This commit was manufactured by cvs2git to create branch 'OPENBSD_2_6'.OPENBSD_2_6

439 files changed, 0 insertions, 104745 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
deleted file mode 100644
index 38ea802be8..0000000000
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* crypto/asn1/a_bitstr.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 <openssl/asn1.h>
-
-int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
-        {
-        int ret,j,r,bits,len;
-        unsigned char *p,*d;
-
-        if (a == NULL) return(0);
-
-        len=a->length;
-
-        if (len > 0)
-                {
-                if (a->flags & ASN1_STRING_FLAG_BITS_LEFT)
-                        {
-                        bits=(int)a->flags&0x07;
-                        }
-                else
-                        {
-                        for ( ; len > 0; len--)
-                                {
-                                if (a->data[len-1]) break;
-                                }
-                        j=a->data[len-1];
-                        if      (j & 0x01) bits=0;
-                        else if (j & 0x02) bits=1;
-                        else if (j & 0x04) bits=2;
-                        else if (j & 0x08) bits=3;
-                        else if (j & 0x10) bits=4;
-                        else if (j & 0x20) bits=5;
-                        else if (j & 0x40) bits=6;
-                        else if (j & 0x80) bits=7;
-                        else bits=0; /* should not happen */
-                        }
-                }
-        else
-                bits=0;
-        ret=1+len;
-        r=ASN1_object_size(0,ret,V_ASN1_BIT_STRING);
-        if (pp == NULL) return(r);
-        p= *pp;
-
-        ASN1_put_object(&p,0,ret,V_ASN1_BIT_STRING,V_ASN1_UNIVERSAL);
-        *(p++)=(unsigned char)bits;
-        d=a->data;
-        memcpy(p,d,len);
-        p+=len;
-        if (len > 0) p[-1]&=(0xff<<bits);
-        *pp=p;
-        return(r);
-        }
-
-ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_BIT_STRING *ret=NULL;
-        unsigned char *p,*s;
-        long len;
-        int inf,tag,xclass;
-        int i;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_BIT_STRING_new()) == NULL) return(NULL);
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_BIT_STRING)
-                {
-                i=ASN1_R_EXPECTING_A_BIT_STRING;
-                goto err;
-                }
-        if (len < 1) { i=ASN1_R_STRING_TOO_SHORT; goto err; }
-
-        i= *(p++);
-        /* We do this to preserve the settings.  If we modify
-         * the settings, via the _set_bit function, we will recalculate
-         * on output */
-        ret->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
-        ret->flags|=(ASN1_STRING_FLAG_BITS_LEFT|(i&0x07)); /* set */
-
-        if (len-- > 1) /* using one because of the bits left byte */
-                {
-                s=(unsigned char *)Malloc((int)len);
-                if (s == NULL)
-                        {
-                        i=ERR_R_MALLOC_FAILURE;
-                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len-1]&=(0xff<<i);
-                p+=len;
-                }
-        else
-                s=NULL;
-
-        ret->length=(int)len;
-        if (ret->data != NULL) Free((char *)ret->data);
-        ret->data=s;
-        ret->type=V_ASN1_BIT_STRING;
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_BIT_STRING_free(ret);
-        return(NULL);
-        }
-
-/* These next 2 functions from Goetz Babin-Ebell <babinebell@trustcenter.de>
- */
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
-        {
-        int w,v,iv;
-        unsigned char *c;
-
-        w=n/8;
-        v=1<<(7-(n&0x07));
-        iv= ~v;
-
-        a->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear, set on write */
-
-        if (a == NULL) return(0);
-        if ((a->length < (w+1)) || (a->data == NULL))
-                {
-                if (!value) return(1); /* Don't need to set */
-                if (a->data == NULL)
-                        c=(unsigned char *)Malloc(w+1);
-                else
-                        c=(unsigned char *)Realloc(a->data,w+1);
-                if (c == NULL) return(0);
-                a->data=c;
-                a->length=w+1;
-                c[w]=0;
-                }
-        a->data[w]=((a->data[w])&iv)|v;
-        while ((a->length > 0) && (a->data[a->length-1] == 0))
-                a->length--;
-        return(1);
-        }
-
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n)
-        {
-        int w,v;
-
-        w=n/8;
-        v=1<<(7-(n&0x07));
-        if ((a == NULL) || (a->length < (w+1)) || (a->data == NULL))
-                return(0);
-        return((a->data[w]&v) != 0);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_bool.c b/src/lib/libcrypto/asn1/a_bool.c
deleted file mode 100644
index 18fa61840b..0000000000
--- a/src/lib/libcrypto/asn1/a_bool.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/asn1/a_bool.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 <openssl/asn1.h>
-
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)
-        {
-        int r;
-        unsigned char *p;
-
-        r=ASN1_object_size(0,1,V_ASN1_BOOLEAN);
-        if (pp == NULL) return(r);
-        p= *pp;
-
-        ASN1_put_object(&p,0,1,V_ASN1_BOOLEAN,V_ASN1_UNIVERSAL);
-        *(p++)= (unsigned char)a;
-        *pp=p;
-        return(r);
-        }
-
-int d2i_ASN1_BOOLEAN(int *a, unsigned char **pp, long length)
-        {
-        int ret= -1;
-        unsigned char *p;
-        long len;
-        int inf,tag,xclass;
-        int i=0;
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_BOOLEAN)
-                {
-                i=ASN1_R_EXPECTING_A_BOOLEAN;
-                goto err;
-                }
-
-        if (len != 1)
-                {
-                i=ASN1_R_BOOLEAN_IS_WRONG_LENGTH;
-                goto err;
-                }
-        ret= (int)*(p++);
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,i);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_bytes.c b/src/lib/libcrypto/asn1/a_bytes.c
deleted file mode 100644
index e452e03b88..0000000000
--- a/src/lib/libcrypto/asn1/a_bytes.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* crypto/asn1/a_bytes.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 <openssl/asn1_mac.h>
-
-static unsigned long tag2bit[32]={
-0,      0,      0,      B_ASN1_BIT_STRING,      /* tags  0 -  3 */
-B_ASN1_OCTET_STRING,    0,      0,              B_ASN1_UNKNOWN,/* tags  4- 7 */
-B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN,/* tags  8-11 */
-B_ASN1_UTF8STRING,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,B_ASN1_UNKNOWN,/* tags 12-15 */
-0,      0,      B_ASN1_NUMERICSTRING,B_ASN1_PRINTABLESTRING,
-B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,0,
-0,B_ASN1_GRAPHICSTRING,B_ASN1_ISO64STRING,B_ASN1_GENERALSTRING,
-B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN,
-        };
-
-static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c);
-/* type is a 'bitmap' of acceptable string types.
- */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
-             long length, int type)
-        {
-        ASN1_STRING *ret=NULL;
-        unsigned char *p,*s;
-        long len;
-        int inf,tag,xclass;
-        int i=0;
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80) goto err;
-
-        if (tag >= 32)
-                {
-                i=ASN1_R_TAG_VALUE_TOO_HIGH;;
-                goto err;
-                }
-        if (!(tag2bit[tag] & type))
-                {
-                i=ASN1_R_WRONG_TYPE;
-                goto err;
-                }
-
-        /* If a bit-string, exit early */
-        if (tag == V_ASN1_BIT_STRING)
-                return(d2i_ASN1_BIT_STRING(a,pp,length));
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
-                }
-        else
-                ret=(*a);
-
-        if (len != 0)
-                {
-                s=(unsigned char *)Malloc((int)len+1);
-                if (s == NULL)
-                        {
-                        i=ERR_R_MALLOC_FAILURE;
-                        goto err;
-                        }
-                memcpy(s,p,(int)len);
-                s[len]='\0';
-                p+=len;
-                }
-        else
-                s=NULL;
-
-        if (ret->data != NULL) Free((char *)ret->data);
-        ret->length=(int)len;
-        ret->data=s;
-        ret->type=tag;
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_STRING_free(ret);
-        return(NULL);
-        }
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
-        {
-        int ret,r,constructed;
-        unsigned char *p;
-
-        if (a == NULL)  return(0);
-
-        if (tag == V_ASN1_BIT_STRING)
-                return(i2d_ASN1_BIT_STRING(a,pp));
-                
-        ret=a->length;
-        r=ASN1_object_size(0,ret,tag);
-        if (pp == NULL) return(r);
-        p= *pp;
-
-        if ((tag == V_ASN1_SEQUENCE) || (tag == V_ASN1_SET))
-                constructed=1;
-        else
-                constructed=0;
-        ASN1_put_object(&p,constructed,ret,tag,xclass);
-        memcpy(p,a->data,a->length);
-        p+=a->length;
-        *pp= p;
-        return(r);
-        }
-
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
-             int Ptag, int Pclass)
-        {
-        ASN1_STRING *ret=NULL;
-        unsigned char *p,*s;
-        long len;
-        int inf,tag,xclass;
-        int i=0;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_STRING_new()) == NULL) return(NULL);
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != Ptag)
-                {
-                i=ASN1_R_WRONG_TAG;
-                goto err;
-                }
-
-        if (inf & V_ASN1_CONSTRUCTED)
-                {
-                ASN1_CTX c;
-
-                c.pp=pp;
-                c.p=p;
-                c.inf=inf;
-                c.slen=len;
-                c.tag=Ptag;
-                c.xclass=Pclass;
-                c.max=(length == 0)?0:(p+length);
-                if (!asn1_collate_primative(ret,&c)) 
-                        goto err; 
-                else
-                        {
-                        p=c.p;
-                        }
-                }
-        else
-                {
-                if (len != 0)
-                        {
-                        if ((ret->length < len) || (ret->data == NULL))
-                                {
-                                if (ret->data != NULL) Free((char *)ret->data);
-                                s=(unsigned char *)Malloc((int)len);
-                                if (s == NULL)
-                                        {
-                                        i=ERR_R_MALLOC_FAILURE;
-                                        goto err;
-                                        }
-                                }
-                        else
-                                s=ret->data;
-                        memcpy(s,p,(int)len);
-                        p+=len;
-                        }
-                else
-                        {
-                        s=NULL;
-                        if (ret->data != NULL) Free((char *)ret->data);
-                        }
-
-                ret->length=(int)len;
-                ret->data=s;
-                ret->type=Ptag;
-                }
-
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_STRING_free(ret);
-        ASN1err(ASN1_F_D2I_ASN1_BYTES,i);
-        return(NULL);
-        }
-
-
-/* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapes
- * them into the one struture that is then returned */
-/* There have been a few bug fixes for this function from
- * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */
-static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c)
-        {
-        ASN1_STRING *os=NULL;
-        BUF_MEM b;
-        int num;
-
-        b.length=0;
-        b.max=0;
-        b.data=NULL;
-
-        if (a == NULL)
-                {
-                c->error=ERR_R_PASSED_NULL_PARAMETER;
-                goto err;
-                }
-
-        num=0;
-        for (;;)
-                {
-                if (c->inf & 1)
-                        {
-                        c->eos=ASN1_check_infinite_end(&c->p,
-                                (long)(c->max-c->p));
-                        if (c->eos) break;
-                        }
-                else
-                        {
-                        if (c->slen <= 0) break;
-                        }
-
-                c->q=c->p;
-                if (d2i_ASN1_bytes(&os,&c->p,c->max-c->p,c->tag,c->xclass)
-                        == NULL)
-                        {
-                        c->error=ERR_R_ASN1_LIB;
-                        goto err;
-                        }
-
-                if (!BUF_MEM_grow(&b,num+os->length))
-                        {
-                        c->error=ERR_R_BUF_LIB;
-                        goto err;
-                        }
-                memcpy(&(b.data[num]),os->data,os->length);
-                if (!(c->inf & 1))
-                        c->slen-=(c->p-c->q);
-                num+=os->length;
-                }
-
-        if (!asn1_Finish(c)) goto err;
-
-        a->length=num;
-        if (a->data != NULL) Free(a->data);
-        a->data=(unsigned char *)b.data;
-        if (os != NULL) ASN1_STRING_free(os);
-        return(1);
-err:
-        ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE,c->error);
-        if (os != NULL) ASN1_STRING_free(os);
-        if (b.data != NULL) Free(b.data);
-        return(0);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c
deleted file mode 100644
index a49d1cb289..0000000000
--- a/src/lib/libcrypto/asn1/a_d2i_fp.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* crypto/asn1/a_d2i_fp.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 <openssl/buffer.h>
-#include <openssl/asn1_mac.h>
-
-#define HEADER_SIZE   8
-
-#ifndef NO_FP_API
-char *ASN1_d2i_fp(char *(*xnew)(), char *(*d2i)(), FILE *in,
-             unsigned char **x)
-        {
-        BIO *b;
-        char *ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_D2I_FP,ERR_R_BUF_LIB);
-                return(NULL);
-                }
-        BIO_set_fp(b,in,BIO_NOCLOSE);
-        ret=ASN1_d2i_bio(xnew,d2i,b,x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-char *ASN1_d2i_bio(char *(*xnew)(), char *(*d2i)(), BIO *in,
-             unsigned char **x)
-        {
-        BUF_MEM *b;
-        unsigned char *p;
-        int i;
-        char *ret=NULL;
-        ASN1_CTX c;
-        int want=HEADER_SIZE;
-        int eos=0;
-        int off=0;
-        int len=0;
-
-        b=BUF_MEM_new();
-        if (b == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_D2I_BIO,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-
-        ERR_clear_error();
-        for (;;)
-                {
-                if (want >= (len-off))
-                        {
-                        want-=(len-off);
-
-                        if (!BUF_MEM_grow(b,len+want))
-                                {
-                                ASN1err(ASN1_F_ASN1_D2I_BIO,ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
-                        i=BIO_read(in,&(b->data[len]),want);
-                        if ((i < 0) && ((len-off) == 0))
-                                {
-                                ASN1err(ASN1_F_ASN1_D2I_BIO,ASN1_R_NOT_ENOUGH_DATA);
-                                goto err;
-                                }
-                        if (i > 0)
-                                len+=i;
-                        }
-                /* else data already loaded */
-
-                p=(unsigned char *)&(b->data[off]);
-                c.p=p;
-                c.inf=ASN1_get_object(&(c.p),&(c.slen),&(c.tag),&(c.xclass),
-                        len-off);
-                if (c.inf & 0x80)
-                        {
-                        unsigned long e;
-
-                        e=ERR_GET_REASON(ERR_peek_error());
-                        if (e != ASN1_R_TOO_LONG)
-                                goto err;
-                        else
-                                ERR_get_error(); /* clear error */
-                        }
-                i=c.p-p;/* header length */
-                off+=i; /* end of data */
-
-                if (c.inf & 1)
-                        {
-                        /* no data body so go round again */
-                        eos++;
-                        want=HEADER_SIZE;
-                        }
-                else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC))
-                        {
-                        /* eos value, so go back and read another header */
-                        eos--;
-                        if (eos <= 0)
-                                break;
-                        else
-                                want=HEADER_SIZE;
-                        }
-                else 
-                        {
-                        /* suck in c.slen bytes of data */
-                        want=(int)c.slen;
-                        if (want > (len-off))
-                                {
-                                want-=(len-off);
-                                if (!BUF_MEM_grow(b,len+want))
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_BIO,ERR_R_MALLOC_FAILURE);
-                                        goto err;
-                                        }
-                                i=BIO_read(in,&(b->data[len]),want);
-                                if (i <= 0)
-                                        {
-                                        ASN1err(ASN1_F_ASN1_D2I_BIO,ASN1_R_NOT_ENOUGH_DATA);
-                                        goto err;
-                                        }
-                                len+=i;
-                                }
-                        off+=(int)c.slen;
-                        if (eos <= 0)
-                                {
-                                break;
-                                }
-                        else
-                                want=HEADER_SIZE;
-                        }
-                }
-
-        p=(unsigned char *)b->data;
-        ret=d2i(x,&p,off);
-err:
-        if (b != NULL) BUF_MEM_free(b);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_digest.c b/src/lib/libcrypto/asn1/a_digest.c
deleted file mode 100644
index 8c45add557..0000000000
--- a/src/lib/libcrypto/asn1/a_digest.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* crypto/asn1/a_digest.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 <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/buffer.h>
-#include <openssl/x509.h>
-
-int ASN1_digest(int (*i2d)(), EVP_MD *type, char *data, unsigned char *md,
-             unsigned int *len)
-        {
-        EVP_MD_CTX ctx;
-        int i;
-        unsigned char *str,*p;
-
-        i=i2d(data,NULL);
-        if ((str=(unsigned char *)Malloc(i)) == NULL) return(0);
-        p=str;
-        i2d(data,&p);
-
-        EVP_DigestInit(&ctx,type);
-        EVP_DigestUpdate(&ctx,str,i);
-        EVP_DigestFinal(&ctx,md,len);
-        Free(str);
-        return(1);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_dup.c b/src/lib/libcrypto/asn1/a_dup.c
deleted file mode 100644
index c0a8709f3b..0000000000
--- a/src/lib/libcrypto/asn1/a_dup.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/asn1/a_dup.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 <openssl/asn1_mac.h>
-
-#define READ_CHUNK   2048
-
-char *ASN1_dup(int (*i2d)(), char *(*d2i)(), char *x)
-        {
-        unsigned char *b,*p;
-        long i;
-        char *ret;
-
-        if (x == NULL) return(NULL);
-
-        i=(long)i2d(x,NULL);
-        b=(unsigned char *)Malloc((unsigned int)i+10);
-        if (b == NULL)
-                { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
-        p= b;
-        i=i2d(x,&p);
-        p= b;
-        ret=d2i(NULL,&p,i);
-        Free((char *)b);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_enum.c b/src/lib/libcrypto/asn1/a_enum.c
deleted file mode 100644
index 9239ecc439..0000000000
--- a/src/lib/libcrypto/asn1/a_enum.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/* crypto/asn1/a_enum.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 <openssl/asn1.h>
-
-/* 
- * Code for ENUMERATED type: identical to INTEGER apart from a different tag.
- * for comments on encoding see a_int.c
- */
-
-int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a, unsigned char **pp)
-        {
-        int pad=0,ret,r,i,t;
-        unsigned char *p,*n,pb=0;
-
-        if ((a == NULL) || (a->data == NULL)) return(0);
-        t=a->type;
-        if (a->length == 0)
-                ret=1;
-        else
-                {
-                ret=a->length;
-                i=a->data[0];
-                if ((t == V_ASN1_ENUMERATED) && (i > 127)) {
-                        pad=1;
-                        pb=0;
-                } else if(t == V_ASN1_NEG_ENUMERATED) {
-                        if(i>128) {
-                                pad=1;
-                                pb=0xFF;
-                        } else if(i == 128) {
-                                for(i = 1; i < a->length; i++) if(a->data[i]) {
-                                                pad=1;
-                                                pb=0xFF;
-                                                break;
-                                }
-                        }
-                }
-                ret+=pad;
-                }
-        r=ASN1_object_size(0,ret,V_ASN1_ENUMERATED);
-        if (pp == NULL) return(r);
-        p= *pp;
-
-        ASN1_put_object(&p,0,ret,V_ASN1_ENUMERATED,V_ASN1_UNIVERSAL);
-        if (pad) *(p++)=pb;
-        if (a->length == 0)
-                *(p++)=0;
-        else if (t == V_ASN1_ENUMERATED)
-                {
-                memcpy(p,a->data,(unsigned int)a->length);
-                p+=a->length;
-                }
-        else {
-                /* Begin at the end of the encoding */
-                n=a->data + a->length - 1;
-                p += a->length - 1;
-                i = a->length;
-                /* Copy zeros to destination as long as source is zero */
-                while(!*n) {
-                        *(p--) = 0;
-                        n--;
-                        i--;
-                }
-                /* Complement and increment next octet */
-                *(p--) = ((*(n--)) ^ 0xff) + 1;
-                i--;
-                /* Complement any octets left */
-                for(;i > 0; i--) *(p--) = *(n--) ^ 0xff;
-                p += a->length;
-        }
-
-        *pp=p;
-        return(r);
-        }
-
-ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_ENUMERATED *ret=NULL;
-        unsigned char *p,*to,*s;
-        long len;
-        int inf,tag,xclass;
-        int i;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_ENUMERATED_new()) == NULL) return(NULL);
-                ret->type=V_ASN1_ENUMERATED;
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_ENUMERATED)
-                {
-                i=ASN1_R_EXPECTING_AN_ENUMERATED;
-                goto err;
-                }
-
-        /* We must Malloc stuff, even for 0 bytes otherwise it
-         * signifies a missing NULL parameter. */
-        s=(unsigned char *)Malloc((int)len+1);
-        if (s == NULL)
-                {
-                i=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-        to=s;
-        if (*p & 0x80) /* a negative number */
-                {
-                ret->type=V_ASN1_NEG_ENUMERATED;
-                if ((*p == 0xff) && (len != 1)) {
-                        p++;
-                        len--;
-                }
-                i = len;
-                p += i - 1;
-                to += i - 1;
-                while((!*p) && i) {
-                        *(to--) = 0;
-                        i--;
-                        p--;
-                }
-                if(!i) {
-                        *s = 1;
-                        s[len] = 0;
-                        p += len;
-                        len++;
-                } else {
-                        *(to--) = (*(p--) ^ 0xff) + 1;
-                        i--;
-                        for(;i > 0; i--) *(to--) = *(p--) ^ 0xff;
-                        p += len;
-                }
-        } else {
-                ret->type=V_ASN1_ENUMERATED;
-                if ((*p == 0) && (len != 1))
-                        {
-                        p++;
-                        len--;
-                        }
-                memcpy(s,p,(int)len);
-                p+=len;
-        }
-
-        if (ret->data != NULL) Free((char *)ret->data);
-        ret->data=s;
-        ret->length=(int)len;
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_ENUMERATED,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_ENUMERATED_free(ret);
-        return(NULL);
-        }
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
-        {
-        int i,j,k;
-        unsigned char buf[sizeof(long)+1];
-        long d;
-
-        a->type=V_ASN1_ENUMERATED;
-        if (a->length < (sizeof(long)+1))
-                {
-                if (a->data != NULL)
-                        Free((char *)a->data);
-                if ((a->data=(unsigned char *)Malloc(sizeof(long)+1)) != NULL)
-                        memset((char *)a->data,0,sizeof(long)+1);
-                }
-        if (a->data == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_ENUMERATED_SET,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        d=v;
-        if (d < 0)
-                {
-                d= -d;
-                a->type=V_ASN1_NEG_ENUMERATED;
-                }
-
-        for (i=0; i<sizeof(long); i++)
-                {
-                if (d == 0) break;
-                buf[i]=(int)d&0xff;
-                d>>=8;
-                }
-        j=0;
-        for (k=i-1; k >=0; k--)
-                a->data[j++]=buf[k];
-        a->length=j;
-        return(1);
-        }
-
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a)
-        {
-        int neg=0,i;
-        long r=0;
-
-        if (a == NULL) return(0L);
-        i=a->type;
-        if (i == V_ASN1_NEG_ENUMERATED)
-                neg=1;
-        else if (i != V_ASN1_ENUMERATED)
-                return(0);
-        
-        if (a->length > sizeof(long))
-                {
-                /* hmm... a bit ugly */
-                return(0xffffffffL);
-                }
-        if (a->data == NULL)
-                return(0);
-
-        for (i=0; i<a->length; i++)
-                {
-                r<<=8;
-                r|=(unsigned char)a->data[i];
-                }
-        if (neg) r= -r;
-        return(r);
-        }
-
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
-        {
-        ASN1_ENUMERATED *ret;
-        int len,j;
-
-        if (ai == NULL)
-                ret=ASN1_ENUMERATED_new();
-        else
-                ret=ai;
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR);
-                goto err;
-                }
-        if(bn->neg) ret->type = V_ASN1_NEG_ENUMERATED;
-        else ret->type=V_ASN1_ENUMERATED;
-        j=BN_num_bits(bn);
-        len=((j == 0)?0:((j/8)+1));
-        ret->data=(unsigned char *)Malloc(len+4);
-        ret->length=BN_bn2bin(bn,ret->data);
-        return(ret);
-err:
-        if (ret != ai) ASN1_ENUMERATED_free(ret);
-        return(NULL);
-        }
-
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn)
-        {
-        BIGNUM *ret;
-
-        if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)
-                ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB);
-        if(ai->type == V_ASN1_NEG_ENUMERATED) bn->neg = 1;
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_i2d_fp.c b/src/lib/libcrypto/asn1/a_i2d_fp.c
deleted file mode 100644
index 6bd845443c..0000000000
--- a/src/lib/libcrypto/asn1/a_i2d_fp.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* crypto/asn1/a_i2d_fp.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 <openssl/buffer.h>
-#include <openssl/asn1_mac.h>
-
-#ifndef NO_FP_API
-int ASN1_i2d_fp(int (*i2d)(), FILE *out, unsigned char *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_I2D_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,out,BIO_NOCLOSE);
-        ret=ASN1_i2d_bio(i2d,b,x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int ASN1_i2d_bio(int (*i2d)(), BIO *out, unsigned char *x)
-        {
-        char *b;
-        unsigned char *p;
-        int i,j=0,n,ret=1;
-
-        n=i2d(x,NULL);
-        b=(char *)Malloc(n);
-        if (b == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_I2D_BIO,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-
-        p=(unsigned char *)b;
-        i2d(x,&p);
-        
-        for (;;)
-                {
-                i=BIO_write(out,&(b[j]),n);
-                if (i == n) break;
-                if (i <= 0)
-                        {
-                        ret=0;
-                        break;
-                        }
-                j+=i;
-                n-=i;
-                }
-        Free((char *)b);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
deleted file mode 100644
index d05436378b..0000000000
--- a/src/lib/libcrypto/asn1/a_int.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/* crypto/asn1/a_int.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 <openssl/asn1.h>
-
-/* 
- * This converts an ASN1 INTEGER into its DER encoding.
- * The internal representation is an ASN1_STRING whose data is a big endian
- * representation of the value, ignoring the sign. The sign is determined by
- * the type: V_ASN1_INTEGER for positive and V_ASN1_NEG_INTEGER for negative. 
- *
- * Positive integers are no problem: they are almost the same as the DER
- * encoding, except if the first byte is >= 0x80 we need to add a zero pad.
- *
- * Negative integers are a bit trickier...
- * The DER representation of negative integers is in 2s complement form.
- * The internal form is converted by complementing each octet and finally 
- * adding one to the result. This can be done less messily with a little trick.
- * If the internal form has trailing zeroes then they will become FF by the
- * complement and 0 by the add one (due to carry) so just copy as many trailing 
- * zeros to the destination as there are in the source. The carry will add one
- * to the last none zero octet: so complement this octet and add one and finally
- * complement any left over until you get to the start of the string.
- *
- * Padding is a little trickier too. If the first bytes is > 0x80 then we pad
- * with 0xff. However if the first byte is 0x80 and one of the following bytes
- * is non-zero we pad with 0xff. The reason for this distinction is that 0x80
- * followed by optional zeros isn't padded.
- */
-
-int i2d_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
-        {
-        int pad=0,ret,r,i,t;
-        unsigned char *p,*n,pb=0;
-
-        if ((a == NULL) || (a->data == NULL)) return(0);
-        t=a->type;
-        if (a->length == 0)
-                ret=1;
-        else
-                {
-                ret=a->length;
-                i=a->data[0];
-                if ((t == V_ASN1_INTEGER) && (i > 127)) {
-                        pad=1;
-                        pb=0;
-                } else if(t == V_ASN1_NEG_INTEGER) {
-                        if(i>128) {
-                                pad=1;
-                                pb=0xFF;
-                        } else if(i == 128) {
-                        /*
-                         * Special case: if any other bytes non zero we pad:
-                         * otherwise we don't.
-                         */
-                                for(i = 1; i < a->length; i++) if(a->data[i]) {
-                                                pad=1;
-                                                pb=0xFF;
-                                                break;
-                                }
-                        }
-                }
-                ret+=pad;
-                }
-        r=ASN1_object_size(0,ret,V_ASN1_INTEGER);
-        if (pp == NULL) return(r);
-        p= *pp;
-
-        ASN1_put_object(&p,0,ret,V_ASN1_INTEGER,V_ASN1_UNIVERSAL);
-        if (pad) *(p++)=pb;
-        if (a->length == 0) *(p++)=0;
-        else if (t == V_ASN1_INTEGER) memcpy(p,a->data,(unsigned int)a->length);
-        else {
-                /* Begin at the end of the encoding */
-                n=a->data + a->length - 1;
-                p += a->length - 1;
-                i = a->length;
-                /* Copy zeros to destination as long as source is zero */
-                while(!*n) {
-                        *(p--) = 0;
-                        n--;
-                        i--;
-                }
-                /* Complement and increment next octet */
-                *(p--) = ((*(n--)) ^ 0xff) + 1;
-                i--;
-                /* Complement any octets left */
-                for(;i > 0; i--) *(p--) = *(n--) ^ 0xff;
-        }
-
-        *pp+=r;
-        return(r);
-        }
-
-ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_INTEGER *ret=NULL;
-        unsigned char *p,*to,*s, *pend;
-        long len;
-        int inf,tag,xclass;
-        int i;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_INTEGER_new()) == NULL) return(NULL);
-                ret->type=V_ASN1_INTEGER;
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        pend = p + len;
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_INTEGER)
-                {
-                i=ASN1_R_EXPECTING_AN_INTEGER;
-                goto err;
-                }
-
-        /* We must Malloc stuff, even for 0 bytes otherwise it
-         * signifies a missing NULL parameter. */
-        s=(unsigned char *)Malloc((int)len+1);
-        if (s == NULL)
-                {
-                i=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-        to=s;
-        if (*p & 0x80) /* a negative number */
-                {
-                ret->type=V_ASN1_NEG_INTEGER;
-                if ((*p == 0xff) && (len != 1)) {
-                        p++;
-                        len--;
-                }
-                i = len;
-                p += i - 1;
-                to += i - 1;
-                while((!*p) && i) {
-                        *(to--) = 0;
-                        i--;
-                        p--;
-                }
-                /* Special case: if all zeros then the number will be of
-                 * the form FF followed by n zero bytes: this corresponds to
-                 * 1 followed by n zero bytes. We've already written n zeros
-                 * so we just append an extra one and set the first byte to
-                 * a 1. This is treated separately because it is the only case
-                 * where the number of bytes is larger than len.
-                 */
-                if(!i) {
-                        *s = 1;
-                        s[len] = 0;
-                        len++;
-                } else {
-                        *(to--) = (*(p--) ^ 0xff) + 1;
-                        i--;
-                        for(;i > 0; i--) *(to--) = *(p--) ^ 0xff;
-                }
-        } else {
-                ret->type=V_ASN1_INTEGER;
-                if ((*p == 0) && (len != 1))
-                        {
-                        p++;
-                        len--;
-                        }
-                memcpy(s,p,(int)len);
-        }
-
-        if (ret->data != NULL) Free((char *)ret->data);
-        ret->data=s;
-        ret->length=(int)len;
-        if (a != NULL) (*a)=ret;
-        *pp=pend;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_INTEGER,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_INTEGER_free(ret);
-        return(NULL);
-        }
-
-/* This is a version of d2i_ASN1_INTEGER that ignores the sign bit of
- * ASN1 integers: some broken software can encode a positive INTEGER
- * with its MSB set as negative (it doesn't add a padding zero).
- */
-
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_INTEGER *ret=NULL;
-        unsigned char *p,*to,*s;
-        long len;
-        int inf,tag,xclass;
-        int i;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_INTEGER_new()) == NULL) return(NULL);
-                ret->type=V_ASN1_INTEGER;
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_INTEGER)
-                {
-                i=ASN1_R_EXPECTING_AN_INTEGER;
-                goto err;
-                }
-
-        /* We must Malloc stuff, even for 0 bytes otherwise it
-         * signifies a missing NULL parameter. */
-        s=(unsigned char *)Malloc((int)len+1);
-        if (s == NULL)
-                {
-                i=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-        to=s;
-                ret->type=V_ASN1_INTEGER;
-                if ((*p == 0) && (len != 1))
-                        {
-                        p++;
-                        len--;
-                        }
-                memcpy(s,p,(int)len);
-                p+=len;
-
-        if (ret->data != NULL) Free((char *)ret->data);
-        ret->data=s;
-        ret->length=(int)len;
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_UINTEGER,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_INTEGER_free(ret);
-        return(NULL);
-        }
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
-        {
-        int i,j,k;
-        unsigned char buf[sizeof(long)+1];
-        long d;
-
-        a->type=V_ASN1_INTEGER;
-        if (a->length < (sizeof(long)+1))
-                {
-                if (a->data != NULL)
-                        Free((char *)a->data);
-                if ((a->data=(unsigned char *)Malloc(sizeof(long)+1)) != NULL)
-                        memset((char *)a->data,0,sizeof(long)+1);
-                }
-        if (a->data == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_INTEGER_SET,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        d=v;
-        if (d < 0)
-                {
-                d= -d;
-                a->type=V_ASN1_NEG_INTEGER;
-                }
-
-        for (i=0; i<sizeof(long); i++)
-                {
-                if (d == 0) break;
-                buf[i]=(int)d&0xff;
-                d>>=8;
-                }
-        j=0;
-        for (k=i-1; k >=0; k--)
-                a->data[j++]=buf[k];
-        a->length=j;
-        return(1);
-        }
-
-long ASN1_INTEGER_get(ASN1_INTEGER *a)
-        {
-        int neg=0,i;
-        long r=0;
-
-        if (a == NULL) return(0L);
-        i=a->type;
-        if (i == V_ASN1_NEG_INTEGER)
-                neg=1;
-        else if (i != V_ASN1_INTEGER)
-                return(0);
-        
-        if (a->length > sizeof(long))
-                {
-                /* hmm... a bit ugly */
-                return(0xffffffffL);
-                }
-        if (a->data == NULL)
-                return(0);
-
-        for (i=0; i<a->length; i++)
-                {
-                r<<=8;
-                r|=(unsigned char)a->data[i];
-                }
-        if (neg) r= -r;
-        return(r);
-        }
-
-ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai)
-        {
-        ASN1_INTEGER *ret;
-        int len,j;
-
-        if (ai == NULL)
-                ret=ASN1_INTEGER_new();
-        else
-                ret=ai;
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_NESTED_ASN1_ERROR);
-                goto err;
-                }
-        if(bn->neg) ret->type = V_ASN1_NEG_INTEGER;
-        else ret->type=V_ASN1_INTEGER;
-        j=BN_num_bits(bn);
-        len=((j == 0)?0:((j/8)+1));
-        ret->data=(unsigned char *)Malloc(len+4);
-        ret->length=BN_bn2bin(bn,ret->data);
-        return(ret);
-err:
-        if (ret != ai) ASN1_INTEGER_free(ret);
-        return(NULL);
-        }
-
-BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai, BIGNUM *bn)
-        {
-        BIGNUM *ret;
-
-        if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)
-                ASN1err(ASN1_F_ASN1_INTEGER_TO_BN,ASN1_R_BN_LIB);
-        if(ai->type == V_ASN1_NEG_INTEGER) bn->neg = 1;
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
deleted file mode 100644
index b94b418ee8..0000000000
--- a/src/lib/libcrypto/asn1/a_object.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* crypto/asn1/a_object.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 <openssl/buffer.h>
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-
-int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
-        {
-        unsigned char *p;
-
-        if ((a == NULL) || (a->data == NULL)) return(0);
-
-        if (pp == NULL)
-                return(ASN1_object_size(0,a->length,V_ASN1_OBJECT));
-
-        p= *pp;
-        ASN1_put_object(&p,0,a->length,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
-        memcpy(p,a->data,a->length);
-        p+=a->length;
-
-        *pp=p;
-        return(a->length);
-        }
-
-int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
-        {
-        int i,first,len=0,c;
-        char tmp[24];
-        const char *p;
-        unsigned long l;
-
-        if (num == 0)
-                return(0);
-        else if (num == -1)
-                num=strlen(buf);
-
-        p=buf;
-        c= *(p++);
-        num--;
-        if ((c >= '0') && (c <= '2'))
-                {
-                first=(c-'0')*40;
-                }
-        else
-                {
-                ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_FIRST_NUM_TOO_LARGE);
-                goto err;
-                }
-
-        if (num <= 0)
-                {
-                ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_MISSING_SECOND_NUMBER);
-                goto err;
-                }
-        c= *(p++);
-        num--;
-        for (;;)
-                {
-                if (num <= 0) break;
-                if ((c != '.') && (c != ' '))
-                        {
-                        ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_INVALID_SEPARATOR);
-                        goto err;
-                        }
-                l=0;
-                for (;;)
-                        {
-                        if (num <= 0) break;
-                        num--;
-                        c= *(p++);
-                        if ((c == ' ') || (c == '.'))
-                                break;
-                        if ((c < '0') || (c > '9'))
-                                {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_INVALID_DIGIT);
-                                goto err;
-                                }
-                        l=l*10L+(long)(c-'0');
-                        }
-                if (len == 0)
-                        {
-                        if ((first < 2) && (l >= 40))
-                                {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_SECOND_NUMBER_TOO_LARGE);
-                                goto err;
-                                }
-                        l+=(long)first;
-                        }
-                i=0;
-                for (;;)
-                        {
-                        tmp[i++]=(unsigned char)l&0x7f;
-                        l>>=7L;
-                        if (l == 0L) break;
-                        }
-                if (out != NULL)
-                        {
-                        if (len+i > olen)
-                                {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_BUFFER_TOO_SMALL);
-                                goto err;
-                                }
-                        while (--i > 0)
-                                out[len++]=tmp[i]|0x80;
-                        out[len++]=tmp[0];
-                        }
-                else
-                        len+=i;
-                }
-        return(len);
-err:
-        return(0);
-        }
-
-int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
-{
-        return OBJ_obj2txt(buf, buf_len, a, 0);
-}
-
-int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
-        {
-        char buf[80];
-        int i;
-
-        if ((a == NULL) || (a->data == NULL))
-                return(BIO_write(bp,"NULL",4));
-        i=i2t_ASN1_OBJECT(buf,80,a);
-        if (i > 80) i=80;
-        BIO_write(bp,buf,i);
-        return(i);
-        }
-
-ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_OBJECT *ret=NULL;
-        unsigned char *p;
-        long len;
-        int tag,xclass;
-        int inf,i;
-
-        /* only the ASN1_OBJECTs from the 'table' will have values
-         * for ->sn or ->ln */
-        if ((a == NULL) || ((*a) == NULL) ||
-                !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC))
-                {
-                if ((ret=ASN1_OBJECT_new()) == NULL) return(NULL);
-                }
-        else    ret=(*a);
-
-        p= *pp;
-
-        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-        if (inf & 0x80)
-                {
-                i=ASN1_R_BAD_OBJECT_HEADER;
-                goto err;
-                }
-
-        if (tag != V_ASN1_OBJECT)
-                {
-                i=ASN1_R_EXPECTING_AN_OBJECT;
-                goto err;
-                }
-        if ((ret->data == NULL) || (ret->length < len))
-                {
-                if (ret->data != NULL) Free((char *)ret->data);
-                ret->data=(unsigned char *)Malloc((int)len);
-                ret->flags|=ASN1_OBJECT_FLAG_DYNAMIC_DATA;
-                if (ret->data == NULL)
-                        { i=ERR_R_MALLOC_FAILURE; goto err; }
-                }
-        memcpy(ret->data,p,(int)len);
-        ret->length=(int)len;
-        ret->sn=NULL;
-        ret->ln=NULL;
-        /* ret->flags=ASN1_OBJECT_FLAG_DYNAMIC; we know it is dynamic */
-        p+=len;
-
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        ASN1err(ASN1_F_D2I_ASN1_OBJECT,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                ASN1_OBJECT_free(ret);
-        return(NULL);
-        }
-
-ASN1_OBJECT *ASN1_OBJECT_new(void)
-        {
-        ASN1_OBJECT *ret;
-
-        ret=(ASN1_OBJECT *)Malloc(sizeof(ASN1_OBJECT));
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_OBJECT_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->length=0;
-        ret->data=NULL;
-        ret->nid=0;
-        ret->sn=NULL;
-        ret->ln=NULL;
-        ret->flags=ASN1_OBJECT_FLAG_DYNAMIC;
-        return(ret);
-        }
-
-void ASN1_OBJECT_free(ASN1_OBJECT *a)
-        {
-        if (a == NULL) return;
-        if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_STRINGS)
-                {
-#ifndef CONST_STRICT /* disable purely for compile-time strict const checking. Doing this on a "real" compile will cause mempory leaks */
-                if (a->sn != NULL) Free((void *)a->sn);
-                if (a->ln != NULL) Free((void *)a->ln);
-#endif
-                a->sn=a->ln=NULL;
-                }
-        if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_DATA)
-                {
-                if (a->data != NULL) Free(a->data);
-                a->data=NULL;
-                a->length=0;
-                }
-        if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC)
-                Free(a);
-        }
-
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-             char *sn, char *ln)
-        {
-        ASN1_OBJECT o;
-
-        o.sn=sn;
-        o.ln=ln;
-        o.data=data;
-        o.nid=nid;
-        o.length=len;
-        o.flags=ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
-                ASN1_OBJECT_FLAG_DYNAMIC_DATA;
-        return(OBJ_dup(&o));
-        }
-
-IMPLEMENT_STACK_OF(ASN1_OBJECT)
-IMPLEMENT_ASN1_SET_OF(ASN1_OBJECT)
diff --git a/src/lib/libcrypto/asn1/a_octet.c b/src/lib/libcrypto/asn1/a_octet.c
deleted file mode 100644
index 7659a13bd3..0000000000
--- a/src/lib/libcrypto/asn1/a_octet.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/asn1/a_octet.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 <openssl/asn1.h>
-
-int i2d_ASN1_OCTET_STRING(ASN1_OCTET_STRING *a, unsigned char **pp)
-        {
-        return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
-                V_ASN1_OCTET_STRING,V_ASN1_UNIVERSAL));
-        }
-
-ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING(ASN1_OCTET_STRING **a,
-             unsigned char **pp, long length)
-        {
-        ASN1_OCTET_STRING *ret=NULL;
-
-        ret=(ASN1_OCTET_STRING *)d2i_ASN1_bytes((ASN1_STRING **)a,
-                pp,length,V_ASN1_OCTET_STRING,V_ASN1_UNIVERSAL);
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ERR_R_NESTED_ASN1_ERROR);
-                return(NULL);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_print.c b/src/lib/libcrypto/asn1/a_print.c
deleted file mode 100644
index cdec7a1561..0000000000
--- a/src/lib/libcrypto/asn1/a_print.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* crypto/asn1/a_print.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 <openssl/asn1.h>
-
-int i2d_ASN1_IA5STRING(ASN1_IA5STRING *a, unsigned char **pp)
-        { return(M_i2d_ASN1_IA5STRING(a,pp)); }
-
-ASN1_IA5STRING *d2i_ASN1_IA5STRING(ASN1_IA5STRING **a, unsigned char **pp,
-             long l)
-        { return(M_d2i_ASN1_IA5STRING(a,pp,l)); }
-
-ASN1_T61STRING *d2i_ASN1_T61STRING(ASN1_T61STRING **a, unsigned char **pp,
-             long l)
-        { return(M_d2i_ASN1_T61STRING(a,pp,l)); }
-
-ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a,
-             unsigned char **pp, long l)
-        { return(M_d2i_ASN1_PRINTABLESTRING(a,pp,
-             l)); }
-
-int i2d_ASN1_PRINTABLE(ASN1_STRING *a, unsigned char **pp)
-        { return(M_i2d_ASN1_PRINTABLE(a,pp)); }
-
-ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a, unsigned char **pp,
-             long l)
-        { return(M_d2i_ASN1_PRINTABLE(a,pp,l)); }
-
-int ASN1_PRINTABLE_type(unsigned char *s, int len)
-        {
-        int c;
-        int ia5=0;
-        int t61=0;
-
-        if (len <= 0) len= -1;
-        if (s == NULL) return(V_ASN1_PRINTABLESTRING);
-
-        while ((*s) && (len-- != 0))
-                {
-                c= *(s++);
-#ifndef CHARSET_EBCDIC
-                if (!(  ((c >= 'a') && (c <= 'z')) ||
-                        ((c >= 'A') && (c <= 'Z')) ||
-                        (c == ' ') ||
-                        ((c >= '0') && (c <= '9')) ||
-                        (c == ' ') || (c == '\'') ||
-                        (c == '(') || (c == ')') ||
-                        (c == '+') || (c == ',') ||
-                        (c == '-') || (c == '.') ||
-                        (c == '/') || (c == ':') ||
-                        (c == '=') || (c == '?')))
-                        ia5=1;
-                if (c&0x80)
-                        t61=1;
-#else
-                if (!isalnum(c) && (c != ' ') &&
-                    strchr("'()+,-./:=?", c) == NULL)
-                        ia5=1;
-                if (os_toascii[c] & 0x80)
-                        t61=1;
-#endif
-                }
-        if (t61) return(V_ASN1_T61STRING);
-        if (ia5) return(V_ASN1_IA5STRING);
-        return(V_ASN1_PRINTABLESTRING);
-        }
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s)
-        {
-        int i;
-        unsigned char *p;
-
-        if (s->type != V_ASN1_UNIVERSALSTRING) return(0);
-        if ((s->length%4) != 0) return(0);
-        p=s->data;
-        for (i=0; i<s->length; i+=4)
-                {
-                if ((p[0] != '\0') || (p[1] != '\0') || (p[2] != '\0'))
-                        break;
-                else
-                        p+=4;
-                }
-        if (i < s->length) return(0);
-        p=s->data;
-        for (i=3; i<s->length; i+=4)
-                {
-                *(p++)=s->data[i];
-                }
-        *(p)='\0';
-        s->length/=4;
-        s->type=ASN1_PRINTABLE_type(s->data,s->length);
-        return(1);
-        }
-
-
-int i2d_DIRECTORYSTRING(ASN1_STRING *a, unsigned char **pp)
-        { return(M_i2d_DIRECTORYSTRING(a,pp)); }
-
-ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, unsigned char **pp,
-             long l)
-        { return(M_d2i_DIRECTORYSTRING(a,pp,l)); }
-
-int i2d_DISPLAYTEXT(ASN1_STRING *a, unsigned char **pp)
-        { return(M_i2d_DISPLAYTEXT(a,pp)); }
-
-ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, unsigned char **pp,
-             long l)
-        { return(M_d2i_DISPLAYTEXT(a,pp,l)); }
diff --git a/src/lib/libcrypto/asn1/a_set.c b/src/lib/libcrypto/asn1/a_set.c
deleted file mode 100644
index c2481e7597..0000000000
--- a/src/lib/libcrypto/asn1/a_set.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* crypto/asn1/a_set.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 <openssl/asn1_mac.h>
-
-typedef struct
-    {
-    unsigned char *pbData;
-    int cbData;
-    } MYBLOB;
-
-/* SetBlobCmp
- * This function compares two elements of SET_OF block
- */
-static int SetBlobCmp(const void *elem1, const void *elem2 )
-    {
-    const MYBLOB *b1 = (const MYBLOB *)elem1;
-    const MYBLOB *b2 = (const MYBLOB *)elem2;
-    int r;
-
-    r = memcmp(b1->pbData, b2->pbData,
-               b1->cbData < b2->cbData ? b1->cbData : b2->cbData);
-    if(r != 0)
-        return r;
-    return b1->cbData-b2->cbData;
-    }
-
-/* int is_set:  if TRUE, then sort the contents (i.e. it isn't a SEQUENCE)    */
-int i2d_ASN1_SET(STACK *a, unsigned char **pp, int (*func)(), int ex_tag,
-             int ex_class, int is_set)
-        {
-        int ret=0,r;
-        int i;
-        unsigned char *p;
-        unsigned char *pStart, *pTempMem;
-        MYBLOB *rgSetBlob;
-        int totSize;
-
-        if (a == NULL) return(0);
-        for (i=sk_num(a)-1; i>=0; i--)
-                ret+=func(sk_value(a,i),NULL);
-        r=ASN1_object_size(1,ret,ex_tag);
-        if (pp == NULL) return(r);
-
-        p= *pp;
-        ASN1_put_object(&p,1,ret,ex_tag,ex_class);
-
-/* Modified by gp@nsj.co.jp */
-        /* And then again by Ben */
-        /* And again by Steve */
-
-        if(!is_set || (sk_num(a) < 2))
-                {
-                for (i=0; i<sk_num(a); i++)
-                        func(sk_value(a,i),&p);
-
-                *pp=p;
-                return(r);
-                }
-
-        pStart  = p; /* Catch the beg of Setblobs*/
-        rgSetBlob = (MYBLOB *)Malloc( sk_num(a) * sizeof(MYBLOB)); /* In this array
-we will store the SET blobs */
-
-        for (i=0; i<sk_num(a); i++)
-                {
-                rgSetBlob[i].pbData = p;  /* catch each set encode blob */
-                func(sk_value(a,i),&p);
-                rgSetBlob[i].cbData = p - rgSetBlob[i].pbData; /* Length of this
-SetBlob
-*/
-                }
-        *pp=p;
-        totSize = p - pStart; /* This is the total size of all set blobs */
-
- /* Now we have to sort the blobs. I am using a simple algo.
-    *Sort ptrs *Copy to temp-mem *Copy from temp-mem to user-mem*/
-        qsort( rgSetBlob, sk_num(a), sizeof(MYBLOB), SetBlobCmp);
-        pTempMem = Malloc(totSize);
-
-/* Copy to temp mem */
-        p = pTempMem;
-        for(i=0; i<sk_num(a); ++i)
-                {
-                memcpy(p, rgSetBlob[i].pbData, rgSetBlob[i].cbData);
-                p += rgSetBlob[i].cbData;
-                }
-
-/* Copy back to user mem*/
-        memcpy(pStart, pTempMem, totSize);
-        Free(pTempMem);
-        Free(rgSetBlob);
-
-        return(r);
-        }
-
-STACK *d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
-             char *(*func)(), void (*free_func)(), int ex_tag, int ex_class)
-        {
-        ASN1_CTX c;
-        STACK *ret=NULL;
-
-        if ((a == NULL) || ((*a) == NULL))
-                { if ((ret=sk_new(NULL)) == NULL) goto err; }
-        else
-                ret=(*a);
-
-        c.p= *pp;
-        c.max=(length == 0)?0:(c.p+length);
-
-        c.inf=ASN1_get_object(&c.p,&c.slen,&c.tag,&c.xclass,c.max-c.p);
-        if (c.inf & 0x80) goto err;
-        if (ex_class != c.xclass)
-                {
-                ASN1err(ASN1_F_D2I_ASN1_SET,ASN1_R_BAD_CLASS);
-                goto err;
-                }
-        if (ex_tag != c.tag)
-                {
-                ASN1err(ASN1_F_D2I_ASN1_SET,ASN1_R_BAD_TAG);
-                goto err;
-                }
-        if ((c.slen+c.p) > c.max)
-                {
-                ASN1err(ASN1_F_D2I_ASN1_SET,ASN1_R_LENGTH_ERROR);
-                goto err;
-                }
-        /* check for infinite constructed - it can be as long
-         * as the amount of data passed to us */
-        if (c.inf == (V_ASN1_CONSTRUCTED+1))
-                c.slen=length+ *pp-c.p;
-        c.max=c.p+c.slen;
-
-        while (c.p < c.max)
-                {
-                char *s;
-
-                if (M_ASN1_D2I_end_sequence()) break;
-                if ((s=func(NULL,&c.p,c.slen,c.max-c.p)) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_ASN1_SET,ASN1_R_ERROR_PARSING_SET_ELEMENT);
-                        asn1_add_error(*pp,(int)(c.q- *pp));
-                        goto err;
-                        }
-                if (!sk_push(ret,s)) goto err;
-                }
-        if (a != NULL) (*a)=ret;
-        *pp=c.p;
-        return(ret);
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                {
-                if (free_func != NULL)
-                        sk_pop_free(ret,free_func);
-                else
-                        sk_free(ret);
-                }
-        return(NULL);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_sign.c b/src/lib/libcrypto/asn1/a_sign.c
deleted file mode 100644
index 57595692e5..0000000000
--- a/src/lib/libcrypto/asn1/a_sign.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* crypto/asn1/a_sign.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 <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/buffer.h>
-
-int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
-             ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
-             const EVP_MD *type)
-        {
-        EVP_MD_CTX ctx;
-        unsigned char *p,*buf_in=NULL,*buf_out=NULL;
-        int i,inl=0,outl=0,outll=0;
-        X509_ALGOR *a;
-
-        for (i=0; i<2; i++)
-                {
-                if (i == 0)
-                        a=algor1;
-                else
-                        a=algor2;
-                if (a == NULL) continue;
-                if (    (a->parameter == NULL) || 
-                        (a->parameter->type != V_ASN1_NULL))
-                        {
-                        ASN1_TYPE_free(a->parameter);
-                        if ((a->parameter=ASN1_TYPE_new()) == NULL) goto err;
-                        a->parameter->type=V_ASN1_NULL;
-                        }
-                ASN1_OBJECT_free(a->algorithm);
-                a->algorithm=OBJ_nid2obj(type->pkey_type);
-                if (a->algorithm == NULL)
-                        {
-                        ASN1err(ASN1_F_ASN1_SIGN,ASN1_R_UNKNOWN_OBJECT_TYPE);
-                        goto err;
-                        }
-                if (a->algorithm->length == 0)
-                        {
-                        ASN1err(ASN1_F_ASN1_SIGN,ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
-                        goto err;
-                        }
-                }
-        inl=i2d(data,NULL);
-        buf_in=(unsigned char *)Malloc((unsigned int)inl);
-        outll=outl=EVP_PKEY_size(pkey);
-        buf_out=(unsigned char *)Malloc((unsigned int)outl);
-        if ((buf_in == NULL) || (buf_out == NULL))
-                {
-                outl=0;
-                ASN1err(ASN1_F_ASN1_SIGN,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        p=buf_in;
-
-        i2d(data,&p);
-        EVP_SignInit(&ctx,type);
-        EVP_SignUpdate(&ctx,(unsigned char *)buf_in,inl);
-        if (!EVP_SignFinal(&ctx,(unsigned char *)buf_out,
-                        (unsigned int *)&outl,pkey))
-                {
-                outl=0;
-                ASN1err(ASN1_F_ASN1_SIGN,ERR_R_EVP_LIB);
-                goto err;
-                }
-        if (signature->data != NULL) Free((char *)signature->data);
-        signature->data=buf_out;
-        buf_out=NULL;
-        signature->length=outl;
-        /* In the interests of compatability, I'll make sure that
-         * the bit string has a 'not-used bits' value of 0
-         */
-        signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
-        signature->flags|=ASN1_STRING_FLAG_BITS_LEFT;
-err:
-        memset(&ctx,0,sizeof(ctx));
-        if (buf_in != NULL)
-                { memset((char *)buf_in,0,(unsigned int)inl); Free((char *)buf_in); }
-        if (buf_out != NULL)
-                { memset((char *)buf_out,0,outll); Free((char *)buf_out); }
-        return(outl);
-        }
diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
deleted file mode 100644
index c1690a5694..0000000000
--- a/src/lib/libcrypto/asn1/a_time.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* crypto/asn1/a_time.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-/* This is an implementation of the ASN1 Time structure which is:
- *    Time ::= CHOICE {
- *      utcTime        UTCTime,
- *      generalTime    GeneralizedTime }
- * written by Steve Henson.
- */
-
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-
-int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
-        {
-#ifdef CHARSET_EBCDIC
-        /* KLUDGE! We convert to ascii before writing DER */
-        char tmp[24];
-        ASN1_STRING tmpstr;
-
-        if(a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME) {
-            int len;
-
-            tmpstr = *(ASN1_STRING *)a;
-            len = tmpstr.length;
-            ebcdic2ascii(tmp, tmpstr.data, (len >= sizeof tmp) ? sizeof tmp : len);
-            tmpstr.data = tmp;
-            a = (ASN1_GENERALIZEDTIME *) &tmpstr;
-        }
-#endif
-        if(a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME)
-                                return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
-                                     a->type ,V_ASN1_UNIVERSAL));
-        ASN1err(ASN1_F_I2D_ASN1_TIME,ASN1_R_EXPECTING_A_TIME);
-        return -1;
-        }
-
-
-ASN1_TIME *d2i_ASN1_TIME(ASN1_TIME **a, unsigned char **pp, long length)
-        {
-        unsigned char tag;
-        tag = **pp & ~V_ASN1_CONSTRUCTED;
-        if(tag == (V_ASN1_UTCTIME|V_ASN1_UNIVERSAL))
-                                         return d2i_ASN1_UTCTIME(a, pp, length);
-        if(tag == (V_ASN1_GENERALIZEDTIME|V_ASN1_UNIVERSAL))
-                                return d2i_ASN1_GENERALIZEDTIME(a, pp, length);
-        ASN1err(ASN1_F_D2I_ASN1_TIME,ASN1_R_EXPECTING_A_TIME);
-        return(NULL);
-        }
-
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
-        {
-        struct tm *ts;
-#if defined(THREADS) && !defined(WIN32)
-        struct tm data;
-#endif
-
-#if defined(THREADS) && !defined(WIN32)
-        gmtime_r(&t,&data);
-        ts=&data; /* should return &data, but doesn't on some systems, so we don't even look at the return value */
-#else
-        ts=gmtime(&t);
-#endif
-        if((ts->tm_year >= 50) && (ts->tm_year < 150))
-                                        return ASN1_UTCTIME_set(s, t);
-        return ASN1_GENERALIZEDTIME_set(s,t);
-        }
diff --git a/src/lib/libcrypto/asn1/a_type.c b/src/lib/libcrypto/asn1/a_type.c
deleted file mode 100644
index 3f2ecee5c2..0000000000
--- a/src/lib/libcrypto/asn1/a_type.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* crypto/asn1/a_type.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 <openssl/asn1_mac.h>
-
-static void ASN1_TYPE_component_free(ASN1_TYPE *a);
-int i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
-        {
-        int r=0;
-
-        if (a == NULL) return(0);
-
-        switch (a->type)
-                {
-        case V_ASN1_NULL:
-                if (pp != NULL)
-                        ASN1_put_object(pp,0,0,V_ASN1_NULL,V_ASN1_UNIVERSAL);
-                r=2;
-                break;
-        case V_ASN1_INTEGER:
-        case V_ASN1_NEG_INTEGER:
-                r=i2d_ASN1_INTEGER(a->value.integer,pp);
-                break;
-        case V_ASN1_ENUMERATED:
-        case V_ASN1_NEG_ENUMERATED:
-                r=i2d_ASN1_ENUMERATED(a->value.enumerated,pp);
-                break;
-        case V_ASN1_BIT_STRING:
-                r=i2d_ASN1_BIT_STRING(a->value.bit_string,pp);
-                break;
-        case V_ASN1_OCTET_STRING:
-                r=i2d_ASN1_OCTET_STRING(a->value.octet_string,pp);
-                break;
-        case V_ASN1_OBJECT:
-                r=i2d_ASN1_OBJECT(a->value.object,pp);
-                break;
-        case V_ASN1_PRINTABLESTRING:
-                r=M_i2d_ASN1_PRINTABLESTRING(a->value.printablestring,pp);
-                break;
-        case V_ASN1_T61STRING:
-                r=M_i2d_ASN1_T61STRING(a->value.t61string,pp);
-                break;
-        case V_ASN1_IA5STRING:
-                r=M_i2d_ASN1_IA5STRING(a->value.ia5string,pp);
-                break;
-        case V_ASN1_GENERALSTRING:
-                r=M_i2d_ASN1_GENERALSTRING(a->value.generalstring,pp);
-                break;
-        case V_ASN1_UNIVERSALSTRING:
-                r=M_i2d_ASN1_UNIVERSALSTRING(a->value.universalstring,pp);
-                break;
-        case V_ASN1_UTF8STRING:
-                r=M_i2d_ASN1_UTF8STRING(a->value.utf8string,pp);
-                break;
-        case V_ASN1_VISIBLESTRING:
-                r=M_i2d_ASN1_VISIBLESTRING(a->value.visiblestring,pp);
-                break;
-        case V_ASN1_BMPSTRING:
-                r=M_i2d_ASN1_BMPSTRING(a->value.bmpstring,pp);
-                break;
-        case V_ASN1_UTCTIME:
-                r=i2d_ASN1_UTCTIME(a->value.utctime,pp);
-                break;
-        case V_ASN1_GENERALIZEDTIME:
-                r=i2d_ASN1_GENERALIZEDTIME(a->value.generalizedtime,pp);
-                break;
-        case V_ASN1_SET:
-        case V_ASN1_SEQUENCE:
-                if (a->value.set == NULL)
-                        r=0;
-                else
-                        {
-                        r=a->value.set->length;
-                        if (pp != NULL)
-                                {
-                                memcpy(*pp,a->value.set->data,r);
-                                *pp+=r;
-                                }
-                        }
-                break;
-                }
-        return(r);
-        }
-
-ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, unsigned char **pp, long length)
-        {
-        ASN1_TYPE *ret=NULL;
-        unsigned char *q,*p,*max;
-        int inf,tag,xclass;
-        long len;
-
-        if ((a == NULL) || ((*a) == NULL))
-                {
-                if ((ret=ASN1_TYPE_new()) == NULL) goto err;
-                }
-        else
-                ret=(*a);
-
-        p= *pp;
-        q=p;
-        max=(p+length);
-
-        inf=ASN1_get_object(&q,&len,&tag,&xclass,length);
-        if (inf & 0x80) goto err;
-        
-        ASN1_TYPE_component_free(ret);
-
-        switch (tag)
-                {
-        case V_ASN1_NULL:
-                p=q;
-                ret->value.ptr=NULL;
-                break;
-        case V_ASN1_INTEGER:
-                if ((ret->value.integer=
-                        d2i_ASN1_INTEGER(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_ENUMERATED:
-                if ((ret->value.enumerated=
-                        d2i_ASN1_ENUMERATED(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_BIT_STRING:
-                if ((ret->value.bit_string=
-                        d2i_ASN1_BIT_STRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_OCTET_STRING:
-                if ((ret->value.octet_string=
-                        d2i_ASN1_OCTET_STRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_VISIBLESTRING:
-                if ((ret->value.visiblestring=
-                        d2i_ASN1_VISIBLESTRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_UTF8STRING:
-                if ((ret->value.utf8string=
-                        d2i_ASN1_UTF8STRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_OBJECT:
-                if ((ret->value.object=
-                        d2i_ASN1_OBJECT(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_PRINTABLESTRING:
-                if ((ret->value.printablestring=
-                        d2i_ASN1_PRINTABLESTRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_T61STRING:
-                if ((ret->value.t61string=
-                        M_d2i_ASN1_T61STRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_IA5STRING:
-                if ((ret->value.ia5string=
-                        M_d2i_ASN1_IA5STRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_GENERALSTRING:
-                if ((ret->value.generalstring=
-                        M_d2i_ASN1_GENERALSTRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_UNIVERSALSTRING:
-                if ((ret->value.universalstring=
-                        M_d2i_ASN1_UNIVERSALSTRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_BMPSTRING:
-                if ((ret->value.bmpstring=
-                        M_d2i_ASN1_BMPSTRING(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_UTCTIME:
-                if ((ret->value.utctime=
-                        d2i_ASN1_UTCTIME(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_GENERALIZEDTIME:
-                if ((ret->value.generalizedtime=
-                        d2i_ASN1_GENERALIZEDTIME(NULL,&p,max-p)) == NULL)
-                        goto err;
-                break;
-        case V_ASN1_SET:
-        case V_ASN1_SEQUENCE:
-                /* Sets and sequences are left complete */
-                if ((ret->value.set=ASN1_STRING_new()) == NULL) goto err;
-                ret->value.set->type=tag;
-                len+=(q-p);
-                if (!ASN1_STRING_set(ret->value.set,p,(int)len)) goto err;
-                p+=len;
-                break;
-        default:
-                ASN1err(ASN1_F_D2I_ASN1_TYPE,ASN1_R_BAD_TYPE);
-                goto err;
-                }
-
-        ret->type=tag;
-        if (a != NULL) (*a)=ret;
-        *pp=p;
-        return(ret);
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) ASN1_TYPE_free(ret);
-        return(NULL);
-        }
-
-ASN1_TYPE *ASN1_TYPE_new(void)
-        {
-        ASN1_TYPE *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,ASN1_TYPE);
-        ret->type= -1;
-        ret->value.ptr=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_ASN1_TYPE_NEW);
-        }
-
-void ASN1_TYPE_free(ASN1_TYPE *a)
-        {
-        if (a == NULL) return;
-        ASN1_TYPE_component_free(a);
-        Free((char *)(char *)a);
-        }
-
-int ASN1_TYPE_get(ASN1_TYPE *a)
-        {
-        if (a->value.ptr != NULL)
-                return(a->type);
-        else
-                return(0);
-        }
-
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)
-        {
-        if (a->value.ptr != NULL)
-                ASN1_TYPE_component_free(a);
-        a->type=type;
-        a->value.ptr=value;
-        }
-
-static void ASN1_TYPE_component_free(ASN1_TYPE *a)
-        {
-        if (a == NULL) return;
-
-        if (a->value.ptr != NULL)
-                {
-                switch (a->type)
-                        {
-                case V_ASN1_OBJECT:
-                        ASN1_OBJECT_free(a->value.object);
-                        break;
-                case V_ASN1_INTEGER:
-                case V_ASN1_NEG_INTEGER:
-                case V_ASN1_ENUMERATED:
-                case V_ASN1_NEG_ENUMERATED:
-                case V_ASN1_BIT_STRING:
-                case V_ASN1_OCTET_STRING:
-                case V_ASN1_SEQUENCE:
-                case V_ASN1_SET:
-                case V_ASN1_NUMERICSTRING:
-                case V_ASN1_PRINTABLESTRING:
-                case V_ASN1_T61STRING:
-                case V_ASN1_VIDEOTEXSTRING:
-                case V_ASN1_IA5STRING:
-                case V_ASN1_UTCTIME:
-                case V_ASN1_GENERALIZEDTIME:
-                case V_ASN1_GRAPHICSTRING:
-                case V_ASN1_VISIBLESTRING:
-                case V_ASN1_GENERALSTRING:
-                case V_ASN1_UNIVERSALSTRING:
-                case V_ASN1_BMPSTRING:
-                case V_ASN1_UTF8STRING:
-                        ASN1_STRING_free((ASN1_STRING *)a->value.ptr);
-                        break;
-                default:
-                        /* MEMORY LEAK */
-                        break;
-                        }
-                a->type=0;
-                a->value.ptr=NULL;
-                }
-        }
-
-IMPLEMENT_STACK_OF(ASN1_TYPE)
-IMPLEMENT_ASN1_SET_OF(ASN1_TYPE)
diff --git a/src/lib/libcrypto/asn1/a_utf8.c b/src/lib/libcrypto/asn1/a_utf8.c
deleted file mode 100644
index 4a8a92e9e4..0000000000
--- a/src/lib/libcrypto/asn1/a_utf8.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/asn1/a_utf8.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 <openssl/asn1.h>
-
-int i2d_ASN1_UTF8STRING(ASN1_UTF8STRING *a, unsigned char **pp)
-        {
-        return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
-                V_ASN1_UTF8STRING,V_ASN1_UNIVERSAL));
-        }
-
-ASN1_UTF8STRING *d2i_ASN1_UTF8STRING(ASN1_UTF8STRING **a, unsigned char **pp,
-             long length)
-        {
-        ASN1_UTF8STRING *ret=NULL;
-
-        ret=(ASN1_UTF8STRING *)d2i_ASN1_bytes((ASN1_STRING **)a,
-                pp,length,V_ASN1_UTF8STRING,V_ASN1_UNIVERSAL);
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_D2I_ASN1_UTF8STRING,ERR_R_NESTED_ASN1_ERROR);
-                return(NULL);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/a_verify.c b/src/lib/libcrypto/asn1/a_verify.c
deleted file mode 100644
index 6383d2c698..0000000000
--- a/src/lib/libcrypto/asn1/a_verify.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* crypto/asn1/a_verify.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 <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-int ASN1_verify(int (*i2d)(), X509_ALGOR *a, ASN1_BIT_STRING *signature,
-             char *data, EVP_PKEY *pkey)
-        {
-        EVP_MD_CTX ctx;
-        const EVP_MD *type;
-        unsigned char *p,*buf_in=NULL;
-        int ret= -1,i,inl;
-
-        i=OBJ_obj2nid(a->algorithm);
-        type=EVP_get_digestbyname(OBJ_nid2sn(i));
-        if (type == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_VERIFY,ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM);
-                goto err;
-                }
-        
-        inl=i2d(data,NULL);
-        buf_in=Malloc((unsigned int)inl);
-        if (buf_in == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_VERIFY,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        p=buf_in;
-
-        i2d(data,&p);
-        EVP_VerifyInit(&ctx,type);
-        EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl);
-
-        memset(buf_in,0,(unsigned int)inl);
-        Free((char *)buf_in);
-
-        if (EVP_VerifyFinal(&ctx,(unsigned char *)signature->data,
-                        (unsigned int)signature->length,pkey) <= 0)
-                {
-                ASN1err(ASN1_F_ASN1_VERIFY,ERR_R_EVP_LIB);
-                ret=0;
-                goto err;
-                }
-        /* we don't need to zero the 'ctx' because we just checked
-         * public information */
-        /* memset(&ctx,0,sizeof(ctx)); */
-        ret=1;
-err:
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
deleted file mode 100644
index 5c2d8999bc..0000000000
--- a/src/lib/libcrypto/asn1/asn1.h
+++ /dev/null
@@ -1,945 +0,0 @@
-/* crypto/asn1/asn1.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_ASN1_H
-#define HEADER_ASN1_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <time.h>
-#include <openssl/bn.h>
-#include <openssl/stack.h>
-#include <openssl/safestack.h>
-
-#define V_ASN1_UNIVERSAL                0x00
-#define V_ASN1_APPLICATION              0x40
-#define V_ASN1_CONTEXT_SPECIFIC         0x80
-#define V_ASN1_PRIVATE                  0xc0
-
-#define V_ASN1_CONSTRUCTED              0x20
-#define V_ASN1_PRIMITIVE_TAG            0x1f
-#define V_ASN1_PRIMATIVE_TAG            0x1f
-
-#define V_ASN1_APP_CHOOSE               -2      /* let the recipent choose */
-
-#define V_ASN1_UNDEF                    -1
-#define V_ASN1_EOC                      0
-#define V_ASN1_BOOLEAN                  1       /**/
-#define V_ASN1_INTEGER                  2
-#define V_ASN1_NEG_INTEGER              (2+0x100)
-#define V_ASN1_BIT_STRING               3
-#define V_ASN1_OCTET_STRING             4
-#define V_ASN1_NULL                     5
-#define V_ASN1_OBJECT                   6
-#define V_ASN1_OBJECT_DESCRIPTOR        7
-#define V_ASN1_EXTERNAL                 8
-#define V_ASN1_REAL                     9
-#define V_ASN1_ENUMERATED               10
-#define V_ASN1_NEG_ENUMERATED           (10+0x100)
-#define V_ASN1_UTF8STRING               12
-#define V_ASN1_SEQUENCE                 16
-#define V_ASN1_SET                      17
-#define V_ASN1_NUMERICSTRING            18      /**/
-#define V_ASN1_PRINTABLESTRING          19
-#define V_ASN1_T61STRING                20
-#define V_ASN1_TELETEXSTRING            20      /* alias */
-#define V_ASN1_VIDEOTEXSTRING           21      /**/
-#define V_ASN1_IA5STRING                22
-#define V_ASN1_UTCTIME                  23
-#define V_ASN1_GENERALIZEDTIME          24      /**/
-#define V_ASN1_GRAPHICSTRING            25      /**/
-#define V_ASN1_ISO64STRING              26      /**/
-#define V_ASN1_VISIBLESTRING            26      /* alias */
-#define V_ASN1_GENERALSTRING            27      /**/
-#define V_ASN1_UNIVERSALSTRING          28      /**/
-#define V_ASN1_BMPSTRING                30
-
-/* For use with d2i_ASN1_type_bytes() */
-#define B_ASN1_NUMERICSTRING    0x0001
-#define B_ASN1_PRINTABLESTRING  0x0002
-#define B_ASN1_T61STRING        0x0004
-#define B_ASN1_TELETEXSTRING    0x0008
-#define B_ASN1_VIDEOTEXSTRING   0x0008
-#define B_ASN1_IA5STRING        0x0010
-#define B_ASN1_GRAPHICSTRING    0x0020
-#define B_ASN1_ISO64STRING      0x0040
-#define B_ASN1_VISIBLESTRING    0x0040
-#define B_ASN1_GENERALSTRING    0x0080
-#define B_ASN1_UNIVERSALSTRING  0x0100
-#define B_ASN1_OCTET_STRING     0x0200
-#define B_ASN1_BIT_STRING       0x0400
-#define B_ASN1_BMPSTRING        0x0800
-#define B_ASN1_UNKNOWN          0x1000
-#define B_ASN1_UTF8STRING       0x2000
-
-#define DECLARE_ASN1_SET_OF(type) \
-int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
-                           int (*func)(type *,unsigned char **), int ex_tag, \
-                           int ex_class, int is_set); \
-STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
-                                       long length, \
-                                       type *(*func)(type **, \
-                                                     unsigned char **,long), \
-                                       void (*free_func)(type *), \
-                                       int ex_tag,int ex_class);
-
-#define IMPLEMENT_ASN1_SET_OF(type) \
-int i2d_ASN1_SET_OF_##type(STACK_OF(type) *a,unsigned char **pp, \
-                           int (*func)(type *,unsigned char **), int ex_tag, \
-                           int ex_class, int is_set) \
-    { return i2d_ASN1_SET((STACK *)a,pp,func,ex_tag,ex_class,is_set); } \
-STACK_OF(type) *d2i_ASN1_SET_OF_##type(STACK_OF(type) **a,unsigned char **pp, \
-                                       long length, \
-                                       type *(*func)(type **, \
-                                                     unsigned char **,long), \
-                                       void (*free_func)(type *), \
-                                       int ex_tag,int ex_class) \
-    { return (STACK_OF(type) *)d2i_ASN1_SET((STACK **)a,pp,length, \
-                                            (char *(*)())func, \
-                                            (void (*)())free_func, \
-                                            ex_tag,ex_class); }
-
-typedef struct asn1_ctx_st
-        {
-        unsigned char *p;/* work char pointer */
-        int eos;        /* end of sequence read for indefinite encoding */
-        int error;      /* error code to use when returning an error */
-        int inf;        /* constructed if 0x20, indefinite is 0x21 */
-        int tag;        /* tag from last 'get object' */
-        int xclass;     /* class from last 'get object' */
-        long slen;      /* length of last 'get object' */
-        unsigned char *max; /* largest value of p alowed */
-        unsigned char *q;/* temporary variable */
-        unsigned char **pp;/* variable */
-        int line;       /* used in error processing */
-        } ASN1_CTX;
-
-/* These are used internally in the ASN1_OBJECT to keep track of
- * whether the names and data need to be free()ed */
-#define ASN1_OBJECT_FLAG_DYNAMIC         0x01   /* internal use */
-#define ASN1_OBJECT_FLAG_CRITICAL        0x02   /* critical x509v3 object id */
-#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04   /* internal use */
-#define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08   /* internal use */
-typedef struct asn1_object_st
-        {
-        const char *sn,*ln;
-        int nid;
-        int length;
-        unsigned char *data;
-        int flags;      /* Should we free this one */
-        } ASN1_OBJECT;
-
-#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
-/* This is the base type that holds just about everything :-) */
-typedef struct asn1_string_st
-        {
-        int length;
-        int type;
-        unsigned char *data;
-        /* The value of the following field depends on the type being
-         * held.  It is mostly being used for BIT_STRING so if the
-         * input data has a non-zero 'unused bits' value, it will be
-         * handled correctly */
-        long flags;
-        } ASN1_STRING;
-
-#ifndef DEBUG
-#define ASN1_INTEGER            ASN1_STRING
-#define ASN1_ENUMERATED         ASN1_STRING
-#define ASN1_BIT_STRING         ASN1_STRING
-#define ASN1_OCTET_STRING       ASN1_STRING
-#define ASN1_PRINTABLESTRING    ASN1_STRING
-#define ASN1_T61STRING          ASN1_STRING
-#define ASN1_IA5STRING          ASN1_STRING
-#define ASN1_UTCTIME            ASN1_STRING
-#define ASN1_GENERALIZEDTIME    ASN1_STRING
-#define ASN1_TIME               ASN1_STRING
-#define ASN1_GENERALSTRING      ASN1_STRING
-#define ASN1_UNIVERSALSTRING    ASN1_STRING
-#define ASN1_BMPSTRING          ASN1_STRING
-#define ASN1_VISIBLESTRING      ASN1_STRING
-#define ASN1_UTF8STRING         ASN1_STRING
-#else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-#endif
-
-typedef struct asn1_type_st
-        {
-        int type;
-        union   {
-                char *ptr;
-                ASN1_STRING *           asn1_string;
-                ASN1_OBJECT *           object;
-                ASN1_INTEGER *          integer;
-                ASN1_ENUMERATED *       enumerated;
-                ASN1_BIT_STRING *       bit_string;
-                ASN1_OCTET_STRING *     octet_string;
-                ASN1_PRINTABLESTRING *  printablestring;
-                ASN1_T61STRING *        t61string;
-                ASN1_IA5STRING *        ia5string;
-                ASN1_GENERALSTRING *    generalstring;
-                ASN1_BMPSTRING *        bmpstring;
-                ASN1_UNIVERSALSTRING *  universalstring;
-                ASN1_UTCTIME *          utctime;
-                ASN1_GENERALIZEDTIME *  generalizedtime;
-                ASN1_VISIBLESTRING *    visiblestring;
-                ASN1_UTF8STRING *       utf8string;
-                /* set and sequence are left complete and still
-                 * contain the set or sequence bytes */
-                ASN1_STRING *           set;
-                ASN1_STRING *           sequence;
-                } value;
-        } ASN1_TYPE;
-
-DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
-
-typedef struct asn1_method_st
-        {
-        int (*i2d)();
-        char *(*d2i)();
-        char *(*create)();
-        void (*destroy)();
-        } ASN1_METHOD;
-
-/* This is used when parsing some Netscape objects */
-typedef struct asn1_header_st
-        {
-        ASN1_OCTET_STRING *header;
-        char *data;
-        ASN1_METHOD *meth;
-        } ASN1_HEADER;
-
-#define ASN1_STRING_length(x)   ((x)->length)
-#define ASN1_STRING_type(x)     ((x)->type)
-#define ASN1_STRING_data(x)     ((x)->data)
-
-/* Macros for string operations */
-#define ASN1_BIT_STRING_new()   (ASN1_BIT_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-#define ASN1_BIT_STRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-                ASN1_STRING_dup((ASN1_STRING *)a)
-#define ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (ASN1_STRING *)a,(ASN1_STRING *)b)
-#define ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-/* i2d_ASN1_BIT_STRING() is a function */
-/* d2i_ASN1_BIT_STRING() is a function */
-
-#define ASN1_INTEGER_new()      (ASN1_INTEGER *)\
-                ASN1_STRING_type_new(V_ASN1_INTEGER)
-#define ASN1_INTEGER_free(a)            ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_INTEGER_dup(a) (ASN1_INTEGER *)ASN1_STRING_dup((ASN1_STRING *)a)
-#define ASN1_INTEGER_cmp(a,b)   ASN1_STRING_cmp(\
-                (ASN1_STRING *)a,(ASN1_STRING *)b)
-/* ASN1_INTEGER_set() is a function, also see BN_to_ASN1_INTEGER() */
-/* ASN1_INTEGER_get() is a function, also see ASN1_INTEGER_to_BN() */
-/* i2d_ASN1_INTEGER() is a function */
-/* d2i_ASN1_INTEGER() is a function */
-
-#define ASN1_ENUMERATED_new()   (ASN1_ENUMERATED *)\
-                ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-#define ASN1_ENUMERATED_free(a)         ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)ASN1_STRING_dup((ASN1_STRING *)a)
-#define ASN1_ENUMERATED_cmp(a,b)        ASN1_STRING_cmp(\
-                (ASN1_STRING *)a,(ASN1_STRING *)b)
-/* ASN1_ENUMERATED_set() is a function, also see BN_to_ASN1_ENUMERATED() */
-/* ASN1_ENUMERATED_get() is a function, also see ASN1_ENUMERATED_to_BN() */
-/* i2d_ASN1_ENUMERATED() is a function */
-/* d2i_ASN1_ENUMERATED() is a function */
-
-#define ASN1_OCTET_STRING_new() (ASN1_OCTET_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-#define ASN1_OCTET_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-                ASN1_STRING_dup((ASN1_STRING *)a)
-#define ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (ASN1_STRING *)a,(ASN1_STRING *)b)
-#define ASN1_OCTET_STRING_set(a,b,c)    ASN1_STRING_set((ASN1_STRING *)a,b,c)
-#define ASN1_OCTET_STRING_print(a,b)    ASN1_STRING_print(a,(ASN1_STRING *)b)
-#define M_i2d_ASN1_OCTET_STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-                V_ASN1_OCTET_STRING)
-/* d2i_ASN1_OCTET_STRING() is a function */
-
-#define ASN1_PRINTABLE_new()    ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define ASN1_PRINTABLE_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_T61STRING| \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_BIT_STRING| \
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNKNOWN)
-
-#define DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define DIRECTORYSTRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DIRECTORYSTRING(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_TELETEXSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_UTF8STRING)
-
-#define DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-#define M_d2i_DISPLAYTEXT(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING)
-
-#define ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-#define ASN1_PRINTABLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-                V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-                (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-#define ASN1_T61STRING_new()    (ASN1_T61STRING_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_T61STRING)
-#define ASN1_T61STRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_T61STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-                V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_T61STRING(a,pp,l) \
-                (ASN1_T61STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-#define ASN1_IA5STRING_new()    (ASN1_IA5STRING *)\
-                ASN1_STRING_type_new(V_ASN1_IA5STRING)
-#define ASN1_IA5STRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_IA5STRING_dup(a)   \
-                        (ASN1_IA5STRING *)ASN1_STRING_dup((ASN1_STRING *)a)
-#define M_i2d_ASN1_IA5STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_IA5STRING(a,pp,l) \
-                (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-                        B_ASN1_IA5STRING)
-
-#define ASN1_UTCTIME_new()      (ASN1_UTCTIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define ASN1_UTCTIME_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)ASN1_STRING_dup((ASN1_STRING *)a)
-/* i2d_ASN1_UTCTIME() is a function */
-/* d2i_ASN1_UTCTIME() is a function */
-/* ASN1_UTCTIME_set() is a function */
-/* ASN1_UTCTIME_check() is a function */
-
-#define ASN1_GENERALIZEDTIME_new()      (ASN1_GENERALIZEDTIME *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-#define ASN1_GENERALIZEDTIME_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-        (ASN1_STRING *)a)
-/* i2d_ASN1_GENERALIZEDTIME() is a function */
-/* d2i_ASN1_GENERALIZEDTIME() is a function */
-/* ASN1_GENERALIZEDTIME_set() is a function */
-/* ASN1_GENERALIZEDTIME_check() is a function */
-
-#define ASN1_TIME_new() (ASN1_TIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-#define ASN1_TIME_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-#define ASN1_TIME_dup(a) (ASN1_TIME *)ASN1_STRING_dup((ASN1_STRING *)a)
-
-/* i2d_ASN1_TIME() is a function */
-/* d2i_ASN1_TIME() is a function */
-/* ASN1_TIME_set() is a function */
-/* ASN1_TIME_check() is a function */
-
-#define ASN1_GENERALSTRING_new()        (ASN1_GENERALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-#define ASN1_GENERALSTRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_GENERALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-                (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-#define ASN1_UNIVERSALSTRING_new()      (ASN1_UNIVERSALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-#define ASN1_UNIVERSALSTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-                (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-#define ASN1_BMPSTRING_new()    (ASN1_BMPSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-#define ASN1_BMPSTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_BMPSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-                (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-#define ASN1_VISIBLESTRING_new()        (ASN1_VISIBLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-#define ASN1_VISIBLESTRING_free(a)      ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-#define ASN1_UTF8STRING_new()   (ASN1_UTF8STRING *)\
-                ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-#define ASN1_UTF8STRING_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-#define M_i2d_ASN1_UTF8STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-                        V_ASN1_UNIVERSAL)
-#define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
-  /* for the is_set parameter to i2d_ASN1_SET */
-#define IS_SEQUENCE     0
-#define IS_SET          1
-
-ASN1_TYPE *     ASN1_TYPE_new(void );
-void            ASN1_TYPE_free(ASN1_TYPE *a);
-int             i2d_ASN1_TYPE(ASN1_TYPE *a,unsigned char **pp);
-ASN1_TYPE *     d2i_ASN1_TYPE(ASN1_TYPE **a,unsigned char **pp,long length);
-int ASN1_TYPE_get(ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
-
-ASN1_OBJECT *   ASN1_OBJECT_new(void );
-void            ASN1_OBJECT_free(ASN1_OBJECT *a);
-int             i2d_ASN1_OBJECT(ASN1_OBJECT *a,unsigned char **pp);
-ASN1_OBJECT *   d2i_ASN1_OBJECT(ASN1_OBJECT **a,unsigned char **pp,
-                        long length);
-
-DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
-
-ASN1_STRING *   ASN1_STRING_new(void );
-void            ASN1_STRING_free(ASN1_STRING *a);
-ASN1_STRING *   ASN1_STRING_dup(ASN1_STRING *a);
-ASN1_STRING *   ASN1_STRING_type_new(int type );
-int             ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b);
-  /* Since this is used to store all sorts of things, via macros, for now, make
-     its data void * */
-int             ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-
-int             i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a,unsigned char **pp);
-ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,unsigned char **pp,
-                        long length);
-int             ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
-int             ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
-
-
-int             i2d_ASN1_BOOLEAN(int a,unsigned char **pp);
-int             d2i_ASN1_BOOLEAN(int *a,unsigned char **pp,long length);
-
-int             i2d_ASN1_INTEGER(ASN1_INTEGER *a,unsigned char **pp);
-ASN1_INTEGER *d2i_ASN1_INTEGER(ASN1_INTEGER **a,unsigned char **pp,
-                        long length);
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a,unsigned char **pp,
-                        long length);
-
-int             i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a,unsigned char **pp);
-ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a,unsigned char **pp,
-                        long length);
-
-int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s,time_t t);
-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, char *str); 
-
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);
-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, char *str); 
-
-int             i2d_ASN1_OCTET_STRING(ASN1_OCTET_STRING *a,unsigned char **pp);
-ASN1_OCTET_STRING *d2i_ASN1_OCTET_STRING(ASN1_OCTET_STRING **a,
-                        unsigned char **pp,long length);
-
-int     i2d_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING *a,unsigned char **pp);
-ASN1_VISIBLESTRING *d2i_ASN1_VISIBLESTRING(ASN1_VISIBLESTRING **a,
-                        unsigned char **pp,long length);
-
-int             i2d_ASN1_UTF8STRING(ASN1_UTF8STRING *a,unsigned char **pp);
-ASN1_UTF8STRING *d2i_ASN1_UTF8STRING(ASN1_UTF8STRING **a,
-                        unsigned char **pp,long length);
-
-int i2d_ASN1_BMPSTRING(ASN1_BMPSTRING *a, unsigned char **pp);
-ASN1_BMPSTRING *d2i_ASN1_BMPSTRING(ASN1_BMPSTRING **a, unsigned char **pp,
-        long length);
-
-int i2d_ASN1_PRINTABLE(ASN1_STRING *a,unsigned char **pp);
-ASN1_STRING *d2i_ASN1_PRINTABLE(ASN1_STRING **a,
-        unsigned char **pp, long l);
-ASN1_PRINTABLESTRING *d2i_ASN1_PRINTABLESTRING(ASN1_PRINTABLESTRING **a,
-        unsigned char **pp, long l);
-
-int     i2d_DIRECTORYSTRING(ASN1_STRING *a,unsigned char **pp);
-ASN1_STRING *d2i_DIRECTORYSTRING(ASN1_STRING **a, unsigned char **pp,
-                                                                 long length);
-
-int     i2d_DISPLAYTEXT(ASN1_STRING *a,unsigned char **pp);
-ASN1_STRING *d2i_DISPLAYTEXT(ASN1_STRING **a, unsigned char **pp, long length);
-
-ASN1_T61STRING *d2i_ASN1_T61STRING(ASN1_T61STRING **a,
-        unsigned char **pp, long l);
-int i2d_ASN1_IA5STRING(ASN1_IA5STRING *a,unsigned char **pp);
-ASN1_IA5STRING *d2i_ASN1_IA5STRING(ASN1_IA5STRING **a,
-        unsigned char **pp, long l);
-
-int             i2d_ASN1_UTCTIME(ASN1_UTCTIME *a,unsigned char **pp);
-ASN1_UTCTIME *  d2i_ASN1_UTCTIME(ASN1_UTCTIME **a,unsigned char **pp,
-                        long length);
-
-int             i2d_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME *a,unsigned char **pp);
-ASN1_GENERALIZEDTIME *  d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a,unsigned char **pp,
-                        long length);
-
-int             i2d_ASN1_TIME(ASN1_TIME *a,unsigned char **pp);
-ASN1_TIME *     d2i_ASN1_TIME(ASN1_TIME **a,unsigned char **pp, long length);
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s,time_t t);
-
-int             i2d_ASN1_SET(STACK *a, unsigned char **pp,
-                        int (*func)(), int ex_tag, int ex_class, int is_set);
-STACK *         d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
-                        char *(*func)(), void (*free_func)(),
-                        int ex_tag, int ex_class);
-
-#ifdef HEADER_BIO_H
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp,ASN1_ENUMERATED *bs,char *buf,int size);
-int i2a_ASN1_OBJECT(BIO *bp,ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp,ASN1_STRING *bs,char *buf,int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
-#endif
-int i2t_ASN1_OBJECT(char *buf,int buf_len,ASN1_OBJECT *a);
-
-int a2d_ASN1_OBJECT(unsigned char *out,int olen, const char *buf, int num);
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data,int len,
-        char *sn, char *ln);
-
-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);
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai,BIGNUM *bn);
-
-/* General */
-/* given a string, return the correct type, max is the maximum length */
-int ASN1_PRINTABLE_type(unsigned char *s, int max);
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp,
-        long length, int Ptag, int Pclass);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a,unsigned char **pp,
-                long length,int type);
-
-/* 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 xclass);
-int ASN1_object_size(int constructed, int length, int tag);
-
-/* Used to implement other functions */
-char *ASN1_dup(int (*i2d)(),char *(*d2i)(),char *x);
-
-#ifndef NO_FP_API
-char *ASN1_d2i_fp(char *(*xnew)(),char *(*d2i)(),FILE *fp,unsigned char **x);
-int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x);
-#endif
-
-#ifdef HEADER_BIO_H
-char *ASN1_d2i_bio(char *(*xnew)(),char *(*d2i)(),BIO *bp,unsigned char **x);
-int ASN1_i2d_bio(int (*i2d)(),BIO *out,unsigned char *x);
-int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
-int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
-int ASN1_TIME_print(BIO *fp,ASN1_TIME *a);
-int ASN1_STRING_print(BIO *bp,ASN1_STRING *v);
-int ASN1_parse(BIO *bp,unsigned char *pp,long len,int indent);
-#endif
-
-/* Used to load and write netscape format cert/key */
-int i2d_ASN1_HEADER(ASN1_HEADER *a,unsigned char **pp);
-ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a,unsigned char **pp, long length);
-ASN1_HEADER *ASN1_HEADER_new(void );
-void ASN1_HEADER_free(ASN1_HEADER *a);
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
-
-void ERR_load_ASN1_strings(void);
-
-/* Not used that much at this point, except for the first two */
-ASN1_METHOD *X509_asn1_meth(void);
-ASN1_METHOD *RSAPrivateKey_asn1_meth(void);
-ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void);
-ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(void);
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a,
-        unsigned char *data, int len);
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a,
-        unsigned char *data, int max_len);
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-        unsigned char *data, int len);
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a,long *num,
-        unsigned char *data, int max_len);
-
-STACK *ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)(),
-                                                 void (*free_func)() ); 
-unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf,
-                                                                 int *len );
-void *ASN1_unpack_string(ASN1_STRING *oct, char *(*d2i)());
-ASN1_STRING *ASN1_pack_string(void *obj, int (*i2d)(), ASN1_OCTET_STRING **oct);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the ASN1 functions. */
-
-/* Function codes. */
-#define ASN1_F_A2D_ASN1_OBJECT                           100
-#define ASN1_F_A2I_ASN1_ENUMERATED                       236
-#define ASN1_F_A2I_ASN1_INTEGER                          101
-#define ASN1_F_A2I_ASN1_STRING                           102
-#define ASN1_F_ASN1_COLLATE_PRIMITIVE                    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_ENUMERATED_SET                       232
-#define ASN1_F_ASN1_ENUMERATED_TO_BN                     233
-#define ASN1_F_ASN1_GENERALIZEDTIME_NEW                  222
-#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_PACK_STRING                          245
-#define ASN1_F_ASN1_PBE_SET                              253
-#define ASN1_F_ASN1_SEQ_PACK                             246
-#define ASN1_F_ASN1_SEQ_UNPACK                           247
-#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_UNPACK_STRING                        248
-#define ASN1_F_ASN1_UTCTIME_NEW                          120
-#define ASN1_F_ASN1_VERIFY                               121
-#define ASN1_F_AUTHORITY_KEYID_NEW                       237
-#define ASN1_F_BASIC_CONSTRAINTS_NEW                     226
-#define ASN1_F_BN_TO_ASN1_ENUMERATED                     234
-#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_ENUMERATED                       235
-#define ASN1_F_D2I_ASN1_GENERALIZEDTIME                  223
-#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_TIME                             224
-#define ASN1_F_D2I_ASN1_TYPE                             133
-#define ASN1_F_D2I_ASN1_TYPE_BYTES                       134
-#define ASN1_F_D2I_ASN1_UINTEGER                         280
-#define ASN1_F_D2I_ASN1_UTCTIME                          135
-#define ASN1_F_D2I_ASN1_UTF8STRING                       266
-#define ASN1_F_D2I_ASN1_VISIBLESTRING                    267
-#define ASN1_F_D2I_AUTHORITY_KEYID                       238
-#define ASN1_F_D2I_BASIC_CONSTRAINTS                     227
-#define ASN1_F_D2I_DHPARAMS                              136
-#define ASN1_F_D2I_DIST_POINT                            276
-#define ASN1_F_D2I_DIST_POINT_NAME                       277
-#define ASN1_F_D2I_DSAPARAMS                             137
-#define ASN1_F_D2I_DSAPRIVATEKEY                         138
-#define ASN1_F_D2I_DSAPUBLICKEY                          139
-#define ASN1_F_D2I_GENERAL_NAME                          230
-#define ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE                228
-#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_NOTICEREF                             268
-#define ASN1_F_D2I_PBE2PARAM                             262
-#define ASN1_F_D2I_PBEPARAM                              249
-#define ASN1_F_D2I_PBKDF2PARAM                           263
-#define ASN1_F_D2I_PKCS12                                254
-#define ASN1_F_D2I_PKCS12_BAGS                           255
-#define ASN1_F_D2I_PKCS12_MAC_DATA                       256
-#define ASN1_F_D2I_PKCS12_SAFEBAG                        257
-#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_PKCS8_PRIV_KEY_INFO                   250
-#define ASN1_F_D2I_PKEY_USAGE_PERIOD                     239
-#define ASN1_F_D2I_POLICYINFO                            269
-#define ASN1_F_D2I_POLICYQUALINFO                        270
-#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_SXNET                                 241
-#define ASN1_F_D2I_SXNETID                               243
-#define ASN1_F_D2I_USERNOTICE                            271
-#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_DIST_POINT_NAME_NEW                       278
-#define ASN1_F_DIST_POINT_NEW                            279
-#define ASN1_F_GENERAL_NAME_NEW                          231
-#define ASN1_F_I2D_ASN1_HEADER                           176
-#define ASN1_F_I2D_ASN1_TIME                             225
-#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_CERT_SEQUENCE_NEW                229
-#define ASN1_F_NETSCAPE_PKEY_NEW                         189
-#define ASN1_F_NETSCAPE_SPKAC_NEW                        190
-#define ASN1_F_NETSCAPE_SPKI_NEW                         191
-#define ASN1_F_NOTICEREF_NEW                             272
-#define ASN1_F_PBE2PARAM_NEW                             264
-#define ASN1_F_PBEPARAM_NEW                              251
-#define ASN1_F_PBKDF2PARAM_NEW                           265
-#define ASN1_F_PKCS12_BAGS_NEW                           258
-#define ASN1_F_PKCS12_MAC_DATA_NEW                       259
-#define ASN1_F_PKCS12_NEW                                260
-#define ASN1_F_PKCS12_SAFEBAG_NEW                        261
-#define ASN1_F_PKCS5_PBE2_SET                            281
-#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_PKCS8_PRIV_KEY_INFO_NEW                   252
-#define ASN1_F_PKEY_USAGE_PERIOD_NEW                     240
-#define ASN1_F_POLICYINFO_NEW                            273
-#define ASN1_F_POLICYQUALINFO_NEW                        274
-#define ASN1_F_SXNETID_NEW                               244
-#define ASN1_F_SXNET_NEW                                 242
-#define ASN1_F_USERNOTICE_NEW                            275
-#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_OBJECT_HEADER                         101
-#define ASN1_R_BAD_PASSWORD_READ                         102
-#define ASN1_R_BAD_PKCS7_CONTENT                         103
-#define ASN1_R_BAD_PKCS7_TYPE                            104
-#define ASN1_R_BAD_TAG                                   105
-#define ASN1_R_BAD_TYPE                                  106
-#define ASN1_R_BN_LIB                                    107
-#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   108
-#define ASN1_R_BUFFER_TOO_SMALL                          109
-#define ASN1_R_DATA_IS_WRONG                             110
-#define ASN1_R_DECODE_ERROR                              155
-#define ASN1_R_DECODING_ERROR                            111
-#define ASN1_R_ENCODE_ERROR                              156
-#define ASN1_R_ERROR_PARSING_SET_ELEMENT                 112
-#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               157
-#define ASN1_R_EXPECTING_AN_ENUMERATED                   154
-#define ASN1_R_EXPECTING_AN_INTEGER                      113
-#define ASN1_R_EXPECTING_AN_OBJECT                       114
-#define ASN1_R_EXPECTING_AN_OCTET_STRING                 115
-#define ASN1_R_EXPECTING_A_BIT_STRING                    116
-#define ASN1_R_EXPECTING_A_BOOLEAN                       117
-#define ASN1_R_EXPECTING_A_GENERALIZEDTIME               151
-#define ASN1_R_EXPECTING_A_TIME                          152
-#define ASN1_R_EXPECTING_A_UTCTIME                       118
-#define ASN1_R_FIRST_NUM_TOO_LARGE                       119
-#define ASN1_R_GENERALIZEDTIME_TOO_LONG                  153
-#define ASN1_R_HEADER_TOO_LONG                           120
-#define ASN1_R_INVALID_DIGIT                             121
-#define ASN1_R_INVALID_SEPARATOR                         122
-#define ASN1_R_INVALID_TIME_FORMAT                       123
-#define ASN1_R_IV_TOO_LARGE                              124
-#define ASN1_R_LENGTH_ERROR                              125
-#define ASN1_R_MISSING_SECOND_NUMBER                     126
-#define ASN1_R_NON_HEX_CHARACTERS                        127
-#define ASN1_R_NOT_ENOUGH_DATA                           128
-#define ASN1_R_ODD_NUMBER_OF_CHARS                       129
-#define ASN1_R_PARSING                                   130
-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING                131
-#define ASN1_R_SECOND_NUMBER_TOO_LARGE                   132
-#define ASN1_R_SHORT_LINE                                133
-#define ASN1_R_STRING_TOO_SHORT                          134
-#define ASN1_R_TAG_VALUE_TOO_HIGH                        135
-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 136
-#define ASN1_R_TOO_LONG                                  137
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  138
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          139
-#define ASN1_R_UNKNOWN_ATTRIBUTE_TYPE                    140
-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          141
-#define ASN1_R_UNKNOWN_OBJECT_TYPE                       142
-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   143
-#define ASN1_R_UNSUPPORTED_CIPHER                        144
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          145
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               146
-#define ASN1_R_UTCTIME_TOO_LONG                          147
-#define ASN1_R_WRONG_PRINTABLE_TYPE                      148
-#define ASN1_R_WRONG_TAG                                 149
-#define ASN1_R_WRONG_TYPE                                150
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c
deleted file mode 100644
index 16755a0b05..0000000000
--- a/src/lib/libcrypto/asn1/asn1_err.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* crypto/asn1/asn1_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/asn1.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA ASN1_str_functs[]=
-        {
-{ERR_PACK(0,ASN1_F_A2D_ASN1_OBJECT,0),  "a2d_ASN1_OBJECT"},
-{ERR_PACK(0,ASN1_F_A2I_ASN1_ENUMERATED,0),      "a2i_ASN1_ENUMERATED"},
-{ERR_PACK(0,ASN1_F_A2I_ASN1_INTEGER,0), "a2i_ASN1_INTEGER"},
-{ERR_PACK(0,ASN1_F_A2I_ASN1_STRING,0),  "a2i_ASN1_STRING"},
-{ERR_PACK(0,ASN1_F_ASN1_COLLATE_PRIMITIVE,0),   "ASN1_COLLATE_PRIMITIVE"},
-{ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0),     "ASN1_d2i_bio"},
-{ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0),      "ASN1_d2i_fp"},
-{ERR_PACK(0,ASN1_F_ASN1_DUP,0), "ASN1_dup"},
-{ERR_PACK(0,ASN1_F_ASN1_ENUMERATED_SET,0),      "ASN1_ENUMERATED_set"},
-{ERR_PACK(0,ASN1_F_ASN1_ENUMERATED_TO_BN,0),    "ASN1_ENUMERATED_to_BN"},
-{ERR_PACK(0,ASN1_F_ASN1_GENERALIZEDTIME_NEW,0), "ASN1_GENERALIZEDTIME_NEW"},
-{ERR_PACK(0,ASN1_F_ASN1_GET_OBJECT,0),  "ASN1_get_object"},
-{ERR_PACK(0,ASN1_F_ASN1_HEADER_NEW,0),  "ASN1_HEADER_new"},
-{ERR_PACK(0,ASN1_F_ASN1_I2D_BIO,0),     "ASN1_i2d_bio"},
-{ERR_PACK(0,ASN1_F_ASN1_I2D_FP,0),      "ASN1_i2d_fp"},
-{ERR_PACK(0,ASN1_F_ASN1_INTEGER_SET,0), "ASN1_INTEGER_set"},
-{ERR_PACK(0,ASN1_F_ASN1_INTEGER_TO_BN,0),       "ASN1_INTEGER_to_BN"},
-{ERR_PACK(0,ASN1_F_ASN1_OBJECT_NEW,0),  "ASN1_OBJECT_new"},
-{ERR_PACK(0,ASN1_F_ASN1_PACK_STRING,0), "ASN1_pack_string"},
-{ERR_PACK(0,ASN1_F_ASN1_PBE_SET,0),     "ASN1_PBE_SET"},
-{ERR_PACK(0,ASN1_F_ASN1_SEQ_PACK,0),    "ASN1_seq_pack"},
-{ERR_PACK(0,ASN1_F_ASN1_SEQ_UNPACK,0),  "ASN1_seq_unpack"},
-{ERR_PACK(0,ASN1_F_ASN1_SIGN,0),        "ASN1_sign"},
-{ERR_PACK(0,ASN1_F_ASN1_STRING_NEW,0),  "ASN1_STRING_new"},
-{ERR_PACK(0,ASN1_F_ASN1_STRING_TYPE_NEW,0),     "ASN1_STRING_type_new"},
-{ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING,0),    "ASN1_TYPE_get_int_octetstring"},
-{ERR_PACK(0,ASN1_F_ASN1_TYPE_GET_OCTETSTRING,0),        "ASN1_TYPE_get_octetstring"},
-{ERR_PACK(0,ASN1_F_ASN1_TYPE_NEW,0),    "ASN1_TYPE_new"},
-{ERR_PACK(0,ASN1_F_ASN1_UNPACK_STRING,0),       "ASN1_unpack_string"},
-{ERR_PACK(0,ASN1_F_ASN1_UTCTIME_NEW,0), "ASN1_UTCTIME_NEW"},
-{ERR_PACK(0,ASN1_F_ASN1_VERIFY,0),      "ASN1_verify"},
-{ERR_PACK(0,ASN1_F_AUTHORITY_KEYID_NEW,0),      "AUTHORITY_KEYID_new"},
-{ERR_PACK(0,ASN1_F_BASIC_CONSTRAINTS_NEW,0),    "BASIC_CONSTRAINTS_new"},
-{ERR_PACK(0,ASN1_F_BN_TO_ASN1_ENUMERATED,0),    "BN_to_ASN1_ENUMERATED"},
-{ERR_PACK(0,ASN1_F_BN_TO_ASN1_INTEGER,0),       "BN_to_ASN1_INTEGER"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_BIT_STRING,0),      "d2i_ASN1_BIT_STRING"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_BMPSTRING,0),       "d2i_ASN1_BMPSTRING"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_BOOLEAN,0), "d2i_ASN1_BOOLEAN"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_BYTES,0),   "d2i_ASN1_bytes"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_ENUMERATED,0),      "d2i_ASN1_ENUMERATED"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_GENERALIZEDTIME,0), "d2i_ASN1_GENERALIZEDTIME"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_HEADER,0),  "d2i_ASN1_HEADER"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_INTEGER,0), "d2i_ASN1_INTEGER"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_OBJECT,0),  "d2i_ASN1_OBJECT"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_OCTET_STRING,0),    "d2i_ASN1_OCTET_STRING"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_PRINT_TYPE,0),      "D2I_ASN1_PRINT_TYPE"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_SET,0),     "d2i_ASN1_SET"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_TIME,0),    "d2i_ASN1_TIME"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_TYPE,0),    "d2i_ASN1_TYPE"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_TYPE_BYTES,0),      "d2i_ASN1_type_bytes"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_UINTEGER,0),        "d2i_ASN1_UINTEGER"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_UTCTIME,0), "d2i_ASN1_UTCTIME"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_UTF8STRING,0),      "d2i_ASN1_UTF8STRING"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_VISIBLESTRING,0),   "d2i_ASN1_VISIBLESTRING"},
-{ERR_PACK(0,ASN1_F_D2I_AUTHORITY_KEYID,0),      "d2i_AUTHORITY_KEYID"},
-{ERR_PACK(0,ASN1_F_D2I_BASIC_CONSTRAINTS,0),    "d2i_BASIC_CONSTRAINTS"},
-{ERR_PACK(0,ASN1_F_D2I_DHPARAMS,0),     "d2i_DHparams"},
-{ERR_PACK(0,ASN1_F_D2I_DIST_POINT,0),   "d2i_DIST_POINT"},
-{ERR_PACK(0,ASN1_F_D2I_DIST_POINT_NAME,0),      "d2i_DIST_POINT_NAME"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPARAMS,0),    "d2i_DSAparams"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPRIVATEKEY,0),        "d2i_DSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPUBLICKEY,0), "d2i_DSAPublicKey"},
-{ERR_PACK(0,ASN1_F_D2I_GENERAL_NAME,0), "d2i_GENERAL_NAME"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE,0),       "d2i_NETSCAPE_CERT_SEQUENCE"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_PKEY,0),        "D2I_NETSCAPE_PKEY"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA,0), "d2i_Netscape_RSA"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0),       "d2i_Netscape_RSA_2"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKAC,0),       "d2i_NETSCAPE_SPKAC"},
-{ERR_PACK(0,ASN1_F_D2I_NETSCAPE_SPKI,0),        "d2i_NETSCAPE_SPKI"},
-{ERR_PACK(0,ASN1_F_D2I_NOTICEREF,0),    "d2i_NOTICEREF"},
-{ERR_PACK(0,ASN1_F_D2I_PBE2PARAM,0),    "d2i_PBE2PARAM"},
-{ERR_PACK(0,ASN1_F_D2I_PBEPARAM,0),     "d2i_PBEPARAM"},
-{ERR_PACK(0,ASN1_F_D2I_PBKDF2PARAM,0),  "d2i_PBKDF2PARAM"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12,0),       "d2i_PKCS12"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_BAGS,0),  "d2i_PKCS12_BAGS"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_MAC_DATA,0),      "d2i_PKCS12_MAC_DATA"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_SAFEBAG,0),       "d2i_PKCS12_SAFEBAG"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7,0),        "d2i_PKCS7"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_DIGEST,0), "d2i_PKCS7_DIGEST"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENCRYPT,0),        "d2i_PKCS7_ENCRYPT"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENC_CONTENT,0),    "d2i_PKCS7_ENC_CONTENT"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENVELOPE,0),       "d2i_PKCS7_ENVELOPE"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL,0),      "d2i_PKCS7_ISSUER_AND_SERIAL"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_RECIP_INFO,0),     "d2i_PKCS7_RECIP_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNED,0), "d2i_PKCS7_SIGNED"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNER_INFO,0),    "d2i_PKCS7_SIGNER_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,0),  "d2i_PKCS7_SIGN_ENVELOPE"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS8_PRIV_KEY_INFO,0),  "d2i_PKCS8_PRIV_KEY_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_PKEY_USAGE_PERIOD,0),    "d2i_PKEY_USAGE_PERIOD"},
-{ERR_PACK(0,ASN1_F_D2I_POLICYINFO,0),   "d2i_POLICYINFO"},
-{ERR_PACK(0,ASN1_F_D2I_POLICYQUALINFO,0),       "d2i_POLICYQUALINFO"},
-{ERR_PACK(0,ASN1_F_D2I_PRIVATEKEY,0),   "d2i_PrivateKey"},
-{ERR_PACK(0,ASN1_F_D2I_PUBLICKEY,0),    "d2i_PublicKey"},
-{ERR_PACK(0,ASN1_F_D2I_RSAPRIVATEKEY,0),        "d2i_RSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_D2I_RSAPUBLICKEY,0), "d2i_RSAPublicKey"},
-{ERR_PACK(0,ASN1_F_D2I_SXNET,0),        "d2i_SXNET"},
-{ERR_PACK(0,ASN1_F_D2I_SXNETID,0),      "d2i_SXNETID"},
-{ERR_PACK(0,ASN1_F_D2I_USERNOTICE,0),   "d2i_USERNOTICE"},
-{ERR_PACK(0,ASN1_F_D2I_X509,0), "d2i_X509"},
-{ERR_PACK(0,ASN1_F_D2I_X509_ALGOR,0),   "d2i_X509_ALGOR"},
-{ERR_PACK(0,ASN1_F_D2I_X509_ATTRIBUTE,0),       "d2i_X509_ATTRIBUTE"},
-{ERR_PACK(0,ASN1_F_D2I_X509_CINF,0),    "d2i_X509_CINF"},
-{ERR_PACK(0,ASN1_F_D2I_X509_CRL,0),     "d2i_X509_CRL"},
-{ERR_PACK(0,ASN1_F_D2I_X509_CRL_INFO,0),        "d2i_X509_CRL_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_X509_EXTENSION,0),       "d2i_X509_EXTENSION"},
-{ERR_PACK(0,ASN1_F_D2I_X509_KEY,0),     "D2I_X509_KEY"},
-{ERR_PACK(0,ASN1_F_D2I_X509_NAME,0),    "d2i_X509_NAME"},
-{ERR_PACK(0,ASN1_F_D2I_X509_NAME_ENTRY,0),      "d2i_X509_NAME_ENTRY"},
-{ERR_PACK(0,ASN1_F_D2I_X509_PKEY,0),    "d2i_X509_PKEY"},
-{ERR_PACK(0,ASN1_F_D2I_X509_PUBKEY,0),  "d2i_X509_PUBKEY"},
-{ERR_PACK(0,ASN1_F_D2I_X509_REQ,0),     "d2i_X509_REQ"},
-{ERR_PACK(0,ASN1_F_D2I_X509_REQ_INFO,0),        "d2i_X509_REQ_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_X509_REVOKED,0), "d2i_X509_REVOKED"},
-{ERR_PACK(0,ASN1_F_D2I_X509_SIG,0),     "d2i_X509_SIG"},
-{ERR_PACK(0,ASN1_F_D2I_X509_VAL,0),     "d2i_X509_VAL"},
-{ERR_PACK(0,ASN1_F_DIST_POINT_NAME_NEW,0),      "DIST_POINT_NAME_new"},
-{ERR_PACK(0,ASN1_F_DIST_POINT_NEW,0),   "DIST_POINT_new"},
-{ERR_PACK(0,ASN1_F_GENERAL_NAME_NEW,0), "GENERAL_NAME_new"},
-{ERR_PACK(0,ASN1_F_I2D_ASN1_HEADER,0),  "i2d_ASN1_HEADER"},
-{ERR_PACK(0,ASN1_F_I2D_ASN1_TIME,0),    "i2d_ASN1_TIME"},
-{ERR_PACK(0,ASN1_F_I2D_DHPARAMS,0),     "i2d_DHparams"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPARAMS,0),    "i2d_DSAparams"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPRIVATEKEY,0),        "i2d_DSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPUBLICKEY,0), "i2d_DSAPublicKey"},
-{ERR_PACK(0,ASN1_F_I2D_NETSCAPE_RSA,0), "i2d_Netscape_RSA"},
-{ERR_PACK(0,ASN1_F_I2D_PKCS7,0),        "i2d_PKCS7"},
-{ERR_PACK(0,ASN1_F_I2D_PRIVATEKEY,0),   "i2d_PrivateKey"},
-{ERR_PACK(0,ASN1_F_I2D_PUBLICKEY,0),    "i2d_PublicKey"},
-{ERR_PACK(0,ASN1_F_I2D_RSAPRIVATEKEY,0),        "i2d_RSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_I2D_RSAPUBLICKEY,0), "i2d_RSAPublicKey"},
-{ERR_PACK(0,ASN1_F_I2D_X509_ATTRIBUTE,0),       "i2d_X509_ATTRIBUTE"},
-{ERR_PACK(0,ASN1_F_I2T_ASN1_OBJECT,0),  "i2t_ASN1_OBJECT"},
-{ERR_PACK(0,ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW,0),       "NETSCAPE_CERT_SEQUENCE_new"},
-{ERR_PACK(0,ASN1_F_NETSCAPE_PKEY_NEW,0),        "NETSCAPE_PKEY_NEW"},
-{ERR_PACK(0,ASN1_F_NETSCAPE_SPKAC_NEW,0),       "NETSCAPE_SPKAC_new"},
-{ERR_PACK(0,ASN1_F_NETSCAPE_SPKI_NEW,0),        "NETSCAPE_SPKI_new"},
-{ERR_PACK(0,ASN1_F_NOTICEREF_NEW,0),    "NOTICEREF_new"},
-{ERR_PACK(0,ASN1_F_PBE2PARAM_NEW,0),    "PBE2PARAM_new"},
-{ERR_PACK(0,ASN1_F_PBEPARAM_NEW,0),     "PBEPARAM_new"},
-{ERR_PACK(0,ASN1_F_PBKDF2PARAM_NEW,0),  "PBKDF2PARAM_new"},
-{ERR_PACK(0,ASN1_F_PKCS12_BAGS_NEW,0),  "PKCS12_BAGS_new"},
-{ERR_PACK(0,ASN1_F_PKCS12_MAC_DATA_NEW,0),      "PKCS12_MAC_DATA_new"},
-{ERR_PACK(0,ASN1_F_PKCS12_NEW,0),       "PKCS12_new"},
-{ERR_PACK(0,ASN1_F_PKCS12_SAFEBAG_NEW,0),       "PKCS12_SAFEBAG_new"},
-{ERR_PACK(0,ASN1_F_PKCS5_PBE2_SET,0),   "PKCS5_pbe2_set"},
-{ERR_PACK(0,ASN1_F_PKCS7_DIGEST_NEW,0), "PKCS7_DIGEST_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENCRYPT_NEW,0),        "PKCS7_ENCRYPT_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENC_CONTENT_NEW,0),    "PKCS7_ENC_CONTENT_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENVELOPE_NEW,0),       "PKCS7_ENVELOPE_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,0),      "PKCS7_ISSUER_AND_SERIAL_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_NEW,0),        "PKCS7_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_RECIP_INFO_NEW,0),     "PKCS7_RECIP_INFO_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGNED_NEW,0), "PKCS7_SIGNED_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGNER_INFO_NEW,0),    "PKCS7_SIGNER_INFO_new"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,0),  "PKCS7_SIGN_ENVELOPE_new"},
-{ERR_PACK(0,ASN1_F_PKCS8_PRIV_KEY_INFO_NEW,0),  "PKCS8_PRIV_KEY_INFO_new"},
-{ERR_PACK(0,ASN1_F_PKEY_USAGE_PERIOD_NEW,0),    "PKEY_USAGE_PERIOD_new"},
-{ERR_PACK(0,ASN1_F_POLICYINFO_NEW,0),   "POLICYINFO_new"},
-{ERR_PACK(0,ASN1_F_POLICYQUALINFO_NEW,0),       "POLICYQUALINFO_new"},
-{ERR_PACK(0,ASN1_F_SXNETID_NEW,0),      "SXNETID_new"},
-{ERR_PACK(0,ASN1_F_SXNET_NEW,0),        "SXNET_new"},
-{ERR_PACK(0,ASN1_F_USERNOTICE_NEW,0),   "USERNOTICE_new"},
-{ERR_PACK(0,ASN1_F_X509_ALGOR_NEW,0),   "X509_ALGOR_new"},
-{ERR_PACK(0,ASN1_F_X509_ATTRIBUTE_NEW,0),       "X509_ATTRIBUTE_new"},
-{ERR_PACK(0,ASN1_F_X509_CINF_NEW,0),    "X509_CINF_new"},
-{ERR_PACK(0,ASN1_F_X509_CRL_INFO_NEW,0),        "X509_CRL_INFO_new"},
-{ERR_PACK(0,ASN1_F_X509_CRL_NEW,0),     "X509_CRL_new"},
-{ERR_PACK(0,ASN1_F_X509_DHPARAMS_NEW,0),        "X509_DHPARAMS_NEW"},
-{ERR_PACK(0,ASN1_F_X509_EXTENSION_NEW,0),       "X509_EXTENSION_new"},
-{ERR_PACK(0,ASN1_F_X509_INFO_NEW,0),    "X509_INFO_new"},
-{ERR_PACK(0,ASN1_F_X509_KEY_NEW,0),     "X509_KEY_NEW"},
-{ERR_PACK(0,ASN1_F_X509_NAME_ENTRY_NEW,0),      "X509_NAME_ENTRY_new"},
-{ERR_PACK(0,ASN1_F_X509_NAME_NEW,0),    "X509_NAME_new"},
-{ERR_PACK(0,ASN1_F_X509_NEW,0), "X509_new"},
-{ERR_PACK(0,ASN1_F_X509_PKEY_NEW,0),    "X509_PKEY_new"},
-{ERR_PACK(0,ASN1_F_X509_PUBKEY_NEW,0),  "X509_PUBKEY_new"},
-{ERR_PACK(0,ASN1_F_X509_REQ_INFO_NEW,0),        "X509_REQ_INFO_new"},
-{ERR_PACK(0,ASN1_F_X509_REQ_NEW,0),     "X509_REQ_new"},
-{ERR_PACK(0,ASN1_F_X509_REVOKED_NEW,0), "X509_REVOKED_new"},
-{ERR_PACK(0,ASN1_F_X509_SIG_NEW,0),     "X509_SIG_new"},
-{ERR_PACK(0,ASN1_F_X509_VAL_FREE,0),    "X509_VAL_free"},
-{ERR_PACK(0,ASN1_F_X509_VAL_NEW,0),     "X509_VAL_new"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA ASN1_str_reasons[]=
-        {
-{ASN1_R_BAD_CLASS                        ,"bad class"},
-{ASN1_R_BAD_OBJECT_HEADER                ,"bad object header"},
-{ASN1_R_BAD_PASSWORD_READ                ,"bad password read"},
-{ASN1_R_BAD_PKCS7_CONTENT                ,"bad pkcs7 content"},
-{ASN1_R_BAD_PKCS7_TYPE                   ,"bad pkcs7 type"},
-{ASN1_R_BAD_TAG                          ,"bad tag"},
-{ASN1_R_BAD_TYPE                         ,"bad type"},
-{ASN1_R_BN_LIB                           ,"bn lib"},
-{ASN1_R_BOOLEAN_IS_WRONG_LENGTH          ,"boolean is wrong length"},
-{ASN1_R_BUFFER_TOO_SMALL                 ,"buffer too small"},
-{ASN1_R_DATA_IS_WRONG                    ,"data is wrong"},
-{ASN1_R_DECODE_ERROR                     ,"decode error"},
-{ASN1_R_DECODING_ERROR                   ,"decoding error"},
-{ASN1_R_ENCODE_ERROR                     ,"encode error"},
-{ASN1_R_ERROR_PARSING_SET_ELEMENT        ,"error parsing set element"},
-{ASN1_R_ERROR_SETTING_CIPHER_PARAMS      ,"error setting cipher params"},
-{ASN1_R_EXPECTING_AN_ENUMERATED          ,"expecting an enumerated"},
-{ASN1_R_EXPECTING_AN_INTEGER             ,"expecting an integer"},
-{ASN1_R_EXPECTING_AN_OBJECT              ,"expecting an object"},
-{ASN1_R_EXPECTING_AN_OCTET_STRING        ,"expecting an octet string"},
-{ASN1_R_EXPECTING_A_BIT_STRING           ,"expecting a bit string"},
-{ASN1_R_EXPECTING_A_BOOLEAN              ,"expecting a boolean"},
-{ASN1_R_EXPECTING_A_GENERALIZEDTIME      ,"expecting a generalizedtime"},
-{ASN1_R_EXPECTING_A_TIME                 ,"expecting a time"},
-{ASN1_R_EXPECTING_A_UTCTIME              ,"expecting a utctime"},
-{ASN1_R_FIRST_NUM_TOO_LARGE              ,"first num too large"},
-{ASN1_R_GENERALIZEDTIME_TOO_LONG         ,"generalizedtime too long"},
-{ASN1_R_HEADER_TOO_LONG                  ,"header too long"},
-{ASN1_R_INVALID_DIGIT                    ,"invalid digit"},
-{ASN1_R_INVALID_SEPARATOR                ,"invalid separator"},
-{ASN1_R_INVALID_TIME_FORMAT              ,"invalid time format"},
-{ASN1_R_IV_TOO_LARGE                     ,"iv too large"},
-{ASN1_R_LENGTH_ERROR                     ,"length error"},
-{ASN1_R_MISSING_SECOND_NUMBER            ,"missing second number"},
-{ASN1_R_NON_HEX_CHARACTERS               ,"non hex characters"},
-{ASN1_R_NOT_ENOUGH_DATA                  ,"not enough data"},
-{ASN1_R_ODD_NUMBER_OF_CHARS              ,"odd number of chars"},
-{ASN1_R_PARSING                          ,"parsing"},
-{ASN1_R_PRIVATE_KEY_HEADER_MISSING       ,"private key header missing"},
-{ASN1_R_SECOND_NUMBER_TOO_LARGE          ,"second number too large"},
-{ASN1_R_SHORT_LINE                       ,"short line"},
-{ASN1_R_STRING_TOO_SHORT                 ,"string too short"},
-{ASN1_R_TAG_VALUE_TOO_HIGH               ,"tag value too high"},
-{ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD,"the asn1 object identifier is not known for this md"},
-{ASN1_R_TOO_LONG                         ,"too long"},
-{ASN1_R_UNABLE_TO_DECODE_RSA_KEY         ,"unable to decode rsa key"},
-{ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY ,"unable to decode rsa private key"},
-{ASN1_R_UNKNOWN_ATTRIBUTE_TYPE           ,"unknown attribute type"},
-{ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM ,"unknown message digest algorithm"},
-{ASN1_R_UNKNOWN_OBJECT_TYPE              ,"unknown object type"},
-{ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE          ,"unknown public key type"},
-{ASN1_R_UNSUPPORTED_CIPHER               ,"unsupported cipher"},
-{ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM ,"unsupported encryption algorithm"},
-{ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE      ,"unsupported public key type"},
-{ASN1_R_UTCTIME_TOO_LONG                 ,"utctime too long"},
-{ASN1_R_WRONG_PRINTABLE_TYPE             ,"wrong printable type"},
-{ASN1_R_WRONG_TAG                        ,"wrong tag"},
-{ASN1_R_WRONG_TYPE                       ,"wrong type"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_ASN1_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_ASN1,ASN1_str_functs);
-                ERR_load_strings(ERR_LIB_ASN1,ASN1_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
deleted file mode 100644
index 95e54ed626..0000000000
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* crypto/asn1/asn1_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 <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-
-static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);
-static void asn1_put_length(unsigned char **pp, int length);
-const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
-
-int ASN1_check_infinite_end(unsigned char **p, long len)
-        {
-        /* If there is 0 or 1 byte left, the length check should pick
-         * things up */
-        if (len <= 0)
-                return(1);
-        else if ((len >= 2) && ((*p)[0] == 0) && ((*p)[1] == 0))
-                {
-                (*p)+=2;
-                return(1);
-                }
-        return(0);
-        }
-
-
-int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
-             long omax)
-        {
-        int i,ret;
-        long l;
-        unsigned char *p= *pp;
-        int tag,xclass,inf;
-        long max=omax;
-
-        if (!max) goto err;
-        ret=(*p&V_ASN1_CONSTRUCTED);
-        xclass=(*p&V_ASN1_PRIVATE);
-        i= *p&V_ASN1_PRIMITIVE_TAG;
-        if (i == V_ASN1_PRIMITIVE_TAG)
-                {               /* high-tag */
-                p++;
-                if (--max == 0) goto err;
-                l=0;
-                while (*p&0x80)
-                        {
-                        l<<=7L;
-                        l|= *(p++)&0x7f;
-                        if (--max == 0) goto err;
-                        }
-                l<<=7L;
-                l|= *(p++)&0x7f;
-                tag=(int)l;
-                }
-        else
-                { 
-                tag=i;
-                p++;
-                if (--max == 0) goto err;
-                }
-        *ptag=tag;
-        *pclass=xclass;
-        if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err;
-
-#if 0
-        fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n", 
-                (int)p,*plength,omax,(int)*pp,(int)(p+ *plength),
-                (int)(omax+ *pp));
-
-#endif
-#if 0
-        if ((p+ *plength) > (omax+ *pp))
-                {
-                ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
-                /* Set this so that even if things are not long enough
-                 * the values are set correctly */
-                ret|=0x80;
-                }
-#endif
-        *pp=p;
-        return(ret|inf);
-err:
-        ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_HEADER_TOO_LONG);
-        return(0x80);
-        }
-
-static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
-        {
-        unsigned char *p= *pp;
-        long ret=0;
-        int i;
-
-        if (max-- < 1) return(0);
-        if (*p == 0x80)
-                {
-                *inf=1;
-                ret=0;
-                p++;
-                }
-        else
-                {
-                *inf=0;
-                i= *p&0x7f;
-                if (*(p++) & 0x80)
-                        {
-                        if (max-- == 0) return(0);
-                        while (i-- > 0)
-                                {
-                                ret<<=8L;
-                                ret|= *(p++);
-                                if (max-- == 0) return(0);
-                                }
-                        }
-                else
-                        ret=i;
-                }
-        *pp=p;
-        *rl=ret;
-        return(1);
-        }
-
-/* class 0 is constructed
- * constructed == 2 for indefinitle length constructed */
-void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
-             int xclass)
-        {
-        unsigned char *p= *pp;
-        int i;
-
-        i=(constructed)?V_ASN1_CONSTRUCTED:0;
-        i|=(xclass&V_ASN1_PRIVATE);
-        if (tag < 31)
-                *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);
-        else
-                {
-                *(p++)=i|V_ASN1_PRIMITIVE_TAG;
-                while (tag > 0x7f)
-                        {
-                        *(p++)=(tag&0x7f)|0x80;
-                        tag>>=7;
-                        }
-                *(p++)=(tag&0x7f);
-                }
-        if ((constructed == 2) && (length == 0))
-                *(p++)=0x80; /* der_put_length would output 0 instead */
-        else
-                asn1_put_length(&p,length);
-        *pp=p;
-        }
-
-static void asn1_put_length(unsigned char **pp, int length)
-        {
-        unsigned char *p= *pp;
-        int i,l;
-        if (length <= 127)
-                *(p++)=(unsigned char)length;
-        else
-                {
-                l=length;
-                for (i=0; l > 0; i++)
-                        l>>=8;
-                *(p++)=i|0x80;
-                l=i;
-                while (i-- > 0)
-                        {
-                        p[i]=length&0xff;
-                        length>>=8;
-                        }
-                p+=l;
-                }
-        *pp=p;
-        }
-
-int ASN1_object_size(int constructed, int length, int tag)
-        {
-        int ret;
-
-        ret=length;
-        ret++;
-        if (tag >= 31)
-                {
-                while (tag > 0)
-                        {
-                        tag>>=7;
-                        ret++;
-                        }
-                }
-        if ((length == 0) && (constructed == 2))
-                ret+=2;
-        ret++;
-        if (length > 127)
-                {
-                while (length > 0)
-                        {
-                        length>>=8;
-                        ret++;
-                        }
-                }
-        return(ret);
-        }
-
-int asn1_Finish(ASN1_CTX *c)
-        {
-        if ((c->inf == (1|V_ASN1_CONSTRUCTED)) && (!c->eos))
-                {
-                if (!ASN1_check_infinite_end(&c->p,c->slen))
-                        {
-                        c->error=ERR_R_MISSING_ASN1_EOS;
-                        return(0);
-                        }
-                }
-        if (    ((c->slen != 0) && !(c->inf & 1)) ||
-                ((c->slen < 0) && (c->inf & 1)))
-                {
-                c->error=ERR_R_ASN1_LENGTH_MISMATCH;
-                return(0);
-                }
-        return(1);
-        }
-
-int asn1_GetSequence(ASN1_CTX *c, long *length)
-        {
-        unsigned char *q;
-
-        q=c->p;
-        c->inf=ASN1_get_object(&(c->p),&(c->slen),&(c->tag),&(c->xclass),
-                *length);
-        if (c->inf & 0x80)
-                {
-                c->error=ERR_R_BAD_GET_ASN1_OBJECT_CALL;
-                return(0);
-                }
-        if (c->tag != V_ASN1_SEQUENCE)
-                {
-                c->error=ERR_R_EXPECTING_AN_ASN1_SEQUENCE;
-                return(0);
-                }
-        (*length)-=(c->p-q);
-        if (c->max && (*length < 0))
-                {
-                c->error=ERR_R_ASN1_LENGTH_MISMATCH;
-                return(0);
-                }
-        if (c->inf == (1|V_ASN1_CONSTRUCTED))
-                c->slen= *length+ *(c->pp)-c->p;
-        c->eos=0;
-        return(1);
-        }
-
-ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *str)
-        {
-        ASN1_STRING *ret;
-
-        if (str == NULL) return(NULL);
-        if ((ret=ASN1_STRING_type_new(str->type)) == NULL)
-                return(NULL);
-        if (!ASN1_STRING_set(ret,str->data,str->length))
-                {
-                ASN1_STRING_free(ret);
-                return(NULL);
-                }
-        ret->flags = str->flags;
-        return(ret);
-        }
-
-int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
-        {
-        unsigned char *c;
-        const char *data=_data;
-
-        if (len < 0)
-                {
-                if (data == NULL)
-                        return(0);
-                else
-                        len=strlen(data);
-                }
-        if ((str->length < len) || (str->data == NULL))
-                {
-                c=str->data;
-                if (c == NULL)
-                        str->data=Malloc(len+1);
-                else
-                        str->data=Realloc(c,len+1);
-
-                if (str->data == NULL)
-                        {
-                        str->data=c;
-                        return(0);
-                        }
-                }
-        str->length=len;
-        if (data != NULL)
-                {
-                memcpy(str->data,data,len);
-                /* an alowance for strings :-) */
-                str->data[len]='\0';
-                }
-        return(1);
-        }
-
-ASN1_STRING *ASN1_STRING_new(void)
-        {
-        return(ASN1_STRING_type_new(V_ASN1_OCTET_STRING));
-        }
-
-
-ASN1_STRING *ASN1_STRING_type_new(int type)
-        {
-        ASN1_STRING *ret;
-
-        ret=(ASN1_STRING *)Malloc(sizeof(ASN1_STRING));
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->length=0;
-        ret->type=type;
-        ret->data=NULL;
-        ret->flags=0;
-        return(ret);
-        }
-
-void ASN1_STRING_free(ASN1_STRING *a)
-        {
-        if (a == NULL) return;
-        if (a->data != NULL) Free((char *)a->data);
-        Free((char *)a);
-        }
-
-int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
-        {
-        int i;
-
-        i=(a->length-b->length);
-        if (i == 0)
-                {
-                i=memcmp(a->data,b->data,a->length);
-                if (i == 0)
-                        return(a->type-b->type);
-                else
-                        return(i);
-                }
-        else
-                return(i);
-        }
-
-void asn1_add_error(unsigned char *address, int offset)
-        {
-        char buf1[16],buf2[16];
-
-        sprintf(buf1,"%lu",(unsigned long)address);
-        sprintf(buf2,"%d",offset);
-        ERR_add_error_data(4,"address=",buf1," offset=",buf2);
-        }
-
diff --git a/src/lib/libcrypto/asn1/asn1_mac.h b/src/lib/libcrypto/asn1/asn1_mac.h
deleted file mode 100644
index 93f9c5193c..0000000000
--- a/src/lib/libcrypto/asn1/asn1_mac.h
+++ /dev/null
@@ -1,546 +0,0 @@
-/* crypto/asn1/asn1_mac.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_ASN1_MAC_H
-#define HEADER_ASN1_MAC_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/asn1.h>
-
-#ifndef ASN1_MAC_ERR_LIB
-#define ASN1_MAC_ERR_LIB        ERR_LIB_ASN1
-#endif 
-
-#define ASN1_MAC_H_err(f,r,line) \
-        ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),ERR_file_name,(line))
-
-#define M_ASN1_D2I_vars(a,type,func) \
-        ASN1_CTX c; \
-        type ret=NULL; \
-        \
-        c.pp=pp; \
-        c.q= *pp; \
-        c.error=ERR_R_NESTED_ASN1_ERROR; \
-        if ((a == NULL) || ((*a) == NULL)) \
-                { if ((ret=(type)func()) == NULL) \
-                        { c.line=__LINE__; goto err; } } \
-        else    ret=(*a);
-
-#define M_ASN1_D2I_Init() \
-        c.p= *pp; \
-        c.max=(length == 0)?0:(c.p+length);
-
-#define M_ASN1_D2I_Finish_2(a) \
-        if (!asn1_Finish(&c)) \
-                { c.line=__LINE__; goto err; } \
-        *pp=c.p; \
-        if (a != NULL) (*a)=ret; \
-        return(ret);
-
-#define M_ASN1_D2I_Finish(a,func,e) \
-        M_ASN1_D2I_Finish_2(a); \
-err:\
-        ASN1_MAC_H_err((e),c.error,c.line); \
-        asn1_add_error(*pp,(int)(c.q- *pp)); \
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-        return(NULL)
-
-#define M_ASN1_D2I_start_sequence() \
-        if (!asn1_GetSequence(&c,&length)) \
-                { c.line=__LINE__; goto err; }
-
-#define M_ASN1_D2I_end_sequence() \
-        (((c.inf&1) == 0)?(c.slen <= 0): \
-                (c.eos=ASN1_check_infinite_end(&c.p,c.slen)))
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-#define M_ASN1_D2I_get(b,func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-/* use this instead () */
-#define M_ASN1_D2I_get_int(b,func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) < 0) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_opt(b,func,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-                == (V_ASN1_UNIVERSAL|(type)))) \
-                { \
-                M_ASN1_D2I_get(b,func); \
-                }
-
-#define M_ASN1_D2I_get_imp(b,func, type) \
-        M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \
-        c.slen-=(c.p-c.q);\
-        M_ASN1_next_prev=_tmp;
-
-#define M_ASN1_D2I_get_IMP_opt(b,func,tag,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == \
-                (V_ASN1_CONTEXT_SPECIFIC|(tag)))) \
-                { \
-                unsigned char _tmp = M_ASN1_next; \
-                M_ASN1_D2I_get_imp(b,func, type);\
-                }
-
-#define M_ASN1_D2I_get_set(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_set_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_set_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set(r,func,free_func); }
-
-#define M_ASN1_D2I_get_set_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set_type(type,r,func,free_func); }
-
-#define M_ASN1_I2D_len_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_len_SET(a,f);
-
-#define M_ASN1_I2D_put_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SET(a,f);
-
-#define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_put_SEQUENCE_opt_type(type,a,f) \
-        if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE_type(type,a,f);
-
-#define M_ASN1_D2I_get_IMP_set_opt(b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set(b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-#define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-#define M_ASN1_D2I_get_seq(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-
-#define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                                            V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-#define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq(r,func,free_func); }
-
-#define M_ASN1_D2I_get_seq_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq_type(type,r,func,free_func); }
-
-#define M_ASN1_D2I_get_IMP_set(r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-#define M_ASN1_D2I_get_IMP_set_type(type,r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-#define M_ASN1_D2I_get_imp_set(r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\
-                (void (*)())free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
-                                   free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_set_strings(r,func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-#define M_ASN1_D2I_get_EXP_opt(r,func,tag) \
-        if ((c.slen != 0L) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (func(&(r),&c.p,Tlen) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-#define M_ASN1_D2I_get_EXP_set_opt(r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
-                        (void (*)())free_func, \
-                        b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-#define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \
-                        free_func,b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-/* New macros */
-#define M_ASN1_New_Malloc(ret,type) \
-        if ((ret=(type *)Malloc(sizeof(type))) == NULL) \
-                { c.line=__LINE__; goto err2; }
-
-#define M_ASN1_New(arg,func) \
-        if (((arg)=func()) == NULL) return(NULL)
-
-#define M_ASN1_New_Error(a) \
-/*      err:    ASN1_MAC_H_err((a),ERR_R_NESTED_ASN1_ERROR,c.line); \
-                return(NULL);*/ \
-        err2:   ASN1_MAC_H_err((a),ERR_R_MALLOC_FAILURE,c.line); \
-                return(NULL)
-
-
-#define M_ASN1_next             (*c.p)
-#define M_ASN1_next_prev        (*c.q)
-
-/*************************************************/
-
-#define M_ASN1_I2D_vars(a)      int r=0,ret=0; \
-                                unsigned char *p; \
-                                if (a == NULL) return(0)
-
-/* Length Macros */
-#define M_ASN1_I2D_len(a,f)     ret+=f(a,NULL)
-#define M_ASN1_I2D_len_IMP_opt(a,f)     if (a != NULL) M_ASN1_I2D_len(a,f)
-
-#define M_ASN1_I2D_len_SET(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-
-#define M_ASN1_I2D_len_SET_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SET, \
-                                            V_ASN1_UNIVERSAL,IS_SET);
-
-#define M_ASN1_I2D_len_SEQUENCE(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                                  IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
-                                            V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-#define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_len_SEQUENCE_opt_type(type,a,f) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE_type(type,a,f);
-
-#define M_ASN1_I2D_len_IMP_SET(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_type(type,a,f,x) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                            V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                               V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                  IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                                    V_ASN1_CONTEXT_SPECIFIC, \
-                                                    IS_SEQUENCE);
-
-#define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
-                if (a != NULL)\
-                        { \
-                        v=f(a,NULL); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-#define M_ASN1_I2D_len_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-#define M_ASN1_I2D_len_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL, \
-                                       IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-#define M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET_OF_##type(a,NULL,f,tag, \
-                                                 V_ASN1_UNIVERSAL, \
-                                                 IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-/* Put Macros */
-#define M_ASN1_I2D_put(a,f)     f(a,&p)
-
-#define M_ASN1_I2D_put_IMP_opt(a,f,t)   \
-                if (a != NULL) \
-                        { \
-                        unsigned char *q=p; \
-                        f(a,&p); \
-                        *q=(V_ASN1_CONTEXT_SPECIFIC|t|(*q&V_ASN1_CONSTRUCTED));\
-                        }
-
-#define M_ASN1_I2D_put_SET(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SET,\
-                        V_ASN1_UNIVERSAL,IS_SET)
-#define M_ASN1_I2D_put_SET_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET)
-#define M_ASN1_I2D_put_IMP_SET(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-#define M_ASN1_I2D_put_IMP_SET_type(type,a,f,x) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-#define M_ASN1_I2D_put_IMP_SEQUENCE(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
-                                             V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                            IS_SEQUENCE)
-
-#define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_put_SEQUENCE(a,f);
-
-#define M_ASN1_I2D_put_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SET); }
-
-#define M_ASN1_I2D_put_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SET); }
-
-#define M_ASN1_I2D_put_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SEQUENCE); }
-
-#define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SEQUENCE); }
-
-#define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
-                if (a != NULL) \
-                        { \
-                        ASN1_put_object(&p,1,v,tag,V_ASN1_CONTEXT_SPECIFIC); \
-                        f(a,&p); \
-                        }
-
-#define M_ASN1_I2D_put_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        }
-
-#define M_ASN1_I2D_put_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SEQUENCE); \
-                        }
-
-#define M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET_OF_##type(a,&p,f,tag,V_ASN1_UNIVERSAL, \
-                                               IS_SEQUENCE); \
-                        }
-
-#define M_ASN1_I2D_seq_total() \
-                r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE); \
-                if (pp == NULL) return(r); \
-                p= *pp; \
-                ASN1_put_object(&p,1,ret,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-#define M_ASN1_I2D_INF_seq_start(tag,ctx) \
-                *(p++)=(V_ASN1_CONSTRUCTED|(tag)|(ctx)); \
-                *(p++)=0x80
-
-#define M_ASN1_I2D_INF_seq_end() *(p++)=0x00; *(p++)=0x00
-
-#define M_ASN1_I2D_finish()     *pp=p; \
-                                return(r);
-
-int asn1_GetSequence(ASN1_CTX *c, long *length);
-void asn1_add_error(unsigned char *address,int offset);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
deleted file mode 100644
index 86886606ef..0000000000
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* crypto/asn1/asn1_par.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 <openssl/buffer.h>
-#include <openssl/objects.h>
-#include <openssl/asn1.h>
-
-static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed,
-        int indent);
-static int asn1_parse2(BIO *bp, unsigned char **pp, long length,
-        int offset, int depth, int indent);
-static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed,
-             int indent)
-        {
-        static const char fmt[]="%-18s";
-        static const char fmt2[]="%2d %-15s";
-        char str[128];
-        const char *p,*p2=NULL;
-
-        if (constructed & V_ASN1_CONSTRUCTED)
-                p="cons: ";
-        else
-                p="prim: ";
-        if (BIO_write(bp,p,6) < 6) goto err;
-        if (indent)
-                {
-                if (indent > 128) indent=128;
-                memset(str,' ',indent);
-                if (BIO_write(bp,str,indent) < indent) goto err;
-                }
-
-        p=str;
-        if ((xclass & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-                sprintf(str,"priv [ %d ] ",tag);
-        else if ((xclass & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-                sprintf(str,"cont [ %d ]",tag);
-        else if ((xclass & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-                sprintf(str,"appl [ %d ]",tag);
-        else if ((tag == V_ASN1_EOC) /* && (xclass == V_ASN1_UNIVERSAL) */)
-                p="EOC";
-        else if (tag == V_ASN1_BOOLEAN)
-                p="BOOLEAN";
-        else if (tag == V_ASN1_INTEGER)
-                p="INTEGER";
-        else if (tag == V_ASN1_ENUMERATED)
-                p="ENUMERATED";
-        else if (tag == V_ASN1_BIT_STRING)
-                p="BIT STRING";
-        else if (tag == V_ASN1_OCTET_STRING)
-                p="OCTET STRING";
-        else if (tag == V_ASN1_NULL)
-                p="NULL";
-        else if (tag == V_ASN1_OBJECT)
-                p="OBJECT";
-        else if (tag == V_ASN1_SEQUENCE)
-                p="SEQUENCE";
-        else if (tag == V_ASN1_SET)
-                p="SET";
-        else if (tag == V_ASN1_PRINTABLESTRING)
-                p="PRINTABLESTRING";
-        else if (tag == V_ASN1_T61STRING)
-                p="T61STRING";
-        else if (tag == V_ASN1_IA5STRING)
-                p="IA5STRING";
-        else if (tag == V_ASN1_UTCTIME)
-                p="UTCTIME";
-
-        /* extras */
-        else if (tag == V_ASN1_NUMERICSTRING)
-                p="NUMERICSTRING";
-        else if (tag == V_ASN1_VIDEOTEXSTRING)
-                p="VIDEOTEXSTRING";
-        else if (tag == V_ASN1_GENERALIZEDTIME)
-                p="GENERALIZEDTIME";
-        else if (tag == V_ASN1_GRAPHICSTRING)
-                p="GRAPHICSTRING";
-        else if (tag == V_ASN1_VISIBLESTRING)
-                p="VISIBLESTRING";
-        else if (tag == V_ASN1_GENERALSTRING)
-                p="GENERALSTRING";
-        else if (tag == V_ASN1_UNIVERSALSTRING)
-                p="UNIVERSALSTRING";
-        else if (tag == V_ASN1_BMPSTRING)
-                p="BMPSTRING";
-        else
-                p2="(unknown)";
-                
-        if (p2 != NULL)
-                {
-                if (BIO_printf(bp,fmt2,tag,p2) <= 0) goto err;
-                }
-        else
-                {
-                if (BIO_printf(bp,fmt,p) <= 0) goto err;
-                }
-        return(1);
-err:
-        return(0);
-        }
-
-int ASN1_parse(BIO *bp, unsigned char *pp, long len, int indent)
-        {
-        return(asn1_parse2(bp,&pp,len,0,0,indent));
-        }
-
-static int asn1_parse2(BIO *bp, unsigned char **pp, long length, int offset,
-             int depth, int indent)
-        {
-        unsigned char *p,*ep,*tot,*op,*opp;
-        long len;
-        int tag,xclass,ret=0;
-        int nl,hl,j,r;
-        ASN1_OBJECT *o=NULL;
-        ASN1_OCTET_STRING *os=NULL;
-        /* ASN1_BMPSTRING *bmp=NULL;*/
-
-        p= *pp;
-        tot=p+length;
-        op=p-1;
-        while ((p < tot) && (op < p))
-                {
-                op=p;
-                j=ASN1_get_object(&p,&len,&tag,&xclass,length);
-#ifdef LINT
-                j=j;
-#endif
-                if (j & 0x80)
-                        {
-                        if (BIO_write(bp,"Error in encoding\n",18) <= 0)
-                                goto end;
-                        ret=0;
-                        goto end;
-                        }
-                hl=(p-op);
-                length-=hl;
-                /* if j == 0x21 it is a constructed indefinite length object */
-                if (BIO_printf(bp,"%5ld:",(long)offset+(long)(op- *pp))
-                        <= 0) goto end;
-
-                if (j != (V_ASN1_CONSTRUCTED | 1))
-                        {
-                        if (BIO_printf(bp,"d=%-2d hl=%ld l=%4ld ",
-                                depth,(long)hl,len) <= 0)
-                                goto end;
-                        }
-                else
-                        {
-                        if (BIO_printf(bp,"d=%-2d hl=%ld l=inf  ",
-                                depth,(long)hl) <= 0)
-                                goto end;
-                        }
-                if (!asn1_print_info(bp,tag,xclass,j,(indent)?depth:0))
-                        goto end;
-                if (j & V_ASN1_CONSTRUCTED)
-                        {
-                        ep=p+len;
-                        if (BIO_write(bp,"\n",1) <= 0) goto end;
-                        if (len > length)
-                                {
-                                BIO_printf(bp,
-                                        "length is greater than %ld\n",length);
-                                ret=0;
-                                goto end;
-                                }
-                        if ((j == 0x21) && (len == 0))
-                                {
-                                for (;;)
-                                        {
-                                        r=asn1_parse2(bp,&p,(long)(tot-p),
-                                                offset+(p - *pp),depth+1,
-                                                indent);
-                                        if (r == 0) { ret=0; goto end; }
-                                        if ((r == 2) || (p >= tot)) break;
-                                        }
-                                }
-                        else
-                                while (p < ep)
-                                        {
-                                        r=asn1_parse2(bp,&p,(long)len,
-                                                offset+(p - *pp),depth+1,
-                                                indent);
-                                        if (r == 0) { ret=0; goto end; }
-                                        }
-                        }
-                else if (xclass != 0)
-                        {
-                        p+=len;
-                        if (BIO_write(bp,"\n",1) <= 0) goto end;
-                        }
-                else
-                        {
-                        nl=0;
-                        if (    (tag == V_ASN1_PRINTABLESTRING) ||
-                                (tag == V_ASN1_T61STRING) ||
-                                (tag == V_ASN1_IA5STRING) ||
-                                (tag == V_ASN1_VISIBLESTRING) ||
-                                (tag == V_ASN1_UTCTIME) ||
-                                (tag == V_ASN1_GENERALIZEDTIME))
-                                {
-                                if (BIO_write(bp,":",1) <= 0) goto end;
-                                if ((len > 0) &&
-                                        BIO_write(bp,(char *)p,(int)len)
-                                        != (int)len)
-                                        goto end;
-                                }
-                        else if (tag == V_ASN1_OBJECT)
-                                {
-                                opp=op;
-                                if (d2i_ASN1_OBJECT(&o,&opp,len+hl) != NULL)
-                                        {
-                                        if (BIO_write(bp,":",1) <= 0) goto end;
-                                        i2a_ASN1_OBJECT(bp,o);
-                                        }
-                                else
-                                        {
-                                        if (BIO_write(bp,":BAD OBJECT",11) <= 0)
-                                                goto end;
-                                        }
-                                }
-                        else if (tag == V_ASN1_BOOLEAN)
-                                {
-                                int ii;
-
-                                opp=op;
-                                ii=d2i_ASN1_BOOLEAN(NULL,&opp,len+hl);
-                                if (ii < 0)
-                                        {
-                                        if (BIO_write(bp,"Bad boolean\n",12))
-                                                goto end;
-                                        }
-                                BIO_printf(bp,":%d",ii);
-                                }
-                        else if (tag == V_ASN1_BMPSTRING)
-                                {
-                                /* do the BMP thang */
-                                }
-                        else if (tag == V_ASN1_OCTET_STRING)
-                                {
-                                int i,printable=1;
-
-                                opp=op;
-                                os=d2i_ASN1_OCTET_STRING(NULL,&opp,len+hl);
-                                if (os != NULL)
-                                        {
-                                        opp=os->data;
-                                        for (i=0; i<os->length; i++)
-                                                {
-                                                if ((   (opp[i] < ' ') &&
-                                                        (opp[i] != '\n') &&
-                                                        (opp[i] != '\r') &&
-                                                        (opp[i] != '\t')) ||
-                                                        (opp[i] > '~'))
-                                                        {
-                                                        printable=0;
-                                                        break;
-                                                        }
-                                                }
-                                        if (printable && (os->length > 0))
-                                                {
-                                                if (BIO_write(bp,":",1) <= 0)
-                                                        goto end;
-                                                if (BIO_write(bp,(char *)opp,
-                                                        os->length) <= 0)
-                                                        goto end;
-                                                }
-                                        ASN1_OCTET_STRING_free(os);
-                                        os=NULL;
-                                        }
-                                }
-                        else if (tag == V_ASN1_INTEGER)
-                                {
-                                ASN1_INTEGER *bs;
-                                int i;
-
-                                opp=op;
-                                bs=d2i_ASN1_INTEGER(NULL,&opp,len+hl);
-                                if (bs != NULL)
-                                        {
-                                        if (BIO_write(bp,":",1) <= 0) goto end;
-                                        if (bs->type == V_ASN1_NEG_INTEGER)
-                                                if (BIO_write(bp,"-",1) <= 0)
-                                                        goto end;
-                                        for (i=0; i<bs->length; i++)
-                                                {
-                                                if (BIO_printf(bp,"%02X",
-                                                        bs->data[i]) <= 0)
-                                                        goto end;
-                                                }
-                                        if (bs->length == 0)
-                                                {
-                                                if (BIO_write(bp,"00",2) <= 0)
-                                                        goto end;
-                                                }
-                                        }
-                                else
-                                        {
-                                        if (BIO_write(bp,"BAD INTEGER",11) <= 0)
-                                                goto end;
-                                        }
-                                ASN1_INTEGER_free(bs);
-                                }
-                        else if (tag == V_ASN1_ENUMERATED)
-                                {
-                                ASN1_ENUMERATED *bs;
-                                int i;
-
-                                opp=op;
-                                bs=d2i_ASN1_ENUMERATED(NULL,&opp,len+hl);
-                                if (bs != NULL)
-                                        {
-                                        if (BIO_write(bp,":",1) <= 0) goto end;
-                                        if (bs->type == V_ASN1_NEG_ENUMERATED)
-                                                if (BIO_write(bp,"-",1) <= 0)
-                                                        goto end;
-                                        for (i=0; i<bs->length; i++)
-                                                {
-                                                if (BIO_printf(bp,"%02X",
-                                                        bs->data[i]) <= 0)
-                                                        goto end;
-                                                }
-                                        if (bs->length == 0)
-                                                {
-                                                if (BIO_write(bp,"00",2) <= 0)
-                                                        goto end;
-                                                }
-                                        }
-                                else
-                                        {
-                                        if (BIO_write(bp,"BAD ENUMERATED",11) <= 0)
-                                                goto end;
-                                        }
-                                ASN1_ENUMERATED_free(bs);
-                                }
-
-                        if (!nl) 
-                                {
-                                if (BIO_write(bp,"\n",1) <= 0) goto end;
-                                }
-                        p+=len;
-                        if ((tag == V_ASN1_EOC) && (xclass == 0))
-                                {
-                                ret=2; /* End of sequence */
-                                goto end;
-                                }
-                        }
-                length-=len;
-                }
-        ret=1;
-end:
-        if (o != NULL) ASN1_OBJECT_free(o);
-        if (os != NULL) ASN1_OCTET_STRING_free(os);
-        *pp=p;
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/asn1/asn_pack.c b/src/lib/libcrypto/asn1/asn_pack.c
deleted file mode 100644
index 662a2626a1..0000000000
--- a/src/lib/libcrypto/asn1/asn_pack.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* asn_pack.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-
-/* ASN1 packing and unpacking functions */
-
-/* Turn an ASN1 encoded SEQUENCE OF into a STACK of structures */
-
-STACK *ASN1_seq_unpack(unsigned char *buf, int len, char *(*d2i)(),
-             void (*free_func)())
-{
-    STACK *sk;
-    unsigned char *pbuf;
-    pbuf =  buf;
-    if (!(sk = d2i_ASN1_SET(NULL, &pbuf, len, d2i, free_func,
-                                        V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL)))
-                 ASN1err(ASN1_F_ASN1_SEQ_UNPACK,ASN1_R_DECODE_ERROR);
-    return sk;
-}
-
-/* Turn a STACK structures into an ASN1 encoded SEQUENCE OF structure in a
- * Malloc'ed buffer
- */
-
-unsigned char *ASN1_seq_pack(STACK *safes, int (*i2d)(), unsigned char **buf,
-             int *len)
-{
-        int safelen;
-        unsigned char *safe, *p;
-        if (!(safelen = i2d_ASN1_SET(safes, NULL, i2d, V_ASN1_SEQUENCE,
-                                              V_ASN1_UNIVERSAL, IS_SEQUENCE))) {
-                ASN1err(ASN1_F_ASN1_SEQ_PACK,ASN1_R_ENCODE_ERROR);
-                return NULL;
-        }
-        if (!(safe = Malloc (safelen))) {
-                ASN1err(ASN1_F_ASN1_SEQ_PACK,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        p = safe;
-        i2d_ASN1_SET(safes, &p, i2d, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL,
-                                                                 IS_SEQUENCE);
-        if (len) *len = safelen;
-        if (buf) *buf = safe;
-        return safe;
-}
-
-/* Extract an ASN1 object from an ASN1_STRING */
-
-void *ASN1_unpack_string (ASN1_STRING *oct, char *(*d2i)())
-{
-        unsigned char *p;
-        char *ret;
-
-        p = oct->data;
-        if(!(ret = d2i(NULL, &p, oct->length)))
-                ASN1err(ASN1_F_ASN1_UNPACK_STRING,ASN1_R_DECODE_ERROR);
-        return ret;
-}
-
-/* Pack an ASN1 object into an ASN1_STRING */
-
-ASN1_STRING *ASN1_pack_string (void *obj, int (*i2d)(), ASN1_STRING **oct)
-{
-        unsigned char *p;
-        ASN1_STRING *octmp;
-
-        if (!oct || !*oct) {
-                if (!(octmp = ASN1_STRING_new ())) {
-                        ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE);
-                        return NULL;
-                }
-                if (oct) *oct = octmp;
-        } else octmp = *oct;
-                
-        if (!(octmp->length = i2d(obj, NULL))) {
-                ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR);
-                return NULL;
-        }
-        if (!(p = Malloc (octmp->length))) {
-                ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        octmp->data = p;
-        i2d (obj, &p);
-        return octmp;
-}
-
diff --git a/src/lib/libcrypto/asn1/d2i_pr.c b/src/lib/libcrypto/asn1/d2i_pr.c
deleted file mode 100644
index f3d1aa6240..0000000000
--- a/src/lib/libcrypto/asn1/d2i_pr.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/asn1/d2i_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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/asn1.h>
-
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp,
-             long length)
-        {
-        EVP_PKEY *ret;
-
-        if ((a == NULL) || (*a == NULL))
-                {
-                if ((ret=EVP_PKEY_new()) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_EVP_LIB);
-                        return(NULL);
-                        }
-                }
-        else    ret= *a;
-
-        ret->save_type=type;
-        ret->type=EVP_PKEY_type(type);
-        switch (ret->type)
-                {
-#ifndef NO_RSA
-        case EVP_PKEY_RSA:
-                if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,pp,length)) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                break;
-#endif
-#ifndef NO_DSA
-        case EVP_PKEY_DSA:
-                if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,pp,length)) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                break;
-#endif
-        default:
-                ASN1err(ASN1_F_D2I_PRIVATEKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
-                goto err;
-                /* break; */
-                }
-        if (a != NULL) (*a)=ret;
-        return(ret);
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) EVP_PKEY_free(ret);
-        return(NULL);
-        }
-
diff --git a/src/lib/libcrypto/asn1/d2i_pu.c b/src/lib/libcrypto/asn1/d2i_pu.c
deleted file mode 100644
index e0d203cef7..0000000000
--- a/src/lib/libcrypto/asn1/d2i_pu.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/asn1/d2i_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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/asn1.h>
-
-EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp,
-             long length)
-        {
-        EVP_PKEY *ret;
-
-        if ((a == NULL) || (*a == NULL))
-                {
-                if ((ret=EVP_PKEY_new()) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_EVP_LIB);
-                        return(NULL);
-                        }
-                }
-        else    ret= *a;
-
-        ret->save_type=type;
-        ret->type=EVP_PKEY_type(type);
-        switch (ret->type)
-                {
-#ifndef NO_RSA
-        case EVP_PKEY_RSA:
-                if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,pp,length)) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                break;
-#endif
-#ifndef NO_DSA
-        case EVP_PKEY_DSA:
-                if ((ret->pkey.dsa=d2i_DSAPublicKey(NULL,pp,length)) == NULL)
-                        {
-                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                break;
-#endif
-        default:
-                ASN1err(ASN1_F_D2I_PUBLICKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
-                goto err;
-                /* break; */
-                }
-        if (a != NULL) (*a)=ret;
-        return(ret);
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) EVP_PKEY_free(ret);
-        return(NULL);
-        }
-
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
deleted file mode 100644
index 41ced49c19..0000000000
--- a/src/lib/libcrypto/asn1/evp_asn1.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* crypto/asn1/evp_asn1.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 <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
-        {
-        ASN1_STRING *os;
-
-        if ((os=ASN1_OCTET_STRING_new()) == NULL) return(0);
-        if (!ASN1_OCTET_STRING_set(os,data,len)) return(0);
-        ASN1_TYPE_set(a,V_ASN1_OCTET_STRING,os);
-        return(1);
-        }
-
-/* int max_len:  for returned value    */
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data,
-             int max_len)
-        {
-        int ret,num;
-        unsigned char *p;
-
-        if ((a->type != V_ASN1_OCTET_STRING) || (a->value.octet_string == NULL))
-                {
-                ASN1err(ASN1_F_ASN1_TYPE_GET_OCTETSTRING,ASN1_R_DATA_IS_WRONG);
-                return(-1);
-                }
-        p=ASN1_STRING_data(a->value.octet_string);
-        ret=ASN1_STRING_length(a->value.octet_string);
-        if (ret < max_len)
-                num=ret;
-        else
-                num=max_len;
-        memcpy(data,p,num);
-        return(ret);
-        }
-
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
-             int len)
-        {
-        int n,size;
-        ASN1_OCTET_STRING os,*osp;
-        ASN1_INTEGER in;
-        unsigned char *p;
-        unsigned char buf[32]; /* when they have 256bit longs, 
-                                * I'll be in trouble */
-        in.data=buf;
-        in.length=32;
-        os.data=data;
-        os.type=V_ASN1_OCTET_STRING;
-        os.length=len;
-        ASN1_INTEGER_set(&in,num);
-        n =  i2d_ASN1_INTEGER(&in,NULL);
-        n+=M_i2d_ASN1_OCTET_STRING(&os,NULL);
-
-        size=ASN1_object_size(1,n,V_ASN1_SEQUENCE);
-
-        if ((osp=ASN1_STRING_new()) == NULL) return(0);
-        /* Grow the 'string' */
-        ASN1_STRING_set(osp,NULL,size);
-
-        ASN1_STRING_length(osp)=size;
-        p=ASN1_STRING_data(osp);
-
-        ASN1_put_object(&p,1,n,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-          i2d_ASN1_INTEGER(&in,&p);
-        M_i2d_ASN1_OCTET_STRING(&os,&p);
-
-        ASN1_TYPE_set(a,V_ASN1_SEQUENCE,osp);
-        return(1);
-        }
-
-/* we return the actual length..., num may be missing, in which
- * case, set it to zero */
-/* int max_len:  for returned value    */
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num, unsigned char *data,
-             int max_len)
-        {
-        int ret= -1,n;
-        ASN1_INTEGER *ai=NULL;
-        ASN1_OCTET_STRING *os=NULL;
-        unsigned char *p;
-        long length;
-        ASN1_CTX c;
-
-        if ((a->type != V_ASN1_SEQUENCE) || (a->value.sequence == NULL))
-                {
-                goto err;
-                }
-        p=ASN1_STRING_data(a->value.sequence);
-        length=ASN1_STRING_length(a->value.sequence);
-
-        c.pp= &p;
-        c.p=p;
-        c.max=p+length;
-        c.error=ASN1_R_DATA_IS_WRONG;
-
-        M_ASN1_D2I_start_sequence();
-        c.q=c.p;
-        if ((ai=d2i_ASN1_INTEGER(NULL,&c.p,c.slen)) == NULL) goto err;
-        c.slen-=(c.p-c.q);
-        c.q=c.p;
-        if ((os=d2i_ASN1_OCTET_STRING(NULL,&c.p,c.slen)) == NULL) goto err;
-        c.slen-=(c.p-c.q);
-        if (!M_ASN1_D2I_end_sequence()) goto err;
-
-        if (num != NULL)
-                *num=ASN1_INTEGER_get(ai);
-
-        ret=ASN1_STRING_length(os);
-        if (max_len > ret)
-                n=ret;
-        else
-                n=max_len;
-
-        if (data != NULL)
-                memcpy(data,ASN1_STRING_data(os),n);
-        if (0)
-                {
-err:
-                ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING,ASN1_R_DATA_IS_WRONG);
-                }
-        if (os != NULL) ASN1_OCTET_STRING_free(os);
-        if (ai != NULL) ASN1_INTEGER_free(ai);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/f_enum.c b/src/lib/libcrypto/asn1/f_enum.c
deleted file mode 100644
index 3bcceecdb8..0000000000
--- a/src/lib/libcrypto/asn1/f_enum.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* crypto/asn1/f_enum.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 <openssl/buffer.h>
-#include <openssl/asn1.h>
-
-/* Based on a_int.c: equivalent ENUMERATED functions */
-
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a)
-        {
-        int i,n=0;
-        static const char *h="0123456789ABCDEF";
-        char buf[2];
-
-        if (a == NULL) return(0);
-
-        if (a->length == 0)
-                {
-                if (BIO_write(bp,"00",2) != 2) goto err;
-                n=2;
-                }
-        else
-                {
-                for (i=0; i<a->length; i++)
-                        {
-                        if ((i != 0) && (i%35 == 0))
-                                {
-                                if (BIO_write(bp,"\\\n",2) != 2) goto err;
-                                n+=2;
-                                }
-                        buf[0]=h[((unsigned char)a->data[i]>>4)&0x0f];
-                        buf[1]=h[((unsigned char)a->data[i]   )&0x0f];
-                        if (BIO_write(bp,buf,2) != 2) goto err;
-                        n+=2;
-                        }
-                }
-        return(n);
-err:
-        return(-1);
-        }
-
-int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
-        {
-        int ret=0;
-        int i,j,k,m,n,again,bufsize;
-        unsigned char *s=NULL,*sp;
-        unsigned char *bufp;
-        int num=0,slen=0,first=1;
-
-        bs->type=V_ASN1_ENUMERATED;
-
-        bufsize=BIO_gets(bp,buf,size);
-        for (;;)
-                {
-                if (bufsize < 1) goto err_sl;
-                i=bufsize;
-                if (buf[i-1] == '\n') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                if (buf[i-1] == '\r') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                again=(buf[i-1] == '\\');
-
-                for (j=0; j<i; j++)
-                        {
-                        if (!(  ((buf[j] >= '0') && (buf[j] <= '9')) ||
-                                ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
-                                ((buf[j] >= 'A') && (buf[j] <= 'F'))))
-                                {
-                                i=j;
-                                break;
-                                }
-                        }
-                buf[i]='\0';
-                /* We have now cleared all the crap off the end of the
-                 * line */
-                if (i < 2) goto err_sl;
-
-                bufp=(unsigned char *)buf;
-                if (first)
-                        {
-                        first=0;
-                        if ((bufp[0] == '0') && (buf[1] == '0'))
-                                {
-                                bufp+=2;
-                                i-=2;
-                                }
-                        }
-                k=0;
-                i-=again;
-                if (i%2 != 0)
-                        {
-                        ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_ODD_NUMBER_OF_CHARS);
-                        goto err;
-                        }
-                i/=2;
-                if (num+i > slen)
-                        {
-                        if (s == NULL)
-                                sp=(unsigned char *)Malloc(
-                                        (unsigned int)num+i*2);
-                        else
-                                sp=(unsigned char *)Realloc(s,
-                                        (unsigned int)num+i*2);
-                        if (sp == NULL)
-                                {
-                                ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
-                                if (s != NULL) Free((char *)s);
-                                goto err;
-                                }
-                        s=sp;
-                        slen=num+i*2;
-                        }
-                for (j=0; j<i; j++,k+=2)
-                        {
-                        for (n=0; n<2; n++)
-                                {
-                                m=bufp[k+n];
-                                if ((m >= '0') && (m <= '9'))
-                                        m-='0';
-                                else if ((m >= 'a') && (m <= 'f'))
-                                        m=m-'a'+10;
-                                else if ((m >= 'A') && (m <= 'F'))
-                                        m=m-'A'+10;
-                                else
-                                        {
-                                        ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_NON_HEX_CHARACTERS);
-                                        goto err;
-                                        }
-                                s[num+j]<<=4;
-                                s[num+j]|=m;
-                                }
-                        }
-                num+=i;
-                if (again)
-                        bufsize=BIO_gets(bp,buf,size);
-                else
-                        break;
-                }
-        bs->length=num;
-        bs->data=s;
-        ret=1;
-err:
-        if (0)
-                {
-err_sl:
-                ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ASN1_R_SHORT_LINE);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/f_int.c b/src/lib/libcrypto/asn1/f_int.c
deleted file mode 100644
index 55560dd814..0000000000
--- a/src/lib/libcrypto/asn1/f_int.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* crypto/asn1/f_int.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 <openssl/buffer.h>
-#include <openssl/asn1.h>
-
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a)
-        {
-        int i,n=0;
-        static const char *h="0123456789ABCDEF";
-        char buf[2];
-
-        if (a == NULL) return(0);
-
-        if (a->length == 0)
-                {
-                if (BIO_write(bp,"00",2) != 2) goto err;
-                n=2;
-                }
-        else
-                {
-                for (i=0; i<a->length; i++)
-                        {
-                        if ((i != 0) && (i%35 == 0))
-                                {
-                                if (BIO_write(bp,"\\\n",2) != 2) goto err;
-                                n+=2;
-                                }
-                        buf[0]=h[((unsigned char)a->data[i]>>4)&0x0f];
-                        buf[1]=h[((unsigned char)a->data[i]   )&0x0f];
-                        if (BIO_write(bp,buf,2) != 2) goto err;
-                        n+=2;
-                        }
-                }
-        return(n);
-err:
-        return(-1);
-        }
-
-int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
-        {
-        int ret=0;
-        int i,j,k,m,n,again,bufsize;
-        unsigned char *s=NULL,*sp;
-        unsigned char *bufp;
-        int num=0,slen=0,first=1;
-
-        bs->type=V_ASN1_INTEGER;
-
-        bufsize=BIO_gets(bp,buf,size);
-        for (;;)
-                {
-                if (bufsize < 1) goto err_sl;
-                i=bufsize;
-                if (buf[i-1] == '\n') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                if (buf[i-1] == '\r') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                again=(buf[i-1] == '\\');
-
-                for (j=0; j<i; j++)
-                        {
-#ifndef CHARSET_EBCDIC
-                        if (!(  ((buf[j] >= '0') && (buf[j] <= '9')) ||
-                                ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
-                                ((buf[j] >= 'A') && (buf[j] <= 'F'))))
-#else
-                        /* This #ifdef is not strictly necessary, since
-                         * the characters A...F a...f 0...9 are contiguous
-                         * (yes, even in EBCDIC - but not the whole alphabet).
-                         * Nevertheless, isxdigit() is faster.
-                         */
-                        if (!isxdigit(buf[j]))
-#endif
-                                {
-                                i=j;
-                                break;
-                                }
-                        }
-                buf[i]='\0';
-                /* We have now cleared all the crap off the end of the
-                 * line */
-                if (i < 2) goto err_sl;
-
-                bufp=(unsigned char *)buf;
-                if (first)
-                        {
-                        first=0;
-                        if ((bufp[0] == '0') && (buf[1] == '0'))
-                                {
-                                bufp+=2;
-                                i-=2;
-                                }
-                        }
-                k=0;
-                i-=again;
-                if (i%2 != 0)
-                        {
-                        ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_ODD_NUMBER_OF_CHARS);
-                        goto err;
-                        }
-                i/=2;
-                if (num+i > slen)
-                        {
-                        if (s == NULL)
-                                sp=(unsigned char *)Malloc(
-                                        (unsigned int)num+i*2);
-                        else
-                                sp=(unsigned char *)Realloc(s,
-                                        (unsigned int)num+i*2);
-                        if (sp == NULL)
-                                {
-                                ASN1err(ASN1_F_A2I_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
-                                if (s != NULL) Free((char *)s);
-                                goto err;
-                                }
-                        s=sp;
-                        slen=num+i*2;
-                        }
-                for (j=0; j<i; j++,k+=2)
-                        {
-                        for (n=0; n<2; n++)
-                                {
-                                m=bufp[k+n];
-                                if ((m >= '0') && (m <= '9'))
-                                        m-='0';
-                                else if ((m >= 'a') && (m <= 'f'))
-                                        m=m-'a'+10;
-                                else if ((m >= 'A') && (m <= 'F'))
-                                        m=m-'A'+10;
-                                else
-                                        {
-                                        ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_NON_HEX_CHARACTERS);
-                                        goto err;
-                                        }
-                                s[num+j]<<=4;
-                                s[num+j]|=m;
-                                }
-                        }
-                num+=i;
-                if (again)
-                        bufsize=BIO_gets(bp,buf,size);
-                else
-                        break;
-                }
-        bs->length=num;
-        bs->data=s;
-        ret=1;
-err:
-        if (0)
-                {
-err_sl:
-                ASN1err(ASN1_F_A2I_ASN1_INTEGER,ASN1_R_SHORT_LINE);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/f_string.c b/src/lib/libcrypto/asn1/f_string.c
deleted file mode 100644
index 5d0cf5a46d..0000000000
--- a/src/lib/libcrypto/asn1/f_string.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* crypto/asn1/f_string.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 <openssl/buffer.h>
-#include <openssl/asn1.h>
-
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
-        {
-        int i,n=0;
-        static const char *h="0123456789ABCDEF";
-        char buf[2];
-
-        if (a == NULL) return(0);
-
-        if (a->length == 0)
-                {
-                if (BIO_write(bp,"0",1) != 1) goto err;
-                n=1;
-                }
-        else
-                {
-                for (i=0; i<a->length; i++)
-                        {
-                        if ((i != 0) && (i%35 == 0))
-                                {
-                                if (BIO_write(bp,"\\\n",2) != 2) goto err;
-                                n+=2;
-                                }
-                        buf[0]=h[((unsigned char)a->data[i]>>4)&0x0f];
-                        buf[1]=h[((unsigned char)a->data[i]   )&0x0f];
-                        if (BIO_write(bp,buf,2) != 2) goto err;
-                        n+=2;
-                        }
-                }
-        return(n);
-err:
-        return(-1);
-        }
-
-int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
-        {
-        int ret=0;
-        int i,j,k,m,n,again,bufsize;
-        unsigned char *s=NULL,*sp;
-        unsigned char *bufp;
-        int num=0,slen=0,first=1;
-
-        bufsize=BIO_gets(bp,buf,size);
-        for (;;)
-                {
-                if (bufsize < 1)
-                        {
-                        if (first)
-                                break;
-                        else
-                                goto err_sl;
-                        }
-                first=0;
-
-                i=bufsize;
-                if (buf[i-1] == '\n') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                if (buf[i-1] == '\r') buf[--i]='\0';
-                if (i == 0) goto err_sl;
-                again=(buf[i-1] == '\\');
-
-                for (j=i-1; j>0; j--)
-                        {
-#ifndef CHARSET_EBCDIC
-                        if (!(  ((buf[j] >= '0') && (buf[j] <= '9')) ||
-                                ((buf[j] >= 'a') && (buf[j] <= 'f')) ||
-                                ((buf[j] >= 'A') && (buf[j] <= 'F'))))
-#else
-                        /* This #ifdef is not strictly necessary, since
-                         * the characters A...F a...f 0...9 are contiguous
-                         * (yes, even in EBCDIC - but not the whole alphabet).
-                         * Nevertheless, isxdigit() is faster.
-                         */
-                        if (!isxdigit(buf[j]))
-#endif
-                                {
-                                i=j;
-                                break;
-                                }
-                        }
-                buf[i]='\0';
-                /* We have now cleared all the crap off the end of the
-                 * line */
-                if (i < 2) goto err_sl;
-
-                bufp=(unsigned char *)buf;
-
-                k=0;
-                i-=again;
-                if (i%2 != 0)
-                        {
-                        ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_ODD_NUMBER_OF_CHARS);
-                        goto err;
-                        }
-                i/=2;
-                if (num+i > slen)
-                        {
-                        if (s == NULL)
-                                sp=(unsigned char *)Malloc(
-                                        (unsigned int)num+i*2);
-                        else
-                                sp=(unsigned char *)Realloc(s,
-                                        (unsigned int)num+i*2);
-                        if (sp == NULL)
-                                {
-                                ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
-                                if (s != NULL) Free((char *)s);
-                                goto err;
-                                }
-                        s=sp;
-                        slen=num+i*2;
-                        }
-                for (j=0; j<i; j++,k+=2)
-                        {
-                        for (n=0; n<2; n++)
-                                {
-                                m=bufp[k+n];
-                                if ((m >= '0') && (m <= '9'))
-                                        m-='0';
-                                else if ((m >= 'a') && (m <= 'f'))
-                                        m=m-'a'+10;
-                                else if ((m >= 'A') && (m <= 'F'))
-                                        m=m-'A'+10;
-                                else
-                                        {
-                                        ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_NON_HEX_CHARACTERS);
-                                        goto err;
-                                        }
-                                s[num+j]<<=4;
-                                s[num+j]|=m;
-                                }
-                        }
-                num+=i;
-                if (again)
-                        bufsize=BIO_gets(bp,buf,size);
-                else
-                        break;
-                }
-        bs->length=num;
-        bs->data=s;
-        ret=1;
-err:
-        if (0)
-                {
-err_sl:
-                ASN1err(ASN1_F_A2I_ASN1_STRING,ASN1_R_SHORT_LINE);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/i2d_pr.c b/src/lib/libcrypto/asn1/i2d_pr.c
deleted file mode 100644
index 71d6910204..0000000000
--- a/src/lib/libcrypto/asn1/i2d_pr.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* crypto/asn1/i2d_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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-
-int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
-        {
-#ifndef NO_RSA
-        if (a->type == EVP_PKEY_RSA)
-                {
-                return(i2d_RSAPrivateKey(a->pkey.rsa,pp));
-                }
-        else
-#endif
-#ifndef NO_DSA
-        if (a->type == EVP_PKEY_DSA)
-                {
-                return(i2d_DSAPrivateKey(a->pkey.dsa,pp));
-                }
-#endif
-
-        ASN1err(ASN1_F_I2D_PRIVATEKEY,ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-        return(-1);
-        }
-
diff --git a/src/lib/libcrypto/asn1/i2d_pu.c b/src/lib/libcrypto/asn1/i2d_pu.c
deleted file mode 100644
index 8f73d37d03..0000000000
--- a/src/lib/libcrypto/asn1/i2d_pu.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* crypto/asn1/i2d_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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-
-int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
-        {
-        switch (a->type)
-                {
-#ifndef NO_RSA
-        case EVP_PKEY_RSA:
-                return(i2d_RSAPublicKey(a->pkey.rsa,pp));
-#endif
-#ifndef NO_DSA
-        case EVP_PKEY_DSA:
-                return(i2d_DSAPublicKey(a->pkey.dsa,pp));
-#endif
-        default:
-                ASN1err(ASN1_F_I2D_PUBLICKEY,ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-                return(-1);
-                }
-        }
-
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
deleted file mode 100644
index cdc0d8b7c4..0000000000
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* crypto/asn1/n_pkey.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_RSA
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/rsa.h>
-#include <openssl/objects.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-
-#ifndef NO_RC4
-
-typedef struct netscape_pkey_st
-        {
-        ASN1_INTEGER *version;
-        X509_ALGOR *algor;
-        ASN1_OCTET_STRING *private_key;
-        } NETSCAPE_PKEY;
-
-static int i2d_NETSCAPE_PKEY(NETSCAPE_PKEY *a, unsigned char **pp);
-static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a,unsigned char **pp, long length);
-static NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
-static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *);
-
-int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)())
-        {
-        int i,j,l[6];
-        NETSCAPE_PKEY *pkey;
-        unsigned char buf[256],*zz;
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        EVP_CIPHER_CTX ctx;
-        X509_ALGOR *alg=NULL;
-        ASN1_OCTET_STRING os,os2;
-        M_ASN1_I2D_vars(a);
-
-        if (a == NULL) return(0);
-
-#ifdef WIN32
-        r=r; /* shut the damn compiler up :-) */
-#endif
-
-        os.data=os2.data=NULL;
-        if ((pkey=NETSCAPE_PKEY_new()) == NULL) goto err;
-        if (!ASN1_INTEGER_set(pkey->version,0)) goto err;
-
-        if (pkey->algor->algorithm != NULL)
-                ASN1_OBJECT_free(pkey->algor->algorithm);
-        pkey->algor->algorithm=OBJ_nid2obj(NID_rsaEncryption);
-        if ((pkey->algor->parameter=ASN1_TYPE_new()) == NULL) goto err;
-        pkey->algor->parameter->type=V_ASN1_NULL;
-
-        l[0]=i2d_RSAPrivateKey(a,NULL);
-        pkey->private_key->length=l[0];
-
-        os2.length=i2d_NETSCAPE_PKEY(pkey,NULL);
-        l[1]=i2d_ASN1_OCTET_STRING(&os2,NULL);
-
-        if ((alg=X509_ALGOR_new()) == NULL) goto err;
-        if (alg->algorithm != NULL)
-                ASN1_OBJECT_free(alg->algorithm);
-        alg->algorithm=OBJ_nid2obj(NID_rc4);
-        if ((alg->parameter=ASN1_TYPE_new()) == NULL) goto err;
-        alg->parameter->type=V_ASN1_NULL;
-
-        l[2]=i2d_X509_ALGOR(alg,NULL);
-        l[3]=ASN1_object_size(1,l[2]+l[1],V_ASN1_SEQUENCE);
-
-#ifndef CONST_STRICT
-        os.data=(unsigned char *)"private-key";
-#endif
-        os.length=11;
-        l[4]=i2d_ASN1_OCTET_STRING(&os,NULL);
-
-        l[5]=ASN1_object_size(1,l[4]+l[3],V_ASN1_SEQUENCE);
-
-        if (pp == NULL)
-                {
-                if (pkey != NULL) NETSCAPE_PKEY_free(pkey);
-                if (alg != NULL) X509_ALGOR_free(alg);
-                return(l[5]);
-                }
-
-        if (pkey->private_key->data != NULL)
-                Free((char *)pkey->private_key->data);
-        if ((pkey->private_key->data=(unsigned char *)Malloc(l[0])) == NULL)
-                {
-                ASN1err(ASN1_F_I2D_NETSCAPE_RSA,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        zz=pkey->private_key->data;
-        i2d_RSAPrivateKey(a,&zz);
-
-        if ((os2.data=(unsigned char *)Malloc(os2.length)) == NULL)
-                {
-                ASN1err(ASN1_F_I2D_NETSCAPE_RSA,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        zz=os2.data;
-        i2d_NETSCAPE_PKEY(pkey,&zz);
-                
-        if (cb == NULL)
-                cb=EVP_read_pw_string;
-        i=cb(buf,256,"Enter Private Key password:",1);
-        if (i != 0)
-                {
-                ASN1err(ASN1_F_I2D_NETSCAPE_RSA,ASN1_R_BAD_PASSWORD_READ);
-                goto err;
-                }
-        EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,
-                strlen((char *)buf),1,key,NULL);
-        memset(buf,0,256);
-
-        EVP_CIPHER_CTX_init(&ctx);
-        EVP_EncryptInit(&ctx,EVP_rc4(),key,NULL);
-        EVP_EncryptUpdate(&ctx,os2.data,&i,os2.data,os2.length);
-        EVP_EncryptFinal(&ctx,&(os2.data[i]),&j);
-        EVP_CIPHER_CTX_cleanup(&ctx);
-
-        p= *pp;
-        ASN1_put_object(&p,1,l[4]+l[3],V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-        i2d_ASN1_OCTET_STRING(&os,&p);
-        ASN1_put_object(&p,1,l[2]+l[1],V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-        i2d_X509_ALGOR(alg,&p);
-        i2d_ASN1_OCTET_STRING(&os2,&p);
-        ret=l[5];
-err:
-        if (os2.data != NULL) Free(os2.data);
-        if (alg != NULL) X509_ALGOR_free(alg);
-        if (pkey != NULL) NETSCAPE_PKEY_free(pkey);
-        r=r;
-        return(ret);
-        }
-
-RSA *d2i_Netscape_RSA(RSA **a, unsigned char **pp, long length, int (*cb)())
-        {
-        RSA *ret=NULL;
-        ASN1_OCTET_STRING *os=NULL;
-        ASN1_CTX c;
-
-        c.pp=pp;
-        c.error=ASN1_R_DECODING_ERROR;
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(os,d2i_ASN1_OCTET_STRING);
-        if ((os->length != 11) || (strncmp("private-key",
-                (char *)os->data,os->length) != 0))
-                {
-                ASN1err(ASN1_F_D2I_NETSCAPE_RSA,ASN1_R_PRIVATE_KEY_HEADER_MISSING);
-                ASN1_BIT_STRING_free(os);
-                goto err;
-                }
-        ASN1_BIT_STRING_free(os);
-        c.q=c.p;
-        if ((ret=d2i_Netscape_RSA_2(a,&c.p,c.slen,cb)) == NULL) goto err;
-        c.slen-=(c.p-c.q);
-
-        M_ASN1_D2I_Finish(a,RSA_free,ASN1_F_D2I_NETSCAPE_RSA);
-        }
-
-RSA *d2i_Netscape_RSA_2(RSA **a, unsigned char **pp, long length,
-             int (*cb)())
-        {
-        NETSCAPE_PKEY *pkey=NULL;
-        RSA *ret=NULL;
-        int i,j;
-        unsigned char buf[256],*zz;
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        EVP_CIPHER_CTX ctx;
-        X509_ALGOR *alg=NULL;
-        ASN1_OCTET_STRING *os=NULL;
-        ASN1_CTX c;
-
-        c.error=ERR_R_NESTED_ASN1_ERROR;
-        c.pp=pp;
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(alg,d2i_X509_ALGOR);
-        if (OBJ_obj2nid(alg->algorithm) != NID_rc4)
-                {
-                ASN1err(ASN1_F_D2I_NETSCAPE_RSA_2,ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM);
-                goto err;
-                }
-        M_ASN1_D2I_get(os,d2i_ASN1_OCTET_STRING);
-        if (cb == NULL)
-                cb=EVP_read_pw_string;
-        i=cb(buf,256,"Enter Private Key password:",0);
-        if (i != 0)
-                {
-                ASN1err(ASN1_F_D2I_NETSCAPE_RSA_2,ASN1_R_BAD_PASSWORD_READ);
-                goto err;
-                }
-
-        EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,
-                strlen((char *)buf),1,key,NULL);
-        memset(buf,0,256);
-
-        EVP_CIPHER_CTX_init(&ctx);
-        EVP_DecryptInit(&ctx,EVP_rc4(),key,NULL);
-        EVP_DecryptUpdate(&ctx,os->data,&i,os->data,os->length);
-        EVP_DecryptFinal(&ctx,&(os->data[i]),&j);
-        EVP_CIPHER_CTX_cleanup(&ctx);
-        os->length=i+j;
-
-        zz=os->data;
-
-        if ((pkey=d2i_NETSCAPE_PKEY(NULL,&zz,os->length)) == NULL)
-                {
-                ASN1err(ASN1_F_D2I_NETSCAPE_RSA_2,ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY);
-                goto err;
-                }
-                
-        zz=pkey->private_key->data;
-        if ((ret=d2i_RSAPrivateKey(a,&zz,pkey->private_key->length)) == NULL)
-                {
-                ASN1err(ASN1_F_D2I_NETSCAPE_RSA_2,ASN1_R_UNABLE_TO_DECODE_RSA_KEY);
-                goto err;
-                }
-        if (!asn1_Finish(&c)) goto err;
-        *pp=c.p;
-err:
-        if (pkey != NULL) NETSCAPE_PKEY_free(pkey);
-        if (os != NULL) ASN1_BIT_STRING_free(os);
-        if (alg != NULL) X509_ALGOR_free(alg);
-        return(ret);
-        }
-
-static int i2d_NETSCAPE_PKEY(NETSCAPE_PKEY *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-
-        M_ASN1_I2D_len(a->version,      i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->private_key,  i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->version,      i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->private_key,  i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,NETSCAPE_PKEY *,NETSCAPE_PKEY_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
-        M_ASN1_D2I_get(ret->algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->private_key,d2i_ASN1_OCTET_STRING);
-        M_ASN1_D2I_Finish(a,NETSCAPE_PKEY_free,ASN1_F_D2I_NETSCAPE_PKEY);
-        }
-
-static NETSCAPE_PKEY *NETSCAPE_PKEY_new(void)
-        {
-        NETSCAPE_PKEY *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,NETSCAPE_PKEY);
-        M_ASN1_New(ret->version,ASN1_INTEGER_new);
-        M_ASN1_New(ret->algor,X509_ALGOR_new);
-        M_ASN1_New(ret->private_key,ASN1_OCTET_STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_NETSCAPE_PKEY_NEW);
-        }
-
-static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a)
-        {
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
-        X509_ALGOR_free(a->algor);
-        ASN1_OCTET_STRING_free(a->private_key);
-        Free((char *)a);
-        }
-
-#endif /* NO_RC4 */
-#endif
diff --git a/src/lib/libcrypto/asn1/nsseq.c b/src/lib/libcrypto/asn1/nsseq.c
deleted file mode 100644
index 417d024b81..0000000000
--- a/src/lib/libcrypto/asn1/nsseq.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* nsseq.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-
-/* Netscape certificate sequence structure */
-
-int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp)
-{
-        int v = 0;
-        M_ASN1_I2D_vars(a);
-        M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
-        M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
-                                             V_ASN1_SEQUENCE,v);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
-        M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
-                                             V_ASN1_SEQUENCE,v);
-
-        M_ASN1_I2D_finish();
-}
-
-NETSCAPE_CERT_SEQUENCE *NETSCAPE_CERT_SEQUENCE_new(void)
-{
-        NETSCAPE_CERT_SEQUENCE *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, NETSCAPE_CERT_SEQUENCE);
-        /* Note hardcoded object type */
-        ret->type = OBJ_nid2obj(NID_netscape_cert_sequence);
-        ret->certs = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_NETSCAPE_CERT_SEQUENCE_NEW);
-}
-
-NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a,
-             unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,NETSCAPE_CERT_SEQUENCE *,
-                                        NETSCAPE_CERT_SEQUENCE_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
-        M_ASN1_D2I_get_EXP_set_opt_type(X509,ret->certs,d2i_X509,X509_free,0,
-                                        V_ASN1_SEQUENCE);
-        M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free,
-                          ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE);
-}
-
-void NETSCAPE_CERT_SEQUENCE_free (NETSCAPE_CERT_SEQUENCE *a)
-{
-        if (a == NULL) return;
-        ASN1_OBJECT_free(a->type);
-        if(a->certs)
-            sk_X509_pop_free(a->certs, X509_free);
-        Free (a);
-}
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c
deleted file mode 100644
index b831836e7b..0000000000
--- a/src/lib/libcrypto/asn1/p5_pbe.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* p5_pbe.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-#include <openssl/rand.h>
-
-/* PKCS#5 password based encryption structure */
-
-int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-        M_ASN1_I2D_len (a->salt, i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len (a->iter, i2d_ASN1_INTEGER);
-
-        M_ASN1_I2D_seq_total ();
-
-        M_ASN1_I2D_put (a->salt, i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_put (a->iter, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_finish();
-}
-
-PBEPARAM *PBEPARAM_new(void)
-{
-        PBEPARAM *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, PBEPARAM);
-        M_ASN1_New(ret->iter,ASN1_INTEGER_new);
-        M_ASN1_New(ret->salt,ASN1_OCTET_STRING_new);
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_PBEPARAM_NEW);
-}
-
-PBEPARAM *d2i_PBEPARAM(PBEPARAM **a, unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,PBEPARAM *,PBEPARAM_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->salt, d2i_ASN1_OCTET_STRING);
-        M_ASN1_D2I_get (ret->iter, d2i_ASN1_INTEGER);
-        M_ASN1_D2I_Finish(a, PBEPARAM_free, ASN1_F_D2I_PBEPARAM);
-}
-
-void PBEPARAM_free (PBEPARAM *a)
-{
-        if(a==NULL) return;
-        ASN1_OCTET_STRING_free(a->salt);
-        ASN1_INTEGER_free (a->iter);
-        Free ((char *)a);
-}
-
-/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
-
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
-             int saltlen)
-{
-        PBEPARAM *pbe;
-        ASN1_OBJECT *al;
-        X509_ALGOR *algor;
-        ASN1_TYPE *astype;
-
-        if (!(pbe = PBEPARAM_new ())) {
-                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
-        ASN1_INTEGER_set (pbe->iter, iter);
-        if (!saltlen) saltlen = PKCS5_SALT_LEN;
-        if (!(pbe->salt->data = Malloc (saltlen))) {
-                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        pbe->salt->length = saltlen;
-        if (salt) memcpy (pbe->salt->data, salt, saltlen);
-        else RAND_bytes (pbe->salt->data, saltlen);
-
-        if (!(astype = ASN1_TYPE_new())) {
-                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        astype->type = V_ASN1_SEQUENCE;
-        if(!ASN1_pack_string(pbe, i2d_PBEPARAM, &astype->value.sequence)) {
-                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        PBEPARAM_free (pbe);
-        
-        al = OBJ_nid2obj(alg); /* never need to free al */
-        if (!(algor = X509_ALGOR_new())) {
-                ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        ASN1_OBJECT_free(algor->algorithm);
-        algor->algorithm = al;
-        algor->parameter = astype;
-
-        return (algor);
-}
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
deleted file mode 100644
index 09f4bf6112..0000000000
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* p5_pbev2.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-#include <openssl/rand.h>
-
-/* PKCS#5 v2.0 password based encryption structures */
-
-int i2d_PBE2PARAM(PBE2PARAM *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-        M_ASN1_I2D_len (a->keyfunc, i2d_X509_ALGOR);
-        M_ASN1_I2D_len (a->encryption, i2d_X509_ALGOR);
-
-        M_ASN1_I2D_seq_total ();
-
-        M_ASN1_I2D_put (a->keyfunc, i2d_X509_ALGOR);
-        M_ASN1_I2D_put (a->encryption, i2d_X509_ALGOR);
-
-        M_ASN1_I2D_finish();
-}
-
-PBE2PARAM *PBE2PARAM_new(void)
-{
-        PBE2PARAM *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, PBE2PARAM);
-        M_ASN1_New(ret->keyfunc,X509_ALGOR_new);
-        M_ASN1_New(ret->encryption,X509_ALGOR_new);
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_PBE2PARAM_NEW);
-}
-
-PBE2PARAM *d2i_PBE2PARAM(PBE2PARAM **a, unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,PBE2PARAM *,PBE2PARAM_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->keyfunc, d2i_X509_ALGOR);
-        M_ASN1_D2I_get (ret->encryption, d2i_X509_ALGOR);
-        M_ASN1_D2I_Finish(a, PBE2PARAM_free, ASN1_F_D2I_PBE2PARAM);
-}
-
-void PBE2PARAM_free (PBE2PARAM *a)
-{
-        if(a==NULL) return;
-        X509_ALGOR_free(a->keyfunc);
-        X509_ALGOR_free(a->encryption);
-        Free ((char *)a);
-}
-
-int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-        M_ASN1_I2D_len (a->salt, i2d_ASN1_TYPE);
-        M_ASN1_I2D_len (a->iter, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len (a->keylength, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len (a->prf, i2d_X509_ALGOR);
-
-        M_ASN1_I2D_seq_total ();
-
-        M_ASN1_I2D_put (a->salt, i2d_ASN1_TYPE);
-        M_ASN1_I2D_put (a->iter, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put (a->keylength, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put (a->prf, i2d_X509_ALGOR);
-
-        M_ASN1_I2D_finish();
-}
-
-PBKDF2PARAM *PBKDF2PARAM_new(void)
-{
-        PBKDF2PARAM *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, PBKDF2PARAM);
-        M_ASN1_New(ret->salt, ASN1_TYPE_new);
-        M_ASN1_New(ret->iter, ASN1_INTEGER_new);
-        ret->keylength = NULL;
-        ret->prf = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_PBKDF2PARAM_NEW);
-}
-
-PBKDF2PARAM *d2i_PBKDF2PARAM(PBKDF2PARAM **a, unsigned char **pp,
-             long length)
-{
-        M_ASN1_D2I_vars(a,PBKDF2PARAM *,PBKDF2PARAM_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->salt, d2i_ASN1_TYPE);
-        M_ASN1_D2I_get (ret->iter, d2i_ASN1_INTEGER);
-        M_ASN1_D2I_get_opt (ret->keylength, d2i_ASN1_INTEGER, V_ASN1_INTEGER);
-        M_ASN1_D2I_get_opt (ret->prf, d2i_X509_ALGOR, V_ASN1_SEQUENCE);
-        M_ASN1_D2I_Finish(a, PBKDF2PARAM_free, ASN1_F_D2I_PBKDF2PARAM);
-}
-
-void PBKDF2PARAM_free (PBKDF2PARAM *a)
-{
-        if(a==NULL) return;
-        ASN1_TYPE_free(a->salt);
-        ASN1_INTEGER_free(a->iter);
-        ASN1_INTEGER_free(a->keylength);
-        X509_ALGOR_free(a->prf);
-        Free ((char *)a);
-}
-
-/* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm:
- * yes I know this is horrible!
- */
-
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                                 unsigned char *salt, int saltlen)
-{
-        X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL;
-        int alg_nid;
-        EVP_CIPHER_CTX ctx;
-        unsigned char iv[EVP_MAX_IV_LENGTH];
-        PBKDF2PARAM *kdf = NULL;
-        PBE2PARAM *pbe2 = NULL;
-        ASN1_OCTET_STRING *osalt = NULL;
-
-        if(!(pbe2 = PBE2PARAM_new())) goto merr;
-
-        /* Setup the AlgorithmIdentifier for the encryption scheme */
-        scheme = pbe2->encryption;
-
-        alg_nid = EVP_CIPHER_type(cipher);
-
-        scheme->algorithm = OBJ_nid2obj(alg_nid);
-        if(!(scheme->parameter = ASN1_TYPE_new())) goto merr;
-
-        /* Create random IV */
-        RAND_bytes(iv, EVP_CIPHER_iv_length(cipher));
-
-        /* Dummy cipherinit to just setup the IV */
-        EVP_CipherInit(&ctx, cipher, NULL, iv, 0);
-        if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) {
-                ASN1err(ASN1_F_PKCS5_PBE2_SET,
-                                        ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
-                goto err;
-        }
-        EVP_CIPHER_CTX_cleanup(&ctx);
-
-        if(!(kdf = PBKDF2PARAM_new())) goto merr;
-        if(!(osalt = ASN1_OCTET_STRING_new())) goto merr;
-
-        if (!saltlen) saltlen = PKCS5_SALT_LEN;
-        if (!(osalt->data = Malloc (saltlen))) goto merr;
-        osalt->length = saltlen;
-        if (salt) memcpy (osalt->data, salt, saltlen);
-        else RAND_bytes (osalt->data, saltlen);
-
-        if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
-        if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr;
-
-        /* Now include salt in kdf structure */
-        kdf->salt->value.octet_string = osalt;
-        kdf->salt->type = V_ASN1_OCTET_STRING;
-        osalt = NULL;
-
-        /* If its RC2 then we'd better setup the key length */
-
-        if(alg_nid == NID_rc2_cbc) {
-                if(!(kdf->keylength = ASN1_INTEGER_new())) goto merr;
-                if(!ASN1_INTEGER_set (kdf->keylength,
-                                 EVP_CIPHER_key_length(cipher))) goto merr;
-        }
-
-        /* prf can stay NULL because we are using hmacWithSHA1 */
-
-        /* Now setup the PBE2PARAM keyfunc structure */
-
-        pbe2->keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);
-
-        /* Encode PBKDF2PARAM into parameter of pbe2 */
-
-        if(!(pbe2->keyfunc->parameter = ASN1_TYPE_new())) goto merr;
-
-        if(!ASN1_pack_string(kdf, i2d_PBKDF2PARAM,
-                         &pbe2->keyfunc->parameter->value.sequence)) goto merr;
-        pbe2->keyfunc->parameter->type = V_ASN1_SEQUENCE;
-
-        PBKDF2PARAM_free(kdf);
-        kdf = NULL;
-
-        /* Now set up top level AlgorithmIdentifier */
-
-        if(!(ret = X509_ALGOR_new())) goto merr;
-        if(!(ret->parameter = ASN1_TYPE_new())) goto merr;
-
-        ret->algorithm = OBJ_nid2obj(NID_pbes2);
-
-        /* Encode PBE2PARAM into parameter */
-
-        if(!ASN1_pack_string(pbe2, i2d_PBE2PARAM,
-                                 &ret->parameter->value.sequence)) goto merr;
-        ret->parameter->type = V_ASN1_SEQUENCE;
-
-        PBE2PARAM_free(pbe2);
-        pbe2 = NULL;
-
-        return ret;
-
-        merr:
-        ASN1err(ASN1_F_PKCS5_PBE2_SET,ERR_R_MALLOC_FAILURE);
-
-        err:
-        PBE2PARAM_free(pbe2);
-        /* Note 'scheme' is freed as part of pbe2 */
-        ASN1_OCTET_STRING_free(osalt);
-        PBKDF2PARAM_free(kdf);
-        X509_ALGOR_free(kalg);
-        X509_ALGOR_free(ret);
-
-        return NULL;
-
-}
diff --git a/src/lib/libcrypto/asn1/p8_pkey.c b/src/lib/libcrypto/asn1/p8_pkey.c
deleted file mode 100644
index aa9a4f6c96..0000000000
--- a/src/lib/libcrypto/asn1/p8_pkey.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* p8_pkey.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_PKCS8_PRIV_KEY_INFO (PKCS8_PRIV_KEY_INFO *a, unsigned char **pp)
-{
-
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len (a->pkeyalg, i2d_X509_ALGOR);
-        M_ASN1_I2D_len (a->pkey, i2d_ASN1_TYPE);
-        M_ASN1_I2D_len_IMP_SET_opt_type (X509_ATTRIBUTE, a->attributes,
-                                         i2d_X509_ATTRIBUTE, 0);
-        
-        M_ASN1_I2D_seq_total ();
-
-        M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put (a->pkeyalg, i2d_X509_ALGOR);
-        M_ASN1_I2D_put (a->pkey, i2d_ASN1_TYPE);
-        M_ASN1_I2D_put_IMP_SET_opt_type (X509_ATTRIBUTE, a->attributes,
-                                         i2d_X509_ATTRIBUTE, 0);
-
-        M_ASN1_I2D_finish();
-}
-
-PKCS8_PRIV_KEY_INFO *PKCS8_PRIV_KEY_INFO_new(void)
-{
-        PKCS8_PRIV_KEY_INFO *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, PKCS8_PRIV_KEY_INFO);
-        M_ASN1_New (ret->version, ASN1_INTEGER_new);
-        M_ASN1_New (ret->pkeyalg, X509_ALGOR_new);
-        M_ASN1_New (ret->pkey, ASN1_TYPE_new);
-        ret->attributes = NULL;
-        ret->broken = PKCS8_OK;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_PKCS8_PRIV_KEY_INFO_NEW);
-}
-
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO **a,
-             unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,PKCS8_PRIV_KEY_INFO *,PKCS8_PRIV_KEY_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->pkeyalg, d2i_X509_ALGOR);
-        M_ASN1_D2I_get (ret->pkey, d2i_ASN1_TYPE);
-        M_ASN1_D2I_get_IMP_set_opt_type(X509_ATTRIBUTE, ret->attributes,
-                                        d2i_X509_ATTRIBUTE,
-                                        X509_ATTRIBUTE_free, 0);
-        if (ASN1_TYPE_get(ret->pkey) == V_ASN1_SEQUENCE) 
-                                                ret->broken = PKCS8_NO_OCTET;
-        M_ASN1_D2I_Finish(a, PKCS8_PRIV_KEY_INFO_free, ASN1_F_D2I_PKCS8_PRIV_KEY_INFO);
-}
-
-void PKCS8_PRIV_KEY_INFO_free (PKCS8_PRIV_KEY_INFO *a)
-{
-        if (a == NULL) return;
-        ASN1_INTEGER_free (a->version);
-        X509_ALGOR_free(a->pkeyalg);
-        /* Clear sensitive data */
-        if (a->pkey->value.octet_string)
-                memset (a->pkey->value.octet_string->data,
-                                 0, a->pkey->value.octet_string->length);
-        ASN1_TYPE_free (a->pkey);
-        sk_X509_ATTRIBUTE_pop_free (a->attributes, X509_ATTRIBUTE_free);
-        Free (a);
-}
diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c
deleted file mode 100644
index c2e447ce6f..0000000000
--- a/src/lib/libcrypto/asn1/t_crl.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* t_crl.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/bn.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-
-static void ext_print(BIO *out, X509_EXTENSION *ex);
-#ifndef NO_FP_API
-int X509_CRL_print_fp(FILE *fp, X509_CRL *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=X509_CRL_print(b, x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int X509_CRL_print(BIO *out, X509_CRL *x)
-{
-        char buf[256];
-        unsigned char *s;
-        STACK_OF(X509_REVOKED) *rev;
-        X509_REVOKED *r;
-        long l;
-        int i, j, n;
-
-        BIO_printf(out, "Certificate Revocation List (CRL):\n");
-        l = X509_CRL_get_version(x);
-        BIO_printf(out, "%8sVersion %lu (0x%lx)\n", "", l+1, l);
-        i = OBJ_obj2nid(x->sig_alg->algorithm);
-        BIO_printf(out, "%8sSignature Algorithm: %s\n", "",
-                                 (i == NID_undef) ? "NONE" : OBJ_nid2ln(i));
-        X509_NAME_oneline(X509_CRL_get_issuer(x),buf,256);
-        BIO_printf(out,"%8sIssuer: %s\n","",buf);
-        BIO_printf(out,"%8sLast Update: ","");
-        ASN1_TIME_print(out,X509_CRL_get_lastUpdate(x));
-        BIO_printf(out,"\n%8sNext Update: ","");
-        if (X509_CRL_get_nextUpdate(x))
-                 ASN1_TIME_print(out,X509_CRL_get_nextUpdate(x));
-        else BIO_printf(out,"NONE");
-        BIO_printf(out,"\n");
-
-        n=X509_CRL_get_ext_count(x);
-        if (n > 0) {
-                BIO_printf(out,"%8sCRL extensions:\n","");
-                for (i=0; i<n; i++) ext_print(out, X509_CRL_get_ext(x, i));
-        }
-
-
-        rev = X509_CRL_get_REVOKED(x);
-
-        if(sk_X509_REVOKED_num(rev))
-            BIO_printf(out, "Revoked Certificates:\n");
-        else BIO_printf(out, "No Revoked Certificates.\n");
-
-        for(i = 0; i < sk_X509_REVOKED_num(rev); i++) {
-                r = sk_X509_REVOKED_value(rev, i);
-                BIO_printf(out,"    Serial Number: ");
-                i2a_ASN1_INTEGER(out,r->serialNumber);
-                BIO_printf(out,"\n        Revocation Date: ","");
-                ASN1_TIME_print(out,r->revocationDate);
-                BIO_printf(out,"\n");
-                for(j = 0; j < X509_REVOKED_get_ext_count(r); j++)
-                                ext_print(out, X509_REVOKED_get_ext(r, j));
-        }
-
-        i=OBJ_obj2nid(x->sig_alg->algorithm);
-        BIO_printf(out,"    Signature Algorithm: %s",
-                                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));
-
-        s = x->signature->data;
-        n = x->signature->length;
-        for (i=0; i<n; i++, s++)
-        {
-                if ((i%18) == 0) BIO_write(out,"\n        ",9);
-                BIO_printf(out,"%02x%s",*s, ((i+1) == n)?"":":");
-        }
-        BIO_write(out,"\n",1);
-
-        return 1;
-
-}
-
-static void ext_print(BIO *out, X509_EXTENSION *ex)
-{
-        ASN1_OBJECT *obj;
-        int j;
-        BIO_printf(out,"%12s","");
-        obj=X509_EXTENSION_get_object(ex);
-        i2a_ASN1_OBJECT(out,obj);
-        j=X509_EXTENSION_get_critical(ex);
-        BIO_printf(out, ": %s\n", j ? "critical":"","");
-        if(!X509V3_EXT_print(out, ex, 0, 16)) {
-                BIO_printf(out, "%16s", "");
-                ASN1_OCTET_STRING_print(out,ex->value);
-        }
-        BIO_write(out,"\n",1);
-}
diff --git a/src/lib/libcrypto/asn1/t_pkey.c b/src/lib/libcrypto/asn1/t_pkey.c
deleted file mode 100644
index 0dc6e30c3d..0000000000
--- a/src/lib/libcrypto/asn1/t_pkey.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* crypto/asn1/t_pkey.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 <openssl/buffer.h>
-#include <openssl/bn.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef NO_DSA
-#include <openssl/dsa.h>
-#endif
-
-static int print(BIO *fp,const char *str,BIGNUM *num,
-                unsigned char *buf,int off);
-#ifndef NO_RSA
-#ifndef NO_FP_API
-int RSA_print_fp(FILE *fp, RSA *x, int off)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                RSAerr(RSA_F_RSA_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=RSA_print(b,x,off);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int RSA_print(BIO *bp, RSA *x, int off)
-        {
-        char str[128];
-        const char *s;
-        unsigned char *m=NULL;
-        int i,ret=0;
-
-        i=RSA_size(x);
-        m=(unsigned char *)Malloc((unsigned int)i+10);
-        if (m == NULL)
-                {
-                RSAerr(RSA_F_RSA_PRINT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        if (off)
-                {
-                if (off > 128) off=128;
-                memset(str,' ',off);
-                }
-        if (x->d != NULL)
-                {
-                if (off && (BIO_write(bp,str,off) <= 0)) goto err;
-                if (BIO_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->n))
-                        <= 0) goto err;
-                }
-
-        if (x->d == NULL)
-                sprintf(str,"Modulus (%d bit):",BN_num_bits(x->n));
-        else
-                strcpy(str,"modulus:");
-        if (!print(bp,str,x->n,m,off)) goto err;
-        s=(x->d == NULL)?"Exponent:":"publicExponent:";
-        if (!print(bp,s,x->e,m,off)) goto err;
-        if (!print(bp,"privateExponent:",x->d,m,off)) goto err;
-        if (!print(bp,"prime1:",x->p,m,off)) goto err;
-        if (!print(bp,"prime2:",x->q,m,off)) goto err;
-        if (!print(bp,"exponent1:",x->dmp1,m,off)) goto err;
-        if (!print(bp,"exponent2:",x->dmq1,m,off)) goto err;
-        if (!print(bp,"coefficient:",x->iqmp,m,off)) goto err;
-        ret=1;
-err:
-        if (m != NULL) Free((char *)m);
-        return(ret);
-        }
-#endif /* NO_RSA */
-
-#ifndef NO_DSA
-#ifndef NO_FP_API
-int DSA_print_fp(FILE *fp, DSA *x, int off)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                DSAerr(DSA_F_DSA_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=DSA_print(b,x,off);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int DSA_print(BIO *bp, DSA *x, int off)
-        {
-        char str[128];
-        unsigned char *m=NULL;
-        int i,ret=0;
-        BIGNUM *bn=NULL;
-
-        if (x->p != NULL)
-                bn=x->p;
-        else if (x->priv_key != NULL)
-                bn=x->priv_key;
-        else if (x->pub_key != NULL)
-                bn=x->pub_key;
-                
-        /* larger than needed but what the hell :-) */
-        if (bn != NULL)
-                i=BN_num_bytes(bn)*2;
-        else
-                i=256;
-        m=(unsigned char *)Malloc((unsigned int)i+10);
-        if (m == NULL)
-                {
-                DSAerr(DSA_F_DSA_PRINT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        if (off)
-                {
-                if (off > 128) off=128;
-                memset(str,' ',off);
-                }
-        if (x->priv_key != NULL)
-                {
-                if (off && (BIO_write(bp,str,off) <= 0)) goto err;
-                if (BIO_printf(bp,"Private-Key: (%d bit)\n",BN_num_bits(x->p))
-                        <= 0) goto err;
-                }
-
-        if ((x->priv_key != NULL) && !print(bp,"priv:",x->priv_key,m,off))
-                goto err;
-        if ((x->pub_key  != NULL) && !print(bp,"pub: ",x->pub_key,m,off))
-                goto err;
-        if ((x->p != NULL) && !print(bp,"P:   ",x->p,m,off)) goto err;
-        if ((x->q != NULL) && !print(bp,"Q:   ",x->q,m,off)) goto err;
-        if ((x->g != NULL) && !print(bp,"G:   ",x->g,m,off)) goto err;
-        ret=1;
-err:
-        if (m != NULL) Free((char *)m);
-        return(ret);
-        }
-#endif /* !NO_DSA */
-
-static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
-             int off)
-        {
-        int n,i;
-        char str[128];
-        const char *neg;
-
-        if (num == NULL) return(1);
-        neg=(num->neg)?"-":"";
-        if (off)
-                {
-                if (off > 128) off=128;
-                memset(str,' ',off);
-                if (BIO_write(bp,str,off) <= 0) return(0);
-                }
-
-        if (BN_num_bytes(num) <= BN_BYTES)
-                {
-                if (BIO_printf(bp,"%s %s%lu (%s0x%lx)\n",number,neg,
-                        (unsigned long)num->d[0],neg,(unsigned long)num->d[0])
-                        <= 0) return(0);
-                }
-        else
-                {
-                buf[0]=0;
-                if (BIO_printf(bp,"%s%s",number,
-                        (neg[0] == '-')?" (Negative)":"") <= 0)
-                        return(0);
-                n=BN_bn2bin(num,&buf[1]);
-        
-                if (buf[1] & 0x80)
-                        n++;
-                else    buf++;
-
-                for (i=0; i<n; i++)
-                        {
-                        if ((i%15) == 0)
-                                {
-                                str[0]='\n';
-                                memset(&(str[1]),' ',off+4);
-                                if (BIO_write(bp,str,off+1+4) <= 0) return(0);
-                                }
-                        if (BIO_printf(bp,"%02x%s",buf[i],((i+1) == n)?"":":")
-                                <= 0) return(0);
-                        }
-                if (BIO_write(bp,"\n",1) <= 0) return(0);
-                }
-        return(1);
-        }
-
-#ifndef NO_DH
-#ifndef NO_FP_API
-int DHparams_print_fp(FILE *fp, DH *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                DHerr(DH_F_DHPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=DHparams_print(b, x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int DHparams_print(BIO *bp, DH *x)
-        {
-        unsigned char *m=NULL;
-        int reason=ERR_R_BUF_LIB,i,ret=0;
-
-        i=BN_num_bytes(x->p);
-        m=(unsigned char *)Malloc((unsigned int)i+10);
-        if (m == NULL)
-                {
-                reason=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-
-        if (BIO_printf(bp,"Diffie-Hellman-Parameters: (%d bit)\n",
-                BN_num_bits(x->p)) <= 0)
-                goto err;
-        if (!print(bp,"prime:",x->p,m,4)) goto err;
-        if (!print(bp,"generator:",x->g,m,4)) goto err;
-        if (x->length != 0)
-                {
-                if (BIO_printf(bp,"    recomented-private-length: %d bits\n",
-                        (int)x->length) <= 0) goto err;
-                }
-        ret=1;
-        if (0)
-                {
-err:
-                DHerr(DH_F_DHPARAMS_PRINT,reason);
-                }
-        if (m != NULL) Free((char *)m);
-        return(ret);
-        }
-#endif
-
-#ifndef NO_DSA
-#ifndef NO_FP_API
-int DSAparams_print_fp(FILE *fp, DSA *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                DSAerr(DSA_F_DSAPARAMS_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=DSAparams_print(b, x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int DSAparams_print(BIO *bp, DSA *x)
-        {
-        unsigned char *m=NULL;
-        int reason=ERR_R_BUF_LIB,i,ret=0;
-
-        i=BN_num_bytes(x->p);
-        m=(unsigned char *)Malloc((unsigned int)i+10);
-        if (m == NULL)
-                {
-                reason=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-
-        if (BIO_printf(bp,"DSA-Parameters: (%d bit)\n",
-                BN_num_bits(x->p)) <= 0)
-                goto err;
-        if (!print(bp,"p:",x->p,m,4)) goto err;
-        if (!print(bp,"q:",x->q,m,4)) goto err;
-        if (!print(bp,"g:",x->g,m,4)) goto err;
-        ret=1;
-err:
-        if (m != NULL) Free((char *)m);
-        DSAerr(DSA_F_DSAPARAMS_PRINT,reason);
-        return(ret);
-        }
-
-#endif /* !NO_DSA */
-
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
deleted file mode 100644
index bdd749436a..0000000000
--- a/src/lib/libcrypto/asn1/t_req.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* crypto/asn1/t_req.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 <openssl/buffer.h>
-#include <openssl/bn.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-#ifndef NO_FP_API
-int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                X509err(X509_F_X509_REQ_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=X509_REQ_print(b, x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int X509_REQ_print(BIO *bp, X509_REQ *x)
-        {
-        unsigned long l;
-        int i,n;
-        char *s;
-        const char *neg;
-        X509_REQ_INFO *ri;
-        EVP_PKEY *pkey;
-        STACK_OF(X509_ATTRIBUTE) *sk;
-        char str[128];
-
-        ri=x->req_info;
-        sprintf(str,"Certificate Request:\n");
-        if (BIO_puts(bp,str) <= 0) goto err;
-        sprintf(str,"%4sData:\n","");
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        neg=(ri->version->type == V_ASN1_NEG_INTEGER)?"-":"";
-        l=0;
-        for (i=0; i<ri->version->length; i++)
-                { l<<=8; l+=ri->version->data[i]; }
-        sprintf(str,"%8sVersion: %s%lu (%s0x%lx)\n","",neg,l,neg,l);
-        if (BIO_puts(bp,str) <= 0) goto err;
-        sprintf(str,"%8sSubject: ","");
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        X509_NAME_print(bp,ri->subject,16);
-        sprintf(str,"\n%8sSubject Public Key Info:\n","");
-        if (BIO_puts(bp,str) <= 0) goto err;
-        i=OBJ_obj2nid(ri->pubkey->algor->algorithm);
-        sprintf(str,"%12sPublic Key Algorithm: %s\n","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        pkey=X509_REQ_get_pubkey(x);
-#ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
-                {
-                BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
-                        BN_num_bits(pkey->pkey.rsa->n));
-                RSA_print(bp,pkey->pkey.rsa,16);
-                }
-        else 
-#endif
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                {
-                BIO_printf(bp,"%12sDSA Public Key:\n","");
-                DSA_print(bp,pkey->pkey.dsa,16);
-                }
-        else
-#endif
-                BIO_printf(bp,"%12sUnknown Public Key:\n","");
-
-        EVP_PKEY_free(pkey);
-
-        /* may not be */
-        sprintf(str,"%8sAttributes:\n","");
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        sk=x->req_info->attributes;
-        if ((sk == NULL) || (sk_X509_ATTRIBUTE_num(sk) == 0))
-                {
-                if (!x->req_info->req_kludge)
-                        {
-                        sprintf(str,"%12sa0:00\n","");
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
-                }
-        else
-                {
-                for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
-                        {
-                        ASN1_TYPE *at;
-                        X509_ATTRIBUTE *a;
-                        ASN1_BIT_STRING *bs=NULL;
-                        ASN1_TYPE *t;
-                        int j,type=0,count=1,ii=0;
-
-                        a=sk_X509_ATTRIBUTE_value(sk,i);
-                        sprintf(str,"%12s","");
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        if ((j=i2a_ASN1_OBJECT(bp,a->object)) > 0)
-                        {
-                        if (a->set)
-                                {
-                                ii=0;
-                                count=sk_ASN1_TYPE_num(a->value.set);
-get_next:
-                                at=sk_ASN1_TYPE_value(a->value.set,ii);
-                                type=at->type;
-                                bs=at->value.asn1_string;
-                                }
-                        else
-                                {
-                                t=a->value.single;
-                                type=t->type;
-                                bs=t->value.bit_string;
-                                }
-                        }
-                        for (j=25-j; j>0; j--)
-                                if (BIO_write(bp," ",1) != 1) goto err;
-                        if (BIO_puts(bp,":") <= 0) goto err;
-                        if (    (type == V_ASN1_PRINTABLESTRING) ||
-                                (type == V_ASN1_T61STRING) ||
-                                (type == V_ASN1_IA5STRING))
-                                {
-                                if (BIO_write(bp,(char *)bs->data,bs->length)
-                                        != bs->length)
-                                        goto err;
-                                BIO_puts(bp,"\n");
-                                }
-                        else
-                                {
-                                BIO_puts(bp,"unable to print attribute\n");
-                                }
-                        if (++ii < count) goto get_next;
-                        }
-                }
-
-        i=OBJ_obj2nid(x->sig_alg->algorithm);
-        sprintf(str,"%4sSignature Algorithm: %s","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i));
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        n=x->signature->length;
-        s=(char *)x->signature->data;
-        for (i=0; i<n; i++)
-                {
-                if ((i%18) == 0)
-                        {
-                        sprintf(str,"\n%8s","");
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
-                sprintf(str,"%02x%s",(unsigned char)s[i],((i+1) == n)?"":":");
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (BIO_puts(bp,"\n") <= 0) goto err;
-        return(1);
-err:
-        X509err(X509_F_X509_REQ_PRINT,ERR_R_BUF_LIB);
-        return(0);
-        }
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c
deleted file mode 100644
index 42f4d498cf..0000000000
--- a/src/lib/libcrypto/asn1/t_x509.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* crypto/asn1/t_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 "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/bn.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifndef NO_DSA
-#include <openssl/dsa.h>
-#endif
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-
-#ifndef NO_FP_API
-int X509_print_fp(FILE *fp, X509 *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                X509err(X509_F_X509_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=X509_print(b, x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int X509_print(BIO *bp, X509 *x)
-        {
-        long l;
-        int ret=0,i,j,n;
-        char *m=NULL,*s;
-        X509_CINF *ci;
-        ASN1_INTEGER *bs;
-        EVP_PKEY *pkey=NULL;
-        const char *neg;
-        X509_EXTENSION *ex;
-        ASN1_STRING *str=NULL;
-
-        ci=x->cert_info;
-        if (BIO_write(bp,"Certificate:\n",13) <= 0) goto err;
-        if (BIO_write(bp,"    Data:\n",10) <= 0) goto err;
-        l=X509_get_version(x);
-        if (BIO_printf(bp,"%8sVersion: %lu (0x%lx)\n","",l+1,l) <= 0) goto err;
-        if (BIO_write(bp,"        Serial Number:",22) <= 0) goto err;
-
-        bs=X509_get_serialNumber(x);
-        if (bs->length <= 4)
-                {
-                l=ASN1_INTEGER_get(bs);
-                if (l < 0)
-                        {
-                        l= -l;
-                        neg="-";
-                        }
-                else
-                        neg="";
-                if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
-                        goto err;
-                }
-        else
-                {
-                neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
-                if (BIO_printf(bp,"\n%12s%s","",neg) <= 0) goto err;
-
-                for (i=0; i<bs->length; i++)
-                        {
-                        if (BIO_printf(bp,"%02x%c",bs->data[i],
-                                ((i+1 == bs->length)?'\n':':')) <= 0)
-                                goto err;
-                        }
-                }
-
-        i=OBJ_obj2nid(ci->signature->algorithm);
-        if (BIO_printf(bp,"%8sSignature Algorithm: %s\n","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0)
-                goto err;
-
-        if (BIO_write(bp,"        Issuer: ",16) <= 0) goto err;
-        if (!X509_NAME_print(bp,X509_get_issuer_name(x),16)) goto err;
-        if (BIO_write(bp,"\n        Validity\n",18) <= 0) goto err;
-        if (BIO_write(bp,"            Not Before: ",24) <= 0) goto err;
-        if (!ASN1_TIME_print(bp,X509_get_notBefore(x))) goto err;
-        if (BIO_write(bp,"\n            Not After : ",25) <= 0) goto err;
-        if (!ASN1_TIME_print(bp,X509_get_notAfter(x))) goto err;
-        if (BIO_write(bp,"\n        Subject: ",18) <= 0) goto err;
-        if (!X509_NAME_print(bp,X509_get_subject_name(x),16)) goto err;
-        if (BIO_write(bp,"\n        Subject Public Key Info:\n",34) <= 0)
-                goto err;
-        i=OBJ_obj2nid(ci->key->algor->algorithm);
-        if (BIO_printf(bp,"%12sPublic Key Algorithm: %s\n","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0) goto err;
-
-        pkey=X509_get_pubkey(x);
-        if (pkey == NULL)
-                {
-                BIO_printf(bp,"%12sUnable to load Public Key\n","");
-                ERR_print_errors(bp);
-                }
-        else
-#ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
-                {
-                BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
-                BN_num_bits(pkey->pkey.rsa->n));
-                RSA_print(bp,pkey->pkey.rsa,16);
-                }
-        else
-#endif
-#ifndef NO_DSA
-        if (pkey->type == EVP_PKEY_DSA)
-                {
-                BIO_printf(bp,"%12sDSA Public Key:\n","");
-                DSA_print(bp,pkey->pkey.dsa,16);
-                }
-        else
-#endif
-                BIO_printf(bp,"%12sUnknown Public Key:\n","");
-
-        EVP_PKEY_free(pkey);
-
-        n=X509_get_ext_count(x);
-        if (n > 0)
-                {
-                BIO_printf(bp,"%8sX509v3 extensions:\n","");
-                for (i=0; i<n; i++)
-                        {
-#if 0
-                        int data_type,pack_type;
-#endif
-                        ASN1_OBJECT *obj;
-
-                        ex=X509_get_ext(x,i);
-                        if (BIO_printf(bp,"%12s","") <= 0) goto err;
-                        obj=X509_EXTENSION_get_object(ex);
-                        i2a_ASN1_OBJECT(bp,obj);
-                        j=X509_EXTENSION_get_critical(ex);
-                        if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
-                                goto err;
-                        if(!X509V3_EXT_print(bp, ex, 0, 16))
-                                {
-                                BIO_printf(bp, "%16s", "");
-                                ASN1_OCTET_STRING_print(bp,ex->value);
-                                }
-                        if (BIO_write(bp,"\n",1) <= 0) goto err;
-                        }
-                }
-
-        i=OBJ_obj2nid(x->sig_alg->algorithm);
-        if (BIO_printf(bp,"%4sSignature Algorithm: %s","",
-                (i == NID_undef)?"UNKNOWN":OBJ_nid2ln(i)) <= 0) goto err;
-
-        n=x->signature->length;
-        s=(char *)x->signature->data;
-        for (i=0; i<n; i++)
-                {
-                if ((i%18) == 0)
-                        if (BIO_write(bp,"\n        ",9) <= 0) goto err;
-                if (BIO_printf(bp,"%02x%s",(unsigned char)s[i],
-                        ((i+1) == n)?"":":") <= 0) goto err;
-                }
-        if (BIO_write(bp,"\n",1) != 1) goto err;
-        ret=1;
-err:
-        if (str != NULL) ASN1_STRING_free(str);
-        if (m != NULL) Free((char *)m);
-        return(ret);
-        }
-
-int ASN1_STRING_print(BIO *bp, ASN1_STRING *v)
-        {
-        int i,n;
-        char buf[80],*p;;
-
-        if (v == NULL) return(0);
-        n=0;
-        p=(char *)v->data;
-        for (i=0; i<v->length; i++)
-                {
-                if ((p[i] > '~') || ((p[i] < ' ') &&
-                        (p[i] != '\n') && (p[i] != '\r')))
-                        buf[n]='.';
-                else
-                        buf[n]=p[i];
-                n++;
-                if (n >= 80)
-                        {
-                        if (BIO_write(bp,buf,n) <= 0)
-                                return(0);
-                        n=0;
-                        }
-                }
-        if (n > 0)
-                if (BIO_write(bp,buf,n) <= 0)
-                        return(0);
-        return(1);
-        }
-
-int ASN1_TIME_print(BIO *bp, ASN1_TIME *tm)
-{
-        if(tm->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_print(bp, tm);
-        if(tm->type == V_ASN1_GENERALIZEDTIME)
-                                return ASN1_GENERALIZEDTIME_print(bp, tm);
-        BIO_write(bp,"Bad time value",14);
-        return(0);
-}
-
-static const char *mon[12]=
-    {
-    "Jan","Feb","Mar","Apr","May","Jun",
-    "Jul","Aug","Sep","Oct","Nov","Dec"
-    };
-
-int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm)
-        {
-        char *v;
-        int gmt=0;
-        int i;
-        int y=0,M=0,d=0,h=0,m=0,s=0;
-
-        i=tm->length;
-        v=(char *)tm->data;
-
-        if (i < 12) goto err;
-        if (v[i-1] == 'Z') gmt=1;
-        for (i=0; i<12; i++)
-                if ((v[i] > '9') || (v[i] < '0')) goto err;
-        y= (v[0]-'0')*1000+(v[1]-'0')*100 + (v[2]-'0')*10+(v[3]-'0');
-        M= (v[4]-'0')*10+(v[5]-'0');
-        if ((M > 12) || (M < 1)) goto err;
-        d= (v[6]-'0')*10+(v[7]-'0');
-        h= (v[8]-'0')*10+(v[9]-'0');
-        m=  (v[10]-'0')*10+(v[11]-'0');
-        if (    (v[12] >= '0') && (v[12] <= '9') &&
-                (v[13] >= '0') && (v[13] <= '9'))
-                s=  (v[12]-'0')*10+(v[13]-'0');
-
-        if (BIO_printf(bp,"%s %2d %02d:%02d:%02d %d%s",
-                mon[M-1],d,h,m,s,y,(gmt)?" GMT":"") <= 0)
-                return(0);
-        else
-                return(1);
-err:
-        BIO_write(bp,"Bad time value",14);
-        return(0);
-        }
-
-int ASN1_UTCTIME_print(BIO *bp, ASN1_UTCTIME *tm)
-        {
-        char *v;
-        int gmt=0;
-        int i;
-        int y=0,M=0,d=0,h=0,m=0,s=0;
-
-        i=tm->length;
-        v=(char *)tm->data;
-
-        if (i < 10) goto err;
-        if (v[i-1] == 'Z') gmt=1;
-        for (i=0; i<10; i++)
-                if ((v[i] > '9') || (v[i] < '0')) goto err;
-        y= (v[0]-'0')*10+(v[1]-'0');
-        if (y < 50) y+=100;
-        M= (v[2]-'0')*10+(v[3]-'0');
-        if ((M > 12) || (M < 1)) goto err;
-        d= (v[4]-'0')*10+(v[5]-'0');
-        h= (v[6]-'0')*10+(v[7]-'0');
-        m=  (v[8]-'0')*10+(v[9]-'0');
-        if (    (v[10] >= '0') && (v[10] <= '9') &&
-                (v[11] >= '0') && (v[11] <= '9'))
-                s=  (v[10]-'0')*10+(v[11]-'0');
-
-        if (BIO_printf(bp,"%s %2d %02d:%02d:%02d %d%s",
-                mon[M-1],d,h,m,s,y+1900,(gmt)?" GMT":"") <= 0)
-                return(0);
-        else
-                return(1);
-err:
-        BIO_write(bp,"Bad time value",14);
-        return(0);
-        }
-
-int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
-        {
-        char *s,*c;
-        int ret=0,l,ll,i,first=1;
-        char buf[256];
-
-        ll=80-2-obase;
-
-        s=X509_NAME_oneline(name,buf,256);
-        s++; /* skip the first slash */
-
-        l=ll;
-        c=s;
-        for (;;)
-                {
-#ifndef CHARSET_EBCDIC
-                if (    ((*s == '/') &&
-                                ((s[1] >= 'A') && (s[1] <= 'Z') && (
-                                        (s[2] == '=') ||
-                                        ((s[2] >= 'A') && (s[2] <= 'Z') &&
-                                        (s[3] == '='))
-                                 ))) ||
-                        (*s == '\0'))
-#else
-                if (    ((*s == '/') &&
-                                (isupper(s[1]) && (
-                                        (s[2] == '=') ||
-                                        (isupper(s[2]) &&
-                                        (s[3] == '='))
-                                 ))) ||
-                        (*s == '\0'))
-#endif
-                        {
-                        if ((l <= 0) && !first)
-                                {
-                                first=0;
-                                if (BIO_write(bp,"\n",1) != 1) goto err;
-                                for (i=0; i<obase; i++)
-                                        {
-                                        if (BIO_write(bp," ",1) != 1) goto err;
-                                        }
-                                l=ll;
-                                }
-                        i=s-c;
-                        if (BIO_write(bp,c,i) != i) goto err;
-                        c+=i;
-                        c++;
-                        if (*s != '\0')
-                                {
-                                if (BIO_write(bp,", ",2) != 2) goto err;
-                                }
-                        l--;
-                        }
-                if (*s == '\0') break;
-                s++;
-                l--;
-                }
-        
-        ret=1;
-        if (0)
-                {
-err:
-                X509err(X509_F_X509_NAME_PRINT,ERR_R_BUF_LIB);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c
deleted file mode 100644
index b2c20d139f..0000000000
--- a/src/lib/libcrypto/asn1/x_algor.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* crypto/asn1/x_algor.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_ALGOR(X509_ALGOR *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->algorithm,i2d_ASN1_OBJECT);
-        if (a->parameter != NULL)
-                { M_ASN1_I2D_len(a->parameter,i2d_ASN1_TYPE); }
-
-        M_ASN1_I2D_seq_total();
-        M_ASN1_I2D_put(a->algorithm,i2d_ASN1_OBJECT);
-        if (a->parameter != NULL)
-                { M_ASN1_I2D_put(a->parameter,i2d_ASN1_TYPE); }
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_ALGOR *d2i_X509_ALGOR(X509_ALGOR **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509_ALGOR *,X509_ALGOR_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->algorithm,d2i_ASN1_OBJECT);
-        if (!M_ASN1_D2I_end_sequence())
-                { M_ASN1_D2I_get(ret->parameter,d2i_ASN1_TYPE); }
-        else
-                {
-                ASN1_TYPE_free(ret->parameter);
-                ret->parameter=NULL;
-                }
-        M_ASN1_D2I_Finish(a,X509_ALGOR_free,ASN1_F_D2I_X509_ALGOR);
-        }
-
-X509_ALGOR *X509_ALGOR_new(void)
-        {
-        X509_ALGOR *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_ALGOR);
-        ret->algorithm=OBJ_nid2obj(NID_undef);
-        ret->parameter=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_ALGOR_NEW);
-        }
-
-void X509_ALGOR_free(X509_ALGOR *a)
-        {
-        if (a == NULL) return;
-        ASN1_OBJECT_free(a->algorithm);
-        ASN1_TYPE_free(a->parameter);
-        Free((char *)a);
-        }
-
-IMPLEMENT_STACK_OF(X509_ALGOR)
-IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c
deleted file mode 100644
index a1cbebf5a5..0000000000
--- a/src/lib/libcrypto/asn1/x_attrib.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* crypto/asn1/x_attrib.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 <openssl/objects.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-/* sequence */
-int i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **pp)
-        {
-        int k=0;
-        int r=0,ret=0;
-        unsigned char **p=NULL;
-
-        if (a == NULL) return(0);
-
-        p=NULL;
-        for (;;)
-                {
-                if (k)
-                        {
-                        r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE);
-                        if (pp == NULL) return(r);
-                        p=pp;
-                        ASN1_put_object(p,1,ret,V_ASN1_SEQUENCE,
-                                V_ASN1_UNIVERSAL);
-                        }
-
-                ret+=i2d_ASN1_OBJECT(a->object,p);
-                if (a->set)
-                        ret+=i2d_ASN1_SET_OF_ASN1_TYPE(a->value.set,p,i2d_ASN1_TYPE,
-                                V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-                else
-                        ret+=i2d_ASN1_TYPE(a->value.single,p);
-                if (k++) return(r);
-                }
-        }
-
-X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,X509_ATTRIBUTE *,X509_ATTRIBUTE_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->object,d2i_ASN1_OBJECT);
-
-        if ((c.slen != 0) &&
-                (M_ASN1_next == (V_ASN1_CONSTRUCTED|V_ASN1_UNIVERSAL|V_ASN1_SET)))
-                {
-                ret->set=1;
-                M_ASN1_D2I_get_set_type(ASN1_TYPE,ret->value.set,d2i_ASN1_TYPE,
-                                        ASN1_TYPE_free);
-                }
-        else
-                {
-                ret->set=0;
-                M_ASN1_D2I_get(ret->value.single,d2i_ASN1_TYPE);
-                }
-
-        M_ASN1_D2I_Finish(a,X509_ATTRIBUTE_free,ASN1_F_D2I_X509_ATTRIBUTE);
-        }
-
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
-        {
-        X509_ATTRIBUTE *ret=NULL;
-        ASN1_TYPE *val=NULL;
-
-        if ((ret=X509_ATTRIBUTE_new()) == NULL)
-                return(NULL);
-        ret->object=OBJ_nid2obj(nid);
-        ret->set=1;
-        if ((ret->value.set=sk_ASN1_TYPE_new_null()) == NULL) goto err;
-        if ((val=ASN1_TYPE_new()) == NULL) goto err;
-        if (!sk_ASN1_TYPE_push(ret->value.set,val)) goto err;
-
-        ASN1_TYPE_set(val,atrtype,value);
-        return(ret);
-err:
-        if (ret != NULL) X509_ATTRIBUTE_free(ret);
-        if (val != NULL) ASN1_TYPE_free(val);
-        return(NULL);
-        }
-
-X509_ATTRIBUTE *X509_ATTRIBUTE_new(void)
-        {
-        X509_ATTRIBUTE *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_ATTRIBUTE);
-        ret->object=OBJ_nid2obj(NID_undef);
-        ret->set=0;
-        ret->value.ptr=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_ATTRIBUTE_NEW);
-        }
-        
-void X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
-        {
-        if (a == NULL) return;
-        ASN1_OBJECT_free(a->object);
-        if (a->set)
-                sk_ASN1_TYPE_pop_free(a->value.set,ASN1_TYPE_free);
-        else
-                ASN1_TYPE_free(a->value.single);
-        Free((char *)a);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
deleted file mode 100644
index cd46bbebc2..0000000000
--- a/src/lib/libcrypto/asn1/x_crl.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/* crypto/asn1/x_crl.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-static int X509_REVOKED_cmp(X509_REVOKED **a,X509_REVOKED **b);
-static int X509_REVOKED_seq_cmp(X509_REVOKED **a,X509_REVOKED **b);
-int i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->serialNumber,i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len(a->revocationDate,i2d_ASN1_TIME);
-        M_ASN1_I2D_len_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
-                                         i2d_X509_EXTENSION);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->serialNumber,i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put(a->revocationDate,i2d_ASN1_TIME);
-        M_ASN1_I2D_put_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
-                                         i2d_X509_EXTENSION);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_REVOKED *d2i_X509_REVOKED(X509_REVOKED **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,X509_REVOKED *,X509_REVOKED_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->serialNumber,d2i_ASN1_INTEGER);
-        M_ASN1_D2I_get(ret->revocationDate,d2i_ASN1_TIME);
-        M_ASN1_D2I_get_seq_opt_type(X509_EXTENSION,ret->extensions,
-                                    d2i_X509_EXTENSION,X509_EXTENSION_free);
-        M_ASN1_D2I_Finish(a,X509_REVOKED_free,ASN1_F_D2I_X509_REVOKED);
-        }
-
-int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **pp)
-        {
-        int v1=0;
-        long l=0;
-        int (*old_cmp)(X509_REVOKED **,X509_REVOKED **);
-        M_ASN1_I2D_vars(a);
-        
-        old_cmp=sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_seq_cmp);
-        sk_X509_REVOKED_sort(a->revoked);
-        sk_X509_REVOKED_set_cmp_func(a->revoked,old_cmp);
-
-        if ((a->version != NULL) && ((l=ASN1_INTEGER_get(a->version)) != 0))
-                {
-                M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
-                }
-        M_ASN1_I2D_len(a->sig_alg,i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->issuer,i2d_X509_NAME);
-        M_ASN1_I2D_len(a->lastUpdate,i2d_ASN1_TIME);
-        if (a->nextUpdate != NULL)
-                { M_ASN1_I2D_len(a->nextUpdate,i2d_ASN1_TIME); }
-        M_ASN1_I2D_len_SEQUENCE_opt_type(X509_REVOKED,a->revoked,
-                                         i2d_X509_REVOKED);
-        M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
-                                             i2d_X509_EXTENSION,0,
-                                             V_ASN1_SEQUENCE,v1);
-
-        M_ASN1_I2D_seq_total();
-
-        if ((a->version != NULL) && (l != 0))
-                {
-                M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
-                }
-        M_ASN1_I2D_put(a->sig_alg,i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->issuer,i2d_X509_NAME);
-        M_ASN1_I2D_put(a->lastUpdate,i2d_ASN1_UTCTIME);
-        if (a->nextUpdate != NULL)
-                { M_ASN1_I2D_put(a->nextUpdate,i2d_ASN1_UTCTIME); }
-        M_ASN1_I2D_put_SEQUENCE_opt_type(X509_REVOKED,a->revoked,
-                                         i2d_X509_REVOKED);
-        M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
-                                             i2d_X509_EXTENSION,0,
-                                             V_ASN1_SEQUENCE,v1);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_CRL_INFO *d2i_X509_CRL_INFO(X509_CRL_INFO **a, unsigned char **pp,
-             long length)
-        {
-        int i,ver=0;
-        M_ASN1_D2I_vars(a,X509_CRL_INFO *,X509_CRL_INFO_new);
-
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_opt(ret->version,d2i_ASN1_INTEGER,V_ASN1_INTEGER);
-        if (ret->version != NULL)
-                ver=ret->version->data[0];
-        
-        if ((ver == 0) && (ret->version != NULL))
-                {
-                ASN1_INTEGER_free(ret->version);
-                ret->version=NULL;
-                }
-        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->issuer,d2i_X509_NAME);
-        M_ASN1_D2I_get(ret->lastUpdate,d2i_ASN1_TIME);
-        /* Manually handle the OPTIONAL ASN1_TIME stuff */
-        if(c.slen != 0
-           && ( (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
-                    (V_ASN1_UNIVERSAL|V_ASN1_UTCTIME)
-                || (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
-                    (V_ASN1_UNIVERSAL|V_ASN1_GENERALIZEDTIME) ) ) {
-                M_ASN1_D2I_get(ret->nextUpdate,d2i_ASN1_TIME);
-        }
-        if(!ret->nextUpdate) 
-                M_ASN1_D2I_get_opt(ret->nextUpdate,d2i_ASN1_GENERALIZEDTIME,
-                                                        V_ASN1_GENERALIZEDTIME);
-        if (ret->revoked != NULL)
-                {
-                while (sk_X509_REVOKED_num(ret->revoked))
-                        X509_REVOKED_free(sk_X509_REVOKED_pop(ret->revoked));
-                }
-        M_ASN1_D2I_get_seq_opt_type(X509_REVOKED,ret->revoked,d2i_X509_REVOKED,
-                                    X509_REVOKED_free);
-
-        if (ret->revoked != NULL)
-                {
-                for (i=0; i<sk_X509_REVOKED_num(ret->revoked); i++)
-                        {
-                        sk_X509_REVOKED_value(ret->revoked,i)->sequence=i;
-                        }
-                }
-
-        if (ver >= 1)
-                {
-                if (ret->extensions != NULL)
-                        {
-                        while (sk_X509_EXTENSION_num(ret->extensions))
-                                X509_EXTENSION_free(
-                                sk_X509_EXTENSION_pop(ret->extensions));
-                        }
-                        
-                M_ASN1_D2I_get_EXP_set_opt_type(X509_EXTENSION,ret->extensions,
-                                                d2i_X509_EXTENSION,
-                                                X509_EXTENSION_free,0,
-                                                V_ASN1_SEQUENCE);
-                }
-
-        M_ASN1_D2I_Finish(a,X509_CRL_INFO_free,ASN1_F_D2I_X509_CRL_INFO);
-        }
-
-int i2d_X509_CRL(X509_CRL *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->crl,i2d_X509_CRL_INFO);
-        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->crl,i2d_X509_CRL_INFO);
-        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_CRL *d2i_X509_CRL(X509_CRL **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509_CRL *,X509_CRL_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->crl,d2i_X509_CRL_INFO);
-        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_CRL_free,ASN1_F_D2I_X509_CRL);
-        }
-
-
-X509_REVOKED *X509_REVOKED_new(void)
-        {
-        X509_REVOKED *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_REVOKED);
-        M_ASN1_New(ret->serialNumber,ASN1_INTEGER_new);
-        M_ASN1_New(ret->revocationDate,ASN1_UTCTIME_new);
-        ret->extensions=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_REVOKED_NEW);
-        }
-
-X509_CRL_INFO *X509_CRL_INFO_new(void)
-        {
-        X509_CRL_INFO *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_CRL_INFO);
-        ret->version=NULL;
-        M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
-        M_ASN1_New(ret->issuer,X509_NAME_new);
-        M_ASN1_New(ret->lastUpdate,ASN1_UTCTIME_new);
-        ret->nextUpdate=NULL;
-        M_ASN1_New(ret->revoked,sk_X509_REVOKED_new_null);
-        M_ASN1_New(ret->extensions,sk_X509_EXTENSION_new_null);
-        sk_X509_REVOKED_set_cmp_func(ret->revoked,X509_REVOKED_cmp);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_CRL_INFO_NEW);
-        }
-
-X509_CRL *X509_CRL_new(void)
-        {
-        X509_CRL *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_CRL);
-        ret->references=1;
-        M_ASN1_New(ret->crl,X509_CRL_INFO_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_CRL_NEW);
-        }
-
-void X509_REVOKED_free(X509_REVOKED *a)
-        {
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->serialNumber);
-        ASN1_UTCTIME_free(a->revocationDate);
-        sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
-        Free(a);
-        }
-
-void X509_CRL_INFO_free(X509_CRL_INFO *a)
-        {
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
-        X509_ALGOR_free(a->sig_alg);
-        X509_NAME_free(a->issuer);
-        ASN1_UTCTIME_free(a->lastUpdate);
-        if (a->nextUpdate)
-                ASN1_UTCTIME_free(a->nextUpdate);
-        sk_X509_REVOKED_pop_free(a->revoked,X509_REVOKED_free);
-        sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
-        Free(a);
-        }
-
-void X509_CRL_free(X509_CRL *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-
-        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_X509_CRL);
-#ifdef REF_PRINT
-        REF_PRINT("X509_CRL",a);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_CRL_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        X509_CRL_INFO_free(a->crl);
-        X509_ALGOR_free(a->sig_alg);
-        ASN1_BIT_STRING_free(a->signature);
-        Free(a);
-        }
-
-static int X509_REVOKED_cmp(X509_REVOKED **a, X509_REVOKED **b)
-        {
-        return(ASN1_STRING_cmp(
-                (ASN1_STRING *)(*a)->serialNumber,
-                (ASN1_STRING *)(*b)->serialNumber));
-        }
-
-static int X509_REVOKED_seq_cmp(X509_REVOKED **a, X509_REVOKED **b)
-        {
-        return((*a)->sequence-(*b)->sequence);
-        }
-
-IMPLEMENT_STACK_OF(X509_REVOKED)
-IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
-IMPLEMENT_STACK_OF(X509_CRL)
-IMPLEMENT_ASN1_SET_OF(X509_CRL)
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c
deleted file mode 100644
index d5f9e1df9e..0000000000
--- a/src/lib/libcrypto/asn1/x_exten.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* crypto/asn1/x_exten.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 <openssl/objects.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_EXTENSION(X509_EXTENSION *a, unsigned char **pp)
-        {
-        int k=0;
-        int r=0,ret=0;
-        unsigned char **p=NULL;
-
-        if (a == NULL) return(0);
-
-        p=NULL;
-        for (;;)
-                {
-                if (k)
-                        {
-                        r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE);
-                        if (pp == NULL) return(r);
-                        p=pp;
-                        ASN1_put_object(p,1,ret,V_ASN1_SEQUENCE,
-                                V_ASN1_UNIVERSAL);
-                        }
-
-                ret+=i2d_ASN1_OBJECT(a->object,p);
-                if ((a->critical) || a->netscape_hack)
-                        ret+=i2d_ASN1_BOOLEAN(a->critical,p);
-                ret+=i2d_ASN1_OCTET_STRING(a->value,p);
-                if (k++) return(r);
-                }
-        }
-
-X509_EXTENSION *d2i_X509_EXTENSION(X509_EXTENSION **a, unsigned char **pp,
-             long length)
-        {
-        int i;
-        M_ASN1_D2I_vars(a,X509_EXTENSION *,X509_EXTENSION_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->object,d2i_ASN1_OBJECT);
-
-        if ((ret->argp != NULL) && (ret->ex_free != NULL))
-                ret->ex_free(ret);
-        ret->argl=0;
-        ret->argp=NULL;
-        ret->netscape_hack=0;
-        if ((c.slen != 0) &&
-                (M_ASN1_next == (V_ASN1_UNIVERSAL|V_ASN1_BOOLEAN)))
-                {
-                c.q=c.p;
-                if (d2i_ASN1_BOOLEAN(&i,&c.p,c.slen) < 0) goto err;
-                ret->critical=i;
-                c.slen-=(c.p-c.q);
-                if (ret->critical == 0) ret->netscape_hack=1;
-                }
-        M_ASN1_D2I_get(ret->value,d2i_ASN1_OCTET_STRING);
-
-        M_ASN1_D2I_Finish(a,X509_EXTENSION_free,ASN1_F_D2I_X509_EXTENSION);
-        }
-
-X509_EXTENSION *X509_EXTENSION_new(void)
-        {
-        X509_EXTENSION *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_EXTENSION);
-        ret->object=OBJ_nid2obj(NID_undef);
-        M_ASN1_New(ret->value,ASN1_OCTET_STRING_new);
-        ret->critical=0;
-        ret->netscape_hack=0;
-        ret->argl=0L;
-        ret->argp=NULL;
-        ret->ex_free=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_EXTENSION_NEW);
-        }
-        
-void X509_EXTENSION_free(X509_EXTENSION *a)
-        {
-        if (a == NULL) return;
-        if ((a->argp != NULL) && (a->ex_free != NULL))
-                a->ex_free(a);
-        ASN1_OBJECT_free(a->object);
-        ASN1_OCTET_STRING_free(a->value);
-        Free((char *)a);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_info.c b/src/lib/libcrypto/asn1/x_info.c
deleted file mode 100644
index 99ce011f07..0000000000
--- a/src/lib/libcrypto/asn1/x_info.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* crypto/asn1/x_info.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 <openssl/evp.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-X509_INFO *X509_INFO_new(void)
-        {
-        X509_INFO *ret=NULL;
-
-        ret=(X509_INFO *)Malloc(sizeof(X509_INFO));
-        if (ret == NULL)
-                {
-                ASN1err(ASN1_F_X509_INFO_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
- 
-        ret->enc_cipher.cipher=NULL;
-        ret->enc_len=0;
-        ret->enc_data=NULL;
- 
-        ret->references=1;
-        ret->x509=NULL;
-        ret->crl=NULL;
-        ret->x_pkey=NULL;
-        return(ret);
-        }
-
-void X509_INFO_free(X509_INFO *x)
-        {
-        int i;
-
-        if (x == NULL) return;
-
-        i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_X509_INFO);
-#ifdef REF_PRINT
-        REF_PRINT("X509_INFO",x);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_INFO_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        if (x->x509 != NULL) X509_free(x->x509);
-        if (x->crl != NULL) X509_CRL_free(x->crl);
-        if (x->x_pkey != NULL) X509_PKEY_free(x->x_pkey);
-        Free((char *)x);
-        }
-
-IMPLEMENT_STACK_OF(X509_INFO)
-
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
deleted file mode 100644
index b09fba33fb..0000000000
--- a/src/lib/libcrypto/asn1/x_name.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* crypto/asn1/x_name.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 <openssl/objects.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-static int i2d_X509_NAME_entries(X509_NAME *a);
-int i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->object,i2d_ASN1_OBJECT);
-        M_ASN1_I2D_len(a->value,i2d_ASN1_PRINTABLE);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->object,i2d_ASN1_OBJECT);
-        M_ASN1_I2D_put(a->value,i2d_ASN1_PRINTABLE);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_NAME_ENTRY *d2i_X509_NAME_ENTRY(X509_NAME_ENTRY **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,X509_NAME_ENTRY *,X509_NAME_ENTRY_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->object,d2i_ASN1_OBJECT);
-        M_ASN1_D2I_get(ret->value,d2i_ASN1_PRINTABLE);
-        ret->set=0;
-        M_ASN1_D2I_Finish(a,X509_NAME_ENTRY_free,ASN1_F_D2I_X509_NAME_ENTRY);
-        }
-
-int i2d_X509_NAME(X509_NAME *a, unsigned char **pp)
-        {
-        int ret;
-
-        if (a == NULL) return(0);
-        if (a->modified)
-                {
-                ret=i2d_X509_NAME_entries(a);
-                if (ret < 0) return(ret);
-                }
-
-        ret=a->bytes->length;
-        if (pp != NULL)
-                {
-                memcpy(*pp,a->bytes->data,ret);
-                *pp+=ret;
-                }
-        return(ret);
-        }
-
-static int i2d_X509_NAME_entries(X509_NAME *a)
-        {
-        X509_NAME_ENTRY *ne,*fe=NULL;
-        STACK_OF(X509_NAME_ENTRY) *sk;
-        BUF_MEM *buf=NULL;
-        int set=0,r,ret=0;
-        int i;
-        unsigned char *p;
-        int size=0;
-
-        sk=a->entries;
-        for (i=0; i<sk_X509_NAME_ENTRY_num(sk); i++)
-                {
-                ne=sk_X509_NAME_ENTRY_value(sk,i);
-                if (fe == NULL)
-                        {
-                        fe=ne;
-                        size=0;
-                        }
-
-                if (ne->set != set)
-                        {
-                        ret+=ASN1_object_size(1,size,V_ASN1_SET);
-                        fe->size=size;
-                        fe=ne;
-                        size=0;
-                        set=ne->set;
-                        }
-                size+=i2d_X509_NAME_ENTRY(ne,NULL);
-                }
-
-        ret+=ASN1_object_size(1,size,V_ASN1_SET);
-        if (fe != NULL)
-                fe->size=size;
-
-        r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE);
-
-        buf=a->bytes;
-        if (!BUF_MEM_grow(buf,r)) goto err;
-        p=(unsigned char *)buf->data;
-
-        ASN1_put_object(&p,1,ret,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-
-        set= -1;
-        for (i=0; i<sk_X509_NAME_ENTRY_num(sk); i++)
-                {
-                ne=sk_X509_NAME_ENTRY_value(sk,i);
-                if (set != ne->set)
-                        {
-                        set=ne->set;
-                        ASN1_put_object(&p,1,ne->size,
-                                V_ASN1_SET,V_ASN1_UNIVERSAL);
-                        }
-                i2d_X509_NAME_ENTRY(ne,&p);
-                }
-        a->modified=0;
-        return(r);
-err:
-        return(-1);
-        }
-
-X509_NAME *d2i_X509_NAME(X509_NAME **a, unsigned char **pp, long length)
-        {
-        int set=0,i;
-        int idx=0;
-        unsigned char *orig;
-        M_ASN1_D2I_vars(a,X509_NAME *,X509_NAME_new);
-
-        orig= *pp;
-        if (sk_X509_NAME_ENTRY_num(ret->entries) > 0)
-                {
-                while (sk_X509_NAME_ENTRY_num(ret->entries) > 0)
-                        X509_NAME_ENTRY_free(
-                                       sk_X509_NAME_ENTRY_pop(ret->entries));
-                }
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        for (;;)
-                {
-                if (M_ASN1_D2I_end_sequence()) break;
-                M_ASN1_D2I_get_set_type(X509_NAME_ENTRY,ret->entries,
-                                        d2i_X509_NAME_ENTRY,
-                                        X509_NAME_ENTRY_free);
-                for (; idx < sk_X509_NAME_ENTRY_num(ret->entries); idx++)
-                        {
-                        sk_X509_NAME_ENTRY_value(ret->entries,idx)->set=set;
-                        }
-                set++;
-                }
-
-        i=(int)(c.p-orig);
-        if (!BUF_MEM_grow(ret->bytes,i)) goto err;
-        memcpy(ret->bytes->data,orig,i);
-        ret->bytes->length=i;
-        ret->modified=0;
-
-        M_ASN1_D2I_Finish(a,X509_NAME_free,ASN1_F_D2I_X509_NAME);
-        }
-
-X509_NAME *X509_NAME_new(void)
-        {
-        X509_NAME *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_NAME);
-        if ((ret->entries=sk_X509_NAME_ENTRY_new(NULL)) == NULL)
-                { c.line=__LINE__; goto err2; }
-        M_ASN1_New(ret->bytes,BUF_MEM_new);
-        ret->modified=1;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_NAME_NEW);
-        }
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_new(void)
-        {
-        X509_NAME_ENTRY *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_NAME_ENTRY);
-/*      M_ASN1_New(ret->object,ASN1_OBJECT_new);*/
-        ret->object=NULL;
-        ret->set=0;
-        M_ASN1_New(ret->value,ASN1_STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_NAME_ENTRY_NEW);
-        }
-
-void X509_NAME_free(X509_NAME *a)
-        {
-        if(a == NULL)
-            return;
-
-        BUF_MEM_free(a->bytes);
-        sk_X509_NAME_ENTRY_pop_free(a->entries,X509_NAME_ENTRY_free);
-        Free(a);
-        }
-
-void X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
-        {
-        if (a == NULL) return;
-        ASN1_OBJECT_free(a->object);
-        ASN1_BIT_STRING_free(a->value);
-        Free(a);
-        }
-
-int X509_NAME_set(X509_NAME **xn, X509_NAME *name)
-        {
-        X509_NAME *in;
-
-        if (*xn == NULL) return(0);
-
-        if (*xn != name)
-                {
-                in=X509_NAME_dup(name);
-                if (in != NULL)
-                        {
-                        X509_NAME_free(*xn);
-                        *xn=in;
-                        }
-                }
-        return(*xn != NULL);
-        }
-        
-IMPLEMENT_STACK_OF(X509_NAME_ENTRY)
-IMPLEMENT_ASN1_SET_OF(X509_NAME_ENTRY)
diff --git a/src/lib/libcrypto/asn1/x_pkey.c b/src/lib/libcrypto/asn1/x_pkey.c
deleted file mode 100644
index b0057eb212..0000000000
--- a/src/lib/libcrypto/asn1/x_pkey.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* crypto/asn1/x_pkey.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-/* need to implement */
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp)
-        {
-        return(0);
-        }
-
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, unsigned char **pp, long length)
-        {
-        int i;
-        M_ASN1_D2I_vars(a,X509_PKEY *,X509_PKEY_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->enc_algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->enc_pkey,d2i_ASN1_OCTET_STRING);
-
-        ret->cipher.cipher=EVP_get_cipherbyname(
-                OBJ_nid2ln(OBJ_obj2nid(ret->enc_algor->algorithm)));
-        if (ret->cipher.cipher == NULL)
-                {
-                c.error=ASN1_R_UNSUPPORTED_CIPHER;
-                c.line=__LINE__;
-                goto err;
-                }
-        if (ret->enc_algor->parameter->type == V_ASN1_OCTET_STRING) 
-                {
-                i=ret->enc_algor->parameter->value.octet_string->length;
-                if (i > EVP_MAX_IV_LENGTH)
-                        {
-                        c.error=ASN1_R_IV_TOO_LARGE;
-                        c.line=__LINE__;
-                        goto err;
-                        }
-                memcpy(ret->cipher.iv,
-                        ret->enc_algor->parameter->value.octet_string->data,i);
-                }
-        else
-                memset(ret->cipher.iv,0,EVP_MAX_IV_LENGTH);
-        M_ASN1_D2I_Finish(a,X509_PKEY_free,ASN1_F_D2I_X509_PKEY);
-        }
-
-X509_PKEY *X509_PKEY_new(void)
-        {
-        X509_PKEY *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_PKEY);
-        ret->version=0;
-        M_ASN1_New(ret->enc_algor,X509_ALGOR_new);
-        M_ASN1_New(ret->enc_pkey,ASN1_OCTET_STRING_new);
-        ret->dec_pkey=NULL;
-        ret->key_length=0;
-        ret->key_data=NULL;
-        ret->key_free=0;
-        ret->cipher.cipher=NULL;
-        memset(ret->cipher.iv,0,EVP_MAX_IV_LENGTH);
-        ret->references=1;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_PKEY_NEW);
-        }
-
-void X509_PKEY_free(X509_PKEY *x)
-        {
-        int i;
-
-        if (x == NULL) return;
-
-        i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_X509_PKEY);
-#ifdef REF_PRINT
-        REF_PRINT("X509_PKEY",x);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_PKEY_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        if (x->enc_algor != NULL) X509_ALGOR_free(x->enc_algor);
-        if (x->enc_pkey != NULL) ASN1_OCTET_STRING_free(x->enc_pkey);
-        if (x->dec_pkey != NULL)EVP_PKEY_free(x->dec_pkey);
-        if ((x->key_data != NULL) && (x->key_free)) Free((char *)x->key_data);
-        Free((char *)(char *)x);
-        }
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
deleted file mode 100644
index 4ac32c59dd..0000000000
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* crypto/asn1/x_pubkey.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_PUBKEY(X509_PUBKEY *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->public_key,   i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->public_key,   i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_PUBKEY *d2i_X509_PUBKEY(X509_PUBKEY **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,X509_PUBKEY *,X509_PUBKEY_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->public_key,d2i_ASN1_BIT_STRING);
-        if (ret->pkey != NULL)
-                {
-                EVP_PKEY_free(ret->pkey);
-                ret->pkey=NULL;
-                }
-        M_ASN1_D2I_Finish(a,X509_PUBKEY_free,ASN1_F_D2I_X509_PUBKEY);
-        }
-
-X509_PUBKEY *X509_PUBKEY_new(void)
-        {
-        X509_PUBKEY *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_PUBKEY);
-        M_ASN1_New(ret->algor,X509_ALGOR_new);
-        M_ASN1_New(ret->public_key,ASN1_BIT_STRING_new);
-        ret->pkey=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_PUBKEY_NEW);
-        }
-
-void X509_PUBKEY_free(X509_PUBKEY *a)
-        {
-        if (a == NULL) return;
-        X509_ALGOR_free(a->algor);
-        ASN1_BIT_STRING_free(a->public_key);
-        if (a->pkey != NULL) EVP_PKEY_free(a->pkey);
-        Free((char *)a);
-        }
-
-int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
-        {
-        int ok=0;
-        X509_PUBKEY *pk;
-        X509_ALGOR *a;
-        ASN1_OBJECT *o;
-        unsigned char *s,*p;
-        int i;
-
-        if (x == NULL) return(0);
-
-        if ((pk=X509_PUBKEY_new()) == NULL) goto err;
-        a=pk->algor;
-
-        /* set the algorithm id */
-        if ((o=OBJ_nid2obj(pkey->type)) == NULL) goto err;
-        ASN1_OBJECT_free(a->algorithm);
-        a->algorithm=o;
-
-        /* Set the parameter list */
-        if (!pkey->save_parameters || (pkey->type == EVP_PKEY_RSA))
-                {
-                if ((a->parameter == NULL) ||
-                        (a->parameter->type != V_ASN1_NULL))
-                        {
-                        ASN1_TYPE_free(a->parameter);
-                        a->parameter=ASN1_TYPE_new();
-                        a->parameter->type=V_ASN1_NULL;
-                        }
-                }
-        else
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                {
-                unsigned char *pp;
-                DSA *dsa;
-
-                dsa=pkey->pkey.dsa;
-                dsa->write_params=0;
-                ASN1_TYPE_free(a->parameter);
-                i=i2d_DSAparams(dsa,NULL);
-                p=(unsigned char *)Malloc(i);
-                pp=p;
-                i2d_DSAparams(dsa,&pp);
-                a->parameter=ASN1_TYPE_new();
-                a->parameter->type=V_ASN1_SEQUENCE;
-                a->parameter->value.sequence=ASN1_STRING_new();
-                ASN1_STRING_set(a->parameter->value.sequence,p,i);
-                Free(p);
-                }
-        else
-#endif
-                {
-                X509err(X509_F_X509_PUBKEY_SET,X509_R_UNSUPPORTED_ALGORITHM);
-                goto err;
-                }
-
-        if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err;
-        if ((s=(unsigned char *)Malloc(i+1)) == NULL) goto err;
-        p=s;
-        i2d_PublicKey(pkey,&p);
-        if (!ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err;
-        /* Set number of unused bits to zero */
-        pk->public_key->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
-        pk->public_key->flags|=ASN1_STRING_FLAG_BITS_LEFT;
-
-        Free(s);
-
-        CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
-        pk->pkey=pkey;
-
-        if (*x != NULL)
-                X509_PUBKEY_free(*x);
-
-        *x=pk;
-        pk=NULL;
-
-        ok=1;
-err:
-        if (pk != NULL) X509_PUBKEY_free(pk);
-        return(ok);
-        }
-
-EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
-        {
-        EVP_PKEY *ret=NULL;
-        long j;
-        int type;
-        unsigned char *p;
-#ifndef NO_DSA
-        X509_ALGOR *a;
-#endif
-
-        if (key == NULL) goto err;
-
-        if (key->pkey != NULL)
-            {
-            CRYPTO_add(&key->pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
-            return(key->pkey);
-            }
-
-        if (key->public_key == NULL) goto err;
-
-        type=OBJ_obj2nid(key->algor->algorithm);
-        p=key->public_key->data;
-        j=key->public_key->length;
-        if ((ret=d2i_PublicKey(type,NULL,&p,(long)j)) == NULL)
-                {
-                X509err(X509_F_X509_PUBKEY_GET,X509_R_ERR_ASN1_LIB);
-                goto err;
-                }
-        ret->save_parameters=0;
-
-#ifndef NO_DSA
-        a=key->algor;
-        if (ret->type == EVP_PKEY_DSA)
-                {
-                if (a->parameter->type == V_ASN1_SEQUENCE)
-                        {
-                        ret->pkey.dsa->write_params=0;
-                        p=a->parameter->value.sequence->data;
-                        j=a->parameter->value.sequence->length;
-                        if (!d2i_DSAparams(&ret->pkey.dsa,&p,(long)j))
-                                goto err;
-                        }
-                ret->save_parameters=1;
-                }
-#endif
-        key->pkey=ret;
-        CRYPTO_add(&ret->references,1,CRYPTO_LOCK_EVP_PKEY);
-        return(ret);
-err:
-        if (ret != NULL)
-                EVP_PKEY_free(ret);
-        return(NULL);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
deleted file mode 100644
index 9b1d6abe64..0000000000
--- a/src/lib/libcrypto/asn1/x_req.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* crypto/asn1/x_req.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->version,              i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len(a->subject,              i2d_X509_NAME);
-        M_ASN1_I2D_len(a->pubkey,               i2d_X509_PUBKEY);
-
-        /* this is a *nasty* hack reported to be required to
-         * allow some CA Software to accept the cert request.
-         * It is not following the PKCS standards ...
-         * PKCS#10 pg 5
-         * attributes [0] IMPLICIT Attibutes
-         * NOTE: no OPTIONAL ... so it *must* be there
-         */
-        if (a->req_kludge) 
-                {
-                M_ASN1_I2D_len_IMP_SET_opt_type(X509_ATTRIBUTE,a->attributes,i2d_X509_ATTRIBUTE,0);
-                }
-        else
-                {
-                M_ASN1_I2D_len_IMP_SET_type(X509_ATTRIBUTE,a->attributes,
-                                            i2d_X509_ATTRIBUTE,0);
-                }
-        
-        M_ASN1_I2D_seq_total();
-        M_ASN1_I2D_put(a->version,              i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put(a->subject,              i2d_X509_NAME);
-        M_ASN1_I2D_put(a->pubkey,               i2d_X509_PUBKEY);
-
-        /* this is a *nasty* hack reported to be required by some CA's.
-         * It is not following the PKCS standards ...
-         * PKCS#10 pg 5
-         * attributes [0] IMPLICIT Attibutes
-         * NOTE: no OPTIONAL ... so it *must* be there
-         */
-        if (a->req_kludge)
-                {
-                M_ASN1_I2D_put_IMP_SET_opt_type(X509_ATTRIBUTE,a->attributes,
-                                                i2d_X509_ATTRIBUTE,0);
-                }
-        else
-                {
-                M_ASN1_I2D_put_IMP_SET_type(X509_ATTRIBUTE,a->attributes,
-                                            i2d_X509_ATTRIBUTE,0);
-                }
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_REQ_INFO *d2i_X509_REQ_INFO(X509_REQ_INFO **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,X509_REQ_INFO *,X509_REQ_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->subject,d2i_X509_NAME);
-        M_ASN1_D2I_get(ret->pubkey,d2i_X509_PUBKEY);
-
-        /* this is a *nasty* hack to allow for some CA's that
-         * have been reported as requiring it.
-         * It is not following the PKCS standards ...
-         * PKCS#10 pg 5
-         * attributes [0] IMPLICIT Attibutes
-         * NOTE: no OPTIONAL ... so it *must* be there
-         */
-        if (asn1_Finish(&c))
-                ret->req_kludge=1;
-        else
-                {
-                M_ASN1_D2I_get_IMP_set_type(X509_ATTRIBUTE,ret->attributes,
-                                            d2i_X509_ATTRIBUTE,
-                                            X509_ATTRIBUTE_free,0);
-                }
-
-        M_ASN1_D2I_Finish(a,X509_REQ_INFO_free,ASN1_F_D2I_X509_REQ_INFO);
-        }
-
-X509_REQ_INFO *X509_REQ_INFO_new(void)
-        {
-        X509_REQ_INFO *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_REQ_INFO);
-        M_ASN1_New(ret->version,ASN1_INTEGER_new);
-        M_ASN1_New(ret->subject,X509_NAME_new);
-        M_ASN1_New(ret->pubkey,X509_PUBKEY_new);
-        M_ASN1_New(ret->attributes,sk_X509_ATTRIBUTE_new_null);
-        ret->req_kludge=0;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_REQ_INFO_NEW);
-        }
-        
-void X509_REQ_INFO_free(X509_REQ_INFO *a)
-        {
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
-        X509_NAME_free(a->subject);
-        X509_PUBKEY_free(a->pubkey);
-        sk_X509_ATTRIBUTE_pop_free(a->attributes,X509_ATTRIBUTE_free);
-        Free((char *)a);
-        }
-
-int i2d_X509_REQ(X509_REQ *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-        M_ASN1_I2D_len(a->req_info,     i2d_X509_REQ_INFO);
-        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->req_info,     i2d_X509_REQ_INFO);
-        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_REQ *d2i_X509_REQ(X509_REQ **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509_REQ *,X509_REQ_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->req_info,d2i_X509_REQ_INFO);
-        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_REQ_free,ASN1_F_D2I_X509_REQ);
-        }
-
-X509_REQ *X509_REQ_new(void)
-        {
-        X509_REQ *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_REQ);
-        ret->references=1;
-        M_ASN1_New(ret->req_info,X509_REQ_INFO_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_REQ_NEW);
-        }
-
-void X509_REQ_free(X509_REQ *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-
-        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_X509_REQ);
-#ifdef REF_PRINT
-        REF_PRINT("X509_REQ",a);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_REQ_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        X509_REQ_INFO_free(a->req_info);
-        X509_ALGOR_free(a->sig_alg);
-        ASN1_BIT_STRING_free(a->signature);
-        Free((char *)a);
-        }
-
-
diff --git a/src/lib/libcrypto/asn1/x_sig.c b/src/lib/libcrypto/asn1/x_sig.c
deleted file mode 100644
index c2782d1b9c..0000000000
--- a/src/lib/libcrypto/asn1/x_sig.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/asn1/x_sig.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_SIG(X509_SIG *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->digest,       i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->algor,        i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->digest,       i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_SIG *d2i_X509_SIG(X509_SIG **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509_SIG *,X509_SIG_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->digest,d2i_ASN1_OCTET_STRING);
-        M_ASN1_D2I_Finish(a,X509_SIG_free,ASN1_F_D2I_X509_SIG);
-        }
-
-X509_SIG *X509_SIG_new(void)
-        {
-        X509_SIG *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_SIG);
-        M_ASN1_New(ret->algor,X509_ALGOR_new);
-        M_ASN1_New(ret->digest,ASN1_OCTET_STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_SIG_NEW);
-        }
-
-void X509_SIG_free(X509_SIG *a)
-        {
-        if (a == NULL) return;
-        X509_ALGOR_free(a->algor);
-        ASN1_OCTET_STRING_free(a->digest);
-        Free((char *)a);
-        }
-
-
diff --git a/src/lib/libcrypto/asn1/x_spki.c b/src/lib/libcrypto/asn1/x_spki.c
deleted file mode 100644
index 43e0023839..0000000000
--- a/src/lib/libcrypto/asn1/x_spki.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* crypto/asn1/x_spki.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 module was send to me my Pat Richards <patr@x509.com> who
-  * wrote it.  It is under my Copyright with his permision
-  */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/x509.h>
-#include <openssl/asn1_mac.h>
-
-int i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->pubkey,       i2d_X509_PUBKEY);
-        M_ASN1_I2D_len(a->challenge,    i2d_ASN1_IA5STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->pubkey,       i2d_X509_PUBKEY);
-        M_ASN1_I2D_put(a->challenge,    i2d_ASN1_IA5STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-NETSCAPE_SPKAC *d2i_NETSCAPE_SPKAC(NETSCAPE_SPKAC **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,NETSCAPE_SPKAC *,NETSCAPE_SPKAC_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->pubkey,d2i_X509_PUBKEY);
-        M_ASN1_D2I_get(ret->challenge,d2i_ASN1_IA5STRING);
-        M_ASN1_D2I_Finish(a,NETSCAPE_SPKAC_free,ASN1_F_D2I_NETSCAPE_SPKAC);
-        }
-
-NETSCAPE_SPKAC *NETSCAPE_SPKAC_new(void)
-        {
-        NETSCAPE_SPKAC *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,NETSCAPE_SPKAC);
-        M_ASN1_New(ret->pubkey,X509_PUBKEY_new);
-        M_ASN1_New(ret->challenge,ASN1_IA5STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_NETSCAPE_SPKAC_NEW);
-        }
-
-void NETSCAPE_SPKAC_free(NETSCAPE_SPKAC *a)
-        {
-        if (a == NULL) return;
-        X509_PUBKEY_free(a->pubkey);
-        ASN1_IA5STRING_free(a->challenge);
-        Free((char *)a);
-        }
-
-int i2d_NETSCAPE_SPKI(NETSCAPE_SPKI *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->spkac,        i2d_NETSCAPE_SPKAC);
-        M_ASN1_I2D_len(a->sig_algor,    i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->signature,    i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->spkac,        i2d_NETSCAPE_SPKAC);
-        M_ASN1_I2D_put(a->sig_algor,    i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->signature,    i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-NETSCAPE_SPKI *d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,NETSCAPE_SPKI *,NETSCAPE_SPKI_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->spkac,d2i_NETSCAPE_SPKAC);
-        M_ASN1_D2I_get(ret->sig_algor,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-        M_ASN1_D2I_Finish(a,NETSCAPE_SPKI_free,ASN1_F_D2I_NETSCAPE_SPKI);
-        }
-
-NETSCAPE_SPKI *NETSCAPE_SPKI_new(void)
-        {
-        NETSCAPE_SPKI *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,NETSCAPE_SPKI);
-        M_ASN1_New(ret->spkac,NETSCAPE_SPKAC_new);
-        M_ASN1_New(ret->sig_algor,X509_ALGOR_new);
-        M_ASN1_New(ret->signature,ASN1_BIT_STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_NETSCAPE_SPKI_NEW);
-        }
-
-void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a)
-        {
-        if (a == NULL) return;
-        NETSCAPE_SPKAC_free(a->spkac);
-        X509_ALGOR_free(a->sig_algor);
-        ASN1_BIT_STRING_free(a->signature);
-        Free((char *)a);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_val.c b/src/lib/libcrypto/asn1/x_val.c
deleted file mode 100644
index 84d6f7ca4d..0000000000
--- a/src/lib/libcrypto/asn1/x_val.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* crypto/asn1/x_val.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 <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int i2d_X509_VAL(X509_VAL *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->notBefore,i2d_ASN1_TIME);
-        M_ASN1_I2D_len(a->notAfter,i2d_ASN1_TIME);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->notBefore,i2d_ASN1_TIME);
-        M_ASN1_I2D_put(a->notAfter,i2d_ASN1_TIME);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509_VAL *d2i_X509_VAL(X509_VAL **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509_VAL *,X509_VAL_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->notBefore,d2i_ASN1_TIME);
-        M_ASN1_D2I_get(ret->notAfter,d2i_ASN1_TIME);
-        M_ASN1_D2I_Finish(a,X509_VAL_free,ASN1_F_D2I_X509_VAL);
-        }
-
-X509_VAL *X509_VAL_new(void)
-        {
-        X509_VAL *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509_VAL);
-        M_ASN1_New(ret->notBefore,ASN1_TIME_new);
-        M_ASN1_New(ret->notAfter,ASN1_TIME_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
-        }
-
-void X509_VAL_free(X509_VAL *a)
-        {
-        if (a == NULL) return;
-        ASN1_TIME_free(a->notBefore);
-        ASN1_TIME_free(a->notAfter);
-        Free((char *)a);
-        }
-
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
deleted file mode 100644
index 7abf6b2a6b..0000000000
--- a/src/lib/libcrypto/asn1/x_x509.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* crypto/asn1/x_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 "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-static ASN1_METHOD meth={
-        (int (*)())  i2d_X509,
-        (char *(*)())d2i_X509,
-        (char *(*)())X509_new,
-        (void (*)()) X509_free};
-
-ASN1_METHOD *X509_asn1_meth(void)
-        {
-        return(&meth);
-        }
-
-int i2d_X509(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(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);
-        if (ret->name != NULL) Free(ret->name);
-        ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0);
-
-        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
-        }
-
-X509 *X509_new(void)
-        {
-        X509 *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,X509);
-        ret->references=1;
-        ret->valid=0;
-        ret->name=NULL;
-        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_free(X509 *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-
-        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_X509);
-#ifdef REF_PRINT
-        REF_PRINT("X509",a);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        /* CRYPTO_free_ex_data(bio_meth,(char *)a,&a->ex_data); */
-        X509_CINF_free(a->cert_info);
-        X509_ALGOR_free(a->sig_alg);
-        ASN1_BIT_STRING_free(a->signature);
-
-        if (a->name != NULL) Free(a->name);
-        Free((char *)a);
-        }
-
diff --git a/src/lib/libcrypto/bf/COPYRIGHT b/src/lib/libcrypto/bf/COPYRIGHT
deleted file mode 100644
index 6857223506..0000000000
--- a/src/lib/libcrypto/bf/COPYRIGHT
+++ /dev/null
@@ -1,46 +0,0 @@
-Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an Blowfish implementation written
-by Eric Young (eay@cryptsoft.com).
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution.
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other 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 Eric Young (eay@cryptsoft.com)
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The license and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distrubution license
-[including the GNU Public License.]
-
-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/libcrypto/bf/INSTALL b/src/lib/libcrypto/bf/INSTALL
deleted file mode 100644
index 3b25923532..0000000000
--- a/src/lib/libcrypto/bf/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-This Eric Young's blowfish implementation, taken from his SSLeay library
-and made available as a separate library.
- 
-The version number (0.7.2m) is the SSLeay version that this library was
-taken from.
- 
-To build, just unpack and type make.
-If you are not using gcc, edit the Makefile.
-If you are compiling for an x86 box, try the assembler (it needs improving).
-There are also some compile time options that can improve performance,
-these are documented in the Makefile.
- 
-eric 15-Apr-1997
- 
diff --git a/src/lib/libcrypto/bf/README b/src/lib/libcrypto/bf/README
deleted file mode 100644
index f2712fd0e7..0000000000
--- a/src/lib/libcrypto/bf/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a quick packaging up of my blowfish code into a library.
-It has been lifted from SSLeay.
-The copyright notices seem a little harsh because I have not spent the
-time to rewrite the conditions from the normal SSLeay ones.
-
-Basically if you just want to play with the library, not a problem.
-
-eric 15-Apr-1997
diff --git a/src/lib/libcrypto/bf/VERSION b/src/lib/libcrypto/bf/VERSION
deleted file mode 100644
index be995855e4..0000000000
--- a/src/lib/libcrypto/bf/VERSION
+++ /dev/null
@@ -1,6 +0,0 @@
-The version numbers will follow my SSL implementation
-
-0.7.2r - Some reasonable default compiler options from 
-        Peter Gutman <pgut001@cs.auckland.ac.nz>
-
-0.7.2m - the first release
diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl
deleted file mode 100644
index b556642c94..0000000000
--- a/src/lib/libcrypto/bf/asm/bf-586.pl
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/local/bin/perl
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-require "cbc.pl";
-
-&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");
-
-$BF_ROUNDS=16;
-$BF_OFF=($BF_ROUNDS+2)*4;
-$L="edi";
-$R="esi";
-$P="ebp";
-$tmp1="eax";
-$tmp2="ebx";
-$tmp3="ecx";
-$tmp4="edx";
-
-&BF_encrypt("BF_encrypt",1);
-&BF_encrypt("BF_decrypt",0);
-&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1);
-&asm_finish();
-
-sub BF_encrypt
-        {
-        local($name,$enc)=@_;
-
-        &function_begin_B($name,"");
-
-        &comment("");
-
-        &push("ebp");
-        &push("ebx");
-        &mov($tmp2,&wparam(0));
-        &mov($P,&wparam(1));
-        &push("esi");
-        &push("edi");
-
-        &comment("Load the 2 words");
-        &mov($L,&DWP(0,$tmp2,"",0));
-        &mov($R,&DWP(4,$tmp2,"",0));
-
-        &xor(   $tmp1,  $tmp1);
-
-        # encrypting part
-
-        if ($enc)
-                {
-                 &mov($tmp2,&DWP(0,$P,"",0));
-                &xor(   $tmp3,  $tmp3);
-
-                &xor($L,$tmp2);
-                for ($i=0; $i<$BF_ROUNDS; $i+=2)
-                        {
-                        &comment("");
-                        &comment("Round $i");
-                        &BF_ENCRYPT($i+1,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,1);
-
-                        &comment("");
-                        &comment("Round ".sprintf("%d",$i+1));
-                        &BF_ENCRYPT($i+2,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,1);
-                        }
-                # &mov($tmp1,&wparam(0)); In last loop
-                &mov($tmp4,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-                }
-        else
-                {
-                 &mov($tmp2,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-                &xor(   $tmp3,  $tmp3);
-
-                &xor($L,$tmp2);
-                for ($i=$BF_ROUNDS; $i>0; $i-=2)
-                        {
-                        &comment("");
-                        &comment("Round $i");
-                        &BF_ENCRYPT($i,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,0);
-                        &comment("");
-                        &comment("Round ".sprintf("%d",$i-1));
-                        &BF_ENCRYPT($i-1,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,0);
-                        }
-                # &mov($tmp1,&wparam(0)); In last loop
-                &mov($tmp4,&DWP(0,$P,"",0));
-                }
-
-        &xor($R,$tmp4);
-        &mov(&DWP(4,$tmp1,"",0),$L);
-
-        &mov(&DWP(0,$tmp1,"",0),$R);
-        &function_end($name);
-        }
-
-sub BF_ENCRYPT
-        {
-        local($i,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,$enc)=@_;
-
-        &mov(   $tmp4,          &DWP(&n2a($i*4),$P,"",0)); # for next round
-
-        &mov(   $tmp2,          $R);
-        &xor(   $L,             $tmp4);
-
-        &shr(   $tmp2,          16);
-        &mov(   $tmp4,          $R);
-
-        &movb(  &LB($tmp1),     &HB($tmp2));    # A
-        &and(   $tmp2,          0xff);          # B
-
-        &movb(  &LB($tmp3),     &HB($tmp4));    # C
-        &and(   $tmp4,          0xff);          # D
-
-        &mov(   $tmp1,          &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4));
-        &mov(   $tmp2,          &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4));
-
-        &add(   $tmp2,          $tmp1);
-        &mov(   $tmp1,          &DWP(&n2a($BF_OFF+0x0800),$P,$tmp3,4));
-
-        &xor(   $tmp2,          $tmp1);
-        &mov(   $tmp4,          &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp4,4));
-
-        &add(   $tmp2,          $tmp4);
-        if (($enc && ($i != 16)) || ((!$enc) && ($i != 1)))
-                { &xor( $tmp1,          $tmp1); }
-        else
-                {
-                &comment("Load parameter 0 ($i) enc=$enc");
-                &mov($tmp1,&wparam(0));
-                } # In last loop
-
-        &xor(   $L,             $tmp2);
-        # delay
-        }
-
-sub n2a
-        {
-        sprintf("%d",$_[0]);
-        }
-
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c
deleted file mode 100644
index 95d1cdcdf9..0000000000
--- a/src/lib/libcrypto/bf/bf_cbc.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* crypto/bf/bf_cbc.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 <openssl/blowfish.h>
-#include "bf_locl.h"
-
-void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-             BF_KEY *ks, unsigned char *iv, int encrypt)
-        {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
-        BF_LONG tin[2];
-
-        if (encrypt)
-                {
-                n2l(iv,tout0);
-                n2l(iv,tout1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        n2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                l2n(tout0,iv);
-                l2n(tout1,iv);
-                }
-        else
-                {
-                n2l(iv,xor0);
-                n2l(iv,xor1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2nn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                l2n(xor0,iv);
-                l2n(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c
deleted file mode 100644
index 1fb8905f49..0000000000
--- a/src/lib/libcrypto/bf/bf_cfb64.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* crypto/bf/bf_cfb64.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 <openssl/blowfish.h>
-#include "bf_locl.h"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
-        {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        BF_LONG ti[2];
-        unsigned char *iv,c,cc;
-
-        iv=(unsigned char *)ivec;
-        if (encrypt)
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                n2l(iv,v0); ti[0]=v0;
-                                n2l(iv,v1); ti[1]=v1;
-                                BF_encrypt((BF_LONG *)ti,schedule);
-                                iv=(unsigned char *)ivec;
-                                t=ti[0]; l2n(t,iv);
-                                t=ti[1]; l2n(t,iv);
-                                iv=(unsigned char *)ivec;
-                                }
-                        c= *(in++)^iv[n];
-                        *(out++)=c;
-                        iv[n]=c;
-                        n=(n+1)&0x07;
-                        }
-                }
-        else
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                n2l(iv,v0); ti[0]=v0;
-                                n2l(iv,v1); ti[1]=v1;
-                                BF_encrypt((BF_LONG *)ti,schedule);
-                                iv=(unsigned char *)ivec;
-                                t=ti[0]; l2n(t,iv);
-                                t=ti[1]; l2n(t,iv);
-                                iv=(unsigned char *)ivec;
-                                }
-                        cc= *(in++);
-                        c=iv[n];
-                        iv[n]=cc;
-                        *(out++)=c^cc;
-                        n=(n+1)&0x07;
-                        }
-                }
-        v0=v1=ti[0]=ti[1]=t=c=cc=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/bf/bf_ecb.c b/src/lib/libcrypto/bf/bf_ecb.c
deleted file mode 100644
index 9f8a24cdff..0000000000
--- a/src/lib/libcrypto/bf/bf_ecb.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* crypto/bf/bf_ecb.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 <openssl/blowfish.h>
-#include "bf_locl.h"
-#include <openssl/opensslv.h>
-
-/* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
- * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
- * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
- */
-
-const char *BF_version="BlowFish" OPENSSL_VERSION_PTEXT;
-
-const char *BF_options(void)
-        {
-#ifdef BF_PTR
-        return("blowfish(ptr)");
-#elif defined(BF_PTR2)
-        return("blowfish(ptr2)");
-#else
-        return("blowfish(idx)");
-#endif
-        }
-
-void BF_ecb_encrypt(unsigned char *in, unsigned char *out, BF_KEY *ks,
-             int encrypt)
-        {
-        BF_LONG l,d[2];
-
-        n2l(in,l); d[0]=l;
-        n2l(in,l); d[1]=l;
-        if (encrypt)
-                BF_encrypt(d,ks);
-        else
-                BF_decrypt(d,ks);
-        l=d[0]; l2n(l,out);
-        l=d[1]; l2n(l,out);
-        l=d[0]=d[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c
deleted file mode 100644
index ee01834561..0000000000
--- a/src/lib/libcrypto/bf/bf_enc.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* crypto/bf/bf_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 <openssl/blowfish.h>
-#include "bf_locl.h"
-
-/* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
- * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
- * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
- */
-
-#if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
-#error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
-to modify the code.
-#endif
-
-void BF_encrypt(BF_LONG *data, BF_KEY *key)
-        {
-#ifndef BF_PTR2
-        register BF_LONG l,r,*p,*s;
-
-        p=key->P;
-        s= &(key->S[0]);
-        l=data[0];
-        r=data[1];
-
-        l^=p[0];
-        BF_ENC(r,l,s,p[ 1]);
-        BF_ENC(l,r,s,p[ 2]);
-        BF_ENC(r,l,s,p[ 3]);
-        BF_ENC(l,r,s,p[ 4]);
-        BF_ENC(r,l,s,p[ 5]);
-        BF_ENC(l,r,s,p[ 6]);
-        BF_ENC(r,l,s,p[ 7]);
-        BF_ENC(l,r,s,p[ 8]);
-        BF_ENC(r,l,s,p[ 9]);
-        BF_ENC(l,r,s,p[10]);
-        BF_ENC(r,l,s,p[11]);
-        BF_ENC(l,r,s,p[12]);
-        BF_ENC(r,l,s,p[13]);
-        BF_ENC(l,r,s,p[14]);
-        BF_ENC(r,l,s,p[15]);
-        BF_ENC(l,r,s,p[16]);
-#if BF_ROUNDS == 20
-        BF_ENC(r,l,s,p[17]);
-        BF_ENC(l,r,s,p[18]);
-        BF_ENC(r,l,s,p[19]);
-        BF_ENC(l,r,s,p[20]);
-#endif
-        r^=p[BF_ROUNDS+1];
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-#else
-        register BF_LONG l,r,t,*k;
-
-        l=data[0];
-        r=data[1];
-        k=(BF_LONG*)key;
-
-        l^=k[0];
-        BF_ENC(r,l,k, 1);
-        BF_ENC(l,r,k, 2);
-        BF_ENC(r,l,k, 3);
-        BF_ENC(l,r,k, 4);
-        BF_ENC(r,l,k, 5);
-        BF_ENC(l,r,k, 6);
-        BF_ENC(r,l,k, 7);
-        BF_ENC(l,r,k, 8);
-        BF_ENC(r,l,k, 9);
-        BF_ENC(l,r,k,10);
-        BF_ENC(r,l,k,11);
-        BF_ENC(l,r,k,12);
-        BF_ENC(r,l,k,13);
-        BF_ENC(l,r,k,14);
-        BF_ENC(r,l,k,15);
-        BF_ENC(l,r,k,16);
-#if BF_ROUNDS == 20
-        BF_ENC(r,l,k,17);
-        BF_ENC(l,r,k,18);
-        BF_ENC(r,l,k,19);
-        BF_ENC(l,r,k,20);
-#endif
-        r^=k[BF_ROUNDS+1];
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-#endif
-        }
-
-#ifndef BF_DEFAULT_OPTIONS
-
-void BF_decrypt(BF_LONG *data, BF_KEY *key)
-        {
-#ifndef BF_PTR2
-        register BF_LONG l,r,*p,*s;
-
-        p=key->P;
-        s= &(key->S[0]);
-        l=data[0];
-        r=data[1];
-
-        l^=p[BF_ROUNDS+1];
-#if BF_ROUNDS == 20
-        BF_ENC(r,l,s,p[20]);
-        BF_ENC(l,r,s,p[19]);
-        BF_ENC(r,l,s,p[18]);
-        BF_ENC(l,r,s,p[17]);
-#endif
-        BF_ENC(r,l,s,p[16]);
-        BF_ENC(l,r,s,p[15]);
-        BF_ENC(r,l,s,p[14]);
-        BF_ENC(l,r,s,p[13]);
-        BF_ENC(r,l,s,p[12]);
-        BF_ENC(l,r,s,p[11]);
-        BF_ENC(r,l,s,p[10]);
-        BF_ENC(l,r,s,p[ 9]);
-        BF_ENC(r,l,s,p[ 8]);
-        BF_ENC(l,r,s,p[ 7]);
-        BF_ENC(r,l,s,p[ 6]);
-        BF_ENC(l,r,s,p[ 5]);
-        BF_ENC(r,l,s,p[ 4]);
-        BF_ENC(l,r,s,p[ 3]);
-        BF_ENC(r,l,s,p[ 2]);
-        BF_ENC(l,r,s,p[ 1]);
-        r^=p[0];
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-#else
-        register BF_LONG l,r,t,*k;
-
-        l=data[0];
-        r=data[1];
-        k=(BF_LONG *)key;
-
-        l^=k[BF_ROUNDS+1];
-#if BF_ROUNDS == 20
-        BF_ENC(r,l,k,20);
-        BF_ENC(l,r,k,19);
-        BF_ENC(r,l,k,18);
-        BF_ENC(l,r,k,17);
-#endif
-        BF_ENC(r,l,k,16);
-        BF_ENC(l,r,k,15);
-        BF_ENC(r,l,k,14);
-        BF_ENC(l,r,k,13);
-        BF_ENC(r,l,k,12);
-        BF_ENC(l,r,k,11);
-        BF_ENC(r,l,k,10);
-        BF_ENC(l,r,k, 9);
-        BF_ENC(r,l,k, 8);
-        BF_ENC(l,r,k, 7);
-        BF_ENC(r,l,k, 6);
-        BF_ENC(l,r,k, 5);
-        BF_ENC(r,l,k, 4);
-        BF_ENC(l,r,k, 3);
-        BF_ENC(r,l,k, 2);
-        BF_ENC(l,r,k, 1);
-        r^=k[0];
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-#endif
-        }
-
-void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-             BF_KEY *ks, unsigned char *iv, int encrypt)
-        {
-        register BF_LONG tin0,tin1;
-        register BF_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
-        BF_LONG tin[2];
-
-        if (encrypt)
-                {
-                n2l(iv,tout0);
-                n2l(iv,tout1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        n2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                l2n(tout0,iv);
-                l2n(tout1,iv);
-                }
-        else
-                {
-                n2l(iv,xor0);
-                n2l(iv,xor1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        BF_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2nn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                l2n(xor0,iv);
-                l2n(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
-
-#endif
diff --git a/src/lib/libcrypto/bf/bf_locl.h b/src/lib/libcrypto/bf/bf_locl.h
deleted file mode 100644
index 05756b5d3b..0000000000
--- a/src/lib/libcrypto/bf/bf_locl.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* crypto/bf/bf_locl.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BF_LOCL_H
-#define HEADER_BF_LOCL_H
-#include <openssl/opensslconf.h> /* BF_PTR, BF_PTR2 */
-
-#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 */
-
-#if defined(BF_PTR2)
-
-/*
- * This is basically a special Intel version. Point is that Intel
- * doesn't have many registers, but offers a reach choice of addressing
- * modes. So we spare some registers by directly traversing BF_KEY
- * structure and hiring the most decorated addressing mode. The code
- * generated by EGCS is *perfectly* competitive with assembler
- * implementation!
- */
-#define BF_ENC(LL,R,KEY,Pi) (\
-        LL^=KEY[Pi], \
-        t=  KEY[BF_ROUNDS+2 +   0 + ((R>>24)&0xFF)], \
-        t+= KEY[BF_ROUNDS+2 + 256 + ((R>>16)&0xFF)], \
-        t^= KEY[BF_ROUNDS+2 + 512 + ((R>>8 )&0xFF)], \
-        t+= KEY[BF_ROUNDS+2 + 768 + ((R    )&0xFF)], \
-        LL^=t \
-        )
-
-#elif defined(BF_PTR)
-
-#ifndef BF_LONG_LOG2
-#define BF_LONG_LOG2  2       /* default to BF_LONG being 32 bits */
-#endif
-#define BF_M  (0xFF<<BF_LONG_LOG2)
-#define BF_0  (24-BF_LONG_LOG2)
-#define BF_1  (16-BF_LONG_LOG2)
-#define BF_2  ( 8-BF_LONG_LOG2)
-#define BF_3  BF_LONG_LOG2 /* left shift */
-
-/*
- * This is normally very good on RISC platforms where normally you
- * have to explicitely "multiplicate" array index by sizeof(BF_LONG)
- * in order to caclulate the effective address. This implementation
- * excuses CPU from this extra work. Power[PC] uses should have most
- * fun as (R>>BF_i)&BF_M gets folded into a single instruction, namely
- * rlwinm. So let'em double-check if their compiler does it.
- */
-
-#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 is a *generic* version. Seem to perform best on platforms that
- * offer explicit support for extraction of 8-bit nibbles preferably
- * complemented with "multiplying" of array index by sizeof(BF_LONG).
- * For the moment of this writing the list comprises Alpha CPU featuring
- * extbl and s[48]addq instructions.
- */
-
-#define BF_ENC(LL,R,S,P) ( \
-        LL^=P, \
-        LL^=((( S[       ((int)(R>>24)&0xff)] + \
-                S[0x0100+((int)(R>>16)&0xff)])^ \
-                S[0x0200+((int)(R>> 8)&0xff)])+ \
-                S[0x0300+((int)(R    )&0xff)])&0xffffffffL \
-        )
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c
deleted file mode 100644
index 8ceb8d9bda..0000000000
--- a/src/lib/libcrypto/bf/bf_ofb64.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/bf/bf_ofb64.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 <openssl/blowfish.h>
-#include "bf_locl.h"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             BF_KEY *schedule, unsigned char *ivec, int *num)
-        {
-        register BF_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        unsigned char d[8];
-        register char *dp;
-        BF_LONG ti[2];
-        unsigned char *iv;
-        int save=0;
-
-        iv=(unsigned char *)ivec;
-        n2l(iv,v0);
-        n2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        dp=(char *)d;
-        l2n(v0,dp);
-        l2n(v1,dp);
-        while (l--)
-                {
-                if (n == 0)
-                        {
-                        BF_encrypt((BF_LONG *)ti,schedule);
-                        dp=(char *)d;
-                        t=ti[0]; l2n(t,dp);
-                        t=ti[1]; l2n(t,dp);
-                        save++;
-                        }
-                *(out++)= *(in++)^d[n];
-                n=(n+1)&0x07;
-                }
-        if (save)
-                {
-                v0=ti[0];
-                v1=ti[1];
-                iv=(unsigned char *)ivec;
-                l2n(v0,iv);
-                l2n(v1,iv);
-                }
-        t=v0=v1=ti[0]=ti[1]=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/bf/bf_pi.h b/src/lib/libcrypto/bf/bf_pi.h
deleted file mode 100644
index 417b935538..0000000000
--- a/src/lib/libcrypto/bf/bf_pi.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* crypto/bf/bf_pi.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 BF_KEY bf_init= {
-        {
-        0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
-        0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
-        0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
-        0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
-        0x9216d5d9L, 0x8979fb1b
-        },{
-        0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL, 0xd01adfb7L, 
-        0xb8e1afedL, 0x6a267e96L, 0xba7c9045L, 0xf12c7f99L, 
-        0x24a19947L, 0xb3916cf7L, 0x0801f2e2L, 0x858efc16L, 
-        0x636920d8L, 0x71574e69L, 0xa458fea3L, 0xf4933d7eL, 
-        0x0d95748fL, 0x728eb658L, 0x718bcd58L, 0x82154aeeL, 
-        0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L, 0x2af26013L, 
-        0xc5d1b023L, 0x286085f0L, 0xca417918L, 0xb8db38efL, 
-        0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL, 0xb01e8a3eL, 
-        0xd71577c1L, 0xbd314b27L, 0x78af2fdaL, 0x55605c60L, 
-        0xe65525f3L, 0xaa55ab94L, 0x57489862L, 0x63e81440L, 
-        0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L, 0x1141e8ceL, 
-        0xa15486afL, 0x7c72e993L, 0xb3ee1411L, 0x636fbc2aL, 
-        0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L, 0x9b87931eL, 
-        0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L, 0x28958677L, 
-        0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL, 0x66282193L, 
-        0x61d809ccL, 0xfb21a991L, 0x487cac60L, 0x5dec8032L, 
-        0xef845d5dL, 0xe98575b1L, 0xdc262302L, 0xeb651b88L, 
-        0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L, 0x83f44239L, 
-        0x2e0b4482L, 0xa4842004L, 0x69c8f04aL, 0x9e1f9b5eL, 
-        0x21c66842L, 0xf6e96c9aL, 0x670c9c61L, 0xabd388f0L, 
-        0x6a51a0d2L, 0xd8542f68L, 0x960fa728L, 0xab5133a3L, 
-        0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L, 0x7efb2a98L, 
-        0xa1f1651dL, 0x39af0176L, 0x66ca593eL, 0x82430e88L, 
-        0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L, 0x3b8b5ebeL, 
-        0xe06f75d8L, 0x85c12073L, 0x401a449fL, 0x56c16aa6L, 
-        0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L, 0x429b023dL, 
-        0x37d0d724L, 0xd00a1248L, 0xdb0fead3L, 0x49f1c09bL, 
-        0x075372c9L, 0x80991b7bL, 0x25d479d8L, 0xf6e8def7L, 
-        0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL, 0x04c006baL, 
-        0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L, 0x196a2463L, 
-        0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL, 0x3b52ec6fL, 
-        0x6dfc511fL, 0x9b30952cL, 0xcc814544L, 0xaf5ebd09L, 
-        0xbee3d004L, 0xde334afdL, 0x660f2807L, 0x192e4bb3L, 
-        0xc0cba857L, 0x45c8740fL, 0xd20b5f39L, 0xb9d3fbdbL, 
-        0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L, 0x402c7279L, 
-        0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L, 0xdb3222f8L, 
-        0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L, 0xad0552abL, 
-        0x323db5faL, 0xfd238760L, 0x53317b48L, 0x3e00df82L, 
-        0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL, 0xdf1769dbL, 
-        0xd542a8f6L, 0x287effc3L, 0xac6732c6L, 0x8c4f5573L, 
-        0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL, 0xb8f011a0L, 
-        0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL, 0x2dd1d35bL, 
-        0x9a53e479L, 0xb6f84565L, 0xd28e49bcL, 0x4bfb9790L, 
-        0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L, 0xcee4c6e8L, 
-        0xef20cadaL, 0x36774c01L, 0xd07e9efeL, 0x2bf11fb4L, 
-        0x95dbda4dL, 0xae909198L, 0xeaad8e71L, 0x6b93d5a0L, 
-        0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL, 0x8e7594b7L, 
-        0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L, 0x900df01cL, 
-        0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L, 0xb3a8c1adL, 
-        0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL, 0x8b021fa1L, 
-        0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L, 0xce89e299L, 
-        0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L, 0xd2ada8d9L, 
-        0x165fa266L, 0x80957705L, 0x93cc7314L, 0x211a1477L, 
-        0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L, 0xfb9d35cfL, 
-        0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L, 0xae1e7e49L, 
-        0x00250e2dL, 0x2071b35eL, 0x226800bbL, 0x57b8e0afL, 
-        0x2464369bL, 0xf009b91eL, 0x5563911dL, 0x59dfa6aaL, 
-        0x78c14389L, 0xd95a537fL, 0x207d5ba2L, 0x02e5b9c5L, 
-        0x83260376L, 0x6295cfa9L, 0x11c81968L, 0x4e734a41L, 
-        0xb3472dcaL, 0x7b14a94aL, 0x1b510052L, 0x9a532915L, 
-        0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L, 0x81e67400L, 
-        0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL, 0x2a0dd915L, 
-        0xb6636521L, 0xe7b9f9b6L, 0xff34052eL, 0xc5855664L, 
-        0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L, 0x6e85076aL, 
-        0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL, 0xc4192623L, 
-        0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L, 0x8fedb266L, 
-        0xecaa8c71L, 0x699a17ffL, 0x5664526cL, 0xc2b19ee1L, 
-        0x193602a5L, 0x75094c29L, 0xa0591340L, 0xe4183a3eL, 
-        0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L, 0x99f73fd6L, 
-        0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L, 0xf0255dc1L, 
-        0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L, 0x021ecc5eL, 
-        0x09686b3fL, 0x3ebaefc9L, 0x3c971814L, 0x6b6a70a1L, 
-        0x687f3584L, 0x52a0e286L, 0xb79c5305L, 0xaa500737L, 
-        0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL, 0x5716f2b8L, 
-        0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L, 0x0200b3ffL, 
-        0xae0cf51aL, 0x3cb574b2L, 0x25837a58L, 0xdc0921bdL, 
-        0xd19113f9L, 0x7ca92ff6L, 0x94324773L, 0x22f54701L, 
-        0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L, 0x9af3dda7L, 
-        0xa9446146L, 0x0fd0030eL, 0xecc8c73eL, 0xa4751e41L, 
-        0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L, 0x183eb331L, 
-        0x4e548b38L, 0x4f6db908L, 0x6f420d03L, 0xf60a04bfL, 
-        0x2cb81290L, 0x24977c79L, 0x5679b072L, 0xbcaf89afL, 
-        0xde9a771fL, 0xd9930810L, 0xb38bae12L, 0xdccf3f2eL, 
-        0x5512721fL, 0x2e6b7124L, 0x501adde6L, 0x9f84cd87L, 
-        0x7a584718L, 0x7408da17L, 0xbc9f9abcL, 0xe94b7d8cL, 
-        0xec7aec3aL, 0xdb851dfaL, 0x63094366L, 0xc464c3d2L, 
-        0xef1c1847L, 0x3215d908L, 0xdd433b37L, 0x24c2ba16L, 
-        0x12a14d43L, 0x2a65c451L, 0x50940002L, 0x133ae4ddL, 
-        0x71dff89eL, 0x10314e55L, 0x81ac77d6L, 0x5f11199bL, 
-        0x043556f1L, 0xd7a3c76bL, 0x3c11183bL, 0x5924a509L, 
-        0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL, 0x1e153c6eL, 
-        0x86e34570L, 0xeae96fb1L, 0x860e5e0aL, 0x5a3e2ab3L, 
-        0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L, 0x99e71d0fL, 
-        0x803e89d6L, 0x5266c825L, 0x2e4cc978L, 0x9c10b36aL, 
-        0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L, 0x1e0a2df4L, 
-        0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL, 0x19c27960L, 
-        0x5223a708L, 0xf71312b6L, 0xebadfe6eL, 0xeac31f66L, 
-        0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L, 0x018cff28L, 
-        0xc332ddefL, 0xbe6c5aa5L, 0x65582185L, 0x68ab9802L, 
-        0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL, 0x5b6e2f84L, 
-        0x1521b628L, 0x29076170L, 0xecdd4775L, 0x619f1510L, 
-        0x13cca830L, 0xeb61bd96L, 0x0334fe1eL, 0xaa0363cfL, 
-        0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL, 0xcbaade14L, 
-        0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL, 0xb2f3846eL, 
-        0x648b1eafL, 0x19bdf0caL, 0xa02369b9L, 0x655abb50L, 
-        0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L, 0xc021b8f7L, 
-        0x9b540b19L, 0x875fa099L, 0x95f7997eL, 0x623d7da8L, 
-        0xf837889aL, 0x97e32d77L, 0x11ed935fL, 0x16681281L, 
-        0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L, 0x7858ba99L, 
-        0x57f584a5L, 0x1b227263L, 0x9b83c3ffL, 0x1ac24696L, 
-        0xcdb30aebL, 0x532e3054L, 0x8fd948e4L, 0x6dbc3128L, 
-        0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L, 0xee7c3c73L, 
-        0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L, 0x203e13e0L, 
-        0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L, 0xfacb4fd0L, 
-        0xc742f442L, 0xef6abbb5L, 0x654f3b1dL, 0x41cd2105L, 
-        0xd81e799eL, 0x86854dc7L, 0xe44b476aL, 0x3d816250L, 
-        0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L, 0xc1c7b6a3L, 
-        0x7f1524c3L, 0x69cb7492L, 0x47848a0bL, 0x5692b285L, 
-        0x095bbf00L, 0xad19489dL, 0x1462b174L, 0x23820e00L, 
-        0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL, 0x233f7061L, 
-        0x3372f092L, 0x8d937e41L, 0xd65fecf1L, 0x6c223bdbL, 
-        0x7cde3759L, 0xcbee7460L, 0x4085f2a7L, 0xce77326eL, 
-        0xa6078084L, 0x19f8509eL, 0xe8efd855L, 0x61d99735L, 
-        0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL, 0x800bcadcL, 
-        0x9e447a2eL, 0xc3453484L, 0xfdd56705L, 0x0e1e9ec9L, 
-        0xdb73dbd3L, 0x105588cdL, 0x675fda79L, 0xe3674340L, 
-        0xc5c43465L, 0x713e38d8L, 0x3d28f89eL, 0xf16dff20L, 
-        0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL, 0xdb83adf7L, 
-        0xe93d5a68L, 0x948140f7L, 0xf64c261cL, 0x94692934L, 
-        0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL, 0xd4a20068L, 
-        0xd4082471L, 0x3320f46aL, 0x43b7d4b7L, 0x500061afL, 
-        0x1e39f62eL, 0x97244546L, 0x14214f74L, 0xbf8b8840L, 
-        0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L, 0x66a02f45L, 
-        0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L, 0x31cb8504L, 
-        0x96eb27b3L, 0x55fd3941L, 0xda2547e6L, 0xabca0a9aL, 
-        0x28507825L, 0x530429f4L, 0x0a2c86daL, 0xe9b66dfbL, 
-        0x68dc1462L, 0xd7486900L, 0x680ec0a4L, 0x27a18deeL, 
-        0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L, 0x7af4d6b6L, 
-        0xaace1e7cL, 0xd3375fecL, 0xce78a399L, 0x406b2a42L, 
-        0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL, 0x3b124e8bL, 
-        0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L, 0xeae397b2L, 
-        0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L, 0xca7820fbL, 
-        0xfb0af54eL, 0xd8feb397L, 0x454056acL, 0xba489527L, 
-        0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L, 0xd096954bL, 
-        0x55a867bcL, 0xa1159a58L, 0xcca92963L, 0x99e1db33L, 
-        0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL, 0x9029317cL, 
-        0xfdf8e802L, 0x04272f70L, 0x80bb155cL, 0x05282ce3L, 
-        0x95c11548L, 0xe4c66d22L, 0x48c1133fL, 0xc70f86dcL, 
-        0x07f9c9eeL, 0x41041f0fL, 0x404779a4L, 0x5d886e17L, 
-        0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL, 0x41113564L, 
-        0x257b7834L, 0x602a9c60L, 0xdff8e8a3L, 0x1f636c1bL, 
-        0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L, 0xcad18115L, 
-        0x6b2395e0L, 0x333e92e1L, 0x3b240b62L, 0xeebeb922L, 
-        0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL, 0x2da2f728L, 
-        0xd0127845L, 0x95b794fdL, 0x647d0862L, 0xe7ccf5f0L, 
-        0x5449a36fL, 0x877d48faL, 0xc39dfd27L, 0xf33e8d1eL, 
-        0x0a476341L, 0x992eff74L, 0x3a6f6eabL, 0xf4f8fd37L, 
-        0xa812dc60L, 0xa1ebddf8L, 0x991be14cL, 0xdb6e6b0dL, 
-        0xc67b5510L, 0x6d672c37L, 0x2765d43bL, 0xdcd0e804L, 
-        0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L, 0x690fed0bL, 
-        0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL, 0xd9155ea3L, 
-        0xbb132f88L, 0x515bad24L, 0x7b9479bfL, 0x763bd6ebL, 
-        0x37392eb3L, 0xcc115979L, 0x8026e297L, 0xf42e312dL, 
-        0x6842ada7L, 0xc66a2b3bL, 0x12754cccL, 0x782ef11cL, 
-        0x6a124237L, 0xb79251e7L, 0x06a1bbe6L, 0x4bfb6350L, 
-        0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L, 0xe2e1c3c9L, 
-        0x44421659L, 0x0a121386L, 0xd90cec6eL, 0xd5abea2aL, 
-        0x64af674eL, 0xda86a85fL, 0xbebfe988L, 0x64e4c3feL, 
-        0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L, 0x6003604dL, 
-        0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L, 0xd736fcccL, 
-        0x83426b33L, 0xf01eab71L, 0xb0804187L, 0x3c005e5fL, 
-        0x77a057beL, 0xbde8ae24L, 0x55464299L, 0xbf582e61L, 
-        0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L, 0x8789bdc2L, 
-        0x5366f9c3L, 0xc8b38e74L, 0xb475f255L, 0x46fcd9b9L, 
-        0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L, 0x915f95e2L, 
-        0x466e598eL, 0x20b45770L, 0x8cd55591L, 0xc902de4cL, 
-        0xb90bace1L, 0xbb8205d0L, 0x11a86248L, 0x7574a99eL, 
-        0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L, 0xc4324633L, 
-        0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L, 0x1d6efe10L, 
-        0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL, 0x2868f169L, 
-        0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL, 0x4fcd7f52L, 
-        0x50115e01L, 0xa70683faL, 0xa002b5c4L, 0x0de6d027L, 
-        0x9af88c27L, 0x773f8641L, 0xc3604c06L, 0x61a806b5L, 
-        0xf0177a28L, 0xc0f586e0L, 0x006058aaL, 0x30dc7d62L, 
-        0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L, 0xc2c21634L, 
-        0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L, 0xce591d76L, 
-        0x6f05e409L, 0x4b7c0188L, 0x39720a3dL, 0x7c927c24L, 
-        0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L, 0xd39eb8fcL, 
-        0xed545578L, 0x08fca5b5L, 0xd83d7cd3L, 0x4dad0fc4L, 
-        0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L, 0x6c51133cL, 
-        0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL, 0xddc6c837L, 
-        0xd79a3234L, 0x92638212L, 0x670efa8eL, 0x406000e0L, 
-        0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L, 0x5ac52d1bL, 
-        0x5cb0679eL, 0x4fa33742L, 0xd3822740L, 0x99bc9bbeL, 
-        0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL, 0xc700c47bL, 
-        0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL, 0x6a366eb4L, 
-        0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L, 0x6549c2c8L, 
-        0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL, 0x4cd04dc6L, 
-        0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L, 0xbe5ee304L, 
-        0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L, 0x9a86ee22L, 
-        0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL, 0x9cf2d0a4L, 
-        0x83c061baL, 0x9be96a4dL, 0x8fe51550L, 0xba645bd6L, 
-        0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L, 0xef5562e9L, 
-        0xc72fefd3L, 0xf752f7daL, 0x3f046f69L, 0x77fa0a59L, 
-        0x80e4a915L, 0x87b08601L, 0x9b09e6adL, 0x3b3ee593L, 
-        0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L, 0x022b8b51L, 
-        0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L, 0x7c7d2d28L, 
-        0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L, 0x5a88f54cL, 
-        0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL, 0xed93fa9bL, 
-        0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L, 0x79132e28L, 
-        0x785f0191L, 0xed756055L, 0xf7960e44L, 0xe3d35e8cL, 
-        0x15056dd4L, 0x88f46dbaL, 0x03a16125L, 0x0564f0bdL, 
-        0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL, 0xa93a072aL, 
-        0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL, 0x26dcf319L, 
-        0x7533d928L, 0xb155fdf5L, 0x03563482L, 0x8aba3cbbL, 
-        0x28517711L, 0xc20ad9f8L, 0xabcc5167L, 0xccad925fL, 
-        0x4de81751L, 0x3830dc8eL, 0x379d5862L, 0x9320f991L, 
-        0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L, 0x774fbe32L, 
-        0xa8b6e37eL, 0xc3293d46L, 0x48de5369L, 0x6413e680L, 
-        0xa2ae0810L, 0xdd6db224L, 0x69852dfdL, 0x09072166L, 
-        0xb39a460aL, 0x6445c0ddL, 0x586cdecfL, 0x1c20c8aeL, 
-        0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL, 0x6bb4e3bbL, 
-        0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L, 0xbcb4cdd5L, 
-        0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL, 0xbf3c6f47L, 
-        0xd29be463L, 0x542f5d9eL, 0xaec2771bL, 0xf64e6370L, 
-        0x740e0d8dL, 0xe75b1357L, 0xf8721671L, 0xaf537d5dL, 
-        0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL, 0x0115af84L, 
-        0xe1b00428L, 0x95983a1dL, 0x06b89fb4L, 0xce6ea048L, 
-        0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL, 0x277227f8L, 
-        0x611560b1L, 0xe7933fdcL, 0xbb3a792bL, 0x344525bdL, 
-        0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L, 0xa01fbac9L, 
-        0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L, 0xa1e8aac7L, 
-        0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL, 0xd50ada38L, 
-        0x0339c32aL, 0xc6913667L, 0x8df9317cL, 0xe0b12b4fL, 
-        0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL, 0x27d9459cL, 
-        0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L, 0x9b941525L, 
-        0xfae59361L, 0xceb69cebL, 0xc2a86459L, 0x12baa8d1L, 
-        0xb6c1075eL, 0xe3056a0cL, 0x10d25065L, 0xcb03a442L, 
-        0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL, 0x3278e964L, 
-        0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL, 0x8971f21eL, 
-        0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L, 0xc37632d8L, 
-        0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L, 0x0fe3f11dL, 
-        0xe54cda54L, 0x1edad891L, 0xce6279cfL, 0xcd3e7e6fL, 
-        0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L, 0xf6fb2299L, 
-        0xf523f357L, 0xa6327623L, 0x93a83531L, 0x56cccd02L, 
-        0xacf08162L, 0x5a75ebb5L, 0x6e163697L, 0x88d273ccL, 
-        0xde966292L, 0x81b949d0L, 0x4c50901bL, 0x71c65614L, 
-        0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L, 0xc3f27b9aL, 
-        0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L, 0x35bdd2f6L, 
-        0x71126905L, 0xb2040222L, 0xb6cbcf7cL, 0xcd769c2bL, 
-        0x53113ec0L, 0x1640e3d3L, 0x38abbd60L, 0x2547adf0L, 
-        0xba38209cL, 0xf746ce76L, 0x77afa1c5L, 0x20756060L, 
-        0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L, 0x4cf9aa7eL, 
-        0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L, 0xd6ebe1f9L, 
-        0x90d4f869L, 0xa65cdea0L, 0x3f09252dL, 0xc208e69fL, 
-        0xb74e6132L, 0xce77e25bL, 0x578fdfe3L, 0x3ac372e6L, 
-        }
-        };
-
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c
deleted file mode 100644
index eefa8e6f51..0000000000
--- a/src/lib/libcrypto/bf/bf_skey.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* crypto/bf/bf_skey.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/blowfish.h>
-#include "bf_locl.h"
-#include "bf_pi.h"
-
-void BF_set_key(BF_KEY *key, int len, unsigned char *data)
-        {
-        int i;
-        BF_LONG *p,ri,in[2];
-        unsigned char *d,*end;
-
-
-        memcpy((char *)key,(char *)&bf_init,sizeof(BF_KEY));
-        p=key->P;
-
-        if (len > ((BF_ROUNDS+2)*4)) len=(BF_ROUNDS+2)*4;
-
-        d=data;
-        end= &(data[len]);
-        for (i=0; i<(BF_ROUNDS+2); i++)
-                {
-                ri= *(d++);
-                if (d >= end) d=data;
-
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
-
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
-
-                ri<<=8;
-                ri|= *(d++);
-                if (d >= end) d=data;
-
-                p[i]^=ri;
-                }
-
-        in[0]=0L;
-        in[1]=0L;
-        for (i=0; i<(BF_ROUNDS+2); i+=2)
-                {
-                BF_encrypt(in,key);
-                p[i  ]=in[0];
-                p[i+1]=in[1];
-                }
-
-        p=key->S;
-        for (i=0; i<4*256; i+=2)
-                {
-                BF_encrypt(in,key);
-                p[i  ]=in[0];
-                p[i+1]=in[1];
-                }
-        }
-
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h
deleted file mode 100644
index 02f73b2f30..0000000000
--- a/src/lib/libcrypto/bf/blowfish.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* crypto/bf/blowfish.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_BLOWFISH_H
-#define HEADER_BLOWFISH_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_BF
-#error BF is disabled.
-#endif
-
-#define BF_ENCRYPT      1
-#define BF_DECRYPT      0
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! BF_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(WIN16) || defined(__LP32__)
-#define BF_LONG unsigned long
-#elif defined(_CRAY) || defined(__ILP64__)
-#define BF_LONG unsigned long
-#define BF_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-#else
-#define BF_LONG unsigned int
-#endif
-
-#define BF_ROUNDS       16
-#define BF_BLOCK        8
-
-typedef struct bf_key_st
-        {
-        BF_LONG P[BF_ROUNDS+2];
-        BF_LONG S[4*256];
-        } BF_KEY;
-
- 
-void BF_set_key(BF_KEY *key, int len, unsigned char *data);
-void BF_ecb_encrypt(unsigned char *in,unsigned char *out,BF_KEY *key,
-        int enc);
-void BF_encrypt(BF_LONG *data,BF_KEY *key);
-void BF_decrypt(BF_LONG *data,BF_KEY *key);
-void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *ks, unsigned char *iv, int enc);
-void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *schedule, unsigned char *ivec, int *num);
-const char *BF_options(void);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
deleted file mode 100644
index a7cd828978..0000000000
--- a/src/lib/libcrypto/bio/b_dump.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* crypto/bio/b_dump.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.]
- */
-
-/* 
- * Stolen from tjh's ssl/ssl_trc.c stuff.
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#define TRUNCATE
-#define DUMP_WIDTH      16
-
-int BIO_dump(BIO *bio, const char *s, int len)
-{
-  int ret=0;
-  char buf[160+1],tmp[20];
-  int i,j,rows,trunc;
-  unsigned char ch;
-
-  trunc=0;
-
-#ifdef TRUNCATE
-  for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--) 
-    trunc++;
-#endif
-
-  rows=(len/DUMP_WIDTH);
-  if ((rows*DUMP_WIDTH)<len)
-    rows++;
-  for(i=0;i<rows;i++) {
-    buf[0]='\0';        /* start with empty string */
-    sprintf(tmp,"%04x - ",i*DUMP_WIDTH);
-    strcpy(buf,tmp);
-    for(j=0;j<DUMP_WIDTH;j++) {
-      if (((i*DUMP_WIDTH)+j)>=len) {
-        strcat(buf,"   ");
-      } else {
-        ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;
-        sprintf(tmp,"%02x%c",ch,j==7?'-':' ');
-        strcat(buf,tmp);
-      }
-    }
-    strcat(buf,"  ");
-    for(j=0;j<DUMP_WIDTH;j++) {
-      if (((i*DUMP_WIDTH)+j)>=len)
-        break;
-      ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;
-#ifndef CHARSET_EBCDIC
-      sprintf(tmp,"%c",((ch>=' ')&&(ch<='~'))?ch:'.');
-#else
-      sprintf(tmp,"%c",((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
-              ? os_toebcdic[ch]
-              : '.');
-#endif
-      strcat(buf,tmp);
-    }
-    strcat(buf,"\n");
-    /* if this is the last call then update the ddt_dump thing so that
-     * we will move the selection point in the debug window 
-     */
-    ret+=BIO_write(bio,(char *)buf,strlen(buf));
-  }
-#ifdef TRUNCATE
-  if (trunc > 0) {
-    sprintf(buf,"%04x - <SPACES/NULS>\n",len+trunc);
-    ret+=BIO_write(bio,(char *)buf,strlen(buf));
-  }
-#endif
-  return(ret);
-}
-
diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c
deleted file mode 100644
index f448004298..0000000000
--- a/src/lib/libcrypto/bio/b_print.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* crypto/bio/b_print.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.]
- */
-
-/* 
- * Stolen from tjh's ssl/ssl_trc.c stuff.
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-int BIO_printf (BIO *bio, ...)
-        {
-        va_list args;
-        char *format;
-        int ret;
-        MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */
-
-        va_start(args, bio);
-        format=va_arg(args, char *);
-
-        hugebuf[0]='\0';
-
-        vsprintf(hugebuf,format,args);
-
-        ret=BIO_write(bio,hugebuf,strlen(hugebuf));
-
-        va_end(args);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
deleted file mode 100644
index d29b29ff8b..0000000000
--- a/src/lib/libcrypto/bio/b_sock.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/* crypto/bio/b_sock.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_SOCK
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#define USE_SOCKETS
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#ifdef WIN16
-#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
-#else
-#define SOCKET_PROTOCOL IPPROTO_TCP
-#endif
-
-#ifdef SO_MAXCONN
-#define MAX_LISTEN  SOMAXCONN
-#elif defined(SO_MAXCONN)
-#define MAX_LISTEN  SO_MAXCONN
-#else
-#define MAX_LISTEN  32
-#endif
-
-#ifdef WINDOWS
-static int wsa_init_done=0;
-#endif
-
-static unsigned long BIO_ghbn_hits=0L;
-static unsigned long BIO_ghbn_miss=0L;
-
-#define GHBN_NUM        4
-static struct ghbn_cache_st
-        {
-        char name[129];
-        struct hostent *ent;
-        unsigned long order;
-        } ghbn_cache[GHBN_NUM];
-
-static int get_ip(const char *str,unsigned char *ip);
-static void ghbn_free(struct hostent *a);
-static struct hostent *ghbn_dup(struct hostent *a);
-int BIO_get_host_ip(const char *str, unsigned char *ip)
-        {
-        int i;
-        int err = 1;
-        int locked = 0;
-        struct hostent *he;
-
-        i=get_ip(str,ip);
-        if (i > 0) return(1);
-        if (i < 0)
-                {
-                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_INVALID_IP_ADDRESS);
-                goto err;
-                }
-
-        /* do a gethostbyname */
-        if (!BIO_sock_init())
-                return(0); /* don't generate another error code here */
-
-        CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
-        locked = 1;
-        he=BIO_gethostbyname(str);
-        if (he == NULL)
-                {
-                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_BAD_HOSTNAME_LOOKUP);
-                goto err;
-                }
-
-        /* cast to short because of win16 winsock definition */
-        if ((short)he->h_addrtype != AF_INET)
-                {
-                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
-                goto err;
-                }
-        for (i=0; i<4; i++)
-                ip[i]=he->h_addr_list[0][i];
-        err = 0;
-
- err:
-        if (locked)
-                CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
-        if (err)
-                {
-                ERR_add_error_data(2,"host=",str);
-                return 0;
-                }
-        else
-                return 1;
-        }
-
-int BIO_get_port(const char *str, unsigned short *port_ptr)
-        {
-        int i;
-        struct servent *s;
-
-        if (str == NULL)
-                {
-                BIOerr(BIO_F_BIO_GET_PORT,BIO_R_NO_PORT_DEFINED);
-                return(0);
-                }
-        i=atoi(str);
-        if (i != 0)
-                *port_ptr=(unsigned short)i;
-        else
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_GETSERVBYNAME);
-                s=getservbyname(str,"tcp");
-                if(s != NULL)
-                        *port_ptr=ntohs((unsigned short)s->s_port);
-                CRYPTO_w_unlock(CRYPTO_LOCK_GETSERVBYNAME);
-                if(s == NULL)
-                        {
-                        if (strcmp(str,"http") == 0)
-                                *port_ptr=80;
-                        else if (strcmp(str,"telnet") == 0)
-                                *port_ptr=23;
-                        else if (strcmp(str,"socks") == 0)
-                                *port_ptr=1080;
-                        else if (strcmp(str,"https") == 0)
-                                *port_ptr=443;
-                        else if (strcmp(str,"ssl") == 0)
-                                *port_ptr=443;
-                        else if (strcmp(str,"ftp") == 0)
-                                *port_ptr=21;
-                        else if (strcmp(str,"gopher") == 0)
-                                *port_ptr=70;
-#if 0
-                        else if (strcmp(str,"wais") == 0)
-                                *port_ptr=21;
-#endif
-                        else
-                                {
-                                SYSerr(SYS_F_GETSERVBYNAME,get_last_socket_error());
-                                ERR_add_error_data(3,"service='",str,"'");
-                                return(0);
-                                }
-                        }
-                }
-        return(1);
-        }
-
-int BIO_sock_error(int sock)
-        {
-        int j,i;
-        int size;
-                 
-        size=sizeof(int);
-        /* Note: under Windows the third parameter is of type (char *)
-         * whereas under other systems it is (void *) if you don't have
-         * a cast it will choke the compiler: if you do have a cast then
-         * you can either go for (char *) or (void *).
-         */
-        i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(void *)&j,(void *)&size);
-        if (i < 0)
-                return(1);
-        else
-                return(j);
-        }
-
-long BIO_ghbn_ctrl(int cmd, int iarg, char *parg)
-        {
-        int i;
-        char **p;
-
-        switch (cmd)
-                {
-        case BIO_GHBN_CTRL_HITS:
-                return(BIO_ghbn_hits);
-                /* break; */
-        case BIO_GHBN_CTRL_MISSES:
-                return(BIO_ghbn_miss);
-                /* break; */
-        case BIO_GHBN_CTRL_CACHE_SIZE:
-                return(GHBN_NUM);
-                /* break; */
-        case BIO_GHBN_CTRL_GET_ENTRY:
-                if ((iarg >= 0) && (iarg <GHBN_NUM) &&
-                        (ghbn_cache[iarg].order > 0))
-                        {
-                        p=(char **)parg;
-                        if (p == NULL) return(0);
-                        *p=ghbn_cache[iarg].name;
-                        ghbn_cache[iarg].name[128]='\0';
-                        return(1);
-                        }
-                return(0);
-                /* break; */
-        case BIO_GHBN_CTRL_FLUSH:
-                for (i=0; i<GHBN_NUM; i++)
-                        ghbn_cache[i].order=0;
-                break;
-        default:
-                return(0);
-                }
-        return(1);
-        }
-
-static struct hostent *ghbn_dup(struct hostent *a)
-        {
-        struct hostent *ret;
-        int i,j;
-
-        MemCheck_off();
-        ret=(struct hostent *)Malloc(sizeof(struct hostent));
-        if (ret == NULL) return(NULL);
-        memset(ret,0,sizeof(struct hostent));
-
-        for (i=0; a->h_aliases[i] != NULL; i++)
-                ;
-        i++;
-        ret->h_aliases = (char **)Malloc(i*sizeof(char *));
-        if (ret->h_aliases == NULL)
-                goto err;
-        memset(ret->h_aliases, 0, i*sizeof(char *));
-
-        for (i=0; a->h_addr_list[i] != NULL; i++)
-                ;
-        i++;
-        ret->h_addr_list=(char **)Malloc(i*sizeof(char *));
-        if (ret->h_addr_list == NULL)
-                goto err;
-        memset(ret->h_addr_list, 0, i*sizeof(char *));
-
-        j=strlen(a->h_name)+1;
-        if ((ret->h_name=Malloc(j)) == NULL) goto err;
-        memcpy((char *)ret->h_name,a->h_name,j+1);
-        for (i=0; a->h_aliases[i] != NULL; i++)
-                {
-                j=strlen(a->h_aliases[i])+1;
-                if ((ret->h_aliases[i]=Malloc(j)) == NULL) goto err;
-                memcpy(ret->h_aliases[i],a->h_aliases[i],j+1);
-                }
-        ret->h_length=a->h_length;
-        ret->h_addrtype=a->h_addrtype;
-        for (i=0; a->h_addr_list[i] != NULL; i++)
-                {
-                if ((ret->h_addr_list[i]=Malloc(a->h_length)) == NULL)
-                        goto err;
-                memcpy(ret->h_addr_list[i],a->h_addr_list[i],a->h_length);
-                }
-        if (0)
-                {
-err:    
-                if (ret != NULL)
-                        ghbn_free(ret);
-                ret=NULL;
-                }
-        MemCheck_on();
-        return(ret);
-        }
-
-static void ghbn_free(struct hostent *a)
-        {
-        int i;
-
-        if(a == NULL)
-            return;
-
-        if (a->h_aliases != NULL)
-                {
-                for (i=0; a->h_aliases[i] != NULL; i++)
-                        Free(a->h_aliases[i]);
-                Free(a->h_aliases);
-                }
-        if (a->h_addr_list != NULL)
-                {
-                for (i=0; a->h_addr_list[i] != NULL; i++)
-                        Free(a->h_addr_list[i]);
-                Free(a->h_addr_list);
-                }
-        if (a->h_name != NULL) Free((char *)a->h_name);
-        Free(a);
-        }
-
-struct hostent *BIO_gethostbyname(const char *name)
-        {
-        struct hostent *ret;
-        int i,lowi=0,j;
-        unsigned long low= (unsigned long)-1;
-
-/*      return(gethostbyname(name)); */
-
-#if 0 /* It doesn't make sense to use locking here: The function interface
-           * is not thread-safe, because threads can never be sure when
-           * some other thread destroys the data they were given a pointer to.
-           */
-        CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
-#endif
-        j=strlen(name);
-        if (j < 128)
-                {
-                for (i=0; i<GHBN_NUM; i++)
-                        {
-                        if (low > ghbn_cache[i].order)
-                                {
-                                low=ghbn_cache[i].order;
-                                lowi=i;
-                                }
-                        if (ghbn_cache[i].order > 0)
-                                {
-                                if (strncmp(name,ghbn_cache[i].name,128) == 0)
-                                        break;
-                                }
-                        }
-                }
-        else
-                i=GHBN_NUM;
-
-        if (i == GHBN_NUM) /* no hit*/
-                {
-                BIO_ghbn_miss++;
-                ret=gethostbyname(name);
-
-                if (ret == NULL)
-                        goto end;
-                if (j > 128) /* too big to cache */
-                        {
-#if 0 /* If we were trying to make this function thread-safe (which
-           * is bound to fail), we'd have to give up in this case
-           * (or allocate more memory). */
-                        ret = NULL;
-#endif
-                        goto end;
-                        }
-
-                /* else add to cache */
-                if (ghbn_cache[lowi].ent != NULL)
-                        ghbn_free(ghbn_cache[lowi].ent); /* XXX not thread-safe */
-                ghbn_cache[lowi].name[0] = '\0';
-
-                if((ret=ghbn_cache[lowi].ent=ghbn_dup(ret)) == NULL)
-                        {
-                        BIOerr(BIO_F_BIO_GETHOSTBYNAME,ERR_R_MALLOC_FAILURE);
-                        goto end;
-                        }
-                strncpy(ghbn_cache[lowi].name,name,128);
-                ghbn_cache[lowi].order=BIO_ghbn_miss+BIO_ghbn_hits;
-                }
-        else
-                {
-                BIO_ghbn_hits++;
-                ret= ghbn_cache[i].ent;
-                ghbn_cache[i].order=BIO_ghbn_miss+BIO_ghbn_hits;
-                }
-end:
-#if 0
-        CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
-#endif
-        return(ret);
-        }
-
-int BIO_sock_init(void)
-        {
-#ifdef WINDOWS
-        static struct WSAData wsa_state;
-
-        if (!wsa_init_done)
-                {
-                int err;
-          
-#ifdef SIGINT
-                signal(SIGINT,(void (*)(int))BIO_sock_cleanup);
-#endif
-                wsa_init_done=1;
-                memset(&wsa_state,0,sizeof(wsa_state));
-                if (WSAStartup(0x0101,&wsa_state)!=0)
-                        {
-                        err=WSAGetLastError();
-                        SYSerr(SYS_F_WSASTARTUP,err);
-                        BIOerr(BIO_F_BIO_SOCK_INIT,BIO_R_WSASTARTUP);
-                        return(-1);
-                        }
-                }
-#endif /* WINDOWS */
-        return(1);
-        }
-
-void BIO_sock_cleanup(void)
-        {
-#ifdef WINDOWS
-        if (wsa_init_done)
-                {
-                wsa_init_done=0;
-                WSACancelBlockingCall();
-                WSACleanup();
-                }
-#endif
-        }
-
-#if !defined(VMS) || __VMS_VER >= 70000000
-
-int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
-        {
-        int i;
-
-        i=ioctlsocket(fd,type,arg);
-        if (i < 0)
-                SYSerr(SYS_F_IOCTLSOCKET,get_last_socket_error());
-        return(i);
-        }
-#endif /* __VMS_VER */
-
-/* The reason I have implemented this instead of using sscanf is because
- * Visual C 1.52c gives an unresolved external when linking a DLL :-( */
-static int get_ip(const char *str, unsigned char ip[4])
-        {
-        unsigned int tmp[4];
-        int num=0,c,ok=0;
-
-        tmp[0]=tmp[1]=tmp[2]=tmp[3]=0;
-
-        for (;;)
-                {
-                c= *(str++);
-                if ((c >= '0') && (c <= '9'))
-                        {
-                        ok=1;
-                        tmp[num]=tmp[num]*10+c-'0';
-                        if (tmp[num] > 255) return(-1);
-                        }
-                else if (c == '.')
-                        {
-                        if (!ok) return(-1);
-                        if (num == 3) break;
-                        num++;
-                        ok=0;
-                        }
-                else if ((num == 3) && ok)
-                        break;
-                else
-                        return(0);
-                }
-        ip[0]=tmp[0];
-        ip[1]=tmp[1];
-        ip[2]=tmp[2];
-        ip[3]=tmp[3];
-        return(1);
-        }
-
-int BIO_get_accept_socket(char *host, int bind_mode)
-        {
-        int ret=0;
-        struct sockaddr_in server,client;
-        int s= -1,cs;
-        unsigned char ip[4];
-        unsigned short port;
-        char *str,*e;
-        const char *h,*p;
-        unsigned long l;
-        int err_num;
-
-        if (!BIO_sock_init()) return(INVALID_SOCKET);
-
-        if ((str=BUF_strdup(host)) == NULL) return(INVALID_SOCKET);
-
-        h=p=NULL;
-        h=str;
-        for (e=str; *e; e++)
-                {
-                if (*e == ':')
-                        {
-                        p= &(e[1]);
-                        *e='\0';
-                        }
-                else if (*e == '/')
-                        {
-                        *e='\0';
-                        break;
-                        }
-                }
-
-        if (p == NULL)
-                {
-                p=h;
-                h="*";
-                }
-
-        if (!BIO_get_port(p,&port)) return(INVALID_SOCKET);
-
-        memset((char *)&server,0,sizeof(server));
-        server.sin_family=AF_INET;
-        server.sin_port=htons(port);
-
-        if (strcmp(h,"*") == 0)
-                server.sin_addr.s_addr=INADDR_ANY;
-        else
-                {
-                if (!BIO_get_host_ip(h,&(ip[0]))) return(INVALID_SOCKET);
-                l=(unsigned long)
-                        ((unsigned long)ip[0]<<24L)|
-                        ((unsigned long)ip[1]<<16L)|
-                        ((unsigned long)ip[2]<< 8L)|
-                        ((unsigned long)ip[3]);
-                server.sin_addr.s_addr=htonl(l);
-                }
-
-again:
-        s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-        if (s == INVALID_SOCKET)
-                {
-                SYSerr(SYS_F_SOCKET,get_last_socket_error());
-                ERR_add_error_data(3,"port='",host,"'");
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_CREATE_SOCKET);
-                goto err;
-                }
-
-#ifdef SO_REUSEADDR
-        if (bind_mode == BIO_BIND_REUSEADDR)
-                {
-                int i=1;
-
-                ret=setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&i,sizeof(i));
-                bind_mode=BIO_BIND_NORMAL;
-                }
-#endif
-        if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
-                {
-#ifdef SO_REUSEADDR
-                err_num=get_last_socket_error();
-                if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) &&
-                        (err_num == EADDRINUSE))
-                        {
-                        memcpy((char *)&client,(char *)&server,sizeof(server));
-                        if (strcmp(h,"*") == 0)
-                                client.sin_addr.s_addr=htonl(0x7F000001);
-                        cs=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-                        if (cs != INVALID_SOCKET)
-                                {
-                                int ii;
-                                ii=connect(cs,(struct sockaddr *)&client,
-                                        sizeof(client));
-                                closesocket(cs);
-                                if (ii == INVALID_SOCKET)
-                                        {
-                                        bind_mode=BIO_BIND_REUSEADDR;
-                                        closesocket(s);
-                                        goto again;
-                                        }
-                                /* else error */
-                                }
-                        /* else error */
-                        }
-#endif
-                SYSerr(SYS_F_BIND,err_num);
-                ERR_add_error_data(3,"port='",host,"'");
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_BIND_SOCKET);
-                goto err;
-                }
-        if (listen(s,MAX_LISTEN) == -1)
-                {
-                SYSerr(SYS_F_BIND,get_last_socket_error());
-                ERR_add_error_data(3,"port='",host,"'");
-                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_LISTEN_SOCKET);
-                goto err;
-                }
-        ret=1;
-err:
-        if (str != NULL) Free(str);
-        if ((ret == 0) && (s != INVALID_SOCKET))
-                {
-                closesocket(s);
-                s= INVALID_SOCKET;
-                }
-        return(s);
-        }
-
-int BIO_accept(int sock, char **addr)
-        {
-        int ret=INVALID_SOCKET;
-        static struct sockaddr_in from;
-        unsigned long l;
-        unsigned short port;
-        int len;
-        char *p;
-
-        memset((char *)&from,0,sizeof(from));
-        len=sizeof(from);
-        /* Note: under VMS with SOCKETSHR the fourth parameter is currently
-         * of type (int *) whereas under other systems it is (void *) if
-         * you don't have a cast it will choke the compiler: if you do
-         * have a cast then you can either go for (int *) or (void *).
-         */
-        ret=accept(sock,(struct sockaddr *)&from,(void *)&len);
-        if (ret == INVALID_SOCKET)
-                {
-                SYSerr(SYS_F_ACCEPT,get_last_socket_error());
-                BIOerr(BIO_F_BIO_ACCEPT,BIO_R_ACCEPT_ERROR);
-                goto end;
-                }
-
-        if (addr == NULL) goto end;
-
-        l=ntohl(from.sin_addr.s_addr);
-        port=ntohs(from.sin_port);
-        if (*addr == NULL)
-                {
-                if ((p=Malloc(24)) == NULL)
-                        {
-                        BIOerr(BIO_F_BIO_ACCEPT,ERR_R_MALLOC_FAILURE);
-                        goto end;
-                        }
-                *addr=p;
-                }
-        sprintf(*addr,"%d.%d.%d.%d:%d",
-                (unsigned char)(l>>24L)&0xff,
-                (unsigned char)(l>>16L)&0xff,
-                (unsigned char)(l>> 8L)&0xff,
-                (unsigned char)(l     )&0xff,
-                port);
-end:
-        return(ret);
-        }
-
-int BIO_set_tcp_ndelay(int s, int on)
-        {
-        int ret=0;
-#if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
-        int opt;
-
-#ifdef SOL_TCP
-        opt=SOL_TCP;
-#else
-#ifdef IPPROTO_TCP
-        opt=IPPROTO_TCP;
-#endif
-#endif
-        
-        ret=setsockopt(s,opt,TCP_NODELAY,(char *)&on,sizeof(on));
-#endif
-        return(ret == 0);
-        }
-#endif
-
-int BIO_socket_nbio(int s, int mode)
-        {
-        int ret= -1;
-        unsigned long l;
-
-        l=mode;
-#ifdef FIONBIO
-        ret=BIO_socket_ioctl(s,FIONBIO,&l);
-#endif
-        return(ret == 0);
-        }
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
deleted file mode 100644
index acd8148138..0000000000
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/* crypto/bio/bf_buff.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 <openssl/bio.h>
-#include <openssl/evp.h>
-
-static int buffer_write(BIO *h,char *buf,int num);
-static int buffer_read(BIO *h,char *buf,int size);
-static int buffer_puts(BIO *h,char *str);
-static int buffer_gets(BIO *h,char *str,int size);
-static long buffer_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int buffer_new(BIO *h);
-static int buffer_free(BIO *data);
-#define DEFAULT_BUFFER_SIZE     1024
-
-static BIO_METHOD methods_buffer=
-        {
-        BIO_TYPE_BUFFER,
-        "buffer",
-        buffer_write,
-        buffer_read,
-        buffer_puts,
-        buffer_gets,
-        buffer_ctrl,
-        buffer_new,
-        buffer_free,
-        };
-
-BIO_METHOD *BIO_f_buffer(void)
-        {
-        return(&methods_buffer);
-        }
-
-static int buffer_new(BIO *bi)
-        {
-        BIO_F_BUFFER_CTX *ctx;
-
-        ctx=(BIO_F_BUFFER_CTX *)Malloc(sizeof(BIO_F_BUFFER_CTX));
-        if (ctx == NULL) return(0);
-        ctx->ibuf=(char *)Malloc(DEFAULT_BUFFER_SIZE);
-        if (ctx->ibuf == NULL) { Free(ctx); return(0); }
-        ctx->obuf=(char *)Malloc(DEFAULT_BUFFER_SIZE);
-        if (ctx->obuf == NULL) { Free(ctx->ibuf); Free(ctx); return(0); }
-        ctx->ibuf_size=DEFAULT_BUFFER_SIZE;
-        ctx->obuf_size=DEFAULT_BUFFER_SIZE;
-        ctx->ibuf_len=0;
-        ctx->ibuf_off=0;
-        ctx->obuf_len=0;
-        ctx->obuf_off=0;
-
-        bi->init=1;
-        bi->ptr=(char *)ctx;
-        bi->flags=0;
-        return(1);
-        }
-
-static int buffer_free(BIO *a)
-        {
-        BIO_F_BUFFER_CTX *b;
-
-        if (a == NULL) return(0);
-        b=(BIO_F_BUFFER_CTX *)a->ptr;
-        if (b->ibuf != NULL) Free(b->ibuf);
-        if (b->obuf != NULL) Free(b->obuf);
-        Free(a->ptr);
-        a->ptr=NULL;
-        a->init=0;
-        a->flags=0;
-        return(1);
-        }
-        
-static int buffer_read(BIO *b, char *out, int outl)
-        {
-        int i,num=0;
-        BIO_F_BUFFER_CTX *ctx;
-
-        if (out == NULL) return(0);
-        ctx=(BIO_F_BUFFER_CTX *)b->ptr;
-
-        if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-        num=0;
-        BIO_clear_retry_flags(b);
-
-start:
-        i=ctx->ibuf_len;
-        /* If there is stuff left over, grab it */
-        if (i != 0)
-                {
-                if (i > outl) i=outl;
-                memcpy(out,&(ctx->ibuf[ctx->ibuf_off]),i);
-                ctx->ibuf_off+=i;
-                ctx->ibuf_len-=i;
-                num+=i;
-                if (outl == i)  return(num);
-                outl-=i;
-                out+=i;
-                }
-
-        /* We may have done a partial read. try to do more.
-         * We have nothing in the buffer.
-         * If we get an error and have read some data, just return it
-         * and let them retry to get the error again.
-         * copy direct to parent address space */
-        if (outl > ctx->ibuf_size)
-                {
-                for (;;)
-                        {
-                        i=BIO_read(b->next_bio,out,outl);
-                        if (i <= 0)
-                                {
-                                BIO_copy_next_retry(b);
-                                if (i < 0) return((num > 0)?num:i);
-                                if (i == 0) return(num);
-                                }
-                        num+=i;
-                        if (outl == i) return(num);
-                        out+=i;
-                        outl-=i;
-                        }
-                }
-        /* else */
-
-        /* we are going to be doing some buffering */
-        i=BIO_read(b->next_bio,ctx->ibuf,ctx->ibuf_size);
-        if (i <= 0)
-                {
-                BIO_copy_next_retry(b);
-                if (i < 0) return((num > 0)?num:i);
-                if (i == 0) return(num);
-                }
-        ctx->ibuf_off=0;
-        ctx->ibuf_len=i;
-
-        /* Lets re-read using ourselves :-) */
-        goto start;
-        }
-
-static int buffer_write(BIO *b, char *in, int inl)
-        {
-        int i,num=0;
-        BIO_F_BUFFER_CTX *ctx;
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-        ctx=(BIO_F_BUFFER_CTX *)b->ptr;
-        if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-
-        BIO_clear_retry_flags(b);
-start:
-        i=ctx->obuf_size-(ctx->obuf_len+ctx->obuf_off);
-        /* add to buffer and return */
-        if (i >= inl)
-                {
-                memcpy(&(ctx->obuf[ctx->obuf_len]),in,inl);
-                ctx->obuf_len+=inl;
-                return(num+inl);
-                }
-        /* else */
-        /* stuff already in buffer, so add to it first, then flush */
-        if (ctx->obuf_len != 0)
-                {
-                if (i > 0) /* lets fill it up if we can */
-                        {
-                        memcpy(&(ctx->obuf[ctx->obuf_len]),in,i);
-                        in+=i;
-                        inl-=i;
-                        num+=i;
-                        ctx->obuf_len+=i;
-                        }
-                /* we now have a full buffer needing flushing */
-                for (;;)
-                        {
-                        i=BIO_write(b->next_bio,&(ctx->obuf[ctx->obuf_off]),
-                                ctx->obuf_len);
-                        if (i <= 0)
-                                {
-                                BIO_copy_next_retry(b);
-
-                                if (i < 0) return((num > 0)?num:i);
-                                if (i == 0) return(num);
-                                }
-                        ctx->obuf_off+=i;
-                        ctx->obuf_len-=i;
-                        if (ctx->obuf_len == 0) break;
-                        }
-                }
-        /* we only get here if the buffer has been flushed and we
-         * still have stuff to write */
-        ctx->obuf_off=0;
-
-        /* we now have inl bytes to write */
-        while (inl >= ctx->obuf_size)
-                {
-                i=BIO_write(b->next_bio,in,inl);
-                if (i <= 0)
-                        {
-                        BIO_copy_next_retry(b);
-                        if (i < 0) return((num > 0)?num:i);
-                        if (i == 0) return(num);
-                        }
-                num+=i;
-                in+=i;
-                inl-=i;
-                if (inl == 0) return(num);
-                }
-
-        /* copy the rest into the buffer since we have only a small 
-         * amount left */
-        goto start;
-        }
-
-static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        BIO *dbio;
-        BIO_F_BUFFER_CTX *ctx;
-        long ret=1;
-        char *p1,*p2;
-        int r,i,*ip;
-        int ibs,obs;
-
-        ctx=(BIO_F_BUFFER_CTX *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                ctx->ibuf_off=0;
-                ctx->ibuf_len=0;
-                ctx->obuf_off=0;
-                ctx->obuf_len=0;
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_INFO:
-                ret=(long)ctx->obuf_len;
-                break;
-        case BIO_C_GET_BUFF_NUM_LINES:
-                ret=0;
-                p1=ctx->ibuf;
-                for (i=ctx->ibuf_off; i<ctx->ibuf_len; i++)
-                        {
-                        if (p1[i] == '\n') ret++;
-                        }
-                break;
-        case BIO_CTRL_WPENDING:
-                ret=(long)ctx->obuf_len;
-                if (ret == 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_PENDING:
-                ret=(long)ctx->ibuf_len;
-                if (ret == 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_C_SET_BUFF_READ_DATA:
-                if (num > ctx->ibuf_size)
-                        {
-                        p1=Malloc((int)num);
-                        if (p1 == NULL) goto malloc_error;
-                        if (ctx->ibuf != NULL) Free(ctx->ibuf);
-                        ctx->ibuf=p1;
-                        }
-                ctx->ibuf_off=0;
-                ctx->ibuf_len=(int)num;
-                memcpy(ctx->ibuf,ptr,(int)num);
-                ret=1;
-                break;
-        case BIO_C_SET_BUFF_SIZE:
-                if (ptr != NULL)
-                        {
-                        ip=(int *)ptr;
-                        if (*ip == 0)
-                                {
-                                ibs=(int)num;
-                                obs=ctx->obuf_size;
-                                }
-                        else /* if (*ip == 1) */
-                                {
-                                ibs=ctx->ibuf_size;
-                                obs=(int)num;
-                                }
-                        }
-                else
-                        {
-                        ibs=(int)num;
-                        obs=(int)num;
-                        }
-                p1=ctx->ibuf;
-                p2=ctx->obuf;
-                if ((ibs > DEFAULT_BUFFER_SIZE) && (ibs != ctx->ibuf_size))
-                        {
-                        p1=(char *)Malloc((int)num);
-                        if (p1 == NULL) goto malloc_error;
-                        }
-                if ((obs > DEFAULT_BUFFER_SIZE) && (obs != ctx->obuf_size))
-                        {
-                        p2=(char *)Malloc((int)num);
-                        if (p2 == NULL)
-                                {
-                                if (p1 != ctx->ibuf) Free(p1);
-                                goto malloc_error;
-                                }
-                        }
-                if (ctx->ibuf != p1)
-                        {
-                        Free(ctx->ibuf);
-                        ctx->ibuf=p1;
-                        ctx->ibuf_off=0;
-                        ctx->ibuf_len=0;
-                        ctx->ibuf_size=ibs;
-                        }
-                if (ctx->obuf != p2)
-                        {
-                        Free(ctx->obuf);
-                        ctx->obuf=p2;
-                        ctx->obuf_off=0;
-                        ctx->obuf_len=0;
-                        ctx->obuf_size=obs;
-                        }
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-
-        case BIO_CTRL_FLUSH:
-                if (ctx->obuf_len <= 0)
-                        {
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                        break;
-                        }
-
-                for (;;)
-                        {
-                        BIO_clear_retry_flags(b);
-                        if (ctx->obuf_len > ctx->obuf_off)
-                                {
-                                r=BIO_write(b->next_bio,
-                                        &(ctx->obuf[ctx->obuf_off]),
-                                        ctx->obuf_len-ctx->obuf_off);
-#if 0
-fprintf(stderr,"FLUSH [%3d] %3d -> %3d\n",ctx->obuf_off,ctx->obuf_len-ctx->obuf_off,r);
-#endif
-                                BIO_copy_next_retry(b);
-                                if (r <= 0) return((long)r);
-                                ctx->obuf_off+=r;
-                                }
-                        else
-                                {
-                                ctx->obuf_len=0;
-                                ctx->obuf_off=0;
-                                ret=1;
-                                break;
-                                }
-                        }
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-                if (    !BIO_set_read_buffer_size(dbio,ctx->ibuf_size) ||
-                        !BIO_set_write_buffer_size(dbio,ctx->obuf_size))
-                        ret=0;
-                break;
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-malloc_error:
-        BIOerr(BIO_F_BUFFER_CTRL,ERR_R_MALLOC_FAILURE);
-        return(0);
-        }
-
-static int buffer_gets(BIO *b, char *buf, int size)
-        {
-        BIO_F_BUFFER_CTX *ctx;
-        int num=0,i,flag;
-        char *p;
-
-        ctx=(BIO_F_BUFFER_CTX *)b->ptr;
-        size--; /* reserve space for a '\0' */
-        BIO_clear_retry_flags(b);
-
-        for (;;)
-                {
-                if (ctx->ibuf_len > 0)
-                        {
-                        p= &(ctx->ibuf[ctx->ibuf_off]);
-                        flag=0;
-                        for (i=0; (i<ctx->ibuf_len) && (i<size); i++)
-                                {
-                                *(buf++)=p[i];
-                                if (p[i] == '\n')
-                                        {
-                                        flag=1;
-                                        i++;
-                                        break;
-                                        }
-                                }
-                        num+=i;
-                        size-=i;
-                        ctx->ibuf_len-=i;
-                        ctx->ibuf_off+=i;
-                        if ((flag) || (i == size))
-                                {
-                                *buf='\0';
-                                return(num);
-                                }
-                        }
-                else    /* read another chunk */
-                        {
-                        i=BIO_read(b->next_bio,ctx->ibuf,ctx->ibuf_size);
-                        if (i <= 0)
-                                {
-                                BIO_copy_next_retry(b);
-                                if (i < 0) return((num > 0)?num:i);
-                                if (i == 0) return(num);
-                                }
-                        ctx->ibuf_len=i;
-                        ctx->ibuf_off=0;
-                        }
-                }
-        }
-
-static int buffer_puts(BIO *b, char *str)
-        {
-        return(BIO_write(b,str,strlen(str)));
-        }
-
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
deleted file mode 100644
index cbec2bae29..0000000000
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* crypto/bio/bf_nbio.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 <openssl/rand.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-
-/* BIO_put and BIO_get both add to the digest,
- * BIO_gets returns the digest */
-
-static int nbiof_write(BIO *h,char *buf,int num);
-static int nbiof_read(BIO *h,char *buf,int size);
-static int nbiof_puts(BIO *h,char *str);
-static int nbiof_gets(BIO *h,char *str,int size);
-static long nbiof_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int nbiof_new(BIO *h);
-static int nbiof_free(BIO *data);
-typedef struct nbio_test_st
-        {
-        /* only set if we sent a 'should retry' error */
-        int lrn;
-        int lwn;
-        } NBIO_TEST;
-
-static BIO_METHOD methods_nbiof=
-        {
-        BIO_TYPE_NBIO_TEST,
-        "non-blocking IO test filter",
-        nbiof_write,
-        nbiof_read,
-        nbiof_puts,
-        nbiof_gets,
-        nbiof_ctrl,
-        nbiof_new,
-        nbiof_free,
-        };
-
-BIO_METHOD *BIO_f_nbio_test(void)
-        {
-        return(&methods_nbiof);
-        }
-
-static int nbiof_new(BIO *bi)
-        {
-        NBIO_TEST *nt;
-
-        nt=(NBIO_TEST *)Malloc(sizeof(NBIO_TEST));
-        nt->lrn= -1;
-        nt->lwn= -1;
-        bi->ptr=(char *)nt;
-        bi->init=1;
-        bi->flags=0;
-        return(1);
-        }
-
-static int nbiof_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        if (a->ptr != NULL)
-                Free(a->ptr);
-        a->ptr=NULL;
-        a->init=0;
-        a->flags=0;
-        return(1);
-        }
-        
-static int nbiof_read(BIO *b, char *out, int outl)
-        {
-        NBIO_TEST *nt;
-        int ret=0;
-#if 0
-        int num;
-        unsigned char n;
-#endif
-
-        if (out == NULL) return(0);
-        if (b->next_bio == NULL) return(0);
-        nt=(NBIO_TEST *)b->ptr;
-
-        BIO_clear_retry_flags(b);
-#if 0
-        RAND_bytes(&n,1);
-        num=(n&0x07);
-
-        if (outl > num) outl=num;
-
-        if (num == 0)
-                {
-                ret= -1;
-                BIO_set_retry_read(b);
-                }
-        else
-#endif
-                {
-                ret=BIO_read(b->next_bio,out,outl);
-                if (ret < 0)
-                        BIO_copy_next_retry(b);
-                }
-        return(ret);
-        }
-
-static int nbiof_write(BIO *b, char *in, int inl)
-        {
-        NBIO_TEST *nt;
-        int ret=0;
-        int num;
-        unsigned char n;
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-        if (b->next_bio == NULL) return(0);
-        nt=(NBIO_TEST *)b->ptr;
-
-        BIO_clear_retry_flags(b);
-
-#if 1
-        if (nt->lwn > 0)
-                {
-                num=nt->lwn;
-                nt->lwn=0;
-                }
-        else
-                {
-                RAND_bytes(&n,1);
-                num=(n&7);
-                }
-
-        if (inl > num) inl=num;
-
-        if (num == 0)
-                {
-                ret= -1;
-                BIO_set_retry_write(b);
-                }
-        else
-#endif
-                {
-                ret=BIO_write(b->next_bio,in,inl);
-                if (ret < 0)
-                        {
-                        BIO_copy_next_retry(b);
-                        nt->lwn=inl;
-                        }
-                }
-        return(ret);
-        }
-
-static long nbiof_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        long ret;
-
-        if (b->next_bio == NULL) return(0);
-        switch (cmd)
-                {
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-        case BIO_CTRL_DUP:
-                ret=0L;
-                break;
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-        }
-
-static int nbiof_gets(BIO *bp, char *buf, int size)
-        {
-        if (bp->next_bio == NULL) return(0);
-        return(BIO_gets(bp->next_bio,buf,size));
-        }
-
-
-static int nbiof_puts(BIO *bp, char *str)
-        {
-        if (bp->next_bio == NULL) return(0);
-        return(BIO_puts(bp->next_bio,str));
-        }
-
-
diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c
deleted file mode 100644
index 3254a55dce..0000000000
--- a/src/lib/libcrypto/bio/bf_null.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* crypto/bio/bf_null.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 <openssl/bio.h>
-#include <openssl/evp.h>
-
-/* BIO_put and BIO_get both add to the digest,
- * BIO_gets returns the digest */
-
-static int nullf_write(BIO *h,char *buf,int num);
-static int nullf_read(BIO *h,char *buf,int size);
-static int nullf_puts(BIO *h,char *str);
-static int nullf_gets(BIO *h,char *str,int size);
-static long nullf_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int nullf_new(BIO *h);
-static int nullf_free(BIO *data);
-static BIO_METHOD methods_nullf=
-        {
-        BIO_TYPE_NULL_FILTER,
-        "NULL filter",
-        nullf_write,
-        nullf_read,
-        nullf_puts,
-        nullf_gets,
-        nullf_ctrl,
-        nullf_new,
-        nullf_free,
-        };
-
-BIO_METHOD *BIO_f_null(void)
-        {
-        return(&methods_nullf);
-        }
-
-static int nullf_new(BIO *bi)
-        {
-        bi->init=1;
-        bi->ptr=NULL;
-        bi->flags=0;
-        return(1);
-        }
-
-static int nullf_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-/*      a->ptr=NULL;
-        a->init=0;
-        a->flags=0;*/
-        return(1);
-        }
-        
-static int nullf_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
- 
-        if (out == NULL) return(0);
-        if (b->next_bio == NULL) return(0);
-        ret=BIO_read(b->next_bio,out,outl);
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static int nullf_write(BIO *b, char *in, int inl)
-        {
-        int ret=0;
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-        if (b->next_bio == NULL) return(0);
-        ret=BIO_write(b->next_bio,in,inl);
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static long nullf_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        long ret;
-
-        if (b->next_bio == NULL) return(0);
-        switch(cmd)
-                {
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-        case BIO_CTRL_DUP:
-                ret=0L;
-                break;
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                }
-        return(ret);
-        }
-
-static int nullf_gets(BIO *bp, char *buf, int size)
-        {
-        if (bp->next_bio == NULL) return(0);
-        return(BIO_gets(bp->next_bio,buf,size));
-        }
-
-
-static int nullf_puts(BIO *bp, char *str)
-        {
-        if (bp->next_bio == NULL) return(0);
-        return(BIO_puts(bp->next_bio,str));
-        }
-
-
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
deleted file mode 100644
index 54bf622a3b..0000000000
--- a/src/lib/libcrypto/bio/bio.h
+++ /dev/null
@@ -1,643 +0,0 @@
-/* crypto/bio/bio.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_BIO_H
-#define HEADER_BIO_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/crypto.h>
-
-/* These are the 'types' of BIOs */
-#define BIO_TYPE_NONE           0
-#define BIO_TYPE_MEM            (1|0x0400)
-#define BIO_TYPE_FILE           (2|0x0400)
-
-#define BIO_TYPE_FD             (4|0x0400|0x0100)
-#define BIO_TYPE_SOCKET         (5|0x0400|0x0100)
-#define BIO_TYPE_NULL           (6|0x0400)
-#define BIO_TYPE_SSL            (7|0x0200)
-#define BIO_TYPE_MD             (8|0x0200)              /* pasive filter */
-#define BIO_TYPE_BUFFER         (9|0x0200)              /* filter */
-#define BIO_TYPE_CIPHER         (10|0x0200)             /* filter */
-#define BIO_TYPE_BASE64         (11|0x0200)             /* filter */
-#define BIO_TYPE_CONNECT        (12|0x0400|0x0100)      /* socket - connect */
-#define BIO_TYPE_ACCEPT         (13|0x0400|0x0100)      /* socket for accept */
-#define BIO_TYPE_PROXY_CLIENT   (14|0x0200)             /* client proxy BIO */
-#define BIO_TYPE_PROXY_SERVER   (15|0x0200)             /* server proxy BIO */
-#define BIO_TYPE_NBIO_TEST      (16|0x0200)             /* server proxy BIO */
-#define BIO_TYPE_NULL_FILTER    (17|0x0200)
-#define BIO_TYPE_BER            (18|0x0200)             /* BER -> bin filter */
-#define BIO_TYPE_BIO            (19|0x0400)             /* (half a) BIO pair */
-
-#define BIO_TYPE_DESCRIPTOR     0x0100  /* socket, fd, connect or accept */
-#define BIO_TYPE_FILTER         0x0200
-#define BIO_TYPE_SOURCE_SINK    0x0400
-
-/* BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
- * BIO_set_fp(in,stdin,BIO_NOCLOSE); */
-#define BIO_NOCLOSE             0x00
-#define BIO_CLOSE               0x01
-
-/* These are used in the following macros and are passed to
- * BIO_ctrl() */
-#define BIO_CTRL_RESET          1  /* opt - rewind/zero etc */
-#define BIO_CTRL_EOF            2  /* opt - are we at the eof */
-#define BIO_CTRL_INFO           3  /* opt - extra tit-bits */
-#define BIO_CTRL_SET            4  /* man - set the 'IO' type */
-#define BIO_CTRL_GET            5  /* man - get the 'IO' type */
-#define BIO_CTRL_PUSH           6  /* opt - internal, used to signify change */
-#define BIO_CTRL_POP            7  /* opt - internal, used to signify change */
-#define BIO_CTRL_GET_CLOSE      8  /* man - set the 'close' on free */
-#define BIO_CTRL_SET_CLOSE      9  /* man - set the 'close' on free */
-#define BIO_CTRL_PENDING        10  /* opt - is their more data buffered */
-#define BIO_CTRL_FLUSH          11  /* opt - 'flush' buffered output */
-#define BIO_CTRL_DUP            12  /* man - extra stuff for 'duped' BIO */
-#define BIO_CTRL_WPENDING       13  /* opt - number of bytes still to write */
-/* callback is int cb(BIO *bio,state,ret); */
-#define BIO_CTRL_SET_CALLBACK   14  /* opt - set callback function */
-#define BIO_CTRL_GET_CALLBACK   15  /* opt - set callback function */
-
-#define BIO_CTRL_SET_FILENAME   30      /* BIO_s_file special */
-
-/* modifiers */
-#define BIO_FP_READ             0x02
-#define BIO_FP_WRITE            0x04
-#define BIO_FP_APPEND           0x08
-#define BIO_FP_TEXT             0x10
-
-#define BIO_FLAGS_READ          0x01
-#define BIO_FLAGS_WRITE         0x02
-#define BIO_FLAGS_IO_SPECIAL    0x04
-#define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-#define BIO_FLAGS_SHOULD_RETRY  0x08
-
-/* Used in BIO_gethostbyname() */
-#define BIO_GHBN_CTRL_HITS              1
-#define BIO_GHBN_CTRL_MISSES            2
-#define BIO_GHBN_CTRL_CACHE_SIZE        3
-#define BIO_GHBN_CTRL_GET_ENTRY         4
-#define BIO_GHBN_CTRL_FLUSH             5
-
-/* Mostly used in the SSL BIO */
-/* Not used anymore
- * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
- * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
- * #define BIO_FLAGS_PROTOCOL_STARTUP   0x40
- */
-
-#define BIO_FLAGS_BASE64_NO_NL  0x100
-
-#define BIO_set_flags(b,f) ((b)->flags|=(f))
-#define BIO_get_flags(b) ((b)->flags)
-#define BIO_set_retry_special(b) \
-                ((b)->flags|=(BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_set_retry_read(b) \
-                ((b)->flags|=(BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_set_retry_write(b) \
-                ((b)->flags|=(BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
-/* These are normally used internally in BIOs */
-#define BIO_clear_flags(b,f) ((b)->flags&= ~(f))
-#define BIO_clear_retry_flags(b) \
-                ((b)->flags&= ~(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-#define BIO_get_retry_flags(b) \
-                ((b)->flags&(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
-/* These shouldbe used by the application to tell why we should retry */
-#define BIO_should_read(a)              ((a)->flags & BIO_FLAGS_READ)
-#define BIO_should_write(a)             ((a)->flags & BIO_FLAGS_WRITE)
-#define BIO_should_io_special(a)        ((a)->flags & BIO_FLAGS_IO_SPECIAL)
-#define BIO_retry_type(a)               ((a)->flags & BIO_FLAGS_RWS)
-#define BIO_should_retry(a)             ((a)->flags & BIO_FLAGS_SHOULD_RETRY)
-
-/* The next two are used in conjunction with the
- * BIO_should_io_special() condition.  After this returns true,
- * BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO 
- * stack and return the 'reason' for the special and the offending BIO.
- * Given a BIO, BIO_get_retry_reason(bio) will return the code. */
-/* Returned from the SSL bio when the certificate retrieval code had an error */
-#define BIO_RR_SSL_X509_LOOKUP          0x01
-/* Returned from the connect BIO when a connect would have blocked */
-#define BIO_RR_CONNECT                  0x02
-
-/* These are passed by the BIO callback */
-#define BIO_CB_FREE     0x01
-#define BIO_CB_READ     0x02
-#define BIO_CB_WRITE    0x03
-#define BIO_CB_PUTS     0x04
-#define BIO_CB_GETS     0x05
-#define BIO_CB_CTRL     0x06
-
-/* The callback is called before and after the underling operation,
- * The BIO_CB_RETURN flag indicates if it is after the call */
-#define BIO_CB_RETURN   0x80
-#define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
-#define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
-#define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
-
-#define BIO_set_callback(b,cb)          ((b)->callback=(cb))
-#define BIO_set_callback_arg(b,arg)     ((b)->cb_arg=(char *)(arg))
-#define BIO_get_callback_arg(b)         ((b)->cb_arg)
-#define BIO_get_callback(b)             ((b)->callback)
-#define BIO_method_name(b)              ((b)->method->name)
-#define BIO_method_type(b)              ((b)->method->type)
-
-#ifndef WIN16
-typedef struct bio_method_st
-        {
-        int type;
-        const char *name;
-        int (*bwrite)();
-        int (*bread)();
-        int (*bputs)();
-        int (*bgets)();
-        long (*ctrl)();
-        int (*create)();
-        int (*destroy)();
-        } BIO_METHOD;
-#else
-typedef struct bio_method_st
-        {
-        int type;
-        const char *name;
-        int (_far *bwrite)();
-        int (_far *bread)();
-        int (_far *bputs)();
-        int (_far *bgets)();
-        long (_far *ctrl)();
-        int (_far *create)();
-        int (_far *destroy)();
-        } BIO_METHOD;
-#endif
-
-typedef struct bio_st
-        {
-        BIO_METHOD *method;
-        /* bio, mode, argp, argi, argl, ret */
-        long (*callback)(struct bio_st *,int,const char *,int, long,long);
-        char *cb_arg; /* first argument for the callback */
-
-        int init;
-        int shutdown;
-        int flags;      /* extra storage */
-        int retry_reason;
-        int num;
-        void *ptr;
-        struct bio_st *next_bio;        /* used by filter BIOs */
-        struct bio_st *prev_bio;        /* used by filter BIOs */
-        int references;
-        unsigned long num_read;
-        unsigned long num_write;
-
-        CRYPTO_EX_DATA ex_data;
-        } BIO;
-
-typedef struct bio_f_buffer_ctx_struct
-        {
-        /* BIO *bio; */ /* this is now in the BIO struct */
-        int ibuf_size;  /* how big is the input buffer */
-        int obuf_size;  /* how big is the output buffer */
-
-        char *ibuf;             /* the char array */
-        int ibuf_len;           /* how many bytes are in it */
-        int ibuf_off;           /* write/read offset */
-
-        char *obuf;             /* the char array */
-        int obuf_len;           /* how many bytes are in it */
-        int obuf_off;           /* write/read offset */
-        } BIO_F_BUFFER_CTX;
-
-/* connect BIO stuff */
-#define BIO_CONN_S_BEFORE               1
-#define BIO_CONN_S_GET_IP               2
-#define BIO_CONN_S_GET_PORT             3
-#define BIO_CONN_S_CREATE_SOCKET        4
-#define BIO_CONN_S_CONNECT              5
-#define BIO_CONN_S_OK                   6
-#define BIO_CONN_S_BLOCKED_CONNECT      7
-#define BIO_CONN_S_NBIO                 8
-/*#define BIO_CONN_get_param_hostname   BIO_ctrl */
-
-#define BIO_number_read(b)      ((b)->num_read)
-#define BIO_number_written(b)   ((b)->num_write)
-
-#define BIO_C_SET_CONNECT                       100
-#define BIO_C_DO_STATE_MACHINE                  101
-#define BIO_C_SET_NBIO                          102
-#define BIO_C_SET_PROXY_PARAM                   103
-#define BIO_C_SET_FD                            104
-#define BIO_C_GET_FD                            105
-#define BIO_C_SET_FILE_PTR                      106
-#define BIO_C_GET_FILE_PTR                      107
-#define BIO_C_SET_FILENAME                      108
-#define BIO_C_SET_SSL                           109
-#define BIO_C_GET_SSL                           110
-#define BIO_C_SET_MD                            111
-#define BIO_C_GET_MD                            112
-#define BIO_C_GET_CIPHER_STATUS                 113
-#define BIO_C_SET_BUF_MEM                       114
-#define BIO_C_GET_BUF_MEM_PTR                   115
-#define BIO_C_GET_BUFF_NUM_LINES                116
-#define BIO_C_SET_BUFF_SIZE                     117
-#define BIO_C_SET_ACCEPT                        118
-#define BIO_C_SSL_MODE                          119
-#define BIO_C_GET_MD_CTX                        120
-#define BIO_C_GET_PROXY_PARAM                   121
-#define BIO_C_SET_BUFF_READ_DATA                122 /* data to read first */
-#define BIO_C_GET_CONNECT                       123
-#define BIO_C_GET_ACCEPT                        124
-#define BIO_C_SET_SSL_RENEGOTIATE_BYTES         125
-#define BIO_C_GET_SSL_NUM_RENEGOTIATES          126
-#define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT       127
-#define BIO_C_FILE_SEEK                         128
-#define BIO_C_GET_CIPHER_CTX                    129
-#define BIO_C_SET_BUF_MEM_EOF_RETURN            130/*return end of input value*/
-#define BIO_C_SET_BIND_MODE                     131
-#define BIO_C_GET_BIND_MODE                     132
-#define BIO_C_FILE_TELL                         133
-#define BIO_C_GET_SOCKS                         134
-#define BIO_C_SET_SOCKS                         135
-
-#define BIO_C_SET_WRITE_BUF_SIZE                136/* for BIO_s_bio */
-#define BIO_C_GET_WRITE_BUF_SIZE                137
-#define BIO_C_MAKE_BIO_PAIR                     138
-#define BIO_C_DESTROY_BIO_PAIR                  139
-#define BIO_C_GET_WRITE_GUARANTEE               140
-#define BIO_C_GET_READ_REQUEST                  141
-#define BIO_C_SHUTDOWN_WR                       142
-
-
-#define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,(char *)arg)
-#define BIO_get_app_data(s)             BIO_get_ex_data(s,0)
-
-/* BIO_s_connect() and BIO_s_socks4a_connect() */
-#define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-#define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-#define BIO_set_conn_ip(b,ip)     BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
-#define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
-#define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
-#define BIO_get_conn_port(b)      BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
-#define BIO_get_conn_ip(b,ip) BIO_ptr_ctrl(b,BIO_C_SET_CONNECT,2)
-#define BIO_get_conn_int_port(b,port) BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,port)
-
-
-#define BIO_set_nbio(b,n)       BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-/* BIO_s_accept_socket() */
-#define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-#define BIO_get_accept_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
-/* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-#define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?"a":NULL)
-#define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
-
-#define BIO_BIND_NORMAL                 0
-#define BIO_BIND_REUSEADDR_IF_UNUSED    1
-#define BIO_BIND_REUSEADDR              2
-#define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-#define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-#define BIO_do_connect(b)       BIO_do_handshake(b)
-#define BIO_do_accept(b)        BIO_do_handshake(b)
-#define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_proxy_client() */
-#define BIO_set_url(b,url)      BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
-#define BIO_set_proxies(b,p)    BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
-/* BIO_set_nbio(b,n) */
-#define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
-/* BIO *BIO_get_filter_bio(BIO *bio); */
-#define BIO_set_proxy_cb(b,cb) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,3,(char *)(cb))
-#define BIO_set_proxy_header(b,sk) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,4,(char *)sk)
-#define BIO_set_no_connect_return(b,bool) BIO_int_ctrl(b,BIO_C_SET_PROXY_PARAM,5,bool)
-
-#define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
-#define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
-#define BIO_get_url(b,url)      BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
-#define BIO_get_no_connect_return(b)    BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
-
-#define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-#define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
-
-#define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
-#define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
-
-#define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-#define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
-
-/* name is cast to lose const, but might be better to route through a function
-   so we can do it safely */
-#ifdef CONST_STRICT
-/* If you are wondering why this isn't defined, its because CONST_STRICT is
- * purely a compile-time kludge to allow const to be checked.
- */
-int BIO_read_filename(BIO *b,const char *name);
-#else
-#define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ,(char *)name)
-#endif
-#define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_WRITE,name)
-#define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_APPEND,name)
-#define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
-
-/* WARNING WARNING, this ups the reference count on the read bio of the
- * SSL structure.  This is because the ssl read BIO is now pointed to by
- * the next_bio field in the bio.  So when you free the BIO, make sure
- * you are doing a BIO_free_all() to catch the underlying BIO. */
-#define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
-#define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
-#define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-#define BIO_set_ssl_renegotiate_bytes(b,num) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
-#define BIO_get_num_renegotiates(b) \
-        BIO_ctrl(b,BIO_C_SET_SSL_NUM_RENEGOTIATES,0,NULL);
-#define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
-
-/* defined in evp.h */
-/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
-
-#define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
-#define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
-#define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
-#define BIO_set_mem_eof_return(b,v) \
-                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
-
-/* For the BIO_f_buffer() type */
-#define BIO_get_buffer_num_lines(b)     BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-#define BIO_set_buffer_size(b,size)     BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-#define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-#define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-#define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
-
-/* Don't use the next one unless you know what you are doing :-) */
-#define BIO_dup_state(b,ret)    BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
-
-#define BIO_reset(b)            (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-#define BIO_eof(b)              (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-#define BIO_set_close(b,c)      (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-#define BIO_get_close(b)        (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-#define BIO_pending(b)          (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-#define BIO_wpending(b)         (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
-/* ...pending macros have inappropriate return type */
-size_t BIO_ctrl_pending(BIO *b);
-size_t BIO_ctrl_wpending(BIO *b);
-#define BIO_flush(b)            (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-#define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0,(char *)cbp)
-#define BIO_set_info_callback(b,cb) (int)BIO_ctrl(b,BIO_CTRL_SET_CALLBACK,0,(char *)cb)
-
-/* For the BIO_f_buffer() type */
-#define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-
-/* For BIO_s_bio() */
-#define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-#define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-#define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-#define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-/* macros with inappropriate type -- but ...pending macros use int too: */
-#define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-#define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
-size_t BIO_ctrl_get_write_guarantee(BIO *b);
-size_t BIO_ctrl_get_read_request(BIO *b);
-
-
-
-#ifdef NO_STDIO
-#define NO_FP_API
-#endif
-
-
-/* These two aren't currently implemented */
-/* int BIO_get_ex_num(BIO *bio); */
-/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio,int idx,char *data);
-char *BIO_get_ex_data(BIO *bio,int idx);
-int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-
-#  if defined(WIN16) && defined(_WINDLL)
-BIO_METHOD *BIO_s_file_internal(void);
-BIO *BIO_new_file_internal(char *filename, char *mode);
-BIO *BIO_new_fp_internal(FILE *stream, int close_flag);
-#    define BIO_s_file  BIO_s_file_internal
-#    define BIO_new_file        BIO_new_file_internal
-#    define BIO_new_fp  BIO_new_fp_internal
-#  else /* FP_API */
-BIO_METHOD *BIO_s_file(void );
-BIO *BIO_new_file(const char *filename, const char *mode);
-BIO *BIO_new_fp(FILE *stream, int close_flag);
-#    define BIO_s_file_internal         BIO_s_file
-#    define BIO_new_file_internal       BIO_new_file
-#    define BIO_new_fp_internal         BIO_s_file
-#  endif /* FP_API */
-BIO *   BIO_new(BIO_METHOD *type);
-int     BIO_set(BIO *a,BIO_METHOD *type);
-int     BIO_free(BIO *a);
-int     BIO_read(BIO *b, void *data, int len);
-int     BIO_gets(BIO *bp,char *buf, int size);
-int     BIO_write(BIO *b, const char *data, int len);
-int     BIO_puts(BIO *bp,const char *buf);
-long    BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
-char *  BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
-long    BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
-BIO *   BIO_push(BIO *b,BIO *append);
-BIO *   BIO_pop(BIO *b);
-void    BIO_free_all(BIO *a);
-BIO *   BIO_find_type(BIO *b,int bio_type);
-BIO *   BIO_get_retry_BIO(BIO *bio, int *reason);
-int     BIO_get_retry_reason(BIO *bio);
-BIO *   BIO_dup_chain(BIO *in);
-
-#ifndef WIN16
-long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
-        long argl,long ret);
-#else
-long _far _loadds BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,
-        long argl,long ret);
-#endif
-
-BIO_METHOD *BIO_s_mem(void);
-BIO_METHOD *BIO_s_socket(void);
-BIO_METHOD *BIO_s_connect(void);
-BIO_METHOD *BIO_s_accept(void);
-BIO_METHOD *BIO_s_fd(void);
-BIO_METHOD *BIO_s_log(void);
-BIO_METHOD *BIO_s_bio(void);
-BIO_METHOD *BIO_s_null(void);
-BIO_METHOD *BIO_f_null(void);
-BIO_METHOD *BIO_f_buffer(void);
-BIO_METHOD *BIO_f_nbio_test(void);
-/* BIO_METHOD *BIO_f_ber(void); */
-
-int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
-int BIO_dump(BIO *b,const char *bytes,int len);
-
-struct hostent *BIO_gethostbyname(const char *name);
-/* We might want a thread-safe interface too:
- * struct hostent *BIO_gethostbyname_r(const char *name,
- *     struct hostent *result, void *buffer, size_t buflen);
- * or something similar (caller allocates a struct hostent,
- * pointed to by "result", and additional buffer space for the various
- * substructures; if the buffer does not suffice, NULL is returned
- * and an appropriate error code is set).
- */
-int BIO_sock_error(int sock);
-int BIO_socket_ioctl(int fd, long type, unsigned long *arg);
-int BIO_socket_nbio(int fd,int mode);
-int BIO_get_port(const char *str, unsigned short *port_ptr);
-int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port,int mode);
-int BIO_accept(int sock,char **ip_port);
-int BIO_sock_init(void );
-void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock,int turn_on);
-
-void ERR_load_BIO_strings(void );
-
-BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_fd(int fd, int close_flag);
-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
-
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-        BIO **bio2, size_t writebuf2);
-/* If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
- * Otherwise returns 0 and sets *bio1 and *bio2 to NULL.
- * Size 0 uses default value.
- */
-
-void BIO_copy_next_retry(BIO *b);
-
-long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
-
-int BIO_printf(BIO *bio, ...);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the BIO functions. */
-
-/* Function codes. */
-#define BIO_F_ACPT_STATE                                 100
-#define BIO_F_BIO_ACCEPT                                 101
-#define BIO_F_BIO_BER_GET_HEADER                         102
-#define BIO_F_BIO_CTRL                                   103
-#define BIO_F_BIO_GETHOSTBYNAME                          120
-#define BIO_F_BIO_GETS                                   104
-#define BIO_F_BIO_GET_ACCEPT_SOCKET                      105
-#define BIO_F_BIO_GET_HOST_IP                            106
-#define BIO_F_BIO_GET_PORT                               107
-#define BIO_F_BIO_MAKE_PAIR                              121
-#define BIO_F_BIO_NEW                                    108
-#define BIO_F_BIO_NEW_FILE                               109
-#define BIO_F_BIO_PUTS                                   110
-#define BIO_F_BIO_READ                                   111
-#define BIO_F_BIO_SOCK_INIT                              112
-#define BIO_F_BIO_WRITE                                  113
-#define BIO_F_BUFFER_CTRL                                114
-#define BIO_F_CONN_STATE                                 115
-#define BIO_F_FILE_CTRL                                  116
-#define BIO_F_MEM_WRITE                                  117
-#define BIO_F_SSL_NEW                                    118
-#define BIO_F_WSASTARTUP                                 119
-
-/* 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_BROKEN_PIPE                                124
-#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_ARGUMENT                           125
-#define BIO_R_INVALID_IP_ADDRESS                         108
-#define BIO_R_IN_USE                                     123
-#define BIO_R_KEEPALIVE                                  109
-#define BIO_R_NBIO_CONNECT_ERROR                         110
-#define BIO_R_NO_ACCEPT_PORT_SPECIFIED                   111
-#define BIO_R_NO_HOSTNAME_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_TAG_MISMATCH                               116
-#define BIO_R_UNABLE_TO_BIND_SOCKET                      117
-#define BIO_R_UNABLE_TO_CREATE_SOCKET                    118
-#define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119
-#define BIO_R_UNINITIALIZED                              120
-#define BIO_R_UNSUPPORTED_METHOD                         121
-#define BIO_R_WSASTARTUP                                 122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c
deleted file mode 100644
index 37c7c22666..0000000000
--- a/src/lib/libcrypto/bio/bio_cb.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* crypto/bio/bio_cb.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <openssl/err.h>
-
-long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
-             int argi, long argl, long ret)
-        {
-        BIO *b;
-        MS_STATIC char buf[256];
-        char *p;
-        long r=1;
-
-        if (BIO_CB_RETURN & cmd)
-                r=ret;
-
-        sprintf(buf,"BIO[%08lX]:",(unsigned long)bio);
-        p= &(buf[14]);
-        switch (cmd)
-                {
-        case BIO_CB_FREE:
-                sprintf(p,"Free - %s\n",bio->method->name);
-                break;
-        case BIO_CB_READ:
-                if (bio->method->type & BIO_TYPE_DESCRIPTOR)
-                        sprintf(p,"read(%d,%d) - %s fd=%d\n",bio->num,argi,bio->method->name,bio->num);
-                else
-                        sprintf(p,"read(%d,%d) - %s\n",bio->num,argi,bio->method->name);
-                break;
-        case BIO_CB_WRITE:
-                if (bio->method->type & BIO_TYPE_DESCRIPTOR)
-                        sprintf(p,"write(%d,%d) - %s fd=%d\n",bio->num,argi,bio->method->name,bio->num);
-                else
-                        sprintf(p,"write(%d,%d) - %s\n",bio->num,argi,bio->method->name);
-                break;
-        case BIO_CB_PUTS:
-                sprintf(p,"puts() - %s\n",bio->method->name);
-                break;
-        case BIO_CB_GETS:
-                sprintf(p,"gets(%d) - %s\n",argi,bio->method->name);
-                break;
-        case BIO_CB_CTRL:
-                sprintf(p,"ctrl(%d) - %s\n",argi,bio->method->name);
-                break;
-        case BIO_CB_RETURN|BIO_CB_READ:
-                sprintf(p,"read return %ld\n",ret);
-                break;
-        case BIO_CB_RETURN|BIO_CB_WRITE:
-                sprintf(p,"write return %ld\n",ret);
-                break;
-        case BIO_CB_RETURN|BIO_CB_GETS:
-                sprintf(p,"gets return %ld\n",ret);
-                break;
-        case BIO_CB_RETURN|BIO_CB_PUTS:
-                sprintf(p,"puts return %ld\n",ret);
-                break;
-        case BIO_CB_RETURN|BIO_CB_CTRL:
-                sprintf(p,"ctrl return %ld\n",ret);
-                break;
-        default:
-                sprintf(p,"bio callback - unknown type (%d)\n",cmd);
-                break;
-                }
-
-        b=(BIO *)bio->cb_arg;
-        if (b != NULL)
-                BIO_write(b,buf,strlen(buf));
-#if !defined(NO_STDIO) && !defined(WIN16)
-        else
-                fputs(buf,stderr);
-#endif
-        return(r);
-        }
diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c
deleted file mode 100644
index 712d98a3a1..0000000000
--- a/src/lib/libcrypto/bio/bio_err.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* crypto/bio/bio_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bio.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA BIO_str_functs[]=
-        {
-{ERR_PACK(0,BIO_F_ACPT_STATE,0),        "ACPT_STATE"},
-{ERR_PACK(0,BIO_F_BIO_ACCEPT,0),        "BIO_accept"},
-{ERR_PACK(0,BIO_F_BIO_BER_GET_HEADER,0),        "BIO_BER_GET_HEADER"},
-{ERR_PACK(0,BIO_F_BIO_CTRL,0),  "BIO_ctrl"},
-{ERR_PACK(0,BIO_F_BIO_GETHOSTBYNAME,0), "BIO_gethostbyname"},
-{ERR_PACK(0,BIO_F_BIO_GETS,0),  "BIO_gets"},
-{ERR_PACK(0,BIO_F_BIO_GET_ACCEPT_SOCKET,0),     "BIO_get_accept_socket"},
-{ERR_PACK(0,BIO_F_BIO_GET_HOST_IP,0),   "BIO_get_host_ip"},
-{ERR_PACK(0,BIO_F_BIO_GET_PORT,0),      "BIO_get_port"},
-{ERR_PACK(0,BIO_F_BIO_MAKE_PAIR,0),     "BIO_MAKE_PAIR"},
-{ERR_PACK(0,BIO_F_BIO_NEW,0),   "BIO_new"},
-{ERR_PACK(0,BIO_F_BIO_NEW_FILE,0),      "BIO_new_file"},
-{ERR_PACK(0,BIO_F_BIO_PUTS,0),  "BIO_puts"},
-{ERR_PACK(0,BIO_F_BIO_READ,0),  "BIO_read"},
-{ERR_PACK(0,BIO_F_BIO_SOCK_INIT,0),     "BIO_sock_init"},
-{ERR_PACK(0,BIO_F_BIO_WRITE,0), "BIO_write"},
-{ERR_PACK(0,BIO_F_BUFFER_CTRL,0),       "BUFFER_CTRL"},
-{ERR_PACK(0,BIO_F_CONN_STATE,0),        "CONN_STATE"},
-{ERR_PACK(0,BIO_F_FILE_CTRL,0), "FILE_CTRL"},
-{ERR_PACK(0,BIO_F_MEM_WRITE,0), "MEM_WRITE"},
-{ERR_PACK(0,BIO_F_SSL_NEW,0),   "SSL_new"},
-{ERR_PACK(0,BIO_F_WSASTARTUP,0),        "WSASTARTUP"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA BIO_str_reasons[]=
-        {
-{BIO_R_ACCEPT_ERROR                      ,"accept error"},
-{BIO_R_BAD_FOPEN_MODE                    ,"bad fopen mode"},
-{BIO_R_BAD_HOSTNAME_LOOKUP               ,"bad hostname lookup"},
-{BIO_R_BROKEN_PIPE                       ,"broken pipe"},
-{BIO_R_CONNECT_ERROR                     ,"connect error"},
-{BIO_R_ERROR_SETTING_NBIO                ,"error setting nbio"},
-{BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET,"error setting nbio on accepted socket"},
-{BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET,"error setting nbio on accept socket"},
-{BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET ,"gethostbyname addr is not af inet"},
-{BIO_R_INVALID_ARGUMENT                  ,"invalid argument"},
-{BIO_R_INVALID_IP_ADDRESS                ,"invalid ip address"},
-{BIO_R_IN_USE                            ,"in use"},
-{BIO_R_KEEPALIVE                         ,"keepalive"},
-{BIO_R_NBIO_CONNECT_ERROR                ,"nbio connect error"},
-{BIO_R_NO_ACCEPT_PORT_SPECIFIED          ,"no accept port specified"},
-{BIO_R_NO_HOSTNAME_SPECIFIED             ,"no hostname specified"},
-{BIO_R_NO_PORT_DEFINED                   ,"no port defined"},
-{BIO_R_NO_PORT_SPECIFIED                 ,"no port specified"},
-{BIO_R_NULL_PARAMETER                    ,"null parameter"},
-{BIO_R_TAG_MISMATCH                      ,"tag mismatch"},
-{BIO_R_UNABLE_TO_BIND_SOCKET             ,"unable to bind socket"},
-{BIO_R_UNABLE_TO_CREATE_SOCKET           ,"unable to create socket"},
-{BIO_R_UNABLE_TO_LISTEN_SOCKET           ,"unable to listen socket"},
-{BIO_R_UNINITIALIZED                     ,"uninitialized"},
-{BIO_R_UNSUPPORTED_METHOD                ,"unsupported method"},
-{BIO_R_WSASTARTUP                        ,"wsastartup"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_BIO_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_BIO,BIO_str_functs);
-                ERR_load_strings(ERR_LIB_BIO,BIO_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
deleted file mode 100644
index b72688ea90..0000000000
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/* crypto/bio/bio_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 <errno.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <openssl/stack.h>
-
-static STACK *bio_meth=NULL;
-static int bio_meth_num=0;
-
-BIO *BIO_new(BIO_METHOD *method)
-        {
-        BIO *ret=NULL;
-
-        ret=(BIO *)Malloc(sizeof(BIO));
-        if (ret == NULL)
-                {
-                BIOerr(BIO_F_BIO_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        if (!BIO_set(ret,method))
-                {
-                Free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
-int BIO_set(BIO *bio, BIO_METHOD *method)
-        {
-        bio->method=method;
-        bio->callback=NULL;
-        bio->cb_arg=NULL;
-        bio->init=0;
-        bio->shutdown=1;
-        bio->flags=0;
-        bio->retry_reason=0;
-        bio->num=0;
-        bio->ptr=NULL;
-        bio->prev_bio=NULL;
-        bio->next_bio=NULL;
-        bio->references=1;
-        bio->num_read=0L;
-        bio->num_write=0L;
-        CRYPTO_new_ex_data(bio_meth,(char *)bio,&bio->ex_data);
-        if (method->create != NULL)
-                if (!method->create(bio))
-                        return(0);
-        return(1);
-        }
-
-int BIO_free(BIO *a)
-        {
-        int ret=0,i;
-
-        if (a == NULL) return(0);
-
-        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_BIO);
-#ifdef REF_PRINT
-        REF_PRINT("BIO",a);
-#endif
-        if (i > 0) return(1);
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"BIO_free, bad reference count\n");
-                abort();
-                }
-#endif
-        if ((a->callback != NULL) &&
-                ((i=(int)a->callback(a,BIO_CB_FREE,NULL,0,0L,1L)) <= 0))
-                        return(i);
-
-        CRYPTO_free_ex_data(bio_meth,(char *)a,&a->ex_data);
-
-        if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-        ret=a->method->destroy(a);
-        Free(a);
-        return(1);
-        }
-
-int BIO_read(BIO *b, void *out, int outl)
-        {
-        int i;
-        long (*cb)();
-
-        if ((b == NULL) || (b->method == NULL) || (b->method->bread == NULL))
-                {
-                BIOerr(BIO_F_BIO_READ,BIO_R_UNSUPPORTED_METHOD);
-                return(-2);
-                }
-
-        cb=b->callback;
-        if ((cb != NULL) &&
-                ((i=(int)cb(b,BIO_CB_READ,out,outl,0L,1L)) <= 0))
-                        return(i);
-
-        if (!b->init)
-                {
-                BIOerr(BIO_F_BIO_READ,BIO_R_UNINITIALIZED);
-                return(-2);
-                }
-
-        i=b->method->bread(b,out,outl);
-
-        if (i > 0) b->num_read+=(unsigned long)i;
-
-        if (cb != NULL)
-                i=(int)cb(b,BIO_CB_READ|BIO_CB_RETURN,out,outl,
-                        0L,(long)i);
-        return(i);
-        }
-
-int BIO_write(BIO *b, const char *in, int inl)
-        {
-        int i;
-        long (*cb)();
-
-        if (b == NULL)
-                return(0);
-
-        cb=b->callback;
-        if ((b->method == NULL) || (b->method->bwrite == NULL))
-                {
-                BIOerr(BIO_F_BIO_WRITE,BIO_R_UNSUPPORTED_METHOD);
-                return(-2);
-                }
-
-        if ((cb != NULL) &&
-                ((i=(int)cb(b,BIO_CB_WRITE,in,inl,0L,1L)) <= 0))
-                        return(i);
-
-        if (!b->init)
-                {
-                BIOerr(BIO_F_BIO_WRITE,BIO_R_UNINITIALIZED);
-                return(-2);
-                }
-
-        i=b->method->bwrite(b,in,inl);
-
-        if (i > 0) b->num_write+=(unsigned long)i;
-
-        /* This is evil and not thread safe.  If the BIO has been freed,
-         * we must not call the callback.  The only way to be able to
-         * determine this is the reference count which is now invalid since
-         * the memory has been free()ed.
-         */
-        if (b->references <= 0) abort();
-        if (cb != NULL) /* && (b->references >= 1)) */
-                i=(int)cb(b,BIO_CB_WRITE|BIO_CB_RETURN,in,inl,
-                        0L,(long)i);
-        return(i);
-        }
-
-int BIO_puts(BIO *b, const char *in)
-        {
-        int i;
-        long (*cb)();
-
-        if ((b == NULL) || (b->method == NULL) || (b->method->bputs == NULL))
-                {
-                BIOerr(BIO_F_BIO_PUTS,BIO_R_UNSUPPORTED_METHOD);
-                return(-2);
-                }
-
-        cb=b->callback;
-
-        if ((cb != NULL) &&
-                ((i=(int)cb(b,BIO_CB_PUTS,in,0,0L,1L)) <= 0))
-                        return(i);
-
-        if (!b->init)
-                {
-                BIOerr(BIO_F_BIO_PUTS,BIO_R_UNINITIALIZED);
-                return(-2);
-                }
-
-        i=b->method->bputs(b,in);
-
-        if (cb != NULL)
-                i=(int)cb(b,BIO_CB_PUTS|BIO_CB_RETURN,in,0,
-                        0L,(long)i);
-        return(i);
-        }
-
-int BIO_gets(BIO *b, char *in, int inl)
-        {
-        int i;
-        long (*cb)();
-
-        if ((b == NULL) || (b->method == NULL) || (b->method->bgets == NULL))
-                {
-                BIOerr(BIO_F_BIO_GETS,BIO_R_UNSUPPORTED_METHOD);
-                return(-2);
-                }
-
-        cb=b->callback;
-
-        if ((cb != NULL) &&
-                ((i=(int)cb(b,BIO_CB_GETS,in,inl,0L,1L)) <= 0))
-                        return(i);
-
-        if (!b->init)
-                {
-                BIOerr(BIO_F_BIO_GETS,BIO_R_UNINITIALIZED);
-                return(-2);
-                }
-
-        i=b->method->bgets(b,in,inl);
-
-        if (cb != NULL)
-                i=(int)cb(b,BIO_CB_GETS|BIO_CB_RETURN,in,inl,
-                        0L,(long)i);
-        return(i);
-        }
-
-long BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
-        {
-        int i;
-
-        i=iarg;
-        return(BIO_ctrl(b,cmd,larg,(char *)&i));
-        }
-
-char *BIO_ptr_ctrl(BIO *b, int cmd, long larg)
-        {
-        char *p=NULL;
-
-        if (BIO_ctrl(b,cmd,larg,(char *)&p) <= 0)
-                return(NULL);
-        else
-                return(p);
-        }
-
-long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
-        {
-        long ret;
-        long (*cb)();
-
-        if (b == NULL) return(0);
-
-        if ((b->method == NULL) || (b->method->ctrl == NULL))
-                {
-                BIOerr(BIO_F_BIO_CTRL,BIO_R_UNSUPPORTED_METHOD);
-                return(-2);
-                }
-
-        cb=b->callback;
-
-        if ((cb != NULL) &&
-                ((ret=cb(b,BIO_CB_CTRL,parg,cmd,larg,1L)) <= 0))
-                return(ret);
-
-        ret=b->method->ctrl(b,cmd,larg,parg);
-
-        if (cb != NULL)
-                ret=cb(b,BIO_CB_CTRL|BIO_CB_RETURN,parg,cmd,
-                        larg,ret);
-        return(ret);
-        }
-
-/* It is unfortunate to duplicate in functions what the BIO_(w)pending macros
- * do; but those macros have inappropriate return type, and for interfacing
- * from other programming languages, C macros aren't much of a help anyway. */
-size_t BIO_ctrl_pending(BIO *bio)
-    {
-        return BIO_ctrl(bio, BIO_CTRL_PENDING, 0, NULL);
-        }
-
-size_t BIO_ctrl_wpending(BIO *bio)
-    {
-        return BIO_ctrl(bio, BIO_CTRL_WPENDING, 0, NULL);
-        }
-
-
-/* put the 'bio' on the end of b's list of operators */
-BIO *BIO_push(BIO *b, BIO *bio)
-        {
-        BIO *lb;
-
-        if (b == NULL) return(bio);
-        lb=b;
-        while (lb->next_bio != NULL)
-                lb=lb->next_bio;
-        lb->next_bio=bio;
-        if (bio != NULL)
-                bio->prev_bio=lb;
-        /* called to do internal processing */
-        BIO_ctrl(b,BIO_CTRL_PUSH,0,NULL);
-        return(b);
-        }
-
-/* Remove the first and return the rest */
-BIO *BIO_pop(BIO *b)
-        {
-        BIO *ret;
-
-        if (b == NULL) return(NULL);
-        ret=b->next_bio;
-
-        if (b->prev_bio != NULL)
-                b->prev_bio->next_bio=b->next_bio;
-        if (b->next_bio != NULL)
-                b->next_bio->prev_bio=b->prev_bio;
-
-        b->next_bio=NULL;
-        b->prev_bio=NULL;
-        BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
-        return(ret);
-        }
-
-BIO *BIO_get_retry_BIO(BIO *bio, int *reason)
-        {
-        BIO *b,*last;
-
-        b=last=bio;
-        for (;;)
-                {
-                if (!BIO_should_retry(b)) break;
-                last=b;
-                b=b->next_bio;
-                if (b == NULL) break;
-                }
-        if (reason != NULL) *reason=last->retry_reason;
-        return(last);
-        }
-
-int BIO_get_retry_reason(BIO *bio)
-        {
-        return(bio->retry_reason);
-        }
-
-BIO *BIO_find_type(BIO *bio, int type)
-        {
-        int mt,mask;
-
-        mask=type&0xff;
-        do      {
-                if (bio->method != NULL)
-                        {
-                        mt=bio->method->type;
-
-                        if (!mask)
-                                {
-                                if (mt & type) return(bio);
-                                }
-                        else if (mt == type)
-                                return(bio);
-                        }
-                bio=bio->next_bio;
-                } while (bio != NULL);
-        return(NULL);
-        }
-
-void BIO_free_all(BIO *bio)
-        {
-        BIO *b;
-        int ref;
-
-        while (bio != NULL)
-                {
-                b=bio;
-                ref=b->references;
-                bio=bio->next_bio;
-                BIO_free(b);
-                /* Since ref count > 1, don't free anyone else. */
-                if (ref > 1) break;
-                }
-        }
-
-BIO *BIO_dup_chain(BIO *in)
-        {
-        BIO *ret=NULL,*eoc=NULL,*bio,*new;
-
-        for (bio=in; bio != NULL; bio=bio->next_bio)
-                {
-                if ((new=BIO_new(bio->method)) == NULL) goto err;
-                new->callback=bio->callback;
-                new->cb_arg=bio->cb_arg;
-                new->init=bio->init;
-                new->shutdown=bio->shutdown;
-                new->flags=bio->flags;
-
-                /* This will let SSL_s_sock() work with stdin/stdout */
-                new->num=bio->num;
-
-                if (!BIO_dup_state(bio,(char *)new))
-                        {
-                        BIO_free(new);
-                        goto err;
-                        }
-
-                /* copy app data */
-                if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
-                        goto err;
-
-                if (ret == NULL)
-                        {
-                        eoc=new;
-                        ret=eoc;
-                        }
-                else
-                        {
-                        BIO_push(eoc,new);
-                        eoc=new;
-                        }
-                }
-        return(ret);
-err:
-        if (ret != NULL)
-                BIO_free(ret);
-        return(NULL);   
-        }
-
-void BIO_copy_next_retry(BIO *b)
-        {
-        BIO_set_flags(b,BIO_get_retry_flags(b->next_bio));
-        b->retry_reason=b->next_bio->retry_reason;
-        }
-
-int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-             int (*dup_func)(), void (*free_func)())
-        {
-        bio_meth_num++;
-        return(CRYPTO_get_ex_new_index(bio_meth_num-1,&bio_meth,
-                argl,argp,new_func,dup_func,free_func));
-        }
-
-int BIO_set_ex_data(BIO *bio, int idx, char *data)
-        {
-        return(CRYPTO_set_ex_data(&(bio->ex_data),idx,data));
-        }
-
-char *BIO_get_ex_data(BIO *bio, int idx)
-        {
-        return(CRYPTO_get_ex_data(&(bio->ex_data),idx));
-        }
-
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
deleted file mode 100644
index 47af80f76d..0000000000
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* crypto/bio/bss_acpt.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_SOCK
-
-#include <stdio.h>
-#include <errno.h>
-#define USE_SOCKETS
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#ifdef WIN16
-#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
-#else
-#define SOCKET_PROTOCOL IPPROTO_TCP
-#endif
-
-#if (defined(VMS) && __VMS_VER < 70000000)
-/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
-#undef FIONBIO
-#endif
-
-typedef struct bio_accept_st
-        {
-        int state;
-        char *param_addr;
-
-        int accept_sock;
-        int accept_nbio;
-
-        char *addr;
-        int nbio;
-        /* If 0, it means normal, if 1, do a connect on bind failure,
-         * and if there is no-one listening, bind with SO_REUSEADDR.
-         * If 2, always use SO_REUSEADDR. */
-        int bind_mode;
-        BIO *bio_chain;
-        } BIO_ACCEPT;
-
-static int acpt_write(BIO *h,char *buf,int num);
-static int acpt_read(BIO *h,char *buf,int size);
-static int acpt_puts(BIO *h,char *str);
-static long acpt_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int acpt_new(BIO *h);
-static int acpt_free(BIO *data);
-static int acpt_state(BIO *b, BIO_ACCEPT *c);
-static void acpt_close_socket(BIO *data);
-BIO_ACCEPT *BIO_ACCEPT_new(void );
-void BIO_ACCEPT_free(BIO_ACCEPT *a);
-
-#define ACPT_S_BEFORE                   1
-#define ACPT_S_GET_ACCEPT_SOCKET        2
-#define ACPT_S_OK                       3
-
-static BIO_METHOD methods_acceptp=
-        {
-        BIO_TYPE_ACCEPT,
-        "socket accept",
-        acpt_write,
-        acpt_read,
-        acpt_puts,
-        NULL, /* connect_gets, */
-        acpt_ctrl,
-        acpt_new,
-        acpt_free,
-        };
-
-BIO_METHOD *BIO_s_accept(void)
-        {
-        return(&methods_acceptp);
-        }
-
-static int acpt_new(BIO *bi)
-        {
-        BIO_ACCEPT *ba;
-
-        bi->init=0;
-        bi->num=INVALID_SOCKET;
-        bi->flags=0;
-        if ((ba=BIO_ACCEPT_new()) == NULL)
-                return(0);
-        bi->ptr=(char *)ba;
-        ba->state=ACPT_S_BEFORE;
-        bi->shutdown=1;
-        return(1);
-        }
-
-BIO_ACCEPT *BIO_ACCEPT_new(void)
-        {
-        BIO_ACCEPT *ret;
-
-        if ((ret=(BIO_ACCEPT *)Malloc(sizeof(BIO_ACCEPT))) == NULL)
-                return(NULL);
-
-        memset(ret,0,sizeof(BIO_ACCEPT));
-        ret->accept_sock=INVALID_SOCKET;
-        ret->bind_mode=BIO_BIND_NORMAL;
-        return(ret);
-        }
-
-void BIO_ACCEPT_free(BIO_ACCEPT *a)
-        {
-        if(a == NULL)
-            return;
-
-        if (a->param_addr != NULL) Free(a->param_addr);
-        if (a->addr != NULL) Free(a->addr);
-        if (a->bio_chain != NULL) BIO_free(a->bio_chain);
-        Free(a);
-        }
-
-static void acpt_close_socket(BIO *bio)
-        {
-        BIO_ACCEPT *c;
-
-        c=(BIO_ACCEPT *)bio->ptr;
-        if (c->accept_sock != INVALID_SOCKET)
-                {
-                shutdown(c->accept_sock,2);
-                closesocket(c->accept_sock);
-                c->accept_sock=INVALID_SOCKET;
-                bio->num=INVALID_SOCKET;
-                }
-        }
-
-static int acpt_free(BIO *a)
-        {
-        BIO_ACCEPT *data;
-
-        if (a == NULL) return(0);
-        data=(BIO_ACCEPT *)a->ptr;
-         
-        if (a->shutdown)
-                {
-                acpt_close_socket(a);
-                BIO_ACCEPT_free(data);
-                a->ptr=NULL;
-                a->flags=0;
-                a->init=0;
-                }
-        return(1);
-        }
-        
-static int acpt_state(BIO *b, BIO_ACCEPT *c)
-        {
-        BIO *bio=NULL,*dbio;
-        int s= -1;
-        int i;
-
-again:
-        switch (c->state)
-                {
-        case ACPT_S_BEFORE:
-                if (c->param_addr == NULL)
-                        {
-                        BIOerr(BIO_F_ACPT_STATE,BIO_R_NO_ACCEPT_PORT_SPECIFIED);
-                        return(-1);
-                        }
-                s=BIO_get_accept_socket(c->param_addr,c->bind_mode);
-                if (s == INVALID_SOCKET)
-                        return(-1);
-
-                if (c->accept_nbio)
-                        {
-                        if (!BIO_socket_nbio(s,1))
-                                {
-                                closesocket(s);
-                                BIOerr(BIO_F_ACPT_STATE,BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET);
-                                return(-1);
-                                }
-                        }
-                c->accept_sock=s;
-                b->num=s;
-                c->state=ACPT_S_GET_ACCEPT_SOCKET;
-                return(1);
-                /* break; */
-        case ACPT_S_GET_ACCEPT_SOCKET:
-                if (b->next_bio != NULL)
-                        {
-                        c->state=ACPT_S_OK;
-                        goto again;
-                        }
-                i=BIO_accept(c->accept_sock,&(c->addr));
-                if (i < 0) return(i);
-                bio=BIO_new_socket(i,BIO_CLOSE);
-                if (bio == NULL) goto err;
-
-                BIO_set_callback(bio,BIO_get_callback(b));
-                BIO_set_callback_arg(bio,BIO_get_callback_arg(b));
-
-                if (c->nbio)
-                        {
-                        if (!BIO_socket_nbio(i,1))
-                                {
-                                BIOerr(BIO_F_ACPT_STATE,BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET);
-                                goto err;
-                                }
-                        }
-
-                /* If the accept BIO has an bio_chain, we dup it and
-                 * put the new socket at the end. */
-                if (c->bio_chain != NULL)
-                        {
-                        if ((dbio=BIO_dup_chain(c->bio_chain)) == NULL)
-                                goto err;
-                        if (!BIO_push(dbio,bio)) goto err;
-                        bio=dbio;
-                        }
-                if (BIO_push(b,bio) == NULL) goto err;
-
-                c->state=ACPT_S_OK;
-                return(1);
-err:
-                if (bio != NULL)
-                        BIO_free(bio);
-                else if (s >= 0)
-                        closesocket(s);
-                return(0);
-                /* break; */
-        case ACPT_S_OK:
-                if (b->next_bio == NULL)
-                        {
-                        c->state=ACPT_S_GET_ACCEPT_SOCKET;
-                        goto again;
-                        }
-                return(1);
-                /* break; */
-        default:        
-                return(0);
-                /* break; */
-                }
-
-        }
-
-static int acpt_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
-        BIO_ACCEPT *data;
-
-        BIO_clear_retry_flags(b);
-        data=(BIO_ACCEPT *)b->ptr;
-
-        while (b->next_bio == NULL)
-                {
-                ret=acpt_state(b,data);
-                if (ret <= 0) return(ret);
-                }
-
-        ret=BIO_read(b->next_bio,out,outl);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static int acpt_write(BIO *b, char *in, int inl)
-        {
-        int ret;
-        BIO_ACCEPT *data;
-
-        BIO_clear_retry_flags(b);
-        data=(BIO_ACCEPT *)b->ptr;
-
-        while (b->next_bio == NULL)
-                {
-                ret=acpt_state(b,data);
-                if (ret <= 0) return(ret);
-                }
-
-        ret=BIO_write(b->next_bio,in,inl);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static long acpt_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        BIO *dbio;
-        int *ip;
-        long ret=1;
-        BIO_ACCEPT *data;
-        char **pp;
-
-        data=(BIO_ACCEPT *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                ret=0;
-                data->state=ACPT_S_BEFORE;
-                acpt_close_socket(b);
-                b->flags=0;
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                /* use this one to start the connection */
-                ret=(long)acpt_state(b,data);
-                break;
-        case BIO_C_SET_ACCEPT:
-                if (ptr != NULL)
-                        {
-                        if (num == 0)
-                                {
-                                b->init=1;
-                                if (data->param_addr != NULL)
-                                        Free(data->param_addr);
-                                data->param_addr=BUF_strdup(ptr);
-                                }
-                        else if (num == 1)
-                                {
-                                data->accept_nbio=(ptr != NULL);
-                                }
-                        else if (num == 2)
-                                {
-                                if (data->bio_chain != NULL)
-                                        BIO_free(data->bio_chain);
-                                data->bio_chain=(BIO *)ptr;
-                                }
-                        }
-                break;
-        case BIO_C_SET_NBIO:
-                data->nbio=(int)num;
-                break;
-        case BIO_C_SET_FD:
-                b->init=1;
-                b->num= *((int *)ptr);
-                data->accept_sock=b->num;
-                data->state=ACPT_S_GET_ACCEPT_SOCKET;
-                b->shutdown=(int)num;
-                b->init=1;
-                break;
-        case BIO_C_GET_FD:
-                if (b->init)
-                        {
-                        ip=(int *)ptr;
-                        if (ip != NULL)
-                                *ip=data->accept_sock;
-                        ret=data->accept_sock;
-                        }
-                else
-                        ret= -1;
-                break;
-        case BIO_C_GET_ACCEPT:
-                if (b->init)
-                        {
-                        if (ptr != NULL)
-                                {
-                                pp=(char **)ptr;
-                                *pp=data->param_addr;
-                                }
-                        else
-                                ret= -1;
-                        }
-                else
-                        ret= -1;
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-        case BIO_CTRL_PENDING:
-        case BIO_CTRL_WPENDING:
-                ret=0;
-                break;
-        case BIO_CTRL_FLUSH:
-                break;
-        case BIO_C_SET_BIND_MODE:
-                data->bind_mode=(int)num;
-                break;
-        case BIO_C_GET_BIND_MODE:
-                ret=(long)data->bind_mode;
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-/*              if (data->param_port) EAY EAY
-                        BIO_set_port(dbio,data->param_port);
-                if (data->param_hostname)
-                        BIO_set_hostname(dbio,data->param_hostname);
-                BIO_set_nbio(dbio,data->nbio); */
-                break;
-
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-static int acpt_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=acpt_write(bp,str,n);
-        return(ret);
-        }
-
-BIO *BIO_new_accept(char *str)
-        {
-        BIO *ret;
-
-        ret=BIO_new(BIO_s_accept());
-        if (ret == NULL) return(NULL);
-        if (BIO_set_accept_port(ret,str))
-                return(ret);
-        else
-                {
-                BIO_free(ret);
-                return(NULL);
-                }
-        }
-
-#endif
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
deleted file mode 100644
index 562e9d8de2..0000000000
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ /dev/null
@@ -1,588 +0,0 @@
-/* crypto/bio/bss_bio.c  -*- Mode: C; c-file-style: "eay" -*- */
-
-/* Special method for a BIO where the other endpoint is also a BIO
- * of this kind, handled by the same thread (i.e. the "peer" is actually
- * ourselves, wearing a different hat).
- * Such "BIO pairs" are mainly for using the SSL library with I/O interfaces
- * for which no specific BIO method is available.
- * See ssl/ssltest.c for some hints on how this can be used. */
-
-#ifndef BIO_PAIR_DEBUG
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
-#endif
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/crypto.h>
-
-static int bio_new(BIO *bio);
-static int bio_free(BIO *bio);
-static int bio_read(BIO *bio, char *buf, int size);
-static int bio_write(BIO *bio, char *buf, int num);
-static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr);
-static int bio_puts(BIO *bio, char *str);
-
-static int bio_make_pair(BIO *bio1, BIO *bio2);
-static void bio_destroy_pair(BIO *bio);
-
-static BIO_METHOD methods_biop =
-{
-        BIO_TYPE_BIO,
-        "BIO pair",
-        bio_write,
-        bio_read,
-        bio_puts,
-        NULL /* no bio_gets */,
-        bio_ctrl,
-        bio_new,
-        bio_free
-};
-
-BIO_METHOD *BIO_s_bio(void)
-        {
-        return &methods_biop;
-        }
-
-struct bio_bio_st
-{
-        BIO *peer;     /* NULL if buf == NULL.
-                        * If peer != NULL, then peer->ptr is also a bio_bio_st,
-                        * and its "peer" member points back to us.
-                        * peer != NULL iff init != 0 in the BIO. */
-        
-        /* This is for what we write (i.e. reading uses peer's struct): */
-        int closed;     /* valid iff peer != NULL */
-        size_t len;     /* valid iff buf != NULL; 0 if peer == NULL */
-        size_t offset;  /* valid iff buf != NULL; 0 if len == 0 */
-        size_t size;
-        char *buf;      /* "size" elements (if != NULL) */
-
-        size_t request; /* valid iff peer != NULL; 0 if len != 0,
-                         * otherwise set by peer to number of bytes
-                         * it (unsuccesfully) tried to read,
-                         * never more than buffer space (size-len) warrants. */
-};
-
-static int bio_new(BIO *bio)
-        {
-        struct bio_bio_st *b;
-        
-        b = Malloc(sizeof *b);
-        if (b == NULL)
-                return 0;
-
-        b->peer = NULL;
-        b->size = 17*1024; /* enough for one TLS record (just a default) */
-        b->buf = NULL;
-
-        bio->ptr = b;
-        return 1;
-        }
-
-
-static int bio_free(BIO *bio)
-        {
-        struct bio_bio_st *b;
-
-        if (bio == NULL)
-                return 0;
-        b = bio->ptr;
-
-        assert(b != NULL);
-
-        if (b->peer)
-                bio_destroy_pair(bio);
-        
-        if (b->buf != NULL)
-                {
-                Free(b->buf);
-                }
-
-        Free(b);
-
-        return 1;
-        }
-
-
-
-static int bio_read(BIO *bio, char *buf, int size_)
-        {
-        size_t size = size_;
-        size_t rest;
-        struct bio_bio_st *b, *peer_b;
-
-        BIO_clear_retry_flags(bio);
-
-        if (!bio->init)
-                return 0;
-
-        b = bio->ptr;
-        assert(b != NULL);
-        assert(b->peer != NULL);
-        peer_b = b->peer->ptr;
-        assert(peer_b != NULL);
-        assert(peer_b->buf != NULL);
-
-        peer_b->request = 0; /* will be set in "retry_read" situation */
-
-        if (buf == NULL || size == 0)
-                return 0;
-
-        if (peer_b->len == 0)
-                {
-                if (peer_b->closed)
-                        return 0; /* writer has closed, and no data is left */
-                else
-                        {
-                        BIO_set_retry_read(bio); /* buffer is empty */
-                        if (size <= peer_b->size)
-                                peer_b->request = size;
-                        else
-                                /* don't ask for more than the peer can
-                                 * deliver in one write */
-                                peer_b->request = peer_b->size;
-                        return -1;
-                        }
-                }
-
-        /* we can read */
-        if (peer_b->len < size)
-                size = peer_b->len;
-
-        /* now read "size" bytes */
-        
-        rest = size;
-        
-        assert(rest > 0);
-        do /* one or two iterations */
-                {
-                size_t chunk;
-                
-                assert(rest <= peer_b->len);
-                if (peer_b->offset + rest <= peer_b->size)
-                        chunk = rest;
-                else
-                        /* wrap around ring buffer */
-                        chunk = peer_b->size - peer_b->offset;
-                assert(peer_b->offset + chunk <= peer_b->size);
-                
-                memcpy(buf, peer_b->buf + peer_b->offset, chunk);
-                
-                peer_b->len -= chunk;
-                if (peer_b->len)
-                        {
-                        peer_b->offset += chunk;
-                        assert(peer_b->offset <= peer_b->size);
-                        if (peer_b->offset == peer_b->size)
-                                peer_b->offset = 0;
-                        buf += chunk;
-                        }
-                else
-                        {
-                        /* buffer now empty, no need to advance "buf" */
-                        assert(chunk == rest);
-                        peer_b->offset = 0;
-                        }
-                rest -= chunk;
-                }
-        while (rest);
-        
-        return size;
-        }
-
-static int bio_write(BIO *bio, char *buf, int num_)
-        {
-        size_t num = num_;
-        size_t rest;
-        struct bio_bio_st *b;
-
-        BIO_clear_retry_flags(bio);
-
-        if (!bio->init || buf == NULL || num == 0)
-                return 0;
-
-        b = bio->ptr;           
-        assert(b != NULL);
-        assert(b->peer != NULL);
-        assert(b->buf != NULL);
-
-        b->request = 0;
-        if (b->closed)
-                {
-                /* we already closed */
-                BIOerr(BIO_F_BIO_WRITE, BIO_R_BROKEN_PIPE);
-                return -1;
-                }
-
-        assert(b->len <= b->size);
-
-        if (b->len == b->size)
-                {
-                BIO_set_retry_write(bio); /* buffer is full */
-                return -1;
-                }
-
-        /* we can write */
-        if (num > b->size - b->len)
-                num = b->size - b->len;
-        
-        /* now write "num" bytes */
-
-        rest = num;
-        
-        assert(rest > 0);
-        do /* one or two iterations */
-                {
-                size_t write_offset;
-                size_t chunk;
-
-                assert(b->len + rest <= b->size);
-
-                write_offset = b->offset + b->len;
-                if (write_offset >= b->size)
-                        write_offset -= b->size;
-                /* b->buf[write_offset] is the first byte we can write to. */
-
-                if (write_offset + rest <= b->size)
-                        chunk = rest;
-                else
-                        /* wrap around ring buffer */
-                        chunk = b->size - write_offset;
-                
-                memcpy(b->buf + write_offset, buf, chunk);
-                
-                b->len += chunk;
-
-                assert(b->len <= b->size);
-                
-                rest -= chunk;
-                buf += chunk;
-                }
-        while (rest);
-
-        return num;
-        }
-
-
-static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
-        {
-        long ret;
-        struct bio_bio_st *b = bio->ptr;
-        
-        assert(b != NULL);
-
-        switch (cmd)
-                {
-        /* specific CTRL codes */
-
-        case BIO_C_SET_WRITE_BUF_SIZE:
-                if (b->peer)
-                        {
-                        BIOerr(BIO_F_BIO_CTRL, BIO_R_IN_USE);
-                        ret = 0;
-                        }
-                else if (num == 0)
-                        {
-                        BIOerr(BIO_F_BIO_CTRL, BIO_R_INVALID_ARGUMENT);
-                        ret = 0;
-                        }
-                else
-                        {
-                        size_t new_size = num;
-
-                        if (b->size != new_size)
-                                {
-                                if (b->buf) 
-                                        {
-                                        Free(b->buf);
-                                        b->buf = NULL;
-                                        }
-                                b->size = new_size;
-                                }
-                        ret = 1;
-                        }
-                break;
-
-        case BIO_C_GET_WRITE_BUF_SIZE:
-                num = (long) b->size;
-
-        case BIO_C_MAKE_BIO_PAIR:
-                {
-                BIO *other_bio = ptr;
-                
-                if (bio_make_pair(bio, other_bio))
-                        ret = 1;
-                else
-                        ret = 0;
-                }
-                break;
-                
-        case BIO_C_DESTROY_BIO_PAIR:
-                /* Effects both BIOs in the pair -- call just once!
-                 * Or let BIO_free(bio1); BIO_free(bio2); do the job. */
-                bio_destroy_pair(bio);
-                ret = 1;
-                break;
-
-        case BIO_C_GET_WRITE_GUARANTEE:
-                /* How many bytes can the caller feed to the next write
-                 * withouth having to keep any? */
-                if (b->peer == NULL || b->closed)
-                        ret = 0;
-                else
-                        ret = (long) b->size - b->len;
-                break;
-
-        case BIO_C_GET_READ_REQUEST:
-                /* If the peer unsuccesfully tried to read, how many bytes
-                 * were requested?  (As with BIO_CTRL_PENDING, that number
-                 * can usually be treated as boolean.) */
-                ret = (long) b->request;
-                break;
-
-        case BIO_C_SHUTDOWN_WR:
-                /* similar to shutdown(..., SHUT_WR) */
-                b->closed = 1;
-                ret = 1;
-                break;
-
-
-        /* standard CTRL codes follow */
-
-        case BIO_CTRL_RESET:
-                if (b->buf != NULL)
-                        {
-                        b->len = 0;
-                        b->offset = 0;
-                        }
-                ret = 0;
-                break;          
-
-        case BIO_CTRL_GET_CLOSE:
-                ret = bio->shutdown;
-                break;
-
-        case BIO_CTRL_SET_CLOSE:
-                bio->shutdown = (int) num;
-                ret = 1;
-                break;
-
-        case BIO_CTRL_PENDING:
-                if (b->peer != NULL)
-                        {
-                        struct bio_bio_st *peer_b = b->peer->ptr;
-                        
-                        ret = (long) peer_b->len;
-                        }
-                else
-                        ret = 0;
-                break;
-
-        case BIO_CTRL_WPENDING:
-                if (b->buf != NULL)
-                        ret = (long) b->len;
-                else
-                        ret = 0;
-                break;
-
-        case BIO_CTRL_DUP:
-                /* See BIO_dup_chain for circumstances we have to expect. */
-                {
-                BIO *other_bio = ptr;
-                struct bio_bio_st *other_b;
-                
-                assert(other_bio != NULL);
-                other_b = other_bio->ptr;
-                assert(other_b != NULL);
-                
-                assert(other_b->buf == NULL); /* other_bio is always fresh */
-
-                other_b->size = b->size;
-                }
-
-                ret = 1;
-                break;
-
-        case BIO_CTRL_FLUSH:
-                ret = 1;
-                break;
-
-        case BIO_CTRL_EOF:
-                {
-                BIO *other_bio = ptr;
-                
-                if (other_bio)
-                        {
-                        struct bio_bio_st *other_b = other_bio->ptr;
-                        
-                        assert(other_b != NULL);
-                        ret = other_b->len == 0 && other_b->closed;
-                        }
-                else
-                        ret = 1;
-                }
-                break;
-
-        default:
-                ret = 0;
-                }
-        return ret;
-        }
-
-static int bio_puts(BIO *bio, char *str)
-        {
-        return bio_write(bio, str, strlen(str));
-        }
-
-
-static int bio_make_pair(BIO *bio1, BIO *bio2)
-        {
-        struct bio_bio_st *b1, *b2;
-
-        assert(bio1 != NULL);
-        assert(bio2 != NULL);
-
-        b1 = bio1->ptr;
-        b2 = bio2->ptr;
-        
-        if (b1->peer != NULL || b2->peer != NULL)
-                {
-                BIOerr(BIO_F_BIO_MAKE_PAIR, BIO_R_IN_USE);
-                return 0;
-                }
-        
-        if (b1->buf == NULL)
-                {
-                b1->buf = Malloc(b1->size);
-                if (b1->buf == NULL)
-                        {
-                        BIOerr(BIO_F_BIO_MAKE_PAIR, ERR_R_MALLOC_FAILURE);
-                        return 0;
-                        }
-                b1->len = 0;
-                b1->offset = 0;
-                }
-        
-        if (b2->buf == NULL)
-                {
-                b2->buf = Malloc(b2->size);
-                if (b2->buf == NULL)
-                        {
-                        BIOerr(BIO_F_BIO_MAKE_PAIR, ERR_R_MALLOC_FAILURE);
-                        return 0;
-                        }
-                b2->len = 0;
-                b2->offset = 0;
-                }
-        
-        b1->peer = bio2;
-        b1->closed = 0;
-        b1->request = 0;
-        b2->peer = bio1;
-        b2->closed = 0;
-        b2->request = 0;
-
-        bio1->init = 1;
-        bio2->init = 1;
-
-        return 1;
-        }
-
-static void bio_destroy_pair(BIO *bio)
-        {
-        struct bio_bio_st *b = bio->ptr;
-
-        if (b != NULL)
-                {
-                BIO *peer_bio = b->peer;
-
-                if (peer_bio != NULL)
-                        {
-                        struct bio_bio_st *peer_b = peer_bio->ptr;
-
-                        assert(peer_b != NULL);
-                        assert(peer_b->peer == bio);
-
-                        peer_b->peer = NULL;
-                        peer_bio->init = 0;
-                        assert(peer_b->buf != NULL);
-                        peer_b->len = 0;
-                        peer_b->offset = 0;
-                        
-                        b->peer = NULL;
-                        bio->init = 0;
-                        assert(b->buf != NULL);
-                        b->len = 0;
-                        b->offset = 0;
-                        }
-                }
-        }
- 
-
-/* Exported convenience functions */
-int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
-        BIO **bio2_p, size_t writebuf2)
-         {
-         BIO *bio1 = NULL, *bio2 = NULL;
-         long r;
-         int ret = 0;
-
-         bio1 = BIO_new(BIO_s_bio());
-         if (bio1 == NULL)
-                 goto err;
-         bio2 = BIO_new(BIO_s_bio());
-         if (bio2 == NULL)
-                 goto err;
-
-         if (writebuf1)
-                 {
-                 r = BIO_set_write_buf_size(bio1, writebuf1);
-                 if (!r)
-                         goto err;
-                 }
-         if (writebuf2)
-                 {
-                 r = BIO_set_write_buf_size(bio2, writebuf2);
-                 if (!r)
-                         goto err;
-                 }
-
-         r = BIO_make_bio_pair(bio1, bio2);
-         if (!r)
-                 goto err;
-         ret = 1;
-
- err:
-         if (ret == 0)
-                 {
-                 if (bio1)
-                         {
-                         BIO_free(bio1);
-                         bio1 = NULL;
-                         }
-                 if (bio2)
-                         {
-                         BIO_free(bio2);
-                         bio2 = NULL;
-                         }
-                 }
-
-         *bio1_p = bio1;
-         *bio2_p = bio2;
-         return ret;
-         }
-
-size_t BIO_ctrl_get_write_guarantee(BIO *bio)
-        {
-        return BIO_ctrl(bio, BIO_C_GET_WRITE_GUARANTEE, 0, NULL);
-        }
-
-size_t BIO_ctrl_get_read_request(BIO *bio)
-        {
-        return BIO_ctrl(bio, BIO_C_GET_READ_REQUEST, 0, NULL);
-        }
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
deleted file mode 100644
index 68c46e3d69..0000000000
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/* crypto/bio/bss_conn.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_SOCK
-
-#include <stdio.h>
-#include <errno.h>
-#define USE_SOCKETS
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#ifdef WIN16
-#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
-#else
-#define SOCKET_PROTOCOL IPPROTO_TCP
-#endif
-
-#if (defined(VMS) && __VMS_VER < 70000000)
-/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
-#undef FIONBIO
-#endif
-
-
-typedef struct bio_connect_st
-        {
-        int state;
-
-        char *param_hostname;
-        char *param_port;
-        int nbio;
-
-        unsigned char ip[4];
-        unsigned short port;
-
-        struct sockaddr_in them;
-
-        /* int socket; this will be kept in bio->num so that it is
-         * compatable with the bss_sock bio */ 
-
-        /* called when the connection is initially made
-         *  callback(BIO,state,ret);  The callback should return
-         * 'ret'.  state is for compatablity with the ssl info_callback */
-        int (*info_callback)();
-        } BIO_CONNECT;
-
-static int conn_write(BIO *h,char *buf,int num);
-static int conn_read(BIO *h,char *buf,int size);
-static int conn_puts(BIO *h,char *str);
-static long conn_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int conn_new(BIO *h);
-static int conn_free(BIO *data);
-
-static int conn_state(BIO *b, BIO_CONNECT *c);
-static void conn_close_socket(BIO *data);
-BIO_CONNECT *BIO_CONNECT_new(void );
-void BIO_CONNECT_free(BIO_CONNECT *a);
-
-static BIO_METHOD methods_connectp=
-        {
-        BIO_TYPE_CONNECT,
-        "socket connect",
-        conn_write,
-        conn_read,
-        conn_puts,
-        NULL, /* connect_gets, */
-        conn_ctrl,
-        conn_new,
-        conn_free,
-        };
-
-static int conn_state(BIO *b, BIO_CONNECT *c)
-        {
-        int ret= -1,i;
-        unsigned long l;
-        char *p,*q;
-        int (*cb)()=NULL;
-
-        if (c->info_callback != NULL)
-                cb=c->info_callback;
-
-        for (;;)
-                {
-                switch (c->state)
-                        {
-                case BIO_CONN_S_BEFORE:
-                        p=c->param_hostname;
-                        if (p == NULL)
-                                {
-                                BIOerr(BIO_F_CONN_STATE,BIO_R_NO_HOSTNAME_SPECIFIED);
-                                goto exit_loop;
-                                }
-                        for ( ; *p != '\0'; p++)
-                                {
-                                if ((*p == ':') || (*p == '/')) break;
-                                }
-
-                        i= *p;
-                        if ((i == ':') || (i == '/'))
-                                {
-
-                                *(p++)='\0';
-                                if (i == ':')
-                                        {
-                                        for (q=p; *q; q++)
-                                                if (*q == '/')
-                                                        {
-                                                        *q='\0';
-                                                        break;
-                                                        }
-                                        if (c->param_port != NULL)
-                                                Free(c->param_port);
-                                        c->param_port=BUF_strdup(p);
-                                        }
-                                }
-
-                        if (c->param_port == NULL)
-                                {
-                                BIOerr(BIO_F_CONN_STATE,BIO_R_NO_PORT_SPECIFIED);
-                                ERR_add_error_data(2,"host=",c->param_hostname);
-                                goto exit_loop;
-                                }
-                        c->state=BIO_CONN_S_GET_IP;
-                        break;
-
-                case BIO_CONN_S_GET_IP:
-                        if (BIO_get_host_ip(c->param_hostname,&(c->ip[0])) <= 0)
-                                goto exit_loop;
-                        c->state=BIO_CONN_S_GET_PORT;
-                        break;
-
-                case BIO_CONN_S_GET_PORT:
-                        if (c->param_port == NULL)
-                                {
-                                abort();
-                                goto exit_loop;
-                                }
-                        else if (BIO_get_port(c->param_port,&c->port) <= 0)
-                                goto exit_loop;
-                        c->state=BIO_CONN_S_CREATE_SOCKET;
-                        break;
-
-                case BIO_CONN_S_CREATE_SOCKET:
-                        /* now setup address */
-                        memset((char *)&c->them,0,sizeof(c->them));
-                        c->them.sin_family=AF_INET;
-                        c->them.sin_port=htons((unsigned short)c->port);
-                        l=(unsigned long)
-                                ((unsigned long)c->ip[0]<<24L)|
-                                ((unsigned long)c->ip[1]<<16L)|
-                                ((unsigned long)c->ip[2]<< 8L)|
-                                ((unsigned long)c->ip[3]);
-                        c->them.sin_addr.s_addr=htonl(l);
-                        c->state=BIO_CONN_S_CREATE_SOCKET;
-
-                        ret=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-                        if (ret == INVALID_SOCKET)
-                                {
-                                SYSerr(SYS_F_SOCKET,get_last_socket_error());
-                                ERR_add_error_data(4,"host=",c->param_hostname,
-                                        ":",c->param_port);
-                                BIOerr(BIO_F_CONN_STATE,BIO_R_UNABLE_TO_CREATE_SOCKET);
-                                goto exit_loop;
-                                }
-                        b->num=ret;
-                        c->state=BIO_CONN_S_NBIO;
-                        break;
-
-                case BIO_CONN_S_NBIO:
-                        if (c->nbio)
-                                {
-                                if (!BIO_socket_nbio(b->num,1))
-                                        {
-                                        BIOerr(BIO_F_CONN_STATE,BIO_R_ERROR_SETTING_NBIO);
-                                        ERR_add_error_data(4,"host=",
-                                                c->param_hostname,
-                                                ":",c->param_port);
-                                        goto exit_loop;
-                                        }
-                                }
-                        c->state=BIO_CONN_S_CONNECT;
-
-#ifdef SO_KEEPALIVE
-                        i=1;
-                        i=setsockopt(b->num,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-                        if (i < 0)
-                                {
-                                SYSerr(SYS_F_SOCKET,get_last_socket_error());
-                                ERR_add_error_data(4,"host=",c->param_hostname,
-                                        ":",c->param_port);
-                                BIOerr(BIO_F_CONN_STATE,BIO_R_KEEPALIVE);
-                                goto exit_loop;
-                                }
-#endif
-                        break;
-
-                case BIO_CONN_S_CONNECT:
-                        BIO_clear_retry_flags(b);
-                        ret=connect(b->num,
-                                (struct sockaddr *)&c->them,
-                                sizeof(c->them));
-                        b->retry_reason=0;
-                        if (ret < 0)
-                                {
-                                if (BIO_sock_should_retry(ret))
-                                        {
-                                        BIO_set_retry_special(b);
-                                        c->state=BIO_CONN_S_BLOCKED_CONNECT;
-                                        b->retry_reason=BIO_RR_CONNECT;
-                                        }
-                                else
-                                        {
-                                        SYSerr(SYS_F_CONNECT,get_last_socket_error());
-                                        ERR_add_error_data(4,"host=",
-                                                c->param_hostname,
-                                                ":",c->param_port);
-                                        BIOerr(BIO_F_CONN_STATE,BIO_R_CONNECT_ERROR);
-                                        }
-                                goto exit_loop;
-                                }
-                        else
-                                c->state=BIO_CONN_S_OK;
-                        break;
-
-                case BIO_CONN_S_BLOCKED_CONNECT:
-                        i=BIO_sock_error(b->num);
-                        if (i)
-                                {
-                                BIO_clear_retry_flags(b);
-                                SYSerr(SYS_F_CONNECT,i);
-                                ERR_add_error_data(4,"host=",
-                                        c->param_hostname,
-                                        ":",c->param_port);
-                                BIOerr(BIO_F_CONN_STATE,BIO_R_NBIO_CONNECT_ERROR);
-                                ret=0;
-                                goto exit_loop;
-                                }
-                        else
-                                c->state=BIO_CONN_S_OK;
-                        break;
-
-                case BIO_CONN_S_OK:
-                        ret=1;
-                        goto exit_loop;
-                default:
-                        abort();
-                        goto exit_loop;
-                        }
-
-                if (cb != NULL)
-                        {
-                        if (!(ret=cb((BIO *)b,c->state,ret)))
-                                goto end;
-                        }
-                }
-
-        /* Loop does not exit */
-exit_loop:
-        if (cb != NULL)
-                ret=cb((BIO *)b,c->state,ret);
-end:
-        return(ret);
-        }
-
-BIO_CONNECT *BIO_CONNECT_new(void)
-        {
-        BIO_CONNECT *ret;
-
-        if ((ret=(BIO_CONNECT *)Malloc(sizeof(BIO_CONNECT))) == NULL)
-                return(NULL);
-        ret->state=BIO_CONN_S_BEFORE;
-        ret->param_hostname=NULL;
-        ret->param_port=NULL;
-        ret->info_callback=NULL;
-        ret->nbio=0;
-        ret->ip[0]=0;
-        ret->ip[1]=0;
-        ret->ip[2]=0;
-        ret->ip[3]=0;
-        ret->port=0;
-        memset((char *)&ret->them,0,sizeof(ret->them));
-        return(ret);
-        }
-
-void BIO_CONNECT_free(BIO_CONNECT *a)
-        {
-        if(a == NULL)
-            return;
-
-        if (a->param_hostname != NULL)
-                Free(a->param_hostname);
-        if (a->param_port != NULL)
-                Free(a->param_port);
-        Free(a);
-        }
-
-BIO_METHOD *BIO_s_connect(void)
-        {
-        return(&methods_connectp);
-        }
-
-static int conn_new(BIO *bi)
-        {
-        bi->init=0;
-        bi->num=INVALID_SOCKET;
-        bi->flags=0;
-        if ((bi->ptr=(char *)BIO_CONNECT_new()) == NULL)
-                return(0);
-        else
-                return(1);
-        }
-
-static void conn_close_socket(BIO *bio)
-        {
-        BIO_CONNECT *c;
-
-        c=(BIO_CONNECT *)bio->ptr;
-        if (bio->num != INVALID_SOCKET)
-                {
-                /* Only do a shutdown if things were established */
-                if (c->state == BIO_CONN_S_OK)
-                        shutdown(bio->num,2);
-                closesocket(bio->num);
-                bio->num=INVALID_SOCKET;
-                }
-        }
-
-static int conn_free(BIO *a)
-        {
-        BIO_CONNECT *data;
-
-        if (a == NULL) return(0);
-        data=(BIO_CONNECT *)a->ptr;
-         
-        if (a->shutdown)
-                {
-                conn_close_socket(a);
-                BIO_CONNECT_free(data);
-                a->ptr=NULL;
-                a->flags=0;
-                a->init=0;
-                }
-        return(1);
-        }
-        
-static int conn_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
-        BIO_CONNECT *data;
-
-        data=(BIO_CONNECT *)b->ptr;
-        if (data->state != BIO_CONN_S_OK)
-                {
-                ret=conn_state(b,data);
-                if (ret <= 0)
-                                return(ret);
-                }
-
-        if (out != NULL)
-                {
-                clear_socket_error();
-                ret=readsocket(b->num,out,outl);
-                BIO_clear_retry_flags(b);
-                if (ret <= 0)
-                        {
-                        if (BIO_sock_should_retry(ret))
-                                BIO_set_retry_read(b);
-                        }
-                }
-        return(ret);
-        }
-
-static int conn_write(BIO *b, char *in, int inl)
-        {
-        int ret;
-        BIO_CONNECT *data;
-
-        data=(BIO_CONNECT *)b->ptr;
-        if (data->state != BIO_CONN_S_OK)
-                {
-                ret=conn_state(b,data);
-                if (ret <= 0) return(ret);
-                }
-
-        clear_socket_error();
-        ret=writesocket(b->num,in,inl);
-        BIO_clear_retry_flags(b);
-        if (ret <= 0)
-                {
-                if (BIO_sock_should_retry(ret))
-                        BIO_set_retry_write(b);
-                }
-        return(ret);
-        }
-
-static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        BIO *dbio;
-        int *ip;
-        const char **pptr;
-        long ret=1;
-        BIO_CONNECT *data;
-
-        data=(BIO_CONNECT *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                ret=0;
-                data->state=BIO_CONN_S_BEFORE;
-                conn_close_socket(b);
-                b->flags=0;
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                /* use this one to start the connection */
-                if (!data->state != BIO_CONN_S_OK)
-                        ret=(long)conn_state(b,data);
-                else
-                        ret=1;
-                break;
-        case BIO_C_GET_CONNECT:
-                if (ptr != NULL)
-                        {
-                        pptr=(const char **)ptr;
-                        if (num == 0)
-                                {
-                                *pptr=data->param_hostname;
-
-                                }
-                        else if (num == 1)
-                                {
-                                *pptr=data->param_port;
-                                }
-                        else if (num == 2)
-                                {
-                                *pptr= (char *)&(data->ip[0]);
-                                }
-                        else if (num == 3)
-                                {
-                                *((int *)ptr)=data->port;
-                                }
-                        if ((!b->init) || (ptr == NULL))
-                                *pptr="not initalised";
-                        ret=1;
-                        }
-                break;
-        case BIO_C_SET_CONNECT:
-                if (ptr != NULL)
-                        {
-                        b->init=1;
-                        if (num == 0)
-                                {
-                                if (data->param_hostname != NULL)
-                                        Free(data->param_hostname);
-                                data->param_hostname=BUF_strdup(ptr);
-                                }
-                        else if (num == 1)
-                                {
-                                if (data->param_port != NULL)
-                                        Free(data->param_port);
-                                data->param_port=BUF_strdup(ptr);
-                                }
-                        else if (num == 2)
-                                {
-                                char buf[16];
-
-                                sprintf(buf,"%d.%d.%d.%d",
-                                        ptr[0],ptr[1],ptr[2],ptr[3]);
-                                if (data->param_hostname != NULL)
-                                        Free(data->param_hostname);
-                                data->param_hostname=BUF_strdup(buf);
-                                memcpy(&(data->ip[0]),ptr,4);
-                                }
-                        else if (num == 3)
-                                {
-                                char buf[16];
-
-                                sprintf(buf,"%d",*(int *)ptr);
-                                if (data->param_port != NULL)
-                                        Free(data->param_port);
-                                data->param_port=BUF_strdup(buf);
-                                data->port= *(int *)ptr;
-                                }
-                        }
-                break;
-        case BIO_C_SET_NBIO:
-                data->nbio=(int)num;
-                break;
-        case BIO_C_GET_FD:
-                if (b->init)
-                        {
-                        ip=(int *)ptr;
-                        if (ip != NULL)
-                                *ip=b->num;
-                        ret=b->num;
-                        }
-                else
-                        ret= -1;
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-        case BIO_CTRL_PENDING:
-        case BIO_CTRL_WPENDING:
-                ret=0;
-                break;
-        case BIO_CTRL_FLUSH:
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-                if (data->param_port)
-                        BIO_set_conn_port(dbio,data->param_port);
-                if (data->param_hostname)
-                        BIO_set_conn_hostname(dbio,data->param_hostname);
-                BIO_set_nbio(dbio,data->nbio);
-                (void)BIO_set_info_callback(dbio,data->info_callback);
-                break;
-        case BIO_CTRL_SET_CALLBACK:
-                data->info_callback=(int (*)())ptr;
-                break;
-        case BIO_CTRL_GET_CALLBACK:
-                {
-                int (**fptr)();
-
-                fptr=(int (**)())ptr;
-                *fptr=data->info_callback;
-                }
-                break;
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-static int conn_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=conn_write(bp,str,n);
-        return(ret);
-        }
-
-BIO *BIO_new_connect(char *str)
-        {
-        BIO *ret;
-
-        ret=BIO_new(BIO_s_connect());
-        if (ret == NULL) return(NULL);
-        if (BIO_set_conn_hostname(ret,str))
-                return(ret);
-        else
-                {
-                BIO_free(ret);
-                return(NULL);
-                }
-        }
-
-#endif
-
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
deleted file mode 100644
index 686c4909a2..0000000000
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* crypto/bio/bss_fd.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.]
- */
-
-#define BIO_FD
-#include "bss_sock.c"
-#undef BIO_FD
-
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
deleted file mode 100644
index 52c0c39df0..0000000000
--- a/src/lib/libcrypto/bio/bss_file.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/* crypto/bio/bss_file.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.]
- */
-
-/*
- * 03-Dec-1997  rdenny@dc3.com  Fix bug preventing use of stdin/stdout
- *              with binary data (e.g. asn1parse -inform DER < xxx) under
- *              Windows
- */
-
-#ifndef HEADER_BSS_FILE_C
-#define HEADER_BSS_FILE_C
-
-#include <stdio.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <openssl/err.h>
-
-#if !defined(NO_STDIO)
-
-static int MS_CALLBACK file_write(BIO *h,char *buf,int num);
-static int MS_CALLBACK file_read(BIO *h,char *buf,int size);
-static int MS_CALLBACK file_puts(BIO *h,char *str);
-static int MS_CALLBACK file_gets(BIO *h,char *str,int size);
-static long MS_CALLBACK file_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int MS_CALLBACK file_new(BIO *h);
-static int MS_CALLBACK file_free(BIO *data);
-static BIO_METHOD methods_filep=
-        {
-        BIO_TYPE_FILE,
-        "FILE pointer",
-        file_write,
-        file_read,
-        file_puts,
-        file_gets,
-        file_ctrl,
-        file_new,
-        file_free,
-        };
-
-BIO *BIO_new_file(const char *filename, const char *mode)
-        {
-        BIO *ret;
-        FILE *file;
-
-        if ((file=fopen(filename,mode)) == NULL)
-                {
-                SYSerr(SYS_F_FOPEN,get_last_sys_error());
-                ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");
-                BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);
-                return(NULL);
-                }
-        if ((ret=BIO_new(BIO_s_file_internal())) == NULL)
-                return(NULL);
-
-        BIO_set_fp(ret,file,BIO_CLOSE);
-        return(ret);
-        }
-
-BIO *BIO_new_fp(FILE *stream, int close_flag)
-        {
-        BIO *ret;
-
-        if ((ret=BIO_new(BIO_s_file())) == NULL)
-                return(NULL);
-
-        BIO_set_fp(ret,stream,close_flag);
-        return(ret);
-        }
-
-BIO_METHOD *BIO_s_file(void)
-        {
-        return(&methods_filep);
-        }
-
-static int MS_CALLBACK file_new(BIO *bi)
-        {
-        bi->init=0;
-        bi->num=0;
-        bi->ptr=NULL;
-        return(1);
-        }
-
-static int MS_CALLBACK file_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        if (a->shutdown)
-                {
-                if ((a->init) && (a->ptr != NULL))
-                        {
-                        fclose((FILE *)a->ptr);
-                        a->ptr=NULL;
-                        }
-                a->init=0;
-                }
-        return(1);
-        }
-        
-static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
-
-        if (b->init && (out != NULL))
-                {
-                ret=fread(out,1,(int)outl,(FILE *)b->ptr);
-                }
-        return(ret);
-        }
-
-static int MS_CALLBACK file_write(BIO *b, char *in, int inl)
-        {
-        int ret=0;
-
-        if (b->init && (in != NULL))
-                {
-                if (fwrite(in,(int)inl,1,(FILE *)b->ptr))
-                        ret=inl;
-                /* ret=fwrite(in,1,(int)inl,(FILE *)b->ptr); */
-                /* acording to Tim Hudson <tjh@cryptsoft.com>, the commented
-                 * out version above can cause 'inl' write calls under
-                 * some stupid stdio implementations (VMS) */
-                }
-        return(ret);
-        }
-
-static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        long ret=1;
-        FILE *fp=(FILE *)b->ptr;
-        FILE **fpp;
-        char p[4];
-
-        switch (cmd)
-                {
-        case BIO_C_FILE_SEEK:
-        case BIO_CTRL_RESET:
-                ret=(long)fseek(fp,num,0);
-                break;
-        case BIO_CTRL_EOF:
-                ret=(long)feof(fp);
-                break;
-        case BIO_C_FILE_TELL:
-        case BIO_CTRL_INFO:
-                ret=ftell(fp);
-                break;
-        case BIO_C_SET_FILE_PTR:
-                file_free(b);
-                b->shutdown=(int)num&BIO_CLOSE;
-                b->ptr=(char *)ptr;
-                b->init=1;
-#if defined(MSDOS) || defined(WINDOWS)
-                /* Set correct text/binary mode */
-                if (num & BIO_FP_TEXT)
-                        _setmode(fileno((FILE *)ptr),_O_TEXT);
-                else
-                        _setmode(fileno((FILE *)ptr),_O_BINARY);
-#endif
-                break;
-        case BIO_C_SET_FILENAME:
-                file_free(b);
-                b->shutdown=(int)num&BIO_CLOSE;
-                if (num & BIO_FP_APPEND)
-                        {
-                        if (num & BIO_FP_READ)
-                                strcpy(p,"a+");
-                        else    strcpy(p,"a");
-                        }
-                else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
-                        strcpy(p,"r+");
-                else if (num & BIO_FP_WRITE)
-                        strcpy(p,"w");
-                else if (num & BIO_FP_READ)
-                        strcpy(p,"r");
-                else
-                        {
-                        BIOerr(BIO_F_FILE_CTRL,BIO_R_BAD_FOPEN_MODE);
-                        ret=0;
-                        break;
-                        }
-#if defined(MSDOS) || defined(WINDOWS)
-                if (!(num & BIO_FP_TEXT))
-                        strcat(p,"b");
-                else
-                        strcat(p,"t");
-#endif
-                fp=fopen(ptr,p);
-                if (fp == NULL)
-                        {
-                        SYSerr(SYS_F_FOPEN,get_last_sys_error());
-                        ERR_add_error_data(5,"fopen('",ptr,"','",p,"')");
-                        BIOerr(BIO_F_FILE_CTRL,ERR_R_SYS_LIB);
-                        ret=0;
-                        break;
-                        }
-                b->ptr=(char *)fp;
-                b->init=1;
-                break;
-        case BIO_C_GET_FILE_PTR:
-                /* the ptr parameter is actually a FILE ** in this case. */
-                if (ptr != NULL)
-                        {
-                        fpp=(FILE **)ptr;
-                        *fpp=(FILE *)b->ptr;
-                        }
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=(long)b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-        case BIO_CTRL_FLUSH:
-                fflush((FILE *)b->ptr);
-                break;
-        case BIO_CTRL_DUP:
-                ret=1;
-                break;
-
-        case BIO_CTRL_WPENDING:
-        case BIO_CTRL_PENDING:
-        case BIO_CTRL_PUSH:
-        case BIO_CTRL_POP:
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
-        {
-        int ret=0;
-
-        buf[0]='\0';
-        fgets(buf,size,(FILE *)bp->ptr);
-        if (buf[0] != '\0')
-                ret=strlen(buf);
-        return(ret);
-        }
-
-static int MS_CALLBACK file_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=file_write(bp,str,n);
-        return(ret);
-        }
-
-#endif /* NO_STDIO */
-
-#endif /* HEADER_BSS_FILE_C */
-
-
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
deleted file mode 100644
index db82e757e7..0000000000
--- a/src/lib/libcrypto/bio/bss_log.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* crypto/bio/bss_log.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
-        Why BIO_s_log?
-
-        BIO_s_log is useful for system daemons (or services under NT).
-        It is one-way BIO, it sends all stuff to syslogd (or event log
-        under NT).
-
-*/
-
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef WIN32
-#ifdef __ultrix
-#include <sys/syslog.h>
-#else
-#include <syslog.h>
-#endif
-#endif
-
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/err.h>
-#ifndef NO_SYSLOG
-
-
-static int MS_CALLBACK slg_write(BIO *h,char *buf,int num);
-static int MS_CALLBACK slg_puts(BIO *h,char *str);
-static long MS_CALLBACK slg_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int MS_CALLBACK slg_new(BIO *h);
-static int MS_CALLBACK slg_free(BIO *data);
-static int xopenlog(BIO* bp, const char* name, int level);
-static int xcloselog(BIO* bp);
-
-static BIO_METHOD methods_slg=
-        {
-        BIO_TYPE_MEM,"syslog",
-        slg_write,
-        NULL,
-        slg_puts,
-        NULL,
-        slg_ctrl,
-        slg_new,
-        slg_free,
-        };
-
-BIO_METHOD *BIO_s_log(void)
-        {
-        return(&methods_slg);
-        }
-
-static int MS_CALLBACK slg_new(BIO *bi)
-        {
-        bi->init=1;
-        bi->num=0;
-        bi->ptr=NULL;
-#ifndef WIN32
-        xopenlog(bi, "application", LOG_DAEMON);
-#else
-        xopenlog(bi, "application", 0);
-#endif
-        return(1);
-        }
-
-static int MS_CALLBACK slg_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        xcloselog(a);
-        return(1);
-        }
-        
-static int MS_CALLBACK slg_write(BIO *b, char *in, int inl)
-        {
-        int ret= inl;
-        char* buf= in;
-        char* pp;
-#if defined(WIN32)
-        LPTSTR lpszStrings[1];
-        WORD evtype= EVENTLOG_ERROR_TYPE;
-#else
-        int priority;
-#endif
-
-        if((buf= (char *)Malloc(inl+ 1)) == NULL){
-                return(0);
-        }
-        strncpy(buf, in, inl);
-        buf[inl]= '\0';
-#if defined(WIN32)
-        if(strncmp(buf, "ERR ", 4) == 0){
-                evtype= EVENTLOG_ERROR_TYPE;
-                pp= buf+ 4;
-        }else if(strncmp(buf, "WAR ", 4) == 0){
-                evtype= EVENTLOG_WARNING_TYPE;
-                pp= buf+ 4;
-        }else if(strncmp(buf, "INF ", 4) == 0){
-                evtype= EVENTLOG_INFORMATION_TYPE;
-                pp= buf+ 4;
-        }else{
-                evtype= EVENTLOG_ERROR_TYPE;
-                pp= buf;
-        }
-        lpszStrings[0]= pp;
-
-        if(b->ptr)
-                ReportEvent(b->ptr, evtype, 0, 1024, NULL, 1, 0,
-                                lpszStrings, NULL);
-#else
-        if(strncmp(buf, "ERR ", 4) == 0){
-                priority= LOG_ERR;
-                pp= buf+ 4;
-        }else if(strncmp(buf, "WAR ", 4) == 0){
-                priority= LOG_WARNING;
-                pp= buf+ 4;
-        }else if(strncmp(buf, "INF ", 4) == 0){
-                priority= LOG_INFO;
-                pp= buf+ 4;
-        }else{
-                priority= LOG_ERR;
-                pp= buf;
-        }
-
-        syslog(priority, "%s", pp);
-#endif
-        Free(buf);
-        return(ret);
-        }
-
-static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        switch (cmd)
-                {
-        case BIO_CTRL_SET:
-                xcloselog(b);
-                xopenlog(b, ptr, num);
-                break;
-        default:
-                break;
-                }
-        return(0);
-        }
-
-static int MS_CALLBACK slg_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=slg_write(bp,str,n);
-        return(ret);
-        }
-
-static int xopenlog(BIO* bp, const char* name, int level)
-{
-#if defined(WIN32)
-        if((bp->ptr= (char *)RegisterEventSource(NULL, name)) == NULL){
-                return(0);
-        }
-#else
-        openlog(name, LOG_PID|LOG_CONS, level);
-#endif
-        return(1);
-}
-
-static int xcloselog(BIO* bp)
-{
-#if defined(WIN32)
-        if(bp->ptr)
-                DeregisterEventSource((HANDLE)(bp->ptr));
-        bp->ptr= NULL;
-#else
-        closelog();
-#endif
-        return(1);
-}
-
-#endif
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
deleted file mode 100644
index 7e749a503e..0000000000
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* crypto/bio/bss_mem.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 <openssl/bio.h>
-
-static int mem_write(BIO *h,char *buf,int num);
-static int mem_read(BIO *h,char *buf,int size);
-static int mem_puts(BIO *h,char *str);
-static int mem_gets(BIO *h,char *str,int size);
-static long mem_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int mem_new(BIO *h);
-static int mem_free(BIO *data);
-static BIO_METHOD mem_method=
-        {
-        BIO_TYPE_MEM,
-        "memory buffer",
-        mem_write,
-        mem_read,
-        mem_puts,
-        mem_gets,
-        mem_ctrl,
-        mem_new,
-        mem_free,
-        };
-
-/* bio->num is used to hold the value to return on 'empty', if it is
- * 0, should_retry is not set */
-
-BIO_METHOD *BIO_s_mem(void)
-        {
-        return(&mem_method);
-        }
-
-static int mem_new(BIO *bi)
-        {
-        BUF_MEM *b;
-
-        if ((b=BUF_MEM_new()) == NULL)
-                return(0);
-        bi->shutdown=1;
-        bi->init=1;
-        bi->num= -1;
-        bi->ptr=(char *)b;
-        return(1);
-        }
-
-static int mem_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        if (a->shutdown)
-                {
-                if ((a->init) && (a->ptr != NULL))
-                        {
-                        BUF_MEM_free((BUF_MEM *)a->ptr);
-                        a->ptr=NULL;
-                        }
-                }
-        return(1);
-        }
-        
-static int mem_read(BIO *b, char *out, int outl)
-        {
-        int ret= -1;
-        BUF_MEM *bm;
-        int i;
-        char *from,*to;
-
-        bm=(BUF_MEM *)b->ptr;
-        BIO_clear_retry_flags(b);
-        ret=(outl > bm->length)?bm->length:outl;
-        if ((out != NULL) && (ret > 0))
-                {
-                memcpy(out,bm->data,ret);
-                bm->length-=ret;
-                /* memmove(&(bm->data[0]),&(bm->data[ret]), bm->length); */
-                from=(char *)&(bm->data[ret]);
-                to=(char *)&(bm->data[0]);
-                for (i=0; i<bm->length; i++)
-                        to[i]=from[i];
-                }
-        else if (bm->length == 0)
-                {
-                if (b->num != 0)
-                        BIO_set_retry_read(b);
-                ret= b->num;
-                }
-        return(ret);
-        }
-
-static int mem_write(BIO *b, char *in, int inl)
-        {
-        int ret= -1;
-        int blen;
-        BUF_MEM *bm;
-
-        bm=(BUF_MEM *)b->ptr;
-        if (in == NULL)
-                {
-                BIOerr(BIO_F_MEM_WRITE,BIO_R_NULL_PARAMETER);
-                goto end;
-                }
-
-        BIO_clear_retry_flags(b);
-        blen=bm->length;
-        if (BUF_MEM_grow(bm,blen+inl) != (blen+inl))
-                goto end;
-        memcpy(&(bm->data[blen]),in,inl);
-        ret=inl;
-end:
-        return(ret);
-        }
-
-static long mem_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        long ret=1;
-        char **pptr;
-
-        BUF_MEM *bm=(BUF_MEM *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                if (bm->data != NULL)
-                        memset(bm->data,0,bm->max);
-                bm->length=0;
-                break;
-        case BIO_CTRL_EOF:
-                ret=(long)(bm->length == 0);
-                break;
-        case BIO_C_SET_BUF_MEM_EOF_RETURN:
-                b->num=(int)num;
-                break;
-        case BIO_CTRL_INFO:
-                ret=(long)bm->length;
-                if (ptr != NULL)
-                        {
-                        pptr=(char **)ptr;
-                        *pptr=(char *)&(bm->data[0]);
-                        }
-                break;
-        case BIO_C_SET_BUF_MEM:
-                mem_free(b);
-                b->shutdown=(int)num;
-                b->ptr=ptr;
-                break;
-        case BIO_C_GET_BUF_MEM_PTR:
-                if (ptr != NULL)
-                        {
-                        pptr=(char **)ptr;
-                        *pptr=(char *)bm;
-                        }
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=(long)b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-
-        case BIO_CTRL_WPENDING:
-                ret=0L;
-                break;
-        case BIO_CTRL_PENDING:
-                ret=(long)bm->length;
-                break;
-        case BIO_CTRL_DUP:
-        case BIO_CTRL_FLUSH:
-                ret=1;
-                break;
-        case BIO_CTRL_PUSH:
-        case BIO_CTRL_POP:
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-static int mem_gets(BIO *bp, char *buf, int size)
-        {
-        int i,j;
-        int ret= -1;
-        char *p;
-        BUF_MEM *bm=(BUF_MEM *)bp->ptr;
-
-        BIO_clear_retry_flags(bp);
-        j=bm->length;
-        if (j <= 0) return(0);
-        p=bm->data;
-        for (i=0; i<j; i++)
-                {
-                if (p[i] == '\n') break;
-                }
-        if (i == j)
-                {
-                BIO_set_retry_read(bp);
-                /* return(-1);  change the semantics 0.6.6a */ 
-                }
-        else
-                i++;
-        /* i is the max to copy */
-        if ((size-1) < i) i=size-1;
-        i=mem_read(bp,buf,i);
-        if (i > 0) buf[i]='\0';
-        ret=i;
-        return(ret);
-        }
-
-static int mem_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=mem_write(bp,str,n);
-        /* memory semantics is that it will always work */
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c
deleted file mode 100644
index d04be888e5..0000000000
--- a/src/lib/libcrypto/bio/bss_null.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* crypto/bio/bss_null.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 <openssl/bio.h>
-
-static int null_write(BIO *h,char *buf,int num);
-static int null_read(BIO *h,char *buf,int size);
-static int null_puts(BIO *h,char *str);
-static int null_gets(BIO *h,char *str,int size);
-static long null_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int null_new(BIO *h);
-static int null_free(BIO *data);
-static BIO_METHOD null_method=
-        {
-        BIO_TYPE_NULL,
-        "NULL",
-        null_write,
-        null_read,
-        null_puts,
-        null_gets,
-        null_ctrl,
-        null_new,
-        null_free,
-        };
-
-BIO_METHOD *BIO_s_null(void)
-        {
-        return(&null_method);
-        }
-
-static int null_new(BIO *bi)
-        {
-        bi->init=1;
-        bi->num=0;
-        bi->ptr=(NULL);
-        return(1);
-        }
-
-static int null_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        return(1);
-        }
-        
-static int null_read(BIO *b, char *out, int outl)
-        {
-        return(0);
-        }
-
-static int null_write(BIO *b, char *in, int inl)
-        {
-        return(inl);
-        }
-
-static long null_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        long ret=1;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-        case BIO_CTRL_EOF:
-        case BIO_CTRL_SET:
-        case BIO_CTRL_SET_CLOSE:
-        case BIO_CTRL_FLUSH:
-        case BIO_CTRL_DUP:
-                ret=1;
-                break;
-        case BIO_CTRL_GET_CLOSE:
-        case BIO_CTRL_INFO:
-        case BIO_CTRL_GET:
-        case BIO_CTRL_PENDING:
-        case BIO_CTRL_WPENDING:
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-static int null_gets(BIO *bp, char *buf, int size)
-        {
-        return(0);
-        }
-
-static int null_puts(BIO *bp, char *str)
-        {
-        if (str == NULL) return(0);
-        return(strlen(str));
-        }
-
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
deleted file mode 100644
index d336b99fe8..0000000000
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* crypto/bio/bss_sock.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#if !defined(NO_SOCK) || defined(BIO_FD)
-
-#include <stdio.h>
-#include <errno.h>
-#define USE_SOCKETS
-#include "cryptlib.h"
-#include <openssl/bio.h>
-
-#ifndef BIO_FD
-static int sock_write(BIO *h,char *buf,int num);
-static int sock_read(BIO *h,char *buf,int size);
-static int sock_puts(BIO *h,char *str);
-static long sock_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int sock_new(BIO *h);
-static int sock_free(BIO *data);
-int BIO_sock_should_retry(int s);
-#else
-
-static int fd_write(BIO *h,char *buf,int num);
-static int fd_read(BIO *h,char *buf,int size);
-static int fd_puts(BIO *h,char *str);
-static long fd_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int fd_new(BIO *h);
-static int fd_free(BIO *data);
-int BIO_fd_should_retry(int s);
-#endif
-
-#ifndef BIO_FD
-static BIO_METHOD methods_sockp=
-        {
-        BIO_TYPE_SOCKET,
-        "socket",
-        sock_write,
-        sock_read,
-        sock_puts,
-        NULL, /* sock_gets, */
-        sock_ctrl,
-        sock_new,
-        sock_free,
-        };
-
-BIO_METHOD *BIO_s_socket(void)
-        {
-        return(&methods_sockp);
-        }
-#else
-static BIO_METHOD methods_fdp=
-        {
-        BIO_TYPE_FD,"file descriptor",
-        fd_write,
-        fd_read,
-        fd_puts,
-        NULL, /* fd_gets, */
-        fd_ctrl,
-        fd_new,
-        fd_free,
-        };
-
-BIO_METHOD *BIO_s_fd(void)
-        {
-        return(&methods_fdp);
-        }
-#endif
-
-#ifndef BIO_FD
-BIO *BIO_new_socket(int fd, int close_flag)
-#else
-BIO *BIO_new_fd(int fd,int close_flag)
-#endif
-        {
-        BIO *ret;
-
-#ifndef BIO_FD
-        ret=BIO_new(BIO_s_socket());
-#else
-        ret=BIO_new(BIO_s_fd());
-#endif
-        if (ret == NULL) return(NULL);
-        BIO_set_fd(ret,fd,close_flag);
-        return(ret);
-        }
-
-#ifndef BIO_FD
-static int sock_new(BIO *bi)
-#else
-static int fd_new(BIO *bi)
-#endif
-        {
-        bi->init=0;
-        bi->num=0;
-        bi->ptr=NULL;
-        bi->flags=0;
-        return(1);
-        }
-
-#ifndef BIO_FD
-static int sock_free(BIO *a)
-#else
-static int fd_free(BIO *a)
-#endif
-        {
-        if (a == NULL) return(0);
-        if (a->shutdown)
-                {
-                if (a->init)
-                        {
-#ifndef BIO_FD
-                        shutdown(a->num,2);
-                        closesocket(a->num);
-#else                   /* BIO_FD */
-                        close(a->num);
-#endif
-
-                        }
-                a->init=0;
-                a->flags=0;
-                }
-        return(1);
-        }
-        
-#ifndef BIO_FD
-static int sock_read(BIO *b, char *out, int outl)
-#else
-static int fd_read(BIO *b, char *out,int outl)
-#endif
-        {
-        int ret=0;
-
-        if (out != NULL)
-                {
-#ifndef BIO_FD
-                clear_socket_error();
-                ret=readsocket(b->num,out,outl);
-#else
-                clear_sys_error();
-                ret=read(b->num,out,outl);
-#endif
-                BIO_clear_retry_flags(b);
-                if (ret <= 0)
-                        {
-#ifndef BIO_FD
-                        if (BIO_sock_should_retry(ret))
-#else
-                        if (BIO_fd_should_retry(ret))
-#endif
-                                BIO_set_retry_read(b);
-                        }
-                }
-        return(ret);
-        }
-
-#ifndef BIO_FD
-static int sock_write(BIO *b, char *in, int inl)
-#else
-static int fd_write(BIO *b, char *in, int inl)
-#endif
-        {
-        int ret;
-        
-#ifndef BIO_FD
-        clear_socket_error();
-        ret=writesocket(b->num,in,inl);
-#else
-        clear_sys_error();
-        ret=write(b->num,in,inl);
-#endif
-        BIO_clear_retry_flags(b);
-        if (ret <= 0)
-                {
-#ifndef BIO_FD
-                if (BIO_sock_should_retry(ret))
-#else
-                if (BIO_fd_should_retry(ret))
-#endif
-                        BIO_set_retry_write(b);
-                }
-        return(ret);
-        }
-
-#ifndef BIO_FD
-static long sock_ctrl(BIO *b, int cmd, long num, char *ptr)
-#else
-static long fd_ctrl(BIO *b, int cmd, long num, char *ptr)
-#endif
-        {
-        long ret=1;
-        int *ip;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                num=0;
-        case BIO_C_FILE_SEEK:
-#ifdef BIO_FD
-                ret=(long)lseek(b->num,num,0);
-#else
-                ret=0;
-#endif
-                break;
-        case BIO_C_FILE_TELL:
-        case BIO_CTRL_INFO:
-#ifdef BIO_FD
-                ret=(long)lseek(b->num,0,1);
-#else
-                ret=0;
-#endif
-                break;
-        case BIO_C_SET_FD:
-#ifndef BIO_FD
-                sock_free(b);
-#else
-                fd_free(b);
-#endif
-                b->num= *((int *)ptr);
-                b->shutdown=(int)num;
-                b->init=1;
-                break;
-        case BIO_C_GET_FD:
-                if (b->init)
-                        {
-                        ip=(int *)ptr;
-                        if (ip != NULL) *ip=b->num;
-                        ret=b->num;
-                        }
-                else
-                        ret= -1;
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-        case BIO_CTRL_PENDING:
-        case BIO_CTRL_WPENDING:
-                ret=0;
-                break;
-        case BIO_CTRL_DUP:
-        case BIO_CTRL_FLUSH:
-                ret=1;
-                break;
-        default:
-                ret=0;
-                break;
-                }
-        return(ret);
-        }
-
-#ifdef undef
-static int sock_gets(BIO *bp, char *buf,int size)
-        {
-        return(-1);
-        }
-#endif
-
-#ifndef BIO_FD
-static int sock_puts(BIO *bp, char *str)
-#else
-static int fd_puts(BIO *bp, char *str)
-#endif
-        {
-        int n,ret;
-
-        n=strlen(str);
-#ifndef BIO_FD
-        ret=sock_write(bp,str,n);
-#else
-        ret=fd_write(bp,str,n);
-#endif
-        return(ret);
-        }
-
-#ifndef BIO_FD
-int BIO_sock_should_retry(int i)
-#else
-int BIO_fd_should_retry(int i)
-#endif
-        {
-        int err;
-
-        if ((i == 0) || (i == -1))
-                {
-#ifndef BIO_FD
-                err=get_last_socket_error();
-#else
-                err=get_last_sys_error();
-#endif
-
-#if defined(WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
-                if ((i == -1) && (err == 0))
-                        return(1);
-#endif
-
-#ifndef BIO_FD
-                return(BIO_sock_non_fatal_error(err));
-#else
-                return(BIO_fd_non_fatal_error(err));
-#endif
-                }
-        return(0);
-        }
-
-#ifndef BIO_FD
-int BIO_sock_non_fatal_error(int err)
-#else
-int BIO_fd_non_fatal_error(int err)
-#endif
-        {
-        switch (err)
-                {
-#if !defined(BIO_FD) && defined(WINDOWS)
-# if defined(WSAEWOULDBLOCK)
-        case WSAEWOULDBLOCK:
-# endif
-
-# if 0 /* This appears to always be an error */
-#  if defined(WSAENOTCONN)
-        case WSAENOTCONN:
-#  endif
-# endif
-#endif
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-        case EWOULDBLOCK:
-#  endif
-# else
-        case EWOULDBLOCK:
-# endif
-#endif
-
-#if defined(ENOTCONN)
-        case ENOTCONN:
-#endif
-
-#ifdef EINTR
-        case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
-        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-        case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
-        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
-        case EALREADY:
-#endif
-                return(1);
-                /* break; */
-        default:
-                break;
-                }
-        return(0);
-        }
-#endif
diff --git a/src/lib/libcrypto/bn/asm/bn-586.pl b/src/lib/libcrypto/bn/asm/bn-586.pl
deleted file mode 100644
index 5191bed273..0000000000
--- a/src/lib/libcrypto/bn/asm/bn-586.pl
+++ /dev/null
@@ -1,384 +0,0 @@
-#!/usr/local/bin/perl
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-&bn_mul_add_words("bn_mul_add_words");
-&bn_mul_words("bn_mul_words");
-&bn_sqr_words("bn_sqr_words");
-&bn_div_words("bn_div_words");
-&bn_add_words("bn_add_words");
-&bn_sub_words("bn_sub_words");
-
-&asm_finish();
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $Low="eax";
-        $High="edx";
-        $a="ebx";
-        $w="ebp";
-        $r="edi";
-        $c="esi";
-
-        &xor($c,$c);            # clear carry
-        &mov($r,&wparam(0));    #
-
-        &mov("ecx",&wparam(2)); #
-        &mov($a,&wparam(1));    #
-
-        &and("ecx",0xfffffff8); # num / 8
-        &mov($w,&wparam(3));    #
-
-        &push("ecx");           # Up the stack for a tmp variable
-
-        &jz(&label("maw_finish"));
-
-        &set_label("maw_loop",0);
-
-        &mov(&swtmp(0),"ecx");  #
-
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-
-                 &mov("eax",&DWP($i,$a,"",0));  # *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);         # L(t)+= *r
-                 &mov($c,&DWP($i,$r,"",0));     # L(t)+= *r
-                &adc("edx",0);                  # H(t)+=carry
-                 &add("eax",$c);                # L(t)+=c
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-                &mov($c,"edx");                 # c=  H(t);
-                }
-
-        &comment("");
-        &mov("ecx",&swtmp(0));  #
-        &add($a,32);
-        &add($r,32);
-        &sub("ecx",8);
-        &jnz(&label("maw_loop"));
-
-        &set_label("maw_finish",0);
-        &mov("ecx",&wparam(2)); # get num
-        &and("ecx",7);
-        &jnz(&label("maw_finish2"));    # helps branch prediction
-        &jmp(&label("maw_end"));
-
-        &set_label("maw_finish2",1);
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                 &mov("eax",&DWP($i*4,$a,"",0));# *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 &mov($c,&DWP($i*4,$r,"",0));   # L(t)+= *r
-                &adc("edx",0);                  # H(t)+=carry
-                 &add("eax",$c);
-                &adc("edx",0);                  # H(t)+=carry
-                 &dec("ecx") if ($i != 7-1);
-                &mov(&DWP($i*4,$r,"",0),"eax"); # *r= L(t);
-                 &mov($c,"edx");                        # c=  H(t);
-                &jz(&label("maw_end")) if ($i != 7-1);
-                }
-        &set_label("maw_end",0);
-        &mov("eax",$c);
-
-        &pop("ecx");    # clear variable from
-
-        &function_end($name);
-        }
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $Low="eax";
-        $High="edx";
-        $a="ebx";
-        $w="ecx";
-        $r="edi";
-        $c="esi";
-        $num="ebp";
-
-        &xor($c,$c);            # clear carry
-        &mov($r,&wparam(0));    #
-        &mov($a,&wparam(1));    #
-        &mov($num,&wparam(2));  #
-        &mov($w,&wparam(3));    #
-
-        &and($num,0xfffffff8);  # num / 8
-        &jz(&label("mw_finish"));
-
-        &set_label("mw_loop",0);
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-
-                 &mov("eax",&DWP($i,$a,"",0));  # *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 # XXX
-
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-
-                &mov($c,"edx");                 # c=  H(t);
-                }
-
-        &comment("");
-        &add($a,32);
-        &add($r,32);
-        &sub($num,8);
-        &jz(&label("mw_finish"));
-        &jmp(&label("mw_loop"));
-
-        &set_label("mw_finish",0);
-        &mov($num,&wparam(2));  # get num
-        &and($num,7);
-        &jnz(&label("mw_finish2"));
-        &jmp(&label("mw_end"));
-
-        &set_label("mw_finish2",1);
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                 &mov("eax",&DWP($i*4,$a,"",0));# *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 # XXX
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i*4,$r,"",0),"eax");# *r= L(t);
-                &mov($c,"edx");                 # c=  H(t);
-                 &dec($num) if ($i != 7-1);
-                &jz(&label("mw_end")) if ($i != 7-1);
-                }
-        &set_label("mw_end",0);
-        &mov("eax",$c);
-
-        &function_end($name);
-        }
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $r="esi";
-        $a="edi";
-        $num="ebx";
-
-        &mov($r,&wparam(0));    #
-        &mov($a,&wparam(1));    #
-        &mov($num,&wparam(2));  #
-
-        &and($num,0xfffffff8);  # num / 8
-        &jz(&label("sw_finish"));
-
-        &set_label("sw_loop",0);
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-                &mov("eax",&DWP($i,$a,"",0));   # *a
-                 # XXX
-                &mul("eax");                    # *a * *a
-                &mov(&DWP($i*2,$r,"",0),"eax"); #
-                 &mov(&DWP($i*2+4,$r,"",0),"edx");#
-                }
-
-        &comment("");
-        &add($a,32);
-        &add($r,64);
-        &sub($num,8);
-        &jnz(&label("sw_loop"));
-
-        &set_label("sw_finish",0);
-        &mov($num,&wparam(2));  # get num
-        &and($num,7);
-        &jz(&label("sw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov("eax",&DWP($i*4,$a,"",0)); # *a
-                 # XXX
-                &mul("eax");                    # *a * *a
-                &mov(&DWP($i*8,$r,"",0),"eax"); #
-                 &dec($num) if ($i != 7-1);
-                &mov(&DWP($i*8+4,$r,"",0),"edx");
-                 &jz(&label("sw_end")) if ($i != 7-1);
-                }
-        &set_label("sw_end",0);
-
-        &function_end($name);
-        }
-
-sub bn_div_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-        &mov("edx",&wparam(0)); #
-        &mov("eax",&wparam(1)); #
-        &mov("ebx",&wparam(2)); #
-        &div("ebx");
-        &function_end($name);
-        }
-
-sub bn_add_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $a="esi";
-        $b="edi";
-        $c="eax";
-        $r="ebx";
-        $tmp1="ecx";
-        $tmp2="edx";
-        $num="ebp";
-
-        &mov($r,&wparam(0));    # get r
-         &mov($a,&wparam(1));   # get a
-        &mov($b,&wparam(2));    # get b
-         &mov($num,&wparam(3)); # get num
-        &xor($c,$c);            # clear carry
-         &and($num,0xfffffff8); # num / 8
-
-        &jz(&label("aw_finish"));
-
-        &set_label("aw_loop",0);
-        for ($i=0; $i<8; $i++)
-                {
-                &comment("Round $i");
-
-                &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-                &add($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &add($tmp1,$tmp2);
-                &adc($c,0);
-                 &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-                }
-
-        &comment("");
-        &add($a,32);
-         &add($b,32);
-        &add($r,32);
-         &sub($num,8);
-        &jnz(&label("aw_loop"));
-
-        &set_label("aw_finish",0);
-        &mov($num,&wparam(3));  # get num
-        &and($num,7);
-         &jz(&label("aw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-                &add($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &add($tmp1,$tmp2);
-                &adc($c,0);
-                 &dec($num) if ($i != 6);
-                &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                 &jz(&label("aw_end")) if ($i != 6);
-                }
-        &set_label("aw_end",0);
-
-#       &mov("eax",$c);         # $c is "eax"
-
-        &function_end($name);
-        }
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $a="esi";
-        $b="edi";
-        $c="eax";
-        $r="ebx";
-        $tmp1="ecx";
-        $tmp2="edx";
-        $num="ebp";
-
-        &mov($r,&wparam(0));    # get r
-         &mov($a,&wparam(1));   # get a
-        &mov($b,&wparam(2));    # get b
-         &mov($num,&wparam(3)); # get num
-        &xor($c,$c);            # clear carry
-         &and($num,0xfffffff8); # num / 8
-
-        &jz(&label("aw_finish"));
-
-        &set_label("aw_loop",0);
-        for ($i=0; $i<8; $i++)
-                {
-                &comment("Round $i");
-
-                &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-                &sub($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &sub($tmp1,$tmp2);
-                &adc($c,0);
-                 &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-                }
-
-        &comment("");
-        &add($a,32);
-         &add($b,32);
-        &add($r,32);
-         &sub($num,8);
-        &jnz(&label("aw_loop"));
-
-        &set_label("aw_finish",0);
-        &mov($num,&wparam(3));  # get num
-        &and($num,7);
-         &jz(&label("aw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-                &sub($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &sub($tmp1,$tmp2);
-                &adc($c,0);
-                 &dec($num) if ($i != 6);
-                &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                 &jz(&label("aw_end")) if ($i != 6);
-                }
-        &set_label("aw_end",0);
-
-#       &mov("eax",$c);         # $c is "eax"
-
-        &function_end($name);
-        }
-
diff --git a/src/lib/libcrypto/bn/asm/co-586.pl b/src/lib/libcrypto/bn/asm/co-586.pl
deleted file mode 100644
index 5d962cb957..0000000000
--- a/src/lib/libcrypto/bn/asm/co-586.pl
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/usr/local/bin/perl
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-&bn_mul_comba("bn_mul_comba8",8);
-&bn_mul_comba("bn_mul_comba4",4);
-&bn_sqr_comba("bn_sqr_comba8",8);
-&bn_sqr_comba("bn_sqr_comba4",4);
-
-&asm_finish();
-
-sub mul_add_c
-        {
-        local($a,$ai,$b,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("mul a[$ai]*b[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$b,"",0));
-
-        &mul("edx");
-        &add($c0,"eax");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # laod next a
-         &mov("eax",&wparam(0)) if $pos > 0;                    # load r[]
-         ###
-        &adc($c1,"edx");
-         &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0;        # laod next b
-         &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1;        # laod next b
-         ###
-        &adc($c2,0);
-         # is pos > 1, it means it is the last loop 
-         &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0;           # save r[];
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # laod next a
-        }
-
-sub sqr_add_c
-        {
-        local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("sqr a[$ai]*a[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$b,"",0));
-
-        if ($ai == $bi)
-                { &mul("eax");}
-        else
-                { &mul("edx");}
-        &add($c0,"eax");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-         ###
-        &adc($c1,"edx");
-         &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos == 1) && ($na != $nb);
-         ###
-        &adc($c2,0);
-         # is pos > 1, it means it is the last loop 
-         &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;              # save r[];
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # load next b
-        }
-
-sub sqr_add_c2
-        {
-        local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("sqr a[$ai]*a[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$a,"",0));
-
-        if ($ai == $bi)
-                { &mul("eax");}
-        else
-                { &mul("edx");}
-        &add("eax","eax");
-         ###
-        &adc("edx","edx");
-         ###
-        &adc($c2,0);
-         &add($c0,"eax");
-        &adc($c1,"edx");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;        # load next b
-        &adc($c2,0);
-        &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;               # save r[];
-         &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos <= 1) && ($na != $nb);
-         ###
-        }
-
-sub bn_mul_comba
-        {
-        local($name,$num)=@_;
-        local($a,$b,$c0,$c1,$c2);
-        local($i,$as,$ae,$bs,$be,$ai,$bi);
-        local($tot,$end);
-
-        &function_begin_B($name,"");
-
-        $c0="ebx";
-        $c1="ecx";
-        $c2="ebp";
-        $a="esi";
-        $b="edi";
-        
-        $as=0;
-        $ae=0;
-        $bs=0;
-        $be=0;
-        $tot=$num+$num-1;
-
-        &push("esi");
-         &mov($a,&wparam(1));
-        &push("edi");
-         &mov($b,&wparam(2));
-        &push("ebp");
-         &push("ebx");
-
-        &xor($c0,$c0);
-         &mov("eax",&DWP(0,$a,"",0));   # load the first word 
-        &xor($c1,$c1);
-         &mov("edx",&DWP(0,$b,"",0));   # load the first second 
-
-        for ($i=0; $i<$tot; $i++)
-                {
-                $ai=$as;
-                $bi=$bs;
-                $end=$be+1;
-
-                &comment("################## Calculate word $i"); 
-
-                for ($j=$bs; $j<$end; $j++)
-                        {
-                        &xor($c2,$c2) if ($j == $bs);
-                        if (($j+1) == $end)
-                                {
-                                $v=1;
-                                $v=2 if (($i+1) == $tot);
-                                }
-                        else
-                                { $v=0; }
-                        if (($j+1) != $end)
-                                {
-                                $na=($ai-1);
-                                $nb=($bi+1);
-                                }
-                        else
-                                {
-                                $na=$as+($i < ($num-1));
-                                $nb=$bs+($i >= ($num-1));
-                                }
-#printf STDERR "[$ai,$bi] -> [$na,$nb]\n";
-                        &mul_add_c($a,$ai,$b,$bi,$c0,$c1,$c2,$v,$i,$na,$nb);
-                        if ($v)
-                                {
-                                &comment("saved r[$i]");
-                                # &mov("eax",&wparam(0));
-                                # &mov(&DWP($i*4,"eax","",0),$c0);
-                                ($c0,$c1,$c2)=($c1,$c2,$c0);
-                                }
-                        $ai--;
-                        $bi++;
-                        }
-                $as++ if ($i < ($num-1));
-                $ae++ if ($i >= ($num-1));
-
-                $bs++ if ($i >= ($num-1));
-                $be++ if ($i < ($num-1));
-                }
-        &comment("save r[$i]");
-        # &mov("eax",&wparam(0));
-        &mov(&DWP($i*4,"eax","",0),$c0);
-
-        &pop("ebx");
-        &pop("ebp");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-        &function_end_B($name);
-        }
-
-sub bn_sqr_comba
-        {
-        local($name,$num)=@_;
-        local($r,$a,$c0,$c1,$c2)=@_;
-        local($i,$as,$ae,$bs,$be,$ai,$bi);
-        local($b,$tot,$end,$half);
-
-        &function_begin_B($name,"");
-
-        $c0="ebx";
-        $c1="ecx";
-        $c2="ebp";
-        $a="esi";
-        $r="edi";
-
-        &push("esi");
-         &push("edi");
-        &push("ebp");
-         &push("ebx");
-        &mov($r,&wparam(0));
-         &mov($a,&wparam(1));
-        &xor($c0,$c0);
-         &xor($c1,$c1);
-        &mov("eax",&DWP(0,$a,"",0)); # load the first word
-
-        $as=0;
-        $ae=0;
-        $bs=0;
-        $be=0;
-        $tot=$num+$num-1;
-
-        for ($i=0; $i<$tot; $i++)
-                {
-                $ai=$as;
-                $bi=$bs;
-                $end=$be+1;
-
-                &comment("############### Calculate word $i");
-                for ($j=$bs; $j<$end; $j++)
-                        {
-                        &xor($c2,$c2) if ($j == $bs);
-                        if (($ai-1) < ($bi+1))
-                                {
-                                $v=1;
-                                $v=2 if ($i+1) == $tot;
-                                }
-                        else
-                                { $v=0; }
-                        if (!$v)
-                                {
-                                $na=$ai-1;
-                                $nb=$bi+1;
-                                }
-                        else
-                                {
-                                $na=$as+($i < ($num-1));
-                                $nb=$bs+($i >= ($num-1));
-                                }
-                        if ($ai == $bi)
-                                {
-                                &sqr_add_c($r,$a,$ai,$bi,
-                                        $c0,$c1,$c2,$v,$i,$na,$nb);
-                                }
-                        else
-                                {
-                                &sqr_add_c2($r,$a,$ai,$bi,
-                                        $c0,$c1,$c2,$v,$i,$na,$nb);
-                                }
-                        if ($v)
-                                {
-                                &comment("saved r[$i]");
-                                #&mov(&DWP($i*4,$r,"",0),$c0);
-                                ($c0,$c1,$c2)=($c1,$c2,$c0);
-                                last;
-                                }
-                        $ai--;
-                        $bi++;
-                        }
-                $as++ if ($i < ($num-1));
-                $ae++ if ($i >= ($num-1));
-
-                $bs++ if ($i >= ($num-1));
-                $be++ if ($i < ($num-1));
-                }
-        &mov(&DWP($i*4,$r,"",0),$c0);
-        &pop("ebx");
-        &pop("ebp");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-        &function_end_B($name);
-        }
diff --git a/src/lib/libcrypto/bn/asm/pa-risc2.s b/src/lib/libcrypto/bn/asm/pa-risc2.s
deleted file mode 100644
index c2725996a4..0000000000
--- a/src/lib/libcrypto/bn/asm/pa-risc2.s
+++ /dev/null
@@ -1,416 +0,0 @@
-        .SPACE $PRIVATE$
-        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-        .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-        .SPACE $TEXT$
-        .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-        .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-        .IMPORT $global$,DATA
-        .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_mul_add_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_add_words
-        .PROC
-        .CALLINFO FRAME=64,CALLS,SAVE_RP,ENTRY_GR=4
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        stwm %r4,64(0,%r30)
-        copy %r24,%r31
-        stw %r3,-60(0,%r30)
-        ldi 0,%r20
-        ldo 12(%r26),%r2
-        stw %r23,-16(0,%r30)
-        copy %r25,%r3
-        ldo 12(%r3),%r1
-        fldws -16(0,%r30),%fr8L
-L$0010
-        copy %r20,%r25
-        ldi 0,%r24
-        fldws 0(0,%r3),%fr9L
-        ldw 0(0,%r26),%r19
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r19,%r23
-        ldw -16(0,%r30),%r28
-        ldw -12(0,%r30),%r29
-        ldi 0,%r22
-        add %r23,%r29,%r29
-        addc %r22,%r28,%r28
-        add %r25,%r29,%r29
-        addc %r24,%r28,%r28
-        copy %r28,%r21
-        ldi 0,%r20
-        copy %r21,%r20
-        addib,= -1,%r31,L$0011
-        stw %r29,0(0,%r26)
-        copy %r20,%r25
-        ldi 0,%r24
-        fldws -8(0,%r1),%fr9L
-        ldw -8(0,%r2),%r19
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r19,%r23
-        ldw -16(0,%r30),%r28
-        ldw -12(0,%r30),%r29
-        ldi 0,%r22
-        add %r23,%r29,%r29
-        addc %r22,%r28,%r28
-        add %r25,%r29,%r29
-        addc %r24,%r28,%r28
-        copy %r28,%r21
-        ldi 0,%r20
-        copy %r21,%r20
-        addib,= -1,%r31,L$0011
-        stw %r29,-8(0,%r2)
-        copy %r20,%r25
-        ldi 0,%r24
-        fldws -4(0,%r1),%fr9L
-        ldw -4(0,%r2),%r19
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r19,%r23
-        ldw -16(0,%r30),%r28
-        ldw -12(0,%r30),%r29
-        ldi 0,%r22
-        add %r23,%r29,%r29
-        addc %r22,%r28,%r28
-        add %r25,%r29,%r29
-        addc %r24,%r28,%r28
-        copy %r28,%r21
-        ldi 0,%r20
-        copy %r21,%r20
-        addib,= -1,%r31,L$0011
-        stw %r29,-4(0,%r2)
-        copy %r20,%r25
-        ldi 0,%r24
-        fldws 0(0,%r1),%fr9L
-        ldw 0(0,%r2),%r19
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r19,%r23
-        ldw -16(0,%r30),%r28
-        ldw -12(0,%r30),%r29
-        ldi 0,%r22
-        add %r23,%r29,%r29
-        addc %r22,%r28,%r28
-        add %r25,%r29,%r29
-        addc %r24,%r28,%r28
-        copy %r28,%r21
-        ldi 0,%r20
-        copy %r21,%r20
-        addib,= -1,%r31,L$0011
-        stw %r29,0(0,%r2)
-        ldo 16(%r1),%r1
-        ldo 16(%r3),%r3
-        ldo 16(%r2),%r2
-        bl L$0010,0
-        ldo 16(%r26),%r26
-L$0011
-        copy %r20,%r28
-        ldw -84(0,%r30),%r2
-        ldw -60(0,%r30),%r3
-        bv 0(%r2)
-        ldwm -64(0,%r30),%r4
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_mul_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_words
-        .PROC
-        .CALLINFO FRAME=64,CALLS,SAVE_RP,ENTRY_GR=3
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        copy %r25,%r2
-        stwm %r4,64(0,%r30)
-        copy %r24,%r19
-        ldi 0,%r28
-        stw %r23,-16(0,%r30)
-        ldo 12(%r26),%r31
-        ldo 12(%r2),%r29
-        fldws -16(0,%r30),%fr8L
-L$0026
-        fldws 0(0,%r2),%fr9L
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r28,%r21
-        ldi 0,%r20
-        ldw -16(0,%r30),%r24
-        ldw -12(0,%r30),%r25
-        add %r21,%r25,%r25
-        addc %r20,%r24,%r24
-        copy %r24,%r23
-        ldi 0,%r22
-        copy %r23,%r28
-        addib,= -1,%r19,L$0027
-        stw %r25,0(0,%r26)
-        fldws -8(0,%r29),%fr9L
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r28,%r21
-        ldi 0,%r20
-        ldw -16(0,%r30),%r24
-        ldw -12(0,%r30),%r25
-        add %r21,%r25,%r25
-        addc %r20,%r24,%r24
-        copy %r24,%r23
-        ldi 0,%r22
-        copy %r23,%r28
-        addib,= -1,%r19,L$0027
-        stw %r25,-8(0,%r31)
-        fldws -4(0,%r29),%fr9L
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r28,%r21
-        ldi 0,%r20
-        ldw -16(0,%r30),%r24
-        ldw -12(0,%r30),%r25
-        add %r21,%r25,%r25
-        addc %r20,%r24,%r24
-        copy %r24,%r23
-        ldi 0,%r22
-        copy %r23,%r28
-        addib,= -1,%r19,L$0027
-        stw %r25,-4(0,%r31)
-        fldws 0(0,%r29),%fr9L
-        xmpyu %fr8L,%fr9L,%fr9
-        fstds %fr9,-16(0,%r30)
-        copy %r28,%r21
-        ldi 0,%r20
-        ldw -16(0,%r30),%r24
-        ldw -12(0,%r30),%r25
-        add %r21,%r25,%r25
-        addc %r20,%r24,%r24
-        copy %r24,%r23
-        ldi 0,%r22
-        copy %r23,%r28
-        addib,= -1,%r19,L$0027
-        stw %r25,0(0,%r31)
-        ldo 16(%r29),%r29
-        ldo 16(%r2),%r2
-        ldo 16(%r31),%r31
-        bl L$0026,0
-        ldo 16(%r26),%r26
-L$0027
-        ldw -84(0,%r30),%r2
-        bv 0(%r2)
-        ldwm -64(0,%r30),%r4
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_sqr_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR
-bn_sqr_words
-        .PROC
-        .CALLINFO FRAME=0,NO_CALLS
-        .ENTRY
-        ldo 28(%r26),%r19
-        ldo 12(%r25),%r28
-L$0042
-        fldws 0(0,%r25),%fr8L
-        fldws 0(0,%r25),%fr8R
-        xmpyu %fr8L,%fr8R,%fr8
-        fstds %fr8,-16(0,%r30)
-        ldw -16(0,%r30),%r22
-        ldw -12(0,%r30),%r23
-        stw %r23,0(0,%r26)
-        copy %r22,%r21
-        ldi 0,%r20
-        addib,= -1,%r24,L$0049
-        stw %r21,-24(0,%r19)
-        fldws -8(0,%r28),%fr8L
-        fldws -8(0,%r28),%fr8R
-        xmpyu %fr8L,%fr8R,%fr8
-        fstds %fr8,-16(0,%r30)
-        ldw -16(0,%r30),%r22
-        ldw -12(0,%r30),%r23
-        stw %r23,-20(0,%r19)
-        copy %r22,%r21
-        ldi 0,%r20
-        addib,= -1,%r24,L$0049
-        stw %r21,-16(0,%r19)
-        fldws -4(0,%r28),%fr8L
-        fldws -4(0,%r28),%fr8R
-        xmpyu %fr8L,%fr8R,%fr8
-        fstds %fr8,-16(0,%r30)
-        ldw -16(0,%r30),%r22
-        ldw -12(0,%r30),%r23
-        stw %r23,-12(0,%r19)
-        copy %r22,%r21
-        ldi 0,%r20
-        addib,= -1,%r24,L$0049
-        stw %r21,-8(0,%r19)
-        fldws 0(0,%r28),%fr8L
-        fldws 0(0,%r28),%fr8R
-        xmpyu %fr8L,%fr8R,%fr8
-        fstds %fr8,-16(0,%r30)
-        ldw -16(0,%r30),%r22
-        ldw -12(0,%r30),%r23
-        stw %r23,-4(0,%r19)
-        copy %r22,%r21
-        ldi 0,%r20
-        addib,= -1,%r24,L$0049
-        stw %r21,0(0,%r19)
-        ldo 16(%r28),%r28
-        ldo 16(%r25),%r25
-        ldo 32(%r19),%r19
-        bl L$0042,0
-        ldo 32(%r26),%r26
-L$0049
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .IMPORT BN_num_bits_word,CODE
-        .IMPORT fprintf,CODE
-        .IMPORT __iob,DATA
-        .SPACE $TEXT$
-        .SUBSPA $LIT$
-
-        .align 4
-L$C0000
-        .STRING "Division would overflow (%d)\x0a\x00"
-        .IMPORT abort,CODE
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_div64,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,RTNVAL=GR
-bn_div64
-        .PROC
-        .CALLINFO FRAME=128,CALLS,SAVE_RP,ENTRY_GR=8
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        stwm %r8,128(0,%r30)
-        stw %r7,-124(0,%r30)
-        stw %r4,-112(0,%r30)
-        stw %r3,-108(0,%r30)
-        copy %r26,%r3
-        copy %r25,%r4
-        stw %r6,-120(0,%r30)
-        ldi 0,%r7
-        stw %r5,-116(0,%r30)
-        movb,<> %r24,%r5,L$0051
-        ldi 2,%r6
-        bl L$0068,0
-        ldi -1,%r28
-L$0051
-        .CALL ARGW0=GR
-        bl BN_num_bits_word,%r2
-        copy %r5,%r26
-        copy %r28,%r24
-        ldi 32,%r19
-        comb,= %r19,%r24,L$0052
-        subi 31,%r24,%r19
-        mtsar %r19
-        zvdepi 1,32,%r19
-        comb,>>= %r19,%r3,L$0052
-        addil LR'__iob-$global$+32,%r27
-        ldo RR'__iob-$global$+32(%r1),%r26
-        ldil LR'L$C0000,%r25
-        .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR
-        bl fprintf,%r2
-        ldo RR'L$C0000(%r25),%r25
-        .CALL 
-        bl abort,%r2
-        nop
-L$0052
-        comb,>> %r5,%r3,L$0053
-        subi 32,%r24,%r24
-        sub %r3,%r5,%r3
-L$0053
-        comib,= 0,%r24,L$0054
-        subi 31,%r24,%r19
-        mtsar %r19
-        zvdep %r5,32,%r5
-        zvdep %r3,32,%r21
-        subi 32,%r24,%r20
-        mtsar %r20
-        vshd 0,%r4,%r20
-        or %r21,%r20,%r3
-        mtsar %r19
-        zvdep %r4,32,%r4
-L$0054
-        extru %r5,15,16,%r23
-        extru %r5,31,16,%r28
-L$0055
-        extru %r3,15,16,%r19
-        comb,<> %r23,%r19,L$0058
-        copy %r3,%r26
-        bl L$0059,0
-        zdepi -1,31,16,%r29
-L$0058
-        .IMPORT $$divU,MILLICODE
-        bl $$divU,%r31
-        copy %r23,%r25
-L$0059
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r23,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr9
-        ldw -16(0,%r30),%r8
-        fstws %fr9R,-16(0,%r30)
-        copy %r8,%r22
-        ldw -16(0,%r30),%r8
-        extru %r4,15,16,%r24
-        copy %r8,%r21
-L$0060
-        sub %r3,%r21,%r20
-        copy %r20,%r19
-        depi 0,31,16,%r19
-        comib,<> 0,%r19,L$0061
-        zdep %r20,15,16,%r19
-        addl %r19,%r24,%r19
-        comb,>>= %r19,%r22,L$0061
-        sub %r22,%r28,%r22
-        sub %r21,%r23,%r21
-        bl L$0060,0
-        ldo -1(%r29),%r29
-L$0061
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r8
-        stw %r23,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        copy %r8,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,15,16,%r20
-        ldw -16(0,%r30),%r8
-        zdep %r19,15,16,%r19
-        addl %r8,%r20,%r20
-        comclr,<<= %r19,%r4,0
-        addi 1,%r20,%r20
-        comb,<<= %r20,%r3,L$0066
-        sub %r4,%r19,%r4
-        addl %r3,%r5,%r3
-        ldo -1(%r29),%r29
-L$0066
-        addib,= -1,%r6,L$0056
-        sub %r3,%r20,%r3
-        zdep %r29,15,16,%r7
-        shd %r3,%r4,16,%r3
-        bl L$0055,0
-        zdep %r4,15,16,%r4
-L$0056
-        or %r7,%r29,%r28
-L$0068
-        ldw -148(0,%r30),%r2
-        ldw -124(0,%r30),%r7
-        ldw -120(0,%r30),%r6
-        ldw -116(0,%r30),%r5
-        ldw -112(0,%r30),%r4
-        ldw -108(0,%r30),%r3
-        bv 0(%r2)
-        ldwm -128(0,%r30),%r8
-        .EXIT
-        .PROCEND
diff --git a/src/lib/libcrypto/bn/asm/sparcv8.S b/src/lib/libcrypto/bn/asm/sparcv8.S
deleted file mode 100644
index 88c5dc480a..0000000000
--- a/src/lib/libcrypto/bn/asm/sparcv8.S
+++ /dev/null
@@ -1,1458 +0,0 @@
-.ident  "sparcv8.s, Version 1.4"
-.ident  "SPARC v8 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
-
-/*
- * ====================================================================
- * Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
- * project.
- *
- * Rights for redistribution and usage in source and binary forms are
- * granted according to the OpenSSL license. Warranty of any kind is
- * disclaimed.
- * ====================================================================
- */
-
-/*
- * This is my modest contributon to OpenSSL project (see
- * http://www.openssl.org/ for more information about it) and is
- * a drop-in SuperSPARC ISA replacement for crypto/bn/bn_asm.c
- * module. For updates see http://fy.chalmers.se/~appro/hpe/.
- *
- * See bn_asm.sparc.v8plus.S for more details.
- */
-
-/*
- * Revision history.
- *
- * 1.1  - new loop unrolling model(*);
- * 1.2  - made gas friendly;
- * 1.3  - fixed problem with /usr/ccs/lib/cpp;
- * 1.4  - some retunes;
- *
- * (*)  see bn_asm.sparc.v8plus.S for details
- */
-
-.section        ".text",#alloc,#execinstr
-.file           "bn_asm.sparc.v8.S"
-
-.align  32
-
-.global bn_mul_add_words
-/*
- * BN_ULONG bn_mul_add_words(rp,ap,num,w)
- * BN_ULONG *rp,*ap;
- * int num;
- * BN_ULONG w;
- */
-bn_mul_add_words:
-        cmp     %o2,0
-        bg,a    .L_bn_mul_add_words_proceed
-        ld      [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_mul_add_words_proceed:
-        andcc   %o2,-4,%g0
-        bz      .L_bn_mul_add_words_tail
-        clr     %o5
-
-.L_bn_mul_add_words_loop:
-        ld      [%o0],%o4
-        ld      [%o1+4],%g3
-        umul    %o3,%g2,%g2
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g2,%o4
-        st      %o4,[%o0]
-        addx    %g1,0,%o5
-
-        ld      [%o0+4],%o4
-        ld      [%o1+8],%g2
-        umul    %o3,%g3,%g3
-        dec     4,%o2
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g3,%o4
-        st      %o4,[%o0+4]
-        addx    %g1,0,%o5
-
-        ld      [%o0+8],%o4
-        ld      [%o1+12],%g3
-        umul    %o3,%g2,%g2
-        inc     16,%o1
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g2,%o4
-        st      %o4,[%o0+8]
-        addx    %g1,0,%o5
-
-        ld      [%o0+12],%o4
-        umul    %o3,%g3,%g3
-        inc     16,%o0
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g3,%o4
-        st      %o4,[%o0-4]
-        addx    %g1,0,%o5
-        andcc   %o2,-4,%g0
-        bnz,a   .L_bn_mul_add_words_loop
-        ld      [%o1],%g2
-
-        tst     %o2
-        bnz,a   .L_bn_mul_add_words_tail
-        ld      [%o1],%g2
-.L_bn_mul_add_words_return:
-        retl
-        mov     %o5,%o0
-        nop
-
-.L_bn_mul_add_words_tail:
-        ld      [%o0],%o4
-        umul    %o3,%g2,%g2
-        addcc   %o4,%o5,%o4
-        rd      %y,%g1
-        addx    %g1,0,%g1
-        addcc   %o4,%g2,%o4
-        addx    %g1,0,%o5
-        deccc   %o2
-        bz      .L_bn_mul_add_words_return
-        st      %o4,[%o0]
-
-        ld      [%o1+4],%g2
-        ld      [%o0+4],%o4
-        umul    %o3,%g2,%g2
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g2,%o4
-        addx    %g1,0,%o5
-        deccc   %o2
-        bz      .L_bn_mul_add_words_return
-        st      %o4,[%o0+4]
-
-        ld      [%o1+8],%g2
-        ld      [%o0+8],%o4
-        umul    %o3,%g2,%g2
-        rd      %y,%g1
-        addcc   %o4,%o5,%o4
-        addx    %g1,0,%g1
-        addcc   %o4,%g2,%o4
-        st      %o4,[%o0+8]
-        retl
-        addx    %g1,0,%o0
-
-.type   bn_mul_add_words,#function
-.size   bn_mul_add_words,(.-bn_mul_add_words)
-
-.align  32
-
-.global bn_mul_words
-/*
- * BN_ULONG bn_mul_words(rp,ap,num,w)
- * BN_ULONG *rp,*ap;
- * int num;
- * BN_ULONG w;
- */
-bn_mul_words:
-        cmp     %o2,0
-        bg,a    .L_bn_mul_words_proceeed
-        ld      [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_mul_words_proceeed:
-        andcc   %o2,-4,%g0
-        bz      .L_bn_mul_words_tail
-        clr     %o5
-
-.L_bn_mul_words_loop:
-        ld      [%o1+4],%g3
-        umul    %o3,%g2,%g2
-        addcc   %g2,%o5,%g2
-        rd      %y,%g1
-        addx    %g1,0,%o5
-        st      %g2,[%o0]
-
-        ld      [%o1+8],%g2
-        umul    %o3,%g3,%g3
-        addcc   %g3,%o5,%g3
-        rd      %y,%g1
-        dec     4,%o2
-        addx    %g1,0,%o5
-        st      %g3,[%o0+4]
-
-        ld      [%o1+12],%g3
-        umul    %o3,%g2,%g2
-        addcc   %g2,%o5,%g2
-        rd      %y,%g1
-        inc     16,%o1
-        st      %g2,[%o0+8]
-        addx    %g1,0,%o5
-
-        umul    %o3,%g3,%g3
-        addcc   %g3,%o5,%g3
-        rd      %y,%g1
-        inc     16,%o0
-        addx    %g1,0,%o5
-        st      %g3,[%o0-4]
-        andcc   %o2,-4,%g0
-        nop
-        bnz,a   .L_bn_mul_words_loop
-        ld      [%o1],%g2
-
-        tst     %o2
-        bnz,a   .L_bn_mul_words_tail
-        ld      [%o1],%g2
-.L_bn_mul_words_return:
-        retl
-        mov     %o5,%o0
-        nop
-
-.L_bn_mul_words_tail:
-        umul    %o3,%g2,%g2
-        addcc   %g2,%o5,%g2
-        rd      %y,%g1
-        addx    %g1,0,%o5
-        deccc   %o2
-        bz      .L_bn_mul_words_return
-        st      %g2,[%o0]
-        nop
-
-        ld      [%o1+4],%g2
-        umul    %o3,%g2,%g2
-        addcc   %g2,%o5,%g2
-        rd      %y,%g1
-        addx    %g1,0,%o5
-        deccc   %o2
-        bz      .L_bn_mul_words_return
-        st      %g2,[%o0+4]
-
-        ld      [%o1+8],%g2
-        umul    %o3,%g2,%g2
-        addcc   %g2,%o5,%g2
-        rd      %y,%g1
-        st      %g2,[%o0+8]
-        retl
-        addx    %g1,0,%o0
-
-.type   bn_mul_words,#function
-.size   bn_mul_words,(.-bn_mul_words)
-
-.align  32
-.global bn_sqr_words
-/*
- * void bn_sqr_words(r,a,n)
- * BN_ULONG *r,*a;
- * int n;
- */
-bn_sqr_words:
-        cmp     %o2,0
-        bg,a    .L_bn_sqr_words_proceeed
-        ld      [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_sqr_words_proceeed:
-        andcc   %o2,-4,%g0
-        bz      .L_bn_sqr_words_tail
-        clr     %o5
-
-.L_bn_sqr_words_loop:
-        ld      [%o1+4],%g3
-        umul    %g2,%g2,%o4
-        st      %o4,[%o0]
-        rd      %y,%o5
-        st      %o5,[%o0+4]
-
-        ld      [%o1+8],%g2
-        umul    %g3,%g3,%o4
-        dec     4,%o2
-        st      %o4,[%o0+8]
-        rd      %y,%o5
-        st      %o5,[%o0+12]
-        nop
-
-        ld      [%o1+12],%g3
-        umul    %g2,%g2,%o4
-        st      %o4,[%o0+16]
-        rd      %y,%o5
-        inc     16,%o1
-        st      %o5,[%o0+20]
-
-        umul    %g3,%g3,%o4
-        inc     32,%o0
-        st      %o4,[%o0-8]
-        rd      %y,%o5
-        st      %o5,[%o0-4]
-        andcc   %o2,-4,%g2
-        bnz,a   .L_bn_sqr_words_loop
-        ld      [%o1],%g2
-
-        tst     %o2
-        nop
-        bnz,a   .L_bn_sqr_words_tail
-        ld      [%o1],%g2
-.L_bn_sqr_words_return:
-        retl
-        clr     %o0
-
-.L_bn_sqr_words_tail:
-        umul    %g2,%g2,%o4
-        st      %o4,[%o0]
-        deccc   %o2
-        rd      %y,%o5
-        bz      .L_bn_sqr_words_return
-        st      %o5,[%o0+4]
-
-        ld      [%o1+4],%g2
-        umul    %g2,%g2,%o4
-        st      %o4,[%o0+8]
-        deccc   %o2
-        rd      %y,%o5
-        nop
-        bz      .L_bn_sqr_words_return
-        st      %o5,[%o0+12]
-
-        ld      [%o1+8],%g2
-        umul    %g2,%g2,%o4
-        st      %o4,[%o0+16]
-        rd      %y,%o5
-        st      %o5,[%o0+20]
-        retl
-        clr     %o0
-
-.type   bn_sqr_words,#function
-.size   bn_sqr_words,(.-bn_sqr_words)
-
-.align  32
-
-.global bn_div_words
-/*
- * BN_ULONG bn_div_words(h,l,d)
- * BN_ULONG h,l,d;
- */
-bn_div_words:
-        wr      %o0,%y
-        udiv    %o1,%o2,%o0
-        retl
-        nop
-
-.type   bn_div_words,#function
-.size   bn_div_words,(.-bn_div_words)
-
-.align  32
-
-.global bn_add_words
-/*
- * BN_ULONG bn_add_words(rp,ap,bp,n)
- * BN_ULONG *rp,*ap,*bp;
- * int n;
- */
-bn_add_words:
-        cmp     %o3,0
-        bg,a    .L_bn_add_words_proceed
-        ld      [%o1],%o4
-        retl
-        clr     %o0
-
-.L_bn_add_words_proceed:
-        andcc   %o3,-4,%g0
-        bz      .L_bn_add_words_tail
-        clr     %g1
-        ba      .L_bn_add_words_warn_loop
-        addcc   %g0,0,%g0       ! clear carry flag
-
-.L_bn_add_words_loop:
-        ld      [%o1],%o4
-.L_bn_add_words_warn_loop:
-        ld      [%o2],%o5
-        ld      [%o1+4],%g3
-        ld      [%o2+4],%g4
-        dec     4,%o3
-        addxcc  %o5,%o4,%o5
-        st      %o5,[%o0]
-
-        ld      [%o1+8],%o4
-        ld      [%o2+8],%o5
-        inc     16,%o1
-        addxcc  %g3,%g4,%g3
-        st      %g3,[%o0+4]
-        
-        ld      [%o1-4],%g3
-        ld      [%o2+12],%g4
-        inc     16,%o2
-        addxcc  %o5,%o4,%o5
-        st      %o5,[%o0+8]
-
-        inc     16,%o0
-        addxcc  %g3,%g4,%g3
-        st      %g3,[%o0-4]
-        addx    %g0,0,%g1
-        andcc   %o3,-4,%g0
-        bnz,a   .L_bn_add_words_loop
-        addcc   %g1,-1,%g0
-
-        tst     %o3
-        bnz,a   .L_bn_add_words_tail
-        ld      [%o1],%o4
-.L_bn_add_words_return:
-        retl
-        mov     %g1,%o0
-
-.L_bn_add_words_tail:
-        addcc   %g1,-1,%g0
-        ld      [%o2],%o5
-        addxcc  %o5,%o4,%o5
-        addx    %g0,0,%g1
-        deccc   %o3
-        bz      .L_bn_add_words_return
-        st      %o5,[%o0]
-
-        ld      [%o1+4],%o4
-        addcc   %g1,-1,%g0
-        ld      [%o2+4],%o5
-        addxcc  %o5,%o4,%o5
-        addx    %g0,0,%g1
-        deccc   %o3
-        bz      .L_bn_add_words_return
-        st      %o5,[%o0+4]
-
-        ld      [%o1+8],%o4
-        addcc   %g1,-1,%g0
-        ld      [%o2+8],%o5
-        addxcc  %o5,%o4,%o5
-        st      %o5,[%o0+8]
-        retl
-        addx    %g0,0,%o0
-
-.type   bn_add_words,#function
-.size   bn_add_words,(.-bn_add_words)
-
-.align  32
-
-.global bn_sub_words
-/*
- * BN_ULONG bn_sub_words(rp,ap,bp,n)
- * BN_ULONG *rp,*ap,*bp;
- * int n;
- */
-bn_sub_words:
-        cmp     %o3,0
-        bg,a    .L_bn_sub_words_proceed
-        ld      [%o1],%o4
-        retl
-        clr     %o0
-
-.L_bn_sub_words_proceed:
-        andcc   %o3,-4,%g0
-        bz      .L_bn_sub_words_tail
-        clr     %g1
-        ba      .L_bn_sub_words_warm_loop
-        addcc   %g0,0,%g0       ! clear carry flag
-
-.L_bn_sub_words_loop:
-        ld      [%o1],%o4
-.L_bn_sub_words_warm_loop:
-        ld      [%o2],%o5
-        ld      [%o1+4],%g3
-        ld      [%o2+4],%g4
-        dec     4,%o3
-        subxcc  %o4,%o5,%o5
-        st      %o5,[%o0]
-
-        ld      [%o1+8],%o4
-        ld      [%o2+8],%o5
-        inc     16,%o1
-        subxcc  %g3,%g4,%g4
-        st      %g4,[%o0+4]
-        
-        ld      [%o1-4],%g3
-        ld      [%o2+12],%g4
-        inc     16,%o2
-        subxcc  %o4,%o5,%o5
-        st      %o5,[%o0+8]
-
-        inc     16,%o0
-        subxcc  %g3,%g4,%g4
-        st      %g4,[%o0-4]
-        addx    %g0,0,%g1
-        andcc   %o3,-4,%g0
-        bnz,a   .L_bn_sub_words_loop
-        addcc   %g1,-1,%g0
-
-        tst     %o3
-        nop
-        bnz,a   .L_bn_sub_words_tail
-        ld      [%o1],%o4
-.L_bn_sub_words_return:
-        retl
-        mov     %g1,%o0
-
-.L_bn_sub_words_tail:
-        addcc   %g1,-1,%g0
-        ld      [%o2],%o5
-        subxcc  %o4,%o5,%o5
-        addx    %g0,0,%g1
-        deccc   %o3
-        bz      .L_bn_sub_words_return
-        st      %o5,[%o0]
-        nop
-
-        ld      [%o1+4],%o4
-        addcc   %g1,-1,%g0
-        ld      [%o2+4],%o5
-        subxcc  %o4,%o5,%o5
-        addx    %g0,0,%g1
-        deccc   %o3
-        bz      .L_bn_sub_words_return
-        st      %o5,[%o0+4]
-
-        ld      [%o1+8],%o4
-        addcc   %g1,-1,%g0
-        ld      [%o2+8],%o5
-        subxcc  %o4,%o5,%o5
-        st      %o5,[%o0+8]
-        retl
-        addx    %g0,0,%o0
-
-.type   bn_sub_words,#function
-.size   bn_sub_words,(.-bn_sub_words)
-
-#define FRAME_SIZE      -96
-
-/*
- * Here is register usage map for *all* routines below.
- */
-#define t_1     %o0
-#define t_2     %o1
-#define c_1     %o2
-#define c_2     %o3
-#define c_3     %o4
-
-#define ap(I)   [%i1+4*I]
-#define bp(I)   [%i2+4*I]
-#define rp(I)   [%i0+4*I]
-
-#define a_0     %l0
-#define a_1     %l1
-#define a_2     %l2
-#define a_3     %l3
-#define a_4     %l4
-#define a_5     %l5
-#define a_6     %l6
-#define a_7     %l7
-
-#define b_0     %i3
-#define b_1     %i4
-#define b_2     %i5
-#define b_3     %o5
-#define b_4     %g1
-#define b_5     %g2
-#define b_6     %g3
-#define b_7     %g4
-
-.align  32
-.global bn_mul_comba8
-/*
- * void bn_mul_comba8(r,a,b)
- * BN_ULONG *r,*a,*b;
- */
-bn_mul_comba8:
-        save    %sp,FRAME_SIZE,%sp
-        ld      ap(0),a_0
-        ld      bp(0),b_0
-        umul    a_0,b_0,c_1     !=!mul_add_c(a[0],b[0],c1,c2,c3);
-        ld      bp(1),b_1
-        rd      %y,c_2
-        st      c_1,rp(0)       !r[0]=c1;
-
-        umul    a_0,b_1,t_1     !=!mul_add_c(a[0],b[1],c2,c3,c1);
-        ld      ap(1),a_1
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  %g0,t_2,c_3     !=
-        addx    %g0,%g0,c_1
-        ld      ap(2),a_2
-        umul    a_1,b_0,t_1     !mul_add_c(a[1],b[0],c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        st      c_2,rp(1)       !r[1]=c2;
-        addx    c_1,%g0,c_1     !=
-
-        umul    a_2,b_0,t_1     !mul_add_c(a[2],b[0],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    %g0,%g0,c_2
-        ld      bp(2),b_2
-        umul    a_1,b_1,t_1     !mul_add_c(a[1],b[1],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        ld      bp(3),b_3
-        addx    c_2,%g0,c_2     !=
-        umul    a_0,b_2,t_1     !mul_add_c(a[0],b[2],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        st      c_3,rp(2)       !r[2]=c3;
-
-        umul    a_0,b_3,t_1     !mul_add_c(a[0],b[3],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3
-        umul    a_1,b_2,t_1     !=!mul_add_c(a[1],b[2],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        ld      ap(3),a_3
-        umul    a_2,b_1,t_1     !mul_add_c(a[2],b[1],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2          !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        ld      ap(4),a_4
-        umul    a_3,b_0,t_1     !mul_add_c(a[3],b[0],c1,c2,c3);!=
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(3)       !r[3]=c1;
-
-        umul    a_4,b_0,t_1     !mul_add_c(a[4],b[0],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        umul    a_3,b_1,t_1     !mul_add_c(a[3],b[1],c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        umul    a_2,b_2,t_1     !=!mul_add_c(a[2],b[2],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        ld      bp(4),b_4
-        umul    a_1,b_3,t_1     !mul_add_c(a[1],b[3],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        ld      bp(5),b_5
-        umul    a_0,b_4,t_1     !=!mul_add_c(a[0],b[4],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        st      c_2,rp(4)       !r[4]=c2;
-
-        umul    a_0,b_5,t_1     !mul_add_c(a[0],b[5],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        umul    a_1,b_4,t_1     !mul_add_c(a[1],b[4],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_2,b_3,t_1     !=!mul_add_c(a[2],b[3],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        umul    a_3,b_2,t_1     !mul_add_c(a[3],b[2],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        ld      ap(5),a_5
-        umul    a_4,b_1,t_1     !mul_add_c(a[4],b[1],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        ld      ap(6),a_6
-        addx    c_2,%g0,c_2     !=
-        umul    a_5,b_0,t_1     !mul_add_c(a[5],b[0],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        st      c_3,rp(5)       !r[5]=c3;
-
-        umul    a_6,b_0,t_1     !mul_add_c(a[6],b[0],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3
-        umul    a_5,b_1,t_1     !=!mul_add_c(a[5],b[1],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_4,b_2,t_1     !mul_add_c(a[4],b[2],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        umul    a_3,b_3,t_1     !mul_add_c(a[3],b[3],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2          !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_2,b_4,t_1     !mul_add_c(a[2],b[4],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        ld      bp(6),b_6
-        addx    c_3,%g0,c_3     !=
-        umul    a_1,b_5,t_1     !mul_add_c(a[1],b[5],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        ld      bp(7),b_7
-        umul    a_0,b_6,t_1     !mul_add_c(a[0],b[6],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        st      c_1,rp(6)       !r[6]=c1;
-        addx    c_3,%g0,c_3     !=
-
-        umul    a_0,b_7,t_1     !mul_add_c(a[0],b[7],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    %g0,%g0,c_1
-        umul    a_1,b_6,t_1     !mul_add_c(a[1],b[6],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        umul    a_2,b_5,t_1     !mul_add_c(a[2],b[5],c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        umul    a_3,b_4,t_1     !=!mul_add_c(a[3],b[4],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        umul    a_4,b_3,t_1     !mul_add_c(a[4],b[3],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_5,b_2,t_1     !mul_add_c(a[5],b[2],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        ld      ap(7),a_7
-        umul    a_6,b_1,t_1     !=!mul_add_c(a[6],b[1],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        umul    a_7,b_0,t_1     !mul_add_c(a[7],b[0],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        st      c_2,rp(7)       !r[7]=c2;
-
-        umul    a_7,b_1,t_1     !mul_add_c(a[7],b[1],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        umul    a_6,b_2,t_1     !=!mul_add_c(a[6],b[2],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        umul    a_5,b_3,t_1     !mul_add_c(a[5],b[3],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        umul    a_4,b_4,t_1     !mul_add_c(a[4],b[4],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_3,b_5,t_1     !mul_add_c(a[3],b[5],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_2,b_6,t_1     !=!mul_add_c(a[2],b[6],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        umul    a_1,b_7,t_1     !mul_add_c(a[1],b[7],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !
-        addx    c_2,%g0,c_2
-        st      c_3,rp(8)       !r[8]=c3;
-
-        umul    a_2,b_7,t_1     !mul_add_c(a[2],b[7],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3
-        umul    a_3,b_6,t_1     !=!mul_add_c(a[3],b[6],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_4,b_5,t_1     !mul_add_c(a[4],b[5],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        umul    a_5,b_4,t_1     !mul_add_c(a[5],b[4],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2          !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_6,b_3,t_1     !mul_add_c(a[6],b[3],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_7,b_2,t_1     !=!mul_add_c(a[7],b[2],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(9)       !r[9]=c1;
-
-        umul    a_7,b_3,t_1     !mul_add_c(a[7],b[3],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        umul    a_6,b_4,t_1     !mul_add_c(a[6],b[4],c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        umul    a_5,b_5,t_1     !=!mul_add_c(a[5],b[5],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        umul    a_4,b_6,t_1     !mul_add_c(a[4],b[6],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_3,b_7,t_1     !mul_add_c(a[3],b[7],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        st      c_2,rp(10)      !r[10]=c2;
-
-        umul    a_4,b_7,t_1     !=!mul_add_c(a[4],b[7],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2     !=
-        umul    a_5,b_6,t_1     !mul_add_c(a[5],b[6],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        umul    a_6,b_5,t_1     !mul_add_c(a[6],b[5],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_7,b_4,t_1     !mul_add_c(a[7],b[4],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(11)      !r[11]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_7,b_5,t_1     !mul_add_c(a[7],b[5],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    %g0,%g0,c_3
-        umul    a_6,b_6,t_1     !mul_add_c(a[6],b[6],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2          !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_5,b_7,t_1     !mul_add_c(a[5],b[7],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        st      c_1,rp(12)      !r[12]=c1;
-        addx    c_3,%g0,c_3     !=
-
-        umul    a_6,b_7,t_1     !mul_add_c(a[6],b[7],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    %g0,%g0,c_1
-        umul    a_7,b_6,t_1     !mul_add_c(a[7],b[6],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        st      c_2,rp(13)      !r[13]=c2;
-
-        umul    a_7,b_7,t_1     !=!mul_add_c(a[7],b[7],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        nop                     !=
-        st      c_3,rp(14)      !r[14]=c3;
-        st      c_1,rp(15)      !r[15]=c1;
-
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_mul_comba8,#function
-.size   bn_mul_comba8,(.-bn_mul_comba8)
-
-.align  32
-
-.global bn_mul_comba4
-/*
- * void bn_mul_comba4(r,a,b)
- * BN_ULONG *r,*a,*b;
- */
-bn_mul_comba4:
-        save    %sp,FRAME_SIZE,%sp
-        ld      ap(0),a_0
-        ld      bp(0),b_0
-        umul    a_0,b_0,c_1     !=!mul_add_c(a[0],b[0],c1,c2,c3);
-        ld      bp(1),b_1
-        rd      %y,c_2
-        st      c_1,rp(0)       !r[0]=c1;
-
-        umul    a_0,b_1,t_1     !=!mul_add_c(a[0],b[1],c2,c3,c1);
-        ld      ap(1),a_1
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  %g0,t_2,c_3
-        addx    %g0,%g0,c_1
-        ld      ap(2),a_2
-        umul    a_1,b_0,t_1     !=!mul_add_c(a[1],b[0],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        st      c_2,rp(1)       !r[1]=c2;
-
-        umul    a_2,b_0,t_1     !mul_add_c(a[2],b[0],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        ld      bp(2),b_2
-        umul    a_1,b_1,t_1     !=!mul_add_c(a[1],b[1],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        ld      bp(3),b_3
-        umul    a_0,b_2,t_1     !mul_add_c(a[0],b[2],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        st      c_3,rp(2)       !r[2]=c3;
-
-        umul    a_0,b_3,t_1     !=!mul_add_c(a[0],b[3],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3     !=
-        umul    a_1,b_2,t_1     !mul_add_c(a[1],b[2],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        ld      ap(3),a_3
-        umul    a_2,b_1,t_1     !mul_add_c(a[2],b[1],c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_3,b_0,t_1     !=!mul_add_c(a[3],b[0],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(3)       !r[3]=c1;
-
-        umul    a_3,b_1,t_1     !mul_add_c(a[3],b[1],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        umul    a_2,b_2,t_1     !mul_add_c(a[2],b[2],c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        umul    a_1,b_3,t_1     !=!mul_add_c(a[1],b[3],c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        st      c_2,rp(4)       !r[4]=c2;
-
-        umul    a_2,b_3,t_1     !mul_add_c(a[2],b[3],c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        umul    a_3,b_2,t_1     !mul_add_c(a[3],b[2],c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(5)       !r[5]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_3,b_3,t_1     !mul_add_c(a[3],b[3],c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        st      c_1,rp(6)       !r[6]=c1;
-        st      c_2,rp(7)       !r[7]=c2;
-        
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_mul_comba4,#function
-.size   bn_mul_comba4,(.-bn_mul_comba4)
-
-.align  32
-
-.global bn_sqr_comba8
-bn_sqr_comba8:
-        save    %sp,FRAME_SIZE,%sp
-        ld      ap(0),a_0
-        ld      ap(1),a_1
-        umul    a_0,a_0,c_1     !=!sqr_add_c(a,0,c1,c2,c3);
-        rd      %y,c_2
-        st      c_1,rp(0)       !r[0]=c1;
-
-        ld      ap(2),a_2
-        umul    a_0,a_1,t_1     !=!sqr_add_c2(a,1,0,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  %g0,t_2,c_3
-        addx    %g0,%g0,c_1     !=
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3
-        st      c_2,rp(1)       !r[1]=c2;
-        addx    c_1,%g0,c_1     !=
-
-        umul    a_2,a_0,t_1     !sqr_add_c2(a,2,0,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    %g0,%g0,c_2
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        ld      ap(3),a_3
-        umul    a_1,a_1,t_1     !sqr_add_c(a,1,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        st      c_3,rp(2)       !r[2]=c3;
-
-        umul    a_0,a_3,t_1     !=!sqr_add_c2(a,3,0,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3     !=
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        ld      ap(4),a_4
-        addx    c_3,%g0,c_3     !=
-        umul    a_1,a_2,t_1     !sqr_add_c2(a,2,1,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(3)       !r[3]=c1;
-
-        umul    a_4,a_0,t_1     !sqr_add_c2(a,4,0,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_3,a_1,t_1     !sqr_add_c2(a,3,1,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        ld      ap(5),a_5
-        umul    a_2,a_2,t_1     !sqr_add_c(a,2,c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        st      c_2,rp(4)       !r[4]=c2;
-        addx    c_1,%g0,c_1     !=
-
-        umul    a_0,a_5,t_1     !sqr_add_c2(a,5,0,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    %g0,%g0,c_2
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        umul    a_1,a_4,t_1     !sqr_add_c2(a,4,1,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        ld      ap(6),a_6
-        umul    a_2,a_3,t_1     !sqr_add_c2(a,3,2,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        st      c_3,rp(5)       !r[5]=c3;
-
-        umul    a_6,a_0,t_1     !sqr_add_c2(a,6,0,c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    %g0,%g0,c_3
-        addcc   c_1,t_1,c_1     !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_5,a_1,t_1     !sqr_add_c2(a,5,1,c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1     !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        umul    a_4,a_2,t_1     !sqr_add_c2(a,4,2,c1,c2,c3);
-        addcc   c_1,t_1,c_1     !=
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1     !=
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3
-        ld      ap(7),a_7
-        umul    a_3,a_3,t_1     !=!sqr_add_c(a,3,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(6)       !r[6]=c1;
-
-        umul    a_0,a_7,t_1     !sqr_add_c2(a,7,0,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_1,a_6,t_1     !sqr_add_c2(a,6,1,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_2,a_5,t_1     !sqr_add_c2(a,5,2,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_3,a_4,t_1     !sqr_add_c2(a,4,3,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        st      c_2,rp(7)       !r[7]=c2;
-
-        umul    a_7,a_1,t_1     !sqr_add_c2(a,7,1,c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        addcc   c_3,t_1,c_3     !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_6,a_2,t_1     !sqr_add_c2(a,6,2,c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        addcc   c_3,t_1,c_3     !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_5,a_3,t_1     !sqr_add_c2(a,5,3,c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        addcc   c_3,t_1,c_3     !=
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_4,a_4,t_1     !sqr_add_c(a,4,c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(8)       !r[8]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_2,a_7,t_1     !sqr_add_c2(a,7,2,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    %g0,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_3,a_6,t_1     !sqr_add_c2(a,6,3,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_4,a_5,t_1     !sqr_add_c2(a,5,4,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(9)       !r[9]=c1;
-
-        umul    a_7,a_3,t_1     !sqr_add_c2(a,7,3,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_6,a_4,t_1     !sqr_add_c2(a,6,4,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_5,a_5,t_1     !sqr_add_c(a,5,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        st      c_2,rp(10)      !r[10]=c2;
-
-        umul    a_4,a_7,t_1     !=!sqr_add_c2(a,7,4,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2     !=
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2
-        umul    a_5,a_6,t_1     !=!sqr_add_c2(a,6,5,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    c_2,%g0,c_2     !=
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(11)      !r[11]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_7,a_5,t_1     !sqr_add_c2(a,7,5,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    %g0,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_6,a_6,t_1     !sqr_add_c(a,6,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        st      c_1,rp(12)      !r[12]=c1;
-
-        umul    a_6,a_7,t_1     !sqr_add_c2(a,7,6,c2,c3,c1);
-        addcc   c_2,t_1,c_2     !=
-        rd      %y,t_2
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        addcc   c_2,t_1,c_2     !=
-        addxcc  c_3,t_2,c_3
-        st      c_2,rp(13)      !r[13]=c2;
-        addx    c_1,%g0,c_1     !=
-
-        umul    a_7,a_7,t_1     !sqr_add_c(a,7,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1     !=
-        st      c_3,rp(14)      !r[14]=c3;
-        st      c_1,rp(15)      !r[15]=c1;
-
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_sqr_comba8,#function
-.size   bn_sqr_comba8,(.-bn_sqr_comba8)
-
-.align  32
-
-.global bn_sqr_comba4
-/*
- * void bn_sqr_comba4(r,a)
- * BN_ULONG *r,*a;
- */
-bn_sqr_comba4:
-        save    %sp,FRAME_SIZE,%sp
-        ld      ap(0),a_0
-        umul    a_0,a_0,c_1     !sqr_add_c(a,0,c1,c2,c3);
-        ld      ap(1),a_1       !=
-        rd      %y,c_2
-        st      c_1,rp(0)       !r[0]=c1;
-
-        ld      ap(2),a_2
-        umul    a_0,a_1,t_1     !=!sqr_add_c2(a,1,0,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2
-        addxcc  %g0,t_2,c_3
-        addx    %g0,%g0,c_1     !=
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1     !=
-        st      c_2,rp(1)       !r[1]=c2;
-
-        umul    a_2,a_0,t_1     !sqr_add_c2(a,2,0,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2          !=
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1     !=
-        addx    c_2,%g0,c_2
-        ld      ap(3),a_3
-        umul    a_1,a_1,t_1     !sqr_add_c(a,1,c3,c1,c2);
-        addcc   c_3,t_1,c_3     !=
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(2)       !r[2]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_0,a_3,t_1     !sqr_add_c2(a,3,0,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    %g0,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        umul    a_1,a_2,t_1     !sqr_add_c2(a,2,1,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        addx    c_3,%g0,c_3
-        addcc   c_1,t_1,c_1
-        addxcc  c_2,t_2,c_2
-        addx    c_3,%g0,c_3     !=
-        st      c_1,rp(3)       !r[3]=c1;
-
-        umul    a_3,a_1,t_1     !sqr_add_c2(a,3,1,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    %g0,%g0,c_1
-        addcc   c_2,t_1,c_2
-        addxcc  c_3,t_2,c_3     !=
-        addx    c_1,%g0,c_1
-        umul    a_2,a_2,t_1     !sqr_add_c(a,2,c2,c3,c1);
-        addcc   c_2,t_1,c_2
-        rd      %y,t_2          !=
-        addxcc  c_3,t_2,c_3
-        addx    c_1,%g0,c_1
-        st      c_2,rp(4)       !r[4]=c2;
-
-        umul    a_2,a_3,t_1     !=!sqr_add_c2(a,3,2,c3,c1,c2);
-        addcc   c_3,t_1,c_3
-        rd      %y,t_2
-        addxcc  c_1,t_2,c_1
-        addx    %g0,%g0,c_2     !=
-        addcc   c_3,t_1,c_3
-        addxcc  c_1,t_2,c_1
-        st      c_3,rp(5)       !r[5]=c3;
-        addx    c_2,%g0,c_2     !=
-
-        umul    a_3,a_3,t_1     !sqr_add_c(a,3,c1,c2,c3);
-        addcc   c_1,t_1,c_1
-        rd      %y,t_2
-        addxcc  c_2,t_2,c_2     !=
-        st      c_1,rp(6)       !r[6]=c1;
-        st      c_2,rp(7)       !r[7]=c2;
-        
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_sqr_comba4,#function
-.size   bn_sqr_comba4,(.-bn_sqr_comba4)
-
-.align  32
diff --git a/src/lib/libcrypto/bn/asm/sparcv8plus.S b/src/lib/libcrypto/bn/asm/sparcv8plus.S
deleted file mode 100644
index 0074dfdb75..0000000000
--- a/src/lib/libcrypto/bn/asm/sparcv8plus.S
+++ /dev/null
@@ -1,1535 +0,0 @@
-.ident  "sparcv8plus.s, Version 1.4"
-.ident  "SPARC v9 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
-
-/*
- * ====================================================================
- * Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
- * project.
- *
- * Rights for redistribution and usage in source and binary forms are
- * granted according to the OpenSSL license. Warranty of any kind is
- * disclaimed.
- * ====================================================================
- */
-
-/*
- * This is my modest contributon to OpenSSL project (see
- * http://www.openssl.org/ for more information about it) and is
- * a drop-in UltraSPARC ISA replacement for crypto/bn/bn_asm.c
- * module. For updates see http://fy.chalmers.se/~appro/hpe/.
- *
- * Questions-n-answers.
- *
- * Q. How to compile?
- * A. With SC4.x/SC5.x:
- *
- *      cc -xarch=v8plus -c bn_asm.sparc.v8plus.S -o bn_asm.o
- *
- *    and with gcc:
- *
- *      gcc -mcpu=ultrasparc -c bn_asm.sparc.v8plus.S -o bn_asm.o
- *
- *    or if above fails (it does if you have gas installed):
- *
- *      gcc -E bn_asm.sparc.v8plus.S | as -xarch=v8plus /dev/fd/0 -o bn_asm.o
- *
- *    Quick-n-dirty way to fuse the module into the library.
- *    Provided that the library is already configured and built
- *    (in 0.9.2 case with no-asm option):
- *
- *      # cd crypto/bn
- *      # cp /some/place/bn_asm.sparc.v8plus.S .
- *      # cc -xarch=v8plus -c bn_asm.sparc.v8plus.S -o bn_asm.o
- *      # make
- *      # cd ../..
- *      # make; make test
- *
- *    Quick-n-dirty way to get rid of it:
- *
- *      # cd crypto/bn
- *      # touch bn_asm.c
- *      # make
- *      # cd ../..
- *      # make; make test
- *
- * Q. V8plus achitecture? What kind of beast is that?
- * A. Well, it's rather a programming model than an architecture...
- *    It's actually v9-compliant, i.e. *any* UltraSPARC, CPU under
- *    special conditions, namely when kernel doesn't preserve upper
- *    32 bits of otherwise 64-bit registers during a context switch.
- *
- * Q. Why just UltraSPARC? What about SuperSPARC?
- * A. Original release did target UltraSPARC only. Now SuperSPARC
- *    version is provided along. Both version share bn_*comba[48]
- *    implementations (see comment later in code for explanation).
- *    But what's so special about this UltraSPARC implementation?
- *    Why didn't I let compiler do the job? Trouble is that most of
- *    available compilers (well, SC5.0 is the only exception) don't
- *    attempt to take advantage of UltraSPARC's 64-bitness under
- *    32-bit kernels even though it's perfectly possible (see next
- *    question).
- *
- * Q. 64-bit registers under 32-bit kernels? Didn't you just say it
- *    doesn't work?
- * A. You can't adress *all* registers as 64-bit wide:-( The catch is
- *    that you actually may rely upon %o0-%o5 and %g1-%g4 being fully
- *    preserved if you're in a leaf function, i.e. such never calling
- *    any other functions. All functions in this module are leaf and
- *    10 registers is a handful. And as a matter of fact none-"comba"
- *    routines don't require even that much and I could even afford to
- *    not allocate own stack frame for 'em:-)
- *
- * Q. What about 64-bit kernels?
- * A. What about 'em? Just kidding:-) Pure 64-bit version is currently
- *    under evaluation and development...
- *
- * Q. What about shared libraries?
- * A. What about 'em? Kidding again:-) Code does *not* contain any
- *    code position dependencies and it's safe to include it into
- *    shared library as is.
- *
- * Q. How much faster does it go?
- * A. Do you have a good benchmark? In either case below is what I
- *    experience with crypto/bn/expspeed.c test program:
- *
- *      v8plus module on U10/300MHz against bn_asm.c compiled with:
- *
- *      cc-5.0 -xarch=v8plus -xO5 -xdepend      +7-12%
- *      cc-4.2 -xarch=v8plus -xO5 -xdepend      +25-35%
- *      egcs-1.1.2 -mcpu=ultrasparc -O3         +35-45%
- *
- *      v8 module on SS10/60MHz against bn_asm.c compiled with:
- *
- *      cc-5.0 -xarch=v8 -xO5 -xdepend          +7-10%
- *      cc-4.2 -xarch=v8 -xO5 -xdepend          +10%
- *      egcs-1.1.2 -mv8 -O3                     +35-45%
- *
- *    As you can see it's damn hard to beat the new Sun C compiler
- *    and it's in first place GNU C users who will appreciate this
- *    assembler implementation:-)       
- */
-
-/*
- * Revision history.
- *
- * 1.0  - initial release;
- * 1.1  - new loop unrolling model(*);
- *      - some more fine tuning;
- * 1.2  - made gas friendly;
- *      - updates to documentation concerning v9;
- *      - new performance comparison matrix;
- * 1.3  - fixed problem with /usr/ccs/lib/cpp;
- * 1.4  - native V9 bn_*_comba[48] implementation (15% more efficient)
- *        resulting in slight overall performance kick;
- *      - some retunes;
- *      - support for GNU as added;
- *
- * (*)  Originally unrolled loop looked like this:
- *          for (;;) {
- *              op(p+0); if (--n==0) break;
- *              op(p+1); if (--n==0) break;
- *              op(p+2); if (--n==0) break;
- *              op(p+3); if (--n==0) break;
- *              p+=4;
- *          }
- *      I unroll according to following:
- *          while (n&~3) {
- *              op(p+0); op(p+1); op(p+2); op(p+3);
- *              p+=4; n=-4;
- *          }
- *          if (n) {
- *              op(p+0); if (--n==0) return;
- *              op(p+2); if (--n==0) return;
- *              op(p+3); return;
- *          }
- */
-
-/*
- * GNU assembler can't stand stuw:-(
- */
-#define stuw st
-
-.section        ".text",#alloc,#execinstr
-.file           "bn_asm.sparc.v8plus.S"
-
-.align  32
-
-.global bn_mul_add_words
-/*
- * BN_ULONG bn_mul_add_words(rp,ap,num,w)
- * BN_ULONG *rp,*ap;
- * int num;
- * BN_ULONG w;
- */
-bn_mul_add_words:
-        brgz,a  %o2,.L_bn_mul_add_words_proceed
-        lduw    [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_mul_add_words_proceed:
-        srl     %o3,%g0,%o3     ! clruw %o3
-        andcc   %o2,-4,%g0
-        bz,pn   %icc,.L_bn_mul_add_words_tail
-        clr     %o5
-
-.L_bn_mul_add_words_loop:       ! wow! 32 aligned!
-        lduw    [%o0],%g1
-        lduw    [%o1+4],%g3
-        mulx    %o3,%g2,%g2
-        add     %g1,%o5,%o4
-        nop
-        add     %o4,%g2,%o4
-        stuw    %o4,[%o0]
-        srlx    %o4,32,%o5
-
-        lduw    [%o0+4],%g1
-        lduw    [%o1+8],%g2
-        mulx    %o3,%g3,%g3
-        add     %g1,%o5,%o4
-        dec     4,%o2
-        add     %o4,%g3,%o4
-        stuw    %o4,[%o0+4]
-        srlx    %o4,32,%o5
-
-        lduw    [%o0+8],%g1
-        lduw    [%o1+12],%g3
-        mulx    %o3,%g2,%g2
-        add     %g1,%o5,%o4
-        inc     16,%o1
-        add     %o4,%g2,%o4
-        stuw    %o4,[%o0+8]
-        srlx    %o4,32,%o5
-
-        lduw    [%o0+12],%g1
-        mulx    %o3,%g3,%g3
-        add     %g1,%o5,%o4
-        inc     16,%o0
-        add     %o4,%g3,%o4
-        andcc   %o2,-4,%g0
-        stuw    %o4,[%o0-4]
-        srlx    %o4,32,%o5
-        bnz,a,pt        %icc,.L_bn_mul_add_words_loop
-        lduw    [%o1],%g2
-
-        brnz,a,pn       %o2,.L_bn_mul_add_words_tail
-        lduw    [%o1],%g2
-.L_bn_mul_add_words_return:
-        retl
-        mov     %o5,%o0
-
-.L_bn_mul_add_words_tail:
-        lduw    [%o0],%g1
-        mulx    %o3,%g2,%g2
-        add     %g1,%o5,%o4
-        dec     %o2
-        add     %o4,%g2,%o4
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_mul_add_words_return
-        stuw    %o4,[%o0]
-
-        lduw    [%o1+4],%g2
-        lduw    [%o0+4],%g1
-        mulx    %o3,%g2,%g2
-        add     %g1,%o5,%o4
-        dec     %o2
-        add     %o4,%g2,%o4
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_mul_add_words_return
-        stuw    %o4,[%o0+4]
-
-        lduw    [%o1+8],%g2
-        lduw    [%o0+8],%g1
-        mulx    %o3,%g2,%g2
-        add     %g1,%o5,%o4
-        add     %o4,%g2,%o4
-        stuw    %o4,[%o0+8]
-        retl
-        srlx    %o4,32,%o0
-
-.type   bn_mul_add_words,#function
-.size   bn_mul_add_words,(.-bn_mul_add_words)
-
-.align  32
-
-.global bn_mul_words
-/*
- * BN_ULONG bn_mul_words(rp,ap,num,w)
- * BN_ULONG *rp,*ap;
- * int num;
- * BN_ULONG w;
- */
-bn_mul_words:
-        brgz,a  %o2,.L_bn_mul_words_proceeed
-        lduw    [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_mul_words_proceeed:
-        srl     %o3,%g0,%o3     ! clruw %o3
-        andcc   %o2,-4,%g0
-        bz,pn   %icc,.L_bn_mul_words_tail
-        clr     %o5
-
-.L_bn_mul_words_loop:           ! wow! 32 aligned!
-        lduw    [%o1+4],%g3
-        mulx    %o3,%g2,%g2
-        add     %g2,%o5,%o4
-        nop
-        stuw    %o4,[%o0]
-        srlx    %o4,32,%o5
-
-        lduw    [%o1+8],%g2
-        mulx    %o3,%g3,%g3
-        add     %g3,%o5,%o4
-        dec     4,%o2
-        stuw    %o4,[%o0+4]
-        srlx    %o4,32,%o5
-
-        lduw    [%o1+12],%g3
-        mulx    %o3,%g2,%g2
-        add     %g2,%o5,%o4
-        inc     16,%o1
-        stuw    %o4,[%o0+8]
-        srlx    %o4,32,%o5
-
-        mulx    %o3,%g3,%g3
-        add     %g3,%o5,%o4
-        inc     16,%o0
-        stuw    %o4,[%o0-4]
-        srlx    %o4,32,%o5
-        andcc   %o2,-4,%g0
-        bnz,a,pt        %icc,.L_bn_mul_words_loop
-        lduw    [%o1],%g2
-        nop
-        nop
-
-        brnz,a,pn       %o2,.L_bn_mul_words_tail
-        lduw    [%o1],%g2
-.L_bn_mul_words_return:
-        retl
-        mov     %o5,%o0
-
-.L_bn_mul_words_tail:
-        mulx    %o3,%g2,%g2
-        add     %g2,%o5,%o4
-        dec     %o2
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_mul_words_return
-        stuw    %o4,[%o0]
-
-        lduw    [%o1+4],%g2
-        mulx    %o3,%g2,%g2
-        add     %g2,%o5,%o4
-        dec     %o2
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_mul_words_return
-        stuw    %o4,[%o0+4]
-
-        lduw    [%o1+8],%g2
-        mulx    %o3,%g2,%g2
-        add     %g2,%o5,%o4
-        stuw    %o4,[%o0+8]
-        retl
-        srlx    %o4,32,%o0
-
-.type   bn_mul_words,#function
-.size   bn_mul_words,(.-bn_mul_words)
-
-.align  32
-.global bn_sqr_words
-/*
- * void bn_sqr_words(r,a,n)
- * BN_ULONG *r,*a;
- * int n;
- */
-bn_sqr_words:
-        brgz,a  %o2,.L_bn_sqr_words_proceeed
-        lduw    [%o1],%g2
-        retl
-        clr     %o0
-
-.L_bn_sqr_words_proceeed:
-        andcc   %o2,-4,%g0
-        nop
-        bz,pn   %icc,.L_bn_sqr_words_tail
-        nop
-
-.L_bn_sqr_words_loop:           ! wow! 32 aligned!
-        lduw    [%o1+4],%g3
-        mulx    %g2,%g2,%o4
-        stuw    %o4,[%o0]
-        srlx    %o4,32,%o5
-        stuw    %o5,[%o0+4]
-        nop
-
-        lduw    [%o1+8],%g2
-        mulx    %g3,%g3,%o4
-        dec     4,%o2
-        stuw    %o4,[%o0+8]
-        srlx    %o4,32,%o5
-        stuw    %o5,[%o0+12]
-
-        lduw    [%o1+12],%g3
-        mulx    %g2,%g2,%o4
-        srlx    %o4,32,%o5
-        stuw    %o4,[%o0+16]
-        inc     16,%o1
-        stuw    %o5,[%o0+20]
-
-        mulx    %g3,%g3,%o4
-        inc     32,%o0
-        stuw    %o4,[%o0-8]
-        srlx    %o4,32,%o5
-        andcc   %o2,-4,%g2
-        stuw    %o5,[%o0-4]
-        bnz,a,pt        %icc,.L_bn_sqr_words_loop
-        lduw    [%o1],%g2
-        nop
-
-        brnz,a,pn       %o2,.L_bn_sqr_words_tail
-        lduw    [%o1],%g2
-.L_bn_sqr_words_return:
-        retl
-        clr     %o0
-
-.L_bn_sqr_words_tail:
-        mulx    %g2,%g2,%o4
-        dec     %o2
-        stuw    %o4,[%o0]
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_sqr_words_return
-        stuw    %o5,[%o0+4]
-
-        lduw    [%o1+4],%g2
-        mulx    %g2,%g2,%o4
-        dec     %o2
-        stuw    %o4,[%o0+8]
-        srlx    %o4,32,%o5
-        brz,pt  %o2,.L_bn_sqr_words_return
-        stuw    %o5,[%o0+12]
-
-        lduw    [%o1+8],%g2
-        mulx    %g2,%g2,%o4
-        srlx    %o4,32,%o5
-        stuw    %o4,[%o0+16]
-        stuw    %o5,[%o0+20]
-        retl
-        clr     %o0
-
-.type   bn_sqr_words,#function
-.size   bn_sqr_words,(.-bn_sqr_words)
-
-.align  32
-.global bn_div_words
-/*
- * BN_ULONG bn_div_words(h,l,d)
- * BN_ULONG h,l,d;
- */
-bn_div_words:
-        sllx    %o0,32,%o0
-        or      %o0,%o1,%o0
-        udivx   %o0,%o2,%o0
-        retl
-        srl     %o0,%g0,%o0     ! clruw %o0
-
-.type   bn_div_words,#function
-.size   bn_div_words,(.-bn_div_words)
-
-.align  32
-
-.global bn_add_words
-/*
- * BN_ULONG bn_add_words(rp,ap,bp,n)
- * BN_ULONG *rp,*ap,*bp;
- * int n;
- */
-bn_add_words:
-        brgz,a  %o3,.L_bn_add_words_proceed
-        lduw    [%o1],%o4
-        retl
-        clr     %o0
-
-.L_bn_add_words_proceed:
-        andcc   %o3,-4,%g0
-        bz,pn   %icc,.L_bn_add_words_tail
-        addcc   %g0,0,%g0       ! clear carry flag
-        nop
-
-.L_bn_add_words_loop:           ! wow! 32 aligned!
-        dec     4,%o3
-        lduw    [%o2],%o5
-        lduw    [%o1+4],%g1
-        lduw    [%o2+4],%g2
-        lduw    [%o1+8],%g3
-        lduw    [%o2+8],%g4
-        addccc  %o5,%o4,%o5
-        stuw    %o5,[%o0]
-
-        lduw    [%o1+12],%o4
-        lduw    [%o2+12],%o5
-        inc     16,%o1
-        addccc  %g1,%g2,%g1
-        stuw    %g1,[%o0+4]
-        
-        inc     16,%o2
-        addccc  %g3,%g4,%g3
-        stuw    %g3,[%o0+8]
-
-        inc     16,%o0
-        addccc  %o5,%o4,%o5
-        stuw    %o5,[%o0-4]
-        and     %o3,-4,%g1
-        brnz,a,pt       %g1,.L_bn_add_words_loop
-        lduw    [%o1],%o4
-
-        brnz,a,pn       %o3,.L_bn_add_words_tail
-        lduw    [%o1],%o4
-.L_bn_add_words_return:
-        clr     %o0
-        retl
-        movcs   %icc,1,%o0
-        nop
-
-.L_bn_add_words_tail:
-        lduw    [%o2],%o5
-        dec     %o3
-        addccc  %o5,%o4,%o5
-        brz,pt  %o3,.L_bn_add_words_return
-        stuw    %o5,[%o0]
-
-        lduw    [%o1+4],%o4
-        lduw    [%o2+4],%o5
-        dec     %o3
-        addccc  %o5,%o4,%o5
-        brz,pt  %o3,.L_bn_add_words_return
-        stuw    %o5,[%o0+4]
-
-        lduw    [%o1+8],%o4
-        lduw    [%o2+8],%o5
-        addccc  %o5,%o4,%o5
-        stuw    %o5,[%o0+8]
-        clr     %o0
-        retl
-        movcs   %icc,1,%o0
-
-.type   bn_add_words,#function
-.size   bn_add_words,(.-bn_add_words)
-
-.global bn_sub_words
-/*
- * BN_ULONG bn_sub_words(rp,ap,bp,n)
- * BN_ULONG *rp,*ap,*bp;
- * int n;
- */
-bn_sub_words:
-        brgz,a  %o3,.L_bn_sub_words_proceed
-        lduw    [%o1],%o4
-        retl
-        clr     %o0
-
-.L_bn_sub_words_proceed:
-        andcc   %o3,-4,%g0
-        bz,pn   %icc,.L_bn_sub_words_tail
-        addcc   %g0,0,%g0       ! clear carry flag
-        nop
-
-.L_bn_sub_words_loop:           ! wow! 32 aligned!
-        dec     4,%o3
-        lduw    [%o2],%o5
-        lduw    [%o1+4],%g1
-        lduw    [%o2+4],%g2
-        lduw    [%o1+8],%g3
-        lduw    [%o2+8],%g4
-        subccc  %o4,%o5,%o5
-        stuw    %o5,[%o0]
-
-        lduw    [%o1+12],%o4
-        lduw    [%o2+12],%o5
-        inc     16,%o1
-        subccc  %g1,%g2,%g2
-        stuw    %g2,[%o0+4]
-
-        inc     16,%o2
-        subccc  %g3,%g4,%g4
-        stuw    %g4,[%o0+8]
-
-        inc     16,%o0
-        subccc  %o4,%o5,%o5
-        stuw    %o5,[%o0-4]
-        and     %o3,-4,%g1
-        brnz,a,pt       %g1,.L_bn_sub_words_loop
-        lduw    [%o1],%o4
-
-        brnz,a,pn       %o3,.L_bn_sub_words_tail
-        lduw    [%o1],%o4
-.L_bn_sub_words_return:
-        clr     %o0
-        retl
-        movcs   %icc,1,%o0
-        nop
-
-.L_bn_sub_words_tail:           ! wow! 32 aligned!
-        lduw    [%o2],%o5
-        dec     %o3
-        subccc  %o4,%o5,%o5
-        brz,pt  %o3,.L_bn_sub_words_return
-        stuw    %o5,[%o0]
-
-        lduw    [%o1+4],%o4
-        lduw    [%o2+4],%o5
-        dec     %o3
-        subccc  %o4,%o5,%o5
-        brz,pt  %o3,.L_bn_sub_words_return
-        stuw    %o5,[%o0+4]
-
-        lduw    [%o1+8],%o4
-        lduw    [%o2+8],%o5
-        subccc  %o4,%o5,%o5
-        stuw    %o5,[%o0+8]
-        clr     %o0
-        retl
-        movcs   %icc,1,%o0
-
-.type   bn_sub_words,#function
-.size   bn_sub_words,(.-bn_sub_words)
-
-/*
- * Code below depends on the fact that upper parts of the %l0-%l7
- * and %i0-%i7 are zeroed by kernel after context switch. In
- * previous versions this comment stated that "the trouble is that
- * it's not feasible to implement the mumbo-jumbo in less V9
- * instructions:-(" which apparently isn't true thanks to
- * 'bcs,a %xcc,.+8; inc %rd' pair. But the performance improvement
- * results not from the shorter code, but from elimination of
- * multicycle none-pairable 'rd %y,%rd' instructions.
- *
- *                                                      Andy.
- */
-
-#define FRAME_SIZE      -96
-
-/*
- * Here is register usage map for *all* routines below.
- */
-#define t_1     %o0
-#define t_2     %o1
-#define c_12    %o2
-#define c_3     %o3
-
-#define ap(I)   [%i1+4*I]
-#define bp(I)   [%i2+4*I]
-#define rp(I)   [%i0+4*I]
-
-#define a_0     %l0
-#define a_1     %l1
-#define a_2     %l2
-#define a_3     %l3
-#define a_4     %l4
-#define a_5     %l5
-#define a_6     %l6
-#define a_7     %l7
-
-#define b_0     %i3
-#define b_1     %i4
-#define b_2     %i5
-#define b_3     %o4
-#define b_4     %o5
-#define b_5     %o7
-#define b_6     %g1
-#define b_7     %g4
-
-.align  32
-.global bn_mul_comba8
-/*
- * void bn_mul_comba8(r,a,b)
- * BN_ULONG *r,*a,*b;
- */
-bn_mul_comba8:
-        save    %sp,FRAME_SIZE,%sp
-        mov     1,t_2
-        lduw    ap(0),a_0
-        sllx    t_2,32,t_2
-        lduw    bp(0),b_0       !=
-        lduw    bp(1),b_1
-        mulx    a_0,b_0,t_1     !mul_add_c(a[0],b[0],c1,c2,c3);
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(0)       !=!r[0]=c1;
-
-        lduw    ap(1),a_1
-        mulx    a_0,b_1,t_1     !mul_add_c(a[0],b[1],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3             !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(2),a_2
-        mulx    a_1,b_0,t_1     !=!mul_add_c(a[1],b[0],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(1)       !r[1]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,b_0,t_1     !mul_add_c(a[2],b[0],c3,c1,c2);
-        addcc   c_12,t_1,c_12   !=
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    bp(2),b_2       !=
-        mulx    a_1,b_1,t_1     !mul_add_c(a[1],b[1],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        lduw    bp(3),b_3
-        mulx    a_0,b_2,t_1     !mul_add_c(a[0],b[2],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(2)       !r[2]=c3;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_0,b_3,t_1     !mul_add_c(a[0],b[3],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_1,b_2,t_1     !=!mul_add_c(a[1],b[2],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        lduw    ap(3),a_3
-        mulx    a_2,b_1,t_1     !mul_add_c(a[2],b[1],c1,c2,c3);
-        addcc   c_12,t_1,c_12   !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(4),a_4
-        mulx    a_3,b_0,t_1     !=!mul_add_c(a[3],b[0],c1,c2,c3);!=
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(3)       !r[3]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_4,b_0,t_1     !mul_add_c(a[4],b[0],c2,c3,c1);
-        addcc   c_12,t_1,c_12   !=
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,b_1,t_1     !=!mul_add_c(a[3],b[1],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_2,b_2,t_1     !=!mul_add_c(a[2],b[2],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    bp(4),b_4       !=
-        mulx    a_1,b_3,t_1     !mul_add_c(a[1],b[3],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        lduw    bp(5),b_5
-        mulx    a_0,b_4,t_1     !mul_add_c(a[0],b[4],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(4)       !r[4]=c2;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_0,b_5,t_1     !mul_add_c(a[0],b[5],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_1,b_4,t_1     !mul_add_c(a[1],b[4],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_2,b_3,t_1     !mul_add_c(a[2],b[3],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_3,b_2,t_1     !mul_add_c(a[3],b[2],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        lduw    ap(5),a_5
-        mulx    a_4,b_1,t_1     !mul_add_c(a[4],b[1],c3,c1,c2);
-        addcc   c_12,t_1,c_12   !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(6),a_6
-        mulx    a_5,b_0,t_1     !=!mul_add_c(a[5],b[0],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(5)       !r[5]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_6,b_0,t_1     !mul_add_c(a[6],b[0],c1,c2,c3);
-        addcc   c_12,t_1,c_12   !=
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_5,b_1,t_1     !=!mul_add_c(a[5],b[1],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_4,b_2,t_1     !=!mul_add_c(a[4],b[2],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,b_3,t_1     !=!mul_add_c(a[3],b[3],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_2,b_4,t_1     !=!mul_add_c(a[2],b[4],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    bp(6),b_6       !=
-        mulx    a_1,b_5,t_1     !mul_add_c(a[1],b[5],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        lduw    bp(7),b_7
-        mulx    a_0,b_6,t_1     !mul_add_c(a[0],b[6],c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(6)       !r[6]=c1;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_0,b_7,t_1     !mul_add_c(a[0],b[7],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_1,b_6,t_1     !mul_add_c(a[1],b[6],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_2,b_5,t_1     !mul_add_c(a[2],b[5],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_3,b_4,t_1     !mul_add_c(a[3],b[4],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_4,b_3,t_1     !mul_add_c(a[4],b[3],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_5,b_2,t_1     !mul_add_c(a[5],b[2],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        lduw    ap(7),a_7
-        mulx    a_6,b_1,t_1     !=!mul_add_c(a[6],b[1],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_7,b_0,t_1     !=!mul_add_c(a[7],b[0],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(7)       !r[7]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_7,b_1,t_1     !=!mul_add_c(a[7],b[1],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_6,b_2,t_1     !mul_add_c(a[6],b[2],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_5,b_3,t_1     !mul_add_c(a[5],b[3],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_4,b_4,t_1     !mul_add_c(a[4],b[4],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_3,b_5,t_1     !mul_add_c(a[3],b[5],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_2,b_6,t_1     !mul_add_c(a[2],b[6],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_1,b_7,t_1     !mul_add_c(a[1],b[7],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(8)       !r[8]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,b_7,t_1     !=!mul_add_c(a[2],b[7],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        mulx    a_3,b_6,t_1     !mul_add_c(a[3],b[6],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_4,b_5,t_1     !mul_add_c(a[4],b[5],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_5,b_4,t_1     !mul_add_c(a[5],b[4],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_6,b_3,t_1     !mul_add_c(a[6],b[3],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_7,b_2,t_1     !mul_add_c(a[7],b[2],c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(9)       !r[9]=c1;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_7,b_3,t_1     !mul_add_c(a[7],b[3],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_6,b_4,t_1     !mul_add_c(a[6],b[4],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_5,b_5,t_1     !mul_add_c(a[5],b[5],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_4,b_6,t_1     !mul_add_c(a[4],b[6],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_3,b_7,t_1     !mul_add_c(a[3],b[7],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(10)      !r[10]=c2;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_4,b_7,t_1     !mul_add_c(a[4],b[7],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_5,b_6,t_1     !mul_add_c(a[5],b[6],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_6,b_5,t_1     !mul_add_c(a[6],b[5],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_7,b_4,t_1     !mul_add_c(a[7],b[4],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(11)      !r[11]=c3;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_7,b_5,t_1     !mul_add_c(a[7],b[5],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_6,b_6,t_1     !mul_add_c(a[6],b[6],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_5,b_7,t_1     !mul_add_c(a[5],b[7],c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(12)      !r[12]=c1;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_6,b_7,t_1     !mul_add_c(a[6],b[7],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_7,b_6,t_1     !mul_add_c(a[7],b[6],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        st      t_1,rp(13)      !r[13]=c2;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_7,b_7,t_1     !mul_add_c(a[7],b[7],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(14)      !r[14]=c3;
-        stuw    c_12,rp(15)     !r[15]=c1;
-
-        ret
-        restore %g0,%g0,%o0     !=
-
-.type   bn_mul_comba8,#function
-.size   bn_mul_comba8,(.-bn_mul_comba8)
-
-.align  32
-
-.global bn_mul_comba4
-/*
- * void bn_mul_comba4(r,a,b)
- * BN_ULONG *r,*a,*b;
- */
-bn_mul_comba4:
-        save    %sp,FRAME_SIZE,%sp
-        lduw    ap(0),a_0
-        mov     1,t_2
-        lduw    bp(0),b_0
-        sllx    t_2,32,t_2      !=
-        lduw    bp(1),b_1
-        mulx    a_0,b_0,t_1     !mul_add_c(a[0],b[0],c1,c2,c3);
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(0)       !=!r[0]=c1;
-
-        lduw    ap(1),a_1
-        mulx    a_0,b_1,t_1     !mul_add_c(a[0],b[1],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3             !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(2),a_2
-        mulx    a_1,b_0,t_1     !=!mul_add_c(a[1],b[0],c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(1)       !r[1]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,b_0,t_1     !mul_add_c(a[2],b[0],c3,c1,c2);
-        addcc   c_12,t_1,c_12   !=
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    bp(2),b_2       !=
-        mulx    a_1,b_1,t_1     !mul_add_c(a[1],b[1],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3     !=
-        lduw    bp(3),b_3
-        mulx    a_0,b_2,t_1     !mul_add_c(a[0],b[2],c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(2)       !r[2]=c3;
-        or      c_12,c_3,c_12   !=
-
-        mulx    a_0,b_3,t_1     !mul_add_c(a[0],b[3],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        mulx    a_1,b_2,t_1     !mul_add_c(a[1],b[2],c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8        !=
-        add     c_3,t_2,c_3
-        lduw    ap(3),a_3
-        mulx    a_2,b_1,t_1     !mul_add_c(a[2],b[1],c1,c2,c3);
-        addcc   c_12,t_1,c_12   !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,b_0,t_1     !mul_add_c(a[3],b[0],c1,c2,c3);!=
-        addcc   c_12,t_1,t_1    !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(3)       !=!r[3]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_3,b_1,t_1     !mul_add_c(a[3],b[1],c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3             !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_2,b_2,t_1     !mul_add_c(a[2],b[2],c2,c3,c1);
-        addcc   c_12,t_1,c_12   !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_1,b_3,t_1     !mul_add_c(a[1],b[3],c2,c3,c1);
-        addcc   c_12,t_1,t_1    !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(4)       !=!r[4]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,b_3,t_1     !mul_add_c(a[2],b[3],c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3             !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,b_2,t_1     !mul_add_c(a[3],b[2],c3,c1,c2);
-        addcc   c_12,t_1,t_1    !=
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(5)       !=!r[5]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_3,b_3,t_1     !mul_add_c(a[3],b[3],c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        srlx    t_1,32,c_12     !=
-        stuw    t_1,rp(6)       !r[6]=c1;
-        stuw    c_12,rp(7)      !r[7]=c2;
-        
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_mul_comba4,#function
-.size   bn_mul_comba4,(.-bn_mul_comba4)
-
-.align  32
-
-.global bn_sqr_comba8
-bn_sqr_comba8:
-        save    %sp,FRAME_SIZE,%sp
-        mov     1,t_2
-        lduw    ap(0),a_0
-        sllx    t_2,32,t_2
-        lduw    ap(1),a_1
-        mulx    a_0,a_0,t_1     !sqr_add_c(a,0,c1,c2,c3);
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(0)       !r[0]=c1;
-
-        lduw    ap(2),a_2
-        mulx    a_0,a_1,t_1     !=!sqr_add_c2(a,1,0,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(1)       !r[1]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,a_0,t_1     !sqr_add_c2(a,2,0,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(3),a_3
-        mulx    a_1,a_1,t_1     !sqr_add_c(a,1,c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(2)       !r[2]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_0,a_3,t_1     !sqr_add_c2(a,3,0,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(4),a_4
-        mulx    a_1,a_2,t_1     !sqr_add_c2(a,2,1,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        st      t_1,rp(3)       !r[3]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_4,a_0,t_1     !sqr_add_c2(a,4,0,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,a_1,t_1     !sqr_add_c2(a,3,1,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(5),a_5
-        mulx    a_2,a_2,t_1     !sqr_add_c(a,2,c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(4)       !r[4]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_0,a_5,t_1     !sqr_add_c2(a,5,0,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_1,a_4,t_1     !sqr_add_c2(a,4,1,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(6),a_6
-        mulx    a_2,a_3,t_1     !sqr_add_c2(a,3,2,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(5)       !r[5]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_6,a_0,t_1     !sqr_add_c2(a,6,0,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_5,a_1,t_1     !sqr_add_c2(a,5,1,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_4,a_2,t_1     !sqr_add_c2(a,4,2,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(7),a_7
-        mulx    a_3,a_3,t_1     !=!sqr_add_c(a,3,c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(6)       !r[6]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_0,a_7,t_1     !sqr_add_c2(a,7,0,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_1,a_6,t_1     !sqr_add_c2(a,6,1,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_2,a_5,t_1     !sqr_add_c2(a,5,2,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,a_4,t_1     !sqr_add_c2(a,4,3,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(7)       !r[7]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_7,a_1,t_1     !sqr_add_c2(a,7,1,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_6,a_2,t_1     !sqr_add_c2(a,6,2,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_5,a_3,t_1     !sqr_add_c2(a,5,3,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_4,a_4,t_1     !sqr_add_c(a,4,c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(8)       !r[8]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,a_7,t_1     !sqr_add_c2(a,7,2,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_3,a_6,t_1     !sqr_add_c2(a,6,3,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_4,a_5,t_1     !sqr_add_c2(a,5,4,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(9)       !r[9]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_7,a_3,t_1     !sqr_add_c2(a,7,3,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_6,a_4,t_1     !sqr_add_c2(a,6,4,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_5,a_5,t_1     !sqr_add_c(a,5,c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(10)      !r[10]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_4,a_7,t_1     !sqr_add_c2(a,7,4,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_5,a_6,t_1     !sqr_add_c2(a,6,5,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(11)      !r[11]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_7,a_5,t_1     !sqr_add_c2(a,7,5,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_6,a_6,t_1     !sqr_add_c(a,6,c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(12)      !r[12]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_6,a_7,t_1     !sqr_add_c2(a,7,6,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(13)      !r[13]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_7,a_7,t_1     !sqr_add_c(a,7,c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(14)      !r[14]=c3;
-        stuw    c_12,rp(15)     !r[15]=c1;
-
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_sqr_comba8,#function
-.size   bn_sqr_comba8,(.-bn_sqr_comba8)
-
-.align  32
-
-.global bn_sqr_comba4
-/*
- * void bn_sqr_comba4(r,a)
- * BN_ULONG *r,*a;
- */
-bn_sqr_comba4:
-        save    %sp,FRAME_SIZE,%sp
-        mov     1,t_2
-        lduw    ap(0),a_0
-        sllx    t_2,32,t_2
-        lduw    ap(1),a_1
-        mulx    a_0,a_0,t_1     !sqr_add_c(a,0,c1,c2,c3);
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(0)       !r[0]=c1;
-
-        lduw    ap(2),a_2
-        mulx    a_0,a_1,t_1     !sqr_add_c2(a,1,0,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(1)       !r[1]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,a_0,t_1     !sqr_add_c2(a,2,0,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        lduw    ap(3),a_3
-        mulx    a_1,a_1,t_1     !sqr_add_c(a,1,c3,c1,c2);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(2)       !r[2]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_0,a_3,t_1     !sqr_add_c2(a,3,0,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_1,a_2,t_1     !sqr_add_c2(a,2,1,c1,c2,c3);
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(3)       !r[3]=c1;
-        or      c_12,c_3,c_12
-
-        mulx    a_3,a_1,t_1     !sqr_add_c2(a,3,1,c2,c3,c1);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,c_12
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        mulx    a_2,a_2,t_1     !sqr_add_c(a,2,c2,c3,c1);
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(4)       !r[4]=c2;
-        or      c_12,c_3,c_12
-
-        mulx    a_2,a_3,t_1     !sqr_add_c2(a,3,2,c3,c1,c2);
-        addcc   c_12,t_1,c_12
-        clr     c_3
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        addcc   c_12,t_1,t_1
-        bcs,a   %xcc,.+8
-        add     c_3,t_2,c_3
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(5)       !r[5]=c3;
-        or      c_12,c_3,c_12
-
-        mulx    a_3,a_3,t_1     !sqr_add_c(a,3,c1,c2,c3);
-        addcc   c_12,t_1,t_1
-        srlx    t_1,32,c_12
-        stuw    t_1,rp(6)       !r[6]=c1;
-        stuw    c_12,rp(7)      !r[7]=c2;
-        
-        ret
-        restore %g0,%g0,%o0
-
-.type   bn_sqr_comba4,#function
-.size   bn_sqr_comba4,(.-bn_sqr_comba4)
-
-.align  32
diff --git a/src/lib/libcrypto/bn/asm/x86.pl b/src/lib/libcrypto/bn/asm/x86.pl
deleted file mode 100644
index 1bc4f1bb27..0000000000
--- a/src/lib/libcrypto/bn/asm/x86.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/local/bin/perl
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-require("x86/mul_add.pl");
-require("x86/mul.pl");
-require("x86/sqr.pl");
-require("x86/div.pl");
-require("x86/add.pl");
-require("x86/sub.pl");
-require("x86/comba.pl");
-
-&asm_init($ARGV[0],$0);
-
-&bn_mul_add_words("bn_mul_add_words");
-&bn_mul_words("bn_mul_words");
-&bn_sqr_words("bn_sqr_words");
-&bn_div_words("bn_div_words");
-&bn_add_words("bn_add_words");
-&bn_sub_words("bn_sub_words");
-&bn_mul_comba("bn_mul_comba8",8);
-&bn_mul_comba("bn_mul_comba4",4);
-&bn_sqr_comba("bn_sqr_comba8",8);
-&bn_sqr_comba("bn_sqr_comba4",4);
-
-&asm_finish();
-
diff --git a/src/lib/libcrypto/bn/asm/x86/add.pl b/src/lib/libcrypto/bn/asm/x86/add.pl
deleted file mode 100644
index 0b5cf583e3..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/add.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_add_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $a="esi";
-        $b="edi";
-        $c="eax";
-        $r="ebx";
-        $tmp1="ecx";
-        $tmp2="edx";
-        $num="ebp";
-
-        &mov($r,&wparam(0));    # get r
-         &mov($a,&wparam(1));   # get a
-        &mov($b,&wparam(2));    # get b
-         &mov($num,&wparam(3)); # get num
-        &xor($c,$c);            # clear carry
-         &and($num,0xfffffff8); # num / 8
-
-        &jz(&label("aw_finish"));
-
-        &set_label("aw_loop",0);
-        for ($i=0; $i<8; $i++)
-                {
-                &comment("Round $i");
-
-                &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-                &add($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &add($tmp1,$tmp2);
-                &adc($c,0);
-                 &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-                }
-
-        &comment("");
-        &add($a,32);
-         &add($b,32);
-        &add($r,32);
-         &sub($num,8);
-        &jnz(&label("aw_loop"));
-
-        &set_label("aw_finish",0);
-        &mov($num,&wparam(3));  # get num
-        &and($num,7);
-         &jz(&label("aw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-                &add($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &add($tmp1,$tmp2);
-                &adc($c,0);
-                 &dec($num) if ($i != 6);
-                &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                 &jz(&label("aw_end")) if ($i != 6);
-                }
-        &set_label("aw_end",0);
-
-#       &mov("eax",$c);         # $c is "eax"
-
-        &function_end($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/comba.pl b/src/lib/libcrypto/bn/asm/x86/comba.pl
deleted file mode 100644
index 2291253629..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/comba.pl
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub mul_add_c
-        {
-        local($a,$ai,$b,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("mul a[$ai]*b[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$b,"",0));
-
-        &mul("edx");
-        &add($c0,"eax");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # laod next a
-         &mov("eax",&wparam(0)) if $pos > 0;                    # load r[]
-         ###
-        &adc($c1,"edx");
-         &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0;        # laod next b
-         &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1;        # laod next b
-         ###
-        &adc($c2,0);
-         # is pos > 1, it means it is the last loop 
-         &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0;           # save r[];
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # laod next a
-        }
-
-sub sqr_add_c
-        {
-        local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("sqr a[$ai]*a[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$b,"",0));
-
-        if ($ai == $bi)
-                { &mul("eax");}
-        else
-                { &mul("edx");}
-        &add($c0,"eax");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-         ###
-        &adc($c1,"edx");
-         &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos == 1) && ($na != $nb);
-         ###
-        &adc($c2,0);
-         # is pos > 1, it means it is the last loop 
-         &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;              # save r[];
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # load next b
-        }
-
-sub sqr_add_c2
-        {
-        local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-        # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-        # words, and 1 if load return value
-
-        &comment("sqr a[$ai]*a[$bi]");
-
-        # "eax" and "edx" will always be pre-loaded.
-        # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-        # &mov("edx",&DWP($bi*4,$a,"",0));
-
-        if ($ai == $bi)
-                { &mul("eax");}
-        else
-                { &mul("edx");}
-        &add("eax","eax");
-         ###
-        &adc("edx","edx");
-         ###
-        &adc($c2,0);
-         &add($c0,"eax");
-        &adc($c1,"edx");
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-         &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;        # load next b
-        &adc($c2,0);
-        &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;               # save r[];
-         &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos <= 1) && ($na != $nb);
-         ###
-        }
-
-sub bn_mul_comba
-        {
-        local($name,$num)=@_;
-        local($a,$b,$c0,$c1,$c2);
-        local($i,$as,$ae,$bs,$be,$ai,$bi);
-        local($tot,$end);
-
-        &function_begin_B($name,"");
-
-        $c0="ebx";
-        $c1="ecx";
-        $c2="ebp";
-        $a="esi";
-        $b="edi";
-        
-        $as=0;
-        $ae=0;
-        $bs=0;
-        $be=0;
-        $tot=$num+$num-1;
-
-        &push("esi");
-         &mov($a,&wparam(1));
-        &push("edi");
-         &mov($b,&wparam(2));
-        &push("ebp");
-         &push("ebx");
-
-        &xor($c0,$c0);
-         &mov("eax",&DWP(0,$a,"",0));   # load the first word 
-        &xor($c1,$c1);
-         &mov("edx",&DWP(0,$b,"",0));   # load the first second 
-
-        for ($i=0; $i<$tot; $i++)
-                {
-                $ai=$as;
-                $bi=$bs;
-                $end=$be+1;
-
-                &comment("################## Calculate word $i"); 
-
-                for ($j=$bs; $j<$end; $j++)
-                        {
-                        &xor($c2,$c2) if ($j == $bs);
-                        if (($j+1) == $end)
-                                {
-                                $v=1;
-                                $v=2 if (($i+1) == $tot);
-                                }
-                        else
-                                { $v=0; }
-                        if (($j+1) != $end)
-                                {
-                                $na=($ai-1);
-                                $nb=($bi+1);
-                                }
-                        else
-                                {
-                                $na=$as+($i < ($num-1));
-                                $nb=$bs+($i >= ($num-1));
-                                }
-#printf STDERR "[$ai,$bi] -> [$na,$nb]\n";
-                        &mul_add_c($a,$ai,$b,$bi,$c0,$c1,$c2,$v,$i,$na,$nb);
-                        if ($v)
-                                {
-                                &comment("saved r[$i]");
-                                # &mov("eax",&wparam(0));
-                                # &mov(&DWP($i*4,"eax","",0),$c0);
-                                ($c0,$c1,$c2)=($c1,$c2,$c0);
-                                }
-                        $ai--;
-                        $bi++;
-                        }
-                $as++ if ($i < ($num-1));
-                $ae++ if ($i >= ($num-1));
-
-                $bs++ if ($i >= ($num-1));
-                $be++ if ($i < ($num-1));
-                }
-        &comment("save r[$i]");
-        # &mov("eax",&wparam(0));
-        &mov(&DWP($i*4,"eax","",0),$c0);
-
-        &pop("ebx");
-        &pop("ebp");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-        &function_end_B($name);
-        }
-
-sub bn_sqr_comba
-        {
-        local($name,$num)=@_;
-        local($r,$a,$c0,$c1,$c2)=@_;
-        local($i,$as,$ae,$bs,$be,$ai,$bi);
-        local($b,$tot,$end,$half);
-
-        &function_begin_B($name,"");
-
-        $c0="ebx";
-        $c1="ecx";
-        $c2="ebp";
-        $a="esi";
-        $r="edi";
-
-        &push("esi");
-         &push("edi");
-        &push("ebp");
-         &push("ebx");
-        &mov($r,&wparam(0));
-         &mov($a,&wparam(1));
-        &xor($c0,$c0);
-         &xor($c1,$c1);
-        &mov("eax",&DWP(0,$a,"",0)); # load the first word
-
-        $as=0;
-        $ae=0;
-        $bs=0;
-        $be=0;
-        $tot=$num+$num-1;
-
-        for ($i=0; $i<$tot; $i++)
-                {
-                $ai=$as;
-                $bi=$bs;
-                $end=$be+1;
-
-                &comment("############### Calculate word $i");
-                for ($j=$bs; $j<$end; $j++)
-                        {
-                        &xor($c2,$c2) if ($j == $bs);
-                        if (($ai-1) < ($bi+1))
-                                {
-                                $v=1;
-                                $v=2 if ($i+1) == $tot;
-                                }
-                        else
-                                { $v=0; }
-                        if (!$v)
-                                {
-                                $na=$ai-1;
-                                $nb=$bi+1;
-                                }
-                        else
-                                {
-                                $na=$as+($i < ($num-1));
-                                $nb=$bs+($i >= ($num-1));
-                                }
-                        if ($ai == $bi)
-                                {
-                                &sqr_add_c($r,$a,$ai,$bi,
-                                        $c0,$c1,$c2,$v,$i,$na,$nb);
-                                }
-                        else
-                                {
-                                &sqr_add_c2($r,$a,$ai,$bi,
-                                        $c0,$c1,$c2,$v,$i,$na,$nb);
-                                }
-                        if ($v)
-                                {
-                                &comment("saved r[$i]");
-                                #&mov(&DWP($i*4,$r,"",0),$c0);
-                                ($c0,$c1,$c2)=($c1,$c2,$c0);
-                                last;
-                                }
-                        $ai--;
-                        $bi++;
-                        }
-                $as++ if ($i < ($num-1));
-                $ae++ if ($i >= ($num-1));
-
-                $bs++ if ($i >= ($num-1));
-                $be++ if ($i < ($num-1));
-                }
-        &mov(&DWP($i*4,$r,"",0),$c0);
-        &pop("ebx");
-        &pop("ebp");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-        &function_end_B($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/div.pl b/src/lib/libcrypto/bn/asm/x86/div.pl
deleted file mode 100644
index 0e90152caa..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/div.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_div_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-        &mov("edx",&wparam(0)); #
-        &mov("eax",&wparam(1)); #
-        &mov("ebx",&wparam(2)); #
-        &div("ebx");
-        &function_end($name);
-        }
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/mul.pl b/src/lib/libcrypto/bn/asm/x86/mul.pl
deleted file mode 100644
index 674cb9b055..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/mul.pl
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $Low="eax";
-        $High="edx";
-        $a="ebx";
-        $w="ecx";
-        $r="edi";
-        $c="esi";
-        $num="ebp";
-
-        &xor($c,$c);            # clear carry
-        &mov($r,&wparam(0));    #
-        &mov($a,&wparam(1));    #
-        &mov($num,&wparam(2));  #
-        &mov($w,&wparam(3));    #
-
-        &and($num,0xfffffff8);  # num / 8
-        &jz(&label("mw_finish"));
-
-        &set_label("mw_loop",0);
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-
-                 &mov("eax",&DWP($i,$a,"",0));  # *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 # XXX
-
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-
-                &mov($c,"edx");                 # c=  H(t);
-                }
-
-        &comment("");
-        &add($a,32);
-        &add($r,32);
-        &sub($num,8);
-        &jz(&label("mw_finish"));
-        &jmp(&label("mw_loop"));
-
-        &set_label("mw_finish",0);
-        &mov($num,&wparam(2));  # get num
-        &and($num,7);
-        &jnz(&label("mw_finish2"));
-        &jmp(&label("mw_end"));
-
-        &set_label("mw_finish2",1);
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                 &mov("eax",&DWP($i*4,$a,"",0));# *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 # XXX
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i*4,$r,"",0),"eax");# *r= L(t);
-                &mov($c,"edx");                 # c=  H(t);
-                 &dec($num) if ($i != 7-1);
-                &jz(&label("mw_end")) if ($i != 7-1);
-                }
-        &set_label("mw_end",0);
-        &mov("eax",$c);
-
-        &function_end($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/mul_add.pl b/src/lib/libcrypto/bn/asm/x86/mul_add.pl
deleted file mode 100644
index 61830d3a90..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/mul_add.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $Low="eax";
-        $High="edx";
-        $a="ebx";
-        $w="ebp";
-        $r="edi";
-        $c="esi";
-
-        &xor($c,$c);            # clear carry
-        &mov($r,&wparam(0));    #
-
-        &mov("ecx",&wparam(2)); #
-        &mov($a,&wparam(1));    #
-
-        &and("ecx",0xfffffff8); # num / 8
-        &mov($w,&wparam(3));    #
-
-        &push("ecx");           # Up the stack for a tmp variable
-
-        &jz(&label("maw_finish"));
-
-        &set_label("maw_loop",0);
-
-        &mov(&swtmp(0),"ecx");  #
-
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-
-                 &mov("eax",&DWP($i,$a,"",0));  # *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);         # L(t)+= *r
-                 &mov($c,&DWP($i,$r,"",0));     # L(t)+= *r
-                &adc("edx",0);                  # H(t)+=carry
-                 &add("eax",$c);                # L(t)+=c
-                &adc("edx",0);                  # H(t)+=carry
-                 &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-                &mov($c,"edx");                 # c=  H(t);
-                }
-
-        &comment("");
-        &mov("ecx",&swtmp(0));  #
-        &add($a,32);
-        &add($r,32);
-        &sub("ecx",8);
-        &jnz(&label("maw_loop"));
-
-        &set_label("maw_finish",0);
-        &mov("ecx",&wparam(2)); # get num
-        &and("ecx",7);
-        &jnz(&label("maw_finish2"));    # helps branch prediction
-        &jmp(&label("maw_end"));
-
-        &set_label("maw_finish2",1);
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                 &mov("eax",&DWP($i*4,$a,"",0));# *a
-                &mul($w);                       # *a * w
-                &add("eax",$c);                 # L(t)+=c
-                 &mov($c,&DWP($i*4,$r,"",0));   # L(t)+= *r
-                &adc("edx",0);                  # H(t)+=carry
-                 &add("eax",$c);
-                &adc("edx",0);                  # H(t)+=carry
-                 &dec("ecx") if ($i != 7-1);
-                &mov(&DWP($i*4,$r,"",0),"eax"); # *r= L(t);
-                 &mov($c,"edx");                        # c=  H(t);
-                &jz(&label("maw_end")) if ($i != 7-1);
-                }
-        &set_label("maw_end",0);
-        &mov("eax",$c);
-
-        &pop("ecx");    # clear variable from
-
-        &function_end($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/sqr.pl b/src/lib/libcrypto/bn/asm/x86/sqr.pl
deleted file mode 100644
index 1f90993cf6..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/sqr.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $r="esi";
-        $a="edi";
-        $num="ebx";
-
-        &mov($r,&wparam(0));    #
-        &mov($a,&wparam(1));    #
-        &mov($num,&wparam(2));  #
-
-        &and($num,0xfffffff8);  # num / 8
-        &jz(&label("sw_finish"));
-
-        &set_label("sw_loop",0);
-        for ($i=0; $i<32; $i+=4)
-                {
-                &comment("Round $i");
-                &mov("eax",&DWP($i,$a,"",0));   # *a
-                 # XXX
-                &mul("eax");                    # *a * *a
-                &mov(&DWP($i*2,$r,"",0),"eax"); #
-                 &mov(&DWP($i*2+4,$r,"",0),"edx");#
-                }
-
-        &comment("");
-        &add($a,32);
-        &add($r,64);
-        &sub($num,8);
-        &jnz(&label("sw_loop"));
-
-        &set_label("sw_finish",0);
-        &mov($num,&wparam(2));  # get num
-        &and($num,7);
-        &jz(&label("sw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov("eax",&DWP($i*4,$a,"",0)); # *a
-                 # XXX
-                &mul("eax");                    # *a * *a
-                &mov(&DWP($i*8,$r,"",0),"eax"); #
-                 &dec($num) if ($i != 7-1);
-                &mov(&DWP($i*8+4,$r,"",0),"edx");
-                 &jz(&label("sw_end")) if ($i != 7-1);
-                }
-        &set_label("sw_end",0);
-
-        &function_end($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/x86/sub.pl b/src/lib/libcrypto/bn/asm/x86/sub.pl
deleted file mode 100644
index 837b0e1b07..0000000000
--- a/src/lib/libcrypto/bn/asm/x86/sub.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-
-        &function_begin($name,"");
-
-        &comment("");
-        $a="esi";
-        $b="edi";
-        $c="eax";
-        $r="ebx";
-        $tmp1="ecx";
-        $tmp2="edx";
-        $num="ebp";
-
-        &mov($r,&wparam(0));    # get r
-         &mov($a,&wparam(1));   # get a
-        &mov($b,&wparam(2));    # get b
-         &mov($num,&wparam(3)); # get num
-        &xor($c,$c);            # clear carry
-         &and($num,0xfffffff8); # num / 8
-
-        &jz(&label("aw_finish"));
-
-        &set_label("aw_loop",0);
-        for ($i=0; $i<8; $i++)
-                {
-                &comment("Round $i");
-
-                &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-                &sub($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &sub($tmp1,$tmp2);
-                &adc($c,0);
-                 &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-                }
-
-        &comment("");
-        &add($a,32);
-         &add($b,32);
-        &add($r,32);
-         &sub($num,8);
-        &jnz(&label("aw_loop"));
-
-        &set_label("aw_finish",0);
-        &mov($num,&wparam(3));  # get num
-        &and($num,7);
-         &jz(&label("aw_end"));
-
-        for ($i=0; $i<7; $i++)
-                {
-                &comment("Tail Round $i");
-                &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                 &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-                &sub($tmp1,$c);
-                 &mov($c,0);
-                &adc($c,$c);
-                 &sub($tmp1,$tmp2);
-                &adc($c,0);
-                 &dec($num) if ($i != 6);
-                &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                 &jz(&label("aw_end")) if ($i != 6);
-                }
-        &set_label("aw_end",0);
-
-#       &mov("eax",$c);         # $c is "eax"
-
-        &function_end($name);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
deleted file mode 100644
index f935e1ca79..0000000000
--- a/src/lib/libcrypto/bn/bn.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/* crypto/bn/bn.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BN_H
-#define HEADER_BN_H
-
-#ifndef WIN16
-#include <stdio.h> /* FILE */
-#endif
-#include <openssl/opensslconf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef VMS
-#undef BN_LLONG /* experimental, so far... */
-#endif
-
-#define BN_MUL_COMBA
-#define BN_SQR_COMBA
-#define BN_RECURSION
-#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
-
-/* 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_MASK         (0xffffffffffffffffffffffffffffffffLL)
-#define BN_MASK2        (0xffffffffffffffffL)
-#define BN_MASK2l       (0xffffffffL)
-#define BN_MASK2h       (0xffffffff00000000L)
-#define BN_MASK2h1      (0xffffffff80000000L)
-#define BN_TBIT         (0x8000000000000000L)
-#define BN_DEC_CONV     (10000000000000000000UL)
-#define BN_DEC_FMT1     "%lu"
-#define BN_DEC_FMT2     "%019lu"
-#define BN_DEC_NUM      19
-#endif
-
-/* This is where the long long data type is 64 bits, but long is 32.
- * For machines where there are 64bit registers, this is the mode to use.
- * IRIX, on R4000 and above should use this mode, along with the relevent
- * assember code :-).  Do NOT define BN_LLONG.
- */
-#ifdef SIXTY_FOUR_BIT
-#undef BN_LLONG
-#undef BN_ULLONG
-#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     (10000000000000000000LL)
-#define BN_DEC_FMT1     "%llu"
-#define BN_DEC_FMT2     "%019llu"
-#define BN_DEC_NUM      19
-#endif
-
-#ifdef THIRTY_TWO_BIT
-#if defined(WIN32) && !defined(__GNUC__)
-#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
-#ifdef WIN32
-/* VC++ doesn't like the LL suffix */
-#define BN_MASK         (0xffffffffffffffffL)
-#else
-#define BN_MASK         (0xffffffffffffffffLL)
-#endif
-#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_MASK         (0xffffffff)
-#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_MASK         (0xffff)
-#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
-
-#define BN_FLG_MALLOCED         0x01
-#define BN_FLG_STATIC_DATA      0x02
-#define BN_FLG_FREE             0x8000  /* used for debuging */
-#define BN_set_flags(b,n)       ((b)->flags|=(n))
-#define BN_get_flags(b,n)       ((b)->flags&(n))
-
-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 */
-        int flags;
-        } BIGNUM;
-
-/* Used for temp variables */
-#define BN_CTX_NUM      12
-typedef struct bignum_ctx
-        {
-        int tos;
-        BIGNUM bn[BN_CTX_NUM+1];
-        int flags;
-        } 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 use_word;   /* 0 for word form, 1 for long form */
-        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 */
-        int flags;
-        } BN_MONT_CTX;
-
-/* Used for reciprocal division/mod functions
- * It cannot be shared between threads
- */
-typedef struct bn_recp_ctx_st
-        {
-        BIGNUM N;       /* the divisor */
-        BIGNUM Nr;      /* the reciprocal */
-        int num_bits;
-        int shift;
-        int flags;
-        } BN_RECP_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 == 0) || BN_is_word(a,0))
-#define BN_is_one(a)    (BN_is_word((a),1))
-#define BN_is_odd(a)    (((a)->top > 0) && ((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_expand(n,b) ((((((b+BN_BITS2-1))/BN_BITS2)) <= (n)->max)?\
-        (n):bn_expand2((n),(b)/BN_BITS2+1))
-#define bn_wexpand(n,b) (((b) <= (n)->max)?(n):bn_expand2((n),(b)))
-
-#define bn_fix_top(a) \
-        { \
-        BN_ULONG *ftl; \
-        if ((a)->top > 0) \
-                { \
-                for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \
-                if (*(ftl--)) break; \
-                } \
-        }
-
-BIGNUM *BN_value_one(void);
-char *  BN_options(void);
-BN_CTX *BN_CTX_new(void);
-void    BN_CTX_init(BN_CTX *c);
-void    BN_CTX_free(BN_CTX *c);
-int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);
-int     BN_num_bits(const BIGNUM *a);
-int     BN_num_bits_word(BN_ULONG);
-BIGNUM *BN_new(void);
-void    BN_init(BIGNUM *);
-void    BN_clear_free(BIGNUM *a);
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
-BIGNUM *BN_bin2bn(const unsigned char *s,int len,BIGNUM *ret);
-int     BN_bn2bin(const BIGNUM *a, unsigned char *to);
-BIGNUM *BN_mpi2bn(unsigned char *s,int len,BIGNUM *ret);
-int     BN_bn2mpi(const BIGNUM *a, unsigned char *to);
-int     BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int     BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int     BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int     BN_add(BIGNUM *r, BIGNUM *a, BIGNUM *b);
-int     BN_mod(BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
-int     BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-               BN_CTX *ctx);
-int     BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b,BN_CTX *ctx);
-int     BN_sqr(BIGNUM *r, BIGNUM *a,BN_CTX *ctx);
-BN_ULONG BN_mod_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
-int     BN_mul_word(BIGNUM *a, BN_ULONG w);
-int     BN_add_word(BIGNUM *a, BN_ULONG w);
-int     BN_sub_word(BIGNUM *a, BN_ULONG w);
-int     BN_set_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_get_word(BIGNUM *a);
-int     BN_cmp(const BIGNUM *a, const BIGNUM *b);
-void    BN_free(BIGNUM *a);
-int     BN_is_bit_set(const BIGNUM *a, int n);
-int     BN_lshift(BIGNUM *r, const 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, const BIGNUM *p,
-                   const BIGNUM *m,BN_CTX *ctx);
-int     BN_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int     BN_mod_exp2_mont(BIGNUM *r, BIGNUM *a1, BIGNUM *p1,BIGNUM *a2,
-                BIGNUM *p2,BIGNUM *m,BN_CTX *ctx,BN_MONT_CTX *m_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(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const 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, const BIGNUM *a);
-#else
-int     BN_print(char *fp, const BIGNUM *a);
-#endif
-int     BN_reciprocal(BIGNUM *r, BIGNUM *m, int len, 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(const BIGNUM *a);
-int     BN_ucmp(const BIGNUM *a, const BIGNUM *b);
-int     BN_set_bit(BIGNUM *a, int n);
-int     BN_clear_bit(BIGNUM *a, int n);
-char *  BN_bn2hex(const BIGNUM *a);
-char *  BN_bn2dec(const BIGNUM *a);
-int     BN_hex2bn(BIGNUM **a, const char *str);
-int     BN_dec2bn(BIGNUM **a, const char *str);
-int     BN_gcd(BIGNUM *r,BIGNUM *in_a,BIGNUM *in_b,BN_CTX *ctx);
-BIGNUM *BN_mod_inverse(BIGNUM *ret,BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);
-BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int strong,BIGNUM *add,
-                BIGNUM *rem,void (*callback)(int,int,void *),void *cb_arg);
-int     BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(int,int,void *),
-                BN_CTX *ctx,void *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_div_words(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_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void );
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
-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,const BIGNUM *modulus,BN_CTX *ctx);
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);
-
-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);
-
-void BN_set_params(int mul,int high,int low,int mont);
-int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
-
-void    BN_RECP_CTX_init(BN_RECP_CTX *recp);
-BN_RECP_CTX *BN_RECP_CTX_new(void);
-void    BN_RECP_CTX_free(BN_RECP_CTX *recp);
-int     BN_RECP_CTX_set(BN_RECP_CTX *recp,const BIGNUM *rdiv,BN_CTX *ctx);
-int     BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y,
-                BN_RECP_CTX *recp,BN_CTX *ctx);
-int     BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx);
-int     BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m,
-                BN_RECP_CTX *recp, BN_CTX *ctx);
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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
-#define BN_F_BN_USUB                                     115
-
-/* Reason codes. */
-#define BN_R_ARG2_LT_ARG3                                100
-#define BN_R_BAD_RECIPROCAL                              101
-#define BN_R_CALLED_WITH_EVEN_MODULUS                    102
-#define BN_R_DIV_BY_ZERO                                 103
-#define BN_R_ENCODING_ERROR                              104
-#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
-#define BN_R_INVALID_LENGTH                              106
-#define BN_R_NOT_INITIALIZED                             107
-#define BN_R_NO_INVERSE                                  108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/bn/bn_add.c b/src/lib/libcrypto/bn/bn_add.c
deleted file mode 100644
index c5ab066c9e..0000000000
--- a/src/lib/libcrypto/bn/bn_add.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* crypto/bn/bn_add.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"
-
-/* r can == a or b */
-int BN_add(BIGNUM *r, BIGNUM *a, BIGNUM *b)
-        {
-        BIGNUM *tmp;
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        /*  a +  b      a+b
-         *  a + -b      a-b
-         * -a +  b      b-a
-         * -a + -b      -(a+b)
-         */
-        if (a->neg ^ b->neg)
-                {
-                /* only one is negative */
-                if (a->neg)
-                        { tmp=a; a=b; b=tmp; }
-
-                /* we are now a - b */
-
-                if (BN_ucmp(a,b) < 0)
-                        {
-                        if (!BN_usub(r,b,a)) return(0);
-                        r->neg=1;
-                        }
-                else
-                        {
-                        if (!BN_usub(r,a,b)) return(0);
-                        r->neg=0;
-                        }
-                return(1);
-                }
-
-        if (a->neg) /* both are neg */
-                r->neg=1;
-        else
-                r->neg=0;
-
-        if (!BN_uadd(r,a,b)) return(0);
-        return(1);
-        }
-
-/* unsigned add of b to a, r must be large enough */
-int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
-        {
-        register int i;
-        int max,min;
-        BN_ULONG *ap,*bp,*rp,carry,t1;
-        const BIGNUM *tmp;
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        if (a->top < b->top)
-                { tmp=a; a=b; b=tmp; }
-        max=a->top;
-        min=b->top;
-
-        if (bn_wexpand(r,max+1) == NULL)
-                return(0);
-
-        r->top=max;
-
-
-        ap=a->d;
-        bp=b->d;
-        rp=r->d;
-        carry=0;
-
-        carry=bn_add_words(rp,ap,bp,min);
-        rp+=min;
-        ap+=min;
-        bp+=min;
-        i=min;
-
-        if (carry)
-                {
-                while (i < max)
-                        {
-                        i++;
-                        t1= *(ap++);
-                        if ((*(rp++)=(t1+1)&BN_MASK2) >= t1)
-                                {
-                                carry=0;
-                                break;
-                                }
-                        }
-                if ((i >= max) && carry)
-                        {
-                        *(rp++)=1;
-                        r->top++;
-                        }
-                }
-        if (rp != ap)
-                {
-                for (; i<max; i++)
-                        *(rp++)= *(ap++);
-                }
-        /* memcpy(rp,ap,sizeof(*ap)*(max-i));*/
-        return(1);
-        }
-
-/* unsigned subtraction of b from a, a must be larger than b. */
-int BN_usub(BIGNUM *r, const BIGNUM *a, const 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
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        if (a->top < b->top) /* hmm... should not be happening */
-                {
-                BNerr(BN_F_BN_USUB,BN_R_ARG2_LT_ARG3);
-                return(0);
-                }
-
-        max=a->top;
-        min=b->top;
-        if (bn_wexpand(r,max) == NULL) return(0);
-
-        ap=a->d;
-        bp=b->d;
-        rp=r->d;
-
-#if 1
-        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;
-                }
-#else
-        carry=bn_sub_words(rp,ap,bp,min);
-        ap+=min;
-        bp+=min;
-        rp+=min;
-        i=min;
-#endif
-        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
-        if (rp != ap)
-                {
-                for (;;)
-                        {
-                        if (i++ >= max) break;
-                        rp[0]=ap[0];
-                        if (i++ >= max) break;
-                        rp[1]=ap[1];
-                        if (i++ >= max) break;
-                        rp[2]=ap[2];
-                        if (i++ >= max) break;
-                        rp[3]=ap[3];
-                        rp+=4;
-                        ap+=4;
-                        }
-                }
-#endif
-
-        r->top=max;
-        bn_fix_top(r);
-        return(1);
-        }
-
-int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
-        {
-        int max;
-        int add=0,neg=0;
-        const BIGNUM *tmp;
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        /*  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)
-                {
-                if (!BN_uadd(r,a,b)) return(0);
-                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)
-                {
-                if (!BN_usub(r,b,a)) return(0);
-                r->neg=1;
-                }
-        else
-                {
-                if (!BN_usub(r,a,b)) return(0);
-                r->neg=0;
-                }
-        return(1);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_asm.c b/src/lib/libcrypto/bn/bn_asm.c
deleted file mode 100644
index 4d3da16a0c..0000000000
--- a/src/lib/libcrypto/bn/bn_asm.c
+++ /dev/null
@@ -1,802 +0,0 @@
-/* crypto/bn/bn_asm.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(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
-        {
-        BN_ULONG c1=0;
-
-        bn_check_num(num);
-        if (num <= 0) return(c1);
-
-        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(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
-        {
-        BN_ULONG c1=0;
-
-        bn_check_num(num);
-        if (num <= 0) return(c1);
-
-        /* for (;;) */
-        while (1) /* circumvent egcs-1.1.2 bug */
-                {
-                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(BN_ULONG *r, BN_ULONG *a, int n)
-        {
-        bn_check_num(n);
-        if (n <= 0) return;
-        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;
-                }
-        }
-
-#else
-
-BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
-        {
-        BN_ULONG c=0;
-        BN_ULONG bl,bh;
-
-        bn_check_num(num);
-        if (num <= 0) return((BN_ULONG)0);
-
-        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(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
-        {
-        BN_ULONG carry=0;
-        BN_ULONG bl,bh;
-
-        bn_check_num(num);
-        if (num <= 0) return((BN_ULONG)0);
-
-        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(BN_ULONG *r, BN_ULONG *a, int n)
-        {
-        bn_check_num(n);
-        if (n <= 0) return;
-        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;
-                }
-        }
-
-#endif
-
-#if defined(BN_LLONG) && defined(BN_DIV2W)
-
-BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG 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_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG 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;
-
-                th=q*dh;
-                tl=dl*q;
-                for (;;)
-                        {
-                        t=h-th;
-                        if ((t&BN_MASK2h) ||
-                                ((tl) <= (
-                                        (t<<BN_BITS4)|
-                                        ((l&BN_MASK2h)>>BN_BITS4))))
-                                break;
-                        q--;
-                        th-=dh;
-                        tl-=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
-
-#ifdef BN_LLONG
-BN_ULONG bn_add_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
-        {
-        BN_ULLONG ll=0;
-
-        bn_check_num(n);
-        if (n <= 0) return((BN_ULONG)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((BN_ULONG)ll);
-        }
-#else
-BN_ULONG bn_add_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
-        {
-        BN_ULONG c,l,t;
-
-        bn_check_num(n);
-        if (n <= 0) return((BN_ULONG)0);
-
-        c=0;
-        for (;;)
-                {
-                t=a[0];
-                t=(t+c)&BN_MASK2;
-                c=(t < c);
-                l=(t+b[0])&BN_MASK2;
-                c+=(l < t);
-                r[0]=l;
-                if (--n <= 0) break;
-
-                t=a[1];
-                t=(t+c)&BN_MASK2;
-                c=(t < c);
-                l=(t+b[1])&BN_MASK2;
-                c+=(l < t);
-                r[1]=l;
-                if (--n <= 0) break;
-
-                t=a[2];
-                t=(t+c)&BN_MASK2;
-                c=(t < c);
-                l=(t+b[2])&BN_MASK2;
-                c+=(l < t);
-                r[2]=l;
-                if (--n <= 0) break;
-
-                t=a[3];
-                t=(t+c)&BN_MASK2;
-                c=(t < c);
-                l=(t+b[3])&BN_MASK2;
-                c+=(l < t);
-                r[3]=l;
-                if (--n <= 0) break;
-
-                a+=4;
-                b+=4;
-                r+=4;
-                }
-        return((BN_ULONG)c);
-        }
-#endif
-
-BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
-        {
-        BN_ULONG t1,t2;
-        int c=0;
-
-        bn_check_num(n);
-        if (n <= 0) return((BN_ULONG)0);
-
-        for (;;)
-                {
-                t1=a[0]; t2=b[0];
-                r[0]=(t1-t2-c)&BN_MASK2;
-                if (t1 != t2) c=(t1 < t2);
-                if (--n <= 0) break;
-
-                t1=a[1]; t2=b[1];
-                r[1]=(t1-t2-c)&BN_MASK2;
-                if (t1 != t2) c=(t1 < t2);
-                if (--n <= 0) break;
-
-                t1=a[2]; t2=b[2];
-                r[2]=(t1-t2-c)&BN_MASK2;
-                if (t1 != t2) c=(t1 < t2);
-                if (--n <= 0) break;
-
-                t1=a[3]; t2=b[3];
-                r[3]=(t1-t2-c)&BN_MASK2;
-                if (t1 != t2) c=(t1 < t2);
-                if (--n <= 0) break;
-
-                a+=4;
-                b+=4;
-                r+=4;
-                }
-        return(c);
-        }
-
-#ifdef BN_MUL_COMBA
-
-#undef bn_mul_comba8
-#undef bn_mul_comba4
-#undef bn_sqr_comba8
-#undef bn_sqr_comba4
-
-#ifdef BN_LLONG
-#define mul_add_c(a,b,c0,c1,c2) \
-        t=(BN_ULLONG)a*b; \
-        t1=(BN_ULONG)Lw(t); \
-        t2=(BN_ULONG)Hw(t); \
-        c0=(c0+t1)&BN_MASK2; if ((c0) < t1) t2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define mul_add_c2(a,b,c0,c1,c2) \
-        t=(BN_ULLONG)a*b; \
-        tt=(t+t)&BN_MASK; \
-        if (tt < t) c2++; \
-        t1=(BN_ULONG)Lw(tt); \
-        t2=(BN_ULONG)Hw(tt); \
-        c0=(c0+t1)&BN_MASK2;  \
-        if ((c0 < t1) && (((++t2)&BN_MASK2) == 0)) c2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define sqr_add_c(a,i,c0,c1,c2) \
-        t=(BN_ULLONG)a[i]*a[i]; \
-        t1=(BN_ULONG)Lw(t); \
-        t2=(BN_ULONG)Hw(t); \
-        c0=(c0+t1)&BN_MASK2; if ((c0) < t1) t2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define sqr_add_c2(a,i,j,c0,c1,c2) \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-#else
-#define mul_add_c(a,b,c0,c1,c2) \
-        t1=LBITS(a); t2=HBITS(a); \
-        bl=LBITS(b); bh=HBITS(b); \
-        mul64(t1,t2,bl,bh); \
-        c0=(c0+t1)&BN_MASK2; if ((c0) < t1) t2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define mul_add_c2(a,b,c0,c1,c2) \
-        t1=LBITS(a); t2=HBITS(a); \
-        bl=LBITS(b); bh=HBITS(b); \
-        mul64(t1,t2,bl,bh); \
-        if (t2 & BN_TBIT) c2++; \
-        t2=(t2+t2)&BN_MASK2; \
-        if (t1 & BN_TBIT) t2++; \
-        t1=(t1+t1)&BN_MASK2; \
-        c0=(c0+t1)&BN_MASK2;  \
-        if ((c0 < t1) && (((++t2)&BN_MASK2) == 0)) c2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define sqr_add_c(a,i,c0,c1,c2) \
-        sqr64(t1,t2,(a)[i]); \
-        c0=(c0+t1)&BN_MASK2; if ((c0) < t1) t2++; \
-        c1=(c1+t2)&BN_MASK2; if ((c1) < t2) c2++;
-
-#define sqr_add_c2(a,i,j,c0,c1,c2) \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-#endif
-
-void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
-        {
-#ifdef BN_LLONG
-        BN_ULLONG t;
-#else
-        BN_ULONG bl,bh;
-#endif
-        BN_ULONG t1,t2;
-        BN_ULONG c1,c2,c3;
-
-        c1=0;
-        c2=0;
-        c3=0;
-        mul_add_c(a[0],b[0],c1,c2,c3);
-        r[0]=c1;
-        c1=0;
-        mul_add_c(a[0],b[1],c2,c3,c1);
-        mul_add_c(a[1],b[0],c2,c3,c1);
-        r[1]=c2;
-        c2=0;
-        mul_add_c(a[2],b[0],c3,c1,c2);
-        mul_add_c(a[1],b[1],c3,c1,c2);
-        mul_add_c(a[0],b[2],c3,c1,c2);
-        r[2]=c3;
-        c3=0;
-        mul_add_c(a[0],b[3],c1,c2,c3);
-        mul_add_c(a[1],b[2],c1,c2,c3);
-        mul_add_c(a[2],b[1],c1,c2,c3);
-        mul_add_c(a[3],b[0],c1,c2,c3);
-        r[3]=c1;
-        c1=0;
-        mul_add_c(a[4],b[0],c2,c3,c1);
-        mul_add_c(a[3],b[1],c2,c3,c1);
-        mul_add_c(a[2],b[2],c2,c3,c1);
-        mul_add_c(a[1],b[3],c2,c3,c1);
-        mul_add_c(a[0],b[4],c2,c3,c1);
-        r[4]=c2;
-        c2=0;
-        mul_add_c(a[0],b[5],c3,c1,c2);
-        mul_add_c(a[1],b[4],c3,c1,c2);
-        mul_add_c(a[2],b[3],c3,c1,c2);
-        mul_add_c(a[3],b[2],c3,c1,c2);
-        mul_add_c(a[4],b[1],c3,c1,c2);
-        mul_add_c(a[5],b[0],c3,c1,c2);
-        r[5]=c3;
-        c3=0;
-        mul_add_c(a[6],b[0],c1,c2,c3);
-        mul_add_c(a[5],b[1],c1,c2,c3);
-        mul_add_c(a[4],b[2],c1,c2,c3);
-        mul_add_c(a[3],b[3],c1,c2,c3);
-        mul_add_c(a[2],b[4],c1,c2,c3);
-        mul_add_c(a[1],b[5],c1,c2,c3);
-        mul_add_c(a[0],b[6],c1,c2,c3);
-        r[6]=c1;
-        c1=0;
-        mul_add_c(a[0],b[7],c2,c3,c1);
-        mul_add_c(a[1],b[6],c2,c3,c1);
-        mul_add_c(a[2],b[5],c2,c3,c1);
-        mul_add_c(a[3],b[4],c2,c3,c1);
-        mul_add_c(a[4],b[3],c2,c3,c1);
-        mul_add_c(a[5],b[2],c2,c3,c1);
-        mul_add_c(a[6],b[1],c2,c3,c1);
-        mul_add_c(a[7],b[0],c2,c3,c1);
-        r[7]=c2;
-        c2=0;
-        mul_add_c(a[7],b[1],c3,c1,c2);
-        mul_add_c(a[6],b[2],c3,c1,c2);
-        mul_add_c(a[5],b[3],c3,c1,c2);
-        mul_add_c(a[4],b[4],c3,c1,c2);
-        mul_add_c(a[3],b[5],c3,c1,c2);
-        mul_add_c(a[2],b[6],c3,c1,c2);
-        mul_add_c(a[1],b[7],c3,c1,c2);
-        r[8]=c3;
-        c3=0;
-        mul_add_c(a[2],b[7],c1,c2,c3);
-        mul_add_c(a[3],b[6],c1,c2,c3);
-        mul_add_c(a[4],b[5],c1,c2,c3);
-        mul_add_c(a[5],b[4],c1,c2,c3);
-        mul_add_c(a[6],b[3],c1,c2,c3);
-        mul_add_c(a[7],b[2],c1,c2,c3);
-        r[9]=c1;
-        c1=0;
-        mul_add_c(a[7],b[3],c2,c3,c1);
-        mul_add_c(a[6],b[4],c2,c3,c1);
-        mul_add_c(a[5],b[5],c2,c3,c1);
-        mul_add_c(a[4],b[6],c2,c3,c1);
-        mul_add_c(a[3],b[7],c2,c3,c1);
-        r[10]=c2;
-        c2=0;
-        mul_add_c(a[4],b[7],c3,c1,c2);
-        mul_add_c(a[5],b[6],c3,c1,c2);
-        mul_add_c(a[6],b[5],c3,c1,c2);
-        mul_add_c(a[7],b[4],c3,c1,c2);
-        r[11]=c3;
-        c3=0;
-        mul_add_c(a[7],b[5],c1,c2,c3);
-        mul_add_c(a[6],b[6],c1,c2,c3);
-        mul_add_c(a[5],b[7],c1,c2,c3);
-        r[12]=c1;
-        c1=0;
-        mul_add_c(a[6],b[7],c2,c3,c1);
-        mul_add_c(a[7],b[6],c2,c3,c1);
-        r[13]=c2;
-        c2=0;
-        mul_add_c(a[7],b[7],c3,c1,c2);
-        r[14]=c3;
-        r[15]=c1;
-        }
-
-void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
-        {
-#ifdef BN_LLONG
-        BN_ULLONG t;
-#else
-        BN_ULONG bl,bh;
-#endif
-        BN_ULONG t1,t2;
-        BN_ULONG c1,c2,c3;
-
-        c1=0;
-        c2=0;
-        c3=0;
-        mul_add_c(a[0],b[0],c1,c2,c3);
-        r[0]=c1;
-        c1=0;
-        mul_add_c(a[0],b[1],c2,c3,c1);
-        mul_add_c(a[1],b[0],c2,c3,c1);
-        r[1]=c2;
-        c2=0;
-        mul_add_c(a[2],b[0],c3,c1,c2);
-        mul_add_c(a[1],b[1],c3,c1,c2);
-        mul_add_c(a[0],b[2],c3,c1,c2);
-        r[2]=c3;
-        c3=0;
-        mul_add_c(a[0],b[3],c1,c2,c3);
-        mul_add_c(a[1],b[2],c1,c2,c3);
-        mul_add_c(a[2],b[1],c1,c2,c3);
-        mul_add_c(a[3],b[0],c1,c2,c3);
-        r[3]=c1;
-        c1=0;
-        mul_add_c(a[3],b[1],c2,c3,c1);
-        mul_add_c(a[2],b[2],c2,c3,c1);
-        mul_add_c(a[1],b[3],c2,c3,c1);
-        r[4]=c2;
-        c2=0;
-        mul_add_c(a[2],b[3],c3,c1,c2);
-        mul_add_c(a[3],b[2],c3,c1,c2);
-        r[5]=c3;
-        c3=0;
-        mul_add_c(a[3],b[3],c1,c2,c3);
-        r[6]=c1;
-        r[7]=c2;
-        }
-
-void bn_sqr_comba8(BN_ULONG *r, BN_ULONG *a)
-        {
-#ifdef BN_LLONG
-        BN_ULLONG t,tt;
-#else
-        BN_ULONG bl,bh;
-#endif
-        BN_ULONG t1,t2;
-        BN_ULONG c1,c2,c3;
-
-        c1=0;
-        c2=0;
-        c3=0;
-        sqr_add_c(a,0,c1,c2,c3);
-        r[0]=c1;
-        c1=0;
-        sqr_add_c2(a,1,0,c2,c3,c1);
-        r[1]=c2;
-        c2=0;
-        sqr_add_c(a,1,c3,c1,c2);
-        sqr_add_c2(a,2,0,c3,c1,c2);
-        r[2]=c3;
-        c3=0;
-        sqr_add_c2(a,3,0,c1,c2,c3);
-        sqr_add_c2(a,2,1,c1,c2,c3);
-        r[3]=c1;
-        c1=0;
-        sqr_add_c(a,2,c2,c3,c1);
-        sqr_add_c2(a,3,1,c2,c3,c1);
-        sqr_add_c2(a,4,0,c2,c3,c1);
-        r[4]=c2;
-        c2=0;
-        sqr_add_c2(a,5,0,c3,c1,c2);
-        sqr_add_c2(a,4,1,c3,c1,c2);
-        sqr_add_c2(a,3,2,c3,c1,c2);
-        r[5]=c3;
-        c3=0;
-        sqr_add_c(a,3,c1,c2,c3);
-        sqr_add_c2(a,4,2,c1,c2,c3);
-        sqr_add_c2(a,5,1,c1,c2,c3);
-        sqr_add_c2(a,6,0,c1,c2,c3);
-        r[6]=c1;
-        c1=0;
-        sqr_add_c2(a,7,0,c2,c3,c1);
-        sqr_add_c2(a,6,1,c2,c3,c1);
-        sqr_add_c2(a,5,2,c2,c3,c1);
-        sqr_add_c2(a,4,3,c2,c3,c1);
-        r[7]=c2;
-        c2=0;
-        sqr_add_c(a,4,c3,c1,c2);
-        sqr_add_c2(a,5,3,c3,c1,c2);
-        sqr_add_c2(a,6,2,c3,c1,c2);
-        sqr_add_c2(a,7,1,c3,c1,c2);
-        r[8]=c3;
-        c3=0;
-        sqr_add_c2(a,7,2,c1,c2,c3);
-        sqr_add_c2(a,6,3,c1,c2,c3);
-        sqr_add_c2(a,5,4,c1,c2,c3);
-        r[9]=c1;
-        c1=0;
-        sqr_add_c(a,5,c2,c3,c1);
-        sqr_add_c2(a,6,4,c2,c3,c1);
-        sqr_add_c2(a,7,3,c2,c3,c1);
-        r[10]=c2;
-        c2=0;
-        sqr_add_c2(a,7,4,c3,c1,c2);
-        sqr_add_c2(a,6,5,c3,c1,c2);
-        r[11]=c3;
-        c3=0;
-        sqr_add_c(a,6,c1,c2,c3);
-        sqr_add_c2(a,7,5,c1,c2,c3);
-        r[12]=c1;
-        c1=0;
-        sqr_add_c2(a,7,6,c2,c3,c1);
-        r[13]=c2;
-        c2=0;
-        sqr_add_c(a,7,c3,c1,c2);
-        r[14]=c3;
-        r[15]=c1;
-        }
-
-void bn_sqr_comba4(BN_ULONG *r, BN_ULONG *a)
-        {
-#ifdef BN_LLONG
-        BN_ULLONG t,tt;
-#else
-        BN_ULONG bl,bh;
-#endif
-        BN_ULONG t1,t2;
-        BN_ULONG c1,c2,c3;
-
-        c1=0;
-        c2=0;
-        c3=0;
-        sqr_add_c(a,0,c1,c2,c3);
-        r[0]=c1;
-        c1=0;
-        sqr_add_c2(a,1,0,c2,c3,c1);
-        r[1]=c2;
-        c2=0;
-        sqr_add_c(a,1,c3,c1,c2);
-        sqr_add_c2(a,2,0,c3,c1,c2);
-        r[2]=c3;
-        c3=0;
-        sqr_add_c2(a,3,0,c1,c2,c3);
-        sqr_add_c2(a,2,1,c1,c2,c3);
-        r[3]=c1;
-        c1=0;
-        sqr_add_c(a,2,c2,c3,c1);
-        sqr_add_c2(a,3,1,c2,c3,c1);
-        r[4]=c2;
-        c2=0;
-        sqr_add_c2(a,3,2,c3,c1,c2);
-        r[5]=c3;
-        c3=0;
-        sqr_add_c(a,3,c1,c2,c3);
-        r[6]=c1;
-        r[7]=c2;
-        }
-#else
-
-/* hmm... is it faster just to do a multiply? */
-#undef bn_sqr_comba4
-void bn_sqr_comba4(BN_ULONG *r, BN_ULONG *a)
-        {
-        BN_ULONG t[8];
-        bn_sqr_normal(r,a,4,t);
-        }
-
-#undef bn_sqr_comba8
-void bn_sqr_comba8(BN_ULONG *r, BN_ULONG *a)
-        {
-        BN_ULONG t[16];
-        bn_sqr_normal(r,a,8,t);
-        }
-
-void bn_mul_comba4(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
-        {
-        r[4]=bn_mul_words(    &(r[0]),a,4,b[0]);
-        r[5]=bn_mul_add_words(&(r[1]),a,4,b[1]);
-        r[6]=bn_mul_add_words(&(r[2]),a,4,b[2]);
-        r[7]=bn_mul_add_words(&(r[3]),a,4,b[3]);
-        }
-
-void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
-        {
-        r[ 8]=bn_mul_words(    &(r[0]),a,8,b[0]);
-        r[ 9]=bn_mul_add_words(&(r[1]),a,8,b[1]);
-        r[10]=bn_mul_add_words(&(r[2]),a,8,b[2]);
-        r[11]=bn_mul_add_words(&(r[3]),a,8,b[3]);
-        r[12]=bn_mul_add_words(&(r[4]),a,8,b[4]);
-        r[13]=bn_mul_add_words(&(r[5]),a,8,b[5]);
-        r[14]=bn_mul_add_words(&(r[6]),a,8,b[6]);
-        r[15]=bn_mul_add_words(&(r[7]),a,8,b[7]);
-        }
-
-#endif /* BN_COMBA */
diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
deleted file mode 100644
index 1b1bb06046..0000000000
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* crypto/bn/bn_blind.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"
-
-BN_BLINDING *BN_BLINDING_new(BIGNUM *A, BIGNUM *Ai, BIGNUM *mod)
-        {
-        BN_BLINDING *ret=NULL;
-
-        bn_check_top(Ai);
-        bn_check_top(mod);
-
-        if ((ret=(BN_BLINDING *)Malloc(sizeof(BN_BLINDING))) == NULL)
-                {
-                BNerr(BN_F_BN_BLINDING_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        memset(ret,0,sizeof(BN_BLINDING));
-        if ((ret->A=BN_new()) == NULL) goto err;
-        if ((ret->Ai=BN_new()) == NULL) goto err;
-        if (!BN_copy(ret->A,A)) goto err;
-        if (!BN_copy(ret->Ai,Ai)) goto err;
-        ret->mod=mod;
-        return(ret);
-err:
-        if (ret != NULL) BN_BLINDING_free(ret);
-        return(NULL);
-        }
-
-void BN_BLINDING_free(BN_BLINDING *r)
-        {
-        if(r == NULL)
-            return;
-
-        if (r->A  != NULL) BN_free(r->A );
-        if (r->Ai != NULL) BN_free(r->Ai);
-        Free(r);
-        }
-
-int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
-        {
-        int ret=0;
-
-        if ((b->A == NULL) || (b->Ai == NULL))
-                {
-                BNerr(BN_F_BN_BLINDING_UPDATE,BN_R_NOT_INITIALIZED);
-                goto err;
-                }
-                
-        if (!BN_mod_mul(b->A,b->A,b->A,b->mod,ctx)) goto err;
-        if (!BN_mod_mul(b->Ai,b->Ai,b->Ai,b->mod,ctx)) goto err;
-
-        ret=1;
-err:
-        return(ret);
-        }
-
-int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx)
-        {
-        bn_check_top(n);
-
-        if ((b->A == NULL) || (b->Ai == NULL))
-                {
-                BNerr(BN_F_BN_BLINDING_CONVERT,BN_R_NOT_INITIALIZED);
-                return(0);
-                }
-        return(BN_mod_mul(n,n,b->A,b->mod,ctx));
-        }
-
-int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx)
-        {
-        int ret;
-
-        bn_check_top(n);
-        if ((b->A == NULL) || (b->Ai == NULL))
-                {
-                BNerr(BN_F_BN_BLINDING_INVERT,BN_R_NOT_INITIALIZED);
-                return(0);
-                }
-        if ((ret=BN_mod_mul(n,n,b->Ai,b->mod,ctx)) >= 0)
-                {
-                if (!BN_BLINDING_update(b,ctx))
-                        return(0);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_div.c b/src/lib/libcrypto/bn/bn_div.c
deleted file mode 100644
index 150dd289a5..0000000000
--- a/src/lib/libcrypto/bn/bn_div.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/* crypto/bn/bn_div.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-
-/* The old slow way */
-#if 0
-int BN_div(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx)
-        {
-        int i,nm,nd;
-        BIGNUM *D;
-
-        bn_check_top(m);
-        bn_check_top(d);
-        if (BN_is_zero(d))
-                {
-                BNerr(BN_F_BN_DIV,BN_R_DIV_BY_ZERO);
-                return(0);
-                }
-
-        if (BN_ucmp(m,d) < 0)
-                {
-                if (rem != NULL)
-                        { if (BN_copy(rem,m) == NULL) return(0); }
-                if (dv != NULL) BN_zero(dv);
-                return(1);
-                }
-
-        D= &(ctx->bn[ctx->tos]);
-        if (dv == NULL) dv= &(ctx->bn[ctx->tos+1]);
-        if (rem == NULL) rem= &(ctx->bn[ctx->tos+2]);
-
-        nd=BN_num_bits(d);
-        nm=BN_num_bits(m);
-        if (BN_copy(D,d) == NULL) return(0);
-        if (BN_copy(rem,m) == NULL) return(0);
-
-        /* The next 2 are needed so we can do a dv->d[0]|=1 later
-         * since BN_lshift1 will only work once there is a value :-) */
-        BN_zero(dv);
-        bn_wexpand(dv,1);
-        dv->top=1;
-
-        if (!BN_lshift(D,D,nm-nd)) return(0);
-        for (i=nm-nd; i>=0; i--)
-                {
-                if (!BN_lshift1(dv,dv)) return(0);
-                if (BN_ucmp(rem,D) >= 0)
-                        {
-                        dv->d[0]|=1;
-                        if (!BN_usub(rem,rem,D)) return(0);
-                        }
-/* CAN IMPROVE (and have now :=) */
-                if (!BN_rshift1(D,D)) return(0);
-                }
-        rem->neg=BN_is_zero(rem)?0:m->neg;
-        dv->neg=m->neg^d->neg;
-        return(1);
-        }
-
-#else
-
-int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
-           BN_CTX *ctx)
-        {
-        int norm_shift,i,j,loop;
-        BIGNUM *tmp,wnum,*snum,*sdiv,*res;
-        BN_ULONG *resp,*wnump;
-        BN_ULONG d0,d1;
-        int num_n,div_n;
-
-        bn_check_top(num);
-        bn_check_top(divisor);
-
-        if (BN_is_zero(divisor))
-                {
-                BNerr(BN_F_BN_DIV,BN_R_DIV_BY_ZERO);
-                return(0);
-                }
-
-        if (BN_ucmp(num,divisor) < 0)
-                {
-                if (rm != NULL)
-                        { if (BN_copy(rm,num) == NULL) return(0); }
-                if (dv != NULL) BN_zero(dv);
-                return(1);
-                }
-
-        tmp= &(ctx->bn[ctx->tos]);
-        tmp->neg=0;
-        snum= &(ctx->bn[ctx->tos+1]);
-        sdiv= &(ctx->bn[ctx->tos+2]);
-        if (dv == NULL)
-                res= &(ctx->bn[ctx->tos+3]);
-        else    res=dv;
-
-        /* First we normalise the numbers */
-        norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
-        BN_lshift(sdiv,divisor,norm_shift);
-        sdiv->neg=0;
-        norm_shift+=BN_BITS2;
-        BN_lshift(snum,num,norm_shift);
-        snum->neg=0;
-        div_n=sdiv->top;
-        num_n=snum->top;
-        loop=num_n-div_n;
-
-        /* Lets setup a 'window' into snum
-         * This is the part that corresponds to the current
-         * 'area' being divided */
-        BN_init(&wnum);
-        wnum.d=  &(snum->d[loop]);
-        wnum.top= div_n;
-        wnum.max= snum->max+1; /* a bit of a lie */
-
-        /* Get the top 2 words of sdiv */
-        /* i=sdiv->top; */
-        d0=sdiv->d[div_n-1];
-        d1=(div_n == 1)?0:sdiv->d[div_n-2];
-
-        /* pointer to the 'top' of snum */
-        wnump= &(snum->d[num_n-1]);
-
-        /* Setup to 'res' */
-        res->neg= (num->neg^divisor->neg);
-        if (!bn_wexpand(res,(loop+1))) goto err;
-        res->top=loop;
-        resp= &(res->d[loop-1]);
-
-        /* space for temp */
-        if (!bn_wexpand(tmp,(div_n+1))) goto err;
-
-        if (BN_ucmp(&wnum,sdiv) >= 0)
-                {
-                if (!BN_usub(&wnum,&wnum,sdiv)) goto err;
-                *resp=1;
-                res->d[res->top-1]=1;
-                }
-        else
-                res->top--;
-        resp--;
-
-        for (i=0; i<loop-1; i++)
-                {
-                BN_ULONG q,l0;
-#ifdef BN_DIV3W
-                q=bn_div_3_words(wnump,d0,d1);
-#else
-
-#if !defined(NO_ASM) && !defined(PEDANTIC)
-# if defined(__GNUC__) && __GNUC__>=2
-#  if defined(__i386)
-   /*
-    * There were two reasons for implementing this template:
-    * - GNU C generates a call to a function (__udivdi3 to be exact)
-    *   in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
-    *   understand why...);
-    * - divl doesn't only calculate quotient, but also leaves
-    *   remainder in %edx which we can definitely use here:-)
-    *
-    *                                   <appro@fy.chalmers.se>
-    */
-#  define bn_div_words(n0,n1,d0)                \
-        ({  asm volatile (                      \
-                "divl   %4"                     \
-                : "=a"(q), "=d"(rem)            \
-                : "a"(n1), "d"(n0), "g"(d0)     \
-                : "cc");                        \
-            q;                                  \
-        })
-#  define REMINDER_IS_ALREADY_CALCULATED
-#  endif /* __<cpu> */
-# endif /* __GNUC__ */
-#endif /* NO_ASM */
-                BN_ULONG n0,n1,rem=0;
-
-                n0=wnump[0];
-                n1=wnump[-1];
-                if (n0 == d0)
-                        q=BN_MASK2;
-                else
-#if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
-                        q=((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0;
-#else
-                        q=bn_div_words(n0,n1,d0);
-#endif
-                {
-#ifdef BN_LLONG
-                BN_ULLONG t2;
-
-#ifndef REMINDER_IS_ALREADY_CALCULATED
-                /*
-                 * rem doesn't have to be BN_ULLONG. The least we
-                 * know it's less that d0, isn't it?
-                 */
-                rem=(n1-q*d0)&BN_MASK2;
-#endif
-                t2=(BN_ULLONG)d1*q;
-
-                for (;;)
-                        {
-                        if (t2 <= ((((BN_ULLONG)rem)<<BN_BITS2)|wnump[-2]))
-                                break;
-                        q--;
-                        rem += d0;
-                        if (rem < d0) break; /* don't let rem overflow */
-                        t2 -= d1;
-                        }
-#else
-                BN_ULONG t2l,t2h,ql,qh;
-
-#ifndef REMINDER_IS_ALREADY_CALCULATED
-                /*
-                 * It's more than enough with the only multiplication.
-                 * See the comment above in BN_LLONG section...
-                 */
-                rem=(n1-q*d0)&BN_MASK2;
-#endif
-                t2l=LBITS(d1); t2h=HBITS(d1);
-                ql =LBITS(q);  qh =HBITS(q);
-                mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */
-
-                for (;;)
-                        {
-                        if ((t2h < rem) ||
-                                ((t2h == rem) && (t2l <= wnump[-2])))
-                                break;
-                        q--;
-                        rem += d0;
-                        if (rem < d0) break; /* don't let rem overflow */
-                        if (t2l < d1) t2h--; t2l -= d1;
-                        }
-#endif
-                }
-#endif /* !BN_DIV3W */
-                wnum.d--; wnum.top++;
-                l0=bn_mul_words(tmp->d,sdiv->d,div_n,q);
-                tmp->d[div_n]=l0;
-                for (j=div_n+1; j>0; j--)
-                        if (tmp->d[j-1]) break;
-                tmp->top=j;
-
-                j=wnum.top;
-                BN_sub(&wnum,&wnum,tmp);
-
-                snum->top=snum->top+wnum.top-j;
-
-                if (wnum.neg)
-                        {
-                        q--;
-                        j=wnum.top;
-                        BN_add(&wnum,&wnum,sdiv);
-                        snum->top+=wnum.top-j;
-                        }
-                *(resp--)=q;
-                wnump--;
-                }
-        if (rm != NULL)
-                {
-                BN_rshift(rm,snum,norm_shift);
-                rm->neg=num->neg;
-                }
-        return(1);
-err:
-        return(0);
-        }
-
-#endif
-
-/* rem != m */
-int BN_mod(BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
-        {
-#if 0 /* The old slow way */
-        int i,nm,nd;
-        BIGNUM *dv;
-
-        if (BN_ucmp(m,d) < 0)
-                return((BN_copy(rem,m) == NULL)?0:1);
-
-        dv= &(ctx->bn[ctx->tos]);
-
-        if (!BN_copy(rem,m)) return(0);
-
-        nm=BN_num_bits(rem);
-        nd=BN_num_bits(d);
-        if (!BN_lshift(dv,d,nm-nd)) return(0);
-        for (i=nm-nd; i>=0; i--)
-                {
-                if (BN_cmp(rem,dv) >= 0)
-                        {
-                        if (!BN_sub(rem,rem,dv)) return(0);
-                        }
-                if (!BN_rshift1(dv,dv)) return(0);
-                }
-        return(1);
-#else
-        return(BN_div(NULL,rem,m,d,ctx));
-#endif
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_err.c b/src/lib/libcrypto/bn/bn_err.c
deleted file mode 100644
index 73e80774e5..0000000000
--- a/src/lib/libcrypto/bn/bn_err.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* crypto/bn/bn_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA BN_str_functs[]=
-        {
-{ERR_PACK(0,BN_F_BN_BLINDING_CONVERT,0),        "BN_BLINDING_convert"},
-{ERR_PACK(0,BN_F_BN_BLINDING_INVERT,0), "BN_BLINDING_invert"},
-{ERR_PACK(0,BN_F_BN_BLINDING_NEW,0),    "BN_BLINDING_new"},
-{ERR_PACK(0,BN_F_BN_BLINDING_UPDATE,0), "BN_BLINDING_update"},
-{ERR_PACK(0,BN_F_BN_BN2DEC,0),  "BN_bn2dec"},
-{ERR_PACK(0,BN_F_BN_BN2HEX,0),  "BN_bn2hex"},
-{ERR_PACK(0,BN_F_BN_CTX_NEW,0), "BN_CTX_new"},
-{ERR_PACK(0,BN_F_BN_DIV,0),     "BN_div"},
-{ERR_PACK(0,BN_F_BN_EXPAND2,0), "bn_expand2"},
-{ERR_PACK(0,BN_F_BN_MOD_EXP_MONT,0),    "BN_mod_exp_mont"},
-{ERR_PACK(0,BN_F_BN_MOD_INVERSE,0),     "BN_mod_inverse"},
-{ERR_PACK(0,BN_F_BN_MOD_MUL_RECIPROCAL,0),      "BN_mod_mul_reciprocal"},
-{ERR_PACK(0,BN_F_BN_MPI2BN,0),  "BN_mpi2bn"},
-{ERR_PACK(0,BN_F_BN_NEW,0),     "BN_new"},
-{ERR_PACK(0,BN_F_BN_RAND,0),    "BN_rand"},
-{ERR_PACK(0,BN_F_BN_USUB,0),    "BN_usub"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA BN_str_reasons[]=
-        {
-{BN_R_ARG2_LT_ARG3                       ,"arg2 lt arg3"},
-{BN_R_BAD_RECIPROCAL                     ,"bad reciprocal"},
-{BN_R_CALLED_WITH_EVEN_MODULUS           ,"called with even modulus"},
-{BN_R_DIV_BY_ZERO                        ,"div by zero"},
-{BN_R_ENCODING_ERROR                     ,"encoding error"},
-{BN_R_EXPAND_ON_STATIC_BIGNUM_DATA       ,"expand on static bignum data"},
-{BN_R_INVALID_LENGTH                     ,"invalid length"},
-{BN_R_NOT_INITIALIZED                    ,"not initialized"},
-{BN_R_NO_INVERSE                         ,"no inverse"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_BN_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_BN,BN_str_functs);
-                ERR_load_strings(ERR_LIB_BN,BN_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
deleted file mode 100644
index 2df1614ada..0000000000
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* crypto/bn/bn_exp.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"
-
-#define TABLE_SIZE      16
-
-/* slow but works */
-int BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
-        {
-        BIGNUM *t;
-        int r=0;
-
-        bn_check_top(a);
-        bn_check_top(b);
-        bn_check_top(m);
-
-        t= &(ctx->bn[ctx->tos++]);
-        if (a == b)
-                { if (!BN_sqr(t,a,ctx)) goto err; }
-        else
-                { if (!BN_mul(t,a,b,ctx)) goto err; }
-        if (!BN_mod(ret,t,m,ctx)) goto err;
-        r=1;
-err:
-        ctx->tos--;
-        return(r);
-        }
-
-#if 0
-/* this one works - simple but works */
-int BN_mod_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m, BN_CTX *ctx)
-        {
-        int i,bits,ret=0;
-        BIGNUM *v,*tmp;
-
-        v= &(ctx->bn[ctx->tos++]);
-        tmp= &(ctx->bn[ctx->tos++]);
-
-        if (BN_copy(v,a) == NULL) goto err;
-        bits=BN_num_bits(p);
-
-        if (BN_is_odd(p))
-                { if (BN_copy(r,a) == NULL) goto err; }
-        else    { if (!BN_one(r)) goto err; }
-
-        for (i=1; i<bits; i++)
-                {
-                if (!BN_sqr(tmp,v,ctx)) goto err;
-                if (!BN_mod(v,tmp,m,ctx)) goto err;
-                if (BN_is_bit_set(p,i))
-                        {
-                        if (!BN_mul(tmp,r,v,ctx)) goto err;
-                        if (!BN_mod(r,tmp,m,ctx)) goto err;
-                        }
-                }
-        ret=1;
-err:
-        ctx->tos-=2;
-        return(ret);
-        }
-
-#endif
-
-/* this one works - simple but works */
-int BN_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BN_CTX *ctx)
-        {
-        int i,bits,ret=0,tos;
-        BIGNUM *v,*rr;
-
-        tos=ctx->tos;
-        v= &(ctx->bn[ctx->tos++]);
-        if ((r == a) || (r == p))
-                rr= &(ctx->bn[ctx->tos++]);
-        else
-                rr=r;
-
-        if (BN_copy(v,a) == NULL) goto err;
-        bits=BN_num_bits(p);
-
-        if (BN_is_odd(p))
-                { if (BN_copy(rr,a) == NULL) goto err; }
-        else    { if (!BN_one(rr)) goto err; }
-
-        for (i=1; i<bits; i++)
-                {
-                if (!BN_sqr(v,v,ctx)) goto err;
-                if (BN_is_bit_set(p,i))
-                        {
-                        if (!BN_mul(rr,rr,v,ctx)) goto err;
-                        }
-                }
-        ret=1;
-err:
-        ctx->tos=tos;
-        if (r != rr) BN_copy(r,rr);
-        return(ret);
-        }
-
-int BN_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
-               BN_CTX *ctx)
-        {
-        int ret;
-
-        bn_check_top(a);
-        bn_check_top(p);
-        bn_check_top(m);
-
-#ifdef MONT_MUL_MOD
-        /* I have finally been able to take out this pre-condition of
-         * the top bit being set.  It was caused by an error in BN_div
-         * with negatives.  There was also another problem when for a^b%m
-         * a >= m.  eay 07-May-97 */
-/*      if ((m->d[m->top-1]&BN_TBIT) && BN_is_odd(m)) */
-
-        if (BN_is_odd(m))
-                { ret=BN_mod_exp_mont(r,a,p,m,ctx,NULL); }
-        else
-#endif
-#ifdef RECP_MUL_MOD
-                { ret=BN_mod_exp_recp(r,a,p,m,ctx); }
-#else
-                { ret=BN_mod_exp_simple(r,a,p,m,ctx); }
-#endif
-
-        return(ret);
-        }
-
-/* #ifdef RECP_MUL_MOD */
-int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx)
-        {
-        int i,j,bits,ret=0,wstart,wend,window,wvalue;
-        int start=1,ts=0;
-        BIGNUM *aa;
-        BIGNUM val[TABLE_SIZE];
-        BN_RECP_CTX recp;
-
-        aa= &(ctx->bn[ctx->tos++]);
-        bits=BN_num_bits(p);
-
-        if (bits == 0)
-                {
-                BN_one(r);
-                return(1);
-                }
-        BN_RECP_CTX_init(&recp);
-        if (BN_RECP_CTX_set(&recp,m,ctx) <= 0) goto err;
-
-        BN_init(&(val[0]));
-        ts=1;
-
-        if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
-        if (!BN_mod_mul_reciprocal(aa,&(val[0]),&(val[0]),&recp,ctx))
-                goto err;                               /* 2 */
-
-        if (bits <= 17) /* This is probably 3 or 0x10001, so just do singles */
-                window=1;
-        else if (bits >= 256)
-                window=5;       /* max size of window */
-        else if (bits >= 128)
-                window=4;
-        else
-                window=3;
-
-        j=1<<(window-1);
-        for (i=1; i<j; i++)
-                {
-                BN_init(&val[i]);
-                if (!BN_mod_mul_reciprocal(&(val[i]),&(val[i-1]),aa,&recp,ctx))
-                        goto err;
-                }
-        ts=i;
-
-        start=1;        /* This is used to avoid multiplication etc
-                         * when there is only the value '1' in the
-                         * buffer. */
-        wvalue=0;       /* The 'value' of the window */
-        wstart=bits-1;  /* The top bit of the window */
-        wend=0;         /* The bottom bit of the window */
-
-        if (!BN_one(r)) goto err;
-
-        for (;;)
-                {
-                if (BN_is_bit_set(p,wstart) == 0)
-                        {
-                        if (!start)
-                                if (!BN_mod_mul_reciprocal(r,r,r,&recp,ctx))
-                                goto err;
-                        if (wstart == 0) break;
-                        wstart--;
-                        continue;
-                        }
-                /* We now have wstart on a 'set' bit, we now need to work out
-                 * how bit a window to do.  To do this we need to scan
-                 * forward until the last set bit before the end of the
-                 * window */
-                j=wstart;
-                wvalue=1;
-                wend=0;
-                for (i=1; i<window; i++)
-                        {
-                        if (wstart-i < 0) break;
-                        if (BN_is_bit_set(p,wstart-i))
-                                {
-                                wvalue<<=(i-wend);
-                                wvalue|=1;
-                                wend=i;
-                                }
-                        }
-
-                /* wend is the size of the current window */
-                j=wend+1;
-                /* add the 'bytes above' */
-                if (!start)
-                        for (i=0; i<j; i++)
-                                {
-                                if (!BN_mod_mul_reciprocal(r,r,r,&recp,ctx))
-                                        goto err;
-                                }
-                
-                /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul_reciprocal(r,r,&(val[wvalue>>1]),&recp,ctx))
-                        goto err;
-
-                /* move the 'window' down further */
-                wstart-=wend+1;
-                wvalue=0;
-                start=0;
-                if (wstart < 0) break;
-                }
-        ret=1;
-err:
-        ctx->tos--;
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
-        BN_RECP_CTX_free(&recp);
-        return(ret);
-        }
-/* #endif */
-
-/* #ifdef MONT_MUL_MOD */
-int BN_mod_exp_mont(BIGNUM *rr, BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-        {
-        int i,j,bits,ret=0,wstart,wend,window,wvalue;
-        int start=1,ts=0;
-        BIGNUM *d,*r;
-        BIGNUM *aa;
-        BIGNUM val[TABLE_SIZE];
-        BN_MONT_CTX *mont=NULL;
-
-        bn_check_top(a);
-        bn_check_top(p);
-        bn_check_top(m);
-
-        if (!(m->d[0] & 1))
-                {
-                BNerr(BN_F_BN_MOD_EXP_MONT,BN_R_CALLED_WITH_EVEN_MODULUS);
-                return(0);
-                }
-        d= &(ctx->bn[ctx->tos++]);
-        r= &(ctx->bn[ctx->tos++]);
-        bits=BN_num_bits(p);
-        if (bits == 0)
-                {
-                BN_one(r);
-                return(1);
-                }
-
-        /* If this is not done, things will break in the montgomery
-         * part */
-
-#if 1
-        if (in_mont != NULL)
-                mont=in_mont;
-        else
-#endif
-                {
-                if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-                if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
-                }
-
-        BN_init(&val[0]);
-        ts=1;
-        if (BN_ucmp(a,m) >= 0)
-                {
-                BN_mod(&(val[0]),a,m,ctx);
-                aa= &(val[0]);
-                }
-        else
-                aa=a;
-        if (!BN_to_montgomery(&(val[0]),aa,mont,ctx)) goto err; /* 1 */
-        if (!BN_mod_mul_montgomery(d,&(val[0]),&(val[0]),mont,ctx)) goto err; /* 2 */
-
-        if (bits <= 20) /* This is probably 3 or 0x10001, so just do singles */
-                window=1;
-        else if (bits >= 256)
-                window=5;       /* max size of window */
-        else if (bits >= 128)
-                window=4;
-        else
-                window=3;
-
-        j=1<<(window-1);
-        for (i=1; i<j; i++)
-                {
-                BN_init(&(val[i]));
-                if (!BN_mod_mul_montgomery(&(val[i]),&(val[i-1]),d,mont,ctx))
-                        goto err;
-                }
-        ts=i;
-
-        start=1;        /* This is used to avoid multiplication etc
-                         * when there is only the value '1' in the
-                         * buffer. */
-        wvalue=0;       /* The 'value' of the window */
-        wstart=bits-1;  /* The top bit of the window */
-        wend=0;         /* The bottom bit of the window */
-
-        if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
-        for (;;)
-                {
-                if (BN_is_bit_set(p,wstart) == 0)
-                        {
-                        if (!start)
-                                {
-                                if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                goto err;
-                                }
-                        if (wstart == 0) break;
-                        wstart--;
-                        continue;
-                        }
-                /* We now have wstart on a 'set' bit, we now need to work out
-                 * how bit a window to do.  To do this we need to scan
-                 * forward until the last set bit before the end of the
-                 * window */
-                j=wstart;
-                wvalue=1;
-                wend=0;
-                for (i=1; i<window; i++)
-                        {
-                        if (wstart-i < 0) break;
-                        if (BN_is_bit_set(p,wstart-i))
-                                {
-                                wvalue<<=(i-wend);
-                                wvalue|=1;
-                                wend=i;
-                                }
-                        }
-
-                /* wend is the size of the current window */
-                j=wend+1;
-                /* add the 'bytes above' */
-                if (!start)
-                        for (i=0; i<j; i++)
-                                {
-                                if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                        goto err;
-                                }
-                
-                /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul_montgomery(r,r,&(val[wvalue>>1]),mont,ctx))
-                        goto err;
-
-                /* move the 'window' down further */
-                wstart-=wend+1;
-                wvalue=0;
-                start=0;
-                if (wstart < 0) break;
-                }
-        BN_from_montgomery(rr,r,mont,ctx);
-        ret=1;
-err:
-        if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
-        ctx->tos-=2;
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
-        return(ret);
-        }
-/* #endif */
-
-/* The old fallback, simple version :-) */
-int BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,
-             BN_CTX *ctx)
-        {
-        int i,j,bits,ret=0,wstart,wend,window,wvalue,ts=0;
-        int start=1;
-        BIGNUM *d;
-        BIGNUM val[TABLE_SIZE];
-
-        d= &(ctx->bn[ctx->tos++]);
-        bits=BN_num_bits(p);
-
-        if (bits == 0)
-                {
-                BN_one(r);
-                return(1);
-                }
-
-        BN_init(&(val[0]));
-        ts=1;
-        if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
-        if (!BN_mod_mul(d,&(val[0]),&(val[0]),m,ctx))
-                goto err;                               /* 2 */
-
-        if (bits <= 17) /* This is probably 3 or 0x10001, so just do singles */
-                window=1;
-        else if (bits >= 256)
-                window=5;       /* max size of window */
-        else if (bits >= 128)
-                window=4;
-        else
-                window=3;
-
-        j=1<<(window-1);
-        for (i=1; i<j; i++)
-                {
-                BN_init(&(val[i]));
-                if (!BN_mod_mul(&(val[i]),&(val[i-1]),d,m,ctx))
-                        goto err;
-                }
-        ts=i;
-
-        start=1;        /* This is used to avoid multiplication etc
-                         * when there is only the value '1' in the
-                         * buffer. */
-        wvalue=0;       /* The 'value' of the window */
-        wstart=bits-1;  /* The top bit of the window */
-        wend=0;         /* The bottom bit of the window */
-
-        if (!BN_one(r)) goto err;
-
-        for (;;)
-                {
-                if (BN_is_bit_set(p,wstart) == 0)
-                        {
-                        if (!start)
-                                if (!BN_mod_mul(r,r,r,m,ctx))
-                                goto err;
-                        if (wstart == 0) break;
-                        wstart--;
-                        continue;
-                        }
-                /* We now have wstart on a 'set' bit, we now need to work out
-                 * how bit a window to do.  To do this we need to scan
-                 * forward until the last set bit before the end of the
-                 * window */
-                j=wstart;
-                wvalue=1;
-                wend=0;
-                for (i=1; i<window; i++)
-                        {
-                        if (wstart-i < 0) break;
-                        if (BN_is_bit_set(p,wstart-i))
-                                {
-                                wvalue<<=(i-wend);
-                                wvalue|=1;
-                                wend=i;
-                                }
-                        }
-
-                /* wend is the size of the current window */
-                j=wend+1;
-                /* add the 'bytes above' */
-                if (!start)
-                        for (i=0; i<j; i++)
-                                {
-                                if (!BN_mod_mul(r,r,r,m,ctx))
-                                        goto err;
-                                }
-                
-                /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul(r,r,&(val[wvalue>>1]),m,ctx))
-                        goto err;
-
-                /* move the 'window' down further */
-                wstart-=wend+1;
-                wvalue=0;
-                start=0;
-                if (wstart < 0) break;
-                }
-        ret=1;
-err:
-        ctx->tos--;
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_exp2.c b/src/lib/libcrypto/bn/bn_exp2.c
deleted file mode 100644
index 1132d53365..0000000000
--- a/src/lib/libcrypto/bn/bn_exp2.c
+++ /dev/null
@@ -1,195 +0,0 @@
-#include <stdio.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-
-/* I've done some timing with different table sizes.
- * The main hassle is that even with bits set at 3, this requires
- * 63 BIGNUMs to store the pre-calculated values.
- *          512   1024 
- * bits=1  75.4%  79.4%
- * bits=2  61.2%  62.4%
- * bits=3  61.3%  59.3%
- * The lack of speed improvment is also a function of the pre-calculation
- * which could be removed.
- */
-#define EXP2_TABLE_BITS 2 /* 1  2  3  4  5  */
-#define EXP2_TABLE_SIZE 4 /* 2  4  8 16 32  */
-
-int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
-             BIGNUM *p2, BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-        {
-        int i,j,k,bits,bits1,bits2,ret=0,wstart,wend,window,xvalue,yvalue;
-        int start=1,ts=0,x,y;
-        BIGNUM *d,*aa1,*aa2,*r;
-        BIGNUM val[EXP2_TABLE_SIZE][EXP2_TABLE_SIZE];
-        BN_MONT_CTX *mont=NULL;
-
-        bn_check_top(a1);
-        bn_check_top(p1);
-        bn_check_top(a2);
-        bn_check_top(p2);
-        bn_check_top(m);
-
-        if (!(m->d[0] & 1))
-                {
-                BNerr(BN_F_BN_MOD_EXP_MONT,BN_R_CALLED_WITH_EVEN_MODULUS);
-                return(0);
-                }
-        d= &(ctx->bn[ctx->tos++]);
-        r= &(ctx->bn[ctx->tos++]);
-        bits1=BN_num_bits(p1);
-        bits2=BN_num_bits(p2);
-        if ((bits1 == 0) && (bits2 == 0))
-                {
-                BN_one(r);
-                return(1);
-                }
-        bits=(bits1 > bits2)?bits1:bits2;
-
-        /* If this is not done, things will break in the montgomery
-         * part */
-
-        if (in_mont != NULL)
-                mont=in_mont;
-        else
-                {
-                if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-                if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
-                }
-
-        BN_init(&(val[0][0]));
-        BN_init(&(val[1][1]));
-        BN_init(&(val[0][1]));
-        BN_init(&(val[1][0]));
-        ts=1;
-        if (BN_ucmp(a1,m) >= 0)
-                {
-                BN_mod(&(val[1][0]),a1,m,ctx);
-                aa1= &(val[1][0]);
-                }
-        else
-                aa1=a1;
-        if (BN_ucmp(a2,m) >= 0)
-                {
-                BN_mod(&(val[0][1]),a2,m,ctx);
-                aa2= &(val[0][1]);
-                }
-        else
-                aa2=a2;
-        if (!BN_to_montgomery(&(val[1][0]),aa1,mont,ctx)) goto err;
-        if (!BN_to_montgomery(&(val[0][1]),aa2,mont,ctx)) goto err;
-        if (!BN_mod_mul_montgomery(&(val[1][1]),
-                &(val[1][0]),&(val[0][1]),mont,ctx))
-                goto err;
-
-#if 0
-        if (bits <= 20) /* This is probably 3 or 0x10001, so just do singles */
-                window=1;
-        else if (bits > 250)
-                window=5;       /* max size of window */
-        else if (bits >= 120)
-                window=4;
-        else
-                window=3;
-#else
-        window=EXP2_TABLE_BITS;
-#endif
-
-        k=1<<window;
-        for (x=0; x<k; x++)
-                {
-                if (x >= 2)
-                        {
-                        BN_init(&(val[x][0]));
-                        BN_init(&(val[x][1]));
-                        if (!BN_mod_mul_montgomery(&(val[x][0]),
-                                &(val[1][0]),&(val[x-1][0]),mont,ctx)) goto err;
-                        if (!BN_mod_mul_montgomery(&(val[x][1]),
-                                &(val[1][0]),&(val[x-1][1]),mont,ctx)) goto err;
-                        }
-                for (y=2; y<k; y++)
-                        {
-                        BN_init(&(val[x][y]));
-                        if (!BN_mod_mul_montgomery(&(val[x][y]),
-                                &(val[x][y-1]),&(val[0][1]),mont,ctx))
-                                goto err;
-                        }
-                }
-        ts=k;
-
-        start=1;        /* This is used to avoid multiplication etc
-                         * when there is only the value '1' in the
-                         * buffer. */
-        xvalue=0;       /* The 'x value' of the window */
-        yvalue=0;       /* The 'y value' of the window */
-        wstart=bits-1;  /* The top bit of the window */
-        wend=0;         /* The bottom bit of the window */
-
-        if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
-        for (;;)
-                {
-                xvalue=BN_is_bit_set(p1,wstart);
-                yvalue=BN_is_bit_set(p2,wstart);
-                if (!(xvalue || yvalue))
-                        {
-                        if (!start)
-                                {
-                                if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                        goto err;
-                                }
-                        wstart--;
-                        if (wstart < 0) break;
-                        continue;
-                        }
-                /* We now have wstart on a 'set' bit, we now need to work out
-                 * how bit a window to do.  To do this we need to scan
-                 * forward until the last set bit before the end of the
-                 * window */
-                j=wstart;
-                /* xvalue=BN_is_bit_set(p1,wstart); already set */
-                /* yvalue=BN_is_bit_set(p1,wstart); already set */
-                wend=0;
-                for (i=1; i<window; i++)
-                        {
-                        if (wstart-i < 0) break;
-                        xvalue+=xvalue;
-                        xvalue|=BN_is_bit_set(p1,wstart-i);
-                        yvalue+=yvalue;
-                        yvalue|=BN_is_bit_set(p2,wstart-i);
-                        }
-
-                /* i is the size of the current window */
-                /* add the 'bytes above' */
-                if (!start)
-                        for (j=0; j<i; j++)
-                                {
-                                if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                        goto err;
-                                }
-                
-                /* wvalue will be an odd number < 2^window */
-                if (xvalue || yvalue)
-                        {
-                        if (!BN_mod_mul_montgomery(r,r,&(val[xvalue][yvalue]),
-                                mont,ctx)) goto err;
-                        }
-
-                /* move the 'window' down further */
-                wstart-=i;
-                start=0;
-                if (wstart < 0) break;
-                }
-        BN_from_montgomery(rr,r,mont,ctx);
-        ret=1;
-err:
-        if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
-        ctx->tos-=2;
-        for (i=0; i<ts; i++)
-                {
-                for (j=0; j<ts; j++)
-                        {
-                        BN_clear_free(&(val[i][j]));
-                        }
-                }
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/bn/bn_gcd.c b/src/lib/libcrypto/bn/bn_gcd.c
deleted file mode 100644
index 64a76f4498..0000000000
--- a/src/lib/libcrypto/bn/bn_gcd.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* crypto/bn/bn_gcd.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"
-
-static BIGNUM *euclid(BIGNUM *a, BIGNUM *b);
-int BN_gcd(BIGNUM *r, BIGNUM *in_a, BIGNUM *in_b, BN_CTX *ctx)
-        {
-        BIGNUM *a,*b,*t;
-        int ret=0;
-
-        bn_check_top(in_a);
-        bn_check_top(in_b);
-
-        a= &(ctx->bn[ctx->tos]);
-        b= &(ctx->bn[ctx->tos+1]);
-
-        if (BN_copy(a,in_a) == NULL) goto err;
-        if (BN_copy(b,in_b) == NULL) goto err;
-
-        if (BN_cmp(a,b) < 0) { t=a; a=b; b=t; }
-        t=euclid(a,b);
-        if (t == NULL) goto err;
-
-        if (BN_copy(r,t) == NULL) goto err;
-        ret=1;
-err:
-        return(ret);
-        }
-
-static BIGNUM *euclid(BIGNUM *a, BIGNUM *b)
-        {
-        BIGNUM *t;
-        int shifts=0;
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        for (;;)
-                {
-                if (BN_is_zero(b))
-                        break;
-
-                if (BN_is_odd(a))
-                        {
-                        if (BN_is_odd(b))
-                                {
-                                if (!BN_sub(a,a,b)) goto err;
-                                if (!BN_rshift1(a,a)) goto err;
-                                if (BN_cmp(a,b) < 0)
-                                        { t=a; a=b; b=t; }
-                                }
-                        else            /* a odd - b even */
-                                {
-                                if (!BN_rshift1(b,b)) goto err;
-                                if (BN_cmp(a,b) < 0)
-                                        { t=a; a=b; b=t; }
-                                }
-                        }
-                else                    /* a is even */
-                        {
-                        if (BN_is_odd(b))
-                                {
-                                if (!BN_rshift1(a,a)) goto err;
-                                if (BN_cmp(a,b) < 0)
-                                        { t=a; a=b; b=t; }
-                                }
-                        else            /* a even - b even */
-                                {
-                                if (!BN_rshift1(a,a)) goto err;
-                                if (!BN_rshift1(b,b)) goto err;
-                                shifts++;
-                                }
-                        }
-                }
-        if (shifts)
-                {
-                if (!BN_lshift(a,a,shifts)) goto err;
-                }
-        return(a);
-err:
-        return(NULL);
-        }
-
-/* solves ax == 1 (mod n) */
-BIGNUM *BN_mod_inverse(BIGNUM *in, BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
-        {
-        BIGNUM *A,*B,*X,*Y,*M,*D,*R;
-        BIGNUM *T,*ret=NULL;
-        int sign;
-
-        bn_check_top(a);
-        bn_check_top(n);
-
-        A= &(ctx->bn[ctx->tos]);
-        B= &(ctx->bn[ctx->tos+1]);
-        X= &(ctx->bn[ctx->tos+2]);
-        D= &(ctx->bn[ctx->tos+3]);
-        M= &(ctx->bn[ctx->tos+4]);
-        Y= &(ctx->bn[ctx->tos+5]);
-        ctx->tos+=6;
-        if (in == NULL)
-                R=BN_new();
-        else
-                R=in;
-        if (R == NULL) goto err;
-
-        BN_zero(X);
-        BN_one(Y);
-        if (BN_copy(A,a) == NULL) goto err;
-        if (BN_copy(B,n) == NULL) goto err;
-        sign=1;
-
-        while (!BN_is_zero(B))
-                {
-                if (!BN_div(D,M,A,B,ctx)) goto err;
-                T=A;
-                A=B;
-                B=M;
-                /* T has a struct, M does not */
-
-                if (!BN_mul(T,D,X,ctx)) goto err;
-                if (!BN_add(T,T,Y)) goto err;
-                M=Y;
-                Y=X;
-                X=T;
-                sign= -sign;
-                }
-        if (sign < 0)
-                {
-                if (!BN_sub(Y,n,Y)) goto err;
-                }
-
-        if (BN_is_one(A))
-                { if (!BN_mod(R,Y,n,ctx)) goto err; }
-        else
-                {
-                BNerr(BN_F_BN_MOD_INVERSE,BN_R_NO_INVERSE);
-                goto err;
-                }
-        ret=R;
-err:
-        if ((ret == NULL) && (in == NULL)) BN_free(R);
-        ctx->tos-=6;
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_lcl.h b/src/lib/libcrypto/bn/bn_lcl.h
deleted file mode 100644
index 85a372695b..0000000000
--- a/src/lib/libcrypto/bn/bn_lcl.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* crypto/bn/bn_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.]
- */
-
-#ifndef HEADER_BN_LCL_H
-#define HEADER_BN_LCL_H
-
-#include <openssl/bn.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Pentium pro 16,16,16,32,64 */
-/* Alpha       16,16,16,16.64 */
-#define BN_MULL_SIZE_NORMAL                     (16) /* 32 */
-#define BN_MUL_RECURSIVE_SIZE_NORMAL            (16) /* 32 less than */
-#define BN_SQR_RECURSIVE_SIZE_NORMAL            (16) /* 32 */
-#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL        (32) /* 32 */
-#define BN_MONT_CTX_SET_SIZE_WORD               (64) /* 32 */
-
-#if 0
-#ifndef BN_MUL_COMBA
-/* #define bn_mul_comba8(r,a,b) bn_mul_normal(r,a,8,b,8) */
-/* #define bn_mul_comba4(r,a,b) bn_mul_normal(r,a,4,b,4) */
-#endif
-
-#ifndef BN_SQR_COMBA
-/* This is probably faster than using the C code - I need to check */
-#define bn_sqr_comba8(r,a)      bn_mul_normal(r,a,8,a,8)
-#define bn_sqr_comba4(r,a)      bn_mul_normal(r,a,4,a,4)
-#endif
-#endif
-
-/*************************************************************
- * Using the long long type
- */
-#define Lw(t)    (((BN_ULONG)(t))&BN_MASK2)
-#define Hw(t)    (((BN_ULONG)((t)>>BN_BITS2))&BN_MASK2)
-
-/* These are used for internal error checking and are not normally used */
-#ifdef BN_DEBUG
-#define bn_check_top(a) \
-        { if (((a)->top < 0) || ((a)->top > (a)->max)) \
-                { char *nullp=NULL; *nullp='z'; } }
-#define bn_check_num(a) if ((a) < 0) { char *nullp=NULL; *nullp='z'; }
-#else
-#define bn_check_top(a)
-#define bn_check_num(a)
-#endif
-
-/* This macro is to add extra stuff for development checking */
-#ifdef BN_DEBUG
-#define bn_set_max(r) ((r)->max=(r)->top,BN_set_flags((r),BN_FLG_STATIC_DATA))
-#else
-#define bn_set_max(r)
-#endif
-
-/* These macros are used to 'take' a section of a bignum for read only use */
-#define bn_set_low(r,a,n) \
-        { \
-        (r)->top=((a)->top > (n))?(n):(a)->top; \
-        (r)->d=(a)->d; \
-        (r)->neg=(a)->neg; \
-        (r)->flags|=BN_FLG_STATIC_DATA; \
-        bn_set_max(r); \
-        }
-
-#define bn_set_high(r,a,n) \
-        { \
-        if ((a)->top > (n)) \
-                { \
-                (r)->top=(a)->top-n; \
-                (r)->d= &((a)->d[n]); \
-                } \
-        else \
-                (r)->top=0; \
-        (r)->neg=(a)->neg; \
-        (r)->flags|=BN_FLG_STATIC_DATA; \
-        bn_set_max(r); \
-        }
-
-/* #define bn_expand(n,b) ((((b)/BN_BITS2) <= (n)->max)?(n):bn_expand2((n),(b))) */
-
-#ifdef BN_LLONG
-#define mul_add(r,a,w,c) { \
-        BN_ULLONG t; \
-        t=(BN_ULLONG)w * (a) + (r) + (c); \
-        (r)= Lw(t); \
-        (c)= Hw(t); \
-        }
-
-#define mul(r,a,w,c) { \
-        BN_ULLONG t; \
-        t=(BN_ULLONG)w * (a) + (c); \
-        (r)= Lw(t); \
-        (c)= Hw(t); \
-        }
-
-#else
-/*************************************************************
- * No long long type
- */
-
-#define LBITS(a)        ((a)&BN_MASK2l)
-#define HBITS(a)        (((a)>>BN_BITS4)&BN_MASK2l)
-#define L2HBITS(a)      ((BN_ULONG)((a)&BN_MASK2l)<<BN_BITS4)
-
-#define LLBITS(a)       ((a)&BN_MASKl)
-#define LHBITS(a)       (((a)>>BN_BITS2)&BN_MASKl)
-#define LL2HBITS(a)     ((BN_ULLONG)((a)&BN_MASKl)<<BN_BITS2)
-
-#define mul64(l,h,bl,bh) \
-        { \
-        BN_ULONG m,m1,lt,ht; \
- \
-        lt=l; \
-        ht=h; \
-        m =(bh)*(lt); \
-        lt=(bl)*(lt); \
-        m1=(bl)*(ht); \
-        ht =(bh)*(ht); \
-        m=(m+m1)&BN_MASK2; if (m < m1) ht+=L2HBITS(1L); \
-        ht+=HBITS(m); \
-        m1=L2HBITS(m); \
-        lt=(lt+m1)&BN_MASK2; if (lt < m1) ht++; \
-        (l)=lt; \
-        (h)=ht; \
-        }
-
-#define sqr64(lo,ho,in) \
-        { \
-        BN_ULONG l,h,m; \
- \
-        h=(in); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        m =(l)*(h); \
-        l*=l; \
-        h*=h; \
-        h+=(m&BN_MASK2h1)>>(BN_BITS4-1); \
-        m =(m&BN_MASK2l)<<(BN_BITS4+1); \
-        l=(l+m)&BN_MASK2; if (l < m) h++; \
-        (lo)=l; \
-        (ho)=h; \
-        }
-
-#define mul_add(r,a,bl,bh,c) { \
-        BN_ULONG l,h; \
- \
-        h= (a); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        mul64(l,h,(bl),(bh)); \
- \
-        /* non-multiply part */ \
-        l=(l+(c))&BN_MASK2; if (l < (c)) h++; \
-        (c)=(r); \
-        l=(l+(c))&BN_MASK2; if (l < (c)) h++; \
-        (c)=h&BN_MASK2; \
-        (r)=l; \
-        }
-
-#define mul(r,a,bl,bh,c) { \
-        BN_ULONG l,h; \
- \
-        h= (a); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        mul64(l,h,(bl),(bh)); \
- \
-        /* non-multiply part */ \
-        l+=(c); if ((l&BN_MASK2) < (c)) h++; \
-        (c)=h&BN_MASK2; \
-        (r)=l&BN_MASK2; \
-        }
-
-#endif
-
-OPENSSL_EXTERN int bn_limit_bits;
-OPENSSL_EXTERN int bn_limit_num;        /* (1<<bn_limit_bits) */
-/* Recursive 'low' limit */
-OPENSSL_EXTERN int bn_limit_bits_low;
-OPENSSL_EXTERN int bn_limit_num_low;    /* (1<<bn_limit_bits_low) */
-/* Do modified 'high' part calculation' */
-OPENSSL_EXTERN int bn_limit_bits_high;
-OPENSSL_EXTERN int bn_limit_num_high;   /* (1<<bn_limit_bits_high) */
-OPENSSL_EXTERN int bn_limit_bits_mont;
-OPENSSL_EXTERN int bn_limit_num_mont;   /* (1<<bn_limit_bits_mont) */
-
-BIGNUM *bn_expand2(BIGNUM *b, int bits);
-
-void bn_mul_normal(BN_ULONG *r,BN_ULONG *a,int na,BN_ULONG *b,int nb);
-void bn_mul_comba8(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
-void bn_mul_comba4(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
-void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp);
-void bn_sqr_comba8(BN_ULONG *r,BN_ULONG *a);
-void bn_sqr_comba4(BN_ULONG *r,BN_ULONG *a);
-int bn_cmp_words(BN_ULONG *a,BN_ULONG *b,int n);
-void bn_mul_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,int n2,BN_ULONG *t);
-void bn_mul_part_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,
-        int tn, int n,BN_ULONG *t);
-void bn_sqr_recursive(BN_ULONG *r,BN_ULONG *a, int n2, BN_ULONG *t);
-void bn_mul_low_normal(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b, int n);
-void bn_mul_low_recursive(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,int n2,
-        BN_ULONG *t);
-void bn_mul_high(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b,BN_ULONG *l,int n2,
-        BN_ULONG *t);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/bn/bn_lib.c b/src/lib/libcrypto/bn/bn_lib.c
deleted file mode 100644
index 5d62d88e8b..0000000000
--- a/src/lib/libcrypto/bn/bn_lib.c
+++ /dev/null
@@ -1,787 +0,0 @@
-/* crypto/bn/bn_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 "bn_lcl.h"
-
-const char *BN_version="Big Number" OPENSSL_VERSION_PTEXT;
-
-/* For a 32 bit machine
- * 2 -   4 ==  128
- * 3 -   8 ==  256
- * 4 -  16 ==  512
- * 5 -  32 == 1024
- * 6 -  64 == 2048
- * 7 - 128 == 4096
- * 8 - 256 == 8192
- */
-OPENSSL_GLOBAL int bn_limit_bits=0;
-OPENSSL_GLOBAL int bn_limit_num=8;        /* (1<<bn_limit_bits) */
-OPENSSL_GLOBAL int bn_limit_bits_low=0;
-OPENSSL_GLOBAL int bn_limit_num_low=8;    /* (1<<bn_limit_bits_low) */
-OPENSSL_GLOBAL int bn_limit_bits_high=0;
-OPENSSL_GLOBAL int bn_limit_num_high=8;   /* (1<<bn_limit_bits_high) */
-OPENSSL_GLOBAL int bn_limit_bits_mont=0;
-OPENSSL_GLOBAL int bn_limit_num_mont=8;   /* (1<<bn_limit_bits_mont) */
-
-void BN_set_params(int mult, int high, int low, int mont)
-        {
-        if (mult >= 0)
-                {
-                if (mult > (sizeof(int)*8)-1)
-                        mult=sizeof(int)*8-1;
-                bn_limit_bits=mult;
-                bn_limit_num=1<<mult;
-                }
-        if (high >= 0)
-                {
-                if (high > (sizeof(int)*8)-1)
-                        high=sizeof(int)*8-1;
-                bn_limit_bits_high=high;
-                bn_limit_num_high=1<<high;
-                }
-        if (low >= 0)
-                {
-                if (low > (sizeof(int)*8)-1)
-                        low=sizeof(int)*8-1;
-                bn_limit_bits_low=low;
-                bn_limit_num_low=1<<low;
-                }
-        if (mont >= 0)
-                {
-                if (mont > (sizeof(int)*8)-1)
-                        mont=sizeof(int)*8-1;
-                bn_limit_bits_mont=mont;
-                bn_limit_num_mont=1<<mont;
-                }
-        }
-
-int BN_get_params(int which)
-        {
-        if      (which == 0) return(bn_limit_bits);
-        else if (which == 1) return(bn_limit_bits_high);
-        else if (which == 2) return(bn_limit_bits_low);
-        else if (which == 3) return(bn_limit_bits_mont);
-        else return(0);
-        }
-
-BIGNUM *BN_value_one(void)
-        {
-        static BN_ULONG data_one=1L;
-        static BIGNUM const_one={&data_one,1,1,0};
-
-        return(&const_one);
-        }
-
-char *BN_options(void)
-        {
-        static int init=0;
-        static char data[16];
-
-        if (!init)
-                {
-                init++;
-#ifdef BN_LLONG
-                sprintf(data,"bn(%d,%d)",(int)sizeof(BN_ULLONG)*8,
-                        (int)sizeof(BN_ULONG)*8);
-#else
-                sprintf(data,"bn(%d,%d)",(int)sizeof(BN_ULONG)*8,
-                        (int)sizeof(BN_ULONG)*8);
-#endif
-                }
-        return(data);
-        }
-
-int BN_num_bits_word(BN_ULONG l)
-        {
-        static const char bits[256]={
-                0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,
-                5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-                6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-                6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-                7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-                7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-                7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-                7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-                };
-
-#if defined(SIXTY_FOUR_BIT_LONG)
-        if (l & 0xffffffff00000000L)
-                {
-                if (l & 0xffff000000000000L)
-                        {
-                        if (l & 0xff00000000000000L)
-                                {
-                                return(bits[(int)(l>>56)]+56);
-                                }
-                        else    return(bits[(int)(l>>48)]+48);
-                        }
-                else
-                        {
-                        if (l & 0x0000ff0000000000L)
-                                {
-                                return(bits[(int)(l>>40)]+40);
-                                }
-                        else    return(bits[(int)(l>>32)]+32);
-                        }
-                }
-        else
-#else
-#ifdef SIXTY_FOUR_BIT
-        if (l & 0xffffffff00000000LL)
-                {
-                if (l & 0xffff000000000000LL)
-                        {
-                        if (l & 0xff00000000000000LL)
-                                {
-                                return(bits[(int)(l>>56)]+56);
-                                }
-                        else    return(bits[(int)(l>>48)]+48);
-                        }
-                else
-                        {
-                        if (l & 0x0000ff0000000000LL)
-                                {
-                                return(bits[(int)(l>>40)]+40);
-                                }
-                        else    return(bits[(int)(l>>32)]+32);
-                        }
-                }
-        else
-#endif
-#endif
-                {
-#if defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
-                if (l & 0xffff0000L)
-                        {
-                        if (l & 0xff000000L)
-                                return(bits[(int)(l>>24L)]+24);
-                        else    return(bits[(int)(l>>16L)]+16);
-                        }
-                else
-#endif
-                        {
-#if defined(SIXTEEN_BIT) || defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
-                        if (l & 0xff00L)
-                                return(bits[(int)(l>>8)]+8);
-                        else    
-#endif
-                                return(bits[(int)(l   )]  );
-                        }
-                }
-        }
-
-int BN_num_bits(const BIGNUM *a)
-        {
-        BN_ULONG l;
-        int i;
-
-        bn_check_top(a);
-
-        if (a->top == 0) return(0);
-        l=a->d[a->top-1];
-        i=(a->top-1)*BN_BITS2;
-        if (l == 0)
-                {
-#if !defined(NO_STDIO) && !defined(WIN16)
-                fprintf(stderr,"BAD TOP VALUE\n");
-#endif
-                abort();
-                }
-        return(i+BN_num_bits_word(l));
-        }
-
-void BN_clear_free(BIGNUM *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-        if (a->d != NULL)
-                {
-                memset(a->d,0,a->max*sizeof(a->d[0]));
-                if (!(BN_get_flags(a,BN_FLG_STATIC_DATA)))
-                        Free(a->d);
-                }
-        i=BN_get_flags(a,BN_FLG_MALLOCED);
-        memset(a,0,sizeof(BIGNUM));
-        if (i)
-                Free(a);
-        }
-
-void BN_free(BIGNUM *a)
-        {
-        if (a == NULL) return;
-        if ((a->d != NULL) && !(BN_get_flags(a,BN_FLG_STATIC_DATA)))
-                Free(a->d);
-        a->flags|=BN_FLG_FREE; /* REMOVE? */
-        if (a->flags & BN_FLG_MALLOCED)
-                Free(a);
-        }
-
-void BN_init(BIGNUM *a)
-        {
-        memset(a,0,sizeof(BIGNUM));
-        }
-
-BIGNUM *BN_new(void)
-        {
-        BIGNUM *ret;
-
-        if ((ret=(BIGNUM *)Malloc(sizeof(BIGNUM))) == NULL)
-                {
-                BNerr(BN_F_BN_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->flags=BN_FLG_MALLOCED;
-        ret->top=0;
-        ret->neg=0;
-        ret->max=0;
-        ret->d=NULL;
-        return(ret);
-        }
-
-
-BN_CTX *BN_CTX_new(void)
-        {
-        BN_CTX *ret;
-
-        ret=(BN_CTX *)Malloc(sizeof(BN_CTX));
-        if (ret == NULL)
-                {
-                BNerr(BN_F_BN_CTX_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-
-        BN_CTX_init(ret);
-        ret->flags=BN_FLG_MALLOCED;
-        return(ret);
-        }
-
-void BN_CTX_init(BN_CTX *ctx)
-        {
-        memset(ctx,0,sizeof(BN_CTX));
-        ctx->tos=0;
-        ctx->flags=0;
-        }
-
-void BN_CTX_free(BN_CTX *c)
-        {
-        int i;
-
-        if(c == NULL)
-            return;
-
-        for (i=0; i<BN_CTX_NUM; i++)
-                BN_clear_free(&(c->bn[i]));
-        if (c->flags & BN_FLG_MALLOCED)
-                Free(c);
-        }
-
-BIGNUM *bn_expand2(BIGNUM *b, int words)
-        {
-        BN_ULONG *A,*a;
-        const BN_ULONG *B;
-        int i;
-
-        bn_check_top(b);
-
-        if (words > b->max)
-                {
-                bn_check_top(b);        
-                if (BN_get_flags(b,BN_FLG_STATIC_DATA))
-                        {
-                        BNerr(BN_F_BN_EXPAND2,BN_R_EXPAND_ON_STATIC_BIGNUM_DATA);
-                        return(NULL);
-                        }
-                a=A=(BN_ULONG *)Malloc(sizeof(BN_ULONG)*(words+1));
-                if (A == NULL)
-                        {
-                        BNerr(BN_F_BN_EXPAND2,ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
-#if 1
-                B=b->d;
-                /* Check if the previous number needs to be copied */
-                if (B != NULL)
-                        {
-#if 0
-                        /* This lot is an unrolled loop to copy b->top 
-                         * BN_ULONGs from B to A
-                         */
-/*
- * I have nothing against unrolling but it's usually done for
- * several reasons, namely:
- * - minimize percentage of decision making code, i.e. branches;
- * - avoid cache trashing;
- * - make it possible to schedule loads earlier;
- * Now let's examine the code below. The cornerstone of C is
- * "programmer is always right" and that's what we love it for:-)
- * For this very reason C compilers have to be paranoid when it
- * comes to data aliasing and assume the worst. Yeah, but what
- * does it mean in real life? This means that loop body below will
- * be compiled to sequence of loads immediately followed by stores
- * as compiler assumes the worst, something in A==B+1 style. As a
- * result CPU pipeline is going to starve for incoming data. Secondly
- * if A and B happen to share same cache line such code is going to
- * cause severe cache trashing. Both factors have severe impact on
- * performance of modern CPUs and this is the reason why this
- * particulare piece of code is #ifdefed away and replaced by more
- * "friendly" version found in #else section below. This comment
- * also applies to BN_copy function.
- *
- *                                      <appro@fy.chalmers.se>
- */
-                        for (i=b->top&(~7); i>0; i-=8)
-                                {
-                                A[0]=B[0]; A[1]=B[1]; A[2]=B[2]; A[3]=B[3];
-                                A[4]=B[4]; A[5]=B[5]; A[6]=B[6]; A[7]=B[7];
-                                A+=8;
-                                B+=8;
-                                }
-                        switch (b->top&7)
-                                {
-                        case 7:
-                                A[6]=B[6];
-                        case 6:
-                                A[5]=B[5];
-                        case 5:
-                                A[4]=B[4];
-                        case 4:
-                                A[3]=B[3];
-                        case 3:
-                                A[2]=B[2];
-                        case 2:
-                                A[1]=B[1];
-                        case 1:
-                                A[0]=B[0];
-                        case 0:
-                                /* I need the 'case 0' entry for utrix cc.
-                                 * If the optimiser is turned on, it does the
-                                 * switch table by doing
-                                 * a=top&7
-                                 * a--;
-                                 * goto jump_table[a];
-                                 * If top is 0, this makes us jump to 0xffffffc 
-                                 * which is rather bad :-(.
-                                 * eric 23-Apr-1998
-                                 */
-                                ;
-                                }
-#else
-                        for (i=b->top>>2; i>0; i--,A+=4,B+=4)
-                                {
-                                /*
-                                 * The fact that the loop is unrolled
-                                 * 4-wise is a tribute to Intel. It's
-                                 * the one that doesn't have enough
-                                 * registers to accomodate more data.
-                                 * I'd unroll it 8-wise otherwise:-)
-                                 *
-                                 *              <appro@fy.chalmers.se>
-                                 */
-                                BN_ULONG a0,a1,a2,a3;
-                                a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
-                                A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
-                                }
-                        switch (b->top&3)
-                                {
-                                case 3: A[2]=B[2];
-                                case 2: A[1]=B[1];
-                                case 1: A[0]=B[0];
-                                case 0: ; /* ultrix cc workaround, see above */
-                                }
-#endif
-                        Free(b->d);
-                        }
-
-                b->d=a;
-                b->max=words;
-
-                /* Now need to zero any data between b->top and b->max */
-
-                A= &(b->d[b->top]);
-                for (i=(b->max - b->top)>>3; i>0; i--,A+=8)
-                        {
-                        A[0]=0; A[1]=0; A[2]=0; A[3]=0;
-                        A[4]=0; A[5]=0; A[6]=0; A[7]=0;
-                        }
-                for (i=(b->max - b->top)&7; i>0; i--,A++)
-                        A[0]=0;
-#else
-                        memset(A,0,sizeof(BN_ULONG)*(words+1));
-                        memcpy(A,b->d,sizeof(b->d[0])*b->top);
-                        b->d=a;
-                        b->max=words;
-#endif
-                
-/*              memset(&(p[b->max]),0,((words+1)-b->max)*sizeof(BN_ULONG)); */
-/*      { int i; for (i=b->max; i<words+1; i++) p[i]=i;} */
-
-                }
-        return(b);
-        }
-
-BIGNUM *BN_dup(const BIGNUM *a)
-        {
-        BIGNUM *r;
-
-        if (a == NULL) return NULL;
-
-        bn_check_top(a);
-
-        r=BN_new();
-        if (r == NULL) return(NULL);
-        return((BIGNUM *)BN_copy(r,a));
-        }
-
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
-        {
-        int i;
-        BN_ULONG *A;
-        const BN_ULONG *B;
-
-        bn_check_top(b);
-
-        if (a == b) return(a);
-        if (bn_wexpand(a,b->top) == NULL) return(NULL);
-
-#if 1
-        A=a->d;
-        B=b->d;
-        for (i=b->top>>2; i>0; i--,A+=4,B+=4)
-                {
-                BN_ULONG a0,a1,a2,a3;
-                a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3];
-                A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3;
-                }
-        switch (b->top&3)
-                {
-                case 3: A[2]=B[2];
-                case 2: A[1]=B[1];
-                case 1: A[0]=B[0];
-                case 0: ; /* ultrix cc workaround, see comments in bn_expand2 */
-                }
-#else
-        memcpy(a->d,b->d,sizeof(b->d[0])*b->top);
-#endif
-
-/*      memset(&(a->d[b->top]),0,sizeof(a->d[0])*(a->max-b->top));*/
-        a->top=b->top;
-        if ((a->top == 0) && (a->d != NULL))
-                a->d[0]=0;
-        a->neg=b->neg;
-        return(a);
-        }
-
-void BN_clear(BIGNUM *a)
-        {
-        if (a->d != NULL)
-                memset(a->d,0,a->max*sizeof(a->d[0]));
-        a->top=0;
-        a->neg=0;
-        }
-
-BN_ULONG BN_get_word(BIGNUM *a)
-        {
-        int i,n;
-        BN_ULONG ret=0;
-
-        n=BN_num_bytes(a);
-        if (n > sizeof(BN_ULONG))
-                return(BN_MASK2);
-        for (i=a->top-1; i>=0; i--)
-                {
-#ifndef SIXTY_FOUR_BIT /* the data item > unsigned long */
-                ret<<=BN_BITS4; /* stops the compiler complaining */
-                ret<<=BN_BITS4;
-#else
-                ret=0;
-#endif
-                ret|=a->d[i];
-                }
-        return(ret);
-        }
-
-int BN_set_word(BIGNUM *a, BN_ULONG w)
-        {
-        int i,n;
-        if (bn_expand(a,sizeof(BN_ULONG)*8) == NULL) return(0);
-
-        n=sizeof(BN_ULONG)/BN_BYTES;
-        a->neg=0;
-        a->top=0;
-        a->d[0]=(BN_ULONG)w&BN_MASK2;
-        if (a->d[0] != 0) a->top=1;
-        for (i=1; i<n; i++)
-                {
-                /* the following is done instead of
-                 * w>>=BN_BITS2 so compilers don't complain
-                 * on builds where sizeof(long) == BN_TYPES */
-#ifndef SIXTY_FOUR_BIT /* the data item > unsigned long */
-                w>>=BN_BITS4;
-                w>>=BN_BITS4;
-#else
-                w=0;
-#endif
-                a->d[i]=(BN_ULONG)w&BN_MASK2;
-                if (a->d[i] != 0) a->top=i+1;
-                }
-        return(1);
-        }
-
-/* ignore negative */
-BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret)
-        {
-        unsigned int i,m;
-        unsigned int n;
-        BN_ULONG l;
-
-        if (ret == NULL) ret=BN_new();
-        if (ret == NULL) return(NULL);
-        l=0;
-        n=len;
-        if (n == 0)
-                {
-                ret->top=0;
-                return(ret);
-                }
-        if (bn_expand(ret,(int)(n+2)*8) == NULL)
-                return(NULL);
-        i=((n-1)/BN_BYTES)+1;
-        m=((n-1)%(BN_BYTES));
-        ret->top=i;
-        while (n-- > 0)
-                {
-                l=(l<<8L)| *(s++);
-                if (m-- == 0)
-                        {
-                        ret->d[--i]=l;
-                        l=0;
-                        m=BN_BYTES-1;
-                        }
-                }
-        /* need to call this due to clear byte at top if avoiding
-         * having the top bit set (-ve number) */
-        bn_fix_top(ret);
-        return(ret);
-        }
-
-/* ignore negative */
-int BN_bn2bin(const BIGNUM *a, unsigned char *to)
-        {
-        int n,i;
-        BN_ULONG l;
-
-        n=i=BN_num_bytes(a);
-        while (i-- > 0)
-                {
-                l=a->d[i/BN_BYTES];
-                *(to++)=(unsigned char)(l>>(8*(i%BN_BYTES)))&0xff;
-                }
-        return(n);
-        }
-
-int BN_ucmp(const BIGNUM *a, const BIGNUM *b)
-        {
-        int i;
-        BN_ULONG t1,t2,*ap,*bp;
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        i=a->top-b->top;
-        if (i != 0) return(i);
-        ap=a->d;
-        bp=b->d;
-        for (i=a->top-1; i>=0; i--)
-                {
-                t1= ap[i];
-                t2= bp[i];
-                if (t1 != t2)
-                        return(t1 > t2?1:-1);
-                }
-        return(0);
-        }
-
-int BN_cmp(const BIGNUM *a, const BIGNUM *b)
-        {
-        int i;
-        int gt,lt;
-        BN_ULONG t1,t2;
-
-        if ((a == NULL) || (b == NULL))
-                {
-                if (a != NULL)
-                        return(-1);
-                else if (b != NULL)
-                        return(1);
-                else
-                        return(0);
-                }
-
-        bn_check_top(a);
-        bn_check_top(b);
-
-        if (a->neg != b->neg)
-                {
-                if (a->neg)
-                        return(-1);
-                else    return(1);
-                }
-        if (a->neg == 0)
-                { gt=1; lt= -1; }
-        else    { gt= -1; lt=1; }
-
-        if (a->top > b->top) return(gt);
-        if (a->top < b->top) return(lt);
-        for (i=a->top-1; i>=0; i--)
-                {
-                t1=a->d[i];
-                t2=b->d[i];
-                if (t1 > t2) return(gt);
-                if (t1 < t2) return(lt);
-                }
-        return(0);
-        }
-
-int BN_set_bit(BIGNUM *a, int n)
-        {
-        int i,j,k;
-
-        i=n/BN_BITS2;
-        j=n%BN_BITS2;
-        if (a->top <= i)
-                {
-                if (bn_wexpand(a,i+1) == NULL) return(0);
-                for(k=a->top; k<i+1; k++)
-                        a->d[k]=0;
-                a->top=i+1;
-                }
-
-        a->d[i]|=(((BN_ULONG)1)<<j);
-        return(1);
-        }
-
-int BN_clear_bit(BIGNUM *a, int n)
-        {
-        int i,j;
-
-        i=n/BN_BITS2;
-        j=n%BN_BITS2;
-        if (a->top <= i) return(0);
-
-        a->d[i]&=(~(((BN_ULONG)1)<<j));
-        bn_fix_top(a);
-        return(1);
-        }
-
-int BN_is_bit_set(const BIGNUM *a, int n)
-        {
-        int i,j;
-
-        if (n < 0) return(0);
-        i=n/BN_BITS2;
-        j=n%BN_BITS2;
-        if (a->top <= i) return(0);
-        return((a->d[i]&(((BN_ULONG)1)<<j))?1:0);
-        }
-
-int BN_mask_bits(BIGNUM *a, int n)
-        {
-        int b,w;
-
-        w=n/BN_BITS2;
-        b=n%BN_BITS2;
-        if (w >= a->top) return(0);
-        if (b == 0)
-                a->top=w;
-        else
-                {
-                a->top=w+1;
-                a->d[w]&= ~(BN_MASK2<<b);
-                }
-        bn_fix_top(a);
-        return(1);
-        }
-
-int bn_cmp_words(BN_ULONG *a, BN_ULONG *b, int n)
-        {
-        int i;
-        BN_ULONG aa,bb;
-
-        aa=a[n-1];
-        bb=b[n-1];
-        if (aa != bb) return((aa > bb)?1:-1);
-        for (i=n-2; i>=0; i--)
-                {
-                aa=a[i];
-                bb=b[i];
-                if (aa != bb) return((aa > bb)?1:-1);
-                }
-        return(0);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c
deleted file mode 100644
index ee0f410c22..0000000000
--- a/src/lib/libcrypto/bn/bn_mont.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* crypto/bn/bn_mont.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.]
- */
-
-/*
- * Details about Montgomery multiplication algorithms can be found at:
- * http://www.ece.orst.edu/ISL/Publications.html
- * http://www.ece.orst.edu/ISL/Koc/papers/j37acmon.pdf
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-
-#define MONT_WORD
-
-int BN_mod_mul_montgomery(BIGNUM *r, BIGNUM *a, BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx)
-        {
-        BIGNUM *tmp,*tmp2;
-
-        tmp= &(ctx->bn[ctx->tos]);
-        tmp2= &(ctx->bn[ctx->tos]);
-        ctx->tos+=2;
-
-        bn_check_top(tmp);
-        bn_check_top(tmp2);
-
-        if (a == b)
-                {
-#if 0
-                bn_wexpand(tmp,a->top*2);
-                bn_wexpand(tmp2,a->top*4);
-                bn_sqr_recursive(tmp->d,a->d,a->top,tmp2->d);
-                tmp->top=a->top*2;
-                if (tmp->d[tmp->top-1] == 0)
-                        tmp->top--;
-#else
-                if (!BN_sqr(tmp,a,ctx)) goto err;
-#endif
-                }
-        else
-                {
-                if (!BN_mul(tmp,a,b,ctx)) goto err;
-                }
-        /* reduce from aRR to aR */
-        if (!BN_from_montgomery(r,tmp,mont,ctx)) goto err;
-        ctx->tos-=2;
-        return(1);
-err:
-        return(0);
-        }
-
-int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont,
-             BN_CTX *ctx)
-        {
-#ifdef BN_RECURSION_MONT
-        if (mont->use_word)
-#endif
-                {
-                BIGNUM *n,*r;
-                BN_ULONG *ap,*np,*rp,n0,v,*nrp;
-                int al,nl,max,i,x,ri;
-                int retn=0;
-
-                r= &(ctx->bn[ctx->tos]);
-
-                if (!BN_copy(r,a)) goto err1;
-                n= &(mont->N);
-
-                ap=a->d;
-                /* mont->ri is the size of mont->N in bits/words */
-                al=ri=mont->ri/BN_BITS2;
-
-                nl=n->top;
-                if ((al == 0) || (nl == 0)) { r->top=0; return(1); }
-
-                max=(nl+al+1); /* allow for overflow (no?) XXX */
-                if (bn_wexpand(r,max) == NULL) goto err1;
-                if (bn_wexpand(ret,max) == NULL) goto err1;
-
-                r->neg=a->neg^n->neg;
-                np=n->d;
-                rp=r->d;
-                nrp= &(r->d[nl]);
-
-                /* clear the top words of T */
-#if 1
-                for (i=r->top; i<max; i++) /* memset? XXX */
-                        r->d[i]=0;
-#else
-                memset(&(r->d[r->top]),0,(max-r->top)*sizeof(BN_ULONG)); 
-#endif
-
-                r->top=max;
-                n0=mont->n0;
-
-#ifdef BN_COUNT
-printf("word BN_from_montgomery %d * %d\n",nl,nl);
-#endif
-                for (i=0; i<nl; i++)
-                        {
-                        v=bn_mul_add_words(rp,np,nl,(rp[0]*n0)&BN_MASK2);
-                        nrp++;
-                        rp++;
-                        if (((nrp[-1]+=v)&BN_MASK2) >= v)
-                                continue;
-                        else
-                                {
-                                if (((++nrp[0])&BN_MASK2) != 0) continue;
-                                if (((++nrp[1])&BN_MASK2) != 0) continue;
-                                for (x=2; (((++nrp[x])&BN_MASK2) == 0); x++) ;
-                                }
-                        }
-                bn_fix_top(r);
-
-                /* mont->ri will be a multiple of the word size */
-#if 0
-                BN_rshift(ret,r,mont->ri);
-#else
-                x=ri;
-                rp=ret->d;
-                ap= &(r->d[x]);
-                if (r->top < x)
-                        al=0;
-                else
-                        al=r->top-x;
-                ret->top=al;
-                al-=4;
-                for (i=0; i<al; i+=4)
-                        {
-                        BN_ULONG t1,t2,t3,t4;
-
-                        t1=ap[i+0];
-                        t2=ap[i+1];
-                        t3=ap[i+2];
-                        t4=ap[i+3];
-                        rp[i+0]=t1;
-                        rp[i+1]=t2;
-                        rp[i+2]=t3;
-                        rp[i+3]=t4;
-                        }
-                al+=4;
-                for (; i<al; i++)
-                        rp[i]=ap[i];
-#endif
-
-                if (BN_ucmp(ret, &(mont->N)) >= 0)
-                        {
-                        BN_usub(ret,ret,&(mont->N)); /* XXX */
-                        }
-                retn=1;
-err1:
-                return(retn);
-                }
-#ifdef BN_RECURSION_MONT
-        else /* bignum version */ 
-                {
-                BIGNUM *t1,*t2,*t3;
-                int j,i;
-
-#ifdef BN_COUNT
-printf("number BN_from_montgomery\n");
-#endif
-
-                t1= &(ctx->bn[ctx->tos]);
-                t2= &(ctx->bn[ctx->tos+1]);
-                t3= &(ctx->bn[ctx->tos+2]);
-
-                i=mont->Ni.top;
-                bn_wexpand(ret,i); /* perhaps only i*2 */
-                bn_wexpand(t1,i*4); /* perhaps only i*2 */
-                bn_wexpand(t2,i*2); /* perhaps only i   */
-
-                bn_mul_low_recursive(t2->d,a->d,mont->Ni.d,i,t1->d);
-
-                BN_zero(t3);
-                BN_set_bit(t3,mont->N.top*BN_BITS2);
-                bn_sub_words(t3->d,t3->d,a->d,i);
-                bn_mul_high(ret->d,t2->d,mont->N.d,t3->d,i,t1->d);
-
-                /* hmm... if a is between i and 2*i, things are bad */
-                if (a->top > i)
-                        {
-                        j=(int)(bn_add_words(ret->d,ret->d,&(a->d[i]),i));
-                        if (j) /* overflow */
-                                bn_sub_words(ret->d,ret->d,mont->N.d,i);
-                        }
-                ret->top=i;
-                bn_fix_top(ret);
-                if (a->d[0])
-                        BN_add_word(ret,1); /* Always? */
-                else    /* Very very rare */
-                        {
-                        for (i=1; i<mont->N.top-1; i++)
-                                {
-                                if (a->d[i])
-                                        {
-                                        BN_add_word(ret,1); /* Always? */
-                                        break;
-                                        }
-                                }
-                        }
-
-                if (BN_ucmp(ret,&(mont->N)) >= 0)
-                        BN_usub(ret,ret,&(mont->N));
-
-                return(1);
-                }
-#endif
-        }
-
-BN_MONT_CTX *BN_MONT_CTX_new(void)
-        {
-        BN_MONT_CTX *ret;
-
-        if ((ret=(BN_MONT_CTX *)Malloc(sizeof(BN_MONT_CTX))) == NULL)
-                return(NULL);
-
-        BN_MONT_CTX_init(ret);
-        ret->flags=BN_FLG_MALLOCED;
-        return(ret);
-        }
-
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx)
-        {
-        ctx->use_word=0;
-        ctx->ri=0;
-        BN_init(&(ctx->RR));
-        BN_init(&(ctx->N));
-        BN_init(&(ctx->Ni));
-        ctx->flags=0;
-        }
-
-void BN_MONT_CTX_free(BN_MONT_CTX *mont)
-        {
-        if(mont == NULL)
-            return;
-
-        BN_free(&(mont->RR));
-        BN_free(&(mont->N));
-        BN_free(&(mont->Ni));
-        if (mont->flags & BN_FLG_MALLOCED)
-                Free(mont);
-        }
-
-int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
-        {
-        BIGNUM Ri,*R;
-
-        BN_init(&Ri);
-        R= &(mont->RR);                                 /* grab RR as a temp */
-        BN_copy(&(mont->N),mod);                        /* Set N */
-
-#ifdef BN_RECURSION_MONT
-        if (mont->N.top < BN_MONT_CTX_SET_SIZE_WORD)
-#endif
-                {
-                BIGNUM tmod;
-                BN_ULONG buf[2];
-
-                mont->use_word=1;
-
-                mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2;
-                BN_zero(R);
-                BN_set_bit(R,BN_BITS2);
-                /* I was bad, this modification of a passed variable was
-                 * breaking the multithreaded stuff :-(
-                 * z=mod->top;
-                 * mod->top=1; */
-
-                buf[0]=mod->d[0];
-                buf[1]=0;
-                tmod.d=buf;
-                tmod.top=1;
-                tmod.max=mod->max;
-                tmod.neg=mod->neg;
-
-                if ((BN_mod_inverse(&Ri,R,&tmod,ctx)) == NULL)
-                        goto err;
-                BN_lshift(&Ri,&Ri,BN_BITS2);                    /* R*Ri */
-                if (!BN_is_zero(&Ri))
-                        {
-#if 1
-                        BN_sub_word(&Ri,1);
-#else
-                        BN_usub(&Ri,&Ri,BN_value_one());        /* R*Ri - 1 */
-#endif
-                        }
-                else
-                        {
-                        /* This is not common..., 1 in BN_MASK2,
-                         * It happens when buf[0] was == 1.  So for 8 bit,
-                         * this is 1/256, 16bit, 1 in 2^16 etc.
-                         */
-                        BN_set_word(&Ri,BN_MASK2);
-                        }
-                BN_div(&Ri,NULL,&Ri,&tmod,ctx);
-                mont->n0=Ri.d[0];
-                BN_free(&Ri);
-                /* mod->top=z; */
-                }
-#ifdef BN_RECURSION_MONT
-        else
-                {
-                mont->use_word=0;
-                mont->ri=(BN_num_bits(mod)+(BN_BITS2-1))/BN_BITS2*BN_BITS2;
-#if 1
-                BN_zero(R);
-                BN_set_bit(R,mont->ri);
-#else
-                BN_lshift(R,BN_value_one(),mont->ri);   /* R */
-#endif
-                if ((BN_mod_inverse(&Ri,R,mod,ctx)) == NULL)
-                        goto err;
-                BN_lshift(&Ri,&Ri,mont->ri);            /* R*Ri */
-#if 1
-                BN_sub_word(&Ri,1);
-#else
-                BN_usub(&Ri,&Ri,BN_value_one());        /* R*Ri - 1 */
-#endif
-                BN_div(&(mont->Ni),NULL,&Ri,mod,ctx);
-                BN_free(&Ri);
-                }
-#endif
-
-        /* setup RR for conversions */
-#if 1
-        BN_zero(&(mont->RR));
-        BN_set_bit(&(mont->RR),mont->ri*2);
-#else
-        BN_lshift(mont->RR,BN_value_one(),mont->ri*2);
-#endif
-        BN_mod(&(mont->RR),&(mont->RR),&(mont->N),ctx);
-
-        return(1);
-err:
-        return(0);
-        }
-
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from)
-        {
-        if (to == from) return(to);
-
-        BN_copy(&(to->RR),&(from->RR));
-        BN_copy(&(to->N),&(from->N));
-        BN_copy(&(to->Ni),&(from->Ni));
-        to->use_word=from->use_word;
-        to->ri=from->ri;
-        to->n0=from->n0;
-        return(to);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_mpi.c b/src/lib/libcrypto/bn/bn_mpi.c
deleted file mode 100644
index 80e1dca6b7..0000000000
--- a/src/lib/libcrypto/bn/bn_mpi.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* crypto/bn/bn_mpi.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"
-
-int BN_bn2mpi(const BIGNUM *a, unsigned char *d)
-        {
-        int bits;
-        int num=0;
-        int ext=0;
-        long l;
-
-        bits=BN_num_bits(a);
-        num=(bits+7)/8;
-        if (bits > 0)
-                {
-                ext=((bits & 0x07) == 0);
-                }
-        if (d == NULL)
-                return(num+4+ext);
-
-        l=num+ext;
-        d[0]=(unsigned char)(l>>24)&0xff;
-        d[1]=(unsigned char)(l>>16)&0xff;
-        d[2]=(unsigned char)(l>> 8)&0xff;
-        d[3]=(unsigned char)(l    )&0xff;
-        if (ext) d[4]=0;
-        num=BN_bn2bin(a,&(d[4+ext]));
-        if (a->neg)
-                d[4]|=0x80;
-        return(num+4+ext);
-        }
-
-BIGNUM *BN_mpi2bn(unsigned char *d, int n, BIGNUM *a)
-        {
-        long len;
-        int neg=0;
-
-        if (n < 4)
-                {
-                BNerr(BN_F_BN_MPI2BN,BN_R_INVALID_LENGTH);
-                return(NULL);
-                }
-        len=((long)d[0]<<24)|((long)d[1]<<16)|((int)d[2]<<8)|(int)d[3];
-        if ((len+4) != n)
-                {
-                BNerr(BN_F_BN_MPI2BN,BN_R_ENCODING_ERROR);
-                return(NULL);
-                }
-
-        if (a == NULL) a=BN_new();
-        if (a == NULL) return(NULL);
-
-        if (len == 0)
-                {
-                a->neg=0;
-                a->top=0;
-                return(a);
-                }
-        d+=4;
-        if ((*d) & 0x80)
-                neg=1;
-        if (BN_bin2bn(d,(int)len,a) == NULL)
-                return(NULL);
-        a->neg=neg;
-        if (neg)
-                {
-                BN_clear_bit(a,BN_num_bits(a)-1);
-                }
-        return(a);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_mul.c b/src/lib/libcrypto/bn/bn_mul.c
deleted file mode 100644
index 38c47f3d1f..0000000000
--- a/src/lib/libcrypto/bn/bn_mul.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/* crypto/bn/bn_mul.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_RECURSION
-/* r is 2*n2 words in size,
- * a and b are both n2 words in size.
- * n2 must be a power of 2.
- * We multiply and return the result.
- * t must be 2*n2 words in size
- * We calulate
- * a[0]*b[0]
- * a[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
- * a[1]*b[1]
- */
-void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-             BN_ULONG *t)
-        {
-        int n=n2/2,c1,c2;
-        unsigned int neg,zero;
-        BN_ULONG ln,lo,*p;
-
-#ifdef BN_COUNT
-printf(" bn_mul_recursive %d * %d\n",n2,n2);
-#endif
-#ifdef BN_MUL_COMBA
-/*      if (n2 == 4)
-                {
-                bn_mul_comba4(r,a,b);
-                return;
-                }
-        else */ if (n2 == 8)
-                {
-                bn_mul_comba8(r,a,b);
-                return; 
-                }
-#endif
-        if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL)
-                {
-                /* This should not happen */
-                bn_mul_normal(r,a,n2,b,n2);
-                return;
-                }
-        /* r=(a[0]-a[1])*(b[1]-b[0]) */
-        c1=bn_cmp_words(a,&(a[n]),n);
-        c2=bn_cmp_words(&(b[n]),b,n);
-        zero=neg=0;
-        switch (c1*3+c2)
-                {
-        case -4:
-                bn_sub_words(t,      &(a[n]),a,      n); /* - */
-                bn_sub_words(&(t[n]),b,      &(b[n]),n); /* - */
-                break;
-        case -3:
-                zero=1;
-                break;
-        case -2:
-                bn_sub_words(t,      &(a[n]),a,      n); /* - */
-                bn_sub_words(&(t[n]),&(b[n]),b,      n); /* + */
-                neg=1;
-                break;
-        case -1:
-        case 0:
-        case 1:
-                zero=1;
-                break;
-        case 2:
-                bn_sub_words(t,      a,      &(a[n]),n); /* + */
-                bn_sub_words(&(t[n]),b,      &(b[n]),n); /* - */
-                neg=1;
-                break;
-        case 3:
-                zero=1;
-                break;
-        case 4:
-                bn_sub_words(t,      a,      &(a[n]),n);
-                bn_sub_words(&(t[n]),&(b[n]),b,      n);
-                break;
-                }
-
-#ifdef BN_MUL_COMBA
-        if (n == 4)
-                {
-                if (!zero)
-                        bn_mul_comba4(&(t[n2]),t,&(t[n]));
-                else
-                        memset(&(t[n2]),0,8*sizeof(BN_ULONG));
-                
-                bn_mul_comba4(r,a,b);
-                bn_mul_comba4(&(r[n2]),&(a[n]),&(b[n]));
-                }
-        else if (n == 8)
-                {
-                if (!zero)
-                        bn_mul_comba8(&(t[n2]),t,&(t[n]));
-                else
-                        memset(&(t[n2]),0,16*sizeof(BN_ULONG));
-                
-                bn_mul_comba8(r,a,b);
-                bn_mul_comba8(&(r[n2]),&(a[n]),&(b[n]));
-                }
-        else
-#endif
-                {
-                p= &(t[n2*2]);
-                if (!zero)
-                        bn_mul_recursive(&(t[n2]),t,&(t[n]),n,p);
-                else
-                        memset(&(t[n2]),0,n2*sizeof(BN_ULONG));
-                bn_mul_recursive(r,a,b,n,p);
-                bn_mul_recursive(&(r[n2]),&(a[n]),&(b[n]),n,p);
-                }
-
-        /* t[32] holds (a[0]-a[1])*(b[1]-b[0]), c1 is the sign
-         * r[10] holds (a[0]*b[0])
-         * r[32] holds (b[1]*b[1])
-         */
-
-        c1=(int)(bn_add_words(t,r,&(r[n2]),n2));
-
-        if (neg) /* if t[32] is negative */
-                {
-                c1-=(int)(bn_sub_words(&(t[n2]),t,&(t[n2]),n2));
-                }
-        else
-                {
-                /* Might have a carry */
-                c1+=(int)(bn_add_words(&(t[n2]),&(t[n2]),t,n2));
-                }
-
-        /* t[32] holds (a[0]-a[1])*(b[1]-b[0])+(a[0]*b[0])+(a[1]*b[1])
-         * r[10] holds (a[0]*b[0])
-         * r[32] holds (b[1]*b[1])
-         * c1 holds the carry bits
-         */
-        c1+=(int)(bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2));
-        if (c1)
-                {
-                p= &(r[n+n2]);
-                lo= *p;
-                ln=(lo+c1)&BN_MASK2;
-                *p=ln;
-
-                /* The overflow will stop before we over write
-                 * words we should not overwrite */
-                if (ln < (BN_ULONG)c1)
-                        {
-                        do      {
-                                p++;
-                                lo= *p;
-                                ln=(lo+1)&BN_MASK2;
-                                *p=ln;
-                                } while (ln == 0);
-                        }
-                }
-        }
-
-/* n+tn is the word length
- * t needs to be n*4 is size, as does r */
-void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int tn,
-             int n, BN_ULONG *t)
-        {
-        int i,j,n2=n*2;
-        unsigned int c1;
-        BN_ULONG ln,lo,*p;
-
-#ifdef BN_COUNT
-printf(" bn_mul_part_recursive %d * %d\n",tn+n,tn+n);
-#endif
-        if (n < 8)
-                {
-                i=tn+n;
-                bn_mul_normal(r,a,i,b,i);
-                return;
-                }
-
-        /* r=(a[0]-a[1])*(b[1]-b[0]) */
-        bn_sub_words(t,      a,      &(a[n]),n); /* + */
-        bn_sub_words(&(t[n]),b,      &(b[n]),n); /* - */
-
-/*      if (n == 4)
-                {
-                bn_mul_comba4(&(t[n2]),t,&(t[n]));
-                bn_mul_comba4(r,a,b);
-                bn_mul_normal(&(r[n2]),&(a[n]),tn,&(b[n]),tn);
-                memset(&(r[n2+tn*2]),0,sizeof(BN_ULONG)*(n2-tn*2));
-                }
-        else */ if (n == 8)
-                {
-                bn_mul_comba8(&(t[n2]),t,&(t[n]));
-                bn_mul_comba8(r,a,b);
-                bn_mul_normal(&(r[n2]),&(a[n]),tn,&(b[n]),tn);
-                memset(&(r[n2+tn*2]),0,sizeof(BN_ULONG)*(n2-tn*2));
-                }
-        else
-                {
-                p= &(t[n2*2]);
-                bn_mul_recursive(&(t[n2]),t,&(t[n]),n,p);
-                bn_mul_recursive(r,a,b,n,p);
-                i=n/2;
-                /* If there is only a bottom half to the number,
-                 * just do it */
-                j=tn-i;
-                if (j == 0)
-                        {
-                        bn_mul_recursive(&(r[n2]),&(a[n]),&(b[n]),i,p);
-                        memset(&(r[n2+i*2]),0,sizeof(BN_ULONG)*(n2-i*2));
-                        }
-                else if (j > 0) /* eg, n == 16, i == 8 and tn == 11 */
-                                {
-                                bn_mul_part_recursive(&(r[n2]),&(a[n]),&(b[n]),
-                                        j,i,p);
-                                memset(&(r[n2+tn*2]),0,
-                                        sizeof(BN_ULONG)*(n2-tn*2));
-                                }
-                else /* (j < 0) eg, n == 16, i == 8 and tn == 5 */
-                        {
-                        memset(&(r[n2]),0,sizeof(BN_ULONG)*n2);
-                        if (tn < BN_MUL_RECURSIVE_SIZE_NORMAL)
-                                {
-                                bn_mul_normal(&(r[n2]),&(a[n]),tn,&(b[n]),tn);
-                                }
-                        else
-                                {
-                                for (;;)
-                                        {
-                                        i/=2;
-                                        if (i < tn)
-                                                {
-                                                bn_mul_part_recursive(&(r[n2]),
-                                                        &(a[n]),&(b[n]),
-                                                        tn-i,i,p);
-                                                break;
-                                                }
-                                        else if (i == tn)
-                                                {
-                                                bn_mul_recursive(&(r[n2]),
-                                                        &(a[n]),&(b[n]),
-                                                        i,p);
-                                                break;
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-        /* t[32] holds (a[0]-a[1])*(b[1]-b[0]), c1 is the sign
-         * r[10] holds (a[0]*b[0])
-         * r[32] holds (b[1]*b[1])
-         */
-
-        c1=(int)(bn_add_words(t,r,&(r[n2]),n2));
-        c1-=(int)(bn_sub_words(&(t[n2]),t,&(t[n2]),n2));
-
-        /* t[32] holds (a[0]-a[1])*(b[1]-b[0])+(a[0]*b[0])+(a[1]*b[1])
-         * r[10] holds (a[0]*b[0])
-         * r[32] holds (b[1]*b[1])
-         * c1 holds the carry bits
-         */
-        c1+=(int)(bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2));
-        if (c1)
-                {
-                p= &(r[n+n2]);
-                lo= *p;
-                ln=(lo+c1)&BN_MASK2;
-                *p=ln;
-
-                /* The overflow will stop before we over write
-                 * words we should not overwrite */
-                if (ln < c1)
-                        {
-                        do      {
-                                p++;
-                                lo= *p;
-                                ln=(lo+1)&BN_MASK2;
-                                *p=ln;
-                                } while (ln == 0);
-                        }
-                }
-        }
-
-/* a and b must be the same size, which is n2.
- * r needs to be n2 words and t needs to be n2*2
- */
-void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-             BN_ULONG *t)
-        {
-        int n=n2/2;
-
-#ifdef BN_COUNT
-printf(" bn_mul_low_recursive %d * %d\n",n2,n2);
-#endif
-
-        bn_mul_recursive(r,a,b,n,&(t[0]));
-        if (n >= BN_MUL_LOW_RECURSIVE_SIZE_NORMAL)
-                {
-                bn_mul_low_recursive(&(t[0]),&(a[0]),&(b[n]),n,&(t[n2]));
-                bn_add_words(&(r[n]),&(r[n]),&(t[0]),n);
-                bn_mul_low_recursive(&(t[0]),&(a[n]),&(b[0]),n,&(t[n2]));
-                bn_add_words(&(r[n]),&(r[n]),&(t[0]),n);
-                }
-        else
-                {
-                bn_mul_low_normal(&(t[0]),&(a[0]),&(b[n]),n);
-                bn_mul_low_normal(&(t[n]),&(a[n]),&(b[0]),n);
-                bn_add_words(&(r[n]),&(r[n]),&(t[0]),n);
-                bn_add_words(&(r[n]),&(r[n]),&(t[n]),n);
-                }
-        }
-
-/* a and b must be the same size, which is n2.
- * r needs to be n2 words and t needs to be n2*2
- * l is the low words of the output.
- * t needs to be n2*3
- */
-void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2,
-             BN_ULONG *t)
-        {
-        int i,n;
-        int c1,c2;
-        int neg,oneg,zero;
-        BN_ULONG ll,lc,*lp,*mp;
-
-#ifdef BN_COUNT
-printf(" bn_mul_high %d * %d\n",n2,n2);
-#endif
-        n=n2/2;
-
-        /* Calculate (al-ah)*(bh-bl) */
-        neg=zero=0;
-        c1=bn_cmp_words(&(a[0]),&(a[n]),n);
-        c2=bn_cmp_words(&(b[n]),&(b[0]),n);
-        switch (c1*3+c2)
-                {
-        case -4:
-                bn_sub_words(&(r[0]),&(a[n]),&(a[0]),n);
-                bn_sub_words(&(r[n]),&(b[0]),&(b[n]),n);
-                break;
-        case -3:
-                zero=1;
-                break;
-        case -2:
-                bn_sub_words(&(r[0]),&(a[n]),&(a[0]),n);
-                bn_sub_words(&(r[n]),&(b[n]),&(b[0]),n);
-                neg=1;
-                break;
-        case -1:
-        case 0:
-        case 1:
-                zero=1;
-                break;
-        case 2:
-                bn_sub_words(&(r[0]),&(a[0]),&(a[n]),n);
-                bn_sub_words(&(r[n]),&(b[0]),&(b[n]),n);
-                neg=1;
-                break;
-        case 3:
-                zero=1;
-                break;
-        case 4:
-                bn_sub_words(&(r[0]),&(a[0]),&(a[n]),n);
-                bn_sub_words(&(r[n]),&(b[n]),&(b[0]),n);
-                break;
-                }
-                
-        oneg=neg;
-        /* t[10] = (a[0]-a[1])*(b[1]-b[0]) */
-        /* r[10] = (a[1]*b[1]) */
-#ifdef BN_MUL_COMBA
-        if (n == 8)
-                {
-                bn_mul_comba8(&(t[0]),&(r[0]),&(r[n]));
-                bn_mul_comba8(r,&(a[n]),&(b[n]));
-                }
-        else
-#endif
-                {
-                bn_mul_recursive(&(t[0]),&(r[0]),&(r[n]),n,&(t[n2]));
-                bn_mul_recursive(r,&(a[n]),&(b[n]),n,&(t[n2]));
-                }
-
-        /* s0 == low(al*bl)
-         * s1 == low(ah*bh)+low((al-ah)*(bh-bl))+low(al*bl)+high(al*bl)
-         * We know s0 and s1 so the only unknown is high(al*bl)
-         * high(al*bl) == s1 - low(ah*bh+s0+(al-ah)*(bh-bl))
-         * high(al*bl) == s1 - (r[0]+l[0]+t[0])
-         */
-        if (l != NULL)
-                {
-                lp= &(t[n2+n]);
-                c1=(int)(bn_add_words(lp,&(r[0]),&(l[0]),n));
-                }
-        else
-                {
-                c1=0;
-                lp= &(r[0]);
-                }
-
-        if (neg)
-                neg=(int)(bn_sub_words(&(t[n2]),lp,&(t[0]),n));
-        else
-                {
-                bn_add_words(&(t[n2]),lp,&(t[0]),n);
-                neg=0;
-                }
-
-        if (l != NULL)
-                {
-                bn_sub_words(&(t[n2+n]),&(l[n]),&(t[n2]),n);
-                }
-        else
-                {
-                lp= &(t[n2+n]);
-                mp= &(t[n2]);
-                for (i=0; i<n; i++)
-                        lp[i]=((~mp[i])+1)&BN_MASK2;
-                }
-
-        /* s[0] = low(al*bl)
-         * t[3] = high(al*bl)
-         * t[10] = (a[0]-a[1])*(b[1]-b[0]) neg is the sign
-         * r[10] = (a[1]*b[1])
-         */
-        /* R[10] = al*bl
-         * R[21] = al*bl + ah*bh + (a[0]-a[1])*(b[1]-b[0])
-         * R[32] = ah*bh
-         */
-        /* R[1]=t[3]+l[0]+r[0](+-)t[0] (have carry/borrow)
-         * R[2]=r[0]+t[3]+r[1](+-)t[1] (have carry/borrow)
-         * R[3]=r[1]+(carry/borrow)
-         */
-        if (l != NULL)
-                {
-                lp= &(t[n2]);
-                c1= (int)(bn_add_words(lp,&(t[n2+n]),&(l[0]),n));
-                }
-        else
-                {
-                lp= &(t[n2+n]);
-                c1=0;
-                }
-        c1+=(int)(bn_add_words(&(t[n2]),lp,  &(r[0]),n));
-        if (oneg)
-                c1-=(int)(bn_sub_words(&(t[n2]),&(t[n2]),&(t[0]),n));
-        else
-                c1+=(int)(bn_add_words(&(t[n2]),&(t[n2]),&(t[0]),n));
-
-        c2 =(int)(bn_add_words(&(r[0]),&(r[0]),&(t[n2+n]),n));
-        c2+=(int)(bn_add_words(&(r[0]),&(r[0]),&(r[n]),n));
-        if (oneg)
-                c2-=(int)(bn_sub_words(&(r[0]),&(r[0]),&(t[n]),n));
-        else
-                c2+=(int)(bn_add_words(&(r[0]),&(r[0]),&(t[n]),n));
-        
-        if (c1 != 0) /* Add starting at r[0], could be +ve or -ve */
-                {
-                i=0;
-                if (c1 > 0)
-                        {
-                        lc=c1;
-                        do      {
-                                ll=(r[i]+lc)&BN_MASK2;
-                                r[i++]=ll;
-                                lc=(lc > ll);
-                                } while (lc);
-                        }
-                else
-                        {
-                        lc= -c1;
-                        do      {
-                                ll=r[i];
-                                r[i++]=(ll-lc)&BN_MASK2;
-                                lc=(lc > ll);
-                                } while (lc);
-                        }
-                }
-        if (c2 != 0) /* Add starting at r[1] */
-                {
-                i=n;
-                if (c2 > 0)
-                        {
-                        lc=c2;
-                        do      {
-                                ll=(r[i]+lc)&BN_MASK2;
-                                r[i++]=ll;
-                                lc=(lc > ll);
-                                } while (lc);
-                        }
-                else
-                        {
-                        lc= -c2;
-                        do      {
-                                ll=r[i];
-                                r[i++]=(ll-lc)&BN_MASK2;
-                                lc=(lc > ll);
-                                } while (lc);
-                        }
-                }
-        }
-#endif
-
-int BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-        {
-        int top,al,bl;
-        BIGNUM *rr;
-#ifdef BN_RECURSION
-        BIGNUM *t;
-        int i,j,k;
-#endif
-
-#ifdef BN_COUNT
-printf("BN_mul %d * %d\n",a->top,b->top);
-#endif
-
-        bn_check_top(a);
-        bn_check_top(b);
-        bn_check_top(r);
-
-        al=a->top;
-        bl=b->top;
-        r->neg=a->neg^b->neg;
-
-        if ((al == 0) || (bl == 0))
-                {
-                BN_zero(r);
-                return(1);
-                }
-        top=al+bl;
-
-        if ((r == a) || (r == b))
-                rr= &(ctx->bn[ctx->tos+1]);
-        else
-                rr=r;
-
-#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
-        if (al == bl)
-                {
-#  ifdef BN_MUL_COMBA
-/*              if (al == 4)
-                        {
-                        if (bn_wexpand(rr,8) == NULL) return(0);
-                        rr->top=8;
-                        bn_mul_comba4(rr->d,a->d,b->d);
-                        goto end;
-                        }
-                else */ if (al == 8)
-                        {
-                        if (bn_wexpand(rr,16) == NULL) return(0);
-                        rr->top=16;
-                        bn_mul_comba8(rr->d,a->d,b->d);
-                        goto end;
-                        }
-                else
-#  endif
-#ifdef BN_RECURSION
-                if (al < BN_MULL_SIZE_NORMAL)
-#endif
-                        {
-                        if (bn_wexpand(rr,top) == NULL) return(0);
-                        rr->top=top;
-                        bn_mul_normal(rr->d,a->d,al,b->d,bl);
-                        goto end;
-                        }
-#  ifdef BN_RECURSION
-                goto symetric;
-#  endif
-                }
-#endif
-#ifdef BN_RECURSION
-        else if ((al < BN_MULL_SIZE_NORMAL) || (bl < BN_MULL_SIZE_NORMAL))
-                {
-                if (bn_wexpand(rr,top) == NULL) return(0);
-                rr->top=top;
-                bn_mul_normal(rr->d,a->d,al,b->d,bl);
-                goto end;
-                }
-        else
-                {
-                i=(al-bl);
-                if ((i ==  1) && !BN_get_flags(b,BN_FLG_STATIC_DATA))
-                        {
-                        bn_wexpand(b,al);
-                        b->d[bl]=0;
-                        bl++;
-                        goto symetric;
-                        }
-                else if ((i ==  -1) && !BN_get_flags(a,BN_FLG_STATIC_DATA))
-                        {
-                        bn_wexpand(a,bl);
-                        a->d[al]=0;
-                        al++;
-                        goto symetric;
-                        }
-                }
-#endif
-
-        /* asymetric and >= 4 */ 
-        if (bn_wexpand(rr,top) == NULL) return(0);
-        rr->top=top;
-        bn_mul_normal(rr->d,a->d,al,b->d,bl);
-
-#ifdef BN_RECURSION
-        if (0)
-                {
-symetric:
-                /* symetric and > 4 */
-                /* 16 or larger */
-                j=BN_num_bits_word((BN_ULONG)al);
-                j=1<<(j-1);
-                k=j+j;
-                t= &(ctx->bn[ctx->tos]);
-                if (al == j) /* exact multiple */
-                        {
-                        bn_wexpand(t,k*2);
-                        bn_wexpand(rr,k*2);
-                        bn_mul_recursive(rr->d,a->d,b->d,al,t->d);
-                        }
-                else
-                        {
-                        bn_wexpand(a,k);
-                        bn_wexpand(b,k);
-                        bn_wexpand(t,k*4);
-                        bn_wexpand(rr,k*4);
-                        for (i=a->top; i<k; i++)
-                                a->d[i]=0;
-                        for (i=b->top; i<k; i++)
-                                b->d[i]=0;
-                        bn_mul_part_recursive(rr->d,a->d,b->d,al-j,j,t->d);
-                        }
-                rr->top=top;
-                }
-#endif
-#if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
-end:
-#endif
-        bn_fix_top(rr);
-        if (r != rr) BN_copy(r,rr);
-        return(1);
-        }
-
-void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
-        {
-        BN_ULONG *rr;
-
-#ifdef BN_COUNT
-printf(" bn_mul_normal %d * %d\n",na,nb);
-#endif
-
-        if (na < nb)
-                {
-                int itmp;
-                BN_ULONG *ltmp;
-
-                itmp=na; na=nb; nb=itmp;
-                ltmp=a;   a=b;   b=ltmp;
-
-                }
-        rr= &(r[na]);
-        rr[0]=bn_mul_words(r,a,na,b[0]);
-
-        for (;;)
-                {
-                if (--nb <= 0) return;
-                rr[1]=bn_mul_add_words(&(r[1]),a,na,b[1]);
-                if (--nb <= 0) return;
-                rr[2]=bn_mul_add_words(&(r[2]),a,na,b[2]);
-                if (--nb <= 0) return;
-                rr[3]=bn_mul_add_words(&(r[3]),a,na,b[3]);
-                if (--nb <= 0) return;
-                rr[4]=bn_mul_add_words(&(r[4]),a,na,b[4]);
-                rr+=4;
-                r+=4;
-                b+=4;
-                }
-        }
-
-void bn_mul_low_normal(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
-        {
-#ifdef BN_COUNT
-printf(" bn_mul_low_normal %d * %d\n",n,n);
-#endif
-        bn_mul_words(r,a,n,b[0]);
-
-        for (;;)
-                {
-                if (--n <= 0) return;
-                bn_mul_add_words(&(r[1]),a,n,b[1]);
-                if (--n <= 0) return;
-                bn_mul_add_words(&(r[2]),a,n,b[2]);
-                if (--n <= 0) return;
-                bn_mul_add_words(&(r[3]),a,n,b[3]);
-                if (--n <= 0) return;
-                bn_mul_add_words(&(r[4]),a,n,b[4]);
-                r+=4;
-                b+=4;
-                }
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_prime.c b/src/lib/libcrypto/bn/bn_prime.c
deleted file mode 100644
index 6fa0f9be1e..0000000000
--- a/src/lib/libcrypto/bn/bn_prime.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* crypto/bn/bn_prime.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 <time.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-#include <openssl/rand.h>
-
-/* The quick seive algorithm approach to weeding out primes is
- * Philip Zimmermann's, as implemented in PGP.  I have had a read of
- * his comments and implemented my own version.
- */
-#include "bn_prime.h"
-
-static int witness(BIGNUM *a, BIGNUM *n, BN_CTX *ctx,BN_CTX *ctx2,
-        BN_MONT_CTX *mont);
-static int probable_prime(BIGNUM *rnd, int bits);
-static int probable_prime_dh(BIGNUM *rnd, int bits,
-        BIGNUM *add, BIGNUM *rem, BN_CTX *ctx);
-static int probable_prime_dh_strong(BIGNUM *rnd, int bits,
-        BIGNUM *add, BIGNUM *rem, BN_CTX *ctx);
-BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int strong, BIGNUM *add,
-             BIGNUM *rem, void (*callback)(int,int,void *), void *cb_arg)
-        {
-        BIGNUM *rnd=NULL;
-        BIGNUM t;
-        int i,j,c1=0;
-        BN_CTX *ctx;
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        if (ret == NULL)
-                {
-                if ((rnd=BN_new()) == NULL) goto err;
-                }
-        else
-                rnd=ret;
-        BN_init(&t);
-loop: 
-        /* make a random number and set the top and bottom bits */
-        if (add == NULL)
-                {
-                if (!probable_prime(rnd,bits)) goto err;
-                }
-        else
-                {
-                if (strong)
-                        {
-                        if (!probable_prime_dh_strong(rnd,bits,add,rem,ctx))
-                                 goto err;
-                        }
-                else
-                        {
-                        if (!probable_prime_dh(rnd,bits,add,rem,ctx))
-                                goto err;
-                        }
-                }
-        /* if (BN_mod_word(rnd,(BN_ULONG)3) == 1) goto loop; */
-        if (callback != NULL) callback(0,c1++,cb_arg);
-
-        if (!strong)
-                {
-                i=BN_is_prime(rnd,BN_prime_checks,callback,ctx,cb_arg);
-                if (i == -1) goto err;
-                if (i == 0) goto loop;
-                }
-        else
-                {
-                /* for a strong prime generation,
-                 * check that (p-1)/2 is prime.
-                 * Since a prime is odd, We just
-                 * need to divide by 2 */
-                if (!BN_rshift1(&t,rnd)) goto err;
-
-                for (i=0; i<BN_prime_checks; i++)
-                        {
-                        j=BN_is_prime(rnd,1,callback,ctx,cb_arg);
-                        if (j == -1) goto err;
-                        if (j == 0) goto loop;
-
-                        j=BN_is_prime(&t,1,callback,ctx,cb_arg);
-                        if (j == -1) goto err;
-                        if (j == 0) goto loop;
-
-                        if (callback != NULL) callback(2,c1-1,cb_arg);
-                        /* We have a strong prime test pass */
-                        }
-                }
-        /* we have a prime :-) */
-        ret=rnd;
-err:
-        if ((ret == NULL) && (rnd != NULL)) BN_free(rnd);
-        BN_free(&t);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return(ret);
-        }
-
-int BN_is_prime(BIGNUM *a, int checks, void (*callback)(int,int,void *),
-             BN_CTX *ctx_passed, void *cb_arg)
-        {
-        int i,j,c2=0,ret= -1;
-        BIGNUM *check;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-        BN_MONT_CTX *mont=NULL;
-
-        if (!BN_is_odd(a))
-                return(0);
-        if (ctx_passed != NULL)
-                ctx=ctx_passed;
-        else
-                if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if ((ctx2=BN_CTX_new()) == NULL) goto err;
-        if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-
-        check= &(ctx->bn[ctx->tos++]);
-
-        /* Setup the montgomery structure */
-        if (!BN_MONT_CTX_set(mont,a,ctx2)) goto err;
-
-        for (i=0; i<checks; i++)
-                {
-                if (!BN_rand(check,BN_num_bits(a)-1,0,0)) goto err;
-                j=witness(check,a,ctx,ctx2,mont);
-                if (j == -1) goto err;
-                if (j)
-                        {
-                        ret=0;
-                        goto err;
-                        }
-                if (callback != NULL) callback(1,c2++,cb_arg);
-                }
-        ret=1;
-err:
-        ctx->tos--;
-        if ((ctx_passed == NULL) && (ctx != NULL))
-                BN_CTX_free(ctx);
-        if (ctx2 != NULL)
-                BN_CTX_free(ctx2);
-        if (mont != NULL) BN_MONT_CTX_free(mont);
-                
-        return(ret);
-        }
-
-#define RECP_MUL_MOD
-
-static int witness(BIGNUM *a, BIGNUM *n, BN_CTX *ctx, BN_CTX *ctx2,
-             BN_MONT_CTX *mont)
-        {
-        int k,i,ret= -1,good;
-        BIGNUM *d,*dd,*tmp,*d1,*d2,*n1;
-        BIGNUM *mont_one,*mont_n1,*mont_a;
-
-        d1= &(ctx->bn[ctx->tos]);
-        d2= &(ctx->bn[ctx->tos+1]);
-        n1= &(ctx->bn[ctx->tos+2]);
-        ctx->tos+=3;
-
-        mont_one= &(ctx2->bn[ctx2->tos]);
-        mont_n1= &(ctx2->bn[ctx2->tos+1]);
-        mont_a= &(ctx2->bn[ctx2->tos+2]);
-        ctx2->tos+=3;
-
-        d=d1;
-        dd=d2;
-        if (!BN_one(d)) goto err;
-        if (!BN_sub(n1,n,d)) goto err; /* n1=n-1; */
-        k=BN_num_bits(n1);
-
-        if (!BN_to_montgomery(mont_one,BN_value_one(),mont,ctx2)) goto err;
-        if (!BN_to_montgomery(mont_n1,n1,mont,ctx2)) goto err;
-        if (!BN_to_montgomery(mont_a,a,mont,ctx2)) goto err;
-
-        BN_copy(d,mont_one);
-        for (i=k-1; i>=0; i--)
-                {
-                if (    (BN_cmp(d,mont_one) != 0) &&
-                        (BN_cmp(d,mont_n1) != 0))
-                        good=1;
-                else
-                        good=0;
-
-                BN_mod_mul_montgomery(dd,d,d,mont,ctx2);
-
-                if (good && (BN_cmp(dd,mont_one) == 0))
-                        {
-                        ret=1;
-                        goto err;
-                        }
-                if (BN_is_bit_set(n1,i))
-                        {
-                        BN_mod_mul_montgomery(d,dd,mont_a,mont,ctx2);
-                        }
-                else
-                        {
-                        tmp=d;
-                        d=dd;
-                        dd=tmp;
-                        }
-                }
-        if (BN_cmp(d,mont_one) == 0)
-                i=0;
-        else    i=1;
-        ret=i;
-err:
-        ctx->tos-=3;
-        ctx2->tos-=3;
-        return(ret);
-        }
-
-static int probable_prime(BIGNUM *rnd, int bits)
-        {
-        int i;
-        MS_STATIC BN_ULONG mods[NUMPRIMES];
-        BN_ULONG delta,d;
-
-again:
-        if (!BN_rand(rnd,bits,1,1)) return(0);
-        /* we now have a random number 'rand' to test. */
-        for (i=1; i<NUMPRIMES; i++)
-                mods[i]=BN_mod_word(rnd,(BN_ULONG)primes[i]);
-        delta=0;
-        loop: for (i=1; i<NUMPRIMES; i++)
-                {
-                /* check that rnd is not a prime and also
-                 * that gcd(rnd-1,primes) == 1 (except for 2) */
-                if (((mods[i]+delta)%primes[i]) <= 1)
-                        {
-                        d=delta;
-                        delta+=2;
-                        /* perhaps need to check for overflow of
-                         * delta (but delta can be upto 2^32)
-                         * 21-May-98 eay - added overflow check */
-                        if (delta < d) goto again;
-                        goto loop;
-                        }
-                }
-        if (!BN_add_word(rnd,delta)) return(0);
-        return(1);
-        }
-
-static int probable_prime_dh(BIGNUM *rnd, int bits, BIGNUM *add, BIGNUM *rem,
-             BN_CTX *ctx)
-        {
-        int i,ret=0;
-        BIGNUM *t1;
-
-        t1= &(ctx->bn[ctx->tos++]);
-
-        if (!BN_rand(rnd,bits,0,1)) goto err;
-
-        /* we need ((rnd-rem) % add) == 0 */
-
-        if (!BN_mod(t1,rnd,add,ctx)) goto err;
-        if (!BN_sub(rnd,rnd,t1)) goto err;
-        if (rem == NULL)
-                { if (!BN_add_word(rnd,1)) goto err; }
-        else
-                { if (!BN_add(rnd,rnd,rem)) goto err; }
-
-        /* we now have a random number 'rand' to test. */
-
-        loop: for (i=1; i<NUMPRIMES; i++)
-                {
-                /* check that rnd is a prime */
-                if (BN_mod_word(rnd,(BN_ULONG)primes[i]) <= 1)
-                        {
-                        if (!BN_add(rnd,rnd,add)) goto err;
-                        goto loop;
-                        }
-                }
-        ret=1;
-err:
-        ctx->tos--;
-        return(ret);
-        }
-
-static int probable_prime_dh_strong(BIGNUM *p, int bits, BIGNUM *padd,
-             BIGNUM *rem, BN_CTX *ctx)
-        {
-        int i,ret=0;
-        BIGNUM *t1,*qadd=NULL,*q=NULL;
-
-        bits--;
-        t1= &(ctx->bn[ctx->tos++]);
-        q= &(ctx->bn[ctx->tos++]);
-        qadd= &(ctx->bn[ctx->tos++]);
-
-        if (!BN_rshift1(qadd,padd)) goto err;
-                
-        if (!BN_rand(q,bits,0,1)) goto err;
-
-        /* we need ((rnd-rem) % add) == 0 */
-        if (!BN_mod(t1,q,qadd,ctx)) goto err;
-        if (!BN_sub(q,q,t1)) goto err;
-        if (rem == NULL)
-                { if (!BN_add_word(q,1)) goto err; }
-        else
-                {
-                if (!BN_rshift1(t1,rem)) goto err;
-                if (!BN_add(q,q,t1)) goto err;
-                }
-
-        /* we now have a random number 'rand' to test. */
-        if (!BN_lshift1(p,q)) goto err;
-        if (!BN_add_word(p,1)) goto err;
-
-        loop: for (i=1; i<NUMPRIMES; i++)
-                {
-                /* check that p and q are prime */
-                /* check that for p and q
-                 * gcd(p-1,primes) == 1 (except for 2) */
-                if (    (BN_mod_word(p,(BN_ULONG)primes[i]) == 0) ||
-                        (BN_mod_word(q,(BN_ULONG)primes[i]) == 0))
-                        {
-                        if (!BN_add(p,p,padd)) goto err;
-                        if (!BN_add(q,q,qadd)) goto err;
-                        goto loop;
-                        }
-                }
-        ret=1;
-err:
-        ctx->tos-=3;
-        return(ret);
-        }
-
-#if 0
-static int witness(BIGNUM *a, BIGNUM *n, BN_CTX *ctx)
-        {
-        int k,i,nb,ret= -1;
-        BIGNUM *d,*dd,*tmp;
-        BIGNUM *d1,*d2,*x,*n1,*inv;
-
-        d1= &(ctx->bn[ctx->tos]);
-        d2= &(ctx->bn[ctx->tos+1]);
-        x=  &(ctx->bn[ctx->tos+2]);
-        n1= &(ctx->bn[ctx->tos+3]);
-        inv=&(ctx->bn[ctx->tos+4]);
-        ctx->tos+=5;
-
-        d=d1;
-        dd=d2;
-        if (!BN_one(d)) goto err;
-        if (!BN_sub(n1,n,d)) goto err; /* n1=n-1; */
-        k=BN_num_bits(n1);
-
-        /* i=BN_num_bits(n); */
-#ifdef RECP_MUL_MOD
-        nb=BN_reciprocal(inv,n,ctx); /**/
-        if (nb == -1) goto err;
-#endif
-
-        for (i=k-1; i>=0; i--)
-                {
-                if (BN_copy(x,d) == NULL) goto err;
-#ifndef RECP_MUL_MOD
-                if (!BN_mod_mul(dd,d,d,n,ctx)) goto err;
-#else
-                if (!BN_mod_mul_reciprocal(dd,d,d,n,inv,nb,ctx)) goto err;
-#endif
-                if (    BN_is_one(dd) &&
-                        !BN_is_one(x) &&
-                        (BN_cmp(x,n1) != 0))
-                        {
-                        ret=1;
-                        goto err;
-                        }
-                if (BN_is_bit_set(n1,i))
-                        {
-#ifndef RECP_MUL_MOD
-                        if (!BN_mod_mul(d,dd,a,n,ctx)) goto err;
-#else
-                        if (!BN_mod_mul_reciprocal(d,dd,a,n,inv,nb,ctx)) goto err; 
-#endif
-                        }
-                else
-                        {
-                        tmp=d;
-                        d=dd;
-                        dd=tmp;
-                        }
-                }
-        if (BN_is_one(d))
-                i=0;
-        else    i=1;
-        ret=i;
-err:
-        ctx->tos-=5;
-        return(ret);
-        }
-#endif
diff --git a/src/lib/libcrypto/bn/bn_prime.h b/src/lib/libcrypto/bn/bn_prime.h
deleted file mode 100644
index 6fce0210cd..0000000000
--- a/src/lib/libcrypto/bn/bn_prime.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/* crypto/bn/bn_prime.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 EIGHT_BIT
-#define NUMPRIMES 2048
-#else
-#define NUMPRIMES 54
-#endif
-static unsigned int primes[NUMPRIMES]=
-        {
-           2,   3,   5,   7,  11,  13,  17,  19,
-          23,  29,  31,  37,  41,  43,  47,  53,
-          59,  61,  67,  71,  73,  79,  83,  89,
-          97, 101, 103, 107, 109, 113, 127, 131,
-         137, 139, 149, 151, 157, 163, 167, 173,
-         179, 181, 191, 193, 197, 199, 211, 223,
-         227, 229, 233, 239, 241, 251,
-#ifndef EIGHT_BIT
-         257, 263,
-         269, 271, 277, 281, 283, 293, 307, 311,
-         313, 317, 331, 337, 347, 349, 353, 359,
-         367, 373, 379, 383, 389, 397, 401, 409,
-         419, 421, 431, 433, 439, 443, 449, 457,
-         461, 463, 467, 479, 487, 491, 499, 503,
-         509, 521, 523, 541, 547, 557, 563, 569,
-         571, 577, 587, 593, 599, 601, 607, 613,
-         617, 619, 631, 641, 643, 647, 653, 659,
-         661, 673, 677, 683, 691, 701, 709, 719,
-         727, 733, 739, 743, 751, 757, 761, 769,
-         773, 787, 797, 809, 811, 821, 823, 827,
-         829, 839, 853, 857, 859, 863, 877, 881,
-         883, 887, 907, 911, 919, 929, 937, 941,
-         947, 953, 967, 971, 977, 983, 991, 997,
-        1009,1013,1019,1021,1031,1033,1039,1049,
-        1051,1061,1063,1069,1087,1091,1093,1097,
-        1103,1109,1117,1123,1129,1151,1153,1163,
-        1171,1181,1187,1193,1201,1213,1217,1223,
-        1229,1231,1237,1249,1259,1277,1279,1283,
-        1289,1291,1297,1301,1303,1307,1319,1321,
-        1327,1361,1367,1373,1381,1399,1409,1423,
-        1427,1429,1433,1439,1447,1451,1453,1459,
-        1471,1481,1483,1487,1489,1493,1499,1511,
-        1523,1531,1543,1549,1553,1559,1567,1571,
-        1579,1583,1597,1601,1607,1609,1613,1619,
-        1621,1627,1637,1657,1663,1667,1669,1693,
-        1697,1699,1709,1721,1723,1733,1741,1747,
-        1753,1759,1777,1783,1787,1789,1801,1811,
-        1823,1831,1847,1861,1867,1871,1873,1877,
-        1879,1889,1901,1907,1913,1931,1933,1949,
-        1951,1973,1979,1987,1993,1997,1999,2003,
-        2011,2017,2027,2029,2039,2053,2063,2069,
-        2081,2083,2087,2089,2099,2111,2113,2129,
-        2131,2137,2141,2143,2153,2161,2179,2203,
-        2207,2213,2221,2237,2239,2243,2251,2267,
-        2269,2273,2281,2287,2293,2297,2309,2311,
-        2333,2339,2341,2347,2351,2357,2371,2377,
-        2381,2383,2389,2393,2399,2411,2417,2423,
-        2437,2441,2447,2459,2467,2473,2477,2503,
-        2521,2531,2539,2543,2549,2551,2557,2579,
-        2591,2593,2609,2617,2621,2633,2647,2657,
-        2659,2663,2671,2677,2683,2687,2689,2693,
-        2699,2707,2711,2713,2719,2729,2731,2741,
-        2749,2753,2767,2777,2789,2791,2797,2801,
-        2803,2819,2833,2837,2843,2851,2857,2861,
-        2879,2887,2897,2903,2909,2917,2927,2939,
-        2953,2957,2963,2969,2971,2999,3001,3011,
-        3019,3023,3037,3041,3049,3061,3067,3079,
-        3083,3089,3109,3119,3121,3137,3163,3167,
-        3169,3181,3187,3191,3203,3209,3217,3221,
-        3229,3251,3253,3257,3259,3271,3299,3301,
-        3307,3313,3319,3323,3329,3331,3343,3347,
-        3359,3361,3371,3373,3389,3391,3407,3413,
-        3433,3449,3457,3461,3463,3467,3469,3491,
-        3499,3511,3517,3527,3529,3533,3539,3541,
-        3547,3557,3559,3571,3581,3583,3593,3607,
-        3613,3617,3623,3631,3637,3643,3659,3671,
-        3673,3677,3691,3697,3701,3709,3719,3727,
-        3733,3739,3761,3767,3769,3779,3793,3797,
-        3803,3821,3823,3833,3847,3851,3853,3863,
-        3877,3881,3889,3907,3911,3917,3919,3923,
-        3929,3931,3943,3947,3967,3989,4001,4003,
-        4007,4013,4019,4021,4027,4049,4051,4057,
-        4073,4079,4091,4093,4099,4111,4127,4129,
-        4133,4139,4153,4157,4159,4177,4201,4211,
-        4217,4219,4229,4231,4241,4243,4253,4259,
-        4261,4271,4273,4283,4289,4297,4327,4337,
-        4339,4349,4357,4363,4373,4391,4397,4409,
-        4421,4423,4441,4447,4451,4457,4463,4481,
-        4483,4493,4507,4513,4517,4519,4523,4547,
-        4549,4561,4567,4583,4591,4597,4603,4621,
-        4637,4639,4643,4649,4651,4657,4663,4673,
-        4679,4691,4703,4721,4723,4729,4733,4751,
-        4759,4783,4787,4789,4793,4799,4801,4813,
-        4817,4831,4861,4871,4877,4889,4903,4909,
-        4919,4931,4933,4937,4943,4951,4957,4967,
-        4969,4973,4987,4993,4999,5003,5009,5011,
-        5021,5023,5039,5051,5059,5077,5081,5087,
-        5099,5101,5107,5113,5119,5147,5153,5167,
-        5171,5179,5189,5197,5209,5227,5231,5233,
-        5237,5261,5273,5279,5281,5297,5303,5309,
-        5323,5333,5347,5351,5381,5387,5393,5399,
-        5407,5413,5417,5419,5431,5437,5441,5443,
-        5449,5471,5477,5479,5483,5501,5503,5507,
-        5519,5521,5527,5531,5557,5563,5569,5573,
-        5581,5591,5623,5639,5641,5647,5651,5653,
-        5657,5659,5669,5683,5689,5693,5701,5711,
-        5717,5737,5741,5743,5749,5779,5783,5791,
-        5801,5807,5813,5821,5827,5839,5843,5849,
-        5851,5857,5861,5867,5869,5879,5881,5897,
-        5903,5923,5927,5939,5953,5981,5987,6007,
-        6011,6029,6037,6043,6047,6053,6067,6073,
-        6079,6089,6091,6101,6113,6121,6131,6133,
-        6143,6151,6163,6173,6197,6199,6203,6211,
-        6217,6221,6229,6247,6257,6263,6269,6271,
-        6277,6287,6299,6301,6311,6317,6323,6329,
-        6337,6343,6353,6359,6361,6367,6373,6379,
-        6389,6397,6421,6427,6449,6451,6469,6473,
-        6481,6491,6521,6529,6547,6551,6553,6563,
-        6569,6571,6577,6581,6599,6607,6619,6637,
-        6653,6659,6661,6673,6679,6689,6691,6701,
-        6703,6709,6719,6733,6737,6761,6763,6779,
-        6781,6791,6793,6803,6823,6827,6829,6833,
-        6841,6857,6863,6869,6871,6883,6899,6907,
-        6911,6917,6947,6949,6959,6961,6967,6971,
-        6977,6983,6991,6997,7001,7013,7019,7027,
-        7039,7043,7057,7069,7079,7103,7109,7121,
-        7127,7129,7151,7159,7177,7187,7193,7207,
-        7211,7213,7219,7229,7237,7243,7247,7253,
-        7283,7297,7307,7309,7321,7331,7333,7349,
-        7351,7369,7393,7411,7417,7433,7451,7457,
-        7459,7477,7481,7487,7489,7499,7507,7517,
-        7523,7529,7537,7541,7547,7549,7559,7561,
-        7573,7577,7583,7589,7591,7603,7607,7621,
-        7639,7643,7649,7669,7673,7681,7687,7691,
-        7699,7703,7717,7723,7727,7741,7753,7757,
-        7759,7789,7793,7817,7823,7829,7841,7853,
-        7867,7873,7877,7879,7883,7901,7907,7919,
-        7927,7933,7937,7949,7951,7963,7993,8009,
-        8011,8017,8039,8053,8059,8069,8081,8087,
-        8089,8093,8101,8111,8117,8123,8147,8161,
-        8167,8171,8179,8191,8209,8219,8221,8231,
-        8233,8237,8243,8263,8269,8273,8287,8291,
-        8293,8297,8311,8317,8329,8353,8363,8369,
-        8377,8387,8389,8419,8423,8429,8431,8443,
-        8447,8461,8467,8501,8513,8521,8527,8537,
-        8539,8543,8563,8573,8581,8597,8599,8609,
-        8623,8627,8629,8641,8647,8663,8669,8677,
-        8681,8689,8693,8699,8707,8713,8719,8731,
-        8737,8741,8747,8753,8761,8779,8783,8803,
-        8807,8819,8821,8831,8837,8839,8849,8861,
-        8863,8867,8887,8893,8923,8929,8933,8941,
-        8951,8963,8969,8971,8999,9001,9007,9011,
-        9013,9029,9041,9043,9049,9059,9067,9091,
-        9103,9109,9127,9133,9137,9151,9157,9161,
-        9173,9181,9187,9199,9203,9209,9221,9227,
-        9239,9241,9257,9277,9281,9283,9293,9311,
-        9319,9323,9337,9341,9343,9349,9371,9377,
-        9391,9397,9403,9413,9419,9421,9431,9433,
-        9437,9439,9461,9463,9467,9473,9479,9491,
-        9497,9511,9521,9533,9539,9547,9551,9587,
-        9601,9613,9619,9623,9629,9631,9643,9649,
-        9661,9677,9679,9689,9697,9719,9721,9733,
-        9739,9743,9749,9767,9769,9781,9787,9791,
-        9803,9811,9817,9829,9833,9839,9851,9857,
-        9859,9871,9883,9887,9901,9907,9923,9929,
-        9931,9941,9949,9967,9973,10007,10009,10037,
-        10039,10061,10067,10069,10079,10091,10093,10099,
-        10103,10111,10133,10139,10141,10151,10159,10163,
-        10169,10177,10181,10193,10211,10223,10243,10247,
-        10253,10259,10267,10271,10273,10289,10301,10303,
-        10313,10321,10331,10333,10337,10343,10357,10369,
-        10391,10399,10427,10429,10433,10453,10457,10459,
-        10463,10477,10487,10499,10501,10513,10529,10531,
-        10559,10567,10589,10597,10601,10607,10613,10627,
-        10631,10639,10651,10657,10663,10667,10687,10691,
-        10709,10711,10723,10729,10733,10739,10753,10771,
-        10781,10789,10799,10831,10837,10847,10853,10859,
-        10861,10867,10883,10889,10891,10903,10909,10937,
-        10939,10949,10957,10973,10979,10987,10993,11003,
-        11027,11047,11057,11059,11069,11071,11083,11087,
-        11093,11113,11117,11119,11131,11149,11159,11161,
-        11171,11173,11177,11197,11213,11239,11243,11251,
-        11257,11261,11273,11279,11287,11299,11311,11317,
-        11321,11329,11351,11353,11369,11383,11393,11399,
-        11411,11423,11437,11443,11447,11467,11471,11483,
-        11489,11491,11497,11503,11519,11527,11549,11551,
-        11579,11587,11593,11597,11617,11621,11633,11657,
-        11677,11681,11689,11699,11701,11717,11719,11731,
-        11743,11777,11779,11783,11789,11801,11807,11813,
-        11821,11827,11831,11833,11839,11863,11867,11887,
-        11897,11903,11909,11923,11927,11933,11939,11941,
-        11953,11959,11969,11971,11981,11987,12007,12011,
-        12037,12041,12043,12049,12071,12073,12097,12101,
-        12107,12109,12113,12119,12143,12149,12157,12161,
-        12163,12197,12203,12211,12227,12239,12241,12251,
-        12253,12263,12269,12277,12281,12289,12301,12323,
-        12329,12343,12347,12373,12377,12379,12391,12401,
-        12409,12413,12421,12433,12437,12451,12457,12473,
-        12479,12487,12491,12497,12503,12511,12517,12527,
-        12539,12541,12547,12553,12569,12577,12583,12589,
-        12601,12611,12613,12619,12637,12641,12647,12653,
-        12659,12671,12689,12697,12703,12713,12721,12739,
-        12743,12757,12763,12781,12791,12799,12809,12821,
-        12823,12829,12841,12853,12889,12893,12899,12907,
-        12911,12917,12919,12923,12941,12953,12959,12967,
-        12973,12979,12983,13001,13003,13007,13009,13033,
-        13037,13043,13049,13063,13093,13099,13103,13109,
-        13121,13127,13147,13151,13159,13163,13171,13177,
-        13183,13187,13217,13219,13229,13241,13249,13259,
-        13267,13291,13297,13309,13313,13327,13331,13337,
-        13339,13367,13381,13397,13399,13411,13417,13421,
-        13441,13451,13457,13463,13469,13477,13487,13499,
-        13513,13523,13537,13553,13567,13577,13591,13597,
-        13613,13619,13627,13633,13649,13669,13679,13681,
-        13687,13691,13693,13697,13709,13711,13721,13723,
-        13729,13751,13757,13759,13763,13781,13789,13799,
-        13807,13829,13831,13841,13859,13873,13877,13879,
-        13883,13901,13903,13907,13913,13921,13931,13933,
-        13963,13967,13997,13999,14009,14011,14029,14033,
-        14051,14057,14071,14081,14083,14087,14107,14143,
-        14149,14153,14159,14173,14177,14197,14207,14221,
-        14243,14249,14251,14281,14293,14303,14321,14323,
-        14327,14341,14347,14369,14387,14389,14401,14407,
-        14411,14419,14423,14431,14437,14447,14449,14461,
-        14479,14489,14503,14519,14533,14537,14543,14549,
-        14551,14557,14561,14563,14591,14593,14621,14627,
-        14629,14633,14639,14653,14657,14669,14683,14699,
-        14713,14717,14723,14731,14737,14741,14747,14753,
-        14759,14767,14771,14779,14783,14797,14813,14821,
-        14827,14831,14843,14851,14867,14869,14879,14887,
-        14891,14897,14923,14929,14939,14947,14951,14957,
-        14969,14983,15013,15017,15031,15053,15061,15073,
-        15077,15083,15091,15101,15107,15121,15131,15137,
-        15139,15149,15161,15173,15187,15193,15199,15217,
-        15227,15233,15241,15259,15263,15269,15271,15277,
-        15287,15289,15299,15307,15313,15319,15329,15331,
-        15349,15359,15361,15373,15377,15383,15391,15401,
-        15413,15427,15439,15443,15451,15461,15467,15473,
-        15493,15497,15511,15527,15541,15551,15559,15569,
-        15581,15583,15601,15607,15619,15629,15641,15643,
-        15647,15649,15661,15667,15671,15679,15683,15727,
-        15731,15733,15737,15739,15749,15761,15767,15773,
-        15787,15791,15797,15803,15809,15817,15823,15859,
-        15877,15881,15887,15889,15901,15907,15913,15919,
-        15923,15937,15959,15971,15973,15991,16001,16007,
-        16033,16057,16061,16063,16067,16069,16073,16087,
-        16091,16097,16103,16111,16127,16139,16141,16183,
-        16187,16189,16193,16217,16223,16229,16231,16249,
-        16253,16267,16273,16301,16319,16333,16339,16349,
-        16361,16363,16369,16381,16411,16417,16421,16427,
-        16433,16447,16451,16453,16477,16481,16487,16493,
-        16519,16529,16547,16553,16561,16567,16573,16603,
-        16607,16619,16631,16633,16649,16651,16657,16661,
-        16673,16691,16693,16699,16703,16729,16741,16747,
-        16759,16763,16787,16811,16823,16829,16831,16843,
-        16871,16879,16883,16889,16901,16903,16921,16927,
-        16931,16937,16943,16963,16979,16981,16987,16993,
-        17011,17021,17027,17029,17033,17041,17047,17053,
-        17077,17093,17099,17107,17117,17123,17137,17159,
-        17167,17183,17189,17191,17203,17207,17209,17231,
-        17239,17257,17291,17293,17299,17317,17321,17327,
-        17333,17341,17351,17359,17377,17383,17387,17389,
-        17393,17401,17417,17419,17431,17443,17449,17467,
-        17471,17477,17483,17489,17491,17497,17509,17519,
-        17539,17551,17569,17573,17579,17581,17597,17599,
-        17609,17623,17627,17657,17659,17669,17681,17683,
-        17707,17713,17729,17737,17747,17749,17761,17783,
-        17789,17791,17807,17827,17837,17839,17851,17863,
-#endif
-        };
diff --git a/src/lib/libcrypto/bn/bn_prime.pl b/src/lib/libcrypto/bn/bn_prime.pl
deleted file mode 100644
index 979385a334..0000000000
--- a/src/lib/libcrypto/bn/bn_prime.pl
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/local/bin/perl
-# bn_prime.pl
-
-$num=2048;
-$num=$ARGV[0] if ($#ARGV >= 0);
-
-push(@primes,2);
-$p=1;
-loop: while ($#primes < $num-1)
-        {
-        $p+=2;
-        $s=int(sqrt($p));
-
-        for ($i=0; $primes[$i]<=$s; $i++)
-                {
-                next loop if (($p%$primes[$i]) == 0);
-                }
-        push(@primes,$p);
-        }
-
-print <<"EOF";
-/* Auto generated by bn_prime.pl */
-/* Copyright (C) 1995-1997 Eric Young (eay\@mincom.oz.au).
- * All rights reserved.
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * See the COPYRIGHT file in the SSLeay distribution for more details.
- */
-
-EOF
-
-for ($i=0; $i <= $#primes; $i++)
-        {
-        if ($primes[$i] > 256)
-                {
-                $eight=$i;
-                last;
-                }
-        }
-
-printf "#ifndef EIGHT_BIT\n";
-printf "#define NUMPRIMES %d\n",$num;
-printf "#else\n";
-printf "#define NUMPRIMES %d\n",$eight;
-printf "#endif\n";
-print "static unsigned int primes[NUMPRIMES]=\n\t{\n\t";
-$init=0;
-for ($i=0; $i <= $#primes; $i++)
-        {
-        printf "\n#ifndef EIGHT_BIT\n\t" if ($primes[$i] > 256) && !($init++);
-        printf("\n\t") if (($i%8) == 0) && ($i != 0);
-        printf("%4d,",$primes[$i]);
-        }
-print "\n#endif\n\t};\n";
-
-
diff --git a/src/lib/libcrypto/bn/bn_print.c b/src/lib/libcrypto/bn/bn_print.c
deleted file mode 100644
index 2f5ab2617b..0000000000
--- a/src/lib/libcrypto/bn/bn_print.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* crypto/bn/bn_print.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 "cryptlib.h"
-#include <openssl/buffer.h>
-#include "bn_lcl.h"
-
-static const char *Hex="0123456789ABCDEF";
-
-/* Must 'Free' the returned data */
-char *BN_bn2hex(const BIGNUM *a)
-        {
-        int i,j,v,z=0;
-        char *buf;
-        char *p;
-
-        buf=(char *)Malloc(a->top*BN_BYTES*2+2);
-        if (buf == NULL)
-                {
-                BNerr(BN_F_BN_BN2HEX,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        p=buf;
-        if (a->neg) *(p++)='-';
-        if (a->top == 0) *(p++)='0';
-        for (i=a->top-1; i >=0; i--)
-                {
-                for (j=BN_BITS2-8; j >= 0; j-=8)
-                        {
-                        /* strip leading zeros */
-                        v=((int)(a->d[i]>>(long)j))&0xff;
-                        if (z || (v != 0))
-                                {
-                                *(p++)=Hex[v>>4];
-                                *(p++)=Hex[v&0x0f];
-                                z=1;
-                                }
-                        }
-                }
-        *p='\0';
-err:
-        return(buf);
-        }
-
-/* Must 'Free' the returned data */
-char *BN_bn2dec(const BIGNUM *a)
-        {
-        int i=0,num;
-        char *buf=NULL;
-        char *p;
-        BIGNUM *t=NULL;
-        BN_ULONG *bn_data=NULL,*lp;
-
-        i=BN_num_bits(a)*3;
-        num=(i/10+i/1000+3)+1;
-        bn_data=(BN_ULONG *)Malloc((num/BN_DEC_NUM+1)*sizeof(BN_ULONG));
-        buf=(char *)Malloc(num+3);
-        if ((buf == NULL) || (bn_data == NULL))
-                {
-                BNerr(BN_F_BN_BN2DEC,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        if ((t=BN_dup(a)) == NULL) goto err;
-
-        p=buf;
-        lp=bn_data;
-        if (t->neg) *(p++)='-';
-        if (t->top == 0)
-                {
-                *(p++)='0';
-                *(p++)='\0';
-                }
-        else
-                {
-                i=0;
-                while (!BN_is_zero(t))
-                        {
-                        *lp=BN_div_word(t,BN_DEC_CONV);
-                        lp++;
-                        }
-                lp--;
-                /* We now have a series of blocks, BN_DEC_NUM chars
-                 * in length, where the last one needs trucation.
-                 * The blocks need to be reversed in order. */
-                sprintf(p,BN_DEC_FMT1,*lp);
-                while (*p) p++;
-                while (lp != bn_data)
-                        {
-                        lp--;
-                        sprintf(p,BN_DEC_FMT2,*lp);
-                        while (*p) p++;
-                        }
-                }
-err:
-        if (bn_data != NULL) Free(bn_data);
-        if (t != NULL) BN_free(t);
-        return(buf);
-        }
-
-int BN_hex2bn(BIGNUM **bn, const char *a)
-        {
-        BIGNUM *ret=NULL;
-        BN_ULONG l=0;
-        int neg=0,h,m,i,j,k,c;
-        int num;
-
-        if ((a == NULL) || (*a == '\0')) return(0);
-
-        if (*a == '-') { neg=1; a++; }
-
-        for (i=0; isxdigit((unsigned char) a[i]); i++)
-                ;
-
-        num=i+neg;
-        if (bn == NULL) return(num);
-
-        /* a is the start of the hex digets, and it is 'i' long */
-        if (*bn == NULL)
-                {
-                if ((ret=BN_new()) == NULL) return(0);
-                }
-        else
-                {
-                ret= *bn;
-                BN_zero(ret);
-                }
-
-        /* i is the number of hex digests; */
-        if (bn_expand(ret,i*4) == NULL) goto err;
-
-        j=i; /* least significate 'hex' */
-        m=0;
-        h=0;
-        while (j > 0)
-                {
-                m=((BN_BYTES*2) <= j)?(BN_BYTES*2):j;
-                l=0;
-                for (;;)
-                        {
-                        c=a[j-m];
-                        if ((c >= '0') && (c <= '9')) k=c-'0';
-                        else if ((c >= 'a') && (c <= 'f')) k=c-'a'+10;
-                        else if ((c >= 'A') && (c <= 'F')) k=c-'A'+10;
-                        else k=0; /* paranoia */
-                        l=(l<<4)|k;
-
-                        if (--m <= 0)
-                                {
-                                ret->d[h++]=l;
-                                break;
-                                }
-                        }
-                j-=(BN_BYTES*2);
-                }
-        ret->top=h;
-        bn_fix_top(ret);
-        ret->neg=neg;
-
-        *bn=ret;
-        return(num);
-err:
-        if (*bn == NULL) BN_free(ret);
-        return(0);
-        }
-
-int BN_dec2bn(BIGNUM **bn, const char *a)
-        {
-        BIGNUM *ret=NULL;
-        BN_ULONG l=0;
-        int neg=0,i,j;
-        int num;
-
-        if ((a == NULL) || (*a == '\0')) return(0);
-        if (*a == '-') { neg=1; a++; }
-
-        for (i=0; isdigit((unsigned char) a[i]); i++)
-                ;
-
-        num=i+neg;
-        if (bn == NULL) return(num);
-
-        /* a is the start of the digets, and it is 'i' long.
-         * We chop it into BN_DEC_NUM digets at a time */
-        if (*bn == NULL)
-                {
-                if ((ret=BN_new()) == NULL) return(0);
-                }
-        else
-                {
-                ret= *bn;
-                BN_zero(ret);
-                }
-
-        /* i is the number of digests, a bit of an over expand; */
-        if (bn_expand(ret,i*4) == NULL) goto err;
-
-        j=BN_DEC_NUM-(i%BN_DEC_NUM);
-        if (j == BN_DEC_NUM) j=0;
-        l=0;
-        while (*a)
-                {
-                l*=10;
-                l+= *a-'0';
-                a++;
-                if (++j == BN_DEC_NUM)
-                        {
-                        BN_mul_word(ret,BN_DEC_CONV);
-                        BN_add_word(ret,l);
-                        l=0;
-                        j=0;
-                        }
-                }
-        ret->neg=neg;
-
-        bn_fix_top(ret);
-        *bn=ret;
-        return(num);
-err:
-        if (*bn == NULL) BN_free(ret);
-        return(0);
-        }
-
-#ifndef NO_BIO
-
-#ifndef NO_FP_API
-int BN_print_fp(FILE *fp, BIGNUM *a)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                return(0);
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=BN_print(b,a);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int BN_print(BIO *bp, const BIGNUM *a)
-        {
-        int i,j,v,z=0;
-        int ret=0;
-
-        if ((a->neg) && (BIO_write(bp,"-",1) != 1)) goto end;
-        if ((a->top == 0) && (BIO_write(bp,"0",1) != 1)) goto end;
-        for (i=a->top-1; i >=0; i--)
-                {
-                for (j=BN_BITS2-4; j >= 0; j-=4)
-                        {
-                        /* strip leading zeros */
-                        v=((int)(a->d[i]>>(long)j))&0x0f;
-                        if (z || (v != 0))
-                                {
-                                if (BIO_write(bp,&(Hex[v]),1) != 1)
-                                        goto end;
-                                z=1;
-                                }
-                        }
-                }
-        ret=1;
-end:
-        return(ret);
-        }
-
-#endif
diff --git a/src/lib/libcrypto/bn/bn_rand.c b/src/lib/libcrypto/bn/bn_rand.c
deleted file mode 100644
index 91b8e34ae6..0000000000
--- a/src/lib/libcrypto/bn/bn_rand.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/bn/bn_rand.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 <time.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-#include <openssl/rand.h>
-
-int BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
-        {
-        unsigned char *buf=NULL;
-        int ret=0,bit,bytes,mask;
-        time_t tim;
-
-        bytes=(bits+7)/8;
-        bit=(bits-1)%8;
-        mask=0xff<<bit;
-
-        buf=(unsigned char *)Malloc(bytes);
-        if (buf == NULL)
-                {
-                BNerr(BN_F_BN_RAND,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* make a random number and set the top and bottom bits */
-        time(&tim);
-        RAND_seed(&tim,sizeof(tim));
-
-        RAND_bytes(buf,(int)bytes);
-        if (top)
-                {
-                if (bit == 0)
-                        {
-                        buf[0]=1;
-                        buf[1]|=0x80;
-                        }
-                else
-                        {
-                        buf[0]|=(3<<(bit-1));
-                        buf[0]&= ~(mask<<1);
-                        }
-                }
-        else
-                {
-                buf[0]|=(1<<bit);
-                buf[0]&= ~(mask<<1);
-                }
-        if (bottom) /* set bottom bits to whatever odd is */
-                buf[bytes-1]|=1;
-        if (!BN_bin2bn(buf,bytes,rnd)) goto err;
-        ret=1;
-err:
-        if (buf != NULL)
-                {
-                memset(buf,0,bytes);
-                Free(buf);
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c
deleted file mode 100644
index c1b0e230ea..0000000000
--- a/src/lib/libcrypto/bn/bn_recp.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* crypto/bn/bn_recp.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"
-
-void BN_RECP_CTX_init(BN_RECP_CTX *recp)
-        {
-        BN_init(&(recp->N));
-        BN_init(&(recp->Nr));
-        recp->num_bits=0;
-        recp->flags=0;
-        }
-
-BN_RECP_CTX *BN_RECP_CTX_new(void)
-        {
-        BN_RECP_CTX *ret;
-
-        if ((ret=(BN_RECP_CTX *)Malloc(sizeof(BN_RECP_CTX))) == NULL)
-                return(NULL);
-
-        BN_RECP_CTX_init(ret);
-        ret->flags=BN_FLG_MALLOCED;
-        return(ret);
-        }
-
-void BN_RECP_CTX_free(BN_RECP_CTX *recp)
-        {
-        if(recp == NULL)
-            return;
-
-        BN_free(&(recp->N));
-        BN_free(&(recp->Nr));
-        if (recp->flags & BN_FLG_MALLOCED)
-                Free(recp);
-        }
-
-int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
-        {
-        BN_copy(&(recp->N),d);
-        BN_zero(&(recp->Nr));
-        recp->num_bits=BN_num_bits(d);
-        recp->shift=0;
-        return(1);
-        }
-
-int BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_RECP_CTX *recp,
-             BN_CTX *ctx)
-        {
-        int ret=0;
-        BIGNUM *a;
-
-        a= &(ctx->bn[ctx->tos++]);
-        if (y != NULL)
-                {
-                if (x == y)
-                        { if (!BN_sqr(a,x,ctx)) goto err; }
-                else
-                        { if (!BN_mul(a,x,y,ctx)) goto err; }
-                }
-        else
-                a=x; /* Just do the mod */
-
-        BN_div_recp(NULL,r,a,recp,ctx);
-        ret=1;
-err:
-        ctx->tos--;
-        return(ret);
-        }
-
-int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BN_RECP_CTX *recp,
-             BN_CTX *ctx)
-        {
-        int i,j,tos,ret=0,ex;
-        BIGNUM *a,*b,*d,*r;
-
-        tos=ctx->tos;
-        a= &(ctx->bn[ctx->tos++]);
-        b= &(ctx->bn[ctx->tos++]);
-        if (dv != NULL)
-                d=dv;
-        else
-                d= &(ctx->bn[ctx->tos++]);
-        if (rem != NULL)
-                r=rem;
-        else
-                r= &(ctx->bn[ctx->tos++]);
-
-        if (BN_ucmp(m,&(recp->N)) < 0)
-                {
-                BN_zero(d);
-                BN_copy(r,m);
-                ctx->tos=tos;
-                return(1);
-                }
-
-        /* We want the remainder
-         * Given input of ABCDEF / ab
-         * we need multiply ABCDEF by 3 digests of the reciprocal of ab
-         *
-         */
-        i=BN_num_bits(m);
-
-        j=recp->num_bits*2;
-        if (j > i)
-                {
-                i=j;
-                ex=0;
-                }
-        else
-                {
-                ex=(i-j)/2;
-                }
-
-        j=i/2;
-
-        if (i != recp->shift)
-                recp->shift=BN_reciprocal(&(recp->Nr),&(recp->N),
-                        i,ctx);
-
-        if (!BN_rshift(a,m,j-ex)) goto err;
-        if (!BN_mul(b,a,&(recp->Nr),ctx)) goto err;
-        if (!BN_rshift(d,b,j+ex)) goto err;
-        d->neg=0;
-        if (!BN_mul(b,&(recp->N),d,ctx)) goto err;
-        if (!BN_usub(r,m,b)) goto err;
-        r->neg=0;
-
-        j=0;
-#if 1
-        while (BN_ucmp(r,&(recp->N)) >= 0)
-                {
-                if (j++ > 2)
-                        {
-                        BNerr(BN_F_BN_MOD_MUL_RECIPROCAL,BN_R_BAD_RECIPROCAL);
-                        goto err;
-                        }
-                if (!BN_usub(r,r,&(recp->N))) goto err;
-                if (!BN_add_word(d,1)) goto err;
-                }
-#endif
-
-        r->neg=BN_is_zero(r)?0:m->neg;
-        d->neg=m->neg^recp->N.neg;
-        ret=1;
-err:
-        ctx->tos=tos;
-        return(ret);
-        } 
-
-/* len is the expected size of the result
- * We actually calculate with an extra word of precision, so
- * we can do faster division if the remainder is not required.
- */
-int BN_reciprocal(BIGNUM *r, BIGNUM *m, int len, BN_CTX *ctx)
-        {
-        int ret= -1;
-        BIGNUM t;
-
-        BN_init(&t);
-
-        BN_zero(&t);
-        if (!BN_set_bit(&t,len)) goto err;
-
-        if (!BN_div(r,NULL,&t,m,ctx)) goto err;
-        ret=len;
-err:
-        BN_free(&t);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/bn/bn_shift.c b/src/lib/libcrypto/bn/bn_shift.c
deleted file mode 100644
index 61aae65a6b..0000000000
--- a/src/lib/libcrypto/bn/bn_shift.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* crypto/bn/bn_shift.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"
-
-int BN_lshift1(BIGNUM *r, BIGNUM *a)
-        {
-        register BN_ULONG *ap,*rp,t,c;
-        int i;
-
-        if (r != a)
-                {
-                r->neg=a->neg;
-                if (bn_wexpand(r,a->top+1) == NULL) return(0);
-                r->top=a->top;
-                }
-        else
-                {
-                if (bn_wexpand(r,a->top+1) == NULL) return(0);
-                }
-        ap=a->d;
-        rp=r->d;
-        c=0;
-        for (i=0; i<a->top; i++)
-                {
-                t= *(ap++);
-                *(rp++)=((t<<1)|c)&BN_MASK2;
-                c=(t & BN_TBIT)?1:0;
-                }
-        if (c)
-                {
-                *rp=1;
-                r->top++;
-                }
-        return(1);
-        }
-
-int BN_rshift1(BIGNUM *r, BIGNUM *a)
-        {
-        BN_ULONG *ap,*rp,t,c;
-        int i;
-
-        if (BN_is_zero(a))
-                {
-                BN_zero(r);
-                return(1);
-                }
-        if (a != r)
-                {
-                if (bn_wexpand(r,a->top) == NULL) return(0);
-                r->top=a->top;
-                r->neg=a->neg;
-                }
-        ap=a->d;
-        rp=r->d;
-        c=0;
-        for (i=a->top-1; i>=0; i--)
-                {
-                t=ap[i];
-                rp[i]=((t>>1)&BN_MASK2)|c;
-                c=(t&1)?BN_TBIT:0;
-                }
-        bn_fix_top(r);
-        return(1);
-        }
-
-int BN_lshift(BIGNUM *r, const BIGNUM *a, int n)
-        {
-        int i,nw,lb,rb;
-        BN_ULONG *t,*f;
-        BN_ULONG l;
-
-        r->neg=a->neg;
-        if (bn_wexpand(r,a->top+(n/BN_BITS2)+1) == NULL) return(0);
-        nw=n/BN_BITS2;
-        lb=n%BN_BITS2;
-        rb=BN_BITS2-lb;
-        f=a->d;
-        t=r->d;
-        t[a->top+nw]=0;
-        if (lb == 0)
-                for (i=a->top-1; i>=0; i--)
-                        t[nw+i]=f[i];
-        else
-                for (i=a->top-1; i>=0; i--)
-                        {
-                        l=f[i];
-                        t[nw+i+1]|=(l>>rb)&BN_MASK2;
-                        t[nw+i]=(l<<lb)&BN_MASK2;
-                        }
-        memset(t,0,nw*sizeof(t[0]));
-/*      for (i=0; i<nw; i++)
-                t[i]=0;*/
-        r->top=a->top+nw+1;
-        bn_fix_top(r);
-        return(1);
-        }
-
-int BN_rshift(BIGNUM *r, BIGNUM *a, int n)
-        {
-        int i,j,nw,lb,rb;
-        BN_ULONG *t,*f;
-        BN_ULONG l,tmp;
-
-        nw=n/BN_BITS2;
-        rb=n%BN_BITS2;
-        lb=BN_BITS2-rb;
-        if (nw > a->top)
-                {
-                BN_zero(r);
-                return(1);
-                }
-        if (r != a)
-                {
-                r->neg=a->neg;
-                if (bn_wexpand(r,a->top-nw+1) == NULL) return(0);
-                }
-
-        f= &(a->d[nw]);
-        t=r->d;
-        j=a->top-nw;
-        r->top=j;
-
-        if (rb == 0)
-                {
-                for (i=j+1; i > 0; i--)
-                        *(t++)= *(f++);
-                }
-        else
-                {
-                l= *(f++);
-                for (i=1; i<j; i++)
-                        {
-                        tmp =(l>>rb)&BN_MASK2;
-                        l= *(f++);
-                        *(t++) =(tmp|(l<<lb))&BN_MASK2;
-                        }
-                *(t++) =(l>>rb)&BN_MASK2;
-                }
-        *t=0;
-        bn_fix_top(r);
-        return(1);
-        }
diff --git a/src/lib/libcrypto/bn/bn_sqr.c b/src/lib/libcrypto/bn/bn_sqr.c
deleted file mode 100644
index 12cce4d7ce..0000000000
--- a/src/lib/libcrypto/bn/bn_sqr.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* crypto/bn/bn_sqr.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"
-
-/* r must not be a */
-/* I've just gone over this and it is now %20 faster on x86 - eay - 27 Jun 96 */
-int BN_sqr(BIGNUM *r, BIGNUM *a, BN_CTX *ctx)
-        {
-        int max,al;
-        BIGNUM *tmp,*rr;
-
-#ifdef BN_COUNT
-printf("BN_sqr %d * %d\n",a->top,a->top);
-#endif
-        bn_check_top(a);
-        tmp= &(ctx->bn[ctx->tos]);
-        rr=(a != r)?r: (&ctx->bn[ctx->tos+1]);
-
-        al=a->top;
-        if (al <= 0)
-                {
-                r->top=0;
-                return(1);
-                }
-
-        max=(al+al);
-        if (bn_wexpand(rr,max+1) == NULL) return(0);
-
-        r->neg=0;
-        if (al == 4)
-                {
-#ifndef BN_SQR_COMBA
-                BN_ULONG t[8];
-                bn_sqr_normal(rr->d,a->d,4,t);
-#else
-                bn_sqr_comba4(rr->d,a->d);
-#endif
-                }
-        else if (al == 8)
-                {
-#ifndef BN_SQR_COMBA
-                BN_ULONG t[16];
-                bn_sqr_normal(rr->d,a->d,8,t);
-#else
-                bn_sqr_comba8(rr->d,a->d);
-#endif
-                }
-        else 
-                {
-#if defined(BN_RECURSION)
-                if (al < BN_SQR_RECURSIVE_SIZE_NORMAL)
-                        {
-                        BN_ULONG t[BN_SQR_RECURSIVE_SIZE_NORMAL*2];
-                        bn_sqr_normal(rr->d,a->d,al,t);
-                        }
-                else
-                        {
-                        int j,k;
-
-                        j=BN_num_bits_word((BN_ULONG)al);
-                        j=1<<(j-1);
-                        k=j+j;
-                        if (al == j)
-                                {
-                                if (bn_wexpand(a,k*2) == NULL) return(0);
-                                if (bn_wexpand(tmp,k*2) == NULL) return(0);
-                                bn_sqr_recursive(rr->d,a->d,al,tmp->d);
-                                }
-                        else
-                                {
-                                if (bn_wexpand(tmp,max) == NULL) return(0);
-                                bn_sqr_normal(rr->d,a->d,al,tmp->d);
-                                }
-                        }
-#else
-                if (bn_wexpand(tmp,max) == NULL) return(0);
-                bn_sqr_normal(rr->d,a->d,al,tmp->d);
-#endif
-                }
-
-        rr->top=max;
-        if ((max > 0) && (rr->d[max-1] == 0)) rr->top--;
-        if (rr != r) BN_copy(r,rr);
-        return(1);
-        }
-
-/* tmp must have 2*n words */
-void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp)
-        {
-        int i,j,max;
-        BN_ULONG *ap,*rp;
-
-        max=n*2;
-        ap=a;
-        rp=r;
-        rp[0]=rp[max-1]=0;
-        rp++;
-        j=n;
-
-        if (--j > 0)
-                {
-                ap++;
-                rp[j]=bn_mul_words(rp,ap,j,ap[-1]);
-                rp+=2;
-                }
-
-        for (i=n-2; i>0; i--)
-                {
-                j--;
-                ap++;
-                rp[j]=bn_mul_add_words(rp,ap,j,ap[-1]);
-                rp+=2;
-                }
-
-        bn_add_words(r,r,r,max);
-
-        /* There will not be a carry */
-
-        bn_sqr_words(tmp,a,n);
-
-        bn_add_words(r,r,tmp,max);
-        }
-
-#ifdef BN_RECURSION
-/* r is 2*n words in size,
- * a and b are both n words in size.
- * n must be a power of 2.
- * We multiply and return the result.
- * t must be 2*n words in size
- * We calulate
- * a[0]*b[0]
- * a[0]*b[0]+a[1]*b[1]+(a[0]-a[1])*(b[1]-b[0])
- * a[1]*b[1]
- */
-void bn_sqr_recursive(BN_ULONG *r, BN_ULONG *a, int n2, BN_ULONG *t)
-        {
-        int n=n2/2;
-        int zero,c1;
-        BN_ULONG ln,lo,*p;
-
-#ifdef BN_COUNT
-printf(" bn_sqr_recursive %d * %d\n",n2,n2);
-#endif
-        if (n2 == 4)
-                {
-#ifndef BN_SQR_COMBA
-                bn_sqr_normal(r,a,4,t);
-#else
-                bn_sqr_comba4(r,a);
-#endif
-                return;
-                }
-        else if (n2 == 8)
-                {
-#ifndef BN_SQR_COMBA
-                bn_sqr_normal(r,a,8,t);
-#else
-                bn_sqr_comba8(r,a);
-#endif
-                return;
-                }
-        if (n2 < BN_SQR_RECURSIVE_SIZE_NORMAL)
-                {
-                bn_sqr_normal(r,a,n2,t);
-                return;
-                }
-        /* r=(a[0]-a[1])*(a[1]-a[0]) */
-        c1=bn_cmp_words(a,&(a[n]),n);
-        zero=0;
-        if (c1 > 0)
-                bn_sub_words(t,a,&(a[n]),n);
-        else if (c1 < 0)
-                bn_sub_words(t,&(a[n]),a,n);
-        else
-                zero=1;
-
-        /* The result will always be negative unless it is zero */
-        p= &(t[n2*2]);
-
-        if (!zero)
-                bn_sqr_recursive(&(t[n2]),t,n,p);
-        else
-                memset(&(t[n2]),0,n*sizeof(BN_ULONG));
-        bn_sqr_recursive(r,a,n,p);
-        bn_sqr_recursive(&(r[n2]),&(a[n]),n,p);
-
-        /* t[32] holds (a[0]-a[1])*(a[1]-a[0]), it is negative or zero
-         * r[10] holds (a[0]*b[0])
-         * r[32] holds (b[1]*b[1])
-         */
-
-        c1=(int)(bn_add_words(t,r,&(r[n2]),n2));
-
-        /* t[32] is negative */
-        c1-=(int)(bn_sub_words(&(t[n2]),t,&(t[n2]),n2));
-
-        /* t[32] holds (a[0]-a[1])*(a[1]-a[0])+(a[0]*a[0])+(a[1]*a[1])
-         * r[10] holds (a[0]*a[0])
-         * r[32] holds (a[1]*a[1])
-         * c1 holds the carry bits
-         */
-        c1+=(int)(bn_add_words(&(r[n]),&(r[n]),&(t[n2]),n2));
-        if (c1)
-                {
-                p= &(r[n+n2]);
-                lo= *p;
-                ln=(lo+c1)&BN_MASK2;
-                *p=ln;
-
-                /* The overflow will stop before we over write
-                 * words we should not overwrite */
-                if (ln < (BN_ULONG)c1)
-                        {
-                        do      {
-                                p++;
-                                lo= *p;
-                                ln=(lo+1)&BN_MASK2;
-                                *p=ln;
-                                } while (ln == 0);
-                        }
-                }
-        }
-#endif
diff --git a/src/lib/libcrypto/bn/bn_word.c b/src/lib/libcrypto/bn/bn_word.c
deleted file mode 100644
index c0cfbc6797..0000000000
--- a/src/lib/libcrypto/bn/bn_word.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* crypto/bn/bn_word.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"
-
-BN_ULONG BN_mod_word(BIGNUM *a, BN_ULONG w)
-        {
-#ifndef BN_LLONG
-        BN_ULONG ret=0;
-#else
-        BN_ULLONG ret=0;
-#endif
-        int i;
-
-        w&=BN_MASK2;
-        for (i=a->top-1; i>=0; i--)
-                {
-#ifndef BN_LLONG
-                ret=((ret<<BN_BITS4)|((a->d[i]>>BN_BITS4)&BN_MASK2l))%w;
-                ret=((ret<<BN_BITS4)|(a->d[i]&BN_MASK2l))%w;
-#else
-                ret=(BN_ULLONG)(((ret<<(BN_ULLONG)BN_BITS2)|a->d[i])%
-                        (BN_ULLONG)w);
-#endif
-                }
-        return((BN_ULONG)ret);
-        }
-
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w)
-        {
-        BN_ULONG ret;
-        int i;
-
-        if (a->top == 0) return(0);
-        ret=0;
-        w&=BN_MASK2;
-        for (i=a->top-1; i>=0; i--)
-                {
-                BN_ULONG l,d;
-                
-                l=a->d[i];
-                d=bn_div_words(ret,l,w);
-                ret=(l-((d*w)&BN_MASK2))&BN_MASK2;
-                a->d[i]=d;
-                }
-        if ((a->top > 0) && (a->d[a->top-1] == 0))
-                a->top--;
-        return(ret);
-        }
-
-int BN_add_word(BIGNUM *a, BN_ULONG w)
-        {
-        BN_ULONG l;
-        int i;
-
-        if (a->neg)
-                {
-                a->neg=0;
-                i=BN_sub_word(a,w);
-                if (!BN_is_zero(a))
-                        a->neg=1;
-                return(i);
-                }
-        w&=BN_MASK2;
-        if (bn_wexpand(a,a->top+1) == NULL) return(0);
-        i=0;
-        for (;;)
-                {
-                l=(a->d[i]+(BN_ULONG)w)&BN_MASK2;
-                a->d[i]=l;
-                if (w > l)
-                        w=1;
-                else
-                        break;
-                i++;
-                }
-        if (i >= a->top)
-                a->top++;
-        return(1);
-        }
-
-int BN_sub_word(BIGNUM *a, BN_ULONG w)
-        {
-        int i;
-
-        if (a->neg)
-                {
-                a->neg=0;
-                i=BN_add_word(a,w);
-                a->neg=1;
-                return(i);
-                }
-
-        w&=BN_MASK2;
-        if ((a->top == 1) && (a->d[0] < w))
-                {
-                a->d[0]=w-a->d[0];
-                a->neg=1;
-                return(1);
-                }
-        i=0;
-        for (;;)
-                {
-                if (a->d[i] >= w)
-                        {
-                        a->d[i]-=w;
-                        break;
-                        }
-                else
-                        {
-                        a->d[i]=(a->d[i]-w)&BN_MASK2;
-                        i++;
-                        w=1;
-                        }
-                }
-        if ((a->d[i] == 0) && (i == (a->top-1)))
-                a->top--;
-        return(1);
-        }
-
-int BN_mul_word(BIGNUM *a, BN_ULONG w)
-        {
-        BN_ULONG ll;
-
-        w&=BN_MASK2;
-        if (a->top)
-                {
-                ll=bn_mul_words(a->d,a->d,a->top,w);
-                if (ll)
-                        {
-                        if (bn_wexpand(a,a->top+1) == NULL) return(0);
-                        a->d[a->top++]=ll;
-                        }
-                }
-        return(1);
-        }
-
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c
deleted file mode 100644
index 7f9fd1f6c3..0000000000
--- a/src/lib/libcrypto/buffer/buf_err.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/buffer/buf_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/buffer.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA BUF_str_functs[]=
-        {
-{ERR_PACK(0,BUF_F_BUF_MEM_GROW,0),      "BUF_MEM_grow"},
-{ERR_PACK(0,BUF_F_BUF_MEM_NEW,0),       "BUF_MEM_new"},
-{ERR_PACK(0,BUF_F_BUF_STRDUP,0),        "BUF_strdup"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA BUF_str_reasons[]=
-        {
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_BUF_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_BUF,BUF_str_functs);
-                ERR_load_strings(ERR_LIB_BUF,BUF_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
deleted file mode 100644
index c3a108ea52..0000000000
--- a/src/lib/libcrypto/buffer/buffer.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* crypto/buffer/buffer.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 <openssl/buffer.h>
-
-BUF_MEM *BUF_MEM_new(void)
-        {
-        BUF_MEM *ret;
-
-        ret=Malloc(sizeof(BUF_MEM));
-        if (ret == NULL)
-                {
-                BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->length=0;
-        ret->max=0;
-        ret->data=NULL;
-        return(ret);
-        }
-
-void BUF_MEM_free(BUF_MEM *a)
-        {
-        if(a == NULL)
-            return;
-
-        if (a->data != NULL)
-                {
-                memset(a->data,0,(unsigned int)a->max);
-                Free(a->data);
-                }
-        Free(a);
-        }
-
-int BUF_MEM_grow(BUF_MEM *str, int len)
-        {
-        char *ret;
-        unsigned int n;
-
-        if (str->length >= len)
-                {
-                str->length=len;
-                return(len);
-                }
-        if (str->max >= len)
-                {
-                memset(&str->data[str->length],0,len-str->length);
-                str->length=len;
-                return(len);
-                }
-        n=(len+3)/3*4;
-        if (str->data == NULL)
-                ret=Malloc(n);
-        else
-                ret=Realloc(str->data,n);
-        if (ret == NULL)
-                {
-                BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
-                len=0;
-                }
-        else
-                {
-                str->data=ret;
-                str->length=len;
-                str->max=n;
-                }
-        return(len);
-        }
-
-char *BUF_strdup(const char *str)
-        {
-        char *ret;
-        int n;
-
-        if (str == NULL) return(NULL);
-
-        n=strlen(str);
-        ret=Malloc(n+1);
-        if (ret == NULL) 
-                {
-                BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        memcpy(ret,str,n+1);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h
deleted file mode 100644
index bff26bf391..0000000000
--- a/src/lib/libcrypto/buffer/buffer.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/buffer/buffer.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_BUFFER_H
-#define HEADER_BUFFER_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct buf_mem_st
-        {
-        int length;     /* current number of bytes */
-        char *data;
-        int max;        /* size of buffer */
-        } BUF_MEM;
-
-BUF_MEM *BUF_MEM_new(void);
-void    BUF_MEM_free(BUF_MEM *a);
-int     BUF_MEM_grow(BUF_MEM *str, int len);
-char *  BUF_strdup(const char *str);
-
-void ERR_load_BUF_strings(void );
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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
-
-/* Reason codes. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/cast/asm/cast-586.pl b/src/lib/libcrypto/cast/asm/cast-586.pl
deleted file mode 100644
index 6be0bfe572..0000000000
--- a/src/lib/libcrypto/cast/asm/cast-586.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/local/bin/perl
-
-# define for pentium pro friendly version
-$ppro=1;
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-require "cbc.pl";
-
-&asm_init($ARGV[0],"cast-586.pl",$ARGV[$#ARGV] eq "386");
-
-$CAST_ROUNDS=16;
-$L="edi";
-$R="esi";
-$K="ebp";
-$tmp1="ecx";
-$tmp2="ebx";
-$tmp3="eax";
-$tmp4="edx";
-$S1="CAST_S_table0";
-$S2="CAST_S_table1";
-$S3="CAST_S_table2";
-$S4="CAST_S_table3";
-
-@F1=("add","xor","sub");
-@F2=("xor","sub","add");
-@F3=("sub","add","xor");
-
-&CAST_encrypt("CAST_encrypt",1);
-&CAST_encrypt("CAST_decrypt",0);
-&cbc("CAST_cbc_encrypt","CAST_encrypt","CAST_decrypt",1,4,5,3,-1,-1);
-
-&asm_finish();
-
-sub CAST_encrypt {
-    local($name,$enc)=@_;
-
-    local($win_ex)=<<"EOF";
-EXTERN  _CAST_S_table0:DWORD
-EXTERN  _CAST_S_table1:DWORD
-EXTERN  _CAST_S_table2:DWORD
-EXTERN  _CAST_S_table3:DWORD
-EOF
-    &main::external_label(
-                          "CAST_S_table0",
-                          "CAST_S_table1",
-                          "CAST_S_table2",
-                          "CAST_S_table3",
-                          );
-
-    &function_begin_B($name,$win_ex);
-
-    &comment("");
-
-    &push("ebp");
-    &push("ebx");
-    &mov($tmp2,&wparam(0));
-    &mov($K,&wparam(1));
-    &push("esi");
-    &push("edi");
-
-    &comment("Load the 2 words");
-    &mov($L,&DWP(0,$tmp2,"",0));
-    &mov($R,&DWP(4,$tmp2,"",0));
-
-    &comment('Get short key flag');
-    &mov($tmp3,&DWP(128,$K,"",0));
-    if($enc) {
-        &push($tmp3);
-    } else {
-        &or($tmp3,$tmp3);
-        &jnz(&label('cast_dec_skip'));
-    }
-
-    &xor($tmp3, $tmp3);
-
-    # encrypting part
-
-    if ($enc) {
-        &E_CAST( 0,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 1,$S,$R,$L,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 2,$S,$L,$R,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 3,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 4,$S,$L,$R,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 5,$S,$R,$L,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 6,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 7,$S,$R,$L,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 8,$S,$L,$R,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 9,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(10,$S,$L,$R,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(11,$S,$R,$L,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &comment('test short key flag');
-        &pop($tmp4);
-        &or($tmp4,$tmp4);
-        &jnz(&label('cast_enc_done'));
-        &E_CAST(12,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(13,$S,$R,$L,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(14,$S,$L,$R,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(15,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-    } else {
-        &E_CAST(15,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(14,$S,$R,$L,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(13,$S,$L,$R,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(12,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &set_label('cast_dec_skip');
-        &E_CAST(11,$S,$L,$R,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST(10,$S,$R,$L,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 9,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 8,$S,$R,$L,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 7,$S,$L,$R,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 6,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 5,$S,$L,$R,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 4,$S,$R,$L,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 3,$S,$L,$R,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 2,$S,$R,$L,$K,@F3,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 1,$S,$L,$R,$K,@F2,$tmp1,$tmp2,$tmp3,$tmp4);
-        &E_CAST( 0,$S,$R,$L,$K,@F1,$tmp1,$tmp2,$tmp3,$tmp4);
-    }
-
-    &set_label('cast_enc_done') if $enc;
-# Why the nop? - Ben 17/1/99
-    &nop();
-    &mov($tmp3,&wparam(0));
-    &mov(&DWP(4,$tmp3,"",0),$L);
-    &mov(&DWP(0,$tmp3,"",0),$R);
-    &function_end($name);
-}
-
-sub E_CAST {
-    local($i,$S,$L,$R,$K,$OP1,$OP2,$OP3,$tmp1,$tmp2,$tmp3,$tmp4)=@_;
-    # Ri needs to have 16 pre added.
-
-    &comment("round $i");
-    &mov(       $tmp4,          &DWP($i*8,$K,"",1));
-
-    &mov(       $tmp1,          &DWP($i*8+4,$K,"",1));
-    &$OP1(      $tmp4,          $R);
-
-    &rotl(      $tmp4,          &LB($tmp1));
-
-    if ($ppro) {
-        &mov(   $tmp2,          $tmp4);         # B
-        &xor(   $tmp1,          $tmp1);
-        
-        &movb(  &LB($tmp1),     &HB($tmp4));    # A
-        &and(   $tmp2,          0xff);
-
-        &shr(   $tmp4,          16);            #
-        &xor(   $tmp3,          $tmp3);
-    } else {
-        &mov(   $tmp2,          $tmp4);         # B
-        &movb(  &LB($tmp1),     &HB($tmp4));    # A     # BAD BAD BAD
-        
-        &shr(   $tmp4,          16);            #
-        &and(   $tmp2,          0xff);
-    }
-
-    &movb(      &LB($tmp3),     &HB($tmp4));    # C     # BAD BAD BAD
-    &and(       $tmp4,          0xff);          # D
-
-    &mov(       $tmp1,          &DWP($S1,"",$tmp1,4));
-    &mov(       $tmp2,          &DWP($S2,"",$tmp2,4));
-
-    &$OP2(      $tmp1,          $tmp2);
-    &mov(       $tmp2,          &DWP($S3,"",$tmp3,4));
-
-    &$OP3(      $tmp1,          $tmp2);
-    &mov(       $tmp2,          &DWP($S4,"",$tmp4,4));
-
-    &$OP1(      $tmp1,          $tmp2);
-    # XXX
-
-    &xor(       $L,             $tmp1);
-    # XXX
-}
-
diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c
deleted file mode 100644
index 514c005c32..0000000000
--- a/src/lib/libcrypto/cast/c_cfb64.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* crypto/cast/c_cfb64.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 <openssl/cast.h>
-#include "cast_lcl.h"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, CAST_KEY *schedule, unsigned char *ivec,
-                        int *num, int enc)
-        {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        CAST_LONG ti[2];
-        unsigned char *iv,c,cc;
-
-        iv=ivec;
-        if (enc)
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                n2l(iv,v0); ti[0]=v0;
-                                n2l(iv,v1); ti[1]=v1;
-                                CAST_encrypt((CAST_LONG *)ti,schedule);
-                                iv=ivec;
-                                t=ti[0]; l2n(t,iv);
-                                t=ti[1]; l2n(t,iv);
-                                iv=ivec;
-                                }
-                        c= *(in++)^iv[n];
-                        *(out++)=c;
-                        iv[n]=c;
-                        n=(n+1)&0x07;
-                        }
-                }
-        else
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                n2l(iv,v0); ti[0]=v0;
-                                n2l(iv,v1); ti[1]=v1;
-                                CAST_encrypt((CAST_LONG *)ti,schedule);
-                                iv=ivec;
-                                t=ti[0]; l2n(t,iv);
-                                t=ti[1]; l2n(t,iv);
-                                iv=ivec;
-                                }
-                        cc= *(in++);
-                        c=iv[n];
-                        iv[n]=cc;
-                        *(out++)=c^cc;
-                        n=(n+1)&0x07;
-                        }
-                }
-        v0=v1=ti[0]=ti[1]=t=c=cc=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/cast/c_ecb.c b/src/lib/libcrypto/cast/c_ecb.c
deleted file mode 100644
index 33182f2b71..0000000000
--- a/src/lib/libcrypto/cast/c_ecb.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* crypto/cast/c_ecb.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 <openssl/cast.h>
-#include "cast_lcl.h"
-#include <openssl/opensslv.h>
-
-char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
-
-void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      CAST_KEY *ks, int enc)
-        {
-        CAST_LONG l,d[2];
-
-        n2l(in,l); d[0]=l;
-        n2l(in,l); d[1]=l;
-        if (enc)
-                CAST_encrypt(d,ks);
-        else
-                CAST_decrypt(d,ks);
-        l=d[0]; l2n(l,out);
-        l=d[1]; l2n(l,out);
-        l=d[0]=d[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c
deleted file mode 100644
index 0fe2cffecc..0000000000
--- a/src/lib/libcrypto/cast/c_enc.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* crypto/cast/c_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 <openssl/cast.h>
-#include "cast_lcl.h"
-
-void CAST_encrypt(CAST_LONG *data, CAST_KEY *key)
-        {
-        register CAST_LONG l,r,*k,t;
-
-        k= &(key->data[0]);
-        l=data[0];
-        r=data[1];
-
-        E_CAST( 0,k,l,r,+,^,-);
-        E_CAST( 1,k,r,l,^,-,+);
-        E_CAST( 2,k,l,r,-,+,^);
-        E_CAST( 3,k,r,l,+,^,-);
-        E_CAST( 4,k,l,r,^,-,+);
-        E_CAST( 5,k,r,l,-,+,^);
-        E_CAST( 6,k,l,r,+,^,-);
-        E_CAST( 7,k,r,l,^,-,+);
-        E_CAST( 8,k,l,r,-,+,^);
-        E_CAST( 9,k,r,l,+,^,-);
-        E_CAST(10,k,l,r,^,-,+);
-        E_CAST(11,k,r,l,-,+,^);
-        if(!key->short_key)
-            {
-            E_CAST(12,k,l,r,+,^,-);
-            E_CAST(13,k,r,l,^,-,+);
-            E_CAST(14,k,l,r,-,+,^);
-            E_CAST(15,k,r,l,+,^,-);
-            }
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-        }
-
-void CAST_decrypt(CAST_LONG *data, CAST_KEY *key)
-        {
-        register CAST_LONG l,r,*k,t;
-
-        k= &(key->data[0]);
-        l=data[0];
-        r=data[1];
-
-        if(!key->short_key)
-            {
-            E_CAST(15,k,l,r,+,^,-);
-            E_CAST(14,k,r,l,-,+,^);
-            E_CAST(13,k,l,r,^,-,+);
-            E_CAST(12,k,r,l,+,^,-);
-            }
-        E_CAST(11,k,l,r,-,+,^);
-        E_CAST(10,k,r,l,^,-,+);
-        E_CAST( 9,k,l,r,+,^,-);
-        E_CAST( 8,k,r,l,-,+,^);
-        E_CAST( 7,k,l,r,^,-,+);
-        E_CAST( 6,k,r,l,+,^,-);
-        E_CAST( 5,k,l,r,-,+,^);
-        E_CAST( 4,k,r,l,^,-,+);
-        E_CAST( 3,k,l,r,+,^,-);
-        E_CAST( 2,k,r,l,-,+,^);
-        E_CAST( 1,k,l,r,^,-,+);
-        E_CAST( 0,k,r,l,+,^,-);
-
-        data[1]=l&0xffffffffL;
-        data[0]=r&0xffffffffL;
-        }
-
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-             CAST_KEY *ks, unsigned char *iv, int enc)
-        {
-        register CAST_LONG tin0,tin1;
-        register CAST_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
-        CAST_LONG tin[2];
-
-        if (enc)
-                {
-                n2l(iv,tout0);
-                n2l(iv,tout1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        CAST_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        n2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        CAST_encrypt(tin,ks);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        }
-                l2n(tout0,iv);
-                l2n(tout1,iv);
-                }
-        else
-                {
-                n2l(iv,xor0);
-                n2l(iv,xor1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        CAST_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2n(tout0,out);
-                        l2n(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        n2l(in,tin0);
-                        n2l(in,tin1);
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        CAST_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2nn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                l2n(xor0,iv);
-                l2n(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c
deleted file mode 100644
index fd0469a62f..0000000000
--- a/src/lib/libcrypto/cast/c_ofb64.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* crypto/cast/c_ofb64.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 <openssl/cast.h>
-#include "cast_lcl.h"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, CAST_KEY *schedule, unsigned char *ivec,
-                        int *num)
-        {
-        register CAST_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        unsigned char d[8];
-        register char *dp;
-        CAST_LONG ti[2];
-        unsigned char *iv;
-        int save=0;
-
-        iv=ivec;
-        n2l(iv,v0);
-        n2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        dp=(char *)d;
-        l2n(v0,dp);
-        l2n(v1,dp);
-        while (l--)
-                {
-                if (n == 0)
-                        {
-                        CAST_encrypt((CAST_LONG *)ti,schedule);
-                        dp=(char *)d;
-                        t=ti[0]; l2n(t,dp);
-                        t=ti[1]; l2n(t,dp);
-                        save++;
-                        }
-                *(out++)= *(in++)^d[n];
-                n=(n+1)&0x07;
-                }
-        if (save)
-                {
-                v0=ti[0];
-                v1=ti[1];
-                iv=ivec;
-                l2n(v0,iv);
-                l2n(v1,iv);
-                }
-        t=v0=v1=ti[0]=ti[1]=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c
deleted file mode 100644
index acf2c3eeb5..0000000000
--- a/src/lib/libcrypto/cast/c_skey.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* crypto/cast/c_skey.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 <openssl/cast.h>
-#include "cast_lcl.h"
-#include "cast_s.h"
-
-#define CAST_exp(l,A,a,n) \
-        A[n/4]=l; \
-        a[n+3]=(l    )&0xff; \
-        a[n+2]=(l>> 8)&0xff; \
-        a[n+1]=(l>>16)&0xff; \
-        a[n+0]=(l>>24)&0xff;
-
-#define S4 CAST_S_table4
-#define S5 CAST_S_table5
-#define S6 CAST_S_table6
-#define S7 CAST_S_table7
-
-void CAST_set_key(CAST_KEY *key, int len, unsigned char *data)
-        {
-        CAST_LONG x[16];
-        CAST_LONG z[16];
-        CAST_LONG k[32];
-        CAST_LONG X[4],Z[4];
-        CAST_LONG l,*K;
-        int i;
-
-        for (i=0; i<16; i++) x[i]=0;
-        if (len > 16) len=16;
-        for (i=0; i<len; i++)
-                x[i]=data[i];
-        if(len <= 10)
-            key->short_key=1;
-        else
-            key->short_key=0;
-
-        K= &k[0];
-        X[0]=((x[ 0]<<24)|(x[ 1]<<16)|(x[ 2]<<8)|x[ 3])&0xffffffffL;
-        X[1]=((x[ 4]<<24)|(x[ 5]<<16)|(x[ 6]<<8)|x[ 7])&0xffffffffL;
-        X[2]=((x[ 8]<<24)|(x[ 9]<<16)|(x[10]<<8)|x[11])&0xffffffffL;
-        X[3]=((x[12]<<24)|(x[13]<<16)|(x[14]<<8)|x[15])&0xffffffffL;
-
-        for (;;)
-                {
-        l=X[0]^S4[x[13]]^S5[x[15]]^S6[x[12]]^S7[x[14]]^S6[x[ 8]];
-        CAST_exp(l,Z,z, 0);
-        l=X[2]^S4[z[ 0]]^S5[z[ 2]]^S6[z[ 1]]^S7[z[ 3]]^S7[x[10]];
-        CAST_exp(l,Z,z, 4);
-        l=X[3]^S4[z[ 7]]^S5[z[ 6]]^S6[z[ 5]]^S7[z[ 4]]^S4[x[ 9]];
-        CAST_exp(l,Z,z, 8);
-        l=X[1]^S4[z[10]]^S5[z[ 9]]^S6[z[11]]^S7[z[ 8]]^S5[x[11]];
-        CAST_exp(l,Z,z,12);
-
-        K[ 0]= S4[z[ 8]]^S5[z[ 9]]^S6[z[ 7]]^S7[z[ 6]]^S4[z[ 2]];
-        K[ 1]= S4[z[10]]^S5[z[11]]^S6[z[ 5]]^S7[z[ 4]]^S5[z[ 6]];
-        K[ 2]= S4[z[12]]^S5[z[13]]^S6[z[ 3]]^S7[z[ 2]]^S6[z[ 9]];
-        K[ 3]= S4[z[14]]^S5[z[15]]^S6[z[ 1]]^S7[z[ 0]]^S7[z[12]];
-
-        l=Z[2]^S4[z[ 5]]^S5[z[ 7]]^S6[z[ 4]]^S7[z[ 6]]^S6[z[ 0]];
-        CAST_exp(l,X,x, 0);
-        l=Z[0]^S4[x[ 0]]^S5[x[ 2]]^S6[x[ 1]]^S7[x[ 3]]^S7[z[ 2]];
-        CAST_exp(l,X,x, 4);
-        l=Z[1]^S4[x[ 7]]^S5[x[ 6]]^S6[x[ 5]]^S7[x[ 4]]^S4[z[ 1]];
-        CAST_exp(l,X,x, 8);
-        l=Z[3]^S4[x[10]]^S5[x[ 9]]^S6[x[11]]^S7[x[ 8]]^S5[z[ 3]];
-        CAST_exp(l,X,x,12);
-
-        K[ 4]= S4[x[ 3]]^S5[x[ 2]]^S6[x[12]]^S7[x[13]]^S4[x[ 8]];
-        K[ 5]= S4[x[ 1]]^S5[x[ 0]]^S6[x[14]]^S7[x[15]]^S5[x[13]];
-        K[ 6]= S4[x[ 7]]^S5[x[ 6]]^S6[x[ 8]]^S7[x[ 9]]^S6[x[ 3]];
-        K[ 7]= S4[x[ 5]]^S5[x[ 4]]^S6[x[10]]^S7[x[11]]^S7[x[ 7]];
-
-        l=X[0]^S4[x[13]]^S5[x[15]]^S6[x[12]]^S7[x[14]]^S6[x[ 8]];
-        CAST_exp(l,Z,z, 0);
-        l=X[2]^S4[z[ 0]]^S5[z[ 2]]^S6[z[ 1]]^S7[z[ 3]]^S7[x[10]];
-        CAST_exp(l,Z,z, 4);
-        l=X[3]^S4[z[ 7]]^S5[z[ 6]]^S6[z[ 5]]^S7[z[ 4]]^S4[x[ 9]];
-        CAST_exp(l,Z,z, 8);
-        l=X[1]^S4[z[10]]^S5[z[ 9]]^S6[z[11]]^S7[z[ 8]]^S5[x[11]];
-        CAST_exp(l,Z,z,12);
-
-        K[ 8]= S4[z[ 3]]^S5[z[ 2]]^S6[z[12]]^S7[z[13]]^S4[z[ 9]];
-        K[ 9]= S4[z[ 1]]^S5[z[ 0]]^S6[z[14]]^S7[z[15]]^S5[z[12]];
-        K[10]= S4[z[ 7]]^S5[z[ 6]]^S6[z[ 8]]^S7[z[ 9]]^S6[z[ 2]];
-        K[11]= S4[z[ 5]]^S5[z[ 4]]^S6[z[10]]^S7[z[11]]^S7[z[ 6]];
-
-        l=Z[2]^S4[z[ 5]]^S5[z[ 7]]^S6[z[ 4]]^S7[z[ 6]]^S6[z[ 0]];
-        CAST_exp(l,X,x, 0);
-        l=Z[0]^S4[x[ 0]]^S5[x[ 2]]^S6[x[ 1]]^S7[x[ 3]]^S7[z[ 2]];
-        CAST_exp(l,X,x, 4);
-        l=Z[1]^S4[x[ 7]]^S5[x[ 6]]^S6[x[ 5]]^S7[x[ 4]]^S4[z[ 1]];
-        CAST_exp(l,X,x, 8);
-        l=Z[3]^S4[x[10]]^S5[x[ 9]]^S6[x[11]]^S7[x[ 8]]^S5[z[ 3]];
-        CAST_exp(l,X,x,12);
-
-        K[12]= S4[x[ 8]]^S5[x[ 9]]^S6[x[ 7]]^S7[x[ 6]]^S4[x[ 3]];
-        K[13]= S4[x[10]]^S5[x[11]]^S6[x[ 5]]^S7[x[ 4]]^S5[x[ 7]];
-        K[14]= S4[x[12]]^S5[x[13]]^S6[x[ 3]]^S7[x[ 2]]^S6[x[ 8]];
-        K[15]= S4[x[14]]^S5[x[15]]^S6[x[ 1]]^S7[x[ 0]]^S7[x[13]];
-        if (K != k)  break;
-        K+=16;
-                }
-
-        for (i=0; i<16; i++)
-                {
-                key->data[i*2]=k[i];
-                key->data[i*2+1]=((k[i+16])+16)&0x1f;
-                }
-        }
-
diff --git a/src/lib/libcrypto/cast/cast.h b/src/lib/libcrypto/cast/cast.h
deleted file mode 100644
index 6cc5e8aa8c..0000000000
--- a/src/lib/libcrypto/cast/cast.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* crypto/cast/cast.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_CAST_H
-#define HEADER_CAST_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_CAST
-#error CAST is disabled.
-#endif
-
-#define CAST_ENCRYPT    1
-#define CAST_DECRYPT    0
-
-#define CAST_LONG unsigned long
-
-#define CAST_BLOCK      8
-#define CAST_KEY_LENGTH 16
-
-typedef struct cast_key_st
-        {
-        CAST_LONG data[32];
-        int short_key;  /* Use reduced rounds for short key */
-        } CAST_KEY;
-
- 
-void CAST_set_key(CAST_KEY *key, int len, unsigned char *data);
-void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key,
-                      int enc);
-void CAST_encrypt(CAST_LONG *data,CAST_KEY *key);
-void CAST_decrypt(CAST_LONG *data,CAST_KEY *key);
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                      CAST_KEY *ks, unsigned char *iv, int enc);
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, CAST_KEY *schedule, unsigned char *ivec,
-                        int *num, int enc);
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, 
-                        long length, CAST_KEY *schedule, unsigned char *ivec,
-                        int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/cast/cast_lcl.h b/src/lib/libcrypto/cast/cast_lcl.h
deleted file mode 100644
index 83cf382a91..0000000000
--- a/src/lib/libcrypto/cast/cast_lcl.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* crypto/cast/cast_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.]
- */
-
-#ifdef WIN32
-#include <stdlib.h>
-#endif
-
-
-#include "openssl/e_os.h" /* OPENSSL_EXTERN */
-
-#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))
-
-#if defined(WIN32)
-#define ROTL(a,n)     (_lrotl(a,n))
-#else
-#define ROTL(a,n)     ((((a)<<(n))&0xffffffffL)|((a)>>(32-(n))))
-#endif
-
-#define C_M    0x3fc
-#define C_0    22L
-#define C_1    14L
-#define C_2     6L
-#define C_3     2L /* left shift */
-
-/* The rotate has an extra 16 added to it to help the x86 asm */
-#if defined(CAST_PTR)
-#define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        int i; \
-        t=(key[n*2] OP1 R)&0xffffffffL; \
-        i=key[n*2+1]; \
-        t=ROTL(t,i); \
-        L^= (((((*(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table0+((t>>C_2)&C_M)) OP2 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table1+((t<<C_3)&C_M)))&0xffffffffL) OP3 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table2+((t>>C_0)&C_M)))&0xffffffffL) OP1 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table3+((t>>C_1)&C_M)))&0xffffffffL; \
-        }
-#elif defined(CAST_PTR2)
-#define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        int i; \
-        CAST_LONG u,v,w; \
-        w=(key[n*2] OP1 R)&0xffffffffL; \
-        i=key[n*2+1]; \
-        w=ROTL(w,i); \
-        u=w>>C_2; \
-        v=w<<C_3; \
-        u&=C_M; \
-        v&=C_M; \
-        t= *(CAST_LONG *)((unsigned char *)CAST_S_table0+u); \
-        u=w>>C_0; \
-        t=(t OP2 *(CAST_LONG *)((unsigned char *)CAST_S_table1+v))&0xffffffffL;\
-        v=w>>C_1; \
-        u&=C_M; \
-        v&=C_M; \
-        t=(t OP3 *(CAST_LONG *)((unsigned char *)CAST_S_table2+u)&0xffffffffL);\
-        t=(t OP1 *(CAST_LONG *)((unsigned char *)CAST_S_table3+v)&0xffffffffL);\
-        L^=(t&0xffffffff); \
-        }
-#else
-#define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        CAST_LONG a,b,c,d; \
-        t=(key[n*2] OP1 R)&0xffffffff; \
-        t=ROTL(t,(key[n*2+1])); \
-        a=CAST_S_table0[(t>> 8)&0xff]; \
-        b=CAST_S_table1[(t    )&0xff]; \
-        c=CAST_S_table2[(t>>24)&0xff]; \
-        d=CAST_S_table3[(t>>16)&0xff]; \
-        L^=(((((a OP2 b)&0xffffffffL) OP3 c)&0xffffffffL) OP1 d)&0xffffffffL; \
-        }
-#endif
-
-OPENSSL_EXTERN CAST_LONG CAST_S_table0[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table1[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table2[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table3[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table4[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table5[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table6[256];
-OPENSSL_EXTERN CAST_LONG CAST_S_table7[256];
diff --git a/src/lib/libcrypto/cast/cast_s.h b/src/lib/libcrypto/cast/cast_s.h
deleted file mode 100644
index 9af28972c5..0000000000
--- a/src/lib/libcrypto/cast/cast_s.h
+++ /dev/null
@@ -1,585 +0,0 @@
-/* crypto/cast/cast_s.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.]
- */
-OPENSSL_GLOBAL CAST_LONG CAST_S_table0[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table1[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table2[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table3[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table4[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table5[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table6[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,
-        };
-OPENSSL_GLOBAL CAST_LONG CAST_S_table7[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,
-        };
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c
deleted file mode 100644
index 1a819e3737..0000000000
--- a/src/lib/libcrypto/comp/c_rle.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/objects.h>
-#include <openssl/comp.h>
-
-static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
-        unsigned int olen, unsigned char *in, unsigned int ilen);
-static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
-        unsigned int olen, unsigned char *in, unsigned int ilen);
-
-static COMP_METHOD rle_method={
-        NID_rle_compression,
-        LN_rle_compression,
-        NULL,
-        NULL,
-        rle_compress_block,
-        rle_expand_block,
-        NULL,
-        };
-
-COMP_METHOD *COMP_rle(void)
-        {
-        return(&rle_method);
-        }
-
-static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
-             unsigned int olen, unsigned char *in, unsigned int ilen)
-        {
-        /* int i; */
-
-        if (olen < (ilen+1))
-                {
-                /* ZZZZZZZZZZZZZZZZZZZZZZ */
-                return(-1);
-                }
-
-        *(out++)=0;
-        memcpy(out,in,ilen);
-        return(ilen+1);
-        }
-
-static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
-             unsigned int olen, unsigned char *in, unsigned int ilen)
-        {
-        int i;
-
-        if (olen < (ilen-1))
-                {
-                /* ZZZZZZZZZZZZZZZZZZZZZZ */
-                return(-1);
-                }
-
-        i= *(in++);
-        if (i == 0)
-                {
-                memcpy(out,in,ilen-1);
-                }
-        return(ilen-1);
-        }
-
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c
deleted file mode 100644
index 6684ab4841..0000000000
--- a/src/lib/libcrypto/comp/c_zlib.c
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/objects.h>
-#include <openssl/comp.h>
-
-COMP_METHOD *COMP_zlib(void );
-
-#ifndef ZLIB
-
-static COMP_METHOD zlib_method={
-        NID_undef,
-        "(null)",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        };
-
-#else
-
-#include <zlib.h>
-
-static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out,
-        unsigned int olen, unsigned char *in, unsigned int ilen);
-static int zlib_expand_block(COMP_CTX *ctx, unsigned char *out,
-        unsigned int olen, unsigned char *in, unsigned int ilen);
-
-static int zz_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,
-        uLong sourceLen);
-
-static COMP_METHOD zlib_method={
-        NID_zlib_compression,
-        LN_zlib_compression,
-        NULL,
-        NULL,
-        zlib_compress_block,
-        zlib_expand_block,
-        NULL,
-        };
-
-static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out,
-             unsigned int olen, unsigned char *in, unsigned int ilen)
-        {
-        unsigned long l;
-        int i;
-        int clear=1;
-
-        if (ilen > 128)
-                {
-                out[0]=1;
-                l=olen-1;
-                i=compress(&(out[1]),&l,in,(unsigned long)ilen);
-                if (i != Z_OK)
-                        return(-1);
-                if (ilen > l)
-                        {
-                        clear=0;
-                        l++;
-                        }
-                }
-        if (clear)
-                {
-                out[0]=0;
-                memcpy(&(out[1]),in,ilen);
-                l=ilen+1;
-                }
-fprintf(stderr,"compress(%4d)->%4d %s\n",ilen,(int)l,(clear)?"clear":"zlib");
-        return((int)l);
-        }
-
-static int zlib_expand_block(COMP_CTX *ctx, unsigned char *out,
-             unsigned int olen, unsigned char *in, unsigned int ilen)
-        {
-        unsigned long l;
-        int i;
-
-        if (in[0])
-                {
-                l=olen;
-                i=zz_uncompress(out,&l,&(in[1]),(unsigned long)ilen-1);
-                if (i != Z_OK)
-                        return(-1);
-                }
-        else
-                {
-                memcpy(out,&(in[1]),ilen-1);
-                l=ilen-1;
-                }
-        fprintf(stderr,"expand  (%4d)->%4d %s\n",ilen,(int)l,in[0]?"zlib":"clear");
-        return((int)l);
-        }
-
-static int zz_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source,
-             uLong sourceLen)
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        return err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
-
-#endif
-
-COMP_METHOD *COMP_zlib(void)
-        {
-        return(&zlib_method);
-        }
-
diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h
deleted file mode 100644
index 93bd9c34c8..0000000000
--- a/src/lib/libcrypto/comp/comp.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#ifndef HEADER_COMP_H
-#define HEADER_COMP_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/crypto.h>
-
-typedef struct comp_method_st
-        {
-        int type;               /* NID for compression library */
-        const char *name;       /* A text string to identify the library */
-        int (*init)();
-        void (*finish)();
-        int (*compress)();
-        int (*expand)();
-        long (*ctrl)();
-        } COMP_METHOD;
-
-typedef struct comp_ctx_st
-        {
-        COMP_METHOD *meth;
-        unsigned long compress_in;
-        unsigned long compress_out;
-        unsigned long expand_in;
-        unsigned long expand_out;
-
-        CRYPTO_EX_DATA  ex_data;
-        } COMP_CTX;
-
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-        unsigned char *in, int ilen);
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-        unsigned char *in, int ilen);
-COMP_METHOD *COMP_rle(void );
-#ifdef ZLIB
-COMP_METHOD *COMP_zlib(void );
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the COMP functions. */
-
-/* Function codes. */
-
-/* Reason codes. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c
deleted file mode 100644
index 77a3f7070c..0000000000
--- a/src/lib/libcrypto/comp/comp_err.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* crypto/comp/comp_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/comp.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA COMP_str_functs[]=
-        {
-{0,NULL}
-        };
-
-static ERR_STRING_DATA COMP_str_reasons[]=
-        {
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_COMP_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_COMP,COMP_str_functs);
-                ERR_load_strings(ERR_LIB_COMP,COMP_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c
deleted file mode 100644
index a67ef23bc0..0000000000
--- a/src/lib/libcrypto/comp/comp_lib.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/objects.h>
-#include <openssl/comp.h>
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
-        {
-        COMP_CTX *ret;
-
-        if ((ret=(COMP_CTX *)Malloc(sizeof(COMP_CTX))) == NULL)
-                {
-                /* ZZZZZZZZZZZZZZZZ */
-                return(NULL);
-                }
-        memset(ret,0,sizeof(COMP_CTX));
-        ret->meth=meth;
-        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
-                {
-                Free(ret);
-                ret=NULL;
-                }
-#if 0
-        else
-                CRYPTO_new_ex_data(rsa_meth,(char *)ret,&ret->ex_data);
-#endif
-        return(ret);
-        }
-
-void COMP_CTX_free(COMP_CTX *ctx)
-        {
-        /* CRYPTO_free_ex_data(rsa_meth,(char *)ctx,&ctx->ex_data); */
-
-        if(ctx == NULL)
-            return;
-
-        if (ctx->meth->finish != NULL)
-                ctx->meth->finish(ctx);
-
-        Free(ctx);
-        }
-
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-             unsigned char *in, int ilen)
-        {
-        int ret;
-        if (ctx->meth->compress == NULL)
-                {
-                /* ZZZZZZZZZZZZZZZZZ */
-                return(-1);
-                }
-        ret=ctx->meth->compress(ctx,out,olen,in,ilen);
-        if (ret > 0)
-                {
-                ctx->compress_in+=ilen;
-                ctx->compress_out+=ret;
-                }
-        return(ret);
-        }
-
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-             unsigned char *in, int ilen)
-        {
-        int ret;
-
-        if (ctx->meth->expand == NULL)
-                {
-                /* ZZZZZZZZZZZZZZZZZ */
-                return(-1);
-                }
-        ret=ctx->meth->expand(ctx,out,olen,in,ilen);
-        if (ret > 0)
-                {
-                ctx->expand_in+=ilen;
-                ctx->expand_out+=ret;
-                }
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
deleted file mode 100644
index e7c5150097..0000000000
--- a/src/lib/libcrypto/conf/conf.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/conf/conf.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_CONF_H
-#define HEADER_CONF_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bio.h>
-#include <openssl/lhash.h>
-#include <openssl/stack.h>
-#include <openssl/safestack.h>
-
-typedef struct
-        {
-        char *section;
-        char *name;
-        char *value;
-        } CONF_VALUE;
-
-DECLARE_STACK_OF(CONF_VALUE)
-
-LHASH *CONF_load(LHASH *conf,const char *file,long *eline);
-LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline);
-LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section);
-char *CONF_get_string(LHASH *conf,char *group,char *name);
-long CONF_get_number(LHASH *conf,char *group,char *name);
-void CONF_free(LHASH *conf);
-void ERR_load_CONF_strings(void );
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the CONF functions. */
-
-/* Function codes. */
-#define CONF_F_CONF_LOAD                                 100
-#define CONF_F_CONF_LOAD_BIO                             102
-#define CONF_F_CONF_LOAD_FP                              103
-#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
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c
deleted file mode 100644
index eb4b3cfc70..0000000000
--- a/src/lib/libcrypto/conf/conf_err.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* crypto/conf/conf_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/conf.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA CONF_str_functs[]=
-        {
-{ERR_PACK(0,CONF_F_CONF_LOAD,0),        "CONF_load"},
-{ERR_PACK(0,CONF_F_CONF_LOAD_BIO,0),    "CONF_load_bio"},
-{ERR_PACK(0,CONF_F_CONF_LOAD_FP,0),     "CONF_load_fp"},
-{ERR_PACK(0,CONF_F_STR_COPY,0), "STR_COPY"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA CONF_str_reasons[]=
-        {
-{CONF_R_MISSING_CLOSE_SQUARE_BRACKET     ,"missing close square bracket"},
-{CONF_R_MISSING_EQUAL_SIGN               ,"missing equal sign"},
-{CONF_R_NO_CLOSE_BRACE                   ,"no close brace"},
-{CONF_R_UNABLE_TO_CREATE_NEW_SECTION     ,"unable to create new section"},
-{CONF_R_VARIABLE_HAS_NO_VALUE            ,"variable has no value"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_CONF_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_CONF,CONF_str_functs);
-                ERR_load_strings(ERR_LIB_CONF,CONF_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/conf/keysets.pl b/src/lib/libcrypto/conf/keysets.pl
deleted file mode 100644
index 1aed0c80c4..0000000000
--- a/src/lib/libcrypto/conf/keysets.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/local/bin/perl
-
-$NUMBER=0x01;
-$UPPER=0x02;
-$LOWER=0x04;
-$EOF=0x08;
-$WS=0x10;
-$ESC=0x20;
-$QUOTE=0x40;
-$COMMENT=0x80;
-$UNDER=0x100;
-
-foreach (0 .. 127)
-        {
-        $v=0;
-        $c=sprintf("%c",$_);
-        $v|=$NUMBER     if ($c =~ /[0-9]/);
-        $v|=$UPPER      if ($c =~ /[A-Z]/);
-        $v|=$LOWER      if ($c =~ /[a-z]/);
-        $v|=$UNDER      if ($c =~ /_/);
-        $v|=$WS         if ($c =~ / \t\r\n/);
-        $v|=$ESC        if ($c =~ /\\/);
-        $v|=$QUOTE      if ($c =~ /['`"]/);
-        $v|=$COMMENT    if ($c =~ /\#/);
-        $v|=$EOF        if ($c =~ /\0/);
-
-        push(@V,$v);
-        }
-
-print <<"EOF";
-#define CONF_NUMBER             $NUMBER
-#define CONF_UPPER              $UPPER
-#define CONF_LOWER              $LOWER
-#define CONF_EOF                $EOF
-#define CONF_WS                 $WS
-#define CONF_ESC                $ESC
-#define CONF_QUOTE              $QUOTE
-#define CONF_COMMENT            $COMMENT
-#define CONF_ALPHA              (CONF_UPPER|CONF_LOWER)
-#define CONF_ALPHA_NUMERIC      (CONF_ALPHA|CONF_NUMBER|CONF_UNDER)
-#define CONF_UNDER              $UNDER
-
-#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_QUOTE(a)             (CONF_type[(a)&0x7f]&CONF_QUOTE)
-
-EOF
-
-print "static unsigned short CONF_type[128]={";
-
-for ($i=0; $i<128; $i++)
-        {
-        print "\n\t" if ($i % 8) == 0;
-        printf "0x%03X,",$V[$i];
-        }
-
-print "\n\t};\n";
diff --git a/src/lib/libcrypto/conf/ssleay.cnf b/src/lib/libcrypto/conf/ssleay.cnf
deleted file mode 100644
index ed33af601e..0000000000
--- a/src/lib/libcrypto/conf/ssleay.cnf
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# This is a test configuration file for use in SSLeay etc...
-#
-
-init = 5
-in\#it1 =10
-init2='10'
-init3='10\''
-init4="10'"
-init5='='10\'' again'
-
-SSLeay::version = 0.5.0
-
-[genrsa]
-default_bits    = 512
-SSLEAY::version = 0.5.0
-
-[gendh]
-default_bits    = 512
-def_generator   = 2
-
-[s_client]
-cipher1         = DES_CBC_MD5:DES_CBC_SHA:DES_EDE_SHA:RC4_MD5\
-cipher2         = 'DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5'
-cipher3         = "DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5"
-cipher4         = DES_CBC_MD5 DES_CBC_SHA DES_EDE_SHA RC4_MD5
-
-[ default ]
-cert_dir        = $ENV::HOME/.ca_certs
-
-HOME            = /tmp/eay
-
-tmp_cert_dir    = $HOME/.ca_certs
-tmp2_cert_dir   = thisis$(HOME)stuff
-
-LOGNAME = Eric Young (home=$HOME)
-
-[ special ]
-
-H=$HOME
-H=$default::HOME
-H=$ENV::HOME
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = $HOME/.rand
-
-[ req ]
-default_bits            = 512
-default_keyfile         = privkey.pem
-
-Attribute_type_1        = countryName
-Attribute_text_1        = Country Name (2 letter code)
-Attribute_default_1     = AU
-
-Attribute_type_2        = stateOrProvinceName
-Attribute_text_2        = State or Province Name (full name)
-Attribute_default_2     = Queensland
-
-Attribute_type_3        = localityName
-Attribute_text_3        = Locality Name (eg, city)
-
-Attribute_type_4        = organizationName
-Attribute_text_4        = Organization Name (eg, company)
-Attribute_default_4     = Mincom Pty Ltd
-
-Attribute_type_5        = organizationalUnitName
-Attribute_text_5        = Organizational Unit Name (eg, section)
-Attribute_default_5     = TR
-
-Attribute_type_6        = commonName
-Attribute_text_6        = Common Name (eg, YOUR name)
-
-Attribute_type_7        = emailAddress
-Attribute_text_7        = Email Address
-
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c
deleted file mode 100644
index c2a2dd4af6..0000000000
--- a/src/lib/libcrypto/cpt_err.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/cpt_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/crypto.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA CRYPTO_str_functs[]=
-        {
-{ERR_PACK(0,CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,0),        "CRYPTO_get_ex_new_index"},
-{ERR_PACK(0,CRYPTO_F_CRYPTO_GET_NEW_LOCKID,0),  "CRYPTO_get_new_lockid"},
-{ERR_PACK(0,CRYPTO_F_CRYPTO_SET_EX_DATA,0),     "CRYPTO_set_ex_data"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA CRYPTO_str_reasons[]=
-        {
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_CRYPTO_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_CRYPTO,CRYPTO_str_functs);
-                ERR_load_strings(ERR_LIB_CRYPTO,CRYPTO_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
deleted file mode 100644
index 356c476a99..0000000000
--- a/src/lib/libcrypto/cryptlib.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* crypto/cryptlib.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-
-#if defined(WIN32) || defined(WIN16)
-static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
-#endif
-
-/* real #defines in crypto.h, keep these upto date */
-static const char* lock_names[CRYPTO_NUM_LOCKS] =
-        {
-        "<<ERROR>>",
-        "err",
-        "err_hash",
-        "x509",
-        "x509_info",
-        "x509_pkey",
-        "x509_crl",
-        "x509_req",
-        "dsa",
-        "rsa",
-        "evp_pkey",
-        "x509_store",
-        "ssl_ctx",
-        "ssl_cert",
-        "ssl_session",
-        "ssl_sess_cert",
-        "ssl",
-        "rand",
-        "debug_malloc",
-        "BIO",
-        "gethostbyname",
-        "getservbyname",
-        "readdir",
-        "RSA_blinding",
-#if CRYPTO_NUM_LOCKS != 24
-# error "Inconsistency between crypto.h and cryptlib.c"
-#endif
-        };
-
-static STACK *app_locks=NULL;
-
-static void (MS_FAR *locking_callback)(int mode,int type,
-        const char *file,int line)=NULL;
-static int (MS_FAR *add_lock_callback)(int *pointer,int amount,
-        int type,const char *file,int line)=NULL;
-static unsigned long (MS_FAR *id_callback)(void)=NULL;
-int CRYPTO_get_new_lockid(char *name)
-        {
-        char *str;
-        int i;
-
-        /* A hack to make Visual C++ 5.0 work correctly when linking as
-         * a DLL using /MT. Without this, the application cannot use
-         * and floating point printf's.
-         * It also seems to be needed for Visual C 1.5 (win16) */
-#if defined(WIN32) || defined(WIN16)
-        SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
-#endif
-
-        if ((app_locks == NULL) && ((app_locks=sk_new_null()) == NULL))
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        if ((str=BUF_strdup(name)) == NULL)
-                return(0);
-        i=sk_push(app_locks,str);
-        if (!i)
-                Free(str);
-        else
-                i+=CRYPTO_NUM_LOCKS; /* gap of one :-) */
-        return(i);
-        }
-
-int CRYPTO_num_locks(void)
-        {
-        return CRYPTO_NUM_LOCKS;
-        }
-
-void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
-                int line)
-        {
-        return(locking_callback);
-        }
-
-int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
-                                          const char *file,int line)
-        {
-        return(add_lock_callback);
-        }
-
-void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
-                                              const char *file,int line))
-        {
-        locking_callback=func;
-        }
-
-void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
-                                              const char *file,int line))
-        {
-        add_lock_callback=func;
-        }
-
-unsigned long (*CRYPTO_get_id_callback(void))(void)
-        {
-        return(id_callback);
-        }
-
-void CRYPTO_set_id_callback(unsigned long (*func)(void))
-        {
-        id_callback=func;
-        }
-
-unsigned long CRYPTO_thread_id(void)
-        {
-        unsigned long ret=0;
-
-        if (id_callback == NULL)
-                {
-#ifdef WIN16
-                ret=(unsigned long)GetCurrentTask();
-#elif defined(WIN32)
-                ret=(unsigned long)GetCurrentThreadId();
-#elif defined(MSDOS)
-                ret=1L;
-#else
-                ret=(unsigned long)getpid();
-#endif
-                }
-        else
-                ret=id_callback();
-        return(ret);
-        }
-
-void CRYPTO_lock(int mode, int type, const char *file, int line)
-        {
-#ifdef LOCK_DEBUG
-                {
-                char *rw_text,*operation_text;
-
-                if (mode & CRYPTO_LOCK)
-                        operation_text="lock  ";
-                else if (mode & CRYPTO_UNLOCK)
-                        operation_text="unlock";
-                else
-                        operation_text="ERROR ";
-
-                if (mode & CRYPTO_READ)
-                        rw_text="r";
-                else if (mode & CRYPTO_WRITE)
-                        rw_text="w";
-                else
-                        rw_text="ERROR";
-
-                fprintf(stderr,"lock:%08lx:(%s)%s %-18s %s:%d\n",
-                        CRYPTO_thread_id(), rw_text, operation_text,
-                        CRYPTO_get_lock_name(type), file, line);
-                }
-#endif
-        if (locking_callback != NULL)
-                locking_callback(mode,type,file,line);
-        }
-
-int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
-             int line)
-        {
-        int ret;
-
-        if (add_lock_callback != NULL)
-                {
-#ifdef LOCK_DEBUG
-                int before= *pointer;
-#endif
-
-                ret=add_lock_callback(pointer,amount,type,file,line);
-#ifdef LOCK_DEBUG
-                fprintf(stderr,"ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n",
-                        CRYPTO_thread_id(),
-                        before,amount,ret,
-                        CRYPTO_get_lock_name(type),
-                        file,line);
-#endif
-                *pointer=ret;
-                }
-        else
-                {
-                CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,file,line);
-
-                ret= *pointer+amount;
-#ifdef LOCK_DEBUG
-                fprintf(stderr,"ladd:%08lx:%2d+%2d->%2d %-18s %s:%d\n",
-                        CRYPTO_thread_id(),
-                        *pointer,amount,ret,
-                        CRYPTO_get_lock_name(type),
-                        file,line);
-#endif
-                *pointer=ret;
-                CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,file,line);
-                }
-        return(ret);
-        }
-
-const char *CRYPTO_get_lock_name(int type)
-        {
-        if (type < 0)
-                return("ERROR");
-        else if (type < CRYPTO_NUM_LOCKS)
-                return(lock_names[type]);
-        else if (type-CRYPTO_NUM_LOCKS >= sk_num(app_locks))
-                return("ERROR");
-        else
-                return(sk_value(app_locks,type-CRYPTO_NUM_LOCKS));
-        }
-
-#ifdef _DLL
-#ifdef WIN32
-
-/* All we really need to do is remove the 'error' state when a thread
- * detaches */
-
-BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason,
-             LPVOID lpvReserved)
-        {
-        switch(fdwReason)
-                {
-        case DLL_PROCESS_ATTACH:
-                break;
-        case DLL_THREAD_ATTACH:
-                break;
-        case DLL_THREAD_DETACH:
-                ERR_remove_state(0);
-                break;
-        case DLL_PROCESS_DETACH:
-                break;
-                }
-        return(TRUE);
-        }
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
deleted file mode 100644
index e3d38524ae..0000000000
--- a/src/lib/libcrypto/cryptlib.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* crypto/cryptlib.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_CRYPTLIB_H
-#define HEADER_CRYPTLIB_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include "openssl/e_os.h"
-
-#include <openssl/crypto.h>
-#include <openssl/buffer.h> 
-#include <openssl/bio.h> 
-#include <openssl/err.h>
-#include <openssl/opensslconf.h>
-
-#ifndef VMS
-#define X509_CERT_AREA          OPENSSLDIR
-#define X509_CERT_DIR           OPENSSLDIR "/certs"
-#define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-#define X509_PRIVATE_DIR        OPENSSLDIR "/private"
-#else
-#define X509_CERT_AREA          "SSLROOT:[000000]"
-#define X509_CERT_DIR           "SSLCERTS:"
-#define X509_CERT_FILE          "SSLCERTS:cert.pem"
-#define X509_PRIVATE_DIR        "SSLPRIVATE:"
-#endif
-
-#define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
-#define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
deleted file mode 100644
index 8ad8c25e5a..0000000000
--- a/src/lib/libcrypto/crypto.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/* crypto/crypto.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_CRYPTO_H
-#define HEADER_CRYPTO_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef NO_FP_API
-#include <stdio.h>
-#endif
-
-#include <openssl/stack.h>
-#include <openssl/opensslv.h>
-
-#ifdef CHARSET_EBCDIC
-#include <openssl/ebcdic.h>
-#endif
-
-/* Backward compatibility to SSLeay */
-/* This is more to be used to check the correct DLL is being used
- * in the MS world. */
-#define SSLEAY_VERSION_NUMBER   OPENSSL_VERSION_NUMBER
-#define SSLEAY_VERSION          0
-/* #define SSLEAY_OPTIONS       1 no longer supported */
-#define SSLEAY_CFLAGS           2
-#define SSLEAY_BUILT_ON         3
-#define SSLEAY_PLATFORM         4
-
-/* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
- * names in cryptlib.c
- */
-
-#define CRYPTO_LOCK_ERR                 1
-#define CRYPTO_LOCK_ERR_HASH            2
-#define CRYPTO_LOCK_X509                3
-#define CRYPTO_LOCK_X509_INFO           4
-#define CRYPTO_LOCK_X509_PKEY           5
-#define CRYPTO_LOCK_X509_CRL            6
-#define CRYPTO_LOCK_X509_REQ            7
-#define CRYPTO_LOCK_DSA                 8
-#define CRYPTO_LOCK_RSA                 9
-#define CRYPTO_LOCK_EVP_PKEY            10
-#define CRYPTO_LOCK_X509_STORE          11
-#define CRYPTO_LOCK_SSL_CTX             12
-#define CRYPTO_LOCK_SSL_CERT            13
-#define CRYPTO_LOCK_SSL_SESSION         14
-#define CRYPTO_LOCK_SSL_SESS_CERT       15
-#define CRYPTO_LOCK_SSL                 16
-#define CRYPTO_LOCK_RAND                17
-#define CRYPTO_LOCK_MALLOC              18
-#define CRYPTO_LOCK_BIO                 19
-#define CRYPTO_LOCK_GETHOSTBYNAME       20
-#define CRYPTO_LOCK_GETSERVBYNAME       21
-#define CRYPTO_LOCK_READDIR             22
-#define CRYPTO_LOCK_RSA_BLINDING        23
-#define CRYPTO_NUM_LOCKS                24
-
-#define CRYPTO_LOCK             1
-#define CRYPTO_UNLOCK           2
-#define CRYPTO_READ             4
-#define CRYPTO_WRITE            8
-
-#ifndef NO_LOCKING
-#ifndef CRYPTO_w_lock
-#define CRYPTO_w_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_w_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#define CRYPTO_r_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_r_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#define CRYPTO_add(addr,amount,type)    \
-        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-#endif
-#else
-#define CRYPTO_w_lock(a)
-#define CRYPTO_w_unlock(a)
-#define CRYPTO_r_lock(a)
-#define CRYPTO_r_unlock(a)
-#define CRYPTO_add(a,b,c)       ((*(a))+=(b))
-#endif
-
-/* The following can be used to detect memory leaks in the SSLeay library.
- * It used, it turns on malloc checking */
-
-#define CRYPTO_MEM_CHECK_OFF    0x0     /* an enume */
-#define CRYPTO_MEM_CHECK_ON     0x1     /* a bit */
-#define CRYPTO_MEM_CHECK_ENABLE 0x2     /* a bit */
-#define CRYPTO_MEM_CHECK_DISABLE 0x3    /* an enume */
-
-/*
-typedef struct crypto_mem_st
-        {
-        char *(*malloc_func)();
-        char *(*realloc_func)();
-        void (*free_func)();
-        } CRYPTO_MEM_FUNC;
-*/
-
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
-typedef struct crypto_ex_data_st
-        {
-        STACK *sk;
-        int dummy; /* gcc is screwing up this data structure :-( */
-        } CRYPTO_EX_DATA;
-
-/* This stuff is basically class callback functions
- * The current classes are SSL_CTX, SSL, SSL_SESION, and a few more */
-typedef struct crypto_ex_data_func_st
-        {
-        long argl;      /* Arbitary long */
-        char *argp;     /* Arbitary char * */
-        /* Called when a new object is created */
-        int (*new_func)(/*char *obj,
-                        char *item,int index,long argl,char *argp*/);
-        /* Called when this object is free()ed */
-        void (*free_func)(/*char *obj,
-                        char *item,int index,long argl,char *argp*/);
-
-        /* Called when we need to dup this one */
-        int (*dup_func)(/*char *obj_to,char *obj_from,
-                        char **new,int index,long argl,char *argp*/);
-        } CRYPTO_EX_DATA_FUNCS;
-
-/* Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
- * entry.
- */
-
-#define CRYPTO_EX_INDEX_BIO             0
-#define CRYPTO_EX_INDEX_SSL             1
-#define CRYPTO_EX_INDEX_SSL_CTX         2
-#define CRYPTO_EX_INDEX_SSL_SESSION     3
-#define CRYPTO_EX_INDEX_X509_STORE      4
-#define CRYPTO_EX_INDEX_X509_STORE_CTX  5
-
-/* Use this for win32 DLL's */
-#define CRYPTO_malloc_init()    CRYPTO_set_mem_functions(\
-        (char *(*)())malloc,\
-        (char *(*)())realloc,\
-        (void (*)())free)
-
-#ifdef CRYPTO_MDEBUG_ALL
-# ifndef CRYPTO_MDEBUG_TIME
-#  define CRYPTO_MDEBUG_TIME
-# endif
-# ifndef CRYPTO_MDEBUG_THREAD
-#  define CRYPTO_MDEBUG_THREAD
-# endif
-#endif
-
-#if defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
-# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
-#  define CRYPTO_MDEBUG
-# endif
-#endif
-
-#ifdef CRYPTO_MDEBUG
-#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
-#define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-#define MemCheck_on()   CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-#define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-#define Malloc(num)     CRYPTO_dbg_malloc((int)num,__FILE__,__LINE__)
-#define Realloc(addr,num) \
-        CRYPTO_dbg_realloc((char *)addr,(int)num,__FILE__,__LINE__)
-#define Remalloc(addr,num) \
-        CRYPTO_dbg_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
-#define FreeFunc        CRYPTO_dbg_free
-#define Free(addr)      CRYPTO_dbg_free(addr)
-#define Malloc_locked(num) CRYPTO_malloc_locked((int)num)
-#define Free_locked(addr) CRYPTO_free_locked(addr)
-#else
-#define MemCheck_start()
-#define MemCheck_stop()
-#define MemCheck_on()
-#define MemCheck_off()
-#define Remalloc        CRYPTO_remalloc
-#if defined(WIN32) || defined(MFUNC)
-#define Malloc          CRYPTO_malloc
-#define Realloc(a,n)    CRYPTO_realloc(a,(n))
-#define FreeFunc        CRYPTO_free
-#define Free(addr)      CRYPTO_free(addr)
-#define Malloc_locked   CRYPTO_malloc_locked
-#define Free_locked(addr) CRYPTO_free_locked(addr)
-#else
-#define Malloc          malloc
-#define Realloc         realloc
-#define FreeFunc        free
-#define Free(addr)      free(addr)
-#define Malloc_locked   malloc
-#define Free_locked(addr) free(addr)
-#endif /* WIN32 || MFUNC */
-#endif /* MDEBUG */
-
-/* Case insensiteve linking causes problems.... */
-#if defined(WIN16) || defined(VMS)
-#define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings
-#endif
-
-
-const char *SSLeay_version(int type);
-unsigned long SSLeay(void);
-
-int CRYPTO_get_ex_new_index(int idx,STACK **sk,long argl,char *argp,
-        int (*new_func)(),int (*dup_func)(),void (*free_func)());
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad,int idx,char *val);
-char *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad,int idx);
-int CRYPTO_dup_ex_data(STACK *meth,CRYPTO_EX_DATA *from,CRYPTO_EX_DATA *to);
-void CRYPTO_free_ex_data(STACK *meth,char *obj,CRYPTO_EX_DATA *ad);
-void CRYPTO_new_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad);
-
-int CRYPTO_mem_ctrl(int mode);
-int CRYPTO_get_new_lockid(char *name);
-
-int CRYPTO_num_locks(void); /* return CRYPTO_NUM_LOCKS (shared libs!) */
-void CRYPTO_lock(int mode, int type,const char *file,int line);
-void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
-                                              const char *file,int line));
-void (*CRYPTO_get_locking_callback(void))(int mode,int type,const char *file,
-                int line);
-void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type,
-                                              const char *file, int line));
-int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
-                                          const char *file,int line);
-void CRYPTO_set_id_callback(unsigned long (*func)(void));
-unsigned long (*CRYPTO_get_id_callback(void))(void);
-unsigned long CRYPTO_thread_id(void);
-const char *CRYPTO_get_lock_name(int type);
-int CRYPTO_add_lock(int *pointer,int amount,int type, const char *file,
-                    int line);
-
-void CRYPTO_set_mem_functions(char *(*m)(),char *(*r)(), void (*free_func)());
-void CRYPTO_get_mem_functions(char *(**m)(),char *(**r)(), void (**f)());
-void CRYPTO_set_locked_mem_functions(char *(*m)(), void (*free_func)());
-void CRYPTO_get_locked_mem_functions(char *(**m)(), void (**f)());
-
-void *CRYPTO_malloc_locked(int num);
-void CRYPTO_free_locked(void *);
-void *CRYPTO_malloc(int num);
-void CRYPTO_free(void *);
-void *CRYPTO_realloc(void *addr,int num);
-void *CRYPTO_remalloc(void *addr,int num);
-
-void *CRYPTO_dbg_malloc(int num,const char *file,int line);
-void *CRYPTO_dbg_realloc(void *addr,int num,const char *file,int line);
-void CRYPTO_dbg_free(void *);
-void *CRYPTO_dbg_remalloc(void *addr,int num,const char *file,int line);
-#ifndef NO_FP_API
-void CRYPTO_mem_leaks_fp(FILE *);
-#endif
-void CRYPTO_mem_leaks(struct bio_st *bio);
-/* unsigned long order, char *file, int line, int num_bytes, char *addr */
-void CRYPTO_mem_leaks_cb(void (*cb)());
-
-void ERR_load_CRYPTO_strings(void );
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
deleted file mode 100644
index affdfca98f..0000000000
--- a/src/lib/libcrypto/cversion.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/cversion.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-
-#ifndef NO_WINDOWS_BRAINDEATH
-#include "buildinf.h"
-#endif
-
-const char *SSLeay_version(int t)
-        {
-        if (t == SSLEAY_VERSION)
-                return OPENSSL_VERSION_TEXT;
-        if (t == SSLEAY_BUILT_ON)
-                {
-#ifdef DATE
-                static char buf[sizeof(DATE)+11];
-
-                sprintf(buf,"built on: %s",DATE);
-                return(buf);
-#else
-                return("built on: date not available");
-#endif
-                }
-        if (t == SSLEAY_CFLAGS)
-                {
-#ifdef CFLAGS
-                static char buf[sizeof(CFLAGS)+11];
-
-                sprintf(buf,"compiler: %s",CFLAGS);
-                return(buf);
-#else
-                return("compiler: information not available");
-#endif
-                }
-        if (t == SSLEAY_PLATFORM)
-                {
-#ifdef PLATFORM
-                static char buf[sizeof(PLATFORM)+11];
-
-                sprintf(buf,"platform: %s", PLATFORM);
-                return(buf);
-#else
-                return("platform: information not available");
-#endif
-                }
-        return("not available");
-        }
-
-unsigned long SSLeay(void)
-        {
-        return(SSLEAY_VERSION_NUMBER);
-        }
-
diff --git a/src/lib/libcrypto/des/COPYRIGHT b/src/lib/libcrypto/des/COPYRIGHT
deleted file mode 100644
index 5469e1e469..0000000000
--- a/src/lib/libcrypto/des/COPYRIGHT
+++ /dev/null
@@ -1,50 +0,0 @@
-Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
-All rights reserved.
-
-This package is an DES implementation written by Eric Young (eay@cryptsoft.com).
-The implementation was written so as to conform with MIT's libdes.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to.  The following conditions
-apply to all code found in this distribution.
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of that the SSL library.  This can be in the form of a textual
-message at program startup or in documentation (online or textual) provided
-with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other 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 Eric Young (eay@cryptsoft.com)
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The license and distribution terms for any publically available version or
-derivative of this code cannot be changed.  i.e. this code cannot simply be
-copied and put under another distrubution license
-[including the GNU Public License.]
-
-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/libcrypto/des/asm/crypt586.pl b/src/lib/libcrypto/des/asm/crypt586.pl
deleted file mode 100644
index 197c413ea6..0000000000
--- a/src/lib/libcrypto/des/asm/crypt586.pl
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/local/bin/perl
-#
-# The inner loop instruction sequence and the IP/FP modifications are from
-# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-# I've added the stuff needed for crypt() but I've not worried about making
-# things perfect.
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],"crypt586.pl");
-
-$L="edi";
-$R="esi";
-
-&external_label("des_SPtrans");
-&fcrypt_body("fcrypt_body");
-&asm_finish();
-
-sub fcrypt_body
-        {
-        local($name,$do_ip)=@_;
-
-        &function_begin($name,"EXTRN   _des_SPtrans:DWORD");
-
-        &comment("");
-        &comment("Load the 2 words");
-        $ks="ebp";
-
-        &xor(   $L,     $L);
-        &xor(   $R,     $R);
-        &mov($ks,&wparam(1));
-
-        &push(&DWC(25)); # add a variable
-
-        &set_label("start");
-        for ($i=0; $i<16; $i+=2)
-                {
-                &comment("");
-                &comment("Round $i");
-                &D_ENCRYPT($i,$L,$R,$i*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-
-                &comment("");
-                &comment("Round ".sprintf("%d",$i+1));
-                &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-                }
-         &mov("ebx",    &swtmp(0));
-        &mov("eax",     $L);
-         &dec("ebx");
-        &mov($L,        $R);
-         &mov($R,       "eax");
-        &mov(&swtmp(0), "ebx");
-         &jnz(&label("start"));
-
-        &comment("");
-        &comment("FP");
-        &mov("edx",&wparam(0));
-
-        &FP_new($R,$L,"eax",3);
-        &mov(&DWP(0,"edx","",0),"eax");
-        &mov(&DWP(4,"edx","",0),$L);
-
-        &pop("ecx");    # remove variable
-
-        &function_end($name);
-        }
-
-sub D_ENCRYPT
-        {
-        local($r,$L,$R,$S,$ks,$desSP,$u,$tmp1,$tmp2,$t)=@_;
-
-        &mov(   $u,             &wparam(2));                    # 2
-        &mov(   $t,             $R);
-        &shr(   $t,             16);                            # 1
-        &mov(   $tmp2,          &wparam(3));                    # 2
-        &xor(   $t,             $R);                            # 1
-
-        &and(   $u,             $t);                            # 2
-        &and(   $t,             $tmp2);                         # 2
-
-        &mov(   $tmp1,          $u);
-        &shl(   $tmp1,          16);                            # 1
-        &mov(   $tmp2,          $t);
-        &shl(   $tmp2,          16);                            # 1
-        &xor(   $u,             $tmp1);                         # 2
-        &xor(   $t,             $tmp2);                         # 2
-        &mov(   $tmp1,          &DWP(&n2a($S*4),$ks,"",0));     # 2
-        &xor(   $u,             $tmp1);
-        &mov(   $tmp2,          &DWP(&n2a(($S+1)*4),$ks,"",0)); # 2
-        &xor(   $u,             $R);
-        &xor(   $t,             $R);
-        &xor(   $t,             $tmp2);
-
-        &and(   $u,             "0xfcfcfcfc"    );              # 2
-        &xor(   $tmp1,          $tmp1);                         # 1
-        &and(   $t,             "0xcfcfcfcf"    );              # 2
-        &xor(   $tmp2,          $tmp2); 
-        &movb(  &LB($tmp1),     &LB($u) );
-        &movb(  &LB($tmp2),     &HB($u) );
-        &rotr(  $t,             4               );
-        &mov(   $ks,            &DWP("      $desSP",$tmp1,"",0));
-        &movb(  &LB($tmp1),     &LB($t) );
-        &xor(   $L,             $ks);
-        &mov(   $ks,            &DWP("0x200+$desSP",$tmp2,"",0));
-        &xor(   $L,             $ks);
-        &movb(  &LB($tmp2),     &HB($t) );
-        &shr(   $u,             16);
-        &mov(   $ks,            &DWP("0x100+$desSP",$tmp1,"",0));
-        &xor(   $L,             $ks); 
-        &movb(  &LB($tmp1),     &HB($u) );
-        &shr(   $t,             16);
-        &mov(   $ks,            &DWP("0x300+$desSP",$tmp2,"",0));
-        &xor(   $L,             $ks);
-        &mov(   $ks,            &wparam(1));
-        &movb(  &LB($tmp2),     &HB($t) );
-        &and(   $u,             "0xff"  );
-        &and(   $t,             "0xff"  );
-        &mov(   $tmp1,          &DWP("0x600+$desSP",$tmp1,"",0));
-        &xor(   $L,             $tmp1);
-        &mov(   $tmp1,          &DWP("0x700+$desSP",$tmp2,"",0));
-        &xor(   $L,             $tmp1);
-        &mov(   $tmp1,          &DWP("0x400+$desSP",$u,"",0));
-        &xor(   $L,             $tmp1);
-        &mov(   $tmp1,          &DWP("0x500+$desSP",$t,"",0));
-        &xor(   $L,             $tmp1);
-        }
-
-sub n2a
-        {
-        sprintf("%d",$_[0]);
-        }
-
-# now has a side affect of rotating $a by $shift
-sub R_PERM_OP
-        {
-        local($a,$b,$tt,$shift,$mask,$last)=@_;
-
-        &rotl(  $a,             $shift          ) if ($shift != 0);
-        &mov(   $tt,            $a              );
-        &xor(   $a,             $b              );
-        &and(   $a,             $mask           );
-        if ($notlast eq $b)
-                {
-                &xor(   $b,             $a              );
-                &xor(   $tt,            $a              );
-                }
-        else
-                {
-                &xor(   $tt,            $a              );
-                &xor(   $b,             $a              );
-                }
-        &comment("");
-        }
-
-sub IP_new
-        {
-        local($l,$r,$tt,$lr)=@_;
-
-        &R_PERM_OP($l,$r,$tt, 4,"0xf0f0f0f0",$l);
-        &R_PERM_OP($r,$tt,$l,20,"0xfff0000f",$l);
-        &R_PERM_OP($l,$tt,$r,14,"0x33333333",$r);
-        &R_PERM_OP($tt,$r,$l,22,"0x03fc03fc",$r);
-        &R_PERM_OP($l,$r,$tt, 9,"0xaaaaaaaa",$r);
-        
-        if ($lr != 3)
-                {
-                if (($lr-3) < 0)
-                        { &rotr($tt,    3-$lr); }
-                else    { &rotl($tt,    $lr-3); }
-                }
-        if ($lr != 2)
-                {
-                if (($lr-2) < 0)
-                        { &rotr($r,     2-$lr); }
-                else    { &rotl($r,     $lr-2); }
-                }
-        }
-
-sub FP_new
-        {
-        local($l,$r,$tt,$lr)=@_;
-
-        if ($lr != 2)
-                {
-                if (($lr-2) < 0)
-                        { &rotl($r,     2-$lr); }
-                else    { &rotr($r,     $lr-2); }
-                }
-        if ($lr != 3)
-                {
-                if (($lr-3) < 0)
-                        { &rotl($l,     3-$lr); }
-                else    { &rotr($l,     $lr-3); }
-                }
-
-        &R_PERM_OP($l,$r,$tt, 0,"0xaaaaaaaa",$r);
-        &R_PERM_OP($tt,$r,$l,23,"0x03fc03fc",$r);
-        &R_PERM_OP($l,$r,$tt,10,"0x33333333",$l);
-        &R_PERM_OP($r,$tt,$l,18,"0xfff0000f",$l);
-        &R_PERM_OP($l,$tt,$r,12,"0xf0f0f0f0",$r);
-        &rotr($tt       , 4);
-        }
-
diff --git a/src/lib/libcrypto/des/asm/des-586.pl b/src/lib/libcrypto/des/asm/des-586.pl
deleted file mode 100644
index f054071077..0000000000
--- a/src/lib/libcrypto/des/asm/des-586.pl
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/usr/local/bin/perl
-#
-# The inner loop instruction sequence and the IP/FP modifications are from
-# Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-require "cbc.pl";
-require "desboth.pl";
-
-# base code is in microsft
-# op dest, source
-# format.
-#
-
-&asm_init($ARGV[0],"des-586.pl");
-
-$L="edi";
-$R="esi";
-
-&external_label("des_SPtrans");
-&des_encrypt("des_encrypt",1);
-&des_encrypt("des_encrypt2",0);
-&des_encrypt3("des_encrypt3",1);
-&des_encrypt3("des_decrypt3",0);
-&cbc("des_ncbc_encrypt","des_encrypt","des_encrypt",0,4,5,3,5,-1);
-&cbc("des_ede3_cbc_encrypt","des_encrypt3","des_decrypt3",0,6,7,3,4,5);
-
-&asm_finish();
-
-sub des_encrypt
-        {
-        local($name,$do_ip)=@_;
-
-        &function_begin_B($name,"EXTRN   _des_SPtrans:DWORD");
-
-        &push("esi");
-        &push("edi");
-
-        &comment("");
-        &comment("Load the 2 words");
-        $ks="ebp";
-
-        if ($do_ip)
-                {
-                &mov($R,&wparam(0));
-                 &xor(  "ecx",          "ecx"           );
-
-                &push("ebx");
-                &push("ebp");
-
-                &mov("eax",&DWP(0,$R,"",0));
-                 &mov("ebx",&wparam(2));        # get encrypt flag
-                &mov($L,&DWP(4,$R,"",0));
-                &comment("");
-                &comment("IP");
-                &IP_new("eax",$L,$R,3);
-                }
-        else
-                {
-                &mov("eax",&wparam(0));
-                 &xor(  "ecx",          "ecx"           );
-
-                &push("ebx");
-                &push("ebp");
-
-                &mov($R,&DWP(0,"eax","",0));
-                 &mov("ebx",&wparam(2));        # get encrypt flag
-                &rotl($R,3);
-                &mov($L,&DWP(4,"eax","",0));
-                &rotl($L,3);
-                }
-
-        &mov(   $ks,            &wparam(1)      );
-        &cmp("ebx","0");
-        &je(&label("start_decrypt"));
-
-        for ($i=0; $i<16; $i+=2)
-                {
-                &comment("");
-                &comment("Round $i");
-                &D_ENCRYPT($i,$L,$R,$i*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-
-                &comment("");
-                &comment("Round ".sprintf("%d",$i+1));
-                &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-                }
-        &jmp(&label("end"));
-
-        &set_label("start_decrypt");
-
-        for ($i=15; $i>0; $i-=2)
-                {
-                &comment("");
-                &comment("Round $i");
-                &D_ENCRYPT(15-$i,$L,$R,$i*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-                &comment("");
-                &comment("Round ".sprintf("%d",$i-1));
-                &D_ENCRYPT(15-$i+1,$R,$L,($i-1)*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
-                }
-
-        &set_label("end");
-
-        if ($do_ip)
-                {
-                &comment("");
-                &comment("FP");
-                &mov("edx",&wparam(0));
-                &FP_new($L,$R,"eax",3);
-
-                &mov(&DWP(0,"edx","",0),"eax");
-                &mov(&DWP(4,"edx","",0),$R);
-                }
-        else
-                {
-                &comment("");
-                &comment("Fixup");
-                &rotr($L,3);            # r
-                 &mov("eax",&wparam(0));
-                &rotr($R,3);            # l
-                 &mov(&DWP(0,"eax","",0),$L);
-                 &mov(&DWP(4,"eax","",0),$R);
-                }
-
-        &pop("ebp");
-        &pop("ebx");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-
-        &function_end_B($name);
-        }
-
-sub D_ENCRYPT
-        {
-        local($r,$L,$R,$S,$ks,$desSP,$u,$tmp1,$tmp2,$t)=@_;
-
-         &mov(  $u,             &DWP(&n2a($S*4),$ks,"",0));
-        &xor(   $tmp1,          $tmp1);
-         &mov(  $t,             &DWP(&n2a(($S+1)*4),$ks,"",0));
-        &xor(   $u,             $R);
-         &xor(  $t,             $R);
-        &and(   $u,             "0xfcfcfcfc"    );
-         &and(  $t,             "0xcfcfcfcf"    );
-        &movb(  &LB($tmp1),     &LB($u) );
-         &movb( &LB($tmp2),     &HB($u) );
-        &rotr(  $t,             4               );
-        &mov(   $ks,            &DWP("      $desSP",$tmp1,"",0));
-         &movb( &LB($tmp1),     &LB($t) );
-        &xor(   $L,             $ks);
-         &mov(  $ks,            &DWP("0x200+$desSP",$tmp2,"",0));
-        &xor(   $L,             $ks); ######
-         &movb( &LB($tmp2),     &HB($t) );
-        &shr(   $u,             16);
-         &mov(  $ks,            &DWP("0x100+$desSP",$tmp1,"",0));
-        &xor(   $L,             $ks); ######
-         &movb( &LB($tmp1),     &HB($u) );
-        &shr(   $t,             16);
-         &mov(  $ks,            &DWP("0x300+$desSP",$tmp2,"",0));
-        &xor(   $L,             $ks);
-         &mov(  $ks,            &wparam(1)      );
-        &movb(  &LB($tmp2),     &HB($t) );
-         &and(  $u,             "0xff"  );
-        &and(   $t,             "0xff"  );
-         &mov(  $tmp1,          &DWP("0x600+$desSP",$tmp1,"",0));
-        &xor(   $L,             $tmp1);
-         &mov(  $tmp1,          &DWP("0x700+$desSP",$tmp2,"",0));
-        &xor(   $L,             $tmp1);
-         &mov(  $tmp1,          &DWP("0x400+$desSP",$u,"",0));
-        &xor(   $L,             $tmp1);
-         &mov(  $tmp1,          &DWP("0x500+$desSP",$t,"",0));
-        &xor(   $L,             $tmp1);
-        }
-
-sub n2a
-        {
-        sprintf("%d",$_[0]);
-        }
-
-# now has a side affect of rotating $a by $shift
-sub R_PERM_OP
-        {
-        local($a,$b,$tt,$shift,$mask,$last)=@_;
-
-        &rotl(  $a,             $shift          ) if ($shift != 0);
-        &mov(   $tt,            $a              );
-        &xor(   $a,             $b              );
-        &and(   $a,             $mask           );
-        # This can never succeed, and besides it is difficult to see what the
-        # idea was - Ben 13 Feb 99
-        if (!$last eq $b)
-                {
-                &xor(   $b,             $a              );
-                &xor(   $tt,            $a              );
-                }
-        else
-                {
-                &xor(   $tt,            $a              );
-                &xor(   $b,             $a              );
-                }
-        &comment("");
-        }
-
-sub IP_new
-        {
-        local($l,$r,$tt,$lr)=@_;
-
-        &R_PERM_OP($l,$r,$tt, 4,"0xf0f0f0f0",$l);
-        &R_PERM_OP($r,$tt,$l,20,"0xfff0000f",$l);
-        &R_PERM_OP($l,$tt,$r,14,"0x33333333",$r);
-        &R_PERM_OP($tt,$r,$l,22,"0x03fc03fc",$r);
-        &R_PERM_OP($l,$r,$tt, 9,"0xaaaaaaaa",$r);
-        
-        if ($lr != 3)
-                {
-                if (($lr-3) < 0)
-                        { &rotr($tt,    3-$lr); }
-                else    { &rotl($tt,    $lr-3); }
-                }
-        if ($lr != 2)
-                {
-                if (($lr-2) < 0)
-                        { &rotr($r,     2-$lr); }
-                else    { &rotl($r,     $lr-2); }
-                }
-        }
-
-sub FP_new
-        {
-        local($l,$r,$tt,$lr)=@_;
-
-        if ($lr != 2)
-                {
-                if (($lr-2) < 0)
-                        { &rotl($r,     2-$lr); }
-                else    { &rotr($r,     $lr-2); }
-                }
-        if ($lr != 3)
-                {
-                if (($lr-3) < 0)
-                        { &rotl($l,     3-$lr); }
-                else    { &rotr($l,     $lr-3); }
-                }
-
-        &R_PERM_OP($l,$r,$tt, 0,"0xaaaaaaaa",$r);
-        &R_PERM_OP($tt,$r,$l,23,"0x03fc03fc",$r);
-        &R_PERM_OP($l,$r,$tt,10,"0x33333333",$l);
-        &R_PERM_OP($r,$tt,$l,18,"0xfff0000f",$l);
-        &R_PERM_OP($l,$tt,$r,12,"0xf0f0f0f0",$r);
-        &rotr($tt       , 4);
-        }
-
diff --git a/src/lib/libcrypto/des/asm/desboth.pl b/src/lib/libcrypto/des/asm/desboth.pl
deleted file mode 100644
index d5106414db..0000000000
--- a/src/lib/libcrypto/des/asm/desboth.pl
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/local/bin/perl
-
-$L="edi";
-$R="esi";
-
-sub des_encrypt3
-        {
-        local($name,$enc)=@_;
-
-        &function_begin_B($name,"");
-        &push("ebx");
-        &mov("ebx",&wparam(0));
-
-        &push("ebp");
-        &push("esi");
-
-        &push("edi");
-
-        &comment("");
-        &comment("Load the data words");
-        &mov($L,&DWP(0,"ebx","",0));
-        &mov($R,&DWP(4,"ebx","",0));
-        &stack_push(3);
-
-        &comment("");
-        &comment("IP");
-        &IP_new($L,$R,"edx",0);
-
-        # put them back
-        
-        if ($enc)
-                {
-                &mov(&DWP(4,"ebx","",0),$R);
-                 &mov("eax",&wparam(1));
-                &mov(&DWP(0,"ebx","",0),"edx");
-                 &mov("edi",&wparam(2));
-                 &mov("esi",&wparam(3));
-                }
-        else
-                {
-                &mov(&DWP(4,"ebx","",0),$R);
-                 &mov("esi",&wparam(1));
-                &mov(&DWP(0,"ebx","",0),"edx");
-                 &mov("edi",&wparam(2));
-                 &mov("eax",&wparam(3));
-                }
-        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-        &mov(&swtmp(1), "eax");
-        &mov(&swtmp(0), "ebx");
-        &call("des_encrypt2");
-        &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
-        &mov(&swtmp(1), "edi");
-        &mov(&swtmp(0), "ebx");
-        &call("des_encrypt2");
-        &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-        &mov(&swtmp(1), "esi");
-        &mov(&swtmp(0), "ebx");
-        &call("des_encrypt2");
-
-        &stack_pop(3);
-        &mov($L,&DWP(0,"ebx","",0));
-        &mov($R,&DWP(4,"ebx","",0));
-
-        &comment("");
-        &comment("FP");
-        &FP_new($L,$R,"eax",0);
-
-        &mov(&DWP(0,"ebx","",0),"eax");
-        &mov(&DWP(4,"ebx","",0),$R);
-
-        &pop("edi");
-        &pop("esi");
-        &pop("ebp");
-        &pop("ebx");
-        &ret();
-        &function_end_B($name);
-        }
-
-
diff --git a/src/lib/libcrypto/des/cbc_cksm.c b/src/lib/libcrypto/des/cbc_cksm.c
deleted file mode 100644
index 1e543cb2a1..0000000000
--- a/src/lib/libcrypto/des/cbc_cksm.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* crypto/des/cbc_cksm.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"
-
-DES_LONG des_cbc_cksum(const unsigned char *in, des_cblock *output,
-                long length,
-                des_key_schedule schedule, const_des_cblock *ivec)
-        {
-        register DES_LONG tout0,tout1,tin0,tin1;
-        register long l=length;
-        DES_LONG tin[2];
-        unsigned char *out = &(*output)[0];
-        const unsigned char *iv = &(*ivec)[0];
-
-        c2l(iv,tout0);
-        c2l(iv,tout1);
-        for (; l>0; l-=8)
-                {
-                if (l >= 8)
-                        {
-                        c2l(in,tin0);
-                        c2l(in,tin1);
-                        }
-                else
-                        c2ln(in,tin0,tin1,l);
-                        
-                tin0^=tout0; tin[0]=tin0;
-                tin1^=tout1; tin[1]=tin1;
-                des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-                /* fix 15/10/91 eay - thanks to keithr@sco.COM */
-                tout0=tin[0];
-                tout1=tin[1];
-                }
-        if (out != NULL)
-                {
-                l2c(tout0,out);
-                l2c(tout1,out);
-                }
-        tout0=tin0=tin1=tin[0]=tin[1]=0;
-        return(tout1);
-        }
diff --git a/src/lib/libcrypto/des/cbc_enc.c b/src/lib/libcrypto/des/cbc_enc.c
deleted file mode 100644
index 677903ae4e..0000000000
--- a/src/lib/libcrypto/des/cbc_enc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* crypto/des/cbc_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.]
- */
-
-#define CBC_ENC_C__DONT_UPDATE_IV
-
-#include "ncbc_enc.c" /* des_cbc_encrypt */
diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c
deleted file mode 100644
index 5362a551bf..0000000000
--- a/src/lib/libcrypto/des/cfb64ede.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* crypto/des/cfb64ede.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"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void des_ede3_cfb64_encrypt(const 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)
-        {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
-        DES_LONG ti[2];
-        unsigned char *iv,c,cc;
-
-        iv=&(*ivec)[0];
-        if (enc)
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0);
-                                c2l(iv,v1);
-
-                                ti[0]=v0;
-                                ti[1]=v1;
-                                des_encrypt3(ti,ks1,ks2,ks3);
-                                v0=ti[0];
-                                v1=ti[1];
-
-                                iv = &(*ivec)[0];
-                                l2c(v0,iv);
-                                l2c(v1,iv);
-                                iv = &(*ivec)[0];
-                                }
-                        c= *(in++)^iv[n];
-                        *(out++)=c;
-                        iv[n]=c;
-                        n=(n+1)&0x07;
-                        }
-                }
-        else
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0);
-                                c2l(iv,v1);
-
-                                ti[0]=v0;
-                                ti[1]=v1;
-                                des_encrypt3(ti,ks1,ks2,ks3);
-                                v0=ti[0];
-                                v1=ti[1];
-
-                                iv = &(*ivec)[0];
-                                l2c(v0,iv);
-                                l2c(v1,iv);
-                                iv = &(*ivec)[0];
-                                }
-                        cc= *(in++);
-                        c=iv[n];
-                        iv[n]=cc;
-                        *(out++)=c^cc;
-                        n=(n+1)&0x07;
-                        }
-                }
-        v0=v1=ti[0]=ti[1]=c=cc=0;
-        *num=n;
-        }
-
-#ifdef undef /* MACRO */
-void des_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             des_key_schedule ks1, des_key_schedule ks2, des_cblock (*ivec),
-             int *num, int enc)
-        {
-        des_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc);
-        }
-#endif
diff --git a/src/lib/libcrypto/des/cfb64enc.c b/src/lib/libcrypto/des/cfb64enc.c
deleted file mode 100644
index 389a232cb3..0000000000
--- a/src/lib/libcrypto/des/cfb64enc.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* crypto/des/cfb64enc.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"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void des_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-             long length, des_key_schedule schedule, des_cblock *ivec,
-             int *num, int enc)
-        {
-        register DES_LONG v0,v1;
-        register long l=length;
-        register int n= *num;
-        DES_LONG ti[2];
-        unsigned char *iv,c,cc;
-
-        iv = &(*ivec)[0];
-        if (enc)
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0); ti[0]=v0;
-                                c2l(iv,v1); ti[1]=v1;
-                                des_encrypt(ti,schedule,DES_ENCRYPT);
-                                iv = &(*ivec)[0];
-                                v0=ti[0]; l2c(v0,iv);
-                                v0=ti[1]; l2c(v0,iv);
-                                iv = &(*ivec)[0];
-                                }
-                        c= *(in++)^iv[n];
-                        *(out++)=c;
-                        iv[n]=c;
-                        n=(n+1)&0x07;
-                        }
-                }
-        else
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0); ti[0]=v0;
-                                c2l(iv,v1); ti[1]=v1;
-                                des_encrypt(ti,schedule,DES_ENCRYPT);
-                                iv = &(*ivec)[0];
-                                v0=ti[0]; l2c(v0,iv);
-                                v0=ti[1]; l2c(v0,iv);
-                                iv = &(*ivec)[0];
-                                }
-                        cc= *(in++);
-                        c=iv[n];
-                        iv[n]=cc;
-                        *(out++)=c^cc;
-                        n=(n+1)&0x07;
-                        }
-                }
-        v0=v1=ti[0]=ti[1]=c=cc=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
deleted file mode 100644
index cca34dd7c5..0000000000
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* crypto/des/cfb_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"
-
-/* The input and output are loaded in multiples of 8 bits.
- * What this means is that if you hame numbits=12 and length=2
- * the first 12 bits will be retrieved from the first byte and half
- * the second.  The second 12 bits will come from the 3rd and half the 4th
- * byte.
- */
-void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-             long length, des_key_schedule schedule, des_cblock *ivec, int enc)
-        {
-        register DES_LONG d0,d1,v0,v1,n=(numbits+7)/8;
-        register DES_LONG mask0,mask1;
-        register unsigned long l=length;
-        register int num=numbits;
-        DES_LONG ti[2];
-        unsigned char *iv;
-
-        if (num > 64) return;
-        if (num > 32)
-                {
-                mask0=0xffffffffL;
-                if (num == 64)
-                        mask1=mask0;
-                else    mask1=(1L<<(num-32))-1;
-                }
-        else
-                {
-                if (num == 32)
-                        mask0=0xffffffffL;
-                else    mask0=(1L<<num)-1;
-                mask1=0x00000000L;
-                }
-
-        iv = &(*ivec)[0];
-        c2l(iv,v0);
-        c2l(iv,v1);
-        if (enc)
-                {
-                while (l >= n)
-                        {
-                        l-=n;
-                        ti[0]=v0;
-                        ti[1]=v1;
-                        des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-                        c2ln(in,d0,d1,n);
-                        in+=n;
-                        d0=(d0^ti[0])&mask0;
-                        d1=(d1^ti[1])&mask1;
-                        l2cn(d0,d1,out,n);
-                        out+=n;
-                        /* 30-08-94 - eay - changed because l>>32 and
-                         * l<<32 are bad under gcc :-( */
-                        if (num == 32)
-                                { v0=v1; v1=d0; }
-                        else if (num == 64)
-                                { v0=d0; v1=d1; }
-                        else if (num > 32) /* && num != 64 */
-                                {
-                                v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL;
-                                v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL;
-                                }
-                        else /* num < 32 */
-                                {
-                                v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL;
-                                v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL;
-                                }
-                        }
-                }
-        else
-                {
-                while (l >= n)
-                        {
-                        l-=n;
-                        ti[0]=v0;
-                        ti[1]=v1;
-                        des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-                        c2ln(in,d0,d1,n);
-                        in+=n;
-                        /* 30-08-94 - eay - changed because l>>32 and
-                         * l<<32 are bad under gcc :-( */
-                        if (num == 32)
-                                { v0=v1; v1=d0; }
-                        else if (num == 64)
-                                { v0=d0; v1=d1; }
-                        else if (num > 32) /* && num != 64 */
-                                {
-                                v0=((v1>>(num-32))|(d0<<(64-num)))&0xffffffffL;
-                                v1=((d0>>(num-32))|(d1<<(64-num)))&0xffffffffL;
-                                }
-                        else /* num < 32 */
-                                {
-                                v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL;
-                                v1=((v1>>num)|(d0<<(32-num)))&0xffffffffL;
-                                }
-                        d0=(d0^ti[0])&mask0;
-                        d1=(d1^ti[1])&mask1;
-                        l2cn(d0,d1,out,n);
-                        out+=n;
-                        }
-                }
-        iv = &(*ivec)[0];
-        l2c(v0,iv);
-        l2c(v1,iv);
-        v0=v1=d0=d1=ti[0]=ti[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
deleted file mode 100644
index 67f90aaf17..0000000000
--- a/src/lib/libcrypto/des/des.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* crypto/des/des.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DES_H
-#define HEADER_DES_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_DES
-#error DES is disabled.
-#endif
-
-#ifdef _KERBEROS_DES_H
-#error <openssl/des.h> replaces <kerberos/des.h>.
-#endif
-
-#include <stdio.h>
-#include <openssl/opensslconf.h> /* DES_LONG */
-#include <openssl/e_os2.h>      /* OPENSSL_EXTERN */
-
-typedef unsigned char des_cblock[8];
-typedef /* const */ unsigned char const_des_cblock[8];
-/* With "const", gcc 2.8.1 on Solaris thinks that des_cblock *
- * and const_des_cblock * are incompatible pointer types.
- * I haven't seen that warning on other systems ... I'll look
- * what the standard says. */
-
-
-typedef struct des_ks_struct
-        {
-        union   {
-                des_cblock cblock;
-                /* make sure things are correct size on machines with
-                 * 8 byte longs */
-                DES_LONG deslong[2];
-                } ks;
-        int weak_key;
-        } 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))
-
-OPENSSL_EXTERN int des_check_key;       /* defaults to false */
-OPENSSL_EXTERN int des_rw_mode;         /* defaults to DES_PCBC_MODE */
-OPENSSL_EXTERN int des_set_weak_key_flag; /* set the weak key flag */
-
-const char *des_options(void);
-void des_ecb3_encrypt(const_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(const unsigned char *input,des_cblock *output,
-                       long length,des_key_schedule schedule,
-                       const_des_cblock *ivec);
-/* des_cbc_encrypt does not update the IV!  Use des_ncbc_encrypt instead. */
-void des_cbc_encrypt(const unsigned char *input,unsigned char *output,
-                     long length,des_key_schedule schedule,des_cblock *ivec,
-                     int enc);
-void des_ncbc_encrypt(const unsigned char *input,unsigned char *output,
-                      long length,des_key_schedule schedule,des_cblock *ivec,
-                      int enc);
-void des_xcbc_encrypt(const unsigned char *input,unsigned char *output,
-                      long length,des_key_schedule schedule,des_cblock *ivec,
-                      const_des_cblock *inw,const_des_cblock *outw,int enc);
-void des_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
-                     long length,des_key_schedule schedule,des_cblock *ivec,
-                     int enc);
-void des_ecb_encrypt(const_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(const unsigned char *input,unsigned char *output, 
-                          long length,
-                          des_key_schedule ks1,des_key_schedule ks2,
-                          des_key_schedule ks3,des_cblock *ivec,int enc);
-void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
-                           long length,
-                           des_key_schedule ks1,des_key_schedule ks2,
-                           des_key_schedule ks3,
-                           des_cblock *ivec1,des_cblock *ivec2,
-                           int enc);
-void des_ede3_cfb64_encrypt(const 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(const 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(const_des_cblock *des_key,const_des_cblock *in_white,
-                       des_cblock *out_white);
-
-int des_enc_read(int fd,void *buf,int len,des_key_schedule sched,
-                 des_cblock *iv);
-int des_enc_write(int fd,const void *buf,int len,des_key_schedule sched,
-                  des_cblock *iv);
-char *des_fcrypt(const char *buf,const char *salt, char *ret);
-char *des_crypt(const char *buf,const char *salt);
-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
-char *crypt(const char *buf,const char *salt);
-#endif
-void des_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
-                     long length,des_key_schedule schedule,des_cblock *ivec);
-void des_pcbc_encrypt(const unsigned char *input,unsigned char *output,
-                      long length,des_key_schedule schedule,des_cblock *ivec,
-                      int enc);
-DES_LONG des_quad_cksum(const unsigned char *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,const char *prompt,int verify);
-int des_read_2passwords(des_cblock *key1,des_cblock *key2,
-                        const char *prompt,int verify);
-int des_read_pw_string(char *buf,int length,const char *prompt,int verify);
-void des_set_odd_parity(des_cblock *key);
-int des_is_weak_key(const_des_cblock *key);
-int des_set_key(const_des_cblock *key,des_key_schedule schedule);
-int des_key_sched(const_des_cblock *key,des_key_schedule schedule);
-void des_string_to_key(const char *str,des_cblock *key);
-void des_string_to_2keys(const char *str,des_cblock *key1,des_cblock *key2);
-void des_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
-                       des_key_schedule schedule,des_cblock *ivec,int *num,
-                       int enc);
-void des_ofb64_encrypt(const 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,const char *prompt,int verify);
-
-/* Extra functions from Mark Murray <mark@grondar.za> */
-void des_cblock_print_file(const_des_cblock *cb, FILE *fp);
-
-/* The following definitions provide compatibility with the MIT Kerberos
- * library. The des_key_schedule structure is not binary compatible. */
-
-#define _KERBEROS_DES_H
-
-#define KRBDES_ENCRYPT DES_ENCRYPT
-#define KRBDES_DECRYPT DES_DECRYPT
-
-#ifdef KERBEROS
-#  define ENCRYPT DES_ENCRYPT
-#  define DECRYPT DES_DECRYPT
-#endif
-
-#ifndef NCOMPAT
-#  define C_Block des_cblock
-#  define Key_schedule des_key_schedule
-#  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
-#endif
-
-typedef des_key_schedule bit_64;
-#define des_fixup_key_parity des_set_odd_parity
-#define des_check_key_parity check_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c
deleted file mode 100644
index 8311e10628..0000000000
--- a/src/lib/libcrypto/des/des_enc.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* crypto/des/des_enc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-
-void des_encrypt(DES_LONG *data, des_key_schedule ks, int enc)
-        {
-        register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
-#endif
-#ifndef DES_UNROLL
-        register int i;
-#endif
-        register DES_LONG *s;
-
-        r=data[0];
-        l=data[1];
-
-        IP(r,l);
-        /* Things have been modified so that the initial rotate is
-         * done outside the loop.  This required the
-         * des_SPtrans values in sp.h to be rotated 1 bit to the right.
-         * One perl script later and things have a 5% speed up on a sparc2.
-         * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-         * for pointing this out. */
-        /* clear the top bits on machines with 8byte longs */
-        /* shift left by 2 */
-        r=ROTATE(r,29)&0xffffffffL;
-        l=ROTATE(l,29)&0xffffffffL;
-
-        s=ks->ks.deslong;
-        /* I don't know if it is worth the effort of loop unrolling the
-         * inner loop */
-        if (enc)
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r, 0); /*  1 */
-                D_ENCRYPT(r,l, 2); /*  2 */
-                D_ENCRYPT(l,r, 4); /*  3 */
-                D_ENCRYPT(r,l, 6); /*  4 */
-                D_ENCRYPT(l,r, 8); /*  5 */
-                D_ENCRYPT(r,l,10); /*  6 */
-                D_ENCRYPT(l,r,12); /*  7 */
-                D_ENCRYPT(r,l,14); /*  8 */
-                D_ENCRYPT(l,r,16); /*  9 */
-                D_ENCRYPT(r,l,18); /*  10 */
-                D_ENCRYPT(l,r,20); /*  11 */
-                D_ENCRYPT(r,l,22); /*  12 */
-                D_ENCRYPT(l,r,24); /*  13 */
-                D_ENCRYPT(r,l,26); /*  14 */
-                D_ENCRYPT(l,r,28); /*  15 */
-                D_ENCRYPT(r,l,30); /*  16 */
-#else
-                for (i=0; i<32; i+=8)
-                        {
-                        D_ENCRYPT(l,r,i+0); /*  1 */
-                        D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
-                        }
-#endif
-                }
-        else
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r,30); /* 16 */
-                D_ENCRYPT(r,l,28); /* 15 */
-                D_ENCRYPT(l,r,26); /* 14 */
-                D_ENCRYPT(r,l,24); /* 13 */
-                D_ENCRYPT(l,r,22); /* 12 */
-                D_ENCRYPT(r,l,20); /* 11 */
-                D_ENCRYPT(l,r,18); /* 10 */
-                D_ENCRYPT(r,l,16); /*  9 */
-                D_ENCRYPT(l,r,14); /*  8 */
-                D_ENCRYPT(r,l,12); /*  7 */
-                D_ENCRYPT(l,r,10); /*  6 */
-                D_ENCRYPT(r,l, 8); /*  5 */
-                D_ENCRYPT(l,r, 6); /*  4 */
-                D_ENCRYPT(r,l, 4); /*  3 */
-                D_ENCRYPT(l,r, 2); /*  2 */
-                D_ENCRYPT(r,l, 0); /*  1 */
-#else
-                for (i=30; i>0; i-=8)
-                        {
-                        D_ENCRYPT(l,r,i-0); /* 16 */
-                        D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
-                        }
-#endif
-                }
-
-        /* rotate and clear the top bits on machines with 8byte longs */
-        l=ROTATE(l,3)&0xffffffffL;
-        r=ROTATE(r,3)&0xffffffffL;
-
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        l=r=t=u=0;
-        }
-
-void des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc)
-        {
-        register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
-#endif
-#ifndef DES_UNROLL
-        register int i;
-#endif
-        register DES_LONG *s;
-
-        r=data[0];
-        l=data[1];
-
-        /* Things have been modified so that the initial rotate is
-         * done outside the loop.  This required the
-         * des_SPtrans values in sp.h to be rotated 1 bit to the right.
-         * One perl script later and things have a 5% speed up on a sparc2.
-         * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-         * for pointing this out. */
-        /* clear the top bits on machines with 8byte longs */
-        r=ROTATE(r,29)&0xffffffffL;
-        l=ROTATE(l,29)&0xffffffffL;
-
-        s=ks->ks.deslong;
-        /* I don't know if it is worth the effort of loop unrolling the
-         * inner loop */
-        if (enc)
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r, 0); /*  1 */
-                D_ENCRYPT(r,l, 2); /*  2 */
-                D_ENCRYPT(l,r, 4); /*  3 */
-                D_ENCRYPT(r,l, 6); /*  4 */
-                D_ENCRYPT(l,r, 8); /*  5 */
-                D_ENCRYPT(r,l,10); /*  6 */
-                D_ENCRYPT(l,r,12); /*  7 */
-                D_ENCRYPT(r,l,14); /*  8 */
-                D_ENCRYPT(l,r,16); /*  9 */
-                D_ENCRYPT(r,l,18); /*  10 */
-                D_ENCRYPT(l,r,20); /*  11 */
-                D_ENCRYPT(r,l,22); /*  12 */
-                D_ENCRYPT(l,r,24); /*  13 */
-                D_ENCRYPT(r,l,26); /*  14 */
-                D_ENCRYPT(l,r,28); /*  15 */
-                D_ENCRYPT(r,l,30); /*  16 */
-#else
-                for (i=0; i<32; i+=8)
-                        {
-                        D_ENCRYPT(l,r,i+0); /*  1 */
-                        D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
-                        }
-#endif
-                }
-        else
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r,30); /* 16 */
-                D_ENCRYPT(r,l,28); /* 15 */
-                D_ENCRYPT(l,r,26); /* 14 */
-                D_ENCRYPT(r,l,24); /* 13 */
-                D_ENCRYPT(l,r,22); /* 12 */
-                D_ENCRYPT(r,l,20); /* 11 */
-                D_ENCRYPT(l,r,18); /* 10 */
-                D_ENCRYPT(r,l,16); /*  9 */
-                D_ENCRYPT(l,r,14); /*  8 */
-                D_ENCRYPT(r,l,12); /*  7 */
-                D_ENCRYPT(l,r,10); /*  6 */
-                D_ENCRYPT(r,l, 8); /*  5 */
-                D_ENCRYPT(l,r, 6); /*  4 */
-                D_ENCRYPT(r,l, 4); /*  3 */
-                D_ENCRYPT(l,r, 2); /*  2 */
-                D_ENCRYPT(r,l, 0); /*  1 */
-#else
-                for (i=30; i>0; i-=8)
-                        {
-                        D_ENCRYPT(l,r,i-0); /* 16 */
-                        D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
-                        }
-#endif
-                }
-        /* rotate and clear the top bits on machines with 8byte longs */
-        data[0]=ROTATE(l,3)&0xffffffffL;
-        data[1]=ROTATE(r,3)&0xffffffffL;
-        l=r=t=u=0;
-        }
-
-void des_encrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
-             des_key_schedule ks3)
-        {
-        register DES_LONG l,r;
-
-        l=data[0];
-        r=data[1];
-        IP(l,r);
-        data[0]=l;
-        data[1]=r;
-        des_encrypt2((DES_LONG *)data,ks1,DES_ENCRYPT);
-        des_encrypt2((DES_LONG *)data,ks2,DES_DECRYPT);
-        des_encrypt2((DES_LONG *)data,ks3,DES_ENCRYPT);
-        l=data[0];
-        r=data[1];
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        }
-
-void des_decrypt3(DES_LONG *data, des_key_schedule ks1, des_key_schedule ks2,
-             des_key_schedule ks3)
-        {
-        register DES_LONG l,r;
-
-        l=data[0];
-        r=data[1];
-        IP(l,r);
-        data[0]=l;
-        data[1]=r;
-        des_encrypt2((DES_LONG *)data,ks3,DES_DECRYPT);
-        des_encrypt2((DES_LONG *)data,ks2,DES_ENCRYPT);
-        des_encrypt2((DES_LONG *)data,ks1,DES_DECRYPT);
-        l=data[0];
-        r=data[1];
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        }
-
-#ifndef DES_DEFAULT_OPTIONS
-
-#undef CBC_ENC_C__DONT_UPDATE_IV
-#include "ncbc_enc.c" /* des_ncbc_encrypt */
-
-void des_ede3_cbc_encrypt(const unsigned char *input, unsigned char *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 const unsigned char *in;
-        unsigned char *out;
-        register long l=length;
-        DES_LONG tin[2];
-        unsigned char *iv;
-
-        in=input;
-        out=output;
-        iv = &(*ivec)[0];
-
-        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 = &(*ivec)[0];
-                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 = &(*ivec)[0];
-                l2c(xor0,iv);
-                l2c(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
-
-#endif /* DES_DEFAULT_OPTIONS */
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
deleted file mode 100644
index d6ea17cb68..0000000000
--- a/src/lib/libcrypto/des/des_locl.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/* crypto/des/des_locl.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DES_LOCL_H
-#define HEADER_DES_LOCL_H
-
-#if defined(WIN32) || defined(WIN16)
-#ifndef MSDOS
-#define MSDOS
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <openssl/opensslconf.h>
-
-#ifndef MSDOS
-#if !defined(VMS) || defined(__DECC)
-#include OPENSSL_UNISTD
-#include <math.h>
-#endif
-#endif
-#include <openssl/des.h>
-
-#ifdef MSDOS            /* Visual C++ 2.1 (Windows NT/95) */
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <io.h>
-#endif
-
-#if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
-#include <string.h>
-#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^= *(const DES_LONG *)(des_SP      +u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x200+u2); \
-        u3=(int)(u>>8L); \
-        u1=(int)u&0xfc; \
-        u3&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x400+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x600+u3); \
-        u2=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u2&=0xfc; \
-        t>>=16L; \
-        LL^= *(const DES_LONG *)(des_SP+0x100+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x300+u2); \
-        u3=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u3&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x500+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x700+u3); }
-#endif
-#ifdef DES_RISC2
-#define D_ENCRYPT(LL,R,S) { \
-        unsigned int u1,u2,s1,s2; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0xfc; \
-        u2&=0xfc; \
-        t=ROTATE(t,4); \
-        LL^= *(const DES_LONG *)(des_SP      +u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x200+u2); \
-        s1=(int)(u>>16L); \
-        s2=(int)(u>>24L); \
-        s1&=0xfc; \
-        s2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x400+s1); \
-        LL^= *(const DES_LONG *)(des_SP+0x600+s2); \
-        u2=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x100+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x300+u2); \
-        s1=(int)(t>>16L); \
-        s2=(int)(t>>24L); \
-        s1&=0xfc; \
-        s2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x500+s1); \
-        LL^= *(const DES_LONG *)(des_SP+0x700+s2); }
-#endif
-#else
-#define D_ENCRYPT(LL,R,S) { \
-        LOAD_DATA_tmp(R,S,u,t,E0,E1); \
-        t=ROTATE(t,4); \
-        LL^= \
-        *(const DES_LONG *)(des_SP      +((u     )&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x200+((u>> 8L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x400+((u>>16L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x600+((u>>24L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x100+((t     )&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x300+((t>> 8L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x500+((t>>16L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x700+((t>>24L)&0xfc)); }
-#endif
-
-#else /* original version */
-
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-#define D_ENCRYPT(LL,R,S) {\
-        unsigned int u1,u2,u3; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u>>=2L; \
-        t=ROTATE(t,6); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u2&=0x3f; \
-        u>>=16L; \
-        LL^=des_SPtrans[0][u1]; \
-        LL^=des_SPtrans[2][u2]; \
-        u3=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u3&=0x3f; \
-        LL^=des_SPtrans[4][u1]; \
-        LL^=des_SPtrans[6][u3]; \
-        u2=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u2&=0x3f; \
-        t>>=16L; \
-        LL^=des_SPtrans[1][u1]; \
-        LL^=des_SPtrans[3][u2]; \
-        u3=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u3&=0x3f; \
-        LL^=des_SPtrans[5][u1]; \
-        LL^=des_SPtrans[7][u3]; }
-#endif
-#ifdef DES_RISC2
-#define D_ENCRYPT(LL,R,S) {\
-        unsigned int u1,u2,s1,s2; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u>>=2L; \
-        t=ROTATE(t,6); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u2&=0x3f; \
-        LL^=des_SPtrans[0][u1]; \
-        LL^=des_SPtrans[2][u2]; \
-        s1=(int)u>>16L; \
-        s2=(int)u>>24L; \
-        s1&=0x3f; \
-        s2&=0x3f; \
-        LL^=des_SPtrans[4][s1]; \
-        LL^=des_SPtrans[6][s2]; \
-        u2=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u2&=0x3f; \
-        LL^=des_SPtrans[1][u1]; \
-        LL^=des_SPtrans[3][u2]; \
-        s1=(int)t>>16; \
-        s2=(int)t>>24L; \
-        s1&=0x3f; \
-        s2&=0x3f; \
-        LL^=des_SPtrans[5][s1]; \
-        LL^=des_SPtrans[7][s2]; }
-#endif
-
-#else
-
-#define D_ENCRYPT(LL,R,S) {\
-        LOAD_DATA_tmp(R,S,u,t,E0,E1); \
-        t=ROTATE(t,4); \
-        LL^=\
-                des_SPtrans[0][(u>> 2L)&0x3f]^ \
-                des_SPtrans[2][(u>>10L)&0x3f]^ \
-                des_SPtrans[4][(u>>18L)&0x3f]^ \
-                des_SPtrans[6][(u>>26L)&0x3f]^ \
-                des_SPtrans[1][(t>> 2L)&0x3f]^ \
-                des_SPtrans[3][(t>>10L)&0x3f]^ \
-                des_SPtrans[5][(t>>18L)&0x3f]^ \
-                des_SPtrans[7][(t>>26L)&0x3f]; }
-#endif
-#endif
-
-        /* IP and FP
-         * The problem is more of a geometric problem that random bit fiddling.
-         0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
-         8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
-        16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
-        24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
-
-        32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
-        40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
-        48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
-        56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
-
-        The output has been subject to swaps of the form
-        0 1 -> 3 1 but the odd and even bits have been put into
-        2 3    2 0
-        different words.  The main trick is to remember that
-        t=((l>>size)^r)&(mask);
-        r^=t;
-        l^=(t<<size);
-        can be used to swap and move bits between words.
-
-        So l =  0  1  2  3  r = 16 17 18 19
-                4  5  6  7      20 21 22 23
-                8  9 10 11      24 25 26 27
-               12 13 14 15      28 29 30 31
-        becomes (for size == 2 and mask == 0x3333)
-           t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
-                 6^20  7^21 -- --        4  5 20 21       6  7 22 23
-                10^24 11^25 -- --        8  9 24 25      10 11 24 25
-                14^28 15^29 -- --       12 13 28 29      14 15 28 29
-
-        Thanks for hints from Richard Outerbridge - he told me IP&FP
-        could be done in 15 xor, 10 shifts and 5 ands.
-        When I finally started to think of the problem in 2D
-        I first got ~42 operations without xors.  When I remembered
-        how to use xors :-) I got it to its final state.
-        */
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-        (b)^=(t),\
-        (a)^=((t)<<(n)))
-
-#define IP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
-        PERM_OP(l,r,tt,16,0x0000ffffL); \
-        PERM_OP(r,l,tt, 2,0x33333333L); \
-        PERM_OP(l,r,tt, 8,0x00ff00ffL); \
-        PERM_OP(r,l,tt, 1,0x55555555L); \
-        }
-
-#define FP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(l,r,tt, 1,0x55555555L); \
-        PERM_OP(r,l,tt, 8,0x00ff00ffL); \
-        PERM_OP(l,r,tt, 2,0x33333333L); \
-        PERM_OP(r,l,tt,16,0x0000ffffL); \
-        PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
-        }
-
-OPENSSL_EXTERN const DES_LONG des_SPtrans[8][64];
-
-void fcrypt_body(DES_LONG *out,des_key_schedule ks,
-        DES_LONG Eswap0, DES_LONG Eswap1);
-#endif
diff --git a/src/lib/libcrypto/des/ecb3_enc.c b/src/lib/libcrypto/des/ecb3_enc.c
deleted file mode 100644
index fb28b97e1a..0000000000
--- a/src/lib/libcrypto/des/ecb3_enc.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* crypto/des/ecb3_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_ecb3_encrypt(const_des_cblock *input, des_cblock *output,
-             des_key_schedule ks1, des_key_schedule ks2, des_key_schedule ks3,
-             int enc)
-        {
-        register DES_LONG l0,l1;
-        DES_LONG ll[2];
-        const unsigned char *in = &(*input)[0];
-        unsigned char *out = &(*output)[0];
-
-        c2l(in,l0);
-        c2l(in,l1);
-        ll[0]=l0;
-        ll[1]=l1;
-        if (enc)
-                des_encrypt3(ll,ks1,ks2,ks3);
-        else
-                des_decrypt3(ll,ks1,ks2,ks3);
-        l0=ll[0];
-        l1=ll[1];
-        l2c(l0,out);
-        l2c(l1,out);
-        }
diff --git a/src/lib/libcrypto/des/ecb_enc.c b/src/lib/libcrypto/des/ecb_enc.c
deleted file mode 100644
index b261a8aad9..0000000000
--- a/src/lib/libcrypto/des/ecb_enc.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* crypto/des/ecb_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"
-#include "spr.h"
-#include <openssl/opensslv.h>
-
-OPENSSL_GLOBAL const char *libdes_version="libdes" OPENSSL_VERSION_PTEXT;
-OPENSSL_GLOBAL const char *DES_version="DES" OPENSSL_VERSION_PTEXT;
-
-const char *des_options(void)
-        {
-        static int init=1;
-        static char buf[32];
-
-        if (init)
-                {
-                const char *ptr,*unroll,*risc,*size;
-
-#ifdef DES_PTR
-                ptr="ptr";
-#else
-                ptr="idx";
-#endif
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-                risc="risc1";
-#endif
-#ifdef DES_RISC2
-                risc="risc2";
-#endif
-#else
-                risc="cisc";
-#endif
-#ifdef DES_UNROLL
-                unroll="16";
-#else
-                unroll="4";
-#endif
-                if (sizeof(DES_LONG) != sizeof(long))
-                        size="int";
-                else
-                        size="long";
-                sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size);
-                init=0;
-                }
-        return(buf);
-        }
-                
-
-void des_ecb_encrypt(const_des_cblock *input, des_cblock *output,
-             des_key_schedule ks,
-             int enc)
-        {
-        register DES_LONG l;
-        DES_LONG ll[2];
-        const unsigned char *in = &(*input)[0];
-        unsigned char *out = &(*output)[0];
-
-        c2l(in,l); ll[0]=l;
-        c2l(in,l); ll[1]=l;
-        des_encrypt(ll,ks,enc);
-        l=ll[0]; l2c(l,out);
-        l=ll[1]; l2c(l,out);
-        l=ll[0]=ll[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/des/ede_cbcm_enc.c b/src/lib/libcrypto/des/ede_cbcm_enc.c
deleted file mode 100644
index c53062481d..0000000000
--- a/src/lib/libcrypto/des/ede_cbcm_enc.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ede_cbcm_enc.c */
-/* Written by Ben Laurie <ben@algroup.co.uk> for the OpenSSL
- * project 13 Feb 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
-
-This is an implementation of Triple DES Cipher Block Chaining with Output
-Feedback Masking, by Coppersmith, Johnson and Matyas, (IBM and Certicom).
-
-Note that there is a known attack on this by Biham and Knudsen but it takes
-a lot of work:
-
-http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
-
-*/
-
-#ifndef NO_DESCBCM
-#include "des_locl.h"
-
-void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
-             long length, des_key_schedule ks1, des_key_schedule ks2,
-             des_key_schedule ks3, des_cblock *ivec1, des_cblock *ivec2,
-             int enc)
-    {
-    register DES_LONG tin0,tin1;
-    register DES_LONG tout0,tout1,xor0,xor1,m0,m1;
-    register long l=length;
-    DES_LONG tin[2];
-    unsigned char *iv1,*iv2;
-
-    iv1 = &(*ivec1)[0];
-    iv2 = &(*ivec2)[0];
-
-    if (enc)
-        {
-        c2l(iv1,m0);
-        c2l(iv1,m1);
-        c2l(iv2,tout0);
-        c2l(iv2,tout1);
-        for (l-=8; l>=-7; l-=8)
-            {
-            tin[0]=m0;
-            tin[1]=m1;
-            des_encrypt(tin,ks3,1);
-            m0=tin[0];
-            m1=tin[1];
-
-            if(l < 0)
-                {
-                c2ln(in,tin0,tin1,l+8);
-                }
-            else
-                {
-                c2l(in,tin0);
-                c2l(in,tin1);
-                }
-            tin0^=tout0;
-            tin1^=tout1;
-
-            tin[0]=tin0;
-            tin[1]=tin1;
-            des_encrypt(tin,ks1,1);
-            tin[0]^=m0;
-            tin[1]^=m1;
-            des_encrypt(tin,ks2,0);
-            tin[0]^=m0;
-            tin[1]^=m1;
-            des_encrypt(tin,ks1,1);
-            tout0=tin[0];
-            tout1=tin[1];
-
-            l2c(tout0,out);
-            l2c(tout1,out);
-            }
-        iv1=&(*ivec1)[0];
-        l2c(m0,iv1);
-        l2c(m1,iv1);
-
-        iv2=&(*ivec2)[0];
-        l2c(tout0,iv2);
-        l2c(tout1,iv2);
-        }
-    else
-        {
-        register DES_LONG t0,t1;
-
-        c2l(iv1,m0);
-        c2l(iv1,m1);
-        c2l(iv2,xor0);
-        c2l(iv2,xor1);
-        for (l-=8; l>=-7; l-=8)
-            {
-            tin[0]=m0;
-            tin[1]=m1;
-            des_encrypt(tin,ks3,1);
-            m0=tin[0];
-            m1=tin[1];
-
-            c2l(in,tin0);
-            c2l(in,tin1);
-
-            t0=tin0;
-            t1=tin1;
-
-            tin[0]=tin0;
-            tin[1]=tin1;
-            des_encrypt(tin,ks1,0);
-            tin[0]^=m0;
-            tin[1]^=m1;
-            des_encrypt(tin,ks2,1);
-            tin[0]^=m0;
-            tin[1]^=m1;
-            des_encrypt(tin,ks1,0);
-            tout0=tin[0];
-            tout1=tin[1];
-
-            tout0^=xor0;
-            tout1^=xor1;
-            if(l < 0)
-                {
-                l2cn(tout0,tout1,out,l+8);
-                }
-            else
-                {
-                l2c(tout0,out);
-                l2c(tout1,out);
-                }
-            xor0=t0;
-            xor1=t1;
-            }
-
-        iv1=&(*ivec1)[0];
-        l2c(m0,iv1);
-        l2c(m1,iv1);
-
-        iv2=&(*ivec2)[0];
-        l2c(xor0,iv2);
-        l2c(xor1,iv2);
-        }
-    tin0=tin1=tout0=tout1=xor0=xor1=0;
-    tin[0]=tin[1]=0;
-    }
-#endif
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c
deleted file mode 100644
index 694970ccd2..0000000000
--- a/src/lib/libcrypto/des/enc_read.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* crypto/des/enc_read.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 "des_locl.h"
-
-/* This has some uglies in it but it works - even over sockets. */
-/*extern int errno;*/
-OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
-
-
-/*
- * WARNINGS:
- *
- *  -  The data format used by des_enc_write() and des_enc_read()
- *     has a cryptographic weakness: When asked to write more
- *     than MAXWRITE bytes, des_enc_write will split the data
- *     into several chunks that are all encrypted
- *     using the same IV.  So don't use these functions unless you
- *     are sure you know what you do (in which case you might
- *     not want to use them anyway).
- *
- *  -  This code cannot handle non-blocking sockets.
- *
- *  -  This function uses an internal state and thus cannot be
- *     used on multiple files.
- */
-
-
-int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
-                 des_cblock *iv)
-        {
-        /* data to be unencrypted */
-        int net_num=0;
-        static unsigned char *net=NULL;
-        /* extra unencrypted data 
-         * for when a block of 100 comes in but is des_read one byte at
-         * a time. */
-        static unsigned char *unnet=NULL;
-        static int unnet_start=0;
-        static int unnet_left=0;
-        static unsigned char *tmpbuf=NULL;
-        int i;
-        long num=0,rnum;
-        unsigned char *p;
-
-        if (tmpbuf == NULL)
-                {
-                tmpbuf=Malloc(BSIZE);
-                if (tmpbuf == NULL) return(-1);
-                }
-        if (net == NULL)
-                {
-                net=Malloc(BSIZE);
-                if (net == NULL) return(-1);
-                }
-        if (unnet == NULL)
-                {
-                unnet=Malloc(BSIZE);
-                if (unnet == NULL) return(-1);
-                }
-        /* left over data from last decrypt */
-        if (unnet_left != 0)
-                {
-                if (unnet_left < len)
-                        {
-                        /* we still still need more data but will return
-                         * with the number of bytes we have - should always
-                         * check the return value */
-                        memcpy(buf,&(unnet[unnet_start]),
-                               unnet_left);
-                        /* eay 26/08/92 I had the next 2 lines
-                         * reversed :-( */
-                        i=unnet_left;
-                        unnet_start=unnet_left=0;
-                        }
-                else
-                        {
-                        memcpy(buf,&(unnet[unnet_start]),len);
-                        unnet_start+=len;
-                        unnet_left-=len;
-                        i=len;
-                        }
-                return(i);
-                }
-
-        /* We need to get more data. */
-        if (len > MAXWRITE) len=MAXWRITE;
-
-        /* first - get the length */
-        while (net_num < HDRSIZE) 
-                {
-                i=read(fd,&(net[net_num]),HDRSIZE-net_num);
-#ifdef EINTR
-                if ((i == -1) && (errno == EINTR)) continue;
-#endif
-                if (i <= 0) return(0);
-                net_num+=i;
-                }
-
-        /* we now have at net_num bytes in net */
-        p=net;
-        /* num=0;  */
-        n2l(p,num);
-        /* num should be rounded up to the next group of eight
-         * we make sure that we have read a multiple of 8 bytes from the net.
-         */
-        if ((num > MAXWRITE) || (num < 0)) /* error */
-                return(-1);
-        rnum=(num < 8)?8:((num+7)/8*8);
-
-        net_num=0;
-        while (net_num < rnum)
-                {
-                i=read(fd,&(net[net_num]),rnum-net_num);
-#ifdef EINTR
-                if ((i == -1) && (errno == EINTR)) continue;
-#endif
-                if (i <= 0) return(0);
-                net_num+=i;
-                }
-
-        /* Check if there will be data left over. */
-        if (len < num)
-                {
-                if (des_rw_mode & DES_PCBC_MODE)
-                        des_pcbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
-                else
-                        des_cbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
-                memcpy(buf,unnet,len);
-                unnet_start=len;
-                unnet_left=num-len;
-
-                /* The following line is done because we return num
-                 * as the number of bytes read. */
-                num=len;
-                }
-        else
-                {
-                /* >output is a multiple of 8 byes, if len < rnum
-                 * >we must be careful.  The user must be aware that this
-                 * >routine will write more bytes than he asked for.
-                 * >The length of the buffer must be correct.
-                 * FIXED - Should be ok now 18-9-90 - eay */
-                if (len < rnum)
-                        {
-
-                        if (des_rw_mode & DES_PCBC_MODE)
-                                des_pcbc_encrypt(net,tmpbuf,num,sched,iv,
-                                                 DES_DECRYPT);
-                        else
-                                des_cbc_encrypt(net,tmpbuf,num,sched,iv,
-                                                DES_DECRYPT);
-
-                        /* eay 26/08/92 fix a bug that returned more
-                         * bytes than you asked for (returned len bytes :-( */
-                        memcpy(buf,tmpbuf,num);
-                        }
-                else
-                        {
-                        if (des_rw_mode & DES_PCBC_MODE)
-                                des_pcbc_encrypt(net,buf,num,sched,iv,
-                                                 DES_DECRYPT);
-                        else
-                                des_cbc_encrypt(net,buf,num,sched,iv,
-                                                DES_DECRYPT);
-                        }
-                }
-        return num;
-        }
-
diff --git a/src/lib/libcrypto/des/enc_writ.c b/src/lib/libcrypto/des/enc_writ.c
deleted file mode 100644
index ba3f0822ef..0000000000
--- a/src/lib/libcrypto/des/enc_writ.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* crypto/des/enc_writ.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 <errno.h>
-#include <time.h>
-#include <stdio.h>
-#include "cryptlib.h"
-#include "des_locl.h"
-#include <openssl/rand.h>
-
-/*
- * WARNINGS:
- *
- *  -  The data format used by des_enc_write() and des_enc_read()
- *     has a cryptographic weakness: When asked to write more
- *     than MAXWRITE bytes, des_enc_write will split the data
- *     into several chunks that are all encrypted
- *     using the same IV.  So don't use these functions unless you
- *     are sure you know what you do (in which case you might
- *     not want to use them anyway).
- *
- *  -  This code cannot handle non-blocking sockets.
- */
-
-int des_enc_write(int fd, const void *_buf, int len,
-                  des_key_schedule sched, des_cblock *iv)
-        {
-#ifdef _LIBC
-        extern unsigned long time();
-        extern int write();
-#endif
-        const unsigned char *buf=_buf;
-        long rnum;
-        int i,j,k,outnum;
-        static unsigned char *outbuf=NULL;
-        unsigned char shortbuf[8];
-        unsigned char *p;
-        const unsigned char *cp;
-        static int start=1;
-
-        if (outbuf == NULL)
-                {
-                outbuf=Malloc(BSIZE+HDRSIZE);
-                if (outbuf == NULL) return(-1);
-                }
-        /* If we are sending less than 8 bytes, the same char will look
-         * the same if we don't pad it out with random bytes */
-        if (start)
-                {
-                start=0;
-                }
-
-        /* lets recurse if we want to send the data in small chunks */
-        if (len > MAXWRITE)
-                {
-                j=0;
-                for (i=0; i<len; i+=k)
-                        {
-                        k=des_enc_write(fd,&(buf[i]),
-                                ((len-i) > MAXWRITE)?MAXWRITE:(len-i),sched,iv);
-                        if (k < 0)
-                                return(k);
-                        else
-                                j+=k;
-                        }
-                return(j);
-                }
-
-        /* write length first */
-        p=outbuf;
-        l2n(len,p);
-
-        /* pad short strings */
-        if (len < 8)
-                {
-                cp=shortbuf;
-                memcpy(shortbuf,buf,len);
-                RAND_bytes(shortbuf+len, 8-len);
-                rnum=8;
-                }
-        else
-                {
-                cp=(unsigned char*)buf;
-                rnum=((len+7)/8*8); /* round up to nearest eight */
-                }
-
-        if (des_rw_mode & DES_PCBC_MODE)
-                des_pcbc_encrypt(cp,&(outbuf[HDRSIZE]),(len<8)?8:len,sched,iv,
-                                 DES_ENCRYPT); 
-        else
-                des_cbc_encrypt(cp,&(outbuf[HDRSIZE]),(len<8)?8:len,sched,iv,
-                                DES_ENCRYPT); 
-
-        /* output */
-        outnum=rnum+HDRSIZE;
-
-        for (j=0; j<outnum; j+=i)
-                {
-                /* eay 26/08/92 I was not doing writing from where we
-                 * got upto. */
-                i=write(fd,&(outbuf[j]),outnum-j);
-                if (i == -1)
-                        {
-                        if (errno == EINTR)
-                                i=0;
-                        else    /* This is really a bad error - very bad
-                                 * It will stuff-up both ends. */
-                                return(-1);
-                        }
-                }
-
-        return(len);
-        }
diff --git a/src/lib/libcrypto/des/fcrypt.c b/src/lib/libcrypto/des/fcrypt.c
deleted file mode 100644
index f36746b376..0000000000
--- a/src/lib/libcrypto/des/fcrypt.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* NOCW */
-#include <stdio.h>
-
-/* This version of crypt has been developed from my MIT compatable
- * DES library.
- * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
- * Eric Young (eay@cryptsoft.com)
- */
-
-/* Modification by Jens Kupferschmidt (Cu)
- * I have included directive PARA for shared memory computers.
- * I have included a directive LONGCRYPT to using this routine to cipher
- * passwords with more then 8 bytes like HP-UX 10.x it used. The MAXPLEN
- * definition is the maximum of lenght of password and can changed. I have
- * defined 24.
- */
-
-#include "des_locl.h"
-
-/* Added more values to handle illegal salt values the way normal
- * crypt() implementations do.  The patch was sent by 
- * Bjorn Gronvall <bg@sics.se>
- */
-static unsigned const char con_salt[128]={
-0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,
-0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,
-0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,
-0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,
-0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,
-0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,0x00,0x01,
-0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
-0x0A,0x0B,0x05,0x06,0x07,0x08,0x09,0x0A,
-0x0B,0x0C,0x0D,0x0E,0x0F,0x10,0x11,0x12,
-0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,
-0x1B,0x1C,0x1D,0x1E,0x1F,0x20,0x21,0x22,
-0x23,0x24,0x25,0x20,0x21,0x22,0x23,0x24,
-0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,
-0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,
-0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,
-0x3D,0x3E,0x3F,0x40,0x41,0x42,0x43,0x44,
-};
-
-static unsigned const char cov_2char[64]={
-0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
-0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
-0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,
-0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,
-0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62,
-0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,
-0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,
-0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A
-};
-
-#ifndef NOPROTO
-void fcrypt_body(DES_LONG *out,des_key_schedule ks,
-        DES_LONG Eswap0, DES_LONG Eswap1);
-
-#if defined(PERL5) || defined(FreeBSD) || defined(__OpenBSD__)
-char *des_crypt(const char *buf,const char *salt);
-#else
-char *crypt(const char *buf,const char *salt);
-#endif
-#else
-void fcrypt_body();
-#ifdef PERL5
-char *des_crypt();
-#else
-char *crypt();
-#endif
-#endif
-
-#if defined(PERL5) || defined(FreeBSD) || defined(__OpenBSD__)
-char *des_crypt(buf,salt)
-#else
-char *crypt(buf,salt)
-#endif
-const char *buf;
-const char *salt;
-        {
-        static char buff[14];
-
-        return(des_fcrypt(buf,salt,buff));
-        }
-
-
-char *des_fcrypt(buf,salt,ret)
-const char *buf;
-const char *salt;
-char *ret;
-        {
-        unsigned int i,j,x,y;
-        DES_LONG Eswap0,Eswap1;
-        DES_LONG out[2],ll;
-        des_cblock key;
-        des_key_schedule ks;
-        unsigned char bb[9];
-        unsigned char *b=bb;
-        unsigned char c,u;
-
-        /* eay 25/08/92
-         * If you call crypt("pwd","*") as often happens when you
-         * have * as the pwd field in /etc/passwd, the function
-         * returns *\0XXXXXXXXX
-         * The \0 makes the string look like * so the pwd "*" would
-         * crypt to "*".  This was found when replacing the crypt in
-         * our shared libraries.  People found that the disbled
-         * accounts effectivly had no passwd :-(. */
-        x=ret[0]=((salt[0] == '\0')?'A':salt[0]);
-        Eswap0=con_salt[x]<<2;
-        x=ret[1]=((salt[1] == '\0')?'A':salt[1]);
-        Eswap1=con_salt[x]<<6;
-
-/* EAY
-r=strlen(buf);
-r=(r+7)/8;
-*/
-        for (i=0; i<8; i++)
-                {
-                c= *(buf++);
-                if (!c) break;
-                key[i]=(c<<1);
-                }
-        for (; i<8; i++)
-                key[i]=0;
-
-        des_set_key((des_cblock *)(key),ks);
-        fcrypt_body(&(out[0]),ks,Eswap0,Eswap1);
-
-        ll=out[0]; l2c(ll,b);
-        ll=out[1]; l2c(ll,b);
-        y=0;
-        u=0x80;
-        bb[8]=0;
-        for (i=2; i<13; i++)
-                {
-                c=0;
-                for (j=0; j<6; j++)
-                        {
-                        c<<=1;
-                        if (bb[y] & u) c|=1;
-                        u>>=1;
-                        if (!u)
-                                {
-                                y++;
-                                u=0x80;
-                                }
-                        }
-                ret[i]=cov_2char[c];
-                }
-        ret[13]='\0';
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c
deleted file mode 100644
index 9cbea97c1f..0000000000
--- a/src/lib/libcrypto/des/fcrypt_b.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* crypto/des/fcrypt_b.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>
-
-/* This version of crypt has been developed from my MIT compatable
- * DES library.
- * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
- * Eric Young (eay@cryptsoft.com)
- */
-
-#define DES_FCRYPT
-#include "des_locl.h"
-#undef DES_FCRYPT
-
-#undef PERM_OP
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-        (b)^=(t),\
-        (a)^=((t)<<(n)))
-
-#undef HPERM_OP
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-        (a)=(a)^(t)^(t>>(16-(n))))\
-
-void fcrypt_body(DES_LONG *out, des_key_schedule ks, DES_LONG Eswap0,
-             DES_LONG Eswap1)
-        {
-        register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
-#endif
-        register DES_LONG *s;
-        register int j;
-        register DES_LONG E0,E1;
-
-        l=0;
-        r=0;
-
-        s=(DES_LONG *)ks;
-        E0=Eswap0;
-        E1=Eswap1;
-
-        for (j=0; j<25; j++)
-                {
-#ifdef DES_UNROLL
-                register int i;
-
-                for (i=0; i<32; i+=8)
-                        {
-                        D_ENCRYPT(l,r,i+0); /*  1 */
-                        D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  1 */
-                        D_ENCRYPT(r,l,i+6); /*  2 */
-                        }
-#else
-                D_ENCRYPT(l,r, 0); /*  1 */
-                D_ENCRYPT(r,l, 2); /*  2 */
-                D_ENCRYPT(l,r, 4); /*  3 */
-                D_ENCRYPT(r,l, 6); /*  4 */
-                D_ENCRYPT(l,r, 8); /*  5 */
-                D_ENCRYPT(r,l,10); /*  6 */
-                D_ENCRYPT(l,r,12); /*  7 */
-                D_ENCRYPT(r,l,14); /*  8 */
-                D_ENCRYPT(l,r,16); /*  9 */
-                D_ENCRYPT(r,l,18); /*  10 */
-                D_ENCRYPT(l,r,20); /*  11 */
-                D_ENCRYPT(r,l,22); /*  12 */
-                D_ENCRYPT(l,r,24); /*  13 */
-                D_ENCRYPT(r,l,26); /*  14 */
-                D_ENCRYPT(l,r,28); /*  15 */
-                D_ENCRYPT(r,l,30); /*  16 */
-#endif
-
-                t=l;
-                l=r;
-                r=t;
-                }
-        l=ROTATE(l,3)&0xffffffffL;
-        r=ROTATE(r,3)&0xffffffffL;
-
-        PERM_OP(l,r,t, 1,0x55555555L);
-        PERM_OP(r,l,t, 8,0x00ff00ffL);
-        PERM_OP(l,r,t, 2,0x33333333L);
-        PERM_OP(r,l,t,16,0x0000ffffL);
-        PERM_OP(l,r,t, 4,0x0f0f0f0fL);
-
-        out[0]=r;
-        out[1]=l;
-        }
-
diff --git a/src/lib/libcrypto/des/ncbc_enc.c b/src/lib/libcrypto/des/ncbc_enc.c
deleted file mode 100644
index e0e67a417d..0000000000
--- a/src/lib/libcrypto/des/ncbc_enc.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/* crypto/des/ncbc_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"
-
-#ifdef CBC_ENC_C__DONT_UPDATE_IV
-void des_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-             des_key_schedule schedule, des_cblock *ivec, int enc)
-#else
-void des_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-             des_key_schedule schedule, des_cblock *ivec, int enc)
-#endif
-        {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register long l=length;
-        DES_LONG tin[2];
-        unsigned char *iv;
-
-        iv = &(*ivec)[0];
-
-        if (enc)
-                {
-                c2l(iv,tout0);
-                c2l(iv,tout1);
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0);
-                        c2l(in,tin1);
-                        tin0^=tout0; tin[0]=tin0;
-                        tin1^=tout1; tin[1]=tin1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        c2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0; tin[0]=tin0;
-                        tin1^=tout1; tin[1]=tin1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
-#ifndef CBC_ENC_C__DONT_UPDATE_IV
-                iv = &(*ivec)[0];
-                l2c(tout0,iv);
-                l2c(tout1,iv);
-#endif
-                }
-        else
-                {
-                c2l(iv,xor0);
-                c2l(iv,xor1);
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2c(tout0,out);
-                        l2c(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2cn(tout0,tout1,out,l+8);
-#ifndef CBC_ENC_C__DONT_UPDATE_IV
-                        xor0=tin0;
-                        xor1=tin1;
-#endif
-                        }
-#ifndef CBC_ENC_C__DONT_UPDATE_IV 
-                iv = &(*ivec)[0];
-                l2c(xor0,iv);
-                l2c(xor1,iv);
-#endif
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
diff --git a/src/lib/libcrypto/des/ofb64ede.c b/src/lib/libcrypto/des/ofb64ede.c
deleted file mode 100644
index 6eafe908da..0000000000
--- a/src/lib/libcrypto/des/ofb64ede.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* crypto/des/ofb64ede.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"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void des_ede3_ofb64_encrypt(register const unsigned char *in,
-             register unsigned char *out, long length, des_key_schedule k1,
-             des_key_schedule k2, des_key_schedule k3, des_cblock *ivec,
-             int *num)
-        {
-        register DES_LONG v0,v1;
-        register int n= *num;
-        register long l=length;
-        des_cblock d;
-        register char *dp;
-        DES_LONG ti[2];
-        unsigned char *iv;
-        int save=0;
-
-        iv = &(*ivec)[0];
-        c2l(iv,v0);
-        c2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        dp=(char *)d;
-        l2c(v0,dp);
-        l2c(v1,dp);
-        while (l--)
-                {
-                if (n == 0)
-                        {
-                        /* ti[0]=v0; */
-                        /* ti[1]=v1; */
-                        des_encrypt3(ti,k1,k2,k3);
-                        v0=ti[0];
-                        v1=ti[1];
-
-                        dp=(char *)d;
-                        l2c(v0,dp);
-                        l2c(v1,dp);
-                        save++;
-                        }
-                *(out++)= *(in++)^d[n];
-                n=(n+1)&0x07;
-                }
-        if (save)
-                {
-/*              v0=ti[0];
-                v1=ti[1];*/
-                iv = &(*ivec)[0];
-                l2c(v0,iv);
-                l2c(v1,iv);
-                }
-        v0=v1=ti[0]=ti[1]=0;
-        *num=n;
-        }
-
-#ifdef undef /* MACRO */
-void des_ede2_ofb64_encrypt(register unsigned char *in,
-             register unsigned char *out, long length, des_key_schedule k1,
-             des_key_schedule k2, des_cblock (*ivec), int *num)
-        {
-        des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
-        }
-#endif
diff --git a/src/lib/libcrypto/des/ofb64enc.c b/src/lib/libcrypto/des/ofb64enc.c
deleted file mode 100644
index 64953959ca..0000000000
--- a/src/lib/libcrypto/des/ofb64enc.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/des/ofb64enc.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"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void des_ofb64_encrypt(register const unsigned char *in,
-             register unsigned char *out, long length, des_key_schedule schedule,
-             des_cblock *ivec, int *num)
-        {
-        register DES_LONG v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        des_cblock d;
-        register unsigned char *dp;
-        DES_LONG ti[2];
-        unsigned char *iv;
-        int save=0;
-
-        iv = &(*ivec)[0];
-        c2l(iv,v0);
-        c2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        dp=d;
-        l2c(v0,dp);
-        l2c(v1,dp);
-        while (l--)
-                {
-                if (n == 0)
-                        {
-                        des_encrypt(ti,schedule,DES_ENCRYPT);
-                        dp=d;
-                        t=ti[0]; l2c(t,dp);
-                        t=ti[1]; l2c(t,dp);
-                        save++;
-                        }
-                *(out++)= *(in++)^d[n];
-                n=(n+1)&0x07;
-                }
-        if (save)
-                {
-                v0=ti[0];
-                v1=ti[1];
-                iv = &(*ivec)[0];
-                l2c(v0,iv);
-                l2c(v1,iv);
-                }
-        t=v0=v1=ti[0]=ti[1]=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/des/ofb_enc.c b/src/lib/libcrypto/des/ofb_enc.c
deleted file mode 100644
index a8f425a575..0000000000
--- a/src/lib/libcrypto/des/ofb_enc.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* crypto/des/ofb_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"
-
-/* The input and output are loaded in multiples of 8 bits.
- * What this means is that if you hame numbits=12 and length=2
- * the first 12 bits will be retrieved from the first byte and half
- * the second.  The second 12 bits will come from the 3rd and half the 4th
- * byte.
- */
-void des_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-             long length, des_key_schedule schedule, des_cblock *ivec)
-        {
-        register DES_LONG d0,d1,vv0,vv1,v0,v1,n=(numbits+7)/8;
-        register DES_LONG mask0,mask1;
-        register long l=length;
-        register int num=numbits;
-        DES_LONG ti[2];
-        unsigned char *iv;
-
-        if (num > 64) return;
-        if (num > 32)
-                {
-                mask0=0xffffffffL;
-                if (num >= 64)
-                        mask1=mask0;
-                else
-                        mask1=(1L<<(num-32))-1;
-                }
-        else
-                {
-                if (num == 32)
-                        mask0=0xffffffffL;
-                else
-                        mask0=(1L<<num)-1;
-                mask1=0x00000000L;
-                }
-
-        iv = &(*ivec)[0];
-        c2l(iv,v0);
-        c2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        while (l-- > 0)
-                {
-                ti[0]=v0;
-                ti[1]=v1;
-                des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
-                vv0=ti[0];
-                vv1=ti[1];
-                c2ln(in,d0,d1,n);
-                in+=n;
-                d0=(d0^vv0)&mask0;
-                d1=(d1^vv1)&mask1;
-                l2cn(d0,d1,out,n);
-                out+=n;
-
-                if (num == 32)
-                        { v0=v1; v1=vv0; }
-                else if (num == 64)
-                                { v0=vv0; v1=vv1; }
-                else if (num > 32) /* && num != 64 */
-                        {
-                        v0=((v1>>(num-32))|(vv0<<(64-num)))&0xffffffffL;
-                        v1=((vv0>>(num-32))|(vv1<<(64-num)))&0xffffffffL;
-                        }
-                else /* num < 32 */
-                        {
-                        v0=((v0>>num)|(v1<<(32-num)))&0xffffffffL;
-                        v1=((v1>>num)|(vv0<<(32-num)))&0xffffffffL;
-                        }
-                }
-        iv = &(*ivec)[0];
-        l2c(v0,iv);
-        l2c(v1,iv);
-        v0=v1=d0=d1=ti[0]=ti[1]=vv0=vv1=0;
-        }
-
diff --git a/src/lib/libcrypto/des/pcbc_enc.c b/src/lib/libcrypto/des/pcbc_enc.c
deleted file mode 100644
index dd69a26d4a..0000000000
--- a/src/lib/libcrypto/des/pcbc_enc.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* crypto/des/pcbc_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_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-             long length, des_key_schedule schedule, des_cblock *ivec, int enc)
-        {
-        register DES_LONG sin0,sin1,xor0,xor1,tout0,tout1;
-        DES_LONG tin[2];
-        const unsigned char *in;
-        unsigned char *out,*iv;
-
-        in=input;
-        out=output;
-        iv = &(*ivec)[0];
-
-        if (enc)
-                {
-                c2l(iv,xor0);
-                c2l(iv,xor1);
-                for (; length>0; length-=8)
-                        {
-                        if (length >= 8)
-                                {
-                                c2l(in,sin0);
-                                c2l(in,sin1);
-                                }
-                        else
-                                c2ln(in,sin0,sin1,length);
-                        tin[0]=sin0^xor0;
-                        tin[1]=sin1^xor1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-                        tout0=tin[0];
-                        tout1=tin[1];
-                        xor0=sin0^tout0;
-                        xor1=sin1^tout1;
-                        l2c(tout0,out);
-                        l2c(tout1,out);
-                        }
-                }
-        else
-                {
-                c2l(iv,xor0); c2l(iv,xor1);
-                for (; length>0; length-=8)
-                        {
-                        c2l(in,sin0);
-                        c2l(in,sin1);
-                        tin[0]=sin0;
-                        tin[1]=sin1;
-                        des_encrypt((DES_LONG *)tin,schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        if (length >= 8)
-                                {
-                                l2c(tout0,out);
-                                l2c(tout1,out);
-                                }
-                        else
-                                l2cn(tout0,tout1,out,length);
-                        xor0=tout0^sin0;
-                        xor1=tout1^sin1;
-                        }
-                }
-        tin[0]=tin[1]=0;
-        sin0=sin1=xor0=xor1=tout0=tout1=0;
-        }
diff --git a/src/lib/libcrypto/des/qud_cksm.c b/src/lib/libcrypto/des/qud_cksm.c
deleted file mode 100644
index 6ce8c61b42..0000000000
--- a/src/lib/libcrypto/des/qud_cksm.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/* crypto/des/qud_cksm.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.]
- */
-
-/* From "Message Authentication"  R.R. Jueneman, S.M. Matyas, C.H. Meyer
- * IEEE Communications Magazine Sept 1985 Vol. 23 No. 9 p 29-40
- * This module in only based on the code in this paper and is
- * almost definitely not the same as the MIT implementation.
- */
-#include "des_locl.h"
-
-/* bug fix for dos - 7/6/91 - Larry hughes@logos.ucs.indiana.edu */
-#define Q_B0(a) (((DES_LONG)(a)))
-#define Q_B1(a) (((DES_LONG)(a))<<8)
-#define Q_B2(a) (((DES_LONG)(a))<<16)
-#define Q_B3(a) (((DES_LONG)(a))<<24)
-
-/* used to scramble things a bit */
-/* Got the value MIT uses via brute force :-) 2/10/90 eay */
-#define NOISE   ((DES_LONG)83653421L)
-
-DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[],
-             long length, int out_count, des_cblock *seed)
-        {
-        DES_LONG z0,z1,t0,t1;
-        int i;
-        long l;
-        const unsigned char *cp;
-        unsigned char *lp;
-
-        if (out_count < 1) out_count=1;
-        lp = &(output[0])[0];
-
-        z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
-        z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
-
-        for (i=0; ((i<4)&&(i<out_count)); i++)
-                {
-                cp=input;
-                l=length;
-                while (l > 0)
-                        {
-                        if (l > 1)
-                                {
-                                t0= (DES_LONG)(*(cp++));
-                                t0|=(DES_LONG)Q_B1(*(cp++));
-                                l--;
-                                }
-                        else
-                                t0= (DES_LONG)(*(cp++));
-                        l--;
-                        /* add */
-                        t0+=z0;
-                        t0&=0xffffffffL;
-                        t1=z1;
-                        /* square, well sort of square */
-                        z0=((((t0*t0)&0xffffffffL)+((t1*t1)&0xffffffffL))
-                                &0xffffffffL)%0x7fffffffL; 
-                        z1=((t0*((t1+NOISE)&0xffffffffL))&0xffffffffL)%0x7fffffffL;
-                        }
-                if (lp != NULL)
-                        {
-                        /* I believe I finally have things worked out.
-                         * The MIT library assumes that the checksum
-                         * is one huge number and it is returned in a
-                         * host dependant byte order.
-                         */
-                        static DES_LONG ltmp=1;
-                        static unsigned char *c=(unsigned char *)&ltmp;
-
-                        if (c[0])
-                                {
-                                l2c(z0,lp);
-                                l2c(z1,lp);
-                                }
-                        else
-                                {
-                                lp = &(output[out_count-i-1])[0];
-                                l2n(z1,lp);
-                                l2n(z0,lp);
-                                }
-                        }
-                }
-        return(z0);
-        }
-
diff --git a/src/lib/libcrypto/des/rand_key.c b/src/lib/libcrypto/des/rand_key.c
deleted file mode 100644
index fc11792cda..0000000000
--- a/src/lib/libcrypto/des/rand_key.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/des/rand_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-#include <time.h>
-
-static int seed=0;
-static des_cblock init;
-
-void des_random_seed(des_cblock *key)
-        {
-        memcpy(&init,key,sizeof(des_cblock));
-        seed=1;
-        }
-
-void des_random_key(des_cblock *ret)
-        {
-        des_key_schedule ks;
-        static DES_LONG c=0;
-        static unsigned short pid=0;
-        static des_cblock data={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-        des_cblock key;
-        unsigned char *p;
-        DES_LONG t;
-        int i;
-
-#ifdef MSDOS
-        pid=1;
-#else
-        if (!pid) pid=getpid();
-#endif
-        p=key;
-        if (seed)
-                {
-                for (i=0; i<8; i++)
-                        {
-                        data[i] ^= init[i];
-                        init[i]=0;
-                        }
-                seed=0;
-                }
-        t=(DES_LONG)time(NULL);
-        l2c(t,p);
-        t=(DES_LONG)((pid)|((c++)<<16));
-        l2c(t,p);
-
-        des_set_odd_parity(&data);
-        des_set_key(&data,ks);
-        des_cbc_cksum(key,&key,sizeof(key),ks,&data);
-
-        des_set_odd_parity(&key);
-        des_set_key(&key,ks);
-        des_cbc_cksum(key,&data,sizeof(key),ks,&key);
-
-        memcpy(ret,data,sizeof(key));
-        memset(key,0,sizeof(key));
-        memset(ks,0,sizeof(ks));
-        t=0;
-        }
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
deleted file mode 100644
index 52553a4c16..0000000000
--- a/src/lib/libcrypto/des/set_key.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* crypto/des/set_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* set_key.c v 1.4 eay 24/9/91
- * 1.4 Speed up by 400% :-)
- * 1.3 added register declarations.
- * 1.2 unrolled make_key_sched a bit more
- * 1.1 added norm_expand_bits
- * 1.0 First working version
- */
-#include "des_locl.h"
-#include "podd.h"
-#include "sk.h"
-
-static int check_parity(const_des_cblock *key);
-OPENSSL_GLOBAL int des_check_key=0;
-
-void des_set_odd_parity(des_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<DES_KEY_SZ; i++)
-                (*key)[i]=odd_parity[(*key)[i]];
-        }
-
-static int check_parity(const_des_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<DES_KEY_SZ; i++)
-                {
-                if ((*key)[i] != odd_parity[(*key)[i]])
-                        return(0);
-                }
-        return(1);
-        }
-
-/* Weak and semi week keys as take from
- * %A D.W. Davies
- * %A W.L. Price
- * %T Security for Computer Networks
- * %I John Wiley & Sons
- * %D 1984
- * Many thanks to smb@ulysses.att.com (Steven Bellovin) for the reference
- * (and actual cblock values).
- */
-#define NUM_WEAK_KEY    16
-static des_cblock weak_keys[NUM_WEAK_KEY]={
-        /* weak keys */
-        {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-        {0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
-        {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-        {0xE0,0xE0,0xE0,0xE0,0xF1,0xF1,0xF1,0xF1},
-        /* semi-weak keys */
-        {0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
-        {0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
-        {0x1F,0xE0,0x1F,0xE0,0x0E,0xF1,0x0E,0xF1},
-        {0xE0,0x1F,0xE0,0x1F,0xF1,0x0E,0xF1,0x0E},
-        {0x01,0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1},
-        {0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1,0x01},
-        {0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E,0xFE},
-        {0xFE,0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E},
-        {0x01,0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E},
-        {0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E,0x01},
-        {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-        {0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
-
-int des_is_weak_key(const_des_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<NUM_WEAK_KEY; i++)
-                /* Added == 0 to comparision, I obviously don't run
-                 * this section very often :-(, thanks to
-                 * engineering@MorningStar.Com for the fix
-                 * eay 93/06/29
-                 * Another problem, I was comparing only the first 4
-                 * bytes, 97/03/18 */
-                if (memcmp(weak_keys[i],key,sizeof(des_cblock)) == 0) return(1);
-        return(0);
-        }
-
-/* NOW DEFINED IN des_local.h
- * See ecb_encrypt.c for a pseudo description of these macros. 
- * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
- *      (b)^=(t),\
- *      (a)=((a)^((t)<<(n))))
- */
-
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-        (a)=(a)^(t)^(t>>(16-(n))))
-
-/* return 0 if key parity is odd (correct),
- * return -1 if key parity error,
- * return -2 if illegal weak key.
- */
-int des_set_key(const_des_cblock *key, des_key_schedule schedule)
-        {
-        static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
-        register DES_LONG c,d,t,s,t2;
-        register const unsigned char *in;
-        register DES_LONG *k;
-        register int i;
-
-        if (des_check_key)
-                {
-                if (!check_parity(key))
-                        return(-1);
-
-                if (des_is_weak_key(key))
-                        return(-2);
-                }
-
-        k = &schedule->ks.deslong[0];
-        in = &(*key)[0];
-
-        c2l(in,c);
-        c2l(in,d);
-
-        /* do PC1 in 60 simple operations */ 
-/*      PERM_OP(d,c,t,4,0x0f0f0f0fL);
-        HPERM_OP(c,t,-2, 0xcccc0000L);
-        HPERM_OP(c,t,-1, 0xaaaa0000L);
-        HPERM_OP(c,t, 8, 0x00ff0000L);
-        HPERM_OP(c,t,-1, 0xaaaa0000L);
-        HPERM_OP(d,t,-8, 0xff000000L);
-        HPERM_OP(d,t, 8, 0x00ff0000L);
-        HPERM_OP(d,t, 2, 0x33330000L);
-        d=((d&0x00aa00aaL)<<7L)|((d&0x55005500L)>>7L)|(d&0xaa55aa55L);
-        d=(d>>8)|((c&0xf0000000L)>>4);
-        c&=0x0fffffffL; */
-
-        /* I now do it in 47 simple operations :-)
-         * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
-         * for the inspiration. :-) */
-        PERM_OP (d,c,t,4,0x0f0f0f0fL);
-        HPERM_OP(c,t,-2,0xcccc0000L);
-        HPERM_OP(d,t,-2,0xcccc0000L);
-        PERM_OP (d,c,t,1,0x55555555L);
-        PERM_OP (c,d,t,8,0x00ff00ffL);
-        PERM_OP (d,c,t,1,0x55555555L);
-        d=      (((d&0x000000ffL)<<16L)| (d&0x0000ff00L)     |
-                 ((d&0x00ff0000L)>>16L)|((c&0xf0000000L)>>4L));
-        c&=0x0fffffffL;
-
-        for (i=0; i<ITERATIONS; i++)
-                {
-                if (shifts2[i])
-                        { c=((c>>2L)|(c<<26L)); d=((d>>2L)|(d<<26L)); }
-                else
-                        { c=((c>>1L)|(c<<27L)); d=((d>>1L)|(d<<27L)); }
-                c&=0x0fffffffL;
-                d&=0x0fffffffL;
-                /* could be a few less shifts but I am to lazy at this
-                 * point in time to investigate */
-                s=      des_skb[0][ (c    )&0x3f                ]|
-                        des_skb[1][((c>> 6)&0x03)|((c>> 7L)&0x3c)]|
-                        des_skb[2][((c>>13)&0x0f)|((c>>14L)&0x30)]|
-                        des_skb[3][((c>>20)&0x01)|((c>>21L)&0x06) |
-                                                  ((c>>22L)&0x38)];
-                t=      des_skb[4][ (d    )&0x3f                ]|
-                        des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
-                        des_skb[6][ (d>>15L)&0x3f                ]|
-                        des_skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)];
-
-                /* table contained 0213 4657 */
-                t2=((t<<16L)|(s&0x0000ffffL))&0xffffffffL;
-                *(k++)=ROTATE(t2,30)&0xffffffffL;
-
-                t2=((s>>16L)|(t&0xffff0000L));
-                *(k++)=ROTATE(t2,26)&0xffffffffL;
-                }
-        return(0);
-        }
-
-int des_key_sched(const_des_cblock *key, des_key_schedule schedule)
-        {
-        return(des_set_key(key,schedule));
-        }
diff --git a/src/lib/libcrypto/des/spr.h b/src/lib/libcrypto/des/spr.h
deleted file mode 100644
index b8fbdcf8d3..0000000000
--- a/src/lib/libcrypto/des/spr.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* crypto/des/spr.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.]
- */
-
-OPENSSL_GLOBAL const DES_LONG des_SPtrans[8][64]={
-{
-/* nibble 0 */
-0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
-0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
-0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
-0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
-0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
-0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
-0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
-0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
-0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
-0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
-0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
-0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
-0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
-0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
-0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
-0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
-},{
-/* nibble 1 */
-0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
-0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
-0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
-0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
-0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
-0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
-0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
-0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
-0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
-0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
-0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
-0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
-0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
-0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
-0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
-0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
-},{
-/* nibble 2 */
-0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
-0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
-0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
-0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
-0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
-0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
-0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
-0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
-0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
-0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
-0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
-0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
-0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
-0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
-0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
-0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
-},{
-/* nibble 3 */
-0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
-0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
-0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
-0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
-0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
-0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
-0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
-0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
-0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
-0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
-0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
-0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
-0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
-0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
-0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
-0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
-},{
-/* nibble 4 */
-0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
-0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
-0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
-0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
-0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
-0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
-0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
-0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
-0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
-0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
-0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
-0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
-0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
-0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
-0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
-0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
-},{
-/* nibble 5 */
-0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
-0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
-0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
-0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
-0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
-0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
-0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
-0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
-0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
-0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
-0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
-0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
-0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
-0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
-0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
-0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
-},{
-/* nibble 6 */
-0x00004000L, 0x00000200L, 0x01000200L, 0x01000004L,
-0x01004204L, 0x00004004L, 0x00004200L, 0x00000000L,
-0x01000000L, 0x01000204L, 0x00000204L, 0x01004000L,
-0x00000004L, 0x01004200L, 0x01004000L, 0x00000204L,
-0x01000204L, 0x00004000L, 0x00004004L, 0x01004204L,
-0x00000000L, 0x01000200L, 0x01000004L, 0x00004200L,
-0x01004004L, 0x00004204L, 0x01004200L, 0x00000004L,
-0x00004204L, 0x01004004L, 0x00000200L, 0x01000000L,
-0x00004204L, 0x01004000L, 0x01004004L, 0x00000204L,
-0x00004000L, 0x00000200L, 0x01000000L, 0x01004004L,
-0x01000204L, 0x00004204L, 0x00004200L, 0x00000000L,
-0x00000200L, 0x01000004L, 0x00000004L, 0x01000200L,
-0x00000000L, 0x01000204L, 0x01000200L, 0x00004200L,
-0x00000204L, 0x00004000L, 0x01004204L, 0x01000000L,
-0x01004200L, 0x00000004L, 0x00004004L, 0x01004204L,
-0x01000004L, 0x01004200L, 0x01004000L, 0x00004004L,
-},{
-/* nibble 7 */
-0x20800080L, 0x20820000L, 0x00020080L, 0x00000000L,
-0x20020000L, 0x00800080L, 0x20800000L, 0x20820080L,
-0x00000080L, 0x20000000L, 0x00820000L, 0x00020080L,
-0x00820080L, 0x20020080L, 0x20000080L, 0x20800000L,
-0x00020000L, 0x00820080L, 0x00800080L, 0x20020000L,
-0x20820080L, 0x20000080L, 0x00000000L, 0x00820000L,
-0x20000000L, 0x00800000L, 0x20020080L, 0x20800080L,
-0x00800000L, 0x00020000L, 0x20820000L, 0x00000080L,
-0x00800000L, 0x00020000L, 0x20000080L, 0x20820080L,
-0x00020080L, 0x20000000L, 0x00000000L, 0x00820000L,
-0x20800080L, 0x20020080L, 0x20020000L, 0x00800080L,
-0x20820000L, 0x00000080L, 0x00800080L, 0x20020000L,
-0x20820080L, 0x00800000L, 0x20800000L, 0x20000080L,
-0x00820000L, 0x00020080L, 0x20020080L, 0x20800000L,
-0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
-0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
-}};
diff --git a/src/lib/libcrypto/des/str2key.c b/src/lib/libcrypto/des/str2key.c
deleted file mode 100644
index 24841452f1..0000000000
--- a/src/lib/libcrypto/des/str2key.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* crypto/des/str2key.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"
-
-OPENSSL_EXTERN int des_check_key;
-
-void des_string_to_key(const char *str, des_cblock *key)
-        {
-        des_key_schedule ks;
-        int i,length;
-        register unsigned char j;
-
-        memset(key,0,8);
-        length=strlen(str);
-#ifdef OLD_STR_TO_KEY
-        for (i=0; i<length; i++)
-                (*key)[i%8]^=(str[i]<<1);
-#else /* MIT COMPATIBLE */
-        for (i=0; i<length; i++)
-                {
-                j=str[i];
-                if ((i%16) < 8)
-                        (*key)[i%8]^=(j<<1);
-                else
-                        {
-                        /* Reverse the bit order 05/05/92 eay */
-                        j=((j<<4)&0xf0)|((j>>4)&0x0f);
-                        j=((j<<2)&0xcc)|((j>>2)&0x33);
-                        j=((j<<1)&0xaa)|((j>>1)&0x55);
-                        (*key)[7-(i%8)]^=j;
-                        }
-                }
-#endif
-        des_set_odd_parity(key);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key(key,ks);
-        des_check_key=i;
-        des_cbc_cksum((unsigned char*)str,key,length,ks,key);
-        memset(ks,0,sizeof(ks));
-        des_set_odd_parity(key);
-        }
-
-void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2)
-        {
-        des_key_schedule ks;
-        int i,length;
-        register unsigned char j;
-
-        memset(key1,0,8);
-        memset(key2,0,8);
-        length=strlen(str);
-#ifdef OLD_STR_TO_KEY
-        if (length <= 8)
-                {
-                for (i=0; i<length; i++)
-                        {
-                        (*key2)[i]=(*key1)[i]=(str[i]<<1);
-                        }
-                }
-        else
-                {
-                for (i=0; i<length; i++)
-                        {
-                        if ((i/8)&1)
-                                (*key2)[i%8]^=(str[i]<<1);
-                        else
-                                (*key1)[i%8]^=(str[i]<<1);
-                        }
-                }
-#else /* MIT COMPATIBLE */
-        for (i=0; i<length; i++)
-                {
-                j=str[i];
-                if ((i%32) < 16)
-                        {
-                        if ((i%16) < 8)
-                                (*key1)[i%8]^=(j<<1);
-                        else
-                                (*key2)[i%8]^=(j<<1);
-                        }
-                else
-                        {
-                        j=((j<<4)&0xf0)|((j>>4)&0x0f);
-                        j=((j<<2)&0xcc)|((j>>2)&0x33);
-                        j=((j<<1)&0xaa)|((j>>1)&0x55);
-                        if ((i%16) < 8)
-                                (*key1)[7-(i%8)]^=j;
-                        else
-                                (*key2)[7-(i%8)]^=j;
-                        }
-                }
-        if (length <= 8) memcpy(key2,key1,8);
-#endif
-        des_set_odd_parity(key1);
-        des_set_odd_parity(key2);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key(key1,ks);
-        des_cbc_cksum((unsigned char*)str,key1,length,ks,key1);
-        des_set_key(key2,ks);
-        des_cbc_cksum((unsigned char*)str,key2,length,ks,key2);
-        des_check_key=i;
-        memset(ks,0,sizeof(ks));
-        des_set_odd_parity(key1);
-        des_set_odd_parity(key2);
-        }
diff --git a/src/lib/libcrypto/des/xcbc_enc.c b/src/lib/libcrypto/des/xcbc_enc.c
deleted file mode 100644
index 51e17e6b8a..0000000000
--- a/src/lib/libcrypto/des/xcbc_enc.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* crypto/des/xcbc_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"
-
-/* RSA's DESX */
-
-static unsigned char desx_white_in2out[256]={
-0xBD,0x56,0xEA,0xF2,0xA2,0xF1,0xAC,0x2A,0xB0,0x93,0xD1,0x9C,0x1B,0x33,0xFD,0xD0,
-0x30,0x04,0xB6,0xDC,0x7D,0xDF,0x32,0x4B,0xF7,0xCB,0x45,0x9B,0x31,0xBB,0x21,0x5A,
-0x41,0x9F,0xE1,0xD9,0x4A,0x4D,0x9E,0xDA,0xA0,0x68,0x2C,0xC3,0x27,0x5F,0x80,0x36,
-0x3E,0xEE,0xFB,0x95,0x1A,0xFE,0xCE,0xA8,0x34,0xA9,0x13,0xF0,0xA6,0x3F,0xD8,0x0C,
-0x78,0x24,0xAF,0x23,0x52,0xC1,0x67,0x17,0xF5,0x66,0x90,0xE7,0xE8,0x07,0xB8,0x60,
-0x48,0xE6,0x1E,0x53,0xF3,0x92,0xA4,0x72,0x8C,0x08,0x15,0x6E,0x86,0x00,0x84,0xFA,
-0xF4,0x7F,0x8A,0x42,0x19,0xF6,0xDB,0xCD,0x14,0x8D,0x50,0x12,0xBA,0x3C,0x06,0x4E,
-0xEC,0xB3,0x35,0x11,0xA1,0x88,0x8E,0x2B,0x94,0x99,0xB7,0x71,0x74,0xD3,0xE4,0xBF,
-0x3A,0xDE,0x96,0x0E,0xBC,0x0A,0xED,0x77,0xFC,0x37,0x6B,0x03,0x79,0x89,0x62,0xC6,
-0xD7,0xC0,0xD2,0x7C,0x6A,0x8B,0x22,0xA3,0x5B,0x05,0x5D,0x02,0x75,0xD5,0x61,0xE3,
-0x18,0x8F,0x55,0x51,0xAD,0x1F,0x0B,0x5E,0x85,0xE5,0xC2,0x57,0x63,0xCA,0x3D,0x6C,
-0xB4,0xC5,0xCC,0x70,0xB2,0x91,0x59,0x0D,0x47,0x20,0xC8,0x4F,0x58,0xE0,0x01,0xE2,
-0x16,0x38,0xC4,0x6F,0x3B,0x0F,0x65,0x46,0xBE,0x7E,0x2D,0x7B,0x82,0xF9,0x40,0xB5,
-0x1D,0x73,0xF8,0xEB,0x26,0xC7,0x87,0x97,0x25,0x54,0xB1,0x28,0xAA,0x98,0x9D,0xA5,
-0x64,0x6D,0x7A,0xD4,0x10,0x81,0x44,0xEF,0x49,0xD6,0xAE,0x2E,0xDD,0x76,0x5C,0x2F,
-0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
-        };
-
-void des_xwhite_in2out(const_des_cblock *des_key, const_des_cblock *in_white,
-             des_cblock *out_white)
-        {
-        int out0,out1;
-        int i;
-        const unsigned char *key = &(*des_key)[0];
-        const unsigned char *in = &(*in_white)[0];
-        unsigned char *out = &(*out_white)[0];
-
-        out[0]=out[1]=out[2]=out[3]=out[4]=out[5]=out[6]=out[7]=0;
-        out0=out1=0;
-        for (i=0; i<8; i++)
-                {
-                out[i]=key[i]^desx_white_in2out[out0^out1];
-                out0=out1;
-                out1=(int)out[i&0x07];
-                }
-
-        out0=out[0];
-        out1=out[i];
-        for (i=0; i<8; i++)
-                {
-                out[i]=in[i]^desx_white_in2out[out0^out1];
-                out0=out1;
-                out1=(int)out[i&0x07];
-                }
-        }
-
-void des_xcbc_encrypt(const unsigned char *in, unsigned char *out,
-            long length, des_key_schedule schedule, des_cblock *ivec,
-            const_des_cblock *inw, const_des_cblock *outw, int enc)
-        {
-        register DES_LONG tin0,tin1;
-        register DES_LONG tout0,tout1,xor0,xor1;
-        register DES_LONG inW0,inW1,outW0,outW1;
-        register const unsigned char *in2;
-        register long l=length;
-        DES_LONG tin[2];
-        unsigned char *iv;
-
-        in2 = &(*inw)[0];
-        c2l(in2,inW0);
-        c2l(in2,inW1);
-        in2 = &(*outw)[0];
-        c2l(in2,outW0);
-        c2l(in2,outW1);
-
-        iv = &(*ivec)[0];
-
-        if (enc)
-                {
-                c2l(iv,tout0);
-                c2l(iv,tout1);
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0);
-                        c2l(in,tin1);
-                        tin0^=tout0^inW0; tin[0]=tin0;
-                        tin1^=tout1^inW1; tin[1]=tin1;
-                        des_encrypt(tin,schedule,DES_ENCRYPT);
-                        tout0=tin[0]^outW0; l2c(tout0,out);
-                        tout1=tin[1]^outW1; l2c(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        c2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0^inW0; tin[0]=tin0;
-                        tin1^=tout1^inW1; tin[1]=tin1;
-                        des_encrypt(tin,schedule,DES_ENCRYPT);
-                        tout0=tin[0]^outW0; l2c(tout0,out);
-                        tout1=tin[1]^outW1; l2c(tout1,out);
-                        }
-                iv = &(*ivec)[0];
-                l2c(tout0,iv);
-                l2c(tout1,iv);
-                }
-        else
-                {
-                c2l(iv,xor0);
-                c2l(iv,xor1);
-                for (l-=8; l>0; l-=8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0^outW0;
-                        c2l(in,tin1); tin[1]=tin1^outW1;
-                        des_encrypt(tin,schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0^inW0;
-                        tout1=tin[1]^xor1^inW1;
-                        l2c(tout0,out);
-                        l2c(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0^outW0;
-                        c2l(in,tin1); tin[1]=tin1^outW1;
-                        des_encrypt(tin,schedule,DES_DECRYPT);
-                        tout0=tin[0]^xor0^inW0;
-                        tout1=tin[1]^xor1^inW1;
-                        l2cn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-
-                iv = &(*ivec)[0];
-                l2c(xor0,iv);
-                l2c(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        inW0=inW1=outW0=outW1=0;
-        tin[0]=tin[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
deleted file mode 100644
index 2cc3797a94..0000000000
--- a/src/lib/libcrypto/dh/dh.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* crypto/dh/dh.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_DH_H
-#define HEADER_DH_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_DH
-#error DH is disabled.
-#endif
-
-#include <openssl/bn.h>
-        
-#define DH_FLAG_CACHE_MONT_P    0x01
-
-typedef struct dh_st
-        {
-        /* This first argument is used to pick up errors when
-         * a DH is passed instead of a EVP_PKEY */
-        int pad;
-        int version;
-        BIGNUM *p;
-        BIGNUM *g;
-        int length; /* optional */
-        BIGNUM *pub_key;        /* y */
-        BIGNUM *priv_key;       /* x */
-
-        int flags;
-        char *method_mont_p;
-        } DH;
-
-#define DH_GENERATOR_2          2
-/* #define DH_GENERATOR_3       3 */
-#define DH_GENERATOR_5          5
-
-/* DH_check error codes */
-#define DH_CHECK_P_NOT_PRIME            0x01
-#define DH_CHECK_P_NOT_STRONG_PRIME     0x02
-#define DH_UNABLE_TO_CHECK_GENERATOR    0x04
-#define DH_NOT_SUITABLE_GENERATOR       0x08
-
-#define DHparams_dup(x) (DH *)ASN1_dup((int (*)())i2d_DHparams, \
-                (char *(*)())d2i_DHparams,(char *)(x))
-#define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
-#define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
-                (unsigned char *)(x))
-#define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)())DH_new, \
-                (char *(*)())d2i_DHparams,(bp),(unsigned char **)(x))
-#ifdef  __cplusplus
-#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio((int (*)())i2d_DHparams,(bp), \
-                (unsigned char *)(x))
-#else
-#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio(i2d_DHparams,(bp), \
-                (unsigned char *)(x))
-#endif
-
-DH *    DH_new(void);
-void    DH_free(DH *dh);
-int     DH_size(DH *dh);
-DH *    DH_generate_parameters(int prime_len,int generator,
-                void (*callback)(int,int,void *),void *cb_arg);
-int     DH_check(DH *dh,int *codes);
-int     DH_generate_key(DH *dh);
-int     DH_compute_key(unsigned char *key,BIGNUM *pub_key,DH *dh);
-DH *    d2i_DHparams(DH **a,unsigned char **pp, long length);
-int     i2d_DHparams(DH *a,unsigned char **pp);
-#ifndef NO_FP_API
-int     DHparams_print_fp(FILE *fp, DH *x);
-#endif
-#ifdef HEADER_BIO_H
-int     DHparams_print(BIO *bp, DH *x);
-#else
-int     DHparams_print(char *bp, DH *x);
-#endif
-void    ERR_load_DH_strings(void );
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
deleted file mode 100644
index 95ce9cfad0..0000000000
--- a/src/lib/libcrypto/dh/dh_check.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* crypto/dh/dh_check.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-
-/* Check that p is a strong prime and
- * if g is 2, 3 or 5, check that is is a suitable generator
- * where
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5
- * for 5, p mod 10 == 3 or 7
- * should hold.
- */
-
-int DH_check(DH *dh, int *ret)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BN_ULONG l;
-        BIGNUM *q=NULL;
-
-        *ret=0;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        q=BN_new();
-        if (q == NULL) goto err;
-
-        if (BN_is_word(dh->g,DH_GENERATOR_2))
-                {
-                l=BN_mod_word(dh->p,24);
-                if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-/*      else if (BN_is_word(dh->g,DH_GENERATOR_3))
-                {
-                l=BN_mod_word(dh->p,12);
-                if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }*/
-        else if (BN_is_word(dh->g,DH_GENERATOR_5))
-                {
-                l=BN_mod_word(dh->p,10);
-                if ((l != 3) && (l != 7))
-                        *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-        else
-                *ret|=DH_UNABLE_TO_CHECK_GENERATOR;
-
-        if (!BN_is_prime(dh->p,BN_prime_checks,NULL,ctx,NULL))
-                *ret|=DH_CHECK_P_NOT_PRIME;
-        else
-                {
-                if (!BN_rshift1(q,dh->p)) goto err;
-                if (!BN_is_prime(q,BN_prime_checks,NULL,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_STRONG_PRIME;
-                }
-        ok=1;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (q != NULL) BN_free(q);
-        return(ok);
-        }
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c
deleted file mode 100644
index 0348bd24a2..0000000000
--- a/src/lib/libcrypto/dh/dh_err.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/dh/dh_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/dh.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA DH_str_functs[]=
-        {
-{ERR_PACK(0,DH_F_DHPARAMS_PRINT,0),     "DHparams_print"},
-{ERR_PACK(0,DH_F_DHPARAMS_PRINT_FP,0),  "DHparams_print_fp"},
-{ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0),     "DH_compute_key"},
-{ERR_PACK(0,DH_F_DH_GENERATE_KEY,0),    "DH_generate_key"},
-{ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0),     "DH_generate_parameters"},
-{ERR_PACK(0,DH_F_DH_NEW,0),     "DH_new"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA DH_str_reasons[]=
-        {
-{DH_R_NO_PRIVATE_VALUE                   ,"no private value"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_DH_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_DH,DH_str_functs);
-                ERR_load_strings(ERR_LIB_DH,DH_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
deleted file mode 100644
index b7bcd2c7a4..0000000000
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* crypto/dh/dh_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-
-/* We generate DH parameters as follows
- * find a prime q which is prime_len/2 bits long.
- * p=(2*q)+1 or (p-1)/2 = q
- * For this case, g is a generator if
- * g^((p-1)/q) mod p != 1 for values of q which are the factors of p-1.
- * Since the factors of p-1 are q and 2, we just need to check
- * g^2 mod p != 1 and g^q mod p != 1.
- *
- * Having said all that,
- * there is another special case method for the generators 2, 3 and 5.
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5  <<<<< does not work for strong primes.
- * for 5, p mod 10 == 3 or 7
- *
- * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the
- * special generators and for answering some of my questions.
- *
- * I've implemented the second simple method :-).
- * Since DH should be using a strong prime (both p and q are prime),
- * this generator function can take a very very long time to run.
- */
-
-DH *DH_generate_parameters(int prime_len, int generator,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        BIGNUM *p=NULL,*t1,*t2;
-        DH *ret=NULL;
-        int g,ok= -1;
-        BN_CTX *ctx=NULL;
-
-        ret=DH_new();
-        if (ret == NULL) goto err;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        t1= &(ctx->bn[0]);
-        t2= &(ctx->bn[1]);
-        ctx->tos=2;
-        
-        if (generator == DH_GENERATOR_2)
-                {
-                BN_set_word(t1,24);
-                BN_set_word(t2,11);
-                g=2;
-                }
-#ifdef undef  /* does not work for strong primes */
-        else if (generator == DH_GENERATOR_3)
-                {
-                BN_set_word(t1,12);
-                BN_set_word(t2,5);
-                g=3;
-                }
-#endif
-        else if (generator == DH_GENERATOR_5)
-                {
-                BN_set_word(t1,10);
-                BN_set_word(t2,3);
-                /* BN_set_word(t3,7); just have to miss
-                 * out on these ones :-( */
-                g=5;
-                }
-        else
-                g=generator;
-        
-        p=BN_generate_prime(NULL,prime_len,1,t1,t2,callback,cb_arg);
-        if (p == NULL) goto err;
-        if (callback != NULL) callback(3,0,cb_arg);
-        ret->p=p;
-        ret->g=BN_new();
-        if (!BN_set_word(ret->g,g)) goto err;
-        ok=1;
-err:
-        if (ok == -1)
-                {
-                DHerr(DH_F_DH_GENERATE_PARAMETERS,ERR_R_BN_LIB);
-                ok=0;
-                }
-
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (!ok && (ret != NULL))
-                {
-                DH_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
deleted file mode 100644
index cede53bfc1..0000000000
--- a/src/lib/libcrypto/dh/dh_key.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* crypto/dh/dh_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rand.h>
-#include <openssl/dh.h>
-
-int DH_generate_key(DH *dh)
-        {
-        int ok=0;
-        unsigned int i;
-        BN_CTX ctx;
-        BN_MONT_CTX *mont;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        BN_CTX_init(&ctx);
-
-        if (dh->priv_key == NULL)
-                {
-                i=dh->length;
-                if (i == 0)
-                        {
-                        /* Make the number p-1 bits long */
-                        i=BN_num_bits(dh->p)-1;
-                        }
-                priv_key=BN_new();
-                if (priv_key == NULL) goto err;
-                if (!BN_rand(priv_key,i,0,0)) goto err;
-                }
-        else
-                priv_key=dh->priv_key;
-
-        if (dh->pub_key == NULL)
-                {
-                pub_key=BN_new();
-                if (pub_key == NULL) goto err;
-                }
-        else
-                pub_key=dh->pub_key;
-
-        if ((dh->method_mont_p == NULL) && (dh->flags & DH_FLAG_CACHE_MONT_P))
-                {
-                if ((dh->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dh->method_mont_p,
-                                dh->p,&ctx)) goto err;
-                }
-        mont=(BN_MONT_CTX *)dh->method_mont_p;
-
-        if (!BN_mod_exp_mont(pub_key,dh->g,priv_key,dh->p,&ctx,mont)) goto err;
-                
-        dh->pub_key=pub_key;
-        dh->priv_key=priv_key;
-        ok=1;
-err:
-        if (ok != 1)
-                DHerr(DH_F_DH_GENERATE_KEY,ERR_R_BN_LIB);
-
-        if ((pub_key != NULL)  && (dh->pub_key == NULL))  BN_free(pub_key);
-        if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key);
-        BN_CTX_free(&ctx);
-        return(ok);
-        }
-
-int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
-        {
-        BN_CTX ctx;
-        BN_MONT_CTX *mont;
-        BIGNUM *tmp;
-        int ret= -1;
-
-        BN_CTX_init(&ctx);
-        tmp= &(ctx.bn[ctx.tos++]);
-        
-        if (dh->priv_key == NULL)
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);
-                goto err;
-                }
-        if ((dh->method_mont_p == NULL) && (dh->flags & DH_FLAG_CACHE_MONT_P))
-                {
-                if ((dh->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dh->method_mont_p,
-                                dh->p,&ctx)) goto err;
-                }
-
-        mont=(BN_MONT_CTX *)dh->method_mont_p;
-        if (!BN_mod_exp_mont(tmp,pub_key,dh->priv_key,dh->p,&ctx,mont))
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);
-                goto err;
-                }
-
-        ret=BN_bn2bin(tmp,key);
-err:
-        BN_CTX_free(&ctx);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
deleted file mode 100644
index 61e0720e8a..0000000000
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* crypto/dh/dh_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 <openssl/bn.h>
-#include <openssl/dh.h>
-
-const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
-
-DH *DH_new(void)
-        {
-        DH *ret;
-
-        ret=(DH *)Malloc(sizeof(DH));
-        if (ret == NULL)
-                {
-                DHerr(DH_F_DH_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->pad=0;
-        ret->version=0;
-        ret->p=NULL;
-        ret->g=NULL;
-        ret->length=0;
-        ret->pub_key=NULL;
-        ret->priv_key=NULL;
-        ret->flags=DH_FLAG_CACHE_MONT_P;
-        ret->method_mont_p=NULL;
-        return(ret);
-        }
-
-void DH_free(DH *r)
-        {
-        if(r == NULL) return;
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->g != NULL) BN_clear_free(r->g);
-        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
-        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-        if (r->method_mont_p != NULL)
-                BN_MONT_CTX_free((BN_MONT_CTX *)r->method_mont_p);
-        Free(r);
-        }
-
-int DH_size(DH *dh)
-        {
-        return(BN_num_bytes(dh->p));
-        }
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
deleted file mode 100644
index 20b3f8d90a..0000000000
--- a/src/lib/libcrypto/dsa/dsa.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* crypto/dsa/dsa.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.]
- */
-
-/*
- * The DSS routines are based on patches supplied by
- * Steven Schoch <schoch@sheba.arc.nasa.gov>.  He basically did the
- * work and I have just tweaked them a little to fit into my
- * stylistic vision for SSLeay :-) */
-
-#ifndef HEADER_DSA_H
-#define HEADER_DSA_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_DSA
-#error DSA is disabled.
-#endif
-
-#include <openssl/bn.h>
-#ifndef NO_DH
-# include <openssl/dh.h>
-#endif
-
-#define DSA_FLAG_CACHE_MONT_P   0x01
-
-typedef struct dsa_st
-        {
-        /* This first variable is used to pick up errors where
-         * a DSA is passed instead of of a EVP_PKEY */
-        int pad;
-        int version;
-        int write_params;
-        BIGNUM *p;
-        BIGNUM *q;      /* == 20 */
-        BIGNUM *g;
-
-        BIGNUM *pub_key;  /* y public key */
-        BIGNUM *priv_key; /* x private key */
-
-        BIGNUM *kinv;   /* Signing pre-calc */
-        BIGNUM *r;      /* Signing pre-calc */
-
-        int flags;
-        /* Normally used to cache montgomery values */
-        char *method_mont_p;
-
-        int references;
-        } DSA;
-
-typedef struct DSA_SIG_st
-        {
-        BIGNUM *r;
-        BIGNUM *s;
-        } DSA_SIG;
-
-#define DSAparams_dup(x) (DSA *)ASN1_dup((int (*)())i2d_DSAparams, \
-                (char *(*)())d2i_DSAparams,(char *)(x))
-#define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-                (char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
-#define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
-                (unsigned char *)(x))
-#define d2i_DSAparams_bio(bp,x) (DSA *)ASN1_d2i_bio((char *(*)())DSA_new, \
-                (char *(*)())d2i_DSAparams,(bp),(unsigned char **)(x))
-#define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio(i2d_DSAparams,(bp), \
-                (unsigned char *)(x))
-
-
-DSA_SIG * DSA_SIG_new(void);
-void    DSA_SIG_free(DSA_SIG *a);
-int     i2d_DSA_SIG(DSA_SIG *a, unsigned char **pp);
-DSA_SIG * d2i_DSA_SIG(DSA_SIG **v, unsigned char **pp, long length);
-
-DSA_SIG * DSA_do_sign(const unsigned char *dgst,int dlen,DSA *dsa);
-int     DSA_do_verify(const unsigned char *dgst,int dgst_len,
-                      DSA_SIG *sig,DSA *dsa);
-
-DSA *   DSA_new(void);
-int     DSA_size(DSA *);
-        /* next 4 return -1 on error */
-int     DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
-int     DSA_sign(int type,const unsigned char *dgst,int dlen,
-                unsigned char *sig, unsigned int *siglen, DSA *dsa);
-int     DSA_verify(int type,const unsigned char *dgst,int dgst_len,
-                unsigned char *sigbuf, int siglen, DSA *dsa);
-void    DSA_free (DSA *r);
-
-void    ERR_load_DSA_strings(void );
-
-DSA *   d2i_DSAPublicKey(DSA **a, unsigned char **pp, long length);
-DSA *   d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length);
-DSA *   d2i_DSAparams(DSA **a, unsigned char **pp, long length);
-DSA *   DSA_generate_parameters(int bits, unsigned char *seed,int seed_len,
-                int *counter_ret, unsigned long *h_ret,void
-                (*callback)(),char *cb_arg);
-int     DSA_generate_key(DSA *a);
-int     i2d_DSAPublicKey(DSA *a, unsigned char **pp);
-int     i2d_DSAPrivateKey(DSA *a, unsigned char **pp);
-int     i2d_DSAparams(DSA *a,unsigned char **pp);
-
-#ifdef HEADER_BIO_H
-int     DSAparams_print(BIO *bp, DSA *x);
-int     DSA_print(BIO *bp, DSA *x, int off);
-#endif
-#ifndef NO_FP_API
-int     DSAparams_print_fp(FILE *fp, DSA *x);
-int     DSA_print_fp(FILE *bp, DSA *x, int off);
-#endif
-
-int DSA_is_prime(BIGNUM *q,void (*callback)(),char *cb_arg);
-
-#ifndef NO_DH
-/* Convert DSA structure (key or just parameters) into DH structure
- * (be careful to avoid small subgroup attacks when using this!) */
-DH *DSA_dup_DH(DSA *r);
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the DSA functions. */
-
-/* Function codes. */
-#define DSA_F_D2I_DSA_SIG                                110
-#define DSA_F_DSAPARAMS_PRINT                            100
-#define DSA_F_DSAPARAMS_PRINT_FP                         101
-#define DSA_F_DSA_DO_SIGN                                112
-#define DSA_F_DSA_DO_VERIFY                              113
-#define DSA_F_DSA_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_SIG_NEW                                109
-#define DSA_F_DSA_VERIFY                                 108
-#define DSA_F_I2D_DSA_SIG                                111
-
-/* Reason codes. */
-#define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c
deleted file mode 100644
index 7523b21654..0000000000
--- a/src/lib/libcrypto/dsa/dsa_asn1.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* crypto/dsa/dsa_asn1.c */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/dsa.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-
-DSA_SIG *DSA_SIG_new(void)
-{
-        DSA_SIG *ret;
-
-        ret = Malloc(sizeof(DSA_SIG));
-        if (ret == NULL)
-                {
-                DSAerr(DSA_F_DSA_SIG_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->r = NULL;
-        ret->s = NULL;
-        return(ret);
-}
-
-void DSA_SIG_free(DSA_SIG *r)
-{
-        if (r == NULL) return;
-        if (r->r) BN_clear_free(r->r);
-        if (r->s) BN_clear_free(r->s);
-        Free(r);
-}
-
-int i2d_DSA_SIG(DSA_SIG *v, unsigned char **pp)
-{
-        int t=0,len;
-        ASN1_INTEGER rbs,sbs;
-        unsigned char *p;
-
-        rbs.data=Malloc(BN_num_bits(v->r)/8+1);
-        if (rbs.data == NULL)
-                {
-                DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        rbs.type=V_ASN1_INTEGER;
-        rbs.length=BN_bn2bin(v->r,rbs.data);
-        sbs.data=Malloc(BN_num_bits(v->s)/8+1);
-        if (sbs.data == NULL)
-                {
-                Free(rbs.data);
-                DSAerr(DSA_F_I2D_DSA_SIG, ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        sbs.type=V_ASN1_INTEGER;
-        sbs.length=BN_bn2bin(v->s,sbs.data);
-
-        len=i2d_ASN1_INTEGER(&rbs,NULL);
-        len+=i2d_ASN1_INTEGER(&sbs,NULL);
-
-        if (pp)
-                {
-                p=*pp;
-                ASN1_put_object(&p,1,len,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-                i2d_ASN1_INTEGER(&rbs,&p);
-                i2d_ASN1_INTEGER(&sbs,&p);
-                }
-        t=ASN1_object_size(1,len,V_ASN1_SEQUENCE);
-        Free(rbs.data);
-        Free(sbs.data);
-        return(t);
-}
-
-DSA_SIG *d2i_DSA_SIG(DSA_SIG **a, unsigned char **pp, long length)
-{
-        int i=ERR_R_NESTED_ASN1_ERROR;
-        ASN1_INTEGER *bs=NULL;
-        M_ASN1_D2I_vars(a,DSA_SIG *,DSA_SIG_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
-        if ((ret->r=BN_bin2bn(bs->data,bs->length,ret->r)) == NULL)
-                goto err_bn;
-        M_ASN1_D2I_get(bs,d2i_ASN1_INTEGER);
-        if ((ret->s=BN_bin2bn(bs->data,bs->length,ret->s)) == NULL)
-                goto err_bn;
-        ASN1_BIT_STRING_free(bs);
-        M_ASN1_D2I_Finish_2(a);
-
-err_bn:
-        i=ERR_R_BN_LIB;
-err:
-        DSAerr(DSA_F_D2I_DSA_SIG,i);
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) DSA_SIG_free(ret);
-        if (bs != NULL) ASN1_BIT_STRING_free(bs);
-        return(NULL);
-}
diff --git a/src/lib/libcrypto/dsa/dsa_err.c b/src/lib/libcrypto/dsa/dsa_err.c
deleted file mode 100644
index 33a8270afd..0000000000
--- a/src/lib/libcrypto/dsa/dsa_err.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* crypto/dsa/dsa_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/dsa.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA DSA_str_functs[]=
-        {
-{ERR_PACK(0,DSA_F_D2I_DSA_SIG,0),       "d2i_DSA_SIG"},
-{ERR_PACK(0,DSA_F_DSAPARAMS_PRINT,0),   "DSAparams_print"},
-{ERR_PACK(0,DSA_F_DSAPARAMS_PRINT_FP,0),        "DSAparams_print_fp"},
-{ERR_PACK(0,DSA_F_DSA_DO_SIGN,0),       "DSA_do_sign"},
-{ERR_PACK(0,DSA_F_DSA_DO_VERIFY,0),     "DSA_do_verify"},
-{ERR_PACK(0,DSA_F_DSA_IS_PRIME,0),      "DSA_is_prime"},
-{ERR_PACK(0,DSA_F_DSA_NEW,0),   "DSA_new"},
-{ERR_PACK(0,DSA_F_DSA_PRINT,0), "DSA_print"},
-{ERR_PACK(0,DSA_F_DSA_PRINT_FP,0),      "DSA_print_fp"},
-{ERR_PACK(0,DSA_F_DSA_SIGN,0),  "DSA_sign"},
-{ERR_PACK(0,DSA_F_DSA_SIGN_SETUP,0),    "DSA_sign_setup"},
-{ERR_PACK(0,DSA_F_DSA_SIG_NEW,0),       "DSA_SIG_new"},
-{ERR_PACK(0,DSA_F_DSA_VERIFY,0),        "DSA_verify"},
-{ERR_PACK(0,DSA_F_I2D_DSA_SIG,0),       "i2d_DSA_SIG"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA DSA_str_reasons[]=
-        {
-{DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE       ,"data too large for key size"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_DSA_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_DSA,DSA_str_functs);
-                ERR_load_strings(ERR_LIB_DSA,DSA_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c
deleted file mode 100644
index b5e5ec06e5..0000000000
--- a/src/lib/libcrypto/dsa/dsa_gen.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* crypto/dsa/dsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#undef GENUINE_DSA
-
-#ifdef GENUINE_DSA
-#define HASH    SHA
-#else
-#define HASH    SHA1
-#endif 
-
-#ifndef NO_SHA
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include <openssl/sha.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-
-DSA *DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
-             int *counter_ret, unsigned long *h_ret, void (*callback)(),
-             char *cb_arg)
-        {
-        int ok=0;
-        unsigned char seed[SHA_DIGEST_LENGTH];
-        unsigned char md[SHA_DIGEST_LENGTH];
-        unsigned char buf[SHA_DIGEST_LENGTH],buf2[SHA_DIGEST_LENGTH];
-        BIGNUM *r0,*W,*X,*c,*test;
-        BIGNUM *g=NULL,*q=NULL,*p=NULL;
-        BN_MONT_CTX *mont=NULL;
-        int k,n=0,i,b,m=0;
-        int counter=0;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-        unsigned int h=2;
-        DSA *ret=NULL;
-
-        if (bits < 512) bits=512;
-        bits=(bits+63)/64*64;
-
-        if ((seed_in != NULL) && (seed_len == 20))
-                memcpy(seed,seed_in,seed_len);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        if ((ctx2=BN_CTX_new()) == NULL) goto err;
-        if ((ret=DSA_new()) == NULL) goto err;
-
-        if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-
-        r0= &(ctx2->bn[0]);
-        g= &(ctx2->bn[1]);
-        W= &(ctx2->bn[2]);
-        q= &(ctx2->bn[3]);
-        X= &(ctx2->bn[4]);
-        c= &(ctx2->bn[5]);
-        p= &(ctx2->bn[6]);
-        test= &(ctx2->bn[7]);
-
-        BN_lshift(test,BN_value_one(),bits-1);
-
-        for (;;)
-                {
-                for (;;)
-                        {
-                        /* step 1 */
-                        if (callback != NULL) callback(0,m++,cb_arg);
-
-                        if (!seed_len)
-                                RAND_bytes(seed,SHA_DIGEST_LENGTH);
-                        else
-                                seed_len=0;
-
-                        memcpy(buf,seed,SHA_DIGEST_LENGTH);
-                        memcpy(buf2,seed,SHA_DIGEST_LENGTH);
-                        for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                {
-                                buf[i]++;
-                                if (buf[i] != 0) break;
-                                }
-
-                        /* step 2 */
-                        HASH(seed,SHA_DIGEST_LENGTH,md);
-                        HASH(buf,SHA_DIGEST_LENGTH,buf2);
-                        for (i=0; i<SHA_DIGEST_LENGTH; i++)
-                                md[i]^=buf2[i];
-
-                        /* step 3 */
-                        md[0]|=0x80;
-                        md[SHA_DIGEST_LENGTH-1]|=0x01;
-                        if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,q)) abort();
-
-                        /* step 4 */
-                        if (DSA_is_prime(q,callback,cb_arg) > 0) break;
-                        /* do a callback call */
-                        /* step 5 */
-                        }
-
-                if (callback != NULL) callback(2,0,cb_arg);
-                if (callback != NULL) callback(3,0,cb_arg);
-
-                /* step 6 */
-                counter=0;
-
-                n=(bits-1)/160;
-                b=(bits-1)-n*160;
-
-                for (;;)
-                        {
-                        /* step 7 */
-                        BN_zero(W);
-                        for (k=0; k<=n; k++)
-                                {
-                                for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                        {
-                                        buf[i]++;
-                                        if (buf[i] != 0) break;
-                                        }
-
-                                HASH(buf,SHA_DIGEST_LENGTH,md);
-
-                                /* step 8 */
-                                if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0)) abort();
-                                BN_lshift(r0,r0,160*k);
-                                BN_add(W,W,r0);
-                                }
-
-                        /* more of step 8 */
-                        BN_mask_bits(W,bits-1);
-                        BN_copy(X,W); /* this should be ok */
-                        BN_add(X,X,test); /* this should be ok */
-
-                        /* step 9 */
-                        BN_lshift1(r0,q);
-                        BN_mod(c,X,r0,ctx);
-                        BN_sub(r0,c,BN_value_one());
-                        BN_sub(p,X,r0);
-
-                        /* step 10 */
-                        if (BN_cmp(p,test) >= 0)
-                                {
-                                /* step 11 */
-                                if (DSA_is_prime(p,callback,cb_arg) > 0)
-                                        goto end;
-                                }
-
-                        /* step 13 */
-                        counter++;
-
-                        /* step 14 */
-                        if (counter >= 4096) break;
-
-                        if (callback != NULL) callback(0,counter,cb_arg);
-                        }
-                }
-end:
-        if (callback != NULL) callback(2,1,cb_arg);
-
-        /* We now need to gernerate g */
-        /* Set r0=(p-1)/q */
-        BN_sub(test,p,BN_value_one());
-        BN_div(r0,NULL,test,q,ctx);
-
-        BN_set_word(test,h);
-        BN_MONT_CTX_set(mont,p,ctx);
-
-        for (;;)
-                {
-                /* g=test^r0%p */
-                BN_mod_exp_mont(g,test,r0,p,ctx,mont);
-                if (!BN_is_one(g)) break;
-                BN_add(test,test,BN_value_one());
-                h++;
-                }
-
-        if (callback != NULL) callback(3,1,cb_arg);
-
-        ok=1;
-err:
-        if (!ok)
-                {
-                if (ret != NULL) DSA_free(ret);
-                }
-        else
-                {
-                ret->p=BN_dup(p);
-                ret->q=BN_dup(q);
-                ret->g=BN_dup(g);
-                if ((m > 1) && (seed_in != NULL)) memcpy(seed_in,seed,20);
-                if (counter_ret != NULL) *counter_ret=counter;
-                if (h_ret != NULL) *h_ret=h;
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (ctx != NULL) BN_CTX_free(ctx2);
-        if (mont != NULL) BN_MONT_CTX_free(mont);
-        return(ok?ret:NULL);
-        }
-
-int DSA_is_prime(BIGNUM *w, void (*callback)(), char *cb_arg)
-        {
-        int ok= -1,j,i,n;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-        BIGNUM *w_1,*b,*m,*z,*tmp,*mont_1;
-        int a;
-        BN_MONT_CTX *mont=NULL;
-
-        if (!BN_is_bit_set(w,0)) return(0);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        if ((ctx2=BN_CTX_new()) == NULL) goto err;
-        if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-
-        m=   &(ctx2->bn[2]);
-        b=   &(ctx2->bn[3]);
-        z=   &(ctx2->bn[4]);
-        w_1= &(ctx2->bn[5]);
-        tmp= &(ctx2->bn[6]);
-        mont_1= &(ctx2->bn[7]);
-
-        /* step 1 */
-        n=50;
-
-        /* step 2 */
-        if (!BN_sub(w_1,w,BN_value_one())) goto err;
-        for (a=1; !BN_is_bit_set(w_1,a); a++)
-                ;
-        if (!BN_rshift(m,w_1,a)) goto err;
-
-        BN_MONT_CTX_set(mont,w,ctx);
-        BN_to_montgomery(mont_1,BN_value_one(),mont,ctx);
-        BN_to_montgomery(w_1,w_1,mont,ctx);
-        for (i=1; i < n; i++)
-                {
-                /* step 3 */
-                BN_rand(b,BN_num_bits(w)-2/*-1*/,0,0);
-                /* BN_set_word(b,0x10001L); */
-
-                /* step 4 */
-                j=0;
-                if (!BN_mod_exp_mont(z,b,m,w,ctx,mont)) goto err;
-
-                if (!BN_to_montgomery(z,z,mont,ctx)) goto err;
-
-                /* step 5 */
-                for (;;)
-                        {
-                        if (((j == 0) && (BN_cmp(z,mont_1) == 0)) ||
-                                (BN_cmp(z,w_1) == 0))
-                                break;
-
-                        /* step 6 */
-                        if ((j > 0) && (BN_cmp(z,mont_1) == 0))
-                                {
-                                ok=0;
-                                goto err;
-                                }
-
-                        j++;
-                        if (j >= a)
-                                {
-                                ok=0;
-                                goto err;
-                                }
-
-                        if (!BN_mod_mul_montgomery(z,z,z,mont,ctx)) goto err;
-                        if (callback != NULL) callback(1,j,cb_arg);
-                        }
-                }
-
-        ok=1;
-err:
-        if (ok == -1) DSAerr(DSA_F_DSA_IS_PRIME,ERR_R_BN_LIB);
-        BN_CTX_free(ctx);
-        BN_CTX_free(ctx2);
-        BN_MONT_CTX_free(mont);
-        
-        return(ok);
-        }
-#endif
diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
deleted file mode 100644
index ab7f38fc7c..0000000000
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/dsa/dsa_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef NO_SHA
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include <openssl/sha.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-
-int DSA_generate_key(DSA *dsa)
-        {
-        int ok=0;
-        unsigned int i;
-        BN_CTX *ctx=NULL;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (dsa->priv_key == NULL)
-                {
-                if ((priv_key=BN_new()) == NULL) goto err;
-                }
-        else
-                priv_key=dsa->priv_key;
-
-        i=BN_num_bits(dsa->q);
-        for (;;)
-                {
-                BN_rand(priv_key,i,1,0);
-                if (BN_cmp(priv_key,dsa->q) >= 0)
-                        BN_sub(priv_key,priv_key,dsa->q);
-                if (!BN_is_zero(priv_key)) break;
-                }
-
-        if (dsa->pub_key == NULL)
-                {
-                if ((pub_key=BN_new()) == NULL) goto err;
-                }
-        else
-                pub_key=dsa->pub_key;
-
-        if (!BN_mod_exp(pub_key,dsa->g,priv_key,dsa->p,ctx)) goto err;
-
-        dsa->priv_key=priv_key;
-        dsa->pub_key=pub_key;
-        ok=1;
-
-err:
-        if ((pub_key != NULL) && (dsa->pub_key == NULL)) BN_free(pub_key);
-        if ((priv_key != NULL) && (dsa->priv_key == NULL)) BN_free(priv_key);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return(ok);
-        }
-#endif
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c
deleted file mode 100644
index ce8e204f7e..0000000000
--- a/src/lib/libcrypto/dsa/dsa_lib.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* crypto/dsa/dsa_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.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/asn1.h>
-
-const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
-
-DSA *DSA_new(void)
-        {
-        DSA *ret;
-
-        ret=(DSA *)Malloc(sizeof(DSA));
-        if (ret == NULL)
-                {
-                DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->pad=0;
-        ret->version=0;
-        ret->write_params=1;
-        ret->p=NULL;
-        ret->q=NULL;
-        ret->g=NULL;
-        ret->flags=DSA_FLAG_CACHE_MONT_P;
-
-        ret->pub_key=NULL;
-        ret->priv_key=NULL;
-
-        ret->kinv=NULL;
-        ret->r=NULL;
-        ret->method_mont_p=NULL;
-
-        ret->references=1;
-        return(ret);
-        }
-
-void DSA_free(DSA *r)
-        {
-        int i;
-
-        if (r == NULL) return;
-
-        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_DSA);
-#ifdef REF_PRINT
-        REF_PRINT("DSA",r);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"DSA_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->q != NULL) BN_clear_free(r->q);
-        if (r->g != NULL) BN_clear_free(r->g);
-        if (r->pub_key != NULL) BN_clear_free(r->pub_key);
-        if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-        if (r->kinv != NULL) BN_clear_free(r->kinv);
-        if (r->r != NULL) BN_clear_free(r->r);
-        if (r->method_mont_p != NULL)
-                BN_MONT_CTX_free((BN_MONT_CTX *)r->method_mont_p);
-        Free(r);
-        }
-
-int DSA_size(DSA *r)
-        {
-        int ret,i;
-        ASN1_INTEGER bs;
-        unsigned char buf[4];
-
-        i=BN_num_bits(r->q);
-        bs.length=(i+7)/8;
-        bs.data=buf;
-        bs.type=V_ASN1_INTEGER;
-        /* If the top bit is set the asn1 encoding is 1 larger. */
-        buf[0]=0xff;    
-
-        i=i2d_ASN1_INTEGER(&bs,NULL);
-        i+=i; /* r and s */
-        ret=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
-        return(ret);
-        }
-
-#ifndef NO_DH
-DH *DSA_dup_DH(DSA *r)
-        {
-        /* DSA has p, q, g, optional pub_key, optional priv_key.
-         * DH has p, optional length, g, optional pub_key, optional priv_key.
-         */ 
-
-        DH *ret = NULL;
-
-        if (r == NULL)
-                goto err;
-        ret = DH_new();
-        if (ret == NULL)
-                goto err;
-        if (r->p != NULL) 
-                if ((ret->p = BN_dup(r->p)) == NULL)
-                        goto err;
-        if (r->q != NULL)
-                ret->length = BN_num_bits(r->q);
-        if (r->g != NULL)
-                if ((ret->g = BN_dup(r->g)) == NULL)
-                        goto err;
-        if (r->pub_key != NULL)
-                if ((ret->pub_key = BN_dup(r->pub_key)) == NULL)
-                        goto err;
-        if (r->priv_key != NULL)
-                if ((ret->priv_key = BN_dup(r->priv_key)) == NULL)
-                        goto err;
-
-        return ret;
-
- err:
-        if (ret != NULL)
-                DH_free(ret);
-        return NULL;
-        }
-#endif
diff --git a/src/lib/libcrypto/dsa/dsa_sign.c b/src/lib/libcrypto/dsa/dsa_sign.c
deleted file mode 100644
index 774c161964..0000000000
--- a/src/lib/libcrypto/dsa/dsa_sign.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* crypto/dsa/dsa_sign.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-
-DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-        {
-        BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
-        BIGNUM m;
-        BIGNUM xr;
-        BN_CTX *ctx=NULL;
-        int i,reason=ERR_R_BN_LIB;
-        DSA_SIG *ret=NULL;
-
-        BN_init(&m);
-        BN_init(&xr);
-        s=BN_new();
-        if (s == NULL) goto err;
-
-        i=BN_num_bytes(dsa->q); /* should be 20 */
-        if ((dlen > i) || (dlen > 50))
-                {
-                reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-                goto err;
-                }
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        if ((dsa->kinv == NULL) || (dsa->r == NULL))
-                {
-                if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
-                }
-        else
-                {
-                kinv=dsa->kinv;
-                dsa->kinv=NULL;
-                r=dsa->r;
-                dsa->r=NULL;
-                }
-
-        if (BN_bin2bn(dgst,dlen,&m) == NULL) goto err;
-
-        /* Compute  s = inv(k) (m + xr) mod q */
-        if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
-        if (!BN_add(s, &xr, &m)) goto err;              /* s = m + xr */
-        if (BN_cmp(s,dsa->q) > 0)
-                BN_sub(s,s,dsa->q);
-        if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
-
-        ret=DSA_SIG_new();
-        if (ret == NULL) goto err;
-        ret->r = r;
-        ret->s = s;
-        
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_DO_SIGN,reason);
-                BN_free(r);
-                BN_free(s);
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&m);
-        BN_clear_free(&xr);
-        if (kinv != NULL) /* dsa->kinv is NULL now if we used it */
-            BN_clear_free(kinv);
-        return(ret);
-        }
-
-/* data has already been hashed (probably with SHA or SHA-1). */
-
-/* unsigned char *sig:  out    */
-/* unsigned int *siglen:  out    */
-int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
-             unsigned int *siglen, DSA *dsa)
-        {
-        DSA_SIG *s;
-        s=DSA_do_sign(dgst,dlen,dsa);
-        if (s == NULL)
-                {
-                *siglen=0;
-                return(0);
-                }
-        *siglen=i2d_DSA_SIG(s,&sig);
-        DSA_SIG_free(s);
-        return(1);
-        }
-
-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
-        {
-        BN_CTX *ctx;
-        BIGNUM k,*kinv=NULL,*r=NULL;
-        int ret=0;
-
-        if (ctx_in == NULL)
-                {
-                if ((ctx=BN_CTX_new()) == NULL) goto err;
-                }
-        else
-                ctx=ctx_in;
-
-        BN_init(&k);
-        if ((r=BN_new()) == NULL) goto err;
-        kinv=NULL;
-
-        /* Get random k */
-        for (;;)
-                {
-                if (!BN_rand(&k, BN_num_bits(dsa->q), 1, 0)) goto err;
-                if (BN_cmp(&k,dsa->q) >= 0)
-                        BN_sub(&k,&k,dsa->q);
-                if (!BN_is_zero(&k)) break;
-                }
-
-        if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))
-                {
-                if ((dsa->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dsa->method_mont_p,
-                                dsa->p,ctx)) goto err;
-                }
-
-        /* Compute r = (g^k mod p) mod q */
-        if (!BN_mod_exp_mont(r,dsa->g,&k,dsa->p,ctx,
-                (BN_MONT_CTX *)dsa->method_mont_p)) goto err;
-        if (!BN_mod(r,r,dsa->q,ctx)) goto err;
-
-        /* Compute  part of 's = inv(k) (m + xr) mod q' */
-        if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;
-
-        if (*kinvp != NULL) BN_clear_free(*kinvp);
-        *kinvp=kinv;
-        kinv=NULL;
-        if (*rp != NULL) BN_clear_free(*rp);
-        *rp=r;
-        ret=1;
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
-                if (kinv != NULL) BN_clear_free(kinv);
-                if (r != NULL) BN_clear_free(r);
-                }
-        if (ctx_in == NULL) BN_CTX_free(ctx);
-        if (kinv != NULL) BN_clear_free(kinv);
-        BN_clear_free(&k);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/dsa/dsa_vrf.c b/src/lib/libcrypto/dsa/dsa_vrf.c
deleted file mode 100644
index ff552208aa..0000000000
--- a/src/lib/libcrypto/dsa/dsa_vrf.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* crypto/dsa/dsa_vrf.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-
-int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-                  DSA *dsa)
-        {
-        BN_CTX *ctx;
-        BIGNUM u1,u2,t1;
-        BN_MONT_CTX *mont=NULL;
-        int ret = -1;
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        BN_init(&u1);
-        BN_init(&u2);
-        BN_init(&t1);
-
-        /* Calculate W = inv(S) mod Q
-         * save W in u2 */
-        if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
-
-        /* save M in u1 */
-        if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
-
-        /* u1 = M * w mod q */
-        if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
-
-        /* u2 = r * w mod q */
-        if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
-
-        if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))
-                {
-                if ((dsa->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dsa->method_mont_p,
-                                dsa->p,ctx)) goto err;
-                }
-        mont=(BN_MONT_CTX *)dsa->method_mont_p;
-
-#if 0
-        {
-        BIGNUM t2;
-
-        BN_init(&t2);
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        if (!BN_mod_exp_mont(&t1,dsa->g,&u1,dsa->p,ctx,mont)) goto err;
-        /* let t2 = y ^ u2 mod p */
-        if (!BN_mod_exp_mont(&t2,dsa->pub_key,&u2,dsa->p,ctx,mont)) goto err;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(&u1,&t1,&t2,dsa->p,ctx)) goto err_bn;
-        BN_free(&t2);
-        }
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&u1,dsa->q,ctx)) goto err;
-#else
-        {
-        if (!BN_mod_exp2_mont(&t1,dsa->g,&u1,dsa->pub_key,&u2,dsa->p,ctx,mont))
-                goto err;
-        /* BN_copy(&u1,&t1); */
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;
-        }
-#endif
-        /* V is now in u1.  If the signature is correct, it will be
-         * equal to R. */
-        ret=(BN_ucmp(&u1, sig->r) == 0);
-
-        err:
-        if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_free(&u1);
-        BN_free(&u2);
-        BN_free(&t1);
-        return(ret);
-        }
-
-/* data has already been hashed (probably with SHA or SHA-1). */
-/* returns
- *      1: correct signature
- *      0: incorrect signature
- *     -1: error
- */
-int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-             unsigned char *sigbuf, int siglen, DSA *dsa)
-        {
-        DSA_SIG *s;
-        int ret=-1;
-
-        s = DSA_SIG_new();
-        if (s == NULL) return(ret);
-        if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err;
-        ret=DSA_do_verify(dgst,dgst_len,s,dsa);
-err:
-        DSA_SIG_free(s);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
deleted file mode 100644
index 8810d838c6..0000000000
--- a/src/lib/libcrypto/err/err.c
+++ /dev/null
@@ -1,643 +0,0 @@
-/* crypto/err/err.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 <stdarg.h>
-#include <openssl/lhash.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/err.h>
-#include <openssl/crypto.h>
-
-
-static LHASH *error_hash=NULL;
-static LHASH *thread_hash=NULL;
-
-static unsigned long err_hash(ERR_STRING_DATA *a);
-static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b);
-static unsigned long pid_hash(ERR_STATE *pid);
-static int pid_cmp(ERR_STATE *a,ERR_STATE *pid);
-static unsigned long get_error_values(int inc,const char **file,int *line,
-                                      const char **data,int *flags);
-static void ERR_STATE_free(ERR_STATE *s);
-#ifndef NO_ERR
-static ERR_STRING_DATA ERR_str_libraries[]=
-        {
-{ERR_PACK(ERR_LIB_NONE,0,0)             ,"unknown library"},
-{ERR_PACK(ERR_LIB_SYS,0,0)              ,"system library"},
-{ERR_PACK(ERR_LIB_BN,0,0)               ,"bignum routines"},
-{ERR_PACK(ERR_LIB_RSA,0,0)              ,"rsa routines"},
-{ERR_PACK(ERR_LIB_DH,0,0)               ,"Diffie-Hellman routines"},
-{ERR_PACK(ERR_LIB_EVP,0,0)              ,"digital envelope routines"},
-{ERR_PACK(ERR_LIB_BUF,0,0)              ,"memory buffer routines"},
-{ERR_PACK(ERR_LIB_BIO,0,0)              ,"BIO routines"},
-{ERR_PACK(ERR_LIB_OBJ,0,0)              ,"object identifier routines"},
-{ERR_PACK(ERR_LIB_PEM,0,0)              ,"PEM routines"},
-{ERR_PACK(ERR_LIB_ASN1,0,0)             ,"asn1 encoding routines"},
-{ERR_PACK(ERR_LIB_X509,0,0)             ,"x509 certificate routines"},
-{ERR_PACK(ERR_LIB_CONF,0,0)             ,"configuation file routines"},
-{ERR_PACK(ERR_LIB_METH,0,0)             ,"X509 lookup 'method' routines"},
-{ERR_PACK(ERR_LIB_SSL,0,0)              ,"SSL routines"},
-{ERR_PACK(ERR_LIB_RSAREF,0,0)           ,"RSAref routines"},
-{ERR_PACK(ERR_LIB_PROXY,0,0)            ,"Proxy routines"},
-{ERR_PACK(ERR_LIB_BIO,0,0)              ,"BIO routines"},
-{ERR_PACK(ERR_LIB_PKCS7,0,0)            ,"PKCS7 routines"},
-{ERR_PACK(ERR_LIB_X509V3,0,0)           ,"X509 V3 routines"},
-{ERR_PACK(ERR_LIB_PKCS12,0,0)           ,"PKCS12 routines"},
-{0,NULL},
-        };
-
-static ERR_STRING_DATA ERR_str_functs[]=
-        {
-        {ERR_PACK(0,SYS_F_FOPEN,0),             "fopen"},
-        {ERR_PACK(0,SYS_F_CONNECT,0),           "connect"},
-        {ERR_PACK(0,SYS_F_GETSERVBYNAME,0),     "getservbyname"},
-        {ERR_PACK(0,SYS_F_SOCKET,0),            "socket"}, 
-        {ERR_PACK(0,SYS_F_IOCTLSOCKET,0),       "ioctlsocket"},
-        {ERR_PACK(0,SYS_F_BIND,0),              "bind"},
-        {ERR_PACK(0,SYS_F_LISTEN,0),            "listen"},
-        {ERR_PACK(0,SYS_F_ACCEPT,0),            "accept"},
-#ifdef WINDOWS
-        {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
-#endif
-        {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
-        {0,NULL},
-        };
-
-static ERR_STRING_DATA ERR_str_reasons[]=
-        {
-{ERR_R_FATAL                             ,"fatal"},
-{ERR_R_SYS_LIB                          ,"system lib"},
-{ERR_R_BN_LIB                           ,"BN lib"},
-{ERR_R_RSA_LIB                          ,"RSA lib"},
-{ERR_R_DH_LIB                           ,"DH lib"},
-{ERR_R_EVP_LIB                          ,"EVP lib"},
-{ERR_R_BUF_LIB                          ,"BUF lib"},
-{ERR_R_BIO_LIB                          ,"BIO lib"},
-{ERR_R_OBJ_LIB                          ,"OBJ lib"},
-{ERR_R_PEM_LIB                          ,"PEM lib"},
-{ERR_R_X509_LIB                         ,"X509 lib"},
-{ERR_R_METH_LIB                         ,"METH lib"},
-{ERR_R_ASN1_LIB                         ,"ASN1 lib"},
-{ERR_R_CONF_LIB                         ,"CONF lib"},
-{ERR_R_SSL_LIB                          ,"SSL lib"},
-{ERR_R_PROXY_LIB                        ,"PROXY lib"},
-{ERR_R_BIO_LIB                          ,"BIO lib"},
-{ERR_R_PKCS7_LIB                        ,"PKCS7 lib"},
-{ERR_R_PKCS12_LIB                       ,"PKCS12 lib"},
-{ERR_R_MALLOC_FAILURE                   ,"Malloc failure"},
-{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED      ,"called a function you should not call"},
-{ERR_R_PASSED_NULL_PARAMETER            ,"passed a null parameter"},
-{ERR_R_NESTED_ASN1_ERROR                ,"nested asn1 error"},
-{ERR_R_BAD_ASN1_OBJECT_HEADER           ,"bad asn1 object header"},
-{ERR_R_BAD_GET_ASN1_OBJECT_CALL         ,"bad get asn1 object call"},
-{ERR_R_EXPECTING_AN_ASN1_SEQUENCE       ,"expecting an asn1 sequence"},
-{ERR_R_ASN1_LENGTH_MISMATCH             ,"asn1 length mismatch"},
-{ERR_R_MISSING_ASN1_EOS                 ,"missing asn1 eos"},
-
-{0,NULL},
-        };
-#endif
-
-#define err_clear_data(p,i) \
-        if (((p)->err_data[i] != NULL) && \
-                (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
-                {  \
-                Free((p)->err_data[i]); \
-                (p)->err_data[i]=NULL; \
-                } \
-        (p)->err_data_flags[i]=0;
-
-static void ERR_STATE_free(ERR_STATE *s)
-        {
-        int i;
-
-        if(s == NULL)
-            return;
-
-        for (i=0; i<ERR_NUM_ERRORS; i++)
-                {
-                err_clear_data(s,i);
-                }
-        Free(s);
-        }
-
-void ERR_load_ERR_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                if (init == 0)
-                        {
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                        return;
-                        }
-                init=0;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-#ifndef NO_ERR
-                ERR_load_strings(0,ERR_str_libraries);
-                ERR_load_strings(0,ERR_str_reasons);
-                ERR_load_strings(ERR_LIB_SYS,ERR_str_functs);
-#endif
-                }
-        }
-
-void ERR_load_strings(int lib, ERR_STRING_DATA *str)
-        {
-        if (error_hash == NULL)
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
-                error_hash=lh_new(err_hash,err_cmp);
-                if (error_hash == NULL)
-                        {
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
-                        return;
-                        }
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
-
-                ERR_load_ERR_strings();
-                }
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR_HASH);
-        while (str->error)
-                {
-                str->error|=ERR_PACK(lib,0,0);
-                lh_insert(error_hash,(char *)str);
-                str++;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR_HASH);
-        }
-
-void ERR_free_strings(void)
-        {
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-
-        if (error_hash != NULL)
-                {
-                lh_free(error_hash);
-                error_hash=NULL;
-                }
-
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        }
-
-/********************************************************/
-
-void ERR_put_error(int lib, int func, int reason, const char *file,
-             int line)
-        {
-        ERR_STATE *es;
-
-#ifdef _OSD_POSIX
-        /* In the BS2000-OSD POSIX subsystem, the compiler generates
-         * path names in the form "*POSIX(/etc/passwd)".
-         * This dirty hack strips them to something sensible.
-         * @@@ We shouldn't modify a const string, though.
-         */
-        if (strncmp(file,"*POSIX(", sizeof("*POSIX(")-1) == 0) {
-                char *end;
-
-                /* Skip the "*POSIX(" prefix */
-                file += sizeof("*POSIX(")-1;
-                end = &file[strlen(file)-1];
-                if (*end == ')')
-                        *end = '\0';
-                /* Optional: use the basename of the path only. */
-                if ((end = strrchr(file, '/')) != NULL)
-                        file = &end[1];
-        }
-#endif
-        es=ERR_get_state();
-
-        es->top=(es->top+1)%ERR_NUM_ERRORS;
-        if (es->top == es->bottom)
-                es->bottom=(es->bottom+1)%ERR_NUM_ERRORS;
-        es->err_buffer[es->top]=ERR_PACK(lib,func,reason);
-        es->err_file[es->top]=file;
-        es->err_line[es->top]=line;
-        err_clear_data(es,es->top);
-        }
-
-void ERR_clear_error(void)
-        {
-        ERR_STATE *es;
-
-        es=ERR_get_state();
-
-#if 0
-        /* hmm... is this needed */
-        for (i=0; i<ERR_NUM_ERRORS; i++)
-                {
-                es->err_buffer[i]=0;
-                es->err_file[i]=NULL;
-                es->err_line[i]= -1;
-                err_clear_data(es,i);
-                }
-#endif
-        es->top=es->bottom=0;
-        }
-
-
-unsigned long ERR_get_error(void)
-        { return(get_error_values(1,NULL,NULL,NULL,NULL)); }
-
-unsigned long ERR_get_error_line(const char **file,
-             int *line)
-        { return(get_error_values(1,file,line,NULL,NULL)); }
-
-unsigned long ERR_get_error_line_data(const char **file, int *line,
-             const char **data, int *flags)
-        { return(get_error_values(1,file,line,
-             data,flags)); }
-
-unsigned long ERR_peek_error(void)
-        { return(get_error_values(0,NULL,NULL,NULL,NULL)); }
-
-unsigned long ERR_peek_error_line(const char **file,
-             int *line)
-        { return(get_error_values(0,file,line,NULL,NULL)); }
-
-unsigned long ERR_peek_error_line_data(const char **file, int *line,
-             const char **data, int *flags)
-        { return(get_error_values(0,file,line,
-             data,flags)); }
-
-static unsigned long get_error_values(int inc, const char **file, int *line,
-             const char **data, int *flags)
-        {       
-        int i=0;
-        ERR_STATE *es;
-        unsigned long ret;
-
-        es=ERR_get_state();
-
-        if (es->bottom == es->top) return(0);
-        i=(es->bottom+1)%ERR_NUM_ERRORS;
-
-        ret=es->err_buffer[i];
-        if (inc)
-                {
-                es->bottom=i;
-                es->err_buffer[i]=0;
-                }
-
-        if ((file != NULL) && (line != NULL))
-                {
-                if (es->err_file[i] == NULL)
-                        {
-                        *file="NA";
-                        if (line != NULL) *line=0;
-                        }
-                else
-                        {
-                        *file=es->err_file[i];
-                        if (line != NULL) *line=es->err_line[i];
-                        }
-                }
-
-        if (data != NULL)
-                {
-                if (es->err_data[i] == NULL)
-                        {
-                        *data="";
-                        if (flags != NULL) *flags=0;
-                        }
-                else
-                        {
-                        *data=es->err_data[i];
-                        if (flags != NULL) *flags=es->err_data_flags[i];
-                        }
-                }
-        return(ret);
-        }
-
-/* BAD for multi-threaded, uses a local buffer if ret == NULL */
-char *ERR_error_string(unsigned long e, char *ret)
-        {
-        static char buf[256];
-        const char *ls,*fs,*rs;
-        unsigned long l,f,r;
-        int i;
-
-        l=ERR_GET_LIB(e);
-        f=ERR_GET_FUNC(e);
-        r=ERR_GET_REASON(e);
-
-        ls=ERR_lib_error_string(e);
-        fs=ERR_func_error_string(e);
-        rs=ERR_reason_error_string(e);
-
-        if (ret == NULL) ret=buf;
-
-        sprintf(&(ret[0]),"error:%08lX:",e);
-        i=strlen(ret);
-        if (ls == NULL)
-                sprintf(&(ret[i]),":lib(%lu) ",l);
-        else    sprintf(&(ret[i]),"%s",ls);
-        i=strlen(ret);
-        if (fs == NULL)
-                sprintf(&(ret[i]),":func(%lu) ",f);
-        else    sprintf(&(ret[i]),":%s",fs);
-        i=strlen(ret);
-        if (rs == NULL)
-                sprintf(&(ret[i]),":reason(%lu)",r);
-        else    sprintf(&(ret[i]),":%s",rs);
-
-        return(ret);
-        }
-
-LHASH *ERR_get_string_table(void)
-        {
-        return(error_hash);
-        }
-
-LHASH *ERR_get_err_state_table(void)
-        {
-        return(thread_hash);
-        }
-
-const char *ERR_lib_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p=NULL;
-        unsigned long l;
-
-        l=ERR_GET_LIB(e);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
-                {
-                d.error=ERR_PACK(l,0,0);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
-        return((p == NULL)?NULL:p->string);
-        }
-
-const char *ERR_func_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p=NULL;
-        unsigned long l,f;
-
-        l=ERR_GET_LIB(e);
-        f=ERR_GET_FUNC(e);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
-                {
-                d.error=ERR_PACK(l,f,0);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
-        return((p == NULL)?NULL:p->string);
-        }
-
-const char *ERR_reason_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p=NULL;
-        unsigned long l,r;
-
-        l=ERR_GET_LIB(e);
-        r=ERR_GET_REASON(e);
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR_HASH);
-
-        if (error_hash != NULL)
-                {
-                d.error=ERR_PACK(l,0,r);
-                p=(ERR_STRING_DATA *)lh_retrieve(error_hash,(char *)&d);
-                if (p == NULL)
-                        {
-                        d.error=ERR_PACK(0,0,r);
-                        p=(ERR_STRING_DATA *)lh_retrieve(error_hash,
-                                (char *)&d);
-                        }
-                }
-
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR_HASH);
-
-        return((p == NULL)?NULL:p->string);
-        }
-
-static unsigned long err_hash(ERR_STRING_DATA *a)
-        {
-        unsigned long ret,l;
-
-        l=a->error;
-        ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
-        return(ret^ret%19*13);
-        }
-
-static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b)
-        {
-        return((int)(a->error-b->error));
-        }
-
-static unsigned long pid_hash(ERR_STATE *a)
-        {
-        return(a->pid*13);
-        }
-
-static int pid_cmp(ERR_STATE *a, ERR_STATE *b)
-        {
-        return((int)((long)a->pid - (long)b->pid));
-        }
-
-void ERR_remove_state(unsigned long pid)
-        {
-        ERR_STATE *p,tmp;
-
-        if (thread_hash == NULL)
-                return;
-        if (pid == 0)
-                pid=(unsigned long)CRYPTO_thread_id();
-        tmp.pid=pid;
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p=(ERR_STATE *)lh_delete(thread_hash,(char *)&tmp);
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        if (p != NULL) ERR_STATE_free(p);
-        }
-
-ERR_STATE *ERR_get_state(void)
-        {
-        static ERR_STATE fallback;
-        ERR_STATE *ret=NULL,tmp,*tmpp;
-        int i;
-        unsigned long pid;
-
-        pid=(unsigned long)CRYPTO_thread_id();
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-        if (thread_hash == NULL)
-                {
-                CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                if (thread_hash == NULL)
-                        {
-                        MemCheck_off();
-                        thread_hash=lh_new(pid_hash,pid_cmp);
-                        MemCheck_on();
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                        if (thread_hash == NULL) return(&fallback);
-                        }
-                else
-                        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                }
-        else
-                {
-                tmp.pid=pid;
-                ret=(ERR_STATE *)lh_retrieve(thread_hash,(char *)&tmp);
-                CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-                }
-
-        /* ret == the error state, if NULL, make a new one */
-        if (ret == NULL)
-                {
-                ret=(ERR_STATE *)Malloc(sizeof(ERR_STATE));
-                if (ret == NULL) return(&fallback);
-                ret->pid=pid;
-                ret->top=0;
-                ret->bottom=0;
-                for (i=0; i<ERR_NUM_ERRORS; i++)
-                        {
-                        ret->err_data[i]=NULL;
-                        ret->err_data_flags[i]=0;
-                        }
-                CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-                tmpp=(ERR_STATE *)lh_insert(thread_hash,(char *)ret);
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                if (tmpp != NULL) /* old entry - should not happen */
-                        {
-                        ERR_STATE_free(tmpp);
-                        }
-                }
-        return(ret);
-        }
-
-int ERR_get_next_error_library(void)
-        {
-        static int value=ERR_LIB_USER;
-
-        return(value++);
-        }
-
-void ERR_set_error_data(char *data, int flags)
-        {
-        ERR_STATE *es;
-        int i;
-
-        es=ERR_get_state();
-
-        i=es->top;
-        if (i == 0)
-                i=ERR_NUM_ERRORS-1;
-
-        es->err_data[i]=data;
-        es->err_data_flags[es->top]=flags;
-        }
-
-void ERR_add_error_data(int num, ...)
-        {
-        va_list args;
-        int i,n,s;
-        char *str,*p,*a;
-
-        s=64;
-        str=Malloc(s+1);
-        if (str == NULL) return;
-        str[0]='\0';
-
-        va_start(args, num);
-        n=0;
-        for (i=0; i<num; i++)
-                {
-                a=va_arg(args, char*);
-                /* ignore NULLs, thanks to Bob Beck <beck@obtuse.com> */
-                if (a != NULL)
-                        {
-                        n+=strlen(a);
-                        if (n > s)
-                                {
-                                s=n+20;
-                                p=Realloc(str,s+1);
-                                if (p == NULL)
-                                        {
-                                        Free(str);
-                                        return;
-                                        }
-                                else
-                                        str=p;
-                                }
-                        strcat(str,a);
-                        }
-                }
-        ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
-
-        va_end(args);
-        }
-
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
deleted file mode 100644
index 9411fb3568..0000000000
--- a/src/lib/libcrypto/err/err.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* crypto/err/err.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_ERR_H
-#define HEADER_ERR_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef NO_FP_API
-#include <stdio.h>
-#endif
-
-/* The following is a bit of a trick to help the object files only contain
- * the 'name of the file' string once.  Since 'err.h' is protected by the
- * HEADER_ERR_H stuff, this should be included only once per file. */
-
-#define ERR_file_name   __FILE__
-
-#ifndef NO_ERR
-#define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,d,e)
-#else
-#define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,NULL,0)
-#endif
-
-#include <errno.h>
-
-#define ERR_TXT_MALLOCED        0x01
-#define ERR_TXT_STRING          0x02
-
-#define ERR_NUM_ERRORS  16
-typedef struct err_state_st
-        {
-        unsigned long pid;
-        unsigned long err_buffer[ERR_NUM_ERRORS];
-        char *err_data[ERR_NUM_ERRORS];
-        int err_data_flags[ERR_NUM_ERRORS];
-        const char *err_file[ERR_NUM_ERRORS];
-        int err_line[ERR_NUM_ERRORS];
-        int top,bottom;
-        } ERR_STATE;
-
-/* library */
-#define ERR_LIB_NONE            1
-#define ERR_LIB_SYS             2
-#define ERR_LIB_BN              3
-#define ERR_LIB_RSA             4
-#define ERR_LIB_DH              5
-#define ERR_LIB_EVP             6
-#define ERR_LIB_BUF             7
-#define ERR_LIB_OBJ             8
-#define ERR_LIB_PEM             9
-#define ERR_LIB_DSA             10
-#define ERR_LIB_X509            11
-#define ERR_LIB_METH            12
-#define ERR_LIB_ASN1            13
-#define ERR_LIB_CONF            14
-#define ERR_LIB_CRYPTO          15
-#define ERR_LIB_SSL             20
-#define ERR_LIB_SSL23           21
-#define ERR_LIB_SSL2            22
-#define ERR_LIB_SSL3            23
-#define ERR_LIB_RSAREF          30
-#define ERR_LIB_PROXY           31
-#define ERR_LIB_BIO             32
-#define ERR_LIB_PKCS7           33
-#define ERR_LIB_X509V3          34
-#define ERR_LIB_PKCS12          35
-
-#define ERR_LIB_USER            128
-
-#define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),ERR_file_name,__LINE__)
-#define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),ERR_file_name,__LINE__)
-#define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),ERR_file_name,__LINE__)
-#define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),ERR_file_name,__LINE__)
-#define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),ERR_file_name,__LINE__)
-#define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),ERR_file_name,__LINE__)
-#define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),ERR_file_name,__LINE__)
-#define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),ERR_file_name,__LINE__)
-#define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),ERR_file_name,__LINE__)
-#define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),ERR_file_name,__LINE__)
-#define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),ERR_file_name,__LINE__)
-#define METHerr(f,r) ERR_PUT_error(ERR_LIB_METH,(f),(r),ERR_file_name,__LINE__)
-#define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),ERR_file_name,__LINE__)
-#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),ERR_file_name,__LINE__)
-#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),ERR_file_name,__LINE__)
-#define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),ERR_file_name,__LINE__)
-#define SSL23err(f,r) ERR_PUT_error(ERR_LIB_SSL23,(f),(r),ERR_file_name,__LINE__)
-#define SSL2err(f,r) ERR_PUT_error(ERR_LIB_SSL2,(f),(r),ERR_file_name,__LINE__)
-#define SSL3err(f,r) ERR_PUT_error(ERR_LIB_SSL3,(f),(r),ERR_file_name,__LINE__)
-#define RSAREFerr(f,r) ERR_PUT_error(ERR_LIB_RSAREF,(f),(r),ERR_file_name,__LINE__)
-#define PROXYerr(f,r) ERR_PUT_error(ERR_LIB_PROXY,(f),(r),ERR_file_name,__LINE__)
-#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),ERR_file_name,__LINE__)
-#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),ERR_file_name,__LINE__)
-#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),ERR_file_name,__LINE__)
-
-/* Borland C seems too stupid to be able to shift and do longs in
- * the pre-processor :-( */
-#define ERR_PACK(l,f,r)         (((((unsigned long)l)&0xffL)*0x1000000)| \
-                                ((((unsigned long)f)&0xfffL)*0x1000)| \
-                                ((((unsigned long)r)&0xfffL)))
-#define ERR_GET_LIB(l)          (int)((((unsigned long)l)>>24L)&0xffL)
-#define ERR_GET_FUNC(l)         (int)((((unsigned long)l)>>12L)&0xfffL)
-#define ERR_GET_REASON(l)       (int)((l)&0xfffL)
-#define ERR_FATAL_ERROR(l)      (int)((l)&ERR_R_FATAL)
-
-/* OS fuctions */
-#define SYS_F_FOPEN             1
-#define SYS_F_CONNECT           2
-#define SYS_F_GETSERVBYNAME     3
-#define SYS_F_SOCKET            4
-#define SYS_F_IOCTLSOCKET       5
-#define SYS_F_BIND              6
-#define SYS_F_LISTEN            7
-#define SYS_F_ACCEPT            8
-#define SYS_F_WSASTARTUP        9 /* Winsock stuff */
-#define SYS_F_OPENDIR           10
-
-#define ERR_R_FATAL             32      
-/* reasons */
-#define ERR_R_SYS_LIB   ERR_LIB_SYS
-#define ERR_R_BN_LIB    ERR_LIB_BN
-#define ERR_R_RSA_LIB   ERR_LIB_RSA
-#define ERR_R_DSA_LIB   ERR_LIB_DSA
-#define ERR_R_DH_LIB    ERR_LIB_DH
-#define ERR_R_EVP_LIB   ERR_LIB_EVP
-#define ERR_R_BUF_LIB   ERR_LIB_BUF
-#define ERR_R_BIO_LIB   ERR_LIB_BIO
-#define ERR_R_OBJ_LIB   ERR_LIB_OBJ
-#define ERR_R_PEM_LIB   ERR_LIB_PEM
-#define ERR_R_X509_LIB  ERR_LIB_X509
-#define ERR_R_METH_LIB  ERR_LIB_METH
-#define ERR_R_ASN1_LIB  ERR_LIB_ASN1
-#define ERR_R_CONF_LIB  ERR_LIB_CONF
-#define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO
-#define ERR_R_SSL_LIB   ERR_LIB_SSL
-#define ERR_R_SSL23_LIB ERR_LIB_SSL23
-#define ERR_R_SSL2_LIB  ERR_LIB_SSL2
-#define ERR_R_SSL3_LIB  ERR_LIB_SSL3
-#define ERR_R_PROXY_LIB ERR_LIB_PROXY
-#define ERR_R_BIO_LIB   ERR_LIB_BIO
-#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7
-#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12
-
-/* fatal error */
-#define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
-#define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
-#define ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
-#define ERR_R_NESTED_ASN1_ERROR                 (4)
-#define ERR_R_BAD_ASN1_OBJECT_HEADER            (5)
-#define ERR_R_BAD_GET_ASN1_OBJECT_CALL          (6)
-#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE        (7)
-#define ERR_R_ASN1_LENGTH_MISMATCH              (8)
-#define ERR_R_MISSING_ASN1_EOS                  (9)
-
-typedef struct ERR_string_data_st
-        {
-        unsigned long error;
-        const char *string;
-        } ERR_STRING_DATA;
-
-void ERR_put_error(int lib, int func,int reason,const char *file,int line);
-void ERR_set_error_data(char *data,int flags);
-
-unsigned long ERR_get_error(void );
-unsigned long ERR_get_error_line(const char **file,int *line);
-unsigned long ERR_get_error_line_data(const char **file,int *line,
-                                      const char **data, int *flags);
-unsigned long ERR_peek_error(void );
-unsigned long ERR_peek_error_line(const char **file,int *line);
-unsigned long ERR_peek_error_line_data(const char **file,int *line,
-                                       const char **data,int *flags);
-void ERR_clear_error(void );
-char *ERR_error_string(unsigned long e,char *buf);
-const char *ERR_lib_error_string(unsigned long e);
-const char *ERR_func_error_string(unsigned long e);
-const char *ERR_reason_error_string(unsigned long e);
-#ifndef NO_FP_API
-void ERR_print_errors_fp(FILE *fp);
-#endif
-#ifdef HEADER_BIO_H
-void ERR_print_errors(BIO *bp);
-void ERR_add_error_data(int num, ...);
-#endif
-void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void );
-void ERR_load_crypto_strings(void );
-void ERR_free_strings(void );
-
-void ERR_remove_state(unsigned long pid); /* if zero we look it up */
-ERR_STATE *ERR_get_state(void);
-
-#ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table(void );
-LHASH *ERR_get_err_state_table(void );
-#else
-char *ERR_get_string_table(void );
-char *ERR_get_err_state_table(void );
-#endif
-
-int ERR_get_next_error_library(void );
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
deleted file mode 100644
index ad820227d2..0000000000
--- a/src/lib/libcrypto/err/err_all.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* crypto/err/err_all.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/asn1.h>
-#include <openssl/bn.h>
-#include <openssl/buffer.h>
-#include <openssl/bio.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#ifdef RSAref
-#include <openssl/rsaref.h>
-#endif
-#ifndef NO_DH
-#include <openssl/dh.h>
-#endif
-#ifndef NO_DSA
-#include <openssl/dsa.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/pem2.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/conf.h>
-#include <openssl/pkcs12.h>
-#include <openssl/err.h>
-
-void ERR_load_crypto_strings(void)
-        {
-        static int done=0;
-
-        if (done) return;
-        done=1;
-#ifndef NO_ERR
-        ERR_load_ASN1_strings();
-        ERR_load_BN_strings();
-        ERR_load_BUF_strings();
-        ERR_load_BIO_strings();
-        ERR_load_CONF_strings();
-#ifndef NO_RSA
-#ifdef RSAref
-        ERR_load_RSAREF_strings();
-#else
-        ERR_load_RSA_strings();
-#endif
-#endif
-#ifndef NO_DH
-        ERR_load_DH_strings();
-#endif
-#ifndef NO_DSA
-        ERR_load_DSA_strings();
-#endif
-        ERR_load_ERR_strings();
-        ERR_load_EVP_strings();
-        ERR_load_OBJ_strings();
-        ERR_load_PEM_strings();
-        ERR_load_X509_strings();
-        ERR_load_X509V3_strings();
-        ERR_load_CRYPTO_strings();
-        ERR_load_PKCS7_strings();
-        ERR_load_PKCS12_strings();
-#endif
-        }
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
deleted file mode 100644
index 0999ff214b..0000000000
--- a/src/lib/libcrypto/err/err_prn.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/err/err_prn.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/lhash.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/err.h>
-#include <openssl/crypto.h>
-
-#ifndef NO_FP_API
-void ERR_print_errors_fp(FILE *fp)
-        {
-        unsigned long l;
-        char buf[200];
-        const char *file,*data;
-        int line,flags;
-        unsigned long es;
-
-        es=CRYPTO_thread_id();
-        while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
-                {
-                fprintf(fp,"%lu:%s:%s:%d:%s\n",es,ERR_error_string(l,buf),
-                        file,line,(flags&ERR_TXT_STRING)?data:"");
-                }
-        }
-#endif
-
-void ERR_print_errors(BIO *bp)
-        {
-        unsigned long l;
-        char buf[256];
-        char buf2[256];
-        const char *file,*data;
-        int line,flags;
-        unsigned long es;
-
-        es=CRYPTO_thread_id();
-        while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
-                {
-                sprintf(buf2,"%lu:%s:%s:%d:",es,ERR_error_string(l,buf),
-                        file,line);
-                BIO_write(bp,buf2,strlen(buf2));
-                if (flags & ERR_TXT_STRING)
-                        BIO_write(bp,data,strlen(data));
-                BIO_write(bp,"\n",1);
-                }
-        }
-
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
deleted file mode 100644
index c2a8acff0c..0000000000
--- a/src/lib/libcrypto/err/openssl.ec
+++ /dev/null
@@ -1,71 +0,0 @@
-L ERR           NONE                            NONE
-L CRYPTO        crypto/crypto.h                 crypto/cpt_err.c
-L BN            crypto/bn/bn.h                  crypto/bn/bn_err.c
-L RSA           crypto/rsa/rsa.h                crypto/rsa/rsa_err.c
-L DSA           crypto/dsa/dsa.h                crypto/dsa/dsa_err.c
-L DH            crypto/dh/dh.h                  crypto/dh/dh_err.c
-L EVP           crypto/evp/evp.h                crypto/evp/evp_err.c
-L BUF           crypto/buffer/buffer.h          crypto/buffer/buf_err.c
-L BIO           crypto/bio/bio.h                crypto/bio/bio_err.c
-L OBJ           crypto/objects/objects.h        crypto/objects/obj_err.c
-L PEM           crypto/pem/pem.h                crypto/pem/pem_err.c
-L X509          crypto/x509/x509.h              crypto/x509/x509_err.c
-L NONE          crypto/x509/x509_vfy.h          NONE
-L X509V3        crypto/x509v3/x509v3.h          crypto/x509v3/v3err.c
-#L METH         crypto/meth/meth.h              crypto/meth/meth_err.c
-L ASN1          crypto/asn1/asn1.h              crypto/asn1/asn1_err.c
-L CONF          crypto/conf/conf.h              crypto/conf/conf_err.c
-#L PROXY                crypto/proxy/proxy.h            crypto/proxy/proxy_err.c
-L PKCS7         crypto/pkcs7/pkcs7.h            crypto/pkcs7/pkcs7err.c
-L PKCS12        crypto/pkcs12/pkcs12.h          crypto/pkcs12/pk12err.c
-L RSAREF        rsaref/rsaref.h                 rsaref/rsar_err.c
-L SSL           ssl/ssl.h                       ssl/ssl_err.c
-L COMP          crypto/comp/comp.h              crypto/comp/comp_err.c
-
-
-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_TLSV1_ALERT_DECRYPTION_FAILED           1021
-R SSL_R_TLSV1_ALERT_RECORD_OVERFLOW             1022
-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 SSL_R_TLSV1_ALERT_UNKNOWN_CA                  1048
-R SSL_R_TLSV1_ALERT_ACCESS_DENIED               1049
-R SSL_R_TLSV1_ALERT_DECODE_ERROR                1050
-R SSL_R_TLSV1_ALERT_DECRYPT_ERROR               1051
-R SSL_R_TLSV1_ALERT_EXPORT_RESTRICION           1060
-R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION            1070
-R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY       1071
-R SSL_R_TLSV1_ALERT_INTERNAL_ERROR              1080
-R SSL_R_TLSV1_ALERT_USER_CANCLED                1090
-R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION            1100
-
-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/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c
deleted file mode 100644
index 84729119df..0000000000
--- a/src/lib/libcrypto/evp/bio_b64.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* crypto/evp/bio_b64.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 <openssl/buffer.h>
-#include <openssl/evp.h>
-
-static int b64_write(BIO *h,char *buf,int num);
-static int b64_read(BIO *h,char *buf,int size);
-/*static int b64_puts(BIO *h,char *str); */
-/*static int b64_gets(BIO *h,char *str,int size); */
-static long b64_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int b64_new(BIO *h);
-static int b64_free(BIO *data);
-#define B64_BLOCK_SIZE  1024
-#define B64_BLOCK_SIZE2 768
-#define B64_NONE        0
-#define B64_ENCODE      1
-#define B64_DECODE      2
-
-typedef struct b64_struct
-        {
-        /*BIO *bio; moved to the BIO structure */
-        int buf_len;
-        int buf_off;
-        int tmp_len;            /* used to find the start when decoding */
-        int tmp_nl;             /* If true, scan until '\n' */
-        int encode;
-        int start;              /* have we started decoding yet? */
-        int cont;               /* <= 0 when finished */
-        EVP_ENCODE_CTX base64;
-        char buf[EVP_ENCODE_LENGTH(B64_BLOCK_SIZE)+10];
-        char tmp[B64_BLOCK_SIZE];
-        } BIO_B64_CTX;
-
-static BIO_METHOD methods_b64=
-        {
-        BIO_TYPE_BASE64,"base64 encoding",
-        b64_write,
-        b64_read,
-        NULL, /* b64_puts, */
-        NULL, /* b64_gets, */
-        b64_ctrl,
-        b64_new,
-        b64_free,
-        };
-
-BIO_METHOD *BIO_f_base64(void)
-        {
-        return(&methods_b64);
-        }
-
-static int b64_new(BIO *bi)
-        {
-        BIO_B64_CTX *ctx;
-
-        ctx=(BIO_B64_CTX *)Malloc(sizeof(BIO_B64_CTX));
-        if (ctx == NULL) return(0);
-
-        ctx->buf_len=0;
-        ctx->tmp_len=0;
-        ctx->tmp_nl=0;
-        ctx->buf_off=0;
-        ctx->cont=1;
-        ctx->start=1;
-        ctx->encode=0;
-
-        bi->init=1;
-        bi->ptr=(char *)ctx;
-        bi->flags=0;
-        return(1);
-        }
-
-static int b64_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        Free(a->ptr);
-        a->ptr=NULL;
-        a->init=0;
-        a->flags=0;
-        return(1);
-        }
-        
-static int b64_read(BIO *b, char *out, int outl)
-        {
-        int ret=0,i,ii,j,k,x,n,num,ret_code=0;
-        BIO_B64_CTX *ctx;
-        unsigned char *p,*q;
-
-        if (out == NULL) return(0);
-        ctx=(BIO_B64_CTX *)b->ptr;
-
-        if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-
-        if (ctx->encode != B64_DECODE)
-                {
-                ctx->encode=B64_DECODE;
-                ctx->buf_len=0;
-                ctx->buf_off=0;
-                ctx->tmp_len=0;
-                EVP_DecodeInit(&(ctx->base64));
-                }
-
-        /* First check if there are bytes decoded/encoded */
-        if (ctx->buf_len > 0)
-                {
-                i=ctx->buf_len-ctx->buf_off;
-                if (i > outl) i=outl;
-                memcpy(out,&(ctx->buf[ctx->buf_off]),i);
-                ret=i;
-                out+=i;
-                outl-=i;
-                ctx->buf_off+=i;
-                if (ctx->buf_len == ctx->buf_off)
-                        {
-                        ctx->buf_len=0;
-                        ctx->buf_off=0;
-                        }
-                }
-
-        /* At this point, we have room of outl bytes and an empty
-         * buffer, so we should read in some more. */
-
-        ret_code=0;
-        while (outl > 0)
-                {
-                if (ctx->cont <= 0) break;
-
-                i=BIO_read(b->next_bio,&(ctx->tmp[ctx->tmp_len]),
-                        B64_BLOCK_SIZE-ctx->tmp_len);
-
-                if (i <= 0)
-                        {
-                        ret_code=i;
-
-                        /* Should be continue next time we are called? */
-                        if (!BIO_should_retry(b->next_bio))
-                                ctx->cont=i;
-                        /* else we should continue when called again */
-                        break;
-                        }
-                i+=ctx->tmp_len;
-
-                /* We need to scan, a line at a time until we
-                 * have a valid line if we are starting. */
-                if (ctx->start && (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL))
-                        {
-                        /* ctx->start=1; */
-                        ctx->tmp_len=0;
-                        }
-                else if (ctx->start)
-                        {
-                        q=p=(unsigned char *)ctx->tmp;
-                        for (j=0; j<i; j++)
-                                {
-                                if (*(q++) != '\n') continue;
-
-                                /* due to a previous very long line,
-                                 * we need to keep on scanning for a '\n'
-                                 * before we even start looking for
-                                 * base64 encoded stuff. */
-                                if (ctx->tmp_nl)
-                                        {
-                                        p=q;
-                                        ctx->tmp_nl=0;
-                                        continue;
-                                        }
-
-                                k=EVP_DecodeUpdate(&(ctx->base64),
-                                        (unsigned char *)ctx->buf,
-                                        &num,p,q-p);
-                                if ((k <= 0) && (num == 0) && (ctx->start))
-                                        EVP_DecodeInit(&ctx->base64);
-                                else 
-                                        {
-                                        if (p != (unsigned char *)
-                                                &(ctx->tmp[0]))
-                                                {
-                                                i-=(p- (unsigned char *)
-                                                        &(ctx->tmp[0]));
-                                                for (x=0; x < i; x++)
-                                                        ctx->tmp[x]=p[x];
-                                                EVP_DecodeInit(&ctx->base64);
-                                                }
-                                        ctx->start=0;
-                                        break;
-                                        }
-                                p=q;
-                                }
-
-                        /* we fell off the end without starting */
-                        if (j == i)
-                                {
-                                /* Is this is one long chunk?, if so, keep on
-                                 * reading until a new line. */
-                                if (p == (unsigned char *)&(ctx->tmp[0]))
-                                        {
-                                        ctx->tmp_nl=1;
-                                        ctx->tmp_len=0;
-                                        }
-                                else if (p != q) /* finished on a '\n' */
-                                        {
-                                        n=q-p;
-                                        for (ii=0; ii<n; ii++)
-                                                ctx->tmp[ii]=p[ii];
-                                        ctx->tmp_len=n;
-                                        }
-                                /* else finished on a '\n' */
-                                continue;
-                                }
-                        else
-                                ctx->tmp_len=0;
-                        }
-
-                if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
-                        {
-                        int z,jj;
-
-                        jj=(i>>2)<<2;
-                        z=EVP_DecodeBlock((unsigned char *)ctx->buf,
-                                (unsigned char *)ctx->tmp,jj);
-                        if (jj > 2)
-                                {
-                                if (ctx->tmp[jj-1] == '=')
-                                        {
-                                        z--;
-                                        if (ctx->tmp[jj-2] == '=')
-                                                z--;
-                                        }
-                                }
-                        /* z is now number of output bytes and jj is the
-                         * number consumed */
-                        if (jj != i)
-                                {
-                                memcpy((unsigned char *)ctx->tmp,
-                                        (unsigned char *)&(ctx->tmp[jj]),i-jj);
-                                ctx->tmp_len=i-jj;
-                                }
-                        ctx->buf_len=0;
-                        if (z > 0)
-                                {
-                                ctx->buf_len=z;
-                                i=1;
-                                }
-                        else
-                                i=z;
-                        }
-                else
-                        {
-                        i=EVP_DecodeUpdate(&(ctx->base64),
-                                (unsigned char *)ctx->buf,&ctx->buf_len,
-                                (unsigned char *)ctx->tmp,i);
-                        }
-                ctx->cont=i;
-                ctx->buf_off=0;
-                if (i < 0)
-                        {
-                        ret_code=0;
-                        ctx->buf_len=0;
-                        break;
-                        }
-
-                if (ctx->buf_len <= outl)
-                        i=ctx->buf_len;
-                else
-                        i=outl;
-
-                memcpy(out,ctx->buf,i);
-                ret+=i;
-                ctx->buf_off=i;
-                if (ctx->buf_off == ctx->buf_len)
-                        {
-                        ctx->buf_len=0;
-                        ctx->buf_off=0;
-                        }
-                outl-=i;
-                out+=i;
-                }
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return((ret == 0)?ret_code:ret);
-        }
-
-static int b64_write(BIO *b, char *in, int inl)
-        {
-        int ret=inl,n,i;
-        BIO_B64_CTX *ctx;
-
-        ctx=(BIO_B64_CTX *)b->ptr;
-        BIO_clear_retry_flags(b);
-
-        if (ctx->encode != B64_ENCODE)
-                {
-                ctx->encode=B64_ENCODE;
-                ctx->buf_len=0;
-                ctx->buf_off=0;
-                ctx->tmp_len=0;
-                EVP_EncodeInit(&(ctx->base64));
-                }
-
-        n=ctx->buf_len-ctx->buf_off;
-        while (n > 0)
-                {
-                i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-                if (i <= 0)
-                        {
-                        BIO_copy_next_retry(b);
-                        return(i);
-                        }
-                ctx->buf_off+=i;
-                n-=i;
-                }
-        /* at this point all pending data has been written */
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-
-        ctx->buf_off=0;
-        while (inl > 0)
-                {
-                n=(inl > B64_BLOCK_SIZE)?B64_BLOCK_SIZE:inl;
-
-                if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
-                        {
-                        if (ctx->tmp_len > 0)
-                                {
-                                n=3-ctx->tmp_len;
-                                memcpy(&(ctx->tmp[ctx->tmp_len]),in,n);
-                                ctx->tmp_len+=n;
-                                n=ctx->tmp_len;
-                                if (n < 3)
-                                        break;
-                                ctx->buf_len=EVP_EncodeBlock(
-                                        (unsigned char *)ctx->buf,
-                                        (unsigned char *)ctx->tmp,n);
-                                }
-                        else
-                                {
-                                if (n < 3)
-                                        {
-                                        memcpy(&(ctx->tmp[0]),in,n);
-                                        ctx->tmp_len=n;
-                                        break;
-                                        }
-                                n-=n%3;
-                                ctx->buf_len=EVP_EncodeBlock(
-                                        (unsigned char *)ctx->buf,
-                                        (unsigned char *)in,n);
-                                }
-                        }
-                else
-                        {
-                        EVP_EncodeUpdate(&(ctx->base64),
-                                (unsigned char *)ctx->buf,&ctx->buf_len,
-                                (unsigned char *)in,n);
-                        }
-                inl-=n;
-                in+=n;
-
-                ctx->buf_off=0;
-                n=ctx->buf_len;
-                while (n > 0)
-                        {
-                        i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-                        if (i <= 0)
-                                {
-                                BIO_copy_next_retry(b);
-                                return((ret == 0)?i:ret);
-                                }
-                        n-=i;
-                        ctx->buf_off+=i;
-                        }
-                ctx->buf_len=0;
-                ctx->buf_off=0;
-                }
-        return(ret);
-        }
-
-static long b64_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        BIO_B64_CTX *ctx;
-        long ret=1;
-        int i;
-
-        ctx=(BIO_B64_CTX *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                ctx->cont=1;
-                ctx->start=1;
-                ctx->encode=B64_NONE;
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_EOF:      /* More to read */
-                if (ctx->cont <= 0)
-                        ret=1;
-                else
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_WPENDING: /* More to write in buffer */
-                ret=ctx->buf_len-ctx->buf_off;
-                if ((ret == 0) && (ctx->base64.num != 0))
-                        ret=1;
-                else if (ret <= 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_PENDING: /* More to read in buffer */
-                ret=ctx->buf_len-ctx->buf_off;
-                if (ret <= 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_FLUSH:
-                /* do a final write */
-again:
-                while (ctx->buf_len != ctx->buf_off)
-                        {
-                        i=b64_write(b,NULL,0);
-                        if (i < 0)
-                                {
-                                ret=i;
-                                break;
-                                }
-                        }
-                if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL)
-                        {
-                        if (ctx->tmp_len != 0)
-                                {
-                                ctx->buf_len=EVP_EncodeBlock(
-                                        (unsigned char *)ctx->buf,
-                                        (unsigned char *)ctx->tmp,
-                                        ctx->tmp_len);
-                                ctx->buf_off=0;
-                                ctx->tmp_len=0;
-                                goto again;
-                                }
-                        }
-                else if (ctx->base64.num != 0)
-                        {
-                        ctx->buf_off=0;
-                        EVP_EncodeFinal(&(ctx->base64),
-                                (unsigned char *)ctx->buf,
-                                &(ctx->buf_len));
-                        /* push out the bytes */
-                        goto again;
-                        }
-                /* Finally flush the underlying BIO */
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-
-        case BIO_CTRL_DUP:
-                break;
-        case BIO_CTRL_INFO:
-        case BIO_CTRL_GET:
-        case BIO_CTRL_SET:
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
deleted file mode 100644
index 0a7b1ecf07..0000000000
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* crypto/evp/bio_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 <errno.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-static int enc_write(BIO *h,char *buf,int num);
-static int enc_read(BIO *h,char *buf,int size);
-/*static int enc_puts(BIO *h,char *str); */
-/*static int enc_gets(BIO *h,char *str,int size); */
-static long enc_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int enc_new(BIO *h);
-static int enc_free(BIO *data);
-#define ENC_BLOCK_SIZE  (1024*4)
-
-typedef struct enc_struct
-        {
-        int buf_len;
-        int buf_off;
-        int cont;               /* <= 0 when finished */
-        int finished;
-        int ok;                 /* bad decrypt */
-        EVP_CIPHER_CTX cipher;
-        char buf[ENC_BLOCK_SIZE+10];
-        } BIO_ENC_CTX;
-
-static BIO_METHOD methods_enc=
-        {
-        BIO_TYPE_CIPHER,"cipher",
-        enc_write,
-        enc_read,
-        NULL, /* enc_puts, */
-        NULL, /* enc_gets, */
-        enc_ctrl,
-        enc_new,
-        enc_free,
-        };
-
-BIO_METHOD *BIO_f_cipher(void)
-        {
-        return(&methods_enc);
-        }
-
-static int enc_new(BIO *bi)
-        {
-        BIO_ENC_CTX *ctx;
-
-        ctx=(BIO_ENC_CTX *)Malloc(sizeof(BIO_ENC_CTX));
-        EVP_CIPHER_CTX_init(&ctx->cipher);
-        if (ctx == NULL) return(0);
-
-        ctx->buf_len=0;
-        ctx->buf_off=0;
-        ctx->cont=1;
-        ctx->finished=0;
-        ctx->ok=1;
-
-        bi->init=0;
-        bi->ptr=(char *)ctx;
-        bi->flags=0;
-        return(1);
-        }
-
-static int enc_free(BIO *a)
-        {
-        BIO_ENC_CTX *b;
-
-        if (a == NULL) return(0);
-        b=(BIO_ENC_CTX *)a->ptr;
-        EVP_CIPHER_CTX_cleanup(&(b->cipher));
-        memset(a->ptr,0,sizeof(BIO_ENC_CTX));
-        Free(a->ptr);
-        a->ptr=NULL;
-        a->init=0;
-        a->flags=0;
-        return(1);
-        }
-        
-static int enc_read(BIO *b, char *out, int outl)
-        {
-        int ret=0,i;
-        BIO_ENC_CTX *ctx;
-
-        if (out == NULL) return(0);
-        ctx=(BIO_ENC_CTX *)b->ptr;
-
-        if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-
-        /* First check if there are bytes decoded/encoded */
-        if (ctx->buf_len > 0)
-                {
-                i=ctx->buf_len-ctx->buf_off;
-                if (i > outl) i=outl;
-                memcpy(out,&(ctx->buf[ctx->buf_off]),i);
-                ret=i;
-                out+=i;
-                outl-=i;
-                ctx->buf_off+=i;
-                if (ctx->buf_len == ctx->buf_off)
-                        {
-                        ctx->buf_len=0;
-                        ctx->buf_off=0;
-                        }
-                }
-
-        /* At this point, we have room of outl bytes and an empty
-         * buffer, so we should read in some more. */
-
-        while (outl > 0)
-                {
-                if (ctx->cont <= 0) break;
-
-                /* read in at offset 8, read the EVP_Cipher
-                 * documentation about why */
-                i=BIO_read(b->next_bio,&(ctx->buf[8]),ENC_BLOCK_SIZE);
-
-                if (i <= 0)
-                        {
-                        /* Should be continue next time we are called? */
-                        if (!BIO_should_retry(b->next_bio))
-                                {
-                                ctx->cont=i;
-                                i=EVP_CipherFinal(&(ctx->cipher),
-                                        (unsigned char *)ctx->buf,
-                                        &(ctx->buf_len));
-                                ctx->ok=i;
-                                ctx->buf_off=0;
-                                }
-                        else
-                                ret=(ret == 0)?i:ret;
-                        break;
-                        }
-                else
-                        {
-                        EVP_CipherUpdate(&(ctx->cipher),
-                                (unsigned char *)ctx->buf,&ctx->buf_len,
-                                (unsigned char *)&(ctx->buf[8]),i);
-                        ctx->cont=1;
-                        }
-
-                if (ctx->buf_len <= outl)
-                        i=ctx->buf_len;
-                else
-                        i=outl;
-
-                if (i <= 0) break;
-                memcpy(out,ctx->buf,i);
-                ret+=i;
-                ctx->buf_off=i;
-                outl-=i;
-                out+=i;
-                }
-
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return((ret == 0)?ctx->cont:ret);
-        }
-
-static int enc_write(BIO *b, char *in, int inl)
-        {
-        int ret=0,n,i;
-        BIO_ENC_CTX *ctx;
-
-        ctx=(BIO_ENC_CTX *)b->ptr;
-        ret=inl;
-
-        BIO_clear_retry_flags(b);
-        n=ctx->buf_len-ctx->buf_off;
-        while (n > 0)
-                {
-                i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-                if (i <= 0)
-                        {
-                        BIO_copy_next_retry(b);
-                        return(i);
-                        }
-                ctx->buf_off+=i;
-                n-=i;
-                }
-        /* at this point all pending data has been written */
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-
-        ctx->buf_off=0;
-        while (inl > 0)
-                {
-                n=(inl > ENC_BLOCK_SIZE)?ENC_BLOCK_SIZE:inl;
-                EVP_CipherUpdate(&(ctx->cipher),
-                        (unsigned char *)ctx->buf,&ctx->buf_len,
-                        (unsigned char *)in,n);
-                inl-=n;
-                in+=n;
-
-                ctx->buf_off=0;
-                n=ctx->buf_len;
-                while (n > 0)
-                        {
-                        i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-                        if (i <= 0)
-                                {
-                                BIO_copy_next_retry(b);
-                                return(i);
-                                }
-                        n-=i;
-                        ctx->buf_off+=i;
-                        }
-                ctx->buf_len=0;
-                ctx->buf_off=0;
-                }
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static long enc_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        BIO *dbio;
-        BIO_ENC_CTX *ctx,*dctx;
-        long ret=1;
-        int i;
-        EVP_CIPHER_CTX **c_ctx;
-
-        ctx=(BIO_ENC_CTX *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                ctx->ok=1;
-                ctx->finished=0;
-                EVP_CipherInit(&(ctx->cipher),NULL,NULL,NULL,
-                        ctx->cipher.encrypt);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_EOF:      /* More to read */
-                if (ctx->cont <= 0)
-                        ret=1;
-                else
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_WPENDING:
-                ret=ctx->buf_len-ctx->buf_off;
-                if (ret <= 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_PENDING: /* More to read in buffer */
-                ret=ctx->buf_len-ctx->buf_off;
-                if (ret <= 0)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_FLUSH:
-                /* do a final write */
-again:
-                while (ctx->buf_len != ctx->buf_off)
-                        {
-                        i=enc_write(b,NULL,0);
-                        if (i < 0)
-                                {
-                                ret=i;
-                                break;
-                                }
-                        }
-
-                if (!ctx->finished)
-                        {
-                        ctx->finished=1;
-                        ctx->buf_off=0;
-                        ret=EVP_CipherFinal(&(ctx->cipher),
-                                (unsigned char *)ctx->buf,
-                                &(ctx->buf_len));
-                        ctx->ok=(int)ret;
-                        if (ret <= 0) break;
-
-                        /* push out the bytes */
-                        goto again;
-                        }
-                
-                /* Finally flush the underlying BIO */
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_C_GET_CIPHER_STATUS:
-                ret=(long)ctx->ok;
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-        case BIO_C_GET_CIPHER_CTX:
-                c_ctx=(EVP_CIPHER_CTX **)ptr;
-                (*c_ctx)= &(ctx->cipher);
-                b->init=1;
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-                dctx=(BIO_ENC_CTX *)dbio->ptr;
-                memcpy(&(dctx->cipher),&(ctx->cipher),sizeof(ctx->cipher));
-                dbio->init=1;
-                break;
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-        }
-
-/*
-void BIO_set_cipher_ctx(b,c)
-BIO *b;
-EVP_CIPHER_ctx *c;
-        {
-        if (b == NULL) return;
-
-        if ((b->callback != NULL) &&
-                (b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0))
-                return;
-
-        b->init=1;
-        ctx=(BIO_ENC_CTX *)b->ptr;
-        memcpy(ctx->cipher,c,sizeof(EVP_CIPHER_CTX));
-        
-        if (b->callback != NULL)
-                b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
-        }
-*/
-
-void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, unsigned char *k,
-             unsigned char *i, int e)
-        {
-        BIO_ENC_CTX *ctx;
-
-        if (b == NULL) return;
-
-        if ((b->callback != NULL) &&
-                (b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,0L) <= 0))
-                return;
-
-        b->init=1;
-        ctx=(BIO_ENC_CTX *)b->ptr;
-        EVP_CipherInit(&(ctx->cipher),c,k,i,e);
-        
-        if (b->callback != NULL)
-                b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,1L);
-        }
-
diff --git a/src/lib/libcrypto/evp/bio_md.c b/src/lib/libcrypto/evp/bio_md.c
deleted file mode 100644
index 317167f9c4..0000000000
--- a/src/lib/libcrypto/evp/bio_md.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* crypto/evp/bio_md.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 <openssl/buffer.h>
-#include <openssl/evp.h>
-
-/* BIO_put and BIO_get both add to the digest,
- * BIO_gets returns the digest */
-
-static int md_write(BIO *h,char *buf,int num);
-static int md_read(BIO *h,char *buf,int size);
-/*static int md_puts(BIO *h,char *str); */
-static int md_gets(BIO *h,char *str,int size);
-static long md_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int md_new(BIO *h);
-static int md_free(BIO *data);
-static BIO_METHOD methods_md=
-        {
-        BIO_TYPE_MD,"message digest",
-        md_write,
-        md_read,
-        NULL, /* md_puts, */
-        md_gets,
-        md_ctrl,
-        md_new,
-        md_free,
-        };
-
-BIO_METHOD *BIO_f_md(void)
-        {
-        return(&methods_md);
-        }
-
-static int md_new(BIO *bi)
-        {
-        EVP_MD_CTX *ctx;
-
-        ctx=(EVP_MD_CTX *)Malloc(sizeof(EVP_MD_CTX));
-        if (ctx == NULL) return(0);
-
-        bi->init=0;
-        bi->ptr=(char *)ctx;
-        bi->flags=0;
-        return(1);
-        }
-
-static int md_free(BIO *a)
-        {
-        if (a == NULL) return(0);
-        Free(a->ptr);
-        a->ptr=NULL;
-        a->init=0;
-        a->flags=0;
-        return(1);
-        }
-        
-static int md_read(BIO *b, char *out, int outl)
-        {
-        int ret=0;
-        EVP_MD_CTX *ctx;
-
-        if (out == NULL) return(0);
-        ctx=(EVP_MD_CTX *)b->ptr;
-
-        if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-
-        ret=BIO_read(b->next_bio,out,outl);
-        if (b->init)
-                {
-                if (ret > 0)
-                        {
-                        EVP_DigestUpdate(ctx,(unsigned char *)out,
-                                (unsigned int)ret);
-                        }
-                }
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static int md_write(BIO *b, char *in, int inl)
-        {
-        int ret=0;
-        EVP_MD_CTX *ctx;
-
-        if ((in == NULL) || (inl <= 0)) return(0);
-        ctx=(EVP_MD_CTX *)b->ptr;
-
-        if ((ctx != NULL) && (b->next_bio != NULL))
-                ret=BIO_write(b->next_bio,in,inl);
-        if (b->init)
-                {
-                if (ret > 0)
-                        {
-                        EVP_DigestUpdate(ctx,(unsigned char *)in,
-                                (unsigned int)ret);
-                        }
-                }
-        BIO_clear_retry_flags(b);
-        BIO_copy_next_retry(b);
-        return(ret);
-        }
-
-static long md_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        EVP_MD_CTX *ctx,*dctx,**pctx;
-        const EVP_MD **ppmd;
-        EVP_MD *md;
-        long ret=1;
-        BIO *dbio;
-
-        ctx=(EVP_MD_CTX *)b->ptr;
-
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                if (b->init)
-                        EVP_DigestInit(ctx,ctx->digest);
-                else
-                        ret=0;
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-        case BIO_C_GET_MD:
-                if (b->init)
-                        {
-                        ppmd=(const EVP_MD **)ptr;
-                        *ppmd=ctx->digest;
-                        }
-                else
-                        ret=0;
-                break;
-        case BIO_C_GET_MD_CTX:
-                if (b->init)
-                        {
-                        pctx=(EVP_MD_CTX **)ptr;
-                        *pctx=ctx;
-                        }
-                else
-                        ret=0;
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-
-        case BIO_C_SET_MD:
-                md=(EVP_MD *)ptr;
-                EVP_DigestInit(ctx,md);
-                b->init=1;
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-                dctx=(EVP_MD_CTX *)dbio->ptr;
-                memcpy(dctx,ctx,sizeof(ctx));
-                b->init=1;
-                break;
-        default:
-                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-        }
-
-static int md_gets(BIO *bp, char *buf, int size)
-        {
-        EVP_MD_CTX *ctx;
-        unsigned int ret;
-
-
-        ctx=(EVP_MD_CTX *)bp->ptr;
-        if (size < ctx->digest->md_size)
-                return(0);
-        EVP_DigestFinal(ctx,(unsigned char *)buf,&ret);
-        return((int)ret);
-        }
-
-/*
-static int md_puts(bp,str)
-BIO *bp;
-char *str;
-        {
-        return(-1);
-        }
-*/
-
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
deleted file mode 100644
index a4d3b43fb9..0000000000
--- a/src/lib/libcrypto/evp/c_all.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* crypto/evp/c_all.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 <openssl/evp.h>
-#include <openssl/pkcs12.h>
-#include <openssl/objects.h>
-
-void SSLeay_add_all_algorithms(void)
-        {
-        SSLeay_add_all_ciphers();
-        SSLeay_add_all_digests();
-        }
-
-void SSLeay_add_all_ciphers(void)
-        {
-#ifndef NO_DES
-        EVP_add_cipher(EVP_des_cfb());
-        EVP_add_cipher(EVP_des_ede_cfb());
-        EVP_add_cipher(EVP_des_ede3_cfb());
-
-        EVP_add_cipher(EVP_des_ofb());
-        EVP_add_cipher(EVP_des_ede_ofb());
-        EVP_add_cipher(EVP_des_ede3_ofb());
-
-        EVP_add_cipher(EVP_desx_cbc());
-        EVP_add_cipher_alias(SN_desx_cbc,"DESX");
-        EVP_add_cipher_alias(SN_desx_cbc,"desx");
-
-        EVP_add_cipher(EVP_des_cbc());
-        EVP_add_cipher_alias(SN_des_cbc,"DES");
-        EVP_add_cipher_alias(SN_des_cbc,"des");
-        EVP_add_cipher(EVP_des_ede_cbc());
-        EVP_add_cipher(EVP_des_ede3_cbc());
-        EVP_add_cipher_alias(SN_des_ede3_cbc,"DES3");
-        EVP_add_cipher_alias(SN_des_ede3_cbc,"des3");
-
-        EVP_add_cipher(EVP_des_ecb());
-        EVP_add_cipher(EVP_des_ede());
-        EVP_add_cipher(EVP_des_ede3());
-#endif
-
-#ifndef NO_RC4
-        EVP_add_cipher(EVP_rc4());
-        EVP_add_cipher(EVP_rc4_40());
-#endif
-
-#ifndef NO_IDEA
-        EVP_add_cipher(EVP_idea_ecb());
-        EVP_add_cipher(EVP_idea_cfb());
-        EVP_add_cipher(EVP_idea_ofb());
-        EVP_add_cipher(EVP_idea_cbc());
-        EVP_add_cipher_alias(SN_idea_cbc,"IDEA");
-        EVP_add_cipher_alias(SN_idea_cbc,"idea");
-#endif
-
-#ifndef NO_RC2
-        EVP_add_cipher(EVP_rc2_ecb());
-        EVP_add_cipher(EVP_rc2_cfb());
-        EVP_add_cipher(EVP_rc2_ofb());
-        EVP_add_cipher(EVP_rc2_cbc());
-        EVP_add_cipher(EVP_rc2_40_cbc());
-        EVP_add_cipher(EVP_rc2_64_cbc());
-        EVP_add_cipher_alias(SN_rc2_cbc,"RC2");
-        EVP_add_cipher_alias(SN_rc2_cbc,"rc2");
-#endif
-
-#ifndef NO_BF
-        EVP_add_cipher(EVP_bf_ecb());
-        EVP_add_cipher(EVP_bf_cfb());
-        EVP_add_cipher(EVP_bf_ofb());
-        EVP_add_cipher(EVP_bf_cbc());
-        EVP_add_cipher_alias(SN_bf_cbc,"BF");
-        EVP_add_cipher_alias(SN_bf_cbc,"bf");
-        EVP_add_cipher_alias(SN_bf_cbc,"blowfish");
-#endif
-
-#ifndef NO_CAST
-        EVP_add_cipher(EVP_cast5_ecb());
-        EVP_add_cipher(EVP_cast5_cfb());
-        EVP_add_cipher(EVP_cast5_ofb());
-        EVP_add_cipher(EVP_cast5_cbc());
-        EVP_add_cipher_alias(SN_cast5_cbc,"CAST");
-        EVP_add_cipher_alias(SN_cast5_cbc,"cast");
-        EVP_add_cipher_alias(SN_cast5_cbc,"CAST-cbc");
-        EVP_add_cipher_alias(SN_cast5_cbc,"cast-cbc");
-#endif
-
-#ifndef NO_RC5
-        EVP_add_cipher(EVP_rc5_32_12_16_ecb());
-        EVP_add_cipher(EVP_rc5_32_12_16_cfb());
-        EVP_add_cipher(EVP_rc5_32_12_16_ofb());
-        EVP_add_cipher(EVP_rc5_32_12_16_cbc());
-        EVP_add_cipher_alias(SN_rc5_cbc,"rc5");
-        EVP_add_cipher_alias(SN_rc5_cbc,"RC5");
-#endif
-        }
-
-
-void SSLeay_add_all_digests(void)
-        {
-#ifndef NO_MD2
-        EVP_add_digest(EVP_md2());
-#endif
-#ifndef NO_MD5
-        EVP_add_digest(EVP_md5());
-        EVP_add_digest_alias(SN_md5,"ssl2-md5");
-        EVP_add_digest_alias(SN_md5,"ssl3-md5");
-#endif
-#ifndef NO_SHA
-        EVP_add_digest(EVP_sha());
-#ifndef NO_DSA
-        EVP_add_digest(EVP_dss());
-#endif
-#endif
-#ifndef NO_SHA
-        EVP_add_digest(EVP_sha1());
-        EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
-        EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);
-#ifndef NO_DSA
-        EVP_add_digest(EVP_dss1());
-        EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2);
-        EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1");
-        EVP_add_digest_alias(SN_dsaWithSHA1,"dss1");
-#endif
-#endif
-#if !defined(NO_MDC2) && !defined(NO_DES)
-        EVP_add_digest(EVP_mdc2());
-#endif
-#ifndef NO_RIPEMD
-        EVP_add_digest(EVP_ripemd160());
-        EVP_add_digest_alias(SN_ripemd160,"ripemd");
-        EVP_add_digest_alias(SN_ripemd160,"rmd160");
-#endif
-        PKCS12_PBE_add();
-        PKCS5_PBE_add();
-        }
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c
deleted file mode 100644
index c560733568..0000000000
--- a/src/lib/libcrypto/evp/digest.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* crypto/evp/digest.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 <openssl/objects.h>
-#include <openssl/evp.h>
-
-void EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
-        {
-        ctx->digest=type;
-        type->init(&(ctx->md));
-        }
-
-void EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data,
-             unsigned int count)
-        {
-        ctx->digest->update(&(ctx->md.base[0]),data,(unsigned long)count);
-        }
-
-void EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
-        {
-        ctx->digest->final(md,&(ctx->md.base[0]));
-        if (size != NULL)
-                *size=ctx->digest->md_size;
-        memset(&(ctx->md),0,sizeof(ctx->md));
-        }
-
-int EVP_MD_CTX_copy(EVP_MD_CTX *out, EVP_MD_CTX *in)
-{
-    if ((in == NULL) || (in->digest == NULL)) {
-        EVPerr(EVP_F_EVP_MD_CTX_COPY,EVP_R_INPUT_NOT_INITIALIZED);
-        return 0;
-    }
-    memcpy((char *)out,(char *)in,in->digest->ctx_size);
-    return 1;
-}    
diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c
deleted file mode 100644
index 0a62c10aa9..0000000000
--- a/src/lib/libcrypto/evp/e_null.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* crypto/evp/e_null.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 <openssl/evp.h>
-#include <openssl/objects.h>
-
-static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-        unsigned char *iv,int enc);
-static void null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-        unsigned char *in, unsigned int inl);
-static EVP_CIPHER n_cipher=
-        {
-        NID_undef,
-        1,0,0,
-        null_init_key,
-        null_cipher,
-        NULL,
-        0,
-        NULL,
-        NULL,
-        };
-
-EVP_CIPHER *EVP_enc_null(void)
-        {
-        return(&n_cipher);
-        }
-
-static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-             unsigned char *iv, int enc)
-        {
-        memset(&(ctx->c),0,sizeof(ctx->c));
-        }
-
-static void null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-             unsigned char *in, unsigned int inl)
-        {
-        if (in != out)
-                memcpy((char *)out,(char *)in,(int)inl);
-        }
-
diff --git a/src/lib/libcrypto/evp/e_rc4.c b/src/lib/libcrypto/evp/e_rc4.c
deleted file mode 100644
index c7e58a75cc..0000000000
--- a/src/lib/libcrypto/evp/e_rc4.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* crypto/evp/e_rc4.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_RC4
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-
-static void rc4_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-        unsigned char *iv,int enc);
-static void rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-        unsigned char *in, unsigned int inl);
-static EVP_CIPHER r4_cipher=
-        {
-        NID_rc4,
-        1,EVP_RC4_KEY_SIZE,0,
-        rc4_init_key,
-        rc4_cipher,
-        NULL,
-        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
-                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc4)),
-        NULL,
-        NULL,
-        };
-
-static EVP_CIPHER r4_40_cipher=
-        {
-        NID_rc4_40,
-        1,5 /* 40 bit */,0,
-        rc4_init_key,
-        rc4_cipher,
-        };
-
-EVP_CIPHER *EVP_rc4(void)
-        {
-        return(&r4_cipher);
-        }
-
-EVP_CIPHER *EVP_rc4_40(void)
-        {
-        return(&r4_40_cipher);
-        }
-
-static void rc4_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-             unsigned char *iv, int enc)
-        {
-        if (key != NULL)
-                memcpy(&(ctx->c.rc4.key[0]),key,EVP_CIPHER_CTX_key_length(ctx));
-        RC4_set_key(&(ctx->c.rc4.ks),EVP_CIPHER_CTX_key_length(ctx),
-                ctx->c.rc4.key);
-        }
-
-static void rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-             unsigned char *in, unsigned int inl)
-        {
-        RC4(&(ctx->c.rc4.ks),inl,in,out);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
deleted file mode 100644
index 3a6628a75c..0000000000
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/evp/e_xcbc_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.]
- */
-
-#ifndef NO_DES
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-
-static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-        unsigned char *iv,int enc);
-static void desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-        unsigned char *in, unsigned int inl);
-static EVP_CIPHER d_xcbc_cipher=
-        {
-        NID_desx_cbc,
-        8,24,8,
-        desx_cbc_init_key,
-        desx_cbc_cipher,
-        NULL,
-        sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
-                sizeof((((EVP_CIPHER_CTX *)NULL)->c.desx_cbc)),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        };
-
-EVP_CIPHER *EVP_desx_cbc(void)
-        {
-        return(&d_xcbc_cipher);
-        }
-        
-static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-             unsigned char *iv, int enc)
-        {
-        des_cblock *deskey = (des_cblock *)key;
-
-        if (iv != NULL)
-                memcpy(&(ctx->oiv[0]),iv,8);
-        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
-        if (deskey != NULL)
-                {
-                des_set_key(deskey,ctx->c.desx_cbc.ks);
-                memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8);
-                memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8);
-                }
-        }
-
-static void desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-             unsigned char *in, unsigned int inl)
-        {
-        des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks,
-                (des_cblock *)&(ctx->iv[0]),
-                &ctx->c.desx_cbc.inw,
-                &ctx->c.desx_cbc.outw,
-                ctx->encrypt);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
deleted file mode 100644
index 0152624a76..0000000000
--- a/src/lib/libcrypto/evp/encode.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/* crypto/evp/encode.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 <openssl/evp.h>
-
-#ifndef CHARSET_EBCDIC
-#define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])
-#define conv_ascii2bin(a)       (data_ascii2bin[(a)&0x7f])
-#else
-/* We assume that PEM encoded files are EBCDIC files
- * (i.e., printable text files). Convert them here while decoding.
- * When encoding, output is EBCDIC (text) format again.
- * (No need for conversion in the conv_bin2ascii macro, as the
- * underlying textstring data_bin2ascii[] is already EBCDIC)
- */
-#define conv_bin2ascii(a)       (data_bin2ascii[(a)&0x3f])
-#define conv_ascii2bin(a)       (data_ascii2bin[os_toascii[a]&0x7f])
-#endif
-
-/* 64 char lines
- * pad input with 0
- * left over chars are set to =
- * 1 byte  => xx==
- * 2 bytes => xxx=
- * 3 bytes => xxxx
- */
-#define BIN_PER_LINE    (64/4*3)
-#define CHUNKS_PER_LINE (64/4)
-#define CHAR_PER_LINE   (64+1)
-
-static unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\
-abcdefghijklmnopqrstuvwxyz0123456789+/";
-
-/* 0xF0 is a EOLN
- * 0xF1 is ignore but next needs to be 0xF0 (for \r\n processing).
- * 0xF2 is EOF
- * 0xE0 is ignore at start of line.
- * 0xFF is error
- */
-
-#define B64_EOLN                0xF0
-#define B64_CR                  0xF1
-#define B64_EOF                 0xF2
-#define B64_WS                  0xE0
-#define B64_ERROR               0xFF
-#define B64_NOT_BASE64(a)       (((a)|0x13) == 0xF3)
-
-static unsigned char data_ascii2bin[128]={
-        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-        0xFF,0xE0,0xF0,0xFF,0xFF,0xF1,0xFF,0xFF,
-        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-        0xE0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-        0xFF,0xFF,0xFF,0x3E,0xFF,0xF2,0xFF,0x3F,
-        0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,
-        0x3C,0x3D,0xFF,0xFF,0xFF,0x00,0xFF,0xFF,
-        0xFF,0x00,0x01,0x02,0x03,0x04,0x05,0x06,
-        0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,
-        0x0F,0x10,0x11,0x12,0x13,0x14,0x15,0x16,
-        0x17,0x18,0x19,0xFF,0xFF,0xFF,0xFF,0xFF,
-        0xFF,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,0x20,
-        0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
-        0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,0x30,
-        0x31,0x32,0x33,0xFF,0xFF,0xFF,0xFF,0xFF,
-        };
-
-void EVP_EncodeInit(EVP_ENCODE_CTX *ctx)
-        {
-        ctx->length=48;
-        ctx->num=0;
-        ctx->line_num=0;
-        }
-
-void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        int i,j;
-        unsigned int total=0;
-
-        *outl=0;
-        if (inl == 0) return;
-        if ((ctx->num+inl) < ctx->length)
-                {
-                memcpy(&(ctx->enc_data[ctx->num]),in,inl);
-                ctx->num+=inl;
-                return;
-                }
-        if (ctx->num != 0)
-                {
-                i=ctx->length-ctx->num;
-                memcpy(&(ctx->enc_data[ctx->num]),in,i);
-                in+=i;
-                inl-=i;
-                j=EVP_EncodeBlock(out,ctx->enc_data,ctx->length);
-                ctx->num=0;
-                out+=j;
-                *(out++)='\n';
-                *out='\0';
-                total=j+1;
-                }
-        while (inl >= ctx->length)
-                {
-                j=EVP_EncodeBlock(out,in,ctx->length);
-                in+=ctx->length;
-                inl-=ctx->length;
-                out+=j;
-                *(out++)='\n';
-                *out='\0';
-                total+=j+1;
-                }
-        if (inl != 0)
-                memcpy(&(ctx->enc_data[0]),in,inl);
-        ctx->num=inl;
-        *outl=total;
-        }
-
-void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
-        {
-        unsigned int ret=0;
-
-        if (ctx->num != 0)
-                {
-                ret=EVP_EncodeBlock(out,ctx->enc_data,ctx->num);
-                out[ret++]='\n';
-                out[ret]='\0';
-                ctx->num=0;
-                }
-        *outl=ret;
-        }
-
-int EVP_EncodeBlock(unsigned char *t, unsigned char *f, int dlen)
-        {
-        int i,ret=0;
-        unsigned long l;
-
-        for (i=dlen; i > 0; i-=3)
-                {
-                if (i >= 3)
-                        {
-                        l=      (((unsigned long)f[0])<<16L)|
-                                (((unsigned long)f[1])<< 8L)|f[2];
-                        *(t++)=conv_bin2ascii(l>>18L);
-                        *(t++)=conv_bin2ascii(l>>12L);
-                        *(t++)=conv_bin2ascii(l>> 6L);
-                        *(t++)=conv_bin2ascii(l     );
-                        }
-                else
-                        {
-                        l=((unsigned long)f[0])<<16L;
-                        if (i == 2) l|=((unsigned long)f[1]<<8L);
-
-                        *(t++)=conv_bin2ascii(l>>18L);
-                        *(t++)=conv_bin2ascii(l>>12L);
-                        *(t++)=(i == 1)?'=':conv_bin2ascii(l>> 6L);
-                        *(t++)='=';
-                        }
-                ret+=4;
-                f+=3;
-                }
-
-        *t='\0';
-        return(ret);
-        }
-
-void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
-        {
-        ctx->length=30;
-        ctx->num=0;
-        ctx->line_num=0;
-        ctx->expect_nl=0;
-        }
-
-/* -1 for error
- *  0 for last line
- *  1 for full line
- */
-int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        int seof= -1,eof=0,rv= -1,ret=0,i,v,tmp,n,ln,tmp2,exp_nl;
-        unsigned char *d;
-
-        n=ctx->num;
-        d=ctx->enc_data;
-        ln=ctx->line_num;
-        exp_nl=ctx->expect_nl;
-
-        /* last line of input. */
-        if ((inl == 0) || ((n == 0) && (conv_ascii2bin(in[0]) == B64_EOF)))
-                { rv=0; goto end; }
-                
-        /* We parse the input data */
-        for (i=0; i<inl; i++)
-                {
-                /* If the current line is > 80 characters, scream alot */
-                if (ln >= 80) { rv= -1; goto end; }
-
-                /* Get char and put it into the buffer */
-                tmp= *(in++);
-                v=conv_ascii2bin(tmp);
-                /* only save the good data :-) */
-                if (!B64_NOT_BASE64(v))
-                        {
-                        d[n++]=tmp;
-                        ln++;
-                        }
-                else if (v == B64_ERROR)
-                        {
-                        rv= -1;
-                        goto end;
-                        }
-
-                /* have we seen a '=' which is 'definitly' the last
-                 * input line.  seof will point to the character that
-                 * holds it. and eof will hold how many characters to
-                 * chop off. */
-                if (tmp == '=')
-                        {
-                        if (seof == -1) seof=n;
-                        eof++;
-                        }
-
-                /* eoln */
-                if (v == B64_EOLN)
-                        {
-                        ln=0;
-                        if (exp_nl)
-                                {
-                                exp_nl=0;
-                                continue;
-                                }
-                        }
-                exp_nl=0;
-
-                /* If we are at the end of input and it looks like a
-                 * line, process it. */
-                if (((i+1) == inl) && (((n&3) == 0) || eof))
-                        v=B64_EOF;
-
-                if ((v == B64_EOF) || (n >= 64))
-                        {
-                        /* This is needed to work correctly on 64 byte input
-                         * lines.  We process the line and then need to
-                         * accept the '\n' */
-                        if ((v != B64_EOF) && (n >= 64)) exp_nl=1;
-                        tmp2=v;
-                        if (n > 0)
-                                {
-                                v=EVP_DecodeBlock(out,d,n);
-                                if (v < 0) { rv=0; goto end; }
-                                n=0;
-                                ret+=(v-eof);
-                                }
-                        else
-                                {
-                                eof=1;
-                                v=0;
-                                }
-
-                        /* This is the case where we have had a short
-                         * but valid input line */
-                        if ((v < ctx->length) && eof)
-                                {
-                                rv=0;
-                                goto end;
-                                }
-                        else
-                                ctx->length=v;
-
-                        if (seof >= 0) { rv=0; goto end; }
-                        out+=v;
-                        }
-                }
-        rv=1;
-end:
-        *outl=ret;
-        ctx->num=n;
-        ctx->line_num=ln;
-        ctx->expect_nl=exp_nl;
-        return(rv);
-        }
-
-int EVP_DecodeBlock(unsigned char *t, unsigned char *f, int n)
-        {
-        int i,ret=0,a,b,c,d;
-        unsigned long l;
-
-        /* trim white space from the start of the line. */
-        while ((conv_ascii2bin(*f) == B64_WS) && (n > 0))
-                {
-                f++;
-                n--;
-                }
-
-        /* strip off stuff at the end of the line
-         * ascii2bin values B64_WS, B64_EOLN, B64_EOLN and B64_EOF */
-        while ((n > 3) && (B64_NOT_BASE64(conv_ascii2bin(f[n-1]))))
-                n--;
-
-        if (n%4 != 0) return(-1);
-
-        for (i=0; i<n; i+=4)
-                {
-                a=conv_ascii2bin(*(f++));
-                b=conv_ascii2bin(*(f++));
-                c=conv_ascii2bin(*(f++));
-                d=conv_ascii2bin(*(f++));
-                if (    (a & 0x80) || (b & 0x80) ||
-                        (c & 0x80) || (d & 0x80))
-                        return(-1);
-                l=(     (((unsigned long)a)<<18L)|
-                        (((unsigned long)b)<<12L)|
-                        (((unsigned long)c)<< 6L)|
-                        (((unsigned long)d)     ));
-                *(t++)=(unsigned char)(l>>16L)&0xff;
-                *(t++)=(unsigned char)(l>> 8L)&0xff;
-                *(t++)=(unsigned char)(l     )&0xff;
-                ret+=3;
-                }
-        return(ret);
-        }
-
-int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
-        {
-        int i;
-
-        *outl=0;
-        if (ctx->num != 0)
-                {
-                i=EVP_DecodeBlock(out,ctx->enc_data,ctx->num);
-                if (i < 0) return(-1);
-                ctx->num=0;
-                *outl=i;
-                return(1);
-                }
-        else
-                return(1);
-        }
-
-#ifdef undef
-int EVP_DecodeValid(unsigned char *buf, int len)
-        {
-        int i,num=0,bad=0;
-
-        if (len == 0) return(-1);
-        while (conv_ascii2bin(*buf) == B64_WS)
-                {
-                buf++;
-                len--;
-                if (len == 0) return(-1);
-                }
-
-        for (i=len; i >= 4; i-=4)
-                {
-                if (    (conv_ascii2bin(buf[0]) >= 0x40) ||
-                        (conv_ascii2bin(buf[1]) >= 0x40) ||
-                        (conv_ascii2bin(buf[2]) >= 0x40) ||
-                        (conv_ascii2bin(buf[3]) >= 0x40))
-                        return(-1);
-                buf+=4;
-                num+=1+(buf[2] != '=')+(buf[3] != '=');
-                }
-        if ((i == 1) && (conv_ascii2bin(buf[0]) == B64_EOLN))
-                return(num);
-        if ((i == 2) && (conv_ascii2bin(buf[0]) == B64_EOLN) &&
-                (conv_ascii2bin(buf[0]) == B64_EOLN))
-                return(num);
-        return(1);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
deleted file mode 100644
index 570fe27d39..0000000000
--- a/src/lib/libcrypto/evp/evp.h
+++ /dev/null
@@ -1,720 +0,0 @@
-/* crypto/evp/evp.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_ENVELOPE_H
-#define HEADER_ENVELOPE_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef NO_MD2
-#include <openssl/md2.h>
-#endif
-#ifndef NO_MD5
-#include <openssl/md5.h>
-#endif
-#ifndef NO_SHA
-#include <openssl/sha.h>
-#endif
-#ifndef NO_RIPEMD
-#include <openssl/ripemd.h>
-#endif
-#ifndef NO_DES
-#include <openssl/des.h>
-#endif
-#ifndef NO_RC4
-#include <openssl/rc4.h>
-#endif
-#ifndef NO_RC2
-#include <openssl/rc2.h>
-#endif
-#ifndef NO_RC5
-#include <openssl/rc5.h>
-#endif
-#ifndef NO_BF
-#include <openssl/blowfish.h>
-#endif
-#ifndef NO_CAST
-#include <openssl/cast.h>
-#endif
-#ifndef NO_IDEA
-#include <openssl/idea.h>
-#endif
-#ifndef NO_MDC2
-#include <openssl/mdc2.h>
-#endif
-
-#define EVP_RC2_KEY_SIZE                16
-#define EVP_RC4_KEY_SIZE                16
-#define EVP_BLOWFISH_KEY_SIZE           16
-#define EVP_CAST5_KEY_SIZE              16
-#define EVP_RC5_32_12_16_KEY_SIZE       16
-#define EVP_MAX_MD_SIZE                 (16+20) /* The SSLv3 md5+sha1 type */
-#define EVP_MAX_KEY_LENGTH              24
-#define EVP_MAX_IV_LENGTH               8
-
-#define PKCS5_SALT_LEN                  8
-/* Default PKCS#5 iteration count */
-#define PKCS5_DEFAULT_ITER              2048
-
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-
-#ifndef NO_DSA
-#include <openssl/dsa.h>
-#endif
-
-#ifndef NO_DH
-#include <openssl/dh.h>
-#endif
-
-#include <openssl/objects.h>
-
-#define EVP_PK_RSA      0x0001
-#define EVP_PK_DSA      0x0002
-#define EVP_PK_DH       0x0004
-#define EVP_PKT_SIGN    0x0010
-#define EVP_PKT_ENC     0x0020
-#define EVP_PKT_EXCH    0x0040
-#define EVP_PKS_RSA     0x0100
-#define EVP_PKS_DSA     0x0200
-#define EVP_PKT_EXP     0x1000 /* <= 512 bit key */
-
-#define EVP_PKEY_NONE   NID_undef
-#define EVP_PKEY_RSA    NID_rsaEncryption
-#define EVP_PKEY_RSA2   NID_rsa
-#define EVP_PKEY_DSA    NID_dsa
-#define EVP_PKEY_DSA1   NID_dsa_2
-#define EVP_PKEY_DSA2   NID_dsaWithSHA
-#define EVP_PKEY_DSA3   NID_dsaWithSHA1
-#define EVP_PKEY_DSA4   NID_dsaWithSHA1_2
-#define EVP_PKEY_DH     NID_dhKeyAgreement
-
-/* Type needs to be a bit field
- * Sub-type needs to be for variations on the method, as in, can it do
- * arbitary encryption.... */
-typedef struct evp_pkey_st
-        {
-        int type;
-        int save_type;
-        int references;
-        union   {
-                char *ptr;
-#ifndef NO_RSA
-                struct rsa_st *rsa;     /* RSA */
-#endif
-#ifndef NO_DSA
-                struct dsa_st *dsa;     /* DSA */
-#endif
-#ifndef NO_DH
-                struct dh_st *dh;       /* DH */
-#endif
-                } pkey;
-        int save_parameters;
-        STACK /*X509_ATTRIBUTE*/ *attributes; /* [ 0 ] */
-        } EVP_PKEY;
-
-#define EVP_PKEY_MO_SIGN        0x0001
-#define EVP_PKEY_MO_VERIFY      0x0002
-#define EVP_PKEY_MO_ENCRYPT     0x0004
-#define EVP_PKEY_MO_DECRYPT     0x0008
-
-#if 0
-/* This structure is required to tie the message digest and signing together.
- * The lookup can be done by md/pkey_method, oid, oid/pkey_method, or
- * oid, md and pkey.
- * This is required because for various smart-card perform the digest and
- * signing/verification on-board.  To handle this case, the specific
- * EVP_MD and EVP_PKEY_METHODs need to be closely associated.
- * When a PKEY is created, it will have a EVP_PKEY_METHOD associated with it.
- * This can either be software or a token to provide the required low level
- * routines.
- */
-typedef struct evp_pkey_md_st
-        {
-        int oid;
-        EVP_MD *md;
-        EVP_PKEY_METHOD *pkey;
-        } EVP_PKEY_MD;
-
-#define EVP_rsa_md2() \
-                EVP_PKEY_MD_add(NID_md2WithRSAEncryption,\
-                        EVP_rsa_pkcs1(),EVP_md2())
-#define EVP_rsa_md5() \
-                EVP_PKEY_MD_add(NID_md5WithRSAEncryption,\
-                        EVP_rsa_pkcs1(),EVP_md5())
-#define EVP_rsa_sha0() \
-                EVP_PKEY_MD_add(NID_shaWithRSAEncryption,\
-                        EVP_rsa_pkcs1(),EVP_sha())
-#define EVP_rsa_sha1() \
-                EVP_PKEY_MD_add(NID_sha1WithRSAEncryption,\
-                        EVP_rsa_pkcs1(),EVP_sha1())
-#define EVP_rsa_ripemd160() \
-                EVP_PKEY_MD_add(NID_ripemd160WithRSA,\
-                        EVP_rsa_pkcs1(),EVP_ripemd160())
-#define EVP_rsa_mdc2() \
-                EVP_PKEY_MD_add(NID_mdc2WithRSA,\
-                        EVP_rsa_octet_string(),EVP_mdc2())
-#define EVP_dsa_sha() \
-                EVP_PKEY_MD_add(NID_dsaWithSHA,\
-                        EVP_dsa(),EVP_mdc2())
-#define EVP_dsa_sha1() \
-                EVP_PKEY_MD_add(NID_dsaWithSHA1,\
-                        EVP_dsa(),EVP_sha1())
-
-typedef struct evp_pkey_method_st
-        {
-        char *name;
-        int flags;
-        int type;               /* RSA, DSA, an SSLeay specific constant */
-        int oid;                /* For the pub-key type */
-        int encrypt_oid;        /* pub/priv key encryption */
-
-        int (*sign)();
-        int (*verify)();
-        struct  {
-                int
-                int (*set)();   /* get and/or set the underlying type */
-                int (*get)();
-                int (*encrypt)();
-                int (*decrypt)();
-                int (*i2d)();
-                int (*d2i)();
-                int (*dup)();
-                } pub,priv;
-        int (*set_asn1_parameters)();
-        int (*get_asn1_parameters)();
-        } EVP_PKEY_METHOD;
-#endif
-
-#ifndef EVP_MD
-typedef struct env_md_st
-        {
-        int type;
-        int pkey_type;
-        int md_size;
-        void (*init)();
-        void (*update)();
-        void (*final)();
-
-        int (*sign)();
-        int (*verify)();
-        int required_pkey_type[5]; /*EVP_PKEY_xxx */
-        int block_size;
-        int ctx_size; /* how big does the ctx need to be */
-        } EVP_MD;
-
-
-
-#define EVP_PKEY_NULL_method    NULL,NULL,{0,0,0,0}
-
-#ifndef NO_DSA
-#define EVP_PKEY_DSA_method     DSA_sign,DSA_verify, \
-                                {EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
-                                        EVP_PKEY_DSA4,0}
-#else
-#define EVP_PKEY_DSA_method     EVP_PKEY_NULL_method
-#endif
-
-#ifndef NO_RSA
-#define EVP_PKEY_RSA_method     RSA_sign,RSA_verify, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method \
-                                RSA_sign_ASN1_OCTET_STRING, \
-                                RSA_verify_ASN1_OCTET_STRING, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#else
-#define EVP_PKEY_RSA_method     EVP_PKEY_NULL_method
-#define EVP_PKEY_RSA_ASN1_OCTET_STRING_method EVP_PKEY_NULL_method
-#endif
-
-#endif /* !EVP_MD */
-
-typedef struct env_md_ctx_st
-        {
-        const EVP_MD *digest;
-        union   {
-                unsigned char base[4];
-#ifndef NO_MD2
-                MD2_CTX md2;
-#endif
-#ifndef NO_MD5
-                MD5_CTX md5;
-#endif
-#ifndef NO_RIPEMD
-                RIPEMD160_CTX ripemd160;
-#endif
-#ifndef NO_SHA
-                SHA_CTX sha;
-#endif
-#ifndef NO_MDC2
-                MDC2_CTX mdc2;
-#endif
-                } md;
-        } EVP_MD_CTX;
-
-typedef struct evp_cipher_st
-        {
-        int nid;
-        int block_size;
-        int key_len;
-        int iv_len;
-        void (*init)();         /* init for encryption */
-        void (*do_cipher)();    /* encrypt data */
-        void (*cleanup)();      /* used by cipher method */ 
-        int ctx_size;           /* how big the ctx needs to be */
-        /* int set_asn1_parameters(EVP_CIPHER_CTX,ASN1_TYPE *); */
-        int (*set_asn1_parameters)(); /* Populate a ASN1_TYPE with parameters */
-        /* int get_asn1_parameters(EVP_CIPHER_CTX,ASN1_TYPE *); */
-        int (*get_asn1_parameters)(); /* Get parameters from a ASN1_TYPE */
-        } EVP_CIPHER;
-
-typedef struct evp_cipher_info_st
-        {
-        const EVP_CIPHER *cipher;
-        unsigned char iv[EVP_MAX_IV_LENGTH];
-        } EVP_CIPHER_INFO;
-
-typedef struct evp_cipher_ctx_st
-        {
-        const EVP_CIPHER *cipher;
-        int encrypt;            /* encrypt or decrypt */
-        int buf_len;            /* number we have left */
-
-        unsigned char  oiv[EVP_MAX_IV_LENGTH];  /* original iv */
-        unsigned char  iv[EVP_MAX_IV_LENGTH];   /* working iv */
-        unsigned char buf[EVP_MAX_IV_LENGTH];   /* saved partial block */
-        int num;                                /* used by cfb/ofb mode */
-
-        char *app_data;         /* aplication stuff */
-        union   {
-#ifndef NO_RC4
-                struct
-                        {
-                        unsigned char key[EVP_RC4_KEY_SIZE];
-                        RC4_KEY ks;     /* working key */
-                        } rc4;
-#endif
-#ifndef NO_DES
-                des_key_schedule des_ks;/* key schedule */
-                struct
-                        {
-                        des_key_schedule ks;/* key schedule */
-                        des_cblock inw;
-                        des_cblock outw;
-                        } desx_cbc;
-                struct
-                        {
-                        des_key_schedule ks1;/* key schedule */
-                        des_key_schedule ks2;/* key schedule (for ede) */
-                        des_key_schedule ks3;/* key schedule (for ede3) */
-                        } des_ede;
-#endif
-#ifndef NO_IDEA
-                IDEA_KEY_SCHEDULE idea_ks;/* key schedule */
-#endif
-#ifndef NO_RC2
-                RC2_KEY rc2_ks;/* key schedule */
-#endif
-#ifndef NO_RC5
-                RC5_32_KEY rc5_ks;/* key schedule */
-#endif
-#ifndef NO_BF
-                BF_KEY bf_ks;/* key schedule */
-#endif
-#ifndef NO_CAST
-                CAST_KEY cast_ks;/* key schedule */
-#endif
-                } c;
-        } EVP_CIPHER_CTX;
-
-typedef struct evp_Encode_Ctx_st
-        {
-        int num;        /* number saved in a partial encode/decode */
-        int length;     /* The length is either the output line length
-                         * (in input bytes) or the shortest input line
-                         * length that is ok.  Once decoding begins,
-                         * the length is adjusted up each time a longer
-                         * line is decoded */
-        unsigned char enc_data[80];     /* data to encode */
-        int line_num;   /* number read on current line */
-        int expect_nl;
-        } EVP_ENCODE_CTX;
-
-/* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                ASN1_TYPE *param, EVP_CIPHER *cipher,
-                EVP_MD *md, int en_de);
-
-#define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-                                        (char *)(rsa))
-#define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-                                        (char *)(dsa))
-#define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,\
-                                        (char *)(dh))
-
-/* Add some extra combinations */
-#define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-#define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-#define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
-#define EVP_MD_type(e)                  ((e)->type)
-#define EVP_MD_pkey_type(e)             ((e)->pkey_type)
-#define EVP_MD_size(e)                  ((e)->md_size)
-#define EVP_MD_block_size(e)            ((e)->block_size)
-
-#define EVP_MD_CTX_size(e)              EVP_MD_size((e)->digest)
-#define EVP_MD_CTX_block_size(e)        EVP_MD_block_size((e)->digest)
-#define EVP_MD_CTX_type(e)              ((e)->digest)
-
-#define EVP_CIPHER_nid(e)               ((e)->nid)
-#define EVP_CIPHER_block_size(e)        ((e)->block_size)
-#define EVP_CIPHER_key_length(e)        ((e)->key_len)
-#define EVP_CIPHER_iv_length(e)         ((e)->iv_len)
-
-#define EVP_CIPHER_CTX_cipher(e)        ((e)->cipher)
-#define EVP_CIPHER_CTX_nid(e)           ((e)->cipher->nid)
-#define EVP_CIPHER_CTX_block_size(e)    ((e)->cipher->block_size)
-#define EVP_CIPHER_CTX_key_length(e)    ((e)->cipher->key_len)
-#define EVP_CIPHER_CTX_iv_length(e)     ((e)->cipher->iv_len)
-#define EVP_CIPHER_CTX_get_app_data(e)  ((e)->app_data)
-#define EVP_CIPHER_CTX_set_app_data(e,d) ((e)->app_data=(char *)(d))
-#define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-
-#define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)
-#define EVP_DECODE_LENGTH(l)    ((l+3)/4*3+80)
-
-#define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
-#define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
-#define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
-#define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
-#define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
-#define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)    
-
-#ifdef CONST_STRICT
-void BIO_set_md(BIO *,const EVP_MD *md);
-#else
-# define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
-#endif
-#define BIO_get_md(b,mdp)               BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
-#define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-#define BIO_get_cipher_status(b)        BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-#define BIO_get_cipher_ctx(b,c_pp)      BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
-#define EVP_Cipher(c,o,i,l)     (c)->cipher->do_cipher((c),(o),(i),(l))
-
-#define EVP_add_cipher_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-#define EVP_add_digest_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-#define EVP_delete_cipher_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-#define EVP_delete_digest_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
-
-
-int     EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in);  
-void    EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-void    EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,
-                         unsigned int cnt);
-void    EVP_DigestFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);
-
-int     EVP_read_pw_string(char *buf,int length,const char *prompt,int verify);
-void    EVP_set_pw_prompt(char *prompt);
-char *  EVP_get_pw_prompt(void);
-
-int     EVP_BytesToKey(const EVP_CIPHER *type,EVP_MD *md,unsigned char *salt,
-                unsigned char *data, int datal, int count,
-                unsigned char *key,unsigned char *iv);
-
-void    EVP_EncryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
-                unsigned char *key, unsigned char *iv);
-void    EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                int *outl, unsigned char *in, int inl);
-void    EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-void    EVP_DecryptInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
-                unsigned char *key, unsigned char *iv);
-void    EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                int *outl, unsigned char *in, int inl);
-int     EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-void    EVP_CipherInit(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *type,
-                       unsigned char *key,unsigned char *iv,int enc);
-void    EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                int *outl, unsigned char *in, int inl);
-int     EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int     EVP_SignFinal(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s,
-                EVP_PKEY *pkey);
-
-int     EVP_VerifyFinal(EVP_MD_CTX *ctx,unsigned char *sigbuf,
-                unsigned int siglen,EVP_PKEY *pkey);
-
-int     EVP_OpenInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,unsigned char *ek,
-                int ekl,unsigned char *iv,EVP_PKEY *priv);
-int     EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int     EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
-                int *ekl, unsigned char *iv,EVP_PKEY **pubk, int npubk);
-void    EVP_SealFinal(EVP_CIPHER_CTX *ctx,unsigned char *out,int *outl);
-
-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);
-
-void    ERR_load_EVP_strings(void );
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
-void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
-
-#ifdef HEADER_BIO_H
-BIO_METHOD *BIO_f_md(void);
-BIO_METHOD *BIO_f_base64(void);
-BIO_METHOD *BIO_f_cipher(void);
-BIO_METHOD *BIO_f_reliable(void);
-void BIO_set_cipher(BIO *b,const EVP_CIPHER *c,unsigned char *k,
-        unsigned char *i, int enc);
-#endif
-
-EVP_MD *EVP_md_null(void);
-EVP_MD *EVP_md2(void);
-EVP_MD *EVP_md5(void);
-EVP_MD *EVP_sha(void);
-EVP_MD *EVP_sha1(void);
-EVP_MD *EVP_dss(void);
-EVP_MD *EVP_dss1(void);
-EVP_MD *EVP_mdc2(void);
-EVP_MD *EVP_ripemd160(void);
-
-EVP_CIPHER *EVP_enc_null(void);         /* does nothing :-) */
-EVP_CIPHER *EVP_des_ecb(void);
-EVP_CIPHER *EVP_des_ede(void);
-EVP_CIPHER *EVP_des_ede3(void);
-EVP_CIPHER *EVP_des_cfb(void);
-EVP_CIPHER *EVP_des_ede_cfb(void);
-EVP_CIPHER *EVP_des_ede3_cfb(void);
-EVP_CIPHER *EVP_des_ofb(void);
-EVP_CIPHER *EVP_des_ede_ofb(void);
-EVP_CIPHER *EVP_des_ede3_ofb(void);
-EVP_CIPHER *EVP_des_cbc(void);
-EVP_CIPHER *EVP_des_ede_cbc(void);
-EVP_CIPHER *EVP_des_ede3_cbc(void);
-EVP_CIPHER *EVP_desx_cbc(void);
-EVP_CIPHER *EVP_rc4(void);
-EVP_CIPHER *EVP_rc4_40(void);
-EVP_CIPHER *EVP_idea_ecb(void);
-EVP_CIPHER *EVP_idea_cfb(void);
-EVP_CIPHER *EVP_idea_ofb(void);
-EVP_CIPHER *EVP_idea_cbc(void);
-EVP_CIPHER *EVP_rc2_ecb(void);
-EVP_CIPHER *EVP_rc2_cbc(void);
-EVP_CIPHER *EVP_rc2_40_cbc(void);
-EVP_CIPHER *EVP_rc2_64_cbc(void);
-EVP_CIPHER *EVP_rc2_cfb(void);
-EVP_CIPHER *EVP_rc2_ofb(void);
-EVP_CIPHER *EVP_bf_ecb(void);
-EVP_CIPHER *EVP_bf_cbc(void);
-EVP_CIPHER *EVP_bf_cfb(void);
-EVP_CIPHER *EVP_bf_ofb(void);
-EVP_CIPHER *EVP_cast5_ecb(void);
-EVP_CIPHER *EVP_cast5_cbc(void);
-EVP_CIPHER *EVP_cast5_cfb(void);
-EVP_CIPHER *EVP_cast5_ofb(void);
-EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
-EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
-EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
-EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-
-void SSLeay_add_all_algorithms(void);
-void SSLeay_add_all_ciphers(void);
-void SSLeay_add_all_digests(void);
-
-int EVP_add_cipher(EVP_CIPHER *cipher);
-int EVP_add_digest(EVP_MD *digest);
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-const EVP_MD *EVP_get_digestbyname(const char *name);
-void EVP_cleanup(void);
-
-int             EVP_PKEY_decrypt(unsigned char *dec_key,unsigned char *enc_key,
-                        int enc_key_len,EVP_PKEY *private_key);
-int             EVP_PKEY_encrypt(unsigned char *enc_key,
-                        unsigned char *key,int key_len,EVP_PKEY *pub_key);
-int             EVP_PKEY_type(int type);
-int             EVP_PKEY_bits(EVP_PKEY *pkey);
-int             EVP_PKEY_size(EVP_PKEY *pkey);
-int             EVP_PKEY_assign(EVP_PKEY *pkey,int type,char *key);
-EVP_PKEY *      EVP_PKEY_new(void);
-void            EVP_PKEY_free(EVP_PKEY *pkey);
-EVP_PKEY *      d2i_PublicKey(int type,EVP_PKEY **a, unsigned char **pp,
-                        long length);
-int             i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
-
-EVP_PKEY *      d2i_PrivateKey(int type,EVP_PKEY **a, unsigned char **pp,
-                        long length);
-int             i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to,EVP_PKEY *from);
-int EVP_PKEY_missing_parameters(EVP_PKEY *pkey);
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey,int mode);
-int EVP_PKEY_cmp_parameters(EVP_PKEY *a,EVP_PKEY *b);
-
-int EVP_CIPHER_type(const EVP_CIPHER *ctx);
-
-/* calls methods */
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* These are used by EVP_CIPHER methods */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c,ASN1_TYPE *type);
-
-/* PKCS5 password based encryption */
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,
-                         int en_de);
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out);
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,
-                         int en_de);
-
-void PKCS5_PBE_add(void);
-
-int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-             ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-int EVP_PBE_alg_add(int nid, EVP_CIPHER *cipher, EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen);
-void EVP_PBE_cleanup(void);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the EVP functions. */
-
-/* Function codes. */
-#define EVP_F_D2I_PKEY                                   100
-#define EVP_F_EVP_DECRYPTFINAL                           101
-#define EVP_F_EVP_MD_CTX_COPY                            110
-#define EVP_F_EVP_OPENINIT                               102
-#define EVP_F_EVP_PBE_ALG_ADD                            115
-#define EVP_F_EVP_PBE_CIPHERINIT                         116
-#define EVP_F_EVP_PKCS82PKEY                             111
-#define EVP_F_EVP_PKCS8_SET_BROKEN                       112
-#define EVP_F_EVP_PKEY2PKCS8                             113
-#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
-#define EVP_F_PKCS5_PBE_KEYIVGEN                         117
-#define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      118
-#define EVP_F_RC2_MAGIC_TO_METH                          109
-
-/* Reason codes. */
-#define EVP_R_BAD_DECRYPT                                100
-#define EVP_R_BN_DECODE_ERROR                            112
-#define EVP_R_BN_PUBKEY_ERROR                            113
-#define EVP_R_CIPHER_PARAMETER_ERROR                     122
-#define EVP_R_DECODE_ERROR                               114
-#define EVP_R_DIFFERENT_KEY_TYPES                        101
-#define EVP_R_ENCODE_ERROR                               115
-#define EVP_R_EVP_PBE_CIPHERINIT_ERROR                   119
-#define EVP_R_INPUT_NOT_INITIALIZED                      111
-#define EVP_R_IV_TOO_LARGE                               102
-#define EVP_R_KEYGEN_FAILURE                             120
-#define EVP_R_MISSING_PARMATERS                          103
-#define EVP_R_NO_DSA_PARAMETERS                          116
-#define EVP_R_NO_SIGN_FUNCTION_CONFIGURED                104
-#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED              105
-#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE                  117
-#define EVP_R_PUBLIC_KEY_NOT_RSA                         106
-#define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-#define EVP_R_UNSUPPORTED_CIPHER                         107
-#define EVP_R_UNSUPPORTED_KEYLENGTH                      123
-#define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION        124
-#define EVP_R_UNSUPPORTED_KEY_SIZE                       108
-#define EVP_R_UNSUPPORTED_PRF                            125
-#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM          118
-#define EVP_R_UNSUPPORTED_SALT_TYPE                      126
-#define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
-#define EVP_R_WRONG_PUBLIC_KEY_TYPE                      110
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
deleted file mode 100644
index 5299a65b6a..0000000000
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* crypto/evp/evp_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 <openssl/evp.h>
-
-const char *EVP_version="EVP" OPENSSL_VERSION_PTEXT;
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
-        {
-        memset(ctx,0,sizeof(EVP_CIPHER_CTX));
-        /* ctx->cipher=NULL; */
-        }
-
-void EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *data,
-             unsigned char *key, unsigned char *iv, int enc)
-        {
-        if (enc)
-                EVP_EncryptInit(ctx,data,key,iv);
-        else    
-                EVP_DecryptInit(ctx,data,key,iv);
-        }
-
-void EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        if (ctx->encrypt)
-                EVP_EncryptUpdate(ctx,out,outl,in,inl);
-        else    EVP_DecryptUpdate(ctx,out,outl,in,inl);
-        }
-
-int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
-        if (ctx->encrypt)
-                {
-                EVP_EncryptFinal(ctx,out,outl);
-                return(1);
-                }
-        else    return(EVP_DecryptFinal(ctx,out,outl));
-        }
-
-void EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-             unsigned char *key, unsigned char *iv)
-        {
-        if (cipher != NULL)
-                ctx->cipher=cipher;
-        ctx->cipher->init(ctx,key,iv,1);
-        ctx->encrypt=1;
-        ctx->buf_len=0;
-        }
-
-void EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-             unsigned char *key, unsigned char *iv)
-        {
-        if (cipher != NULL)
-                ctx->cipher=cipher;
-        ctx->cipher->init(ctx,key,iv,0);
-        ctx->encrypt=0;
-        ctx->buf_len=0;
-        }
-
-
-void EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        int i,j,bl;
-
-        i=ctx->buf_len;
-        bl=ctx->cipher->block_size;
-        *outl=0;
-        if ((inl == 0) && (i != bl)) return;
-        if (i != 0)
-                {
-                if (i+inl < bl)
-                        {
-                        memcpy(&(ctx->buf[i]),in,inl);
-                        ctx->buf_len+=inl;
-                        return;
-                        }
-                else
-                        {
-                        j=bl-i;
-                        if (j != 0) memcpy(&(ctx->buf[i]),in,j);
-                        ctx->cipher->do_cipher(ctx,out,ctx->buf,bl);
-                        inl-=j;
-                        in+=j;
-                        out+=bl;
-                        *outl+=bl;
-                        }
-                }
-        i=inl%bl; /* how much is left */
-        inl-=i;
-        if (inl > 0)
-                {
-                ctx->cipher->do_cipher(ctx,out,in,inl);
-                *outl+=inl;
-                }
-
-        if (i != 0)
-                memcpy(ctx->buf,&(in[inl]),i);
-        ctx->buf_len=i;
-        }
-
-void EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
-        int i,n,b,bl;
-
-        b=ctx->cipher->block_size;
-        if (b == 1)
-                {
-                *outl=0;
-                return;
-                }
-        bl=ctx->buf_len;
-        n=b-bl;
-        for (i=bl; i<b; i++)
-                ctx->buf[i]=n;
-        ctx->cipher->do_cipher(ctx,out,ctx->buf,b);
-        *outl=b;
-        }
-
-void EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        int b,bl,n;
-        int keep_last=0;
-
-        *outl=0;
-        if (inl == 0) return;
-
-        b=ctx->cipher->block_size;
-        if (b > 1)
-                {
-                /* Is the input a multiple of the block size? */
-                bl=ctx->buf_len;
-                n=inl+bl;
-                if (n%b == 0)
-                        {
-                        if (inl < b) /* must be 'just one' buff */
-                                {
-                                memcpy(&(ctx->buf[bl]),in,inl);
-                                ctx->buf_len=b;
-                                *outl=0;
-                                return;
-                                }
-                        keep_last=1;
-                        inl-=b; /* don't do the last block */
-                        }
-                }
-        EVP_EncryptUpdate(ctx,out,outl,in,inl);
-
-        /* if we have 'decrypted' a multiple of block size, make sure
-         * we have a copy of this last block */
-        if (keep_last)
-                {
-                memcpy(&(ctx->buf[0]),&(in[inl]),b);
-#ifdef DEBUG
-                if (ctx->buf_len != 0)
-                        {
-                        abort();
-                        }
-#endif
-                ctx->buf_len=b;
-                }
-        }
-
-int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
-        int i,b;
-        int n;
-
-        *outl=0;
-        b=ctx->cipher->block_size;
-        if (b > 1)
-                {
-                if (ctx->buf_len != b)
-                        {
-                        EVPerr(EVP_F_EVP_DECRYPTFINAL,EVP_R_WRONG_FINAL_BLOCK_LENGTH);
-                        return(0);
-                        }
-                EVP_EncryptUpdate(ctx,ctx->buf,&n,ctx->buf,0);
-                if (n != b)
-                        return(0);
-                n=ctx->buf[b-1];
-                if (n > b)
-                        {
-                        EVPerr(EVP_F_EVP_DECRYPTFINAL,EVP_R_BAD_DECRYPT);
-                        return(0);
-                        }
-                for (i=0; i<n; i++)
-                        {
-                        if (ctx->buf[--b] != n)
-                                {
-                                EVPerr(EVP_F_EVP_DECRYPTFINAL,EVP_R_BAD_DECRYPT);
-                                return(0);
-                                }
-                        }
-                n=ctx->cipher->block_size-n;
-                for (i=0; i<n; i++)
-                        out[i]=ctx->buf[i];
-                *outl=n;
-                }
-        else
-                *outl=0;
-        return(1);
-        }
-
-void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
-        {
-        if ((c->cipher != NULL) && (c->cipher->cleanup != NULL))
-                c->cipher->cleanup(c);
-        memset(c,0,sizeof(EVP_CIPHER_CTX));
-        }
-
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c
deleted file mode 100644
index c61cc922e8..0000000000
--- a/src/lib/libcrypto/evp/evp_err.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* crypto/evp/evp_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA EVP_str_functs[]=
-        {
-{ERR_PACK(0,EVP_F_D2I_PKEY,0),  "D2I_PKEY"},
-{ERR_PACK(0,EVP_F_EVP_DECRYPTFINAL,0),  "EVP_DecryptFinal"},
-{ERR_PACK(0,EVP_F_EVP_MD_CTX_COPY,0),   "EVP_MD_CTX_copy"},
-{ERR_PACK(0,EVP_F_EVP_OPENINIT,0),      "EVP_OpenInit"},
-{ERR_PACK(0,EVP_F_EVP_PBE_ALG_ADD,0),   "EVP_PBE_alg_add"},
-{ERR_PACK(0,EVP_F_EVP_PBE_CIPHERINIT,0),        "EVP_PBE_CipherInit"},
-{ERR_PACK(0,EVP_F_EVP_PKCS82PKEY,0),    "EVP_PKCS82PKEY"},
-{ERR_PACK(0,EVP_F_EVP_PKCS8_SET_BROKEN,0),      "EVP_PKCS8_SET_BROKEN"},
-{ERR_PACK(0,EVP_F_EVP_PKEY2PKCS8,0),    "EVP_PKEY2PKCS8"},
-{ERR_PACK(0,EVP_F_EVP_PKEY_COPY_PARAMETERS,0),  "EVP_PKEY_copy_parameters"},
-{ERR_PACK(0,EVP_F_EVP_PKEY_DECRYPT,0),  "EVP_PKEY_decrypt"},
-{ERR_PACK(0,EVP_F_EVP_PKEY_ENCRYPT,0),  "EVP_PKEY_encrypt"},
-{ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0),      "EVP_PKEY_new"},
-{ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0),     "EVP_SignFinal"},
-{ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0),   "EVP_VerifyFinal"},
-{ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0),        "PKCS5_PBE_keyivgen"},
-{ERR_PACK(0,EVP_F_PKCS5_V2_PBE_KEYIVGEN,0),     "PKCS5_v2_PBE_keyivgen"},
-{ERR_PACK(0,EVP_F_RC2_MAGIC_TO_METH,0), "RC2_MAGIC_TO_METH"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA EVP_str_reasons[]=
-        {
-{EVP_R_BAD_DECRYPT                       ,"bad decrypt"},
-{EVP_R_BN_DECODE_ERROR                   ,"bn decode error"},
-{EVP_R_BN_PUBKEY_ERROR                   ,"bn pubkey error"},
-{EVP_R_CIPHER_PARAMETER_ERROR            ,"cipher parameter error"},
-{EVP_R_DECODE_ERROR                      ,"decode error"},
-{EVP_R_DIFFERENT_KEY_TYPES               ,"different key types"},
-{EVP_R_ENCODE_ERROR                      ,"encode error"},
-{EVP_R_EVP_PBE_CIPHERINIT_ERROR          ,"evp pbe cipherinit error"},
-{EVP_R_INPUT_NOT_INITIALIZED             ,"input not initialized"},
-{EVP_R_IV_TOO_LARGE                      ,"iv too large"},
-{EVP_R_KEYGEN_FAILURE                    ,"keygen failure"},
-{EVP_R_MISSING_PARMATERS                 ,"missing parmaters"},
-{EVP_R_NO_DSA_PARAMETERS                 ,"no dsa parameters"},
-{EVP_R_NO_SIGN_FUNCTION_CONFIGURED       ,"no sign function configured"},
-{EVP_R_NO_VERIFY_FUNCTION_CONFIGURED     ,"no verify function configured"},
-{EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE         ,"pkcs8 unknown broken type"},
-{EVP_R_PUBLIC_KEY_NOT_RSA                ,"public key not rsa"},
-{EVP_R_UNKNOWN_PBE_ALGORITHM             ,"unknown pbe algorithm"},
-{EVP_R_UNSUPPORTED_CIPHER                ,"unsupported cipher"},
-{EVP_R_UNSUPPORTED_KEYLENGTH             ,"unsupported keylength"},
-{EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION,"unsupported key derivation function"},
-{EVP_R_UNSUPPORTED_KEY_SIZE              ,"unsupported key size"},
-{EVP_R_UNSUPPORTED_PRF                   ,"unsupported prf"},
-{EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM ,"unsupported private key algorithm"},
-{EVP_R_UNSUPPORTED_SALT_TYPE             ,"unsupported salt type"},
-{EVP_R_WRONG_FINAL_BLOCK_LENGTH          ,"wrong final block length"},
-{EVP_R_WRONG_PUBLIC_KEY_TYPE             ,"wrong public key type"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_EVP_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_EVP,EVP_str_functs);
-                ERR_load_strings(ERR_LIB_EVP,EVP_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
deleted file mode 100644
index 21eda418bc..0000000000
--- a/src/lib/libcrypto/evp/evp_key.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* crypto/evp/evp_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-
-/* should be init to zeros. */
-static char prompt_string[80];
-
-void EVP_set_pw_prompt(char *prompt)
-        {
-        if (prompt == NULL)
-                prompt_string[0]='\0';
-        else
-                strncpy(prompt_string,prompt,79);
-        }
-
-char *EVP_get_pw_prompt(void)
-        {
-        if (prompt_string[0] == '\0')
-                return(NULL);
-        else
-                return(prompt_string);
-        }
-
-#ifdef NO_DES
-int des_read_pw_string(char *buf,int len,const char *prompt,int verify);
-#endif
-
-int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
-        {
-        if ((prompt == NULL) && (prompt_string[0] != '\0'))
-                prompt=prompt_string;
-        return(des_read_pw_string(buf,len,prompt,verify));
-        }
-
-int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt,
-             unsigned char *data, int datal, int count, unsigned char *key,
-             unsigned char *iv)
-        {
-        EVP_MD_CTX c;
-        unsigned char md_buf[EVP_MAX_MD_SIZE];
-        int niv,nkey,addmd=0;
-        unsigned int mds=0,i;
-
-        nkey=type->key_len;
-        niv=type->iv_len;
-
-        if (data == NULL) return(nkey);
-
-        for (;;)
-                {
-                EVP_DigestInit(&c,md);
-                if (addmd++)
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                EVP_DigestUpdate(&c,data,datal);
-                if (salt != NULL)
-                        EVP_DigestUpdate(&c,salt,8);
-                EVP_DigestFinal(&c,&(md_buf[0]),&mds);
-
-                for (i=1; i<(unsigned int)count; i++)
-                        {
-                        EVP_DigestInit(&c,md);
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                        EVP_DigestFinal(&c,&(md_buf[0]),&mds);
-                        }
-                i=0;
-                if (nkey)
-                        {
-                        for (;;)
-                                {
-                                if (nkey == 0) break;
-                                if (i == mds) break;
-                                if (key != NULL)
-                                        *(key++)=md_buf[i];
-                                nkey--;
-                                i++;
-                                }
-                        }
-                if (niv && (i != mds))
-                        {
-                        for (;;)
-                                {
-                                if (niv == 0) break;
-                                if (i == mds) break;
-                                if (iv != NULL)
-                                        *(iv++)=md_buf[i];
-                                niv--;
-                                i++;
-                                }
-                        }
-                if ((nkey == 0) && (niv == 0)) break;
-                }
-        memset(&c,0,sizeof(c));
-        memset(&(md_buf[0]),0,EVP_MAX_MD_SIZE);
-        return(type->key_len);
-        }
-
diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c
deleted file mode 100644
index 3f9bf55828..0000000000
--- a/src/lib/libcrypto/evp/evp_lib.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* crypto/evp/evp_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 <openssl/evp.h>
-#include <openssl/objects.h>
-
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
-        {
-        int ret;
-
-        if (c->cipher->set_asn1_parameters != NULL)
-                ret=c->cipher->set_asn1_parameters(c,type);
-        else
-                ret=1;
-        return(ret);
-        }
-
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
-        {
-        int ret;
-
-        if (c->cipher->get_asn1_parameters != NULL)
-                ret=c->cipher->get_asn1_parameters(c,type);
-        else
-                ret=1;
-        return(ret);
-        }
-
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
-        {
-        int i=0,l;
-
-        if (type != NULL) 
-                {
-                l=EVP_CIPHER_CTX_iv_length(c);
-                i=ASN1_TYPE_get_octetstring(type,c->oiv,l);
-                if (i != l)
-                        return(-1);
-                else if (i > 0)
-                        memcpy(c->iv,c->oiv,l);
-                }
-        return(i);
-        }
-
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
-        {
-        int i=0,j;
-
-        if (type != NULL)
-                {
-                j=EVP_CIPHER_CTX_iv_length(c);
-                i=ASN1_TYPE_set_octetstring(type,c->oiv,j);
-                }
-        return(i);
-        }
-
-/* Convert the various cipher NIDs and dummies to a proper OID NID */
-int EVP_CIPHER_type(const EVP_CIPHER *ctx)
-{
-        int nid;
-        nid = EVP_CIPHER_nid(ctx);
-
-        switch(nid) {
-
-                case NID_rc2_cbc:
-                case NID_rc2_64_cbc:
-                case NID_rc2_40_cbc:
-
-                return NID_rc2_cbc;
-
-                case NID_rc4:
-                case NID_rc4_40:
-
-                return NID_rc4;
-
-                default:
-
-                return nid;
-        }
-}
-
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
deleted file mode 100644
index 353c3ad667..0000000000
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* evp_pbe.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include "cryptlib.h"
-
-/* Password based encryption (PBE) functions */
-
-static STACK *pbe_algs;
-
-/* Setup a cipher context from a PBE algorithm */
-
-typedef struct {
-int pbe_nid;
-EVP_CIPHER *cipher;
-EVP_MD *md;
-EVP_PBE_KEYGEN *keygen;
-} EVP_PBE_CTL;
-
-int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-             ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
-{
-
-        EVP_PBE_CTL *pbetmp, pbelu;
-        int i;
-        pbelu.pbe_nid = OBJ_obj2nid(pbe_obj);
-        if (pbelu.pbe_nid != NID_undef) i = sk_find(pbe_algs, (char *)&pbelu);
-        else i = -1;
-
-        if (i == -1) {
-                char obj_tmp[80];
-                EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_UNKNOWN_PBE_ALGORITHM);
-                if (!pbe_obj) strcpy (obj_tmp, "NULL");
-                else i2t_ASN1_OBJECT(obj_tmp, 80, pbe_obj);
-                ERR_add_error_data(2, "TYPE=", obj_tmp);
-                return 0;
-        }
-        if (passlen == -1) passlen = strlen(pass);
-        pbetmp = (EVP_PBE_CTL *)sk_value (pbe_algs, i);
-        i = (*pbetmp->keygen)(ctx, pass, passlen, param, pbetmp->cipher,
-                                                 pbetmp->md, en_de);
-        if (!i) {
-                EVPerr(EVP_F_EVP_PBE_CIPHERINIT,EVP_R_KEYGEN_FAILURE);
-                return 0;
-        }
-        return 1;       
-}
-
-static int pbe_cmp (EVP_PBE_CTL **pbe1, EVP_PBE_CTL **pbe2)
-{
-        return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
-}
-
-/* Add a PBE algorithm */
-
-int EVP_PBE_alg_add (int nid, EVP_CIPHER *cipher, EVP_MD *md,
-             EVP_PBE_KEYGEN *keygen)
-{
-        EVP_PBE_CTL *pbe_tmp;
-        if (!pbe_algs) pbe_algs = sk_new (pbe_cmp);
-        if (!(pbe_tmp = (EVP_PBE_CTL*) Malloc (sizeof(EVP_PBE_CTL)))) {
-                EVPerr(EVP_F_EVP_PBE_ALG_ADD,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        pbe_tmp->pbe_nid = nid;
-        pbe_tmp->cipher = cipher;
-        pbe_tmp->md = md;
-        pbe_tmp->keygen = keygen;
-        sk_push (pbe_algs, (char *)pbe_tmp);
-        return 1;
-}
-
-void EVP_PBE_cleanup(void)
-{
-        sk_pop_free(pbe_algs, FreeFunc);
-        pbe_algs = NULL;
-}
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c
deleted file mode 100644
index 421e452db1..0000000000
--- a/src/lib/libcrypto/evp/evp_pkey.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* evp_pkey.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "cryptlib.h"
-#include <openssl/x509.h>
-#include <openssl/rand.h>
-
-/* Extract a private key from a PKCS8 structure */
-
-EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
-{
-        EVP_PKEY *pkey;
-#ifndef NO_RSA
-        RSA *rsa;
-#endif
-#ifndef NO_DSA
-        DSA *dsa;
-        ASN1_INTEGER *dsapriv;
-        STACK *ndsa;
-        BN_CTX *ctx;
-        int plen;
-#endif
-        X509_ALGOR *a;
-        unsigned char *p;
-        int pkeylen;
-        char obj_tmp[80];
-
-        switch (p8->broken) {
-                case PKCS8_OK:
-                p = p8->pkey->value.octet_string->data;
-                pkeylen = p8->pkey->value.octet_string->length;
-                break;
-
-                case PKCS8_NO_OCTET:
-                p = p8->pkey->value.sequence->data;
-                pkeylen = p8->pkey->value.sequence->length;
-                break;
-
-                default:
-                EVPerr(EVP_F_EVP_PKCS82PKEY,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);
-                return NULL;
-                break;
-        }
-        if (!(pkey = EVP_PKEY_new())) {
-                EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        a = p8->pkeyalg;
-        switch (OBJ_obj2nid(a->algorithm))
-        {
-#ifndef NO_RSA
-                case NID_rsaEncryption:
-                if (!(rsa = d2i_RSAPrivateKey (NULL, &p, pkeylen))) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                        return NULL;
-                }
-                EVP_PKEY_assign_RSA (pkey, rsa);
-                break;
-#endif
-#ifndef NO_DSA
-                case NID_dsa:
-                /* PKCS#8 DSA is weird: you just get a private key integer
-                 * and parameters in the AlgorithmIdentifier the pubkey must
-                 * be recalculated.
-                 */
-        
-                /* Check for broken Netscape Database DSA PKCS#8, UGH! */
-                if(*p == (V_ASN1_SEQUENCE|V_ASN1_CONSTRUCTED)) {
-                    if(!(ndsa = ASN1_seq_unpack(p, pkeylen, 
-                                        (char *(*)())d2i_ASN1_INTEGER,
-                                                         ASN1_STRING_free))) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                        return NULL;
-                    }
-                    if(sk_num(ndsa) != 2 ) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                        sk_pop_free(ndsa, ASN1_STRING_free);
-                        return NULL;
-                    }
-                    dsapriv = (ASN1_INTEGER *) sk_pop(ndsa);
-                    sk_pop_free(ndsa, ASN1_STRING_free);
-                } else if (!(dsapriv=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                        return NULL;
-                }
-                /* Retrieve parameters */
-                if (a->parameter->type != V_ASN1_SEQUENCE) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_NO_DSA_PARAMETERS);
-                        return NULL;
-                }
-                p = a->parameter->value.sequence->data;
-                plen = a->parameter->value.sequence->length;
-                if (!(dsa = d2i_DSAparams (NULL, &p, plen))) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
-                        return NULL;
-                }
-                /* We have parameters now set private key */
-                if (!(dsa->priv_key = ASN1_INTEGER_to_BN(dsapriv, NULL))) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY,EVP_R_BN_DECODE_ERROR);
-                        DSA_free (dsa);
-                        return NULL;
-                }
-                /* Calculate public key (ouch!) */
-                if (!(dsa->pub_key = BN_new())) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
-                        DSA_free (dsa);
-                        return NULL;
-                }
-                if (!(ctx = BN_CTX_new())) {
-                        EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE);
-                        DSA_free (dsa);
-                        return NULL;
-                }
-                        
-                if (!BN_mod_exp(dsa->pub_key, dsa->g,
-                                                 dsa->priv_key, dsa->p, ctx)) {
-                        
-                        EVPerr(EVP_F_EVP_PKCS82PKEY,EVP_R_BN_PUBKEY_ERROR);
-                        BN_CTX_free (ctx);
-                        DSA_free (dsa);
-                        return NULL;
-                }
-
-                EVP_PKEY_assign_DSA (pkey, dsa);
-                BN_CTX_free (ctx);
-                break;
-#endif
-                default:
-                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
-                if (!a->algorithm) strcpy (obj_tmp, "NULL");
-                else i2t_ASN1_OBJECT(obj_tmp, 80, a->algorithm);
-                ERR_add_error_data(2, "TYPE=", obj_tmp);
-                EVP_PKEY_free (pkey);
-                return NULL;
-        }
-        return pkey;
-}
-
-/* Turn a private key into a PKCS8 structure */
-
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
-{
-        PKCS8_PRIV_KEY_INFO *p8;
-#ifndef NO_DSA
-        ASN1_INTEGER *dpkey;
-        unsigned char *p, *q;
-        int len;
-#endif
-        if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) {        
-                EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        ASN1_INTEGER_set (p8->version, 0);
-        if (!(p8->pkeyalg->parameter = ASN1_TYPE_new ())) {
-                EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
-                PKCS8_PRIV_KEY_INFO_free (p8);
-                return NULL;
-        }
-        switch (EVP_PKEY_type(pkey->type)) {
-#ifndef NO_RSA
-                case EVP_PKEY_RSA:
-
-                p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption);
-                p8->pkeyalg->parameter->type = V_ASN1_NULL;
-                if (!ASN1_pack_string ((char *)pkey, i2d_PrivateKey,
-                                         &p8->pkey->value.octet_string)) {
-                        EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
-                        PKCS8_PRIV_KEY_INFO_free (p8);
-                        return NULL;
-                }
-                break;
-#endif
-#ifndef NO_DSA
-                case EVP_PKEY_DSA:
-                p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
-
-                /* get paramaters and place in AlgorithmIdentifier */
-                len = i2d_DSAparams (pkey->pkey.dsa, NULL);
-                if (!(p = Malloc(len))) {
-                        EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
-                        PKCS8_PRIV_KEY_INFO_free (p8);
-                        return NULL;
-                }
-                q = p;
-                i2d_DSAparams (pkey->pkey.dsa, &q);
-                p8->pkeyalg->parameter->type = V_ASN1_SEQUENCE;
-                p8->pkeyalg->parameter->value.sequence = ASN1_STRING_new();
-                ASN1_STRING_set(p8->pkeyalg->parameter->value.sequence, p, len);
-                Free(p);
-                /* Get private key into an integer and pack */
-                if (!(dpkey = BN_to_ASN1_INTEGER (pkey->pkey.dsa->priv_key, NULL))) {
-                        EVPerr(EVP_F_EVP_PKEY2PKCS8,EVP_R_ENCODE_ERROR);
-                        PKCS8_PRIV_KEY_INFO_free (p8);
-                        return NULL;
-                }
-                
-                if (!ASN1_pack_string((char *)dpkey, i2d_ASN1_INTEGER,
-                                         &p8->pkey->value.octet_string)) {
-                        EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
-                        ASN1_INTEGER_free (dpkey);
-                        PKCS8_PRIV_KEY_INFO_free (p8);
-                        return NULL;
-                }
-                ASN1_INTEGER_free (dpkey);
-                break;
-#endif
-                default:
-                EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
-                PKCS8_PRIV_KEY_INFO_free (p8);
-                return NULL;
-        }
-        p8->pkey->type = V_ASN1_OCTET_STRING;
-        RAND_seed (p8->pkey->value.octet_string->data,
-                                         p8->pkey->value.octet_string->length);
-        return p8;
-}
-
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
-{
-        switch (broken) {
-
-                case PKCS8_OK:
-                p8->broken = PKCS8_OK;
-                return p8;
-                break;
-
-                case PKCS8_NO_OCTET:
-                p8->broken = PKCS8_NO_OCTET;
-                p8->pkey->type = V_ASN1_SEQUENCE;
-                return p8;
-                break;
-
-                default:
-                EVPerr(EVP_F_EVP_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);
-                return NULL;
-                break;
-                
-        }
-}
-
-
diff --git a/src/lib/libcrypto/evp/m_dss.c b/src/lib/libcrypto/evp/m_dss.c
deleted file mode 100644
index 8ea826868e..0000000000
--- a/src/lib/libcrypto/evp/m_dss.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/evp/m_dss.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-#ifndef NO_SHA
-static EVP_MD dsa_md=
-        {
-        NID_dsaWithSHA,
-        NID_dsaWithSHA,
-        SHA_DIGEST_LENGTH,
-        SHA1_Init,
-        SHA1_Update,
-        SHA1_Final,
-        EVP_PKEY_DSA_method,
-        SHA_CBLOCK,
-        sizeof(EVP_MD *)+sizeof(SHA_CTX),
-        };
-
-EVP_MD *EVP_dss(void)
-        {
-        return(&dsa_md);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/m_dss1.c b/src/lib/libcrypto/evp/m_dss1.c
deleted file mode 100644
index 9d8d1ce23e..0000000000
--- a/src/lib/libcrypto/evp/m_dss1.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/evp/m_dss1.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_SHA
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static EVP_MD dss1_md=
-        {
-        NID_dsa,
-        NID_dsaWithSHA1,
-        SHA_DIGEST_LENGTH,
-        SHA1_Init,
-        SHA1_Update,
-        SHA1_Final,
-        EVP_PKEY_DSA_method,
-        SHA_CBLOCK,
-        sizeof(EVP_MD *)+sizeof(SHA_CTX),
-        };
-
-EVP_MD *EVP_dss1(void)
-        {
-        return(&dss1_md);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/m_md5.c b/src/lib/libcrypto/evp/m_md5.c
deleted file mode 100644
index 9fc9530127..0000000000
--- a/src/lib/libcrypto/evp/m_md5.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/evp/m_md5.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_MD5
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static EVP_MD md5_md=
-        {
-        NID_md5,
-        NID_md5WithRSAEncryption,
-        MD5_DIGEST_LENGTH,
-        MD5_Init,
-        MD5_Update,
-        MD5_Final,
-        EVP_PKEY_RSA_method,
-        MD5_CBLOCK,
-        sizeof(EVP_MD *)+sizeof(MD5_CTX),
-        };
-
-EVP_MD *EVP_md5(void)
-        {
-        return(&md5_md);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/m_null.c b/src/lib/libcrypto/evp/m_null.c
deleted file mode 100644
index e2dadf3dab..0000000000
--- a/src/lib/libcrypto/evp/m_null.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/evp/m_null.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static void function(void)
-        {
-        }
-
-static EVP_MD null_md=
-        {
-        NID_undef,
-        NID_undef,
-        0,
-        function,
-        function,
-        function,
-        
-        EVP_PKEY_NULL_method,
-        0,
-        sizeof(EVP_MD *),
-        };
-
-EVP_MD *EVP_md_null(void)
-        {
-        return(&null_md);
-        }
-
-
diff --git a/src/lib/libcrypto/evp/m_ripemd.c b/src/lib/libcrypto/evp/m_ripemd.c
deleted file mode 100644
index 3d781a4e8d..0000000000
--- a/src/lib/libcrypto/evp/m_ripemd.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* crypto/evp/m_ripemd.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_RIPEMD
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/ripemd.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static EVP_MD ripemd160_md=
-        {
-        NID_ripemd160,
-        NID_ripemd160WithRSA,
-        RIPEMD160_DIGEST_LENGTH,
-        RIPEMD160_Init,
-        RIPEMD160_Update,
-        RIPEMD160_Final,
-        EVP_PKEY_RSA_method,
-        RIPEMD160_CBLOCK,
-        sizeof(EVP_MD *)+sizeof(RIPEMD160_CTX),
-        };
-
-EVP_MD *EVP_ripemd160(void)
-        {
-        return(&ripemd160_md);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
deleted file mode 100644
index 57a1ab0cce..0000000000
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/evp/m_sha1.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_SHA
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static EVP_MD sha1_md=
-        {
-        NID_sha1,
-        NID_sha1WithRSAEncryption,
-        SHA_DIGEST_LENGTH,
-        SHA1_Init,
-        SHA1_Update,
-        SHA1_Final,
-        EVP_PKEY_RSA_method,
-        SHA_CBLOCK,
-        sizeof(EVP_MD *)+sizeof(SHA_CTX),
-        };
-
-EVP_MD *EVP_sha1(void)
-        {
-        return(&sha1_md);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c
deleted file mode 100644
index 3e8f460328..0000000000
--- a/src/lib/libcrypto/evp/names.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* crypto/evp/names.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_add_cipher(EVP_CIPHER *c)
-        {
-        int r;
-
-        r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
-        if (r == 0) return(0);
-        r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(char *)c);
-        return(r);
-        }
-
-int EVP_add_digest(EVP_MD *md)
-        {
-        int r;
-        const char *name;
-
-        name=OBJ_nid2sn(md->type);
-        r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(char *)md);
-        if (r == 0) return(0);
-        r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(char *)md);
-        if (r == 0) return(0);
-
-        if (md->type != md->pkey_type)
-                {
-                r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
-                        OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
-                if (r == 0) return(0);
-                r=OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
-                        OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
-                }
-        return(r);
-        }
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
-        {
-        const EVP_CIPHER *cp;
-
-        cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
-        return(cp);
-        }
-
-const EVP_MD *EVP_get_digestbyname(const char *name)
-        {
-        const EVP_MD *cp;
-
-        cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
-        return(cp);
-        }
-
-void EVP_cleanup(void)
-        {
-        OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
-        OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
-        EVP_PBE_cleanup();
-        }
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
deleted file mode 100644
index e3dae52d4d..0000000000
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* p5_crpt.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/x509.h>
-#include <openssl/evp.h>
-#include "cryptlib.h"
-
-/* PKCS#5 v1.5 compatible PBE functions: see PKCS#5 v2.0 for more info.
- */
-
-void PKCS5_PBE_add(void)
-{
-#ifndef NO_DES
-#  ifndef NO_MD5
-EVP_PBE_alg_add(NID_pbeWithMD5AndDES_CBC, EVP_des_cbc(), EVP_md5(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef NO_MD2
-EVP_PBE_alg_add(NID_pbeWithMD2AndDES_CBC, EVP_des_cbc(), EVP_md2(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef NO_SHA
-EVP_PBE_alg_add(NID_pbeWithSHA1AndDES_CBC, EVP_des_cbc(), EVP_sha1(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#endif
-#ifndef NO_RC2
-#  ifndef NO_MD5
-EVP_PBE_alg_add(NID_pbeWithMD5AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md5(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef NO_MD2
-EVP_PBE_alg_add(NID_pbeWithMD2AndRC2_CBC, EVP_rc2_64_cbc(), EVP_md2(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#  ifndef NO_SHA
-EVP_PBE_alg_add(NID_pbeWithSHA1AndRC2_CBC, EVP_rc2_64_cbc(), EVP_sha1(),
-                                                         PKCS5_PBE_keyivgen);
-#  endif
-#endif
-#ifndef NO_HMAC
-EVP_PBE_alg_add(NID_pbes2, NULL, NULL, PKCS5_v2_PBE_keyivgen);
-#endif
-}
-
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,
-                         int en_de)
-{
-        EVP_MD_CTX ctx;
-        unsigned char md_tmp[EVP_MAX_MD_SIZE];
-        unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
-        int i;
-        PBEPARAM *pbe;
-        int saltlen, iter;
-        unsigned char *salt, *pbuf;
-
-        /* Extract useful info from parameter */
-        pbuf = param->value.sequence->data;
-        if (!param || (param->type != V_ASN1_SEQUENCE) ||
-           !(pbe = d2i_PBEPARAM (NULL, &pbuf, param->value.sequence->length))) {
-                EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                return 0;
-        }
-
-        if (!pbe->iter) iter = 1;
-        else iter = ASN1_INTEGER_get (pbe->iter);
-        salt = pbe->salt->data;
-        saltlen = pbe->salt->length;
-
-        EVP_DigestInit (&ctx, md);
-        EVP_DigestUpdate (&ctx, pass, passlen);
-        EVP_DigestUpdate (&ctx, salt, saltlen);
-        PBEPARAM_free(pbe);
-        EVP_DigestFinal (&ctx, md_tmp, NULL);
-        for (i = 1; i < iter; i++) {
-                EVP_DigestInit(&ctx, md);
-                EVP_DigestUpdate(&ctx, md_tmp, EVP_MD_size(md));
-                EVP_DigestFinal (&ctx, md_tmp, NULL);
-        }
-        memcpy (key, md_tmp, EVP_CIPHER_key_length(cipher));
-        memcpy (iv, md_tmp + (16 - EVP_CIPHER_iv_length(cipher)),
-                                                 EVP_CIPHER_iv_length(cipher));
-        EVP_CipherInit(cctx, cipher, key, iv, en_de);
-        memset(md_tmp, 0, EVP_MAX_MD_SIZE);
-        memset(key, 0, EVP_MAX_KEY_LENGTH);
-        memset(iv, 0, EVP_MAX_IV_LENGTH);
-        return 1;
-}
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
deleted file mode 100644
index 27a2c518be..0000000000
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* p5_crpt2.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#if !defined(NO_HMAC) && !defined(NO_SHA)
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/x509.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include "cryptlib.h"
-
-/* set this to print out info about the keygen algorithm */
-/* #define DEBUG_PKCS5V2 */
-
-#ifdef DEBUG_PKCS5V2
-        static void h__dump (const unsigned char *p, int len);
-#endif
-
-/* This is an implementation of PKCS#5 v2.0 password based encryption key
- * derivation function PBKDF2 using the only currently defined function HMAC
- * with SHA1. Verified against test vectors posted by Peter Gutmann
- * <pgut001@cs.auckland.ac.nz> to the PKCS-TNG <pkcs-tng@rsa.com> mailing list.
- */
-
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out)
-{
-        unsigned char digtmp[SHA_DIGEST_LENGTH], *p, itmp[4];
-        int cplen, j, k, tkeylen;
-        unsigned long i = 1;
-        HMAC_CTX hctx;
-        p = out;
-        tkeylen = keylen;
-        if(passlen == -1) passlen = strlen(pass);
-        while(tkeylen) {
-                if(tkeylen > SHA_DIGEST_LENGTH) cplen = SHA_DIGEST_LENGTH;
-                else cplen = tkeylen;
-                /* We are unlikely to ever use more than 256 blocks (5120 bits!)
-                 * but just in case...
-                 */
-                itmp[0] = (unsigned char)((i >> 24) & 0xff);
-                itmp[1] = (unsigned char)((i >> 16) & 0xff);
-                itmp[2] = (unsigned char)((i >> 8) & 0xff);
-                itmp[3] = (unsigned char)(i & 0xff);
-                HMAC_Init(&hctx, pass, passlen, EVP_sha1());
-                HMAC_Update(&hctx, salt, saltlen);
-                HMAC_Update(&hctx, itmp, 4);
-                HMAC_Final(&hctx, digtmp, NULL);
-                memcpy(p, digtmp, cplen);
-                for(j = 1; j < iter; j++) {
-                        HMAC(EVP_sha1(), pass, passlen,
-                                 digtmp, SHA_DIGEST_LENGTH, digtmp, NULL);
-                        for(k = 0; k < cplen; k++) p[k] ^= digtmp[k];
-                }
-                tkeylen-= cplen;
-                i++;
-                p+= cplen;
-        }
-        HMAC_cleanup(&hctx);
-#ifdef DEBUG_PKCS5V2
-        fprintf(stderr, "Password:\n");
-        h__dump (pass, passlen);
-        fprintf(stderr, "Salt:\n");
-        h__dump (salt, saltlen);
-        fprintf(stderr, "Iteration count %d\n", iter);
-        fprintf(stderr, "Key:\n");
-        h__dump (out, keylen);
-#endif
-        return 1;
-}
-
-#ifdef DO_TEST
-main()
-{
-        unsigned char out[4];
-        unsigned char salt[] = {0x12, 0x34, 0x56, 0x78};
-        PKCS5_PBKDF2_HMAC_SHA1("password", -1, salt, 4, 5, 4, out);
-        fprintf(stderr, "Out %02X %02X %02X %02X\n",
-                                         out[0], out[1], out[2], out[3]);
-}
-
-#endif
-
-/* Now the key derivation function itself. This is a bit evil because
- * it has to check the ASN1 parameters are valid: and there are quite a
- * few of them...
- */
-
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, EVP_CIPHER *c, EVP_MD *md,
-                         int en_de)
-{
-        unsigned char *pbuf, *salt, key[EVP_MAX_KEY_LENGTH];
-        int saltlen, keylen, iter, plen;
-        PBE2PARAM *pbe2 = NULL;
-        const EVP_CIPHER *cipher;
-        PBKDF2PARAM *kdf = NULL;
-
-        pbuf = param->value.sequence->data;
-        plen = param->value.sequence->length;
-        if(!param || (param->type != V_ASN1_SEQUENCE) ||
-                                   !(pbe2 = d2i_PBE2PARAM(NULL, &pbuf, plen))) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                return 0;
-        }
-
-        /* See if we recognise the key derivation function */
-
-        if(OBJ_obj2nid(pbe2->keyfunc->algorithm) != NID_id_pbkdf2) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
-                                EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION);
-                goto err;
-        }
-
-        /* lets see if we recognise the encryption algorithm.
-         */
-
-        cipher = EVP_get_cipherbyname(
-                        OBJ_nid2sn(OBJ_obj2nid(pbe2->encryption->algorithm)));
-
-        if(!cipher) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
-                                                EVP_R_UNSUPPORTED_CIPHER);
-                goto err;
-        }
-
-        /* Fixup cipher based on AlgorithmIdentifier */
-        EVP_CipherInit(ctx, cipher, NULL, NULL, en_de);
-        if(EVP_CIPHER_asn1_to_param(ctx, pbe2->encryption->parameter) < 0) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
-                                        EVP_R_CIPHER_PARAMETER_ERROR);
-                goto err;
-        }
-        keylen = EVP_CIPHER_CTX_key_length(ctx);
-
-        /* Now decode key derivation function */
-
-        pbuf = pbe2->keyfunc->parameter->value.sequence->data;
-        plen = pbe2->keyfunc->parameter->value.sequence->length;
-        if(!pbe2->keyfunc->parameter ||
-                 (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE) ||
-                                !(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                goto err;
-        }
-
-        PBE2PARAM_free(pbe2);
-        pbe2 = NULL;
-
-        /* Now check the parameters of the kdf */
-
-        if(kdf->keylength && (ASN1_INTEGER_get(kdf->keylength) != keylen)){
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
-                                                EVP_R_UNSUPPORTED_KEYLENGTH);
-                goto err;
-        }
-
-        if(kdf->prf && (OBJ_obj2nid(kdf->prf->algorithm) != NID_hmacWithSHA1)) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_UNSUPPORTED_PRF);
-                goto err;
-        }
-
-        if(kdf->salt->type != V_ASN1_OCTET_STRING) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
-                                                EVP_R_UNSUPPORTED_SALT_TYPE);
-                goto err;
-        }
-
-        /* it seems that its all OK */
-        salt = kdf->salt->value.octet_string->data;
-        saltlen = kdf->salt->value.octet_string->length;
-        iter = ASN1_INTEGER_get(kdf->iter);
-        PKCS5_PBKDF2_HMAC_SHA1(pass, passlen, salt, saltlen, iter, keylen, key);
-        EVP_CipherInit(ctx, NULL, key, NULL, en_de);
-        memset(key, 0, keylen);
-        PBKDF2PARAM_free(kdf);
-        return 1;
-
-        err:
-        PBE2PARAM_free(pbe2);
-        PBKDF2PARAM_free(kdf);
-        return 0;
-}
-
-#ifdef DEBUG_PKCS5V2
-static void h__dump (const unsigned char *p, int len)
-{
-        for (; len --; p++) fprintf(stderr, "%02X ", *p);
-        fprintf(stderr, "\n");
-}
-#endif
-#endif
diff --git a/src/lib/libcrypto/evp/p_dec.c b/src/lib/libcrypto/evp/p_dec.c
deleted file mode 100644
index 57b5daa453..0000000000
--- a/src/lib/libcrypto/evp/p_dec.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* crypto/evp/p_dec.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 <openssl/rand.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_PKEY_decrypt(unsigned char *key, unsigned char *ek, int ekl,
-             EVP_PKEY *priv)
-        {
-        int ret= -1;
-        
-#ifndef NO_RSA
-        if (priv->type != EVP_PKEY_RSA)
-                {
-#endif
-                EVPerr(EVP_F_EVP_PKEY_DECRYPT,EVP_R_PUBLIC_KEY_NOT_RSA);
-#ifndef NO_RSA
-                goto err;
-                }
-
-        ret=RSA_private_decrypt(ekl,ek,key,priv->pkey.rsa,RSA_PKCS1_PADDING);
-err:
-#endif
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/evp/p_enc.c b/src/lib/libcrypto/evp/p_enc.c
deleted file mode 100644
index 4cf6acaf5d..0000000000
--- a/src/lib/libcrypto/evp/p_enc.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* crypto/evp/p_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 <openssl/rand.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_PKEY_encrypt(unsigned char *ek, unsigned char *key, int key_len,
-             EVP_PKEY *pubk)
-        {
-        int ret=0;
-        
-#ifndef NO_RSA
-        if (pubk->type != EVP_PKEY_RSA)
-                {
-#endif
-                EVPerr(EVP_F_EVP_PKEY_ENCRYPT,EVP_R_PUBLIC_KEY_NOT_RSA);
-#ifndef NO_RSA
-                goto err;
-                }
-        ret=RSA_public_encrypt(key_len,key,ek,pubk->pkey.rsa,RSA_PKCS1_PADDING);
-err:
-#endif
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
deleted file mode 100644
index 3422b77de6..0000000000
--- a/src/lib/libcrypto/evp/p_lib.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* crypto/evp/p_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 <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-static void EVP_PKEY_free_it(EVP_PKEY *x);
-int EVP_PKEY_bits(EVP_PKEY *pkey)
-        {
-#ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
-                return(BN_num_bits(pkey->pkey.rsa->n));
-        else
-#endif
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                return(BN_num_bits(pkey->pkey.dsa->p));
-#endif
-        return(0);
-        }
-
-int EVP_PKEY_size(EVP_PKEY *pkey)
-        {
-        if (pkey == NULL)
-                return(0);
-#ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
-                return(RSA_size(pkey->pkey.rsa));
-        else
-#endif
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                return(DSA_size(pkey->pkey.dsa));
-#endif
-        return(0);
-        }
-
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
-        {
-#ifndef NO_DSA
-        if (pkey->type == EVP_PKEY_DSA)
-                {
-                int ret=pkey->save_parameters=mode;
-
-                if (mode >= 0)
-                        pkey->save_parameters=mode;
-                return(ret);
-                }
-#endif
-        return(0);
-        }
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, EVP_PKEY *from)
-        {
-        if (to->type != from->type)
-                {
-                EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_DIFFERENT_KEY_TYPES);
-                goto err;
-                }
-
-        if (EVP_PKEY_missing_parameters(from))
-                {
-                EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARMATERS);
-                goto err;
-                }
-#ifndef NO_DSA
-        if (to->type == EVP_PKEY_DSA)
-                {
-                BIGNUM *a;
-
-                if ((a=BN_dup(from->pkey.dsa->p)) == NULL) goto err;
-                if (to->pkey.dsa->p != NULL) BN_free(to->pkey.dsa->p);
-                to->pkey.dsa->p=a;
-
-                if ((a=BN_dup(from->pkey.dsa->q)) == NULL) goto err;
-                if (to->pkey.dsa->q != NULL) BN_free(to->pkey.dsa->q);
-                to->pkey.dsa->q=a;
-
-                if ((a=BN_dup(from->pkey.dsa->g)) == NULL) goto err;
-                if (to->pkey.dsa->g != NULL) BN_free(to->pkey.dsa->g);
-                to->pkey.dsa->g=a;
-                }
-#endif
-        return(1);
-err:
-        return(0);
-        }
-
-int EVP_PKEY_missing_parameters(EVP_PKEY *pkey)
-        {
-#ifndef NO_DSA
-        if (pkey->type == EVP_PKEY_DSA)
-                {
-                DSA *dsa;
-
-                dsa=pkey->pkey.dsa;
-                if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-                        return(1);
-                }
-#endif
-        return(0);
-        }
-
-int EVP_PKEY_cmp_parameters(EVP_PKEY *a, EVP_PKEY *b)
-        {
-#ifndef NO_DSA
-        if ((a->type == EVP_PKEY_DSA) && (b->type == EVP_PKEY_DSA))
-                {
-                if (    BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) ||
-                        BN_cmp(a->pkey.dsa->q,b->pkey.dsa->q) ||
-                        BN_cmp(a->pkey.dsa->g,b->pkey.dsa->g))
-                        return(0);
-                else
-                        return(1);
-                }
-#endif
-        return(-1);
-        }
-
-EVP_PKEY *EVP_PKEY_new(void)
-        {
-        EVP_PKEY *ret;
-
-        ret=(EVP_PKEY *)Malloc(sizeof(EVP_PKEY));
-        if (ret == NULL)
-                {
-                EVPerr(EVP_F_EVP_PKEY_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        ret->type=EVP_PKEY_NONE;
-        ret->references=1;
-        ret->pkey.ptr=NULL;
-        ret->attributes=NULL;
-        ret->save_parameters=1;
-        return(ret);
-        }
-
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
-        {
-        if (pkey == NULL) return(0);
-        if (pkey->pkey.ptr != NULL)
-                EVP_PKEY_free_it(pkey);
-        pkey->type=EVP_PKEY_type(type);
-        pkey->save_type=type;
-        pkey->pkey.ptr=key;
-        return(1);
-        }
-
-int EVP_PKEY_type(int type)
-        {
-        switch (type)
-                {
-        case EVP_PKEY_RSA:
-        case EVP_PKEY_RSA2:
-                return(EVP_PKEY_RSA);
-        case EVP_PKEY_DSA:
-        case EVP_PKEY_DSA1:
-        case EVP_PKEY_DSA2:
-        case EVP_PKEY_DSA3:
-        case EVP_PKEY_DSA4:
-                return(EVP_PKEY_DSA);
-        case EVP_PKEY_DH:
-                return(EVP_PKEY_DH);
-        default:
-                return(NID_undef);
-                }
-        }
-
-void EVP_PKEY_free(EVP_PKEY *x)
-        {
-        int i;
-
-        if (x == NULL) return;
-
-        i=CRYPTO_add(&x->references,-1,CRYPTO_LOCK_EVP_PKEY);
-#ifdef REF_PRINT
-        REF_PRINT("EVP_PKEY",x);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"EVP_PKEY_free, bad reference count\n");
-                abort();
-                }
-#endif
-        EVP_PKEY_free_it(x);
-        Free((char *)x);
-        }
-
-static void EVP_PKEY_free_it(EVP_PKEY *x)
-        {
-        switch (x->type)
-                {
-#ifndef NO_RSA
-        case EVP_PKEY_RSA:
-        case EVP_PKEY_RSA2:
-                RSA_free(x->pkey.rsa);
-                break;
-#endif
-#ifndef NO_DSA
-        case EVP_PKEY_DSA:
-        case EVP_PKEY_DSA2:
-        case EVP_PKEY_DSA3:
-        case EVP_PKEY_DSA4:
-                DSA_free(x->pkey.dsa);
-                break;
-#endif
-#ifndef NO_DH
-        case EVP_PKEY_DH:
-                DH_free(x->pkey.dh);
-                break;
-#endif
-                }
-        }
-
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
deleted file mode 100644
index ddb9fd6942..0000000000
--- a/src/lib/libcrypto/evp/p_open.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* crypto/evp/p_open.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_RSA
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
-             int ekl, unsigned char *iv, EVP_PKEY *priv)
-        {
-        unsigned char *key=NULL;
-        int i,size=0,ret=0;
-        
-        if (priv->type != EVP_PKEY_RSA)
-                {
-                EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);
-                ret= -1;
-                goto err;
-                }
-
-        size=RSA_size(priv->pkey.rsa);
-        key=(unsigned char *)Malloc(size+2);
-        if (key == NULL)
-                {
-                /* ERROR */
-                EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
-                ret= -1;
-                goto err;
-                }
-
-        i=EVP_PKEY_decrypt(key,ek,ekl,priv);
-        if (i != type->key_len)
-                {
-                /* ERROR */
-                goto err;
-                }
-
-        EVP_CIPHER_CTX_init(ctx);
-        EVP_DecryptInit(ctx,type,key,iv);
-        ret=1;
-err:
-        if (key != NULL) memset(key,0,size);
-        Free(key);
-        return(ret);
-        }
-
-int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
-        int i;
-
-        i=EVP_DecryptFinal(ctx,out,outl);
-        EVP_DecryptInit(ctx,NULL,NULL,NULL);
-        return(i);
-        }
-#endif
diff --git a/src/lib/libcrypto/evp/p_seal.c b/src/lib/libcrypto/evp/p_seal.c
deleted file mode 100644
index 09b46f4b0e..0000000000
--- a/src/lib/libcrypto/evp/p_seal.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* crypto/evp/p_seal.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 <openssl/rand.h>
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
-             int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk)
-        {
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        int i;
-        
-        if (npubk <= 0) return(0);
-        RAND_bytes(key,EVP_MAX_KEY_LENGTH);
-        if (type->iv_len > 0)
-                RAND_bytes(iv,type->iv_len);
-
-        EVP_CIPHER_CTX_init(ctx);
-        EVP_EncryptInit(ctx,type,key,iv);
-
-        for (i=0; i<npubk; i++)
-                {
-                ekl[i]=EVP_PKEY_encrypt(ek[i],key,EVP_CIPHER_key_length(type),
-                        pubk[i]);
-                if (ekl[i] <= 0) return(-1);
-                }
-        return(npubk);
-        }
-
-/* MACRO
-void EVP_SealUpdate(ctx,out,outl,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-int *outl;
-unsigned char *in;
-int inl;
-        {
-        EVP_EncryptUpdate(ctx,out,outl,in,inl);
-        }
-*/
-
-void EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
-        EVP_EncryptFinal(ctx,out,outl);
-        EVP_EncryptInit(ctx,NULL,NULL,NULL);
-        }
diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
deleted file mode 100644
index 1fa32ac17e..0000000000
--- a/src/lib/libcrypto/evp/p_sign.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/evp/p_sign.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-#ifdef undef
-void EVP_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
-        {
-        EVP_DigestInit(ctx,type);
-        }
-
-void EVP_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
-             unsigned int count)
-        {
-        EVP_DigestUpdate(ctx,data,count);
-        }
-#endif
-
-int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
-             EVP_PKEY *pkey)
-        {
-        unsigned char m[EVP_MAX_MD_SIZE];
-        unsigned int m_len;
-        int i,ok=0,v;
-        MS_STATIC EVP_MD_CTX tmp_ctx;
-
-        *siglen=0;
-        EVP_MD_CTX_copy(&tmp_ctx,ctx);   
-        EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
-        for (i=0; i<4; i++)
-                {
-                v=ctx->digest->required_pkey_type[i];
-                if (v == 0) break;
-                if (pkey->type == v)
-                        {
-                        ok=1;
-                        break;
-                        }
-                }
-        if (!ok)
-                {
-                EVPerr(EVP_F_EVP_SIGNFINAL,EVP_R_WRONG_PUBLIC_KEY_TYPE);
-                return(0);
-                }
-        if (ctx->digest->sign == NULL)
-                {
-                EVPerr(EVP_F_EVP_SIGNFINAL,EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
-                return(0);
-                }
-        return(ctx->digest->sign(ctx->digest->type,m,m_len,sigret,siglen,
-                pkey->pkey.ptr));
-        }
-
diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
deleted file mode 100644
index dcb54f3abb..0000000000
--- a/src/lib/libcrypto/evp/p_verify.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/evp/p_verify.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int EVP_VerifyFinal(EVP_MD_CTX *ctx, unsigned char *sigbuf,
-             unsigned int siglen, EVP_PKEY *pkey)
-        {
-        unsigned char m[EVP_MAX_MD_SIZE];
-        unsigned int m_len;
-        int i,ok=0,v;
-        MS_STATIC EVP_MD_CTX tmp_ctx;
-
-        for (i=0; i<4; i++)
-                {
-                v=ctx->digest->required_pkey_type[i];
-                if (v == 0) break;
-                if (pkey->type == v)
-                        {
-                        ok=1;
-                        break;
-                        }
-                }
-        if (!ok)
-                {
-                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_WRONG_PUBLIC_KEY_TYPE);
-                return(-1);
-                }
-        EVP_MD_CTX_copy(&tmp_ctx,ctx);     
-        EVP_DigestFinal(&tmp_ctx,&(m[0]),&m_len);
-        if (ctx->digest->verify == NULL)
-                {
-                EVPerr(EVP_F_EVP_VERIFYFINAL,EVP_R_NO_VERIFY_FUNCTION_CONFIGURED);
-                return(0);
-                }
-
-        return(ctx->digest->verify(ctx->digest->type,m,m_len,
-                sigbuf,siglen,pkey->pkey.ptr));
-        }
-
diff --git a/src/lib/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
deleted file mode 100644
index 176574766b..0000000000
--- a/src/lib/libcrypto/ex_data.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* crypto/ex_data.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 <openssl/buffer.h>
-#include <openssl/bio.h>
-#include <openssl/lhash.h>
-#include "cryptlib.h"
-
-int CRYPTO_get_ex_new_index(int idx, STACK **skp, long argl, char *argp,
-             int (*new_func)(), int (*dup_func)(), void (*free_func)())
-        {
-        int ret= -1;
-        CRYPTO_EX_DATA_FUNCS *a;
-
-        MemCheck_off();
-        if (*skp == NULL)
-                *skp=sk_new_null();
-        if (*skp == NULL)
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        a=(CRYPTO_EX_DATA_FUNCS *)Malloc(sizeof(CRYPTO_EX_DATA_FUNCS));
-        if (a == NULL)
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        a->argl=argl;
-        a->argp=argp;
-        a->new_func=new_func;
-        a->dup_func=dup_func;
-        a->free_func=free_func;
-        while (sk_num(*skp) <= idx)
-                {
-                if (!sk_push(*skp,NULL))
-                        {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
-                        Free(a);
-                        goto err;
-                        }
-                }
-        sk_set(*skp,idx, (char *)a);
-        ret=idx;
-err:
-        MemCheck_on();
-        return(idx);
-        }
-
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, char *val)
-        {
-        int i;
-
-        if (ad->sk == NULL)
-                {
-                if ((ad->sk=sk_new_null()) == NULL)
-                        {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
-                        return(0);
-                        }
-                }
-        i=sk_num(ad->sk);
-
-        while (i <= idx)
-                {
-                if (!sk_push(ad->sk,NULL))
-                        {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,ERR_R_MALLOC_FAILURE);
-                        return(0);
-                        }
-                i++;
-                }
-        sk_set(ad->sk,idx,val);
-        return(1);
-        }
-
-char *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad, int idx)
-        {
-        if (ad->sk == NULL)
-                return(0);
-        else if (idx >= sk_num(ad->sk))
-                return(0);
-        else
-                return(sk_value(ad->sk,idx));
-        }
-
-/* The callback is called with the 'object', which is the original data object
- * being duplicated, a pointer to the
- * 'new' object to be inserted, the index, and the argi/argp
- */
-int CRYPTO_dup_ex_data(STACK *meth, CRYPTO_EX_DATA *to,
-             CRYPTO_EX_DATA *from)
-        {
-        int i,j,m,r;
-        CRYPTO_EX_DATA_FUNCS *mm;
-        char *from_d;
-
-        if (meth == NULL) return(1);
-        if (from->sk == NULL) return(1);
-        m=sk_num(meth);
-        j=sk_num(from->sk);
-        for (i=0; i<j; i++)
-                {
-                from_d=CRYPTO_get_ex_data(from,i);
-                if (i < m)
-                        {
-                        mm=(CRYPTO_EX_DATA_FUNCS *)sk_value(meth,i);
-                        if (mm->dup_func != NULL)
-                                r=mm->dup_func(to,from,(char **)&from_d,i,
-                                        mm->argl,mm->argp);
-                        }
-                CRYPTO_set_ex_data(to,i,from_d);
-                }
-        return(1);
-        }
-
-/* Call each free callback */
-void CRYPTO_free_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
-        {
-        CRYPTO_EX_DATA_FUNCS *m;
-        char *ptr;
-        int i,max;
-
-        if (meth != NULL)
-                {
-                max=sk_num(meth);
-                for (i=0; i<max; i++)
-                        {
-                        m=(CRYPTO_EX_DATA_FUNCS *)sk_value(meth,i);
-                        if ((m != NULL) && (m->free_func != NULL))
-                                {
-                                ptr=CRYPTO_get_ex_data(ad,i);
-                                m->free_func(obj,ptr,ad,i,m->argl,m->argp);
-                                }
-                        }
-                }
-        if (ad->sk != NULL)
-                {
-                sk_free(ad->sk);
-                ad->sk=NULL;
-                }
-        }
-
-void CRYPTO_new_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
-        {
-        CRYPTO_EX_DATA_FUNCS *m;
-        char *ptr;
-        int i,max;
-
-        ad->sk=NULL;
-        if (meth != NULL)
-                {
-                max=sk_num(meth);
-                for (i=0; i<max; i++)
-                        {
-                        m=(CRYPTO_EX_DATA_FUNCS *)sk_value(meth,i);
-                        if ((m != NULL) && (m->new_func != NULL))
-                                {
-                                ptr=CRYPTO_get_ex_data(ad,i);
-                                m->new_func(obj,ptr,ad,i,m->argl,m->argp);
-                                }
-                        }
-                }
-        }
-
-
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
deleted file mode 100644
index 5c349bbb56..0000000000
--- a/src/lib/libcrypto/hmac/hmac.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* crypto/hmac/hmac.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 <openssl/hmac.h>
-
-void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-               const EVP_MD *md)
-        {
-        int i,j,reset=0;
-        unsigned char pad[HMAC_MAX_MD_CBLOCK];
-
-        if (md != NULL)
-                {
-                reset=1;
-                ctx->md=md;
-                }
-        else
-                md=ctx->md;
-
-        if (key != NULL)
-                {
-                reset=1;
-                j=EVP_MD_block_size(md);
-                if (j < len)
-                        {
-                        EVP_DigestInit(&ctx->md_ctx,md);
-                        EVP_DigestUpdate(&ctx->md_ctx,key,len);
-                        EVP_DigestFinal(&(ctx->md_ctx),ctx->key,
-                                &ctx->key_length);
-                        }
-                else
-                        {
-                        memcpy(ctx->key,key,len);
-                        memset(&(ctx->key[len]),0,sizeof(ctx->key)-len);
-                        ctx->key_length=len;
-                        }
-                }
-
-        if (reset)      
-                {
-                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
-                        pad[i]=0x36^ctx->key[i];
-                EVP_DigestInit(&ctx->i_ctx,md);
-                EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md));
-
-                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
-                        pad[i]=0x5c^ctx->key[i];
-                EVP_DigestInit(&ctx->o_ctx,md);
-                EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md));
-                }
-
-        memcpy(&ctx->md_ctx,&ctx->i_ctx,sizeof(ctx->i_ctx));
-        }
-
-void HMAC_Update(HMAC_CTX *ctx, unsigned char *data, int len)
-        {
-        EVP_DigestUpdate(&(ctx->md_ctx),data,len);
-        }
-
-void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
-        {
-        int j;
-        unsigned int i;
-        unsigned char buf[EVP_MAX_MD_SIZE];
-
-        j=EVP_MD_block_size(ctx->md);
-
-        EVP_DigestFinal(&(ctx->md_ctx),buf,&i);
-        memcpy(&(ctx->md_ctx),&(ctx->o_ctx),sizeof(ctx->o_ctx));
-        EVP_DigestUpdate(&(ctx->md_ctx),buf,i);
-        EVP_DigestFinal(&(ctx->md_ctx),md,len);
-        }
-
-void HMAC_cleanup(HMAC_CTX *ctx)
-        {
-        memset(ctx,0,sizeof(HMAC_CTX));
-        }
-
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    unsigned char *d, int n, unsigned char *md,
-                    unsigned int *md_len)
-        {
-        HMAC_CTX c;
-        static unsigned char m[EVP_MAX_MD_SIZE];
-
-        if (md == NULL) md=m;
-        HMAC_Init(&c,key,key_len,evp_md);
-        HMAC_Update(&c,d,n);
-        HMAC_Final(&c,md,md_len);
-        HMAC_cleanup(&c);
-        return(md);
-        }
-
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h
deleted file mode 100644
index f928975fcd..0000000000
--- a/src/lib/libcrypto/hmac/hmac.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* crypto/hmac/hmac.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_HMAC_H
-#define HEADER_HMAC_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_HMAC
-#error HMAC is disabled.
-#endif
-
-#include <openssl/evp.h>
-
-#define HMAC_MAX_MD_CBLOCK      64
-
-typedef struct hmac_ctx_st
-        {
-        const EVP_MD *md;
-        EVP_MD_CTX md_ctx;
-        EVP_MD_CTX i_ctx;
-        EVP_MD_CTX o_ctx;
-        unsigned int key_length;
-        unsigned char key[HMAC_MAX_MD_CBLOCK];
-        } HMAC_CTX;
-
-#define HMAC_size(e)    (EVP_MD_size((e)->md))
-
-
-void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-               const EVP_MD *md);
-void HMAC_Update(HMAC_CTX *ctx,unsigned char *key, int len);
-void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-void HMAC_cleanup(HMAC_CTX *ctx);
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    unsigned char *d, int n, unsigned char *md,
-                    unsigned int *md_len);
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/idea/idea.h b/src/lib/libcrypto/idea/idea.h
deleted file mode 100644
index ae32f5692e..0000000000
--- a/src/lib/libcrypto/idea/idea.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/idea/idea.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_IDEA_H
-#define HEADER_IDEA_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_IDEA
-#error IDEA is disabled.
-#endif
-
-#define IDEA_ENCRYPT    1
-#define IDEA_DECRYPT    0
-
-#include <openssl/opensslconf.h> /* IDEA_INT */
-#define IDEA_BLOCK      8
-#define IDEA_KEY_LENGTH 16
-
-typedef struct idea_key_st
-        {
-        IDEA_INT data[9][6];
-        } IDEA_KEY_SCHEDULE;
-
-const char *idea_options(void);
-void idea_ecb_encrypt(unsigned char *in, unsigned char *out,
-        IDEA_KEY_SCHEDULE *ks);
-void idea_set_encrypt_key(unsigned char *key, IDEA_KEY_SCHEDULE *ks);
-void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
-void idea_cbc_encrypt(unsigned char *in, unsigned char *out,
-        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,int enc);
-void idea_cfb64_encrypt(unsigned char *in, unsigned char *out,
-        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-        int *num,int enc);
-void idea_ofb64_encrypt(unsigned char *in, unsigned char *out,
-        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num);
-void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/lhash/lh_stats.c b/src/lib/libcrypto/lhash/lh_stats.c
deleted file mode 100644
index 80b931c12b..0000000000
--- a/src/lib/libcrypto/lhash/lh_stats.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* crypto/lhash/lh_stats.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-/* If you wish to build this outside of SSLeay, remove the following lines
- * and things should work as expected */
-#include "cryptlib.h"
-
-#include <openssl/lhash.h>
-
-#ifndef HEADER_BIO_H
-
-void lh_stats(LHASH *lh, FILE *out)
-        {
-        fprintf(out,"num_items             = %lu\n",lh->num_items);
-        fprintf(out,"num_nodes             = %u\n",lh->num_nodes);
-        fprintf(out,"num_alloc_nodes       = %u\n",lh->num_alloc_nodes);
-        fprintf(out,"num_expands           = %lu\n",lh->num_expands);
-        fprintf(out,"num_expand_reallocs   = %lu\n",lh->num_expand_reallocs);
-        fprintf(out,"num_contracts         = %lu\n",lh->num_contracts);
-        fprintf(out,"num_contract_reallocs = %lu\n",lh->num_contract_reallocs);
-        fprintf(out,"num_hash_calls        = %lu\n",lh->num_hash_calls);
-        fprintf(out,"num_comp_calls        = %lu\n",lh->num_comp_calls);
-        fprintf(out,"num_insert            = %lu\n",lh->num_insert);
-        fprintf(out,"num_replace           = %lu\n",lh->num_replace);
-        fprintf(out,"num_delete            = %lu\n",lh->num_delete);
-        fprintf(out,"num_no_delete         = %lu\n",lh->num_no_delete);
-        fprintf(out,"num_retrieve          = %lu\n",lh->num_retrieve);
-        fprintf(out,"num_retrieve_miss     = %lu\n",lh->num_retrieve_miss);
-        fprintf(out,"num_hash_comps        = %lu\n",lh->num_hash_comps);
-#ifdef DEBUG
-        fprintf(out,"p                     = %u\n",lh->p);
-        fprintf(out,"pmax                  = %u\n",lh->pmax);
-        fprintf(out,"up_load               = %lu\n",lh->up_load);
-        fprintf(out,"down_load             = %lu\n",lh->down_load);
-#endif
-        }
-
-void lh_node_stats(LHASH *lh, FILE *out)
-        {
-        LHASH_NODE *n;
-        unsigned int i,num;
-
-        for (i=0; i<lh->num_nodes; i++)
-                {
-                for (n=lh->b[i],num=0; n != NULL; n=n->next)
-                        num++;
-                fprintf(out,"node %6u -> %3u\n",i,num);
-                }
-        }
-
-void lh_node_usage_stats(LHASH *lh, FILE *out)
-        {
-        LHASH_NODE *n;
-        unsigned long num;
-        unsigned int i;
-        unsigned long total=0,n_used=0;
-
-        for (i=0; i<lh->num_nodes; i++)
-                {
-                for (n=lh->b[i],num=0; n != NULL; n=n->next)
-                        num++;
-                if (num != 0)
-                        {
-                        n_used++;
-                        total+=num;
-                        }
-                }
-        fprintf(out,"%lu nodes used out of %u\n",n_used,lh->num_nodes);
-        fprintf(out,"%lu items\n",total);
-        if (n_used == 0) return;
-        fprintf(out,"load %d.%02d  actual load %d.%02d\n",
-                (int)(total/lh->num_nodes),
-                (int)((total%lh->num_nodes)*100/lh->num_nodes),
-                (int)(total/n_used),
-                (int)((total%n_used)*100/n_used));
-        }
-
-#else
-
-#ifndef NO_FP_API
-void lh_stats(LHASH *lh, FILE *fp)
-        {
-        BIO *bp;
-
-        bp=BIO_new(BIO_s_file());
-        if (bp == NULL) goto end;
-        BIO_set_fp(bp,fp,BIO_NOCLOSE);
-        lh_stats_bio(lh,bp);
-        BIO_free(bp);
-end:;
-        }
-
-void lh_node_stats(LHASH *lh, FILE *fp)
-        {
-        BIO *bp;
-
-        bp=BIO_new(BIO_s_file());
-        if (bp == NULL) goto end;
-        BIO_set_fp(bp,fp,BIO_NOCLOSE);
-        lh_node_stats_bio(lh,bp);
-        BIO_free(bp);
-end:;
-        }
-
-void lh_node_usage_stats(LHASH *lh, FILE *fp)
-        {
-        BIO *bp;
-
-        bp=BIO_new(BIO_s_file());
-        if (bp == NULL) goto end;
-        BIO_set_fp(bp,fp,BIO_NOCLOSE);
-        lh_node_usage_stats_bio(lh,bp);
-        BIO_free(bp);
-end:;
-        }
-
-#endif
-
-void lh_stats_bio(LHASH *lh, BIO *out)
-        {
-        char buf[128];
-
-        sprintf(buf,"num_items             = %lu\n",lh->num_items);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_nodes             = %u\n",lh->num_nodes);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_alloc_nodes       = %u\n",lh->num_alloc_nodes);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_expands           = %lu\n",lh->num_expands);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_expand_reallocs   = %lu\n",lh->num_expand_reallocs);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_contracts         = %lu\n",lh->num_contracts);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_contract_reallocs = %lu\n",lh->num_contract_reallocs);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_hash_calls        = %lu\n",lh->num_hash_calls);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_comp_calls        = %lu\n",lh->num_comp_calls);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_insert            = %lu\n",lh->num_insert);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_replace           = %lu\n",lh->num_replace);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_delete            = %lu\n",lh->num_delete);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_no_delete         = %lu\n",lh->num_no_delete);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_retrieve          = %lu\n",lh->num_retrieve);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_retrieve_miss     = %lu\n",lh->num_retrieve_miss);
-        BIO_puts(out,buf);
-        sprintf(buf,"num_hash_comps        = %lu\n",lh->num_hash_comps);
-        BIO_puts(out,buf);
-#ifdef DEBUG
-        sprintf(buf,"p                     = %u\n",lh->p);
-        BIO_puts(out,buf);
-        sprintf(buf,"pmax                  = %u\n",lh->pmax);
-        BIO_puts(out,buf);
-        sprintf(buf,"up_load               = %lu\n",lh->up_load);
-        BIO_puts(out,buf);
-        sprintf(buf,"down_load             = %lu\n",lh->down_load);
-        BIO_puts(out,buf);
-#endif
-        }
-
-void lh_node_stats_bio(LHASH *lh, BIO *out)
-        {
-        LHASH_NODE *n;
-        unsigned int i,num;
-        char buf[128];
-
-        for (i=0; i<lh->num_nodes; i++)
-                {
-                for (n=lh->b[i],num=0; n != NULL; n=n->next)
-                        num++;
-                sprintf(buf,"node %6u -> %3u\n",i,num);
-                BIO_puts(out,buf);
-                }
-        }
-
-void lh_node_usage_stats_bio(LHASH *lh, BIO *out)
-        {
-        LHASH_NODE *n;
-        unsigned long num;
-        unsigned int i;
-        unsigned long total=0,n_used=0;
-        char buf[128];
-
-        for (i=0; i<lh->num_nodes; i++)
-                {
-                for (n=lh->b[i],num=0; n != NULL; n=n->next)
-                        num++;
-                if (num != 0)
-                        {
-                        n_used++;
-                        total+=num;
-                        }
-                }
-        sprintf(buf,"%lu nodes used out of %u\n",n_used,lh->num_nodes);
-        BIO_puts(out,buf);
-        sprintf(buf,"%lu items\n",total);
-        BIO_puts(out,buf);
-        if (n_used == 0) return;
-        sprintf(buf,"load %d.%02d  actual load %d.%02d\n",
-                (int)(total/lh->num_nodes),
-                (int)((total%lh->num_nodes)*100/lh->num_nodes),
-                (int)(total/n_used),
-                (int)((total%n_used)*100/n_used));
-        BIO_puts(out,buf);
-        }
-
-#endif
diff --git a/src/lib/libcrypto/lhash/lhash.c b/src/lib/libcrypto/lhash/lhash.c
deleted file mode 100644
index 801322beb6..0000000000
--- a/src/lib/libcrypto/lhash/lhash.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/* crypto/lhash/lhash.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.]
- */
-
-/* Code for dynamic hash table routines
- * Author - Eric Young v 2.0
- *
- * 2.2 eay - added #include "crypto.h" so the memory leak checking code is
- *           present. eay 18-Jun-98
- *
- * 2.1 eay - Added an 'error in last operation' flag. eay 6-May-98
- *
- * 2.0 eay - Fixed a bug that occured when using lh_delete
- *           from inside lh_doall().  As entries were deleted,
- *           the 'table' was 'contract()ed', making some entries
- *           jump from the end of the table to the start, there by
- *           skiping the lh_doall() processing. eay - 4/12/95
- *
- * 1.9 eay - Fixed a memory leak in lh_free, the LHASH_NODEs
- *           were not being free()ed. 21/11/95
- *
- * 1.8 eay - Put the stats routines into a separate file, lh_stats.c
- *           19/09/95
- *
- * 1.7 eay - Removed the fputs() for realloc failures - the code
- *           should silently tolerate them.  I have also fixed things
- *           lint complained about 04/05/95
- *
- * 1.6 eay - Fixed an invalid pointers in contract/expand 27/07/92
- *
- * 1.5 eay - Fixed a misuse of realloc in expand 02/03/1992
- *
- * 1.4 eay - Fixed lh_doall so the function can call lh_delete 28/05/91
- *
- * 1.3 eay - Fixed a few lint problems 19/3/1991
- *
- * 1.2 eay - Fixed lh_doall problem 13/3/1991
- *
- * 1.1 eay - Added lh_doall
- *
- * 1.0 eay - First version
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-
-const char *lh_version="lhash" OPENSSL_VERSION_PTEXT;
-
-#undef MIN_NODES 
-#define MIN_NODES       16
-#define UP_LOAD         (2*LH_LOAD_MULT) /* load times 256  (default 2) */
-#define DOWN_LOAD       (LH_LOAD_MULT)   /* load times 256  (default 1) */
-
-
-#define P_CP    char *
-#define P_CPP   char *,char *
-static void expand(LHASH *lh);
-static void contract(LHASH *lh);
-static LHASH_NODE **getrn(LHASH *lh, char *data, unsigned long *rhash);
-
-LHASH *lh_new(unsigned long (*h)(), int (*c)())
-        {
-        LHASH *ret;
-        int i;
-
-        if ((ret=(LHASH *)Malloc(sizeof(LHASH))) == NULL)
-                goto err0;
-        if ((ret->b=(LHASH_NODE **)Malloc(sizeof(LHASH_NODE *)*MIN_NODES)) == NULL)
-                goto err1;
-        for (i=0; i<MIN_NODES; i++)
-                ret->b[i]=NULL;
-        ret->comp=((c == NULL)?(int (*)())strcmp:c);
-        ret->hash=((h == NULL)?(unsigned long (*)())lh_strhash:h);
-        ret->num_nodes=MIN_NODES/2;
-        ret->num_alloc_nodes=MIN_NODES;
-        ret->p=0;
-        ret->pmax=MIN_NODES/2;
-        ret->up_load=UP_LOAD;
-        ret->down_load=DOWN_LOAD;
-        ret->num_items=0;
-
-        ret->num_expands=0;
-        ret->num_expand_reallocs=0;
-        ret->num_contracts=0;
-        ret->num_contract_reallocs=0;
-        ret->num_hash_calls=0;
-        ret->num_comp_calls=0;
-        ret->num_insert=0;
-        ret->num_replace=0;
-        ret->num_delete=0;
-        ret->num_no_delete=0;
-        ret->num_retrieve=0;
-        ret->num_retrieve_miss=0;
-        ret->num_hash_comps=0;
-
-        ret->error=0;
-        return(ret);
-err1:
-        Free((char *)ret);
-err0:
-        return(NULL);
-        }
-
-void lh_free(LHASH *lh)
-        {
-        unsigned int i;
-        LHASH_NODE *n,*nn;
-
-        if(lh == NULL)
-            return;
-
-        for (i=0; i<lh->num_nodes; i++)
-                {
-                n=lh->b[i];
-                while (n != NULL)
-                        {
-                        nn=n->next;
-                        Free(n);
-                        n=nn;
-                        }
-                }
-        Free((char *)lh->b);
-        Free((char *)lh);
-        }
-
-char *lh_insert(LHASH *lh, char *data)
-        {
-        unsigned long hash;
-        LHASH_NODE *nn,**rn;
-        char *ret;
-
-        lh->error=0;
-        if (lh->up_load <= (lh->num_items*LH_LOAD_MULT/lh->num_nodes))
-                expand(lh);
-
-        rn=getrn(lh,data,&hash);
-
-        if (*rn == NULL)
-                {
-                if ((nn=(LHASH_NODE *)Malloc(sizeof(LHASH_NODE))) == NULL)
-                        {
-                        lh->error++;
-                        return(NULL);
-                        }
-                nn->data=data;
-                nn->next=NULL;
-#ifndef NO_HASH_COMP
-                nn->hash=hash;
-#endif
-                *rn=nn;
-                ret=NULL;
-                lh->num_insert++;
-                lh->num_items++;
-                }
-        else /* replace same key */
-                {
-                ret= (*rn)->data;
-                (*rn)->data=data;
-                lh->num_replace++;
-                }
-        return(ret);
-        }
-
-char *lh_delete(LHASH *lh, char *data)
-        {
-        unsigned long hash;
-        LHASH_NODE *nn,**rn;
-        char *ret;
-
-        lh->error=0;
-        rn=getrn(lh,data,&hash);
-
-        if (*rn == NULL)
-                {
-                lh->num_no_delete++;
-                return(NULL);
-                }
-        else
-                {
-                nn= *rn;
-                *rn=nn->next;
-                ret=nn->data;
-                Free((char *)nn);
-                lh->num_delete++;
-                }
-
-        lh->num_items--;
-        if ((lh->num_nodes > MIN_NODES) &&
-                (lh->down_load >= (lh->num_items*LH_LOAD_MULT/lh->num_nodes)))
-                contract(lh);
-
-        return(ret);
-        }
-
-char *lh_retrieve(LHASH *lh, char *data)
-        {
-        unsigned long hash;
-        LHASH_NODE **rn;
-        char *ret;
-
-        lh->error=0;
-        rn=getrn(lh,data,&hash);
-
-        if (*rn == NULL)
-                {
-                lh->num_retrieve_miss++;
-                return(NULL);
-                }
-        else
-                {
-                ret= (*rn)->data;
-                lh->num_retrieve++;
-                }
-        return(ret);
-        }
-
-void lh_doall(LHASH *lh, void (*func)())
-        {
-        lh_doall_arg(lh,func,NULL);
-        }
-
-void lh_doall_arg(LHASH *lh, void (*func)(), char *arg)
-        {
-        int i;
-        LHASH_NODE *a,*n;
-
-        /* reverse the order so we search from 'top to bottom'
-         * We were having memory leaks otherwise */
-        for (i=lh->num_nodes-1; i>=0; i--)
-                {
-                a=lh->b[i];
-                while (a != NULL)
-                        {
-                        /* 28/05/91 - eay - n added so items can be deleted
-                         * via lh_doall */
-                        n=a->next;
-                        func(a->data,arg);
-                        a=n;
-                        }
-                }
-        }
-
-static void expand(LHASH *lh)
-        {
-        LHASH_NODE **n,**n1,**n2,*np;
-        unsigned int p,i,j;
-        unsigned long hash,nni;
-
-        lh->num_nodes++;
-        lh->num_expands++;
-        p=(int)lh->p++;
-        n1= &(lh->b[p]);
-        n2= &(lh->b[p+(int)lh->pmax]);
-        *n2=NULL;        /* 27/07/92 - eay - undefined pointer bug */
-        nni=lh->num_alloc_nodes;
-        
-        for (np= *n1; np != NULL; )
-                {
-#ifndef NO_HASH_COMP
-                hash=np->hash;
-#else
-                hash=(*(lh->hash))(np->data);
-                lh->num_hash_calls++;
-#endif
-                if ((hash%nni) != p)
-                        { /* move it */
-                        *n1= (*n1)->next;
-                        np->next= *n2;
-                        *n2=np;
-                        }
-                else
-                        n1= &((*n1)->next);
-                np= *n1;
-                }
-
-        if ((lh->p) >= lh->pmax)
-                {
-                j=(int)lh->num_alloc_nodes*2;
-                n=(LHASH_NODE **)Realloc((char *)lh->b,
-                        (unsigned int)sizeof(LHASH_NODE *)*j);
-                if (n == NULL)
-                        {
-/*                      fputs("realloc error in lhash",stderr); */
-                        lh->error++;
-                        lh->p=0;
-                        return;
-                        }
-                /* else */
-                for (i=(int)lh->num_alloc_nodes; i<j; i++)/* 26/02/92 eay */
-                        n[i]=NULL;                        /* 02/03/92 eay */
-                lh->pmax=lh->num_alloc_nodes;
-                lh->num_alloc_nodes=j;
-                lh->num_expand_reallocs++;
-                lh->p=0;
-                lh->b=n;
-                }
-        }
-
-static void contract(LHASH *lh)
-        {
-        LHASH_NODE **n,*n1,*np;
-
-        np=lh->b[lh->p+lh->pmax-1];
-        lh->b[lh->p+lh->pmax-1]=NULL; /* 24/07-92 - eay - weird but :-( */
-        if (lh->p == 0)
-                {
-                n=(LHASH_NODE **)Realloc((char *)lh->b,
-                        (unsigned int)(sizeof(LHASH_NODE *)*lh->pmax));
-                if (n == NULL)
-                        {
-/*                      fputs("realloc error in lhash",stderr); */
-                        lh->error++;
-                        return;
-                        }
-                lh->num_contract_reallocs++;
-                lh->num_alloc_nodes/=2;
-                lh->pmax/=2;
-                lh->p=lh->pmax-1;
-                lh->b=n;
-                }
-        else
-                lh->p--;
-
-        lh->num_nodes--;
-        lh->num_contracts++;
-
-        n1=lh->b[(int)lh->p];
-        if (n1 == NULL)
-                lh->b[(int)lh->p]=np;
-        else
-                {
-                while (n1->next != NULL)
-                        n1=n1->next;
-                n1->next=np;
-                }
-        }
-
-static LHASH_NODE **getrn(LHASH *lh, char *data, unsigned long *rhash)
-        {
-        LHASH_NODE **ret,*n1;
-        unsigned long hash,nn;
-        int (*cf)();
-
-        hash=(*(lh->hash))(data);
-        lh->num_hash_calls++;
-        *rhash=hash;
-
-        nn=hash%lh->pmax;
-        if (nn < lh->p)
-                nn=hash%lh->num_alloc_nodes;
-
-        cf=lh->comp;
-        ret= &(lh->b[(int)nn]);
-        for (n1= *ret; n1 != NULL; n1=n1->next)
-                {
-#ifndef NO_HASH_COMP
-                lh->num_hash_comps++;
-                if (n1->hash != hash)
-                        {
-                        ret= &(n1->next);
-                        continue;
-                        }
-#endif
-                lh->num_comp_calls++;
-                if ((*cf)(n1->data,data) == 0)
-                        break;
-                ret= &(n1->next);
-                }
-        return(ret);
-        }
-
-/*
-static unsigned long lh_strhash(str)
-char *str;
-        {
-        int i,l;
-        unsigned long ret=0;
-        unsigned short *s;
-
-        if (str == NULL) return(0);
-        l=(strlen(str)+1)/2;
-        s=(unsigned short *)str;
-        for (i=0; i<l; i++)
-                ret^=(s[i]<<(i&0x0f));
-        return(ret);
-        } */
-
-/* The following hash seems to work very well on normal text strings
- * no collisions on /usr/dict/words and it distributes on %2^n quite
- * well, not as good as MD5, but still good.
- */
-unsigned long lh_strhash(const char *c)
-        {
-        unsigned long ret=0;
-        long n;
-        unsigned long v;
-        int r;
-
-        if ((c == NULL) || (*c == '\0'))
-                return(ret);
-/*
-        unsigned char b[16];
-        MD5(c,strlen(c),b);
-        return(b[0]|(b[1]<<8)|(b[2]<<16)|(b[3]<<24)); 
-*/
-
-        n=0x100;
-        while (*c)
-                {
-                v=n|(*c);
-                n+=0x100;
-                r= (int)((v>>2)^v)&0x0f;
-                ret=(ret<<r)|(ret>>(32-r));
-                ret&=0xFFFFFFFFL;
-                ret^=v*v;
-                c++;
-                }
-        return((ret>>16)^ret);
-        }
-
diff --git a/src/lib/libcrypto/lhash/lhash.h b/src/lib/libcrypto/lhash/lhash.h
deleted file mode 100644
index 6e5a1fe708..0000000000
--- a/src/lib/libcrypto/lhash/lhash.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* crypto/lhash/lhash.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.]
- */
-
-/* Header for dynamic hash table routines
- * Author - Eric Young
- */
-
-#ifndef HEADER_LHASH_H
-#define HEADER_LHASH_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifndef NO_FP_API
-#include <stdio.h>
-#endif
-
-typedef struct lhash_node_st
-        {
-        char *data;
-        struct lhash_node_st *next;
-#ifndef NO_HASH_COMP
-        unsigned long hash;
-#endif
-        } LHASH_NODE;
-
-typedef struct lhash_st
-        {
-        LHASH_NODE **b;
-        int (*comp)();
-        unsigned long (*hash)();
-        unsigned int num_nodes;
-        unsigned int num_alloc_nodes;
-        unsigned int p;
-        unsigned int pmax;
-        unsigned long up_load; /* load times 256 */
-        unsigned long down_load; /* load times 256 */
-        unsigned long num_items;
-
-        unsigned long num_expands;
-        unsigned long num_expand_reallocs;
-        unsigned long num_contracts;
-        unsigned long num_contract_reallocs;
-        unsigned long num_hash_calls;
-        unsigned long num_comp_calls;
-        unsigned long num_insert;
-        unsigned long num_replace;
-        unsigned long num_delete;
-        unsigned long num_no_delete;
-        unsigned long num_retrieve;
-        unsigned long num_retrieve_miss;
-        unsigned long num_hash_comps;
-
-        int error;
-        } LHASH;
-
-#define LH_LOAD_MULT    256
-
-/* Indicates a malloc() error in the last call, this is only bad
- * in lh_insert(). */
-#define lh_error(lh)    ((lh)->error)
-
-LHASH *lh_new(unsigned long (*h)(), int (*c)());
-void lh_free(LHASH *lh);
-char *lh_insert(LHASH *lh, char *data);
-char *lh_delete(LHASH *lh, char *data);
-char *lh_retrieve(LHASH *lh, char *data);
-void lh_doall(LHASH *lh, void (*func)(/* char *b */));
-void lh_doall_arg(LHASH *lh, void (*func)(/*char *a,char *b*/),char *arg);
-unsigned long lh_strhash(const char *c);
-
-#ifndef NO_FP_API
-void lh_stats(LHASH *lh, FILE *out);
-void lh_node_stats(LHASH *lh, FILE *out);
-void lh_node_usage_stats(LHASH *lh, FILE *out);
-#endif
-
-#ifdef HEADER_BIO_H
-void lh_stats_bio(LHASH *lh, BIO *out);
-void lh_node_stats_bio(LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(LHASH *lh, BIO *out);
-#endif
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
deleted file mode 100644
index 2b91f9eef2..0000000000
--- a/src/lib/libcrypto/md32_common.h
+++ /dev/null
@@ -1,594 +0,0 @@
-/* crypto/md32_common.h */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This is a generic 32 bit "collector" for message digest algorithms.
- * Whenever needed it collects input character stream into chunks of
- * 32 bit values and invokes a block function that performs actual hash
- * calculations.
- *
- * Porting guide.
- *
- * Obligatory macros:
- *
- * DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
- *      this macro defines byte order of input stream.
- * HASH_CBLOCK
- *      size of a unit chunk HASH_BLOCK operates on.
- * HASH_LONG
- *      has to be at lest 32 bit wide, if it's wider, then
- *      HASH_LONG_LOG2 *has to* be defined along
- * HASH_CTX
- *      context structure that at least contains following
- *      members:
- *              typedef struct {
- *                      ...
- *                      HASH_LONG       Nl,Nh;
- *                      HASH_LONG       data[HASH_LBLOCK];
- *                      int             num;
- *                      ...
- *                      } HASH_CTX;
- * HASH_UPDATE
- *      name of "Update" function, implemented here.
- * HASH_TRANSFORM
- *      name of "Transform" function, implemented here.
- * HASH_FINAL
- *      name of "Final" function, implemented here.
- * HASH_BLOCK_HOST_ORDER
- *      name of "block" function treating *aligned* input message
- *      in host byte order, implemented externally.
- * HASH_BLOCK_DATA_ORDER
- *      name of "block" function treating *unaligned* input message
- *      in original (data) byte order, implemented externally (it
- *      actually is optional if data and host are of the same
- *      "endianess").
- *
- * Optional macros:
- *
- * B_ENDIAN or L_ENDIAN
- *      defines host byte-order.
- * HASH_LONG_LOG2
- *      defaults to 2 if not states otherwise.
- * HASH_LBLOCK
- *      assumed to be HASH_CBLOCK/4 if not stated otherwise.
- * HASH_BLOCK_DATA_ORDER_ALIGNED
- *      alternative "block" function capable of treating
- *      aligned input message in original (data) order,
- *      implemented externally.
- *
- * MD5 example:
- *
- *      #define DATA_ORDER_IS_LITTLE_ENDIAN
- *
- *      #define HASH_LONG               MD5_LONG
- *      #define HASH_LONG_LOG2          MD5_LONG_LOG2
- *      #define HASH_CTX                MD5_CTX
- *      #define HASH_CBLOCK             MD5_CBLOCK
- *      #define HASH_LBLOCK             MD5_LBLOCK
- *      #define HASH_UPDATE             MD5_Update
- *      #define HASH_TRANSFORM          MD5_Transform
- *      #define HASH_FINAL              MD5_Final
- *      #define HASH_BLOCK_HOST_ORDER   md5_block_host_order
- *      #define HASH_BLOCK_DATA_ORDER   md5_block_data_order
- *
- *                                      <appro@fy.chalmers.se>
- */
-
-#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#error "DATA_ORDER must be defined!"
-#endif
-
-#ifndef HASH_CBLOCK
-#error "HASH_CBLOCK must be defined!"
-#endif
-#ifndef HASH_LONG
-#error "HASH_LONG must be defined!"
-#endif
-#ifndef HASH_CTX
-#error "HASH_CTX must be defined!"
-#endif
-
-#ifndef HASH_UPDATE
-#error "HASH_UPDATE must be defined!"
-#endif
-#ifndef HASH_TRANSFORM
-#error "HASH_TRANSFORM must be defined!"
-#endif
-#ifndef HASH_FINAL
-#error "HASH_FINAL must be defined!"
-#endif
-
-#ifndef HASH_BLOCK_HOST_ORDER
-#error "HASH_BLOCK_HOST_ORDER must be defined!"
-#endif
-
-#if 0
-/*
- * Moved below as it's required only if HASH_BLOCK_DATA_ORDER_ALIGNED
- * isn't defined.
- */
-#ifndef HASH_BLOCK_DATA_ORDER
-#error "HASH_BLOCK_DATA_ORDER must be defined!"
-#endif
-#endif
-
-#ifndef HASH_LBLOCK
-#define HASH_LBLOCK     (HASH_CBLOCK/4)
-#endif
-
-#ifndef HASH_LONG_LOG2
-#define HASH_LONG_LOG2  2
-#endif
-
-/*
- * Engage compiler specific rotate intrinsic function if available.
- */
-#undef ROTATE
-#ifndef PEDANTIC
-# if defined(_MSC_VER)
-#  define ROTATE(a,n)     _lrotl(a,n)
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
-  /*
-   * Some GNU C inline assembler templates. Note that these are
-   * rotates by *constant* number of bits! But that's exactly
-   * what we need here...
-   *
-   *                                    <appro@fy.chalmers.se>
-   */
-#  if defined(__i386)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm volatile (          \
-                                "roll %1,%0"            \
-                                : "=r"(ret)             \
-                                : "I"(n), "0"(a)        \
-                                : "cc");                \
-                           ret;                         \
-                        })
-#  elif defined(__powerpc)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm volatile (          \
-                                "rlwinm %0,%1,%2,0,31"  \
-                                : "=r"(ret)             \
-                                : "r"(a), "I"(n));      \
-                           ret;                         \
-                        })
-#  endif
-# endif
-
-/*
- * Engage compiler specific "fetch in reverse byte order"
- * intrinsic function if available.
- */
-# if defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)
-  /* some GNU C inline assembler templates by <appro@fy.chalmers.se> */
-#  if defined(__i386) && !defined(I386_ONLY)
-#   define BE_FETCH32(a)        ({ register unsigned int l=(a);\
-                                asm volatile (          \
-                                "bswapl %0"             \
-                                : "=r"(l) : "0"(l));    \
-                          l;                            \
-                        })
-#  elif defined(__powerpc)
-#   define LE_FETCH32(a)        ({ register unsigned int l;     \
-                                asm volatile (          \
-                                "lwbrx %0,0,%1"         \
-                                : "=r"(l)               \
-                                : "r"(a));              \
-                           l;                           \
-                        })
-
-#  elif defined(__sparc) && defined(ULTRASPARC)
-#  define LE_FETCH32(a) ({ register unsigned int l;             \
-                                asm volatile (                  \
-                                "lda [%1]#ASI_PRIMARY_LITTLE,%0"\
-                                : "=r"(l)                       \
-                                : "r"(a));                      \
-                           l;                                   \
-                        })
-#  endif
-# endif
-#endif /* PEDANTIC */
-
-#if HASH_LONG_LOG2==2   /* Engage only if sizeof(HASH_LONG)== 4 */
-/* A nice byte order reversal from Wei Dai <weidai@eskimo.com> */
-#ifdef ROTATE
-/* 5 instructions with rotate instruction, else 9 */
-#define REVERSE_FETCH32(a,l)    (                                       \
-                l=*(const HASH_LONG *)(a),                              \
-                ((ROTATE(l,8)&0x00FF00FF)|(ROTATE((l&0x00FF00FF),24)))  \
-                                )
-#else
-/* 6 instructions with rotate instruction, else 8 */
-#define REVERSE_FETCH32(a,l)    (                               \
-                l=*(const HASH_LONG *)(a),                      \
-                l=(((l>>8)&0x00FF00FF)|((l&0x00FF00FF)<<8)),    \
-                ROTATE(l,16)                                    \
-                                )
-/*
- * Originally the middle line started with l=(((l&0xFF00FF00)>>8)|...
- * It's rewritten as above for two reasons:
- *      - RISCs aren't good at long constants and have to explicitely
- *        compose 'em with several (well, usually 2) instructions in a
- *        register before performing the actual operation and (as you
- *        already realized:-) having same constant should inspire the
- *        compiler to permanently allocate the only register for it;
- *      - most modern CPUs have two ALUs, but usually only one has
- *        circuitry for shifts:-( this minor tweak inspires compiler
- *        to schedule shift instructions in a better way...
- *
- *                              <appro@fy.chalmers.se>
- */
-#endif
-#endif
-
-#ifndef ROTATE
-#define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
-#endif
-
-/*
- * Make some obvious choices. E.g., HASH_BLOCK_DATA_ORDER_ALIGNED
- * and HASH_BLOCK_HOST_ORDER ought to be the same if input data
- * and host are of the same "endianess". It's possible to mask
- * this with blank #define HASH_BLOCK_DATA_ORDER though...
- *
- *                              <appro@fy.chalmers.se>
- */
-#if defined(B_ENDIAN)
-#  if defined(DATA_ORDER_IS_BIG_ENDIAN)
-#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
-#      define HASH_BLOCK_DATA_ORDER_ALIGNED     HASH_BLOCK_HOST_ORDER
-#    endif
-#  elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#    ifndef HOST_FETCH32
-#      ifdef LE_FETCH32
-#        define HOST_FETCH32(p,l)       LE_FETCH32(p)
-#      elif defined(REVERSE_FETCH32)
-#        define HOST_FETCH32(p,l)       REVERSE_FETCH32(p,l)
-#      endif
-#    endif
-#  endif
-#elif defined(L_ENDIAN)
-#  if defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
-#      define HASH_BLOCK_DATA_ORDER_ALIGNED     HASH_BLOCK_HOST_ORDER
-#    endif
-#  elif defined(DATA_ORDER_IS_BIG_ENDIAN)
-#    ifndef HOST_FETCH32
-#      ifdef BE_FETCH32
-#        define HOST_FETCH32(p,l)       BE_FETCH32(p)
-#      elif defined(REVERSE_FETCH32)
-#        define HOST_FETCH32(p,l)       REVERSE_FETCH32(p,l)
-#      endif
-#    endif
-#  endif
-#endif
-
-#if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-#ifndef HASH_BLOCK_DATA_ORDER
-#error "HASH_BLOCK_DATA_ORDER must be defined!"
-#endif
-#endif
-
-#if defined(DATA_ORDER_IS_BIG_ENDIAN)
-
-#define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))<<24),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    ),          \
-                         l)
-#define HOST_p_c2l(c,l,n)       {                                       \
-                        switch (n) {                                    \
-                        case 0: l =((unsigned long)(*((c)++)))<<24;     \
-                        case 1: l|=((unsigned long)(*((c)++)))<<16;     \
-                        case 2: l|=((unsigned long)(*((c)++)))<< 8;     \
-                        case 3: l|=((unsigned long)(*((c)++)));         \
-                                } }
-#define HOST_p_c2l_p(c,l,sc,len) {                                      \
-                        switch (sc) {                                   \
-                        case 0: l =((unsigned long)(*((c)++)))<<24;     \
-                                if (--len == 0) break;                  \
-                        case 1: l|=((unsigned long)(*((c)++)))<<16;     \
-                                if (--len == 0) break;                  \
-                        case 2: l|=((unsigned long)(*((c)++)))<< 8;     \
-                                } }
-/* NOTE the pointer is not incremented at the end of this */
-#define HOST_c2l_p(c,l,n)       {                                       \
-                        l=0; (c)+=n;                                    \
-                        switch (n) {                                    \
-                        case 3: l =((unsigned long)(*(--(c))))<< 8;     \
-                        case 2: l|=((unsigned long)(*(--(c))))<<16;     \
-                        case 1: l|=((unsigned long)(*(--(c))))<<24;     \
-                                } }
-#define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
-
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-
-#define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))    ),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<<24),          \
-                         l)
-#define HOST_p_c2l(c,l,n)       {                                       \
-                        switch (n) {                                    \
-                        case 0: l =((unsigned long)(*((c)++)));         \
-                        case 1: l|=((unsigned long)(*((c)++)))<< 8;     \
-                        case 2: l|=((unsigned long)(*((c)++)))<<16;     \
-                        case 3: l|=((unsigned long)(*((c)++)))<<24;     \
-                                } }
-#define HOST_p_c2l_p(c,l,sc,len) {                                      \
-                        switch (sc) {                                   \
-                        case 0: l =((unsigned long)(*((c)++)));         \
-                                if (--len == 0) break;                  \
-                        case 1: l|=((unsigned long)(*((c)++)))<< 8;     \
-                                if (--len == 0) break;                  \
-                        case 2: l|=((unsigned long)(*((c)++)))<<16;     \
-                                } }
-/* NOTE the pointer is not incremented at the end of this */
-#define HOST_c2l_p(c,l,n)       {                                       \
-                        l=0; (c)+=n;                                    \
-                        switch (n) {                                    \
-                        case 3: l =((unsigned long)(*(--(c))))<<16;     \
-                        case 2: l|=((unsigned long)(*(--(c))))<< 8;     \
-                        case 1: l|=((unsigned long)(*(--(c))));         \
-                                } }
-#define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
-
-#endif
-
-/*
- * Time for some action:-)
- */
-
-void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len)
-        {
-        register HASH_LONG * p;
-        register unsigned long l;
-        int sw,sc,ew,ec;
-
-        if (len==0) return;
-
-        l=(c->Nl+(len<<3))&0xffffffffL;
-        /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
-         * Wei Dai <weidai@eskimo.com> for pointing it out. */
-        if (l < c->Nl) /* overflow */
-                c->Nh++;
-        c->Nh+=(len>>29);
-        c->Nl=l;
-
-        if (c->num != 0)
-                {
-                p=c->data;
-                sw=c->num>>2;
-                sc=c->num&0x03;
-
-                if ((c->num+len) >= HASH_CBLOCK)
-                        {
-                        l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
-                        for (; sw<HASH_LBLOCK; sw++)
-                                {
-                                HOST_c2l(data,l); p[sw]=l;
-                                }
-                        HASH_BLOCK_HOST_ORDER (c,p,1);
-                        len-=(HASH_CBLOCK-c->num);
-                        c->num=0;
-                        /* drop through and do the rest */
-                        }
-                else
-                        {
-                        c->num+=len;
-                        if ((sc+len) < 4) /* ugly, add char's to a word */
-                                {
-                                l=p[sw]; HOST_p_c2l_p(data,l,sc,len); p[sw]=l;
-                                }
-                        else
-                                {
-                                ew=(c->num>>2);
-                                ec=(c->num&0x03);
-                                l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
-                                for (; sw < ew; sw++)
-                                        {
-                                        HOST_c2l(data,l); p[sw]=l;
-                                        }
-                                if (ec)
-                                        {
-                                        HOST_c2l_p(data,l,ec); p[sw]=l;
-                                        }
-                                }
-                        return;
-                        }
-                }
-
-        sw=len/HASH_CBLOCK;
-        if (sw > 0)
-                {
-#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-                /*
-                 * Note that HASH_BLOCK_DATA_ORDER_ALIGNED gets defined
-                 * only if sizeof(HASH_LONG)==4.
-                 */
-                if ((((unsigned long)data)%4) == 0)
-                        {
-                        /* data is properly aligned so that we can cast it: */
-                        HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,sw);
-                        sw*=HASH_CBLOCK;
-                        data+=sw;
-                        len-=sw;
-                        }
-                else
-#if !defined(HASH_BLOCK_DATA_ORDER)
-                        while (sw--)
-                                {
-                                memcpy (p=c->data,data,HASH_CBLOCK);
-                                HASH_BLOCK_DATA_ORDER_ALIGNED(c,p,1);
-                                data+=HASH_CBLOCK;
-                                len-=HASH_CBLOCK;
-                                }
-#endif
-#endif
-#if defined(HASH_BLOCK_DATA_ORDER)
-                        {
-                        HASH_BLOCK_DATA_ORDER(c,data,sw);
-                        sw*=HASH_CBLOCK;
-                        data+=sw;
-                        len-=sw;
-                        }
-#endif
-                }
-
-        if (len!=0)
-                {
-                p = c->data;
-                c->num = len;
-                ew=len>>2;      /* words to copy */
-                ec=len&0x03;
-                for (; ew; ew--,p++)
-                        {
-                        HOST_c2l(data,l); *p=l;
-                        }
-                HOST_c2l_p(data,l,ec);
-                *p=l;
-                }
-        }
-
-
-void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
-        {
-#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-        if ((((unsigned long)data)%4) == 0)
-                /* data is properly aligned so that we can cast it: */
-                HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,1);
-        else
-#if !defined(HASH_BLOCK_DATA_ORDER)
-                {
-                memcpy (c->data,data,HASH_CBLOCK);
-                HASH_BLOCK_DATA_ORDER_ALIGNED (c,c->data,1);
-                }
-#endif
-#endif
-#if defined(HASH_BLOCK_DATA_ORDER)
-        HASH_BLOCK_DATA_ORDER (c,data,1);
-#endif
-        }
-
-
-void HASH_FINAL (unsigned char *md, HASH_CTX *c)
-        {
-        register HASH_LONG *p;
-        register unsigned long l;
-        register int i,j;
-        static const unsigned char end[4]={0x80,0x00,0x00,0x00};
-        const unsigned char *cp=end;
-
-        /* c->num should definitly have room for at least one more byte. */
-        p=c->data;
-        i=c->num>>2;
-        j=c->num&0x03;
-
-#if 0
-        /* purify often complains about the following line as an
-         * Uninitialized Memory Read.  While this can be true, the
-         * following p_c2l macro will reset l when that case is true.
-         * This is because j&0x03 contains the number of 'valid' bytes
-         * already in p[i].  If and only if j&0x03 == 0, the UMR will
-         * occur but this is also the only time p_c2l will do
-         * l= *(cp++) instead of l|= *(cp++)
-         * Many thanks to Alex Tang <altitude@cic.net> for pickup this
-         * 'potential bug' */
-#ifdef PURIFY
-        if (j==0) p[i]=0; /* Yeah, but that's not the way to fix it:-) */
-#endif
-        l=p[i];
-#else
-        l = (j==0) ? 0 : p[i];
-#endif
-        HOST_p_c2l(cp,l,j); p[i++]=l; /* i is the next 'undefined word' */
-
-        if (i>(HASH_LBLOCK-2)) /* save room for Nl and Nh */
-                {
-                if (i<HASH_LBLOCK) p[i]=0;
-                HASH_BLOCK_HOST_ORDER (c,p,1);
-                i=0;
-                }
-        for (; i<(HASH_LBLOCK-2); i++)
-                p[i]=0;
-
-#if   defined(DATA_ORDER_IS_BIG_ENDIAN)
-        p[HASH_LBLOCK-2]=c->Nh;
-        p[HASH_LBLOCK-1]=c->Nl;
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-        p[HASH_LBLOCK-2]=c->Nl;
-        p[HASH_LBLOCK-1]=c->Nh;
-#endif
-        HASH_BLOCK_HOST_ORDER (c,p,1);
-
-        l=c->A; HOST_l2c(l,md);
-        l=c->B; HOST_l2c(l,md);
-        l=c->C; HOST_l2c(l,md);
-        l=c->D; HOST_l2c(l,md);
-
-        c->num=0;
-        /* clear stuff, HASH_BLOCK may be leaving some stuff on the stack
-         * but I'm not worried :-)
-        memset((void *)c,0,sizeof(HASH_CTX));
-         */
-        }
diff --git a/src/lib/libcrypto/md5/asm/md5-586.pl b/src/lib/libcrypto/md5/asm/md5-586.pl
deleted file mode 100644
index 5fc6a205ce..0000000000
--- a/src/lib/libcrypto/md5/asm/md5-586.pl
+++ /dev/null
@@ -1,306 +0,0 @@
-#!/usr/local/bin/perl
-
-# Normal is the
-# md5_block_x86(MD5_CTX *c, ULONG *X);
-# version, non-normal is the
-# md5_block_x86(MD5_CTX *c, ULONG *X,int blocks);
-
-$normal=0;
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-$A="eax";
-$B="ebx";
-$C="ecx";
-$D="edx";
-$tmp1="edi";
-$tmp2="ebp";
-$X="esi";
-
-# What we need to load into $tmp for the next round
-%Ltmp1=("R0",&Np($C), "R1",&Np($C), "R2",&Np($C), "R3",&Np($D));
-@xo=(
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  # R0
- 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12,  # R1
- 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2,  # R2
- 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9,  # R3
- );
-
-&md5_block("md5_block_asm_host_order");
-&asm_finish();
-
-sub Np
-        {
-        local($p)=@_;
-        local(%n)=($A,$D,$B,$A,$C,$B,$D,$C);
-        return($n{$p});
-        }
-
-sub R0
-        {
-        local($pos,$a,$b,$c,$d,$K,$ki,$s,$t)=@_;
-
-        &mov($tmp1,$C)  if $pos < 0;
-        &mov($tmp2,&DWP($xo[$ki]*4,$K,"",0)) if $pos < 0; # very first one 
-
-        # body proper
-
-        &comment("R0 $ki");
-        &xor($tmp1,$d); # F function - part 2
-
-        &and($tmp1,$b); # F function - part 3
-        &lea($a,&DWP($t,$a,$tmp2,1));
-
-        &xor($tmp1,$d); # F function - part 4
-
-        &add($a,$tmp1);
-        &mov($tmp1,&Np($c)) if $pos < 1;        # next tmp1 for R0
-        &mov($tmp1,&Np($c)) if $pos == 1;       # next tmp1 for R1
-
-        &rotl($a,$s);
-
-        &mov($tmp2,&DWP($xo[$ki+1]*4,$K,"",0)) if ($pos != 2);
-
-        &add($a,$b);
-        }
-
-sub R1
-        {
-        local($pos,$a,$b,$c,$d,$K,$ki,$s,$t)=@_;
-
-        &comment("R1 $ki");
-
-        &lea($a,&DWP($t,$a,$tmp2,1));
-
-        &xor($tmp1,$b); # G function - part 2
-        &and($tmp1,$d); # G function - part 3
-
-        &mov($tmp2,&DWP($xo[$ki+1]*4,$K,"",0)) if ($pos != 2);
-        &xor($tmp1,$c);                 # G function - part 4
-
-        &add($a,$tmp1);
-        &mov($tmp1,&Np($c)) if $pos < 1;        # G function - part 1
-        &mov($tmp1,&Np($c)) if $pos == 1;       # G function - part 1
-
-        &rotl($a,$s);
-
-        &add($a,$b);
-        }
-
-sub R2
-        {
-        local($n,$pos,$a,$b,$c,$d,$K,$ki,$s,$t)=@_;
-        # This one is different, only 3 logical operations
-
-if (($n & 1) == 0)
-        {
-        &comment("R2 $ki");
-        # make sure to do 'D' first, not 'B', else we clash with
-        # the last add from the previous round.
-
-        &xor($tmp1,$d); # H function - part 2
-
-        &xor($tmp1,$b); # H function - part 3
-        &lea($a,&DWP($t,$a,$tmp2,1));
-
-        &add($a,$tmp1);
-
-        &rotl($a,$s);
-
-        &mov($tmp2,&DWP($xo[$ki+1]*4,$K,"",0));
-        &mov($tmp1,&Np($c));
-        }
-else
-        {
-        &comment("R2 $ki");
-        # make sure to do 'D' first, not 'B', else we clash with
-        # the last add from the previous round.
-
-        &lea($a,&DWP($t,$a,$tmp2,1));
-
-        &add($b,$c);                    # MOVED FORWARD
-        &xor($tmp1,$d); # H function - part 2
-
-        &xor($tmp1,$b); # H function - part 3
-        &mov($tmp2,&DWP($xo[$ki+1]*4,$K,"",0)) if ($pos != 2);
-
-        &add($a,$tmp1);
-        &mov($tmp1,&Np($c)) if $pos < 1;        # H function - part 1
-        &mov($tmp1,-1) if $pos == 1;            # I function - part 1
-
-        &rotl($a,$s);
-
-        &add($a,$b);
-        }
-        }
-
-sub R3
-        {
-        local($pos,$a,$b,$c,$d,$K,$ki,$s,$t)=@_;
-
-        &comment("R3 $ki");
-
-        # &not($tmp1)
-        &xor($tmp1,$d) if $pos < 0;     # I function - part 2
-
-        &or($tmp1,$b);                          # I function - part 3
-        &lea($a,&DWP($t,$a,$tmp2,1));
-
-        &xor($tmp1,$c);                         # I function - part 4
-        &mov($tmp2,&DWP($xo[$ki+1]*4,$K,"",0))  if $pos != 2; # load X/k value
-        &mov($tmp2,&wparam(0)) if $pos == 2;
-
-        &add($a,$tmp1);
-        &mov($tmp1,-1) if $pos < 1;     # H function - part 1
-        &add($K,64) if $pos >=1 && !$normal;
-
-        &rotl($a,$s);
-
-        &xor($tmp1,&Np($d)) if $pos <= 0;       # I function - part = first time
-        &mov($tmp1,&DWP( 0,$tmp2,"",0)) if $pos > 0;
-        &add($a,$b);
-        }
-
-
-sub md5_block
-        {
-        local($name)=@_;
-
-        &function_begin_B($name,"",3);
-
-        # parameter 1 is the MD5_CTX structure.
-        # A     0
-        # B     4
-        # C     8
-        # D     12
-
-        &push("esi");
-         &push("edi");
-        &mov($tmp1,     &wparam(0)); # edi
-         &mov($X,       &wparam(1)); # esi
-        &mov($C,        &wparam(2));
-         &push("ebp");
-        &shl($C,        6);
-        &push("ebx");
-         &add($C,       $X); # offset we end at
-        &sub($C,        64);
-         &mov($A,       &DWP( 0,$tmp1,"",0));
-        &push($C);      # Put on the TOS
-         &mov($B,       &DWP( 4,$tmp1,"",0));
-        &mov($C,        &DWP( 8,$tmp1,"",0));
-         &mov($D,       &DWP(12,$tmp1,"",0));
-
-        &set_label("start") unless $normal;
-        &comment("");
-        &comment("R0 section");
-
-        &R0(-2,$A,$B,$C,$D,$X, 0, 7,0xd76aa478);
-        &R0( 0,$D,$A,$B,$C,$X, 1,12,0xe8c7b756);
-        &R0( 0,$C,$D,$A,$B,$X, 2,17,0x242070db);
-        &R0( 0,$B,$C,$D,$A,$X, 3,22,0xc1bdceee);
-        &R0( 0,$A,$B,$C,$D,$X, 4, 7,0xf57c0faf);
-        &R0( 0,$D,$A,$B,$C,$X, 5,12,0x4787c62a);
-        &R0( 0,$C,$D,$A,$B,$X, 6,17,0xa8304613);
-        &R0( 0,$B,$C,$D,$A,$X, 7,22,0xfd469501);
-        &R0( 0,$A,$B,$C,$D,$X, 8, 7,0x698098d8);
-        &R0( 0,$D,$A,$B,$C,$X, 9,12,0x8b44f7af);
-        &R0( 0,$C,$D,$A,$B,$X,10,17,0xffff5bb1);
-        &R0( 0,$B,$C,$D,$A,$X,11,22,0x895cd7be);
-        &R0( 0,$A,$B,$C,$D,$X,12, 7,0x6b901122);
-        &R0( 0,$D,$A,$B,$C,$X,13,12,0xfd987193);
-        &R0( 0,$C,$D,$A,$B,$X,14,17,0xa679438e);
-        &R0( 1,$B,$C,$D,$A,$X,15,22,0x49b40821);
-
-        &comment("");
-        &comment("R1 section");
-        &R1(-1,$A,$B,$C,$D,$X,16, 5,0xf61e2562);
-        &R1( 0,$D,$A,$B,$C,$X,17, 9,0xc040b340);
-        &R1( 0,$C,$D,$A,$B,$X,18,14,0x265e5a51);
-        &R1( 0,$B,$C,$D,$A,$X,19,20,0xe9b6c7aa);
-        &R1( 0,$A,$B,$C,$D,$X,20, 5,0xd62f105d);
-        &R1( 0,$D,$A,$B,$C,$X,21, 9,0x02441453);
-        &R1( 0,$C,$D,$A,$B,$X,22,14,0xd8a1e681);
-        &R1( 0,$B,$C,$D,$A,$X,23,20,0xe7d3fbc8);
-        &R1( 0,$A,$B,$C,$D,$X,24, 5,0x21e1cde6);
-        &R1( 0,$D,$A,$B,$C,$X,25, 9,0xc33707d6);
-        &R1( 0,$C,$D,$A,$B,$X,26,14,0xf4d50d87);
-        &R1( 0,$B,$C,$D,$A,$X,27,20,0x455a14ed);
-        &R1( 0,$A,$B,$C,$D,$X,28, 5,0xa9e3e905);
-        &R1( 0,$D,$A,$B,$C,$X,29, 9,0xfcefa3f8);
-        &R1( 0,$C,$D,$A,$B,$X,30,14,0x676f02d9);
-        &R1( 1,$B,$C,$D,$A,$X,31,20,0x8d2a4c8a);
-
-        &comment("");
-        &comment("R2 section");
-        &R2( 0,-1,$A,$B,$C,$D,$X,32, 4,0xfffa3942);
-        &R2( 1, 0,$D,$A,$B,$C,$X,33,11,0x8771f681);
-        &R2( 2, 0,$C,$D,$A,$B,$X,34,16,0x6d9d6122);
-        &R2( 3, 0,$B,$C,$D,$A,$X,35,23,0xfde5380c);
-        &R2( 4, 0,$A,$B,$C,$D,$X,36, 4,0xa4beea44);
-        &R2( 5, 0,$D,$A,$B,$C,$X,37,11,0x4bdecfa9);
-        &R2( 6, 0,$C,$D,$A,$B,$X,38,16,0xf6bb4b60);
-        &R2( 7, 0,$B,$C,$D,$A,$X,39,23,0xbebfbc70);
-        &R2( 8, 0,$A,$B,$C,$D,$X,40, 4,0x289b7ec6);
-        &R2( 9, 0,$D,$A,$B,$C,$X,41,11,0xeaa127fa);
-        &R2(10, 0,$C,$D,$A,$B,$X,42,16,0xd4ef3085);
-        &R2(11, 0,$B,$C,$D,$A,$X,43,23,0x04881d05);
-        &R2(12, 0,$A,$B,$C,$D,$X,44, 4,0xd9d4d039);
-        &R2(13, 0,$D,$A,$B,$C,$X,45,11,0xe6db99e5);
-        &R2(14, 0,$C,$D,$A,$B,$X,46,16,0x1fa27cf8);
-        &R2(15, 1,$B,$C,$D,$A,$X,47,23,0xc4ac5665);
-
-        &comment("");
-        &comment("R3 section");
-        &R3(-1,$A,$B,$C,$D,$X,48, 6,0xf4292244);
-        &R3( 0,$D,$A,$B,$C,$X,49,10,0x432aff97);
-        &R3( 0,$C,$D,$A,$B,$X,50,15,0xab9423a7);
-        &R3( 0,$B,$C,$D,$A,$X,51,21,0xfc93a039);
-        &R3( 0,$A,$B,$C,$D,$X,52, 6,0x655b59c3);
-        &R3( 0,$D,$A,$B,$C,$X,53,10,0x8f0ccc92);
-        &R3( 0,$C,$D,$A,$B,$X,54,15,0xffeff47d);
-        &R3( 0,$B,$C,$D,$A,$X,55,21,0x85845dd1);
-        &R3( 0,$A,$B,$C,$D,$X,56, 6,0x6fa87e4f);
-        &R3( 0,$D,$A,$B,$C,$X,57,10,0xfe2ce6e0);
-        &R3( 0,$C,$D,$A,$B,$X,58,15,0xa3014314);
-        &R3( 0,$B,$C,$D,$A,$X,59,21,0x4e0811a1);
-        &R3( 0,$A,$B,$C,$D,$X,60, 6,0xf7537e82);
-        &R3( 0,$D,$A,$B,$C,$X,61,10,0xbd3af235);
-        &R3( 0,$C,$D,$A,$B,$X,62,15,0x2ad7d2bb);
-        &R3( 2,$B,$C,$D,$A,$X,63,21,0xeb86d391);
-
-        # &mov($tmp2,&wparam(0));       # done in the last R3
-        # &mov($tmp1,   &DWP( 0,$tmp2,"",0)); # done is the last R3
-
-        &add($A,$tmp1);
-         &mov($tmp1,    &DWP( 4,$tmp2,"",0));
-
-        &add($B,$tmp1);
-        &mov($tmp1,     &DWP( 8,$tmp2,"",0));
-
-        &add($C,$tmp1);
-        &mov($tmp1,     &DWP(12,$tmp2,"",0));
-
-        &add($D,$tmp1);
-        &mov(&DWP( 0,$tmp2,"",0),$A);
-
-        &mov(&DWP( 4,$tmp2,"",0),$B);
-        &mov($tmp1,&swtmp(0)) unless $normal;
-
-        &mov(&DWP( 8,$tmp2,"",0),$C);
-         &mov(&DWP(12,$tmp2,"",0),$D);
-
-        &cmp($tmp1,$X) unless $normal;                  # check count
-         &jge(&label("start")) unless $normal;
-
-        &pop("eax"); # pop the temp variable off the stack
-         &pop("ebx");
-        &pop("ebp");
-         &pop("edi");
-        &pop("esi");
-         &ret();
-        &function_end_B($name);
-        }
-
diff --git a/src/lib/libcrypto/md5/md5.h b/src/lib/libcrypto/md5/md5.h
deleted file mode 100644
index bdab6d45e8..0000000000
--- a/src/lib/libcrypto/md5/md5.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/md5/md5.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_MD5_H
-#define HEADER_MD5_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_MD5
-#error MD5 is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(WIN16) || defined(__LP32__)
-#define MD5_LONG unsigned long
-#elif defined(_CRAY) || defined(__ILP64__)
-#define MD5_LONG unsigned long
-#define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-#else
-#define MD5_LONG unsigned int
-#endif
-
-#define MD5_CBLOCK      64
-#define MD5_LBLOCK      (MD5_CBLOCK/4)
-#define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st
-        {
-        MD5_LONG A,B,C,D;
-        MD5_LONG Nl,Nh;
-        MD5_LONG data[MD5_LBLOCK];
-        int num;
-        } MD5_CTX;
-
-void MD5_Init(MD5_CTX *c);
-void MD5_Update(MD5_CTX *c, const unsigned char *data, unsigned long len);
-void MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(unsigned char *d, unsigned long n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/md5/md5_dgst.c b/src/lib/libcrypto/md5/md5_dgst.c
deleted file mode 100644
index ba0115ae79..0000000000
--- a/src/lib/libcrypto/md5/md5_dgst.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* crypto/md5/md5_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 "md5_locl.h"
-#include <openssl/opensslv.h>
-
-char *MD5_version="MD5" OPENSSL_VERSION_PTEXT;
-
-/* Implemented from RFC1321 The MD5 Message-Digest Algorithm
- */
-
-#define INIT_DATA_A (unsigned long)0x67452301L
-#define INIT_DATA_B (unsigned long)0xefcdab89L
-#define INIT_DATA_C (unsigned long)0x98badcfeL
-#define INIT_DATA_D (unsigned long)0x10325476L
-
-void MD5_Init(MD5_CTX *c)
-        {
-        c->A=INIT_DATA_A;
-        c->B=INIT_DATA_B;
-        c->C=INIT_DATA_C;
-        c->D=INIT_DATA_D;
-        c->Nl=0;
-        c->Nh=0;
-        c->num=0;
-        }
-
-#ifndef md5_block_host_order
-void md5_block_host_order (MD5_CTX *c, const void *data, int num)
-        {
-        const MD5_LONG *X=data;
-        register unsigned long A,B,C,D;
-        /*
-         * In case you wonder why A-D are declared as long and not
-         * as MD5_LONG. Doing so results in slight performance
-         * boost on LP64 architectures. The catch is we don't
-         * really care if 32 MSBs of a 64-bit register get polluted
-         * with eventual overflows as we *save* only 32 LSBs in
-         * *either* case. Now declaring 'em long excuses the compiler
-         * from keeping 32 MSBs zeroed resulting in 13% performance
-         * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
-         * Well, to be honest it should say that this *prevents* 
-         * performance degradation.
-         *
-         *                              <appro@fy.chalmers.se>
-         */
-
-        A=c->A;
-        B=c->B;
-        C=c->C;
-        D=c->D;
-
-        for (;num--;X+=HASH_LBLOCK)
-                {
-        /* Round 0 */
-        R0(A,B,C,D,X[ 0], 7,0xd76aa478L);
-        R0(D,A,B,C,X[ 1],12,0xe8c7b756L);
-        R0(C,D,A,B,X[ 2],17,0x242070dbL);
-        R0(B,C,D,A,X[ 3],22,0xc1bdceeeL);
-        R0(A,B,C,D,X[ 4], 7,0xf57c0fafL);
-        R0(D,A,B,C,X[ 5],12,0x4787c62aL);
-        R0(C,D,A,B,X[ 6],17,0xa8304613L);
-        R0(B,C,D,A,X[ 7],22,0xfd469501L);
-        R0(A,B,C,D,X[ 8], 7,0x698098d8L);
-        R0(D,A,B,C,X[ 9],12,0x8b44f7afL);
-        R0(C,D,A,B,X[10],17,0xffff5bb1L);
-        R0(B,C,D,A,X[11],22,0x895cd7beL);
-        R0(A,B,C,D,X[12], 7,0x6b901122L);
-        R0(D,A,B,C,X[13],12,0xfd987193L);
-        R0(C,D,A,B,X[14],17,0xa679438eL);
-        R0(B,C,D,A,X[15],22,0x49b40821L);
-        /* Round 1 */
-        R1(A,B,C,D,X[ 1], 5,0xf61e2562L);
-        R1(D,A,B,C,X[ 6], 9,0xc040b340L);
-        R1(C,D,A,B,X[11],14,0x265e5a51L);
-        R1(B,C,D,A,X[ 0],20,0xe9b6c7aaL);
-        R1(A,B,C,D,X[ 5], 5,0xd62f105dL);
-        R1(D,A,B,C,X[10], 9,0x02441453L);
-        R1(C,D,A,B,X[15],14,0xd8a1e681L);
-        R1(B,C,D,A,X[ 4],20,0xe7d3fbc8L);
-        R1(A,B,C,D,X[ 9], 5,0x21e1cde6L);
-        R1(D,A,B,C,X[14], 9,0xc33707d6L);
-        R1(C,D,A,B,X[ 3],14,0xf4d50d87L);
-        R1(B,C,D,A,X[ 8],20,0x455a14edL);
-        R1(A,B,C,D,X[13], 5,0xa9e3e905L);
-        R1(D,A,B,C,X[ 2], 9,0xfcefa3f8L);
-        R1(C,D,A,B,X[ 7],14,0x676f02d9L);
-        R1(B,C,D,A,X[12],20,0x8d2a4c8aL);
-        /* Round 2 */
-        R2(A,B,C,D,X[ 5], 4,0xfffa3942L);
-        R2(D,A,B,C,X[ 8],11,0x8771f681L);
-        R2(C,D,A,B,X[11],16,0x6d9d6122L);
-        R2(B,C,D,A,X[14],23,0xfde5380cL);
-        R2(A,B,C,D,X[ 1], 4,0xa4beea44L);
-        R2(D,A,B,C,X[ 4],11,0x4bdecfa9L);
-        R2(C,D,A,B,X[ 7],16,0xf6bb4b60L);
-        R2(B,C,D,A,X[10],23,0xbebfbc70L);
-        R2(A,B,C,D,X[13], 4,0x289b7ec6L);
-        R2(D,A,B,C,X[ 0],11,0xeaa127faL);
-        R2(C,D,A,B,X[ 3],16,0xd4ef3085L);
-        R2(B,C,D,A,X[ 6],23,0x04881d05L);
-        R2(A,B,C,D,X[ 9], 4,0xd9d4d039L);
-        R2(D,A,B,C,X[12],11,0xe6db99e5L);
-        R2(C,D,A,B,X[15],16,0x1fa27cf8L);
-        R2(B,C,D,A,X[ 2],23,0xc4ac5665L);
-        /* Round 3 */
-        R3(A,B,C,D,X[ 0], 6,0xf4292244L);
-        R3(D,A,B,C,X[ 7],10,0x432aff97L);
-        R3(C,D,A,B,X[14],15,0xab9423a7L);
-        R3(B,C,D,A,X[ 5],21,0xfc93a039L);
-        R3(A,B,C,D,X[12], 6,0x655b59c3L);
-        R3(D,A,B,C,X[ 3],10,0x8f0ccc92L);
-        R3(C,D,A,B,X[10],15,0xffeff47dL);
-        R3(B,C,D,A,X[ 1],21,0x85845dd1L);
-        R3(A,B,C,D,X[ 8], 6,0x6fa87e4fL);
-        R3(D,A,B,C,X[15],10,0xfe2ce6e0L);
-        R3(C,D,A,B,X[ 6],15,0xa3014314L);
-        R3(B,C,D,A,X[13],21,0x4e0811a1L);
-        R3(A,B,C,D,X[ 4], 6,0xf7537e82L);
-        R3(D,A,B,C,X[11],10,0xbd3af235L);
-        R3(C,D,A,B,X[ 2],15,0x2ad7d2bbL);
-        R3(B,C,D,A,X[ 9],21,0xeb86d391L);
-
-        A = c->A += A;
-        B = c->B += B;
-        C = c->C += C;
-        D = c->D += D;
-                }
-        }
-#endif
-
-#ifndef md5_block_data_order
-void md5_block_data_order (MD5_CTX *c, const void *data_, int num)
-        {
-        const unsigned char *data=data_;
-        register unsigned long A,B,C,D,l;
-        /*
-         * In case you wonder why A-D are declared as long and not
-         * as MD5_LONG. Doing so results in slight performance
-         * boost on LP64 architectures. The catch is we don't
-         * really care if 32 MSBs of a 64-bit register get polluted
-         * with eventual overflows as we *save* only 32 LSBs in
-         * *either* case. Now declaring 'em long excuses the compiler
-         * from keeping 32 MSBs zeroed resulting in 13% performance
-         * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
-         * Well, to be honest it should say that this *prevents* 
-         * performance degradation.
-         *
-         *                              <appro@fy.chalmers.se>
-         */
-        MD5_LONG X[MD5_LBLOCK];
-        /*
-         * In case you wonder why don't I use c->data for this.
-         * RISCs usually have a handful of registers and if X is
-         * declared as automatic array good optimizing compiler
-         * shall accomodate at least part of it in register bank
-         * instead of memory.
-         *
-         *                              <appro@fy.chalmers.se>
-         */
-
-        A=c->A;
-        B=c->B;
-        C=c->C;
-        D=c->D;
-
-        for (;num--;)
-                {
-        HOST_c2l(data,l); X[ 0]=l;              HOST_c2l(data,l); X[ 1]=l;
-        /* Round 0 */
-        R0(A,B,C,D,X[ 0], 7,0xd76aa478L);       HOST_c2l(data,l); X[ 2]=l;
-        R0(D,A,B,C,X[ 1],12,0xe8c7b756L);       HOST_c2l(data,l); X[ 3]=l;
-        R0(C,D,A,B,X[ 2],17,0x242070dbL);       HOST_c2l(data,l); X[ 4]=l;
-        R0(B,C,D,A,X[ 3],22,0xc1bdceeeL);       HOST_c2l(data,l); X[ 5]=l;
-        R0(A,B,C,D,X[ 4], 7,0xf57c0fafL);       HOST_c2l(data,l); X[ 6]=l;
-        R0(D,A,B,C,X[ 5],12,0x4787c62aL);       HOST_c2l(data,l); X[ 7]=l;
-        R0(C,D,A,B,X[ 6],17,0xa8304613L);       HOST_c2l(data,l); X[ 8]=l;
-        R0(B,C,D,A,X[ 7],22,0xfd469501L);       HOST_c2l(data,l); X[ 9]=l;
-        R0(A,B,C,D,X[ 8], 7,0x698098d8L);       HOST_c2l(data,l); X[10]=l;
-        R0(D,A,B,C,X[ 9],12,0x8b44f7afL);       HOST_c2l(data,l); X[11]=l;
-        R0(C,D,A,B,X[10],17,0xffff5bb1L);       HOST_c2l(data,l); X[12]=l;
-        R0(B,C,D,A,X[11],22,0x895cd7beL);       HOST_c2l(data,l); X[13]=l;
-        R0(A,B,C,D,X[12], 7,0x6b901122L);       HOST_c2l(data,l); X[14]=l;
-        R0(D,A,B,C,X[13],12,0xfd987193L);       HOST_c2l(data,l); X[15]=l;
-        R0(C,D,A,B,X[14],17,0xa679438eL);
-        R0(B,C,D,A,X[15],22,0x49b40821L);
-        /* Round 1 */
-        R1(A,B,C,D,X[ 1], 5,0xf61e2562L);
-        R1(D,A,B,C,X[ 6], 9,0xc040b340L);
-        R1(C,D,A,B,X[11],14,0x265e5a51L);
-        R1(B,C,D,A,X[ 0],20,0xe9b6c7aaL);
-        R1(A,B,C,D,X[ 5], 5,0xd62f105dL);
-        R1(D,A,B,C,X[10], 9,0x02441453L);
-        R1(C,D,A,B,X[15],14,0xd8a1e681L);
-        R1(B,C,D,A,X[ 4],20,0xe7d3fbc8L);
-        R1(A,B,C,D,X[ 9], 5,0x21e1cde6L);
-        R1(D,A,B,C,X[14], 9,0xc33707d6L);
-        R1(C,D,A,B,X[ 3],14,0xf4d50d87L);
-        R1(B,C,D,A,X[ 8],20,0x455a14edL);
-        R1(A,B,C,D,X[13], 5,0xa9e3e905L);
-        R1(D,A,B,C,X[ 2], 9,0xfcefa3f8L);
-        R1(C,D,A,B,X[ 7],14,0x676f02d9L);
-        R1(B,C,D,A,X[12],20,0x8d2a4c8aL);
-        /* Round 2 */
-        R2(A,B,C,D,X[ 5], 4,0xfffa3942L);
-        R2(D,A,B,C,X[ 8],11,0x8771f681L);
-        R2(C,D,A,B,X[11],16,0x6d9d6122L);
-        R2(B,C,D,A,X[14],23,0xfde5380cL);
-        R2(A,B,C,D,X[ 1], 4,0xa4beea44L);
-        R2(D,A,B,C,X[ 4],11,0x4bdecfa9L);
-        R2(C,D,A,B,X[ 7],16,0xf6bb4b60L);
-        R2(B,C,D,A,X[10],23,0xbebfbc70L);
-        R2(A,B,C,D,X[13], 4,0x289b7ec6L);
-        R2(D,A,B,C,X[ 0],11,0xeaa127faL);
-        R2(C,D,A,B,X[ 3],16,0xd4ef3085L);
-        R2(B,C,D,A,X[ 6],23,0x04881d05L);
-        R2(A,B,C,D,X[ 9], 4,0xd9d4d039L);
-        R2(D,A,B,C,X[12],11,0xe6db99e5L);
-        R2(C,D,A,B,X[15],16,0x1fa27cf8L);
-        R2(B,C,D,A,X[ 2],23,0xc4ac5665L);
-        /* Round 3 */
-        R3(A,B,C,D,X[ 0], 6,0xf4292244L);
-        R3(D,A,B,C,X[ 7],10,0x432aff97L);
-        R3(C,D,A,B,X[14],15,0xab9423a7L);
-        R3(B,C,D,A,X[ 5],21,0xfc93a039L);
-        R3(A,B,C,D,X[12], 6,0x655b59c3L);
-        R3(D,A,B,C,X[ 3],10,0x8f0ccc92L);
-        R3(C,D,A,B,X[10],15,0xffeff47dL);
-        R3(B,C,D,A,X[ 1],21,0x85845dd1L);
-        R3(A,B,C,D,X[ 8], 6,0x6fa87e4fL);
-        R3(D,A,B,C,X[15],10,0xfe2ce6e0L);
-        R3(C,D,A,B,X[ 6],15,0xa3014314L);
-        R3(B,C,D,A,X[13],21,0x4e0811a1L);
-        R3(A,B,C,D,X[ 4], 6,0xf7537e82L);
-        R3(D,A,B,C,X[11],10,0xbd3af235L);
-        R3(C,D,A,B,X[ 2],15,0x2ad7d2bbL);
-        R3(B,C,D,A,X[ 9],21,0xeb86d391L);
-
-        A = c->A += A;
-        B = c->B += B;
-        C = c->C += C;
-        D = c->D += D;
-                }
-        }
-#endif
-
-#ifdef undef
-int printit(unsigned long *l)
-        {
-        int i,ii;
-
-        for (i=0; i<2; i++)
-                {
-                for (ii=0; ii<8; ii++)
-                        {
-                        fprintf(stderr,"%08lx ",l[i*8+ii]);
-                        }
-                fprintf(stderr,"\n");
-                }
-        }
-#endif
diff --git a/src/lib/libcrypto/md5/md5_locl.h b/src/lib/libcrypto/md5/md5_locl.h
deleted file mode 100644
index 9d04696dbd..0000000000
--- a/src/lib/libcrypto/md5/md5_locl.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* crypto/md5/md5_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/opensslconf.h>
-#include <openssl/md5.h>
-
-#ifndef MD5_LONG_LOG2
-#define MD5_LONG_LOG2 2 /* default to 32 bits */
-#endif
-
-#ifdef MD5_ASM
-# if defined(__i386) || defined(_M_IX86)
-#  define md5_block_host_order md5_block_asm_host_order
-# elif defined(__sparc) && defined(ULTRASPARC)
-   void md5_block_asm_data_order_aligned (MD5_CTX *c, const MD5_LONG *p,int num);
-#  define HASH_BLOCK_DATA_ORDER_ALIGNED md5_block_asm_data_order_aligned
-# endif
-#endif
-
-void md5_block_host_order (MD5_CTX *c, const void *p,int num);
-void md5_block_data_order (MD5_CTX *c, const void *p,int num);
-
-#if defined(__i386) || defined(_M_IX86)
-/*
- * *_block_host_order is expected to handle aligned data while
- * *_block_data_order - unaligned. As algorithm and host (x86)
- * are in this case of the same "endianess" these two are
- * otherwise indistinguishable. But normally you don't want to
- * call the same function because unaligned access in places
- * where alignment is expected is usually a "Bad Thing". Indeed,
- * on RISCs you get punished with BUS ERROR signal or *severe*
- * performance degradation. Intel CPUs are in turn perfectly
- * capable of loading unaligned data without such drastic side
- * effect. Yes, they say it's slower than aligned load, but no
- * exception is generated and therefore performance degradation
- * is *incomparable* with RISCs. What we should weight here is
- * costs of unaligned access against costs of aligning data.
- * According to my measurements allowing unaligned access results
- * in ~9% performance improvement on Pentium II operating at
- * 266MHz. I won't be surprised if the difference will be higher
- * on faster systems:-)
- *
- *                              <appro@fy.chalmers.se>
- */
-#define md5_block_data_order md5_block_host_order
-#endif
-
-#define DATA_ORDER_IS_LITTLE_ENDIAN
-
-#define HASH_LONG               MD5_LONG
-#define HASH_LONG_LOG2          MD5_LONG_LOG2
-#define HASH_CTX                MD5_CTX
-#define HASH_CBLOCK             MD5_CBLOCK
-#define HASH_LBLOCK             MD5_LBLOCK
-#define HASH_UPDATE             MD5_Update
-#define HASH_TRANSFORM          MD5_Transform
-#define HASH_FINAL              MD5_Final
-#define HASH_BLOCK_HOST_ORDER   md5_block_host_order
-#if !defined(L_ENDIAN) || defined(md5_block_data_order)
-#define HASH_BLOCK_DATA_ORDER   md5_block_data_order
-/*
- * Little-endians (Intel and Alpha) feel better without this.
- * It looks like memcpy does better job than generic
- * md5_block_data_order on copying-n-aligning input data.
- * But franlky speaking I didn't expect such result on Alpha.
- * On the other hand I've got this with egcs-1.0.2 and if
- * program is compiled with another (better?) compiler it
- * might turn out other way around.
- *
- *                              <appro@fy.chalmers.se>
- */
-#endif
-
-#ifndef FLAT_INC
-#include "../md32_common.h"
-#else
-#include "md32_common.h"
-#endif
-
-/*
-#define F(x,y,z)        (((x) & (y))  |  ((~(x)) & (z)))
-#define G(x,y,z)        (((x) & (z))  |  ((y) & (~(z))))
-*/
-
-/* As pointed out by Wei Dai <weidai@eskimo.com>, the above can be
- * simplified to the code below.  Wei attributes these optimisations
- * to Peter Gutmann's SHS code, and he attributes it to Rich Schroeppel.
- */
-#define F(b,c,d)        ((((c) ^ (d)) & (b)) ^ (d))
-#define G(b,c,d)        ((((b) ^ (c)) & (d)) ^ (c))
-#define H(b,c,d)        ((b) ^ (c) ^ (d))
-#define I(b,c,d)        (((~(d)) | (b)) ^ (c))
-
-#define R0(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+F((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };\
-
-#define R1(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+G((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
-
-#define R2(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+H((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
-
-#define R3(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+I((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
diff --git a/src/lib/libcrypto/md5/md5_one.c b/src/lib/libcrypto/md5/md5_one.c
deleted file mode 100644
index 4b10e7f940..0000000000
--- a/src/lib/libcrypto/md5/md5_one.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* crypto/md5/md5_one.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/md5.h>
-
-#ifdef CHARSET_EBCDIC
-#include <openssl/ebcdic.h>
-#endif
-
-unsigned char *MD5(unsigned char *d, unsigned long n, unsigned char *md)
-        {
-        MD5_CTX c;
-        static unsigned char m[MD5_DIGEST_LENGTH];
-
-        if (md == NULL) md=m;
-        MD5_Init(&c);
-#ifndef CHARSET_EBCDIC
-        MD5_Update(&c,d,n);
-#else
-        {
-                char temp[1024];
-                unsigned long chunk;
-
-                while (n > 0)
-                {
-                        chunk = (n > sizeof(temp)) ? sizeof(temp) : n;
-                        ebcdic2ascii(temp, d, chunk);
-                        MD5_Update(&c,temp,chunk);
-                        n -= chunk;
-                        d += chunk;
-                }
-        }
-#endif
-        MD5_Final(md,&c);
-        memset(&c,0,sizeof(c)); /* security consideration */
-        return(md);
-        }
-
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
deleted file mode 100644
index 4da5e45b9c..0000000000
--- a/src/lib/libcrypto/objects/o_names.c
+++ /dev/null
@@ -1,243 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/lhash.h>
-#include <openssl/objects.h>
-
-/* I use the ex_data stuff to manage the identifiers for the obj_name_types
- * that applications may define.  I only really use the free function field.
- */
-static LHASH *names_lh=NULL;
-static int names_type_num=OBJ_NAME_TYPE_NUM;
-static STACK *names_cmp=NULL;
-static STACK *names_hash=NULL;
-static STACK *names_free=NULL;
-
-static unsigned long obj_name_hash(OBJ_NAME *a);
-static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b);
-
-int OBJ_NAME_init(void)
-        {
-        if (names_lh != NULL) return(1);
-        MemCheck_off();
-        names_lh=lh_new(obj_name_hash,obj_name_cmp);
-        MemCheck_on();
-        return(names_lh != NULL);
-        }
-
-int OBJ_NAME_new_index(unsigned long (*hash_func)(), int (*cmp_func)(),
-             void (*free_func)())
-        {
-        int ret;
-        int i;
-
-        if (names_free == NULL)
-                {
-                MemCheck_off();
-                names_hash=sk_new_null();
-                names_cmp=sk_new_null();
-                names_free=sk_new_null();
-                MemCheck_on();
-                }
-        if ((names_free == NULL) || (names_hash == NULL) || (names_cmp == NULL))
-                {
-                /* ERROR */
-                return(0);
-                }
-        ret=names_type_num;
-        names_type_num++;
-        for (i=sk_num(names_free); i<names_type_num; i++)
-                {
-                MemCheck_off();
-                sk_push(names_hash,(char *)strcmp);
-                sk_push(names_cmp,(char *)lh_strhash);
-                sk_push(names_free,NULL);
-                MemCheck_on();
-                }
-        if (hash_func != NULL)
-                sk_set(names_hash,ret,(char *)hash_func);
-        if (cmp_func != NULL)
-                sk_set(names_cmp,ret,(char *)cmp_func);
-        if (free_func != NULL)
-                sk_set(names_free,ret,(char *)free_func);
-        return(ret);
-        }
-
-static int obj_name_cmp(OBJ_NAME *a, OBJ_NAME *b)
-        {
-        int ret;
-        int (*cmp)();
-
-        ret=a->type-b->type;
-        if (ret == 0)
-                {
-                if ((names_cmp != NULL) && (sk_num(names_cmp) > a->type))
-                        {
-                        cmp=(int (*)())sk_value(names_cmp,a->type);
-                        ret=cmp(a->name,b->name);
-                        }
-                else
-                        ret=strcmp(a->name,b->name);
-                }
-        return(ret);
-        }
-
-static unsigned long obj_name_hash(OBJ_NAME *a)
-        {
-        unsigned long ret;
-        unsigned long (*hash)();
-
-        if ((names_hash != NULL) && (sk_num(names_hash) > a->type))
-                {
-                hash=(unsigned long (*)())sk_value(names_hash,a->type);
-                ret=hash(a->name);
-                }
-        else
-                {
-                ret=lh_strhash(a->name);
-                }
-        ret^=a->type;
-        return(ret);
-        }
-
-const char *OBJ_NAME_get(const char *name, int type)
-        {
-        OBJ_NAME on,*ret;
-        int num=0,alias;
-
-        if (name == NULL) return(NULL);
-        if ((names_lh == NULL) && !OBJ_NAME_init()) return(NULL);
-
-        alias=type&OBJ_NAME_ALIAS;
-        type&= ~OBJ_NAME_ALIAS;
-
-        on.name=name;
-        on.type=type;
-
-        for (;;)
-                {
-                ret=(OBJ_NAME *)lh_retrieve(names_lh,(char *)&on);
-                if (ret == NULL) return(NULL);
-                if ((ret->alias) && !alias)
-                        {
-                        if (++num > 10) return(NULL);
-                        on.name=ret->data;
-                        }
-                else
-                        {
-                        return(ret->data);
-                        }
-                }
-        }
-
-int OBJ_NAME_add(const char *name, int type, const char *data)
-        {
-        void (*f)();
-        OBJ_NAME *onp,*ret;
-        int alias;
-
-        if ((names_lh == NULL) && !OBJ_NAME_init()) return(0);
-
-        alias=type&OBJ_NAME_ALIAS;
-        type&= ~OBJ_NAME_ALIAS;
-
-        onp=(OBJ_NAME *)Malloc(sizeof(OBJ_NAME));
-        if (onp == NULL)
-                {
-                /* ERROR */
-                return(0);
-                }
-
-        onp->name=name;
-        onp->alias=alias;
-        onp->type=type;
-        onp->data=data;
-
-        ret=(OBJ_NAME *)lh_insert(names_lh,(char *)onp);
-        if (ret != NULL)
-                {
-                /* free things */
-                if ((names_free != NULL) && (sk_num(names_free) > ret->type))
-                        {
-                        f=(void (*)())sk_value(names_free,ret->type);
-                        f(ret->name,ret->type,ret->data);
-                        }
-                Free((char *)ret);
-                }
-        else
-                {
-                if (lh_error(names_lh))
-                        {
-                        /* ERROR */
-                        return(0);
-                        }
-                }
-        return(1);
-        }
-
-int OBJ_NAME_remove(const char *name, int type)
-        {
-        OBJ_NAME on,*ret;
-        void (*f)();
-
-        if (names_lh == NULL) return(0);
-
-        type&= ~OBJ_NAME_ALIAS;
-        on.name=name;
-        on.type=type;
-        ret=(OBJ_NAME *)lh_delete(names_lh,(char *)&on);
-        if (ret != NULL)
-                {
-                /* free things */
-                if ((names_free != NULL) && (sk_num(names_free) > type))
-                        {
-                        f=(void (*)())sk_value(names_free,type);
-                        f(ret->name,ret->type,ret->data);
-                        }
-                Free((char *)ret);
-                return(1);
-                }
-        else
-                return(0);
-        }
-
-static int free_type;
-
-static void names_lh_free(OBJ_NAME *onp, int type)
-{
-        if(onp == NULL)
-            return;
-
-        if ((free_type < 0) || (free_type == onp->type))
-                {
-                OBJ_NAME_remove(onp->name,onp->type);
-                }
-        }
-
-void OBJ_NAME_cleanup(int type)
-        {
-        unsigned long down_load;
-
-        if (names_lh == NULL) return;
-
-        free_type=type;
-        down_load=names_lh->down_load;
-        names_lh->down_load=0;
-
-        lh_doall(names_lh,names_lh_free);
-        if (type < 0)
-                {
-                lh_free(names_lh);
-                sk_free(names_hash);
-                sk_free(names_cmp);
-                sk_free(names_free);
-                names_lh=NULL;
-                names_hash=NULL;
-                names_cmp=NULL;
-                names_free=NULL;
-                }
-        else
-                names_lh->down_load=down_load;
-        }
-
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
deleted file mode 100644
index d47b874399..0000000000
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ /dev/null
@@ -1,653 +0,0 @@
-/* crypto/objects/obj_dat.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 "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-
-/* obj_dat.h is generated from objects.h by obj_dat.pl */
-#ifndef NO_OBJECT
-#include "obj_dat.h"
-#else
-/* You will have to load all the objects needed manually in the application */
-#define NUM_NID 0
-#define NUM_SN 0
-#define NUM_LN 0
-#define NUM_OBJ 0
-static unsigned char lvalues[1];
-static ASN1_OBJECT nid_objs[1];
-static ASN1_OBJECT *sn_objs[1];
-static ASN1_OBJECT *ln_objs[1];
-static ASN1_OBJECT *obj_objs[1];
-#endif
-
-static int sn_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
-static int ln_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
-static int obj_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
-#define ADDED_DATA      0
-#define ADDED_SNAME     1
-#define ADDED_LNAME     2
-#define ADDED_NID       3
-
-typedef struct added_obj_st
-        {
-        int type;
-        ASN1_OBJECT *obj;
-        } ADDED_OBJ;
-
-static int new_nid=NUM_NID;
-static LHASH *added=NULL;
-
-static int sn_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
-        { return(strcmp((*ap)->sn,(*bp)->sn)); }
-
-static int ln_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
-        { return(strcmp((*ap)->ln,(*bp)->ln)); }
-
-static unsigned long add_hash(ADDED_OBJ *ca)
-        {
-        ASN1_OBJECT *a;
-        int i;
-        unsigned long ret=0;
-        unsigned char *p;
-
-        a=ca->obj;
-        switch (ca->type)
-                {
-        case ADDED_DATA:
-                ret=a->length<<20L;
-                p=(unsigned char *)a->data;
-                for (i=0; i<a->length; i++)
-                        ret^=p[i]<<((i*3)%24);
-                break;
-        case ADDED_SNAME:
-                ret=lh_strhash(a->sn);
-                break;
-        case ADDED_LNAME:
-                ret=lh_strhash(a->ln);
-                break;
-        case ADDED_NID:
-                ret=a->nid;
-                break;
-        default:
-                abort();
-                }
-        ret&=0x3fffffffL;
-        ret|=ca->type<<30L;
-        return(ret);
-        }
-
-static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb)
-        {
-        ASN1_OBJECT *a,*b;
-        int i;
-
-        i=ca->type-cb->type;
-        if (i) return(i);
-        a=ca->obj;
-        b=cb->obj;
-        switch (ca->type)
-                {
-        case ADDED_DATA:
-                i=(a->length - b->length);
-                if (i) return(i);
-                return(memcmp(a->data,b->data,a->length));
-        case ADDED_SNAME:
-                if (a->sn == NULL) return(-1);
-                else if (b->sn == NULL) return(1);
-                else return(strcmp(a->sn,b->sn));
-        case ADDED_LNAME:
-                if (a->ln == NULL) return(-1);
-                else if (b->ln == NULL) return(1);
-                else return(strcmp(a->ln,b->ln));
-        case ADDED_NID:
-                return(a->nid-b->nid);
-        default:
-                abort();
-                }
-        return(1); /* should not get here */
-        }
-
-static int init_added(void)
-        {
-        if (added != NULL) return(1);
-        added=lh_new(add_hash,add_cmp);
-        return(added != NULL);
-        }
-
-static void cleanup1(ADDED_OBJ *a)
-        {
-        a->obj->nid=0;
-        a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC|
-                        ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
-                        ASN1_OBJECT_FLAG_DYNAMIC_DATA;
-        }
-
-static void cleanup2(ADDED_OBJ *a)
-        { a->obj->nid++; }
-
-static void cleanup3(ADDED_OBJ *a)
-        {
-        if (--a->obj->nid == 0)
-                ASN1_OBJECT_free(a->obj);
-        Free(a);
-        }
-
-void OBJ_cleanup(void)
-        {
-        if (added == NULL) return;
-        added->down_load=0;
-        lh_doall(added,cleanup1); /* zero counters */
-        lh_doall(added,cleanup2); /* set counters */
-        lh_doall(added,cleanup3); /* free objects */
-        lh_free(added);
-        added=NULL;
-        }
-
-int OBJ_new_nid(int num)
-        {
-        int i;
-
-        i=new_nid;
-        new_nid+=num;
-        return(i);
-        }
-
-int OBJ_add_object(ASN1_OBJECT *obj)
-        {
-        ASN1_OBJECT *o;
-        ADDED_OBJ *ao[4],*aop;
-        int i;
-
-        if (added == NULL)
-                if (!init_added()) return(0);
-        if ((o=OBJ_dup(obj)) == NULL) goto err;
-        ao[ADDED_DATA]=NULL;
-        ao[ADDED_SNAME]=NULL;
-        ao[ADDED_LNAME]=NULL;
-        ao[ADDED_NID]=NULL;
-        ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
-        if ((o->length != 0) && (obj->data != NULL))
-                ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
-        if (o->sn != NULL)
-                ao[ADDED_SNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
-        if (o->ln != NULL)
-                ao[ADDED_LNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
-
-        for (i=ADDED_DATA; i<=ADDED_NID; i++)
-                {
-                if (ao[i] != NULL)
-                        {
-                        ao[i]->type=i;
-                        ao[i]->obj=o;
-                        aop=(ADDED_OBJ *)lh_insert(added,(char *)ao[i]);
-                        /* memory leak, buit should not normally matter */
-                        if (aop != NULL)
-                                Free(aop);
-                        }
-                }
-        o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
-                        ASN1_OBJECT_FLAG_DYNAMIC_DATA);
-
-        return(o->nid);
-err:
-        for (i=ADDED_DATA; i<=ADDED_NID; i++)
-                if (ao[i] != NULL) Free(ao[i]);
-        if (o != NULL) Free(o);
-        return(NID_undef);
-        }
-
-ASN1_OBJECT *OBJ_nid2obj(int n)
-        {
-        ADDED_OBJ ad,*adp;
-        ASN1_OBJECT ob;
-
-        if ((n >= 0) && (n < NUM_NID))
-                {
-                if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                return((ASN1_OBJECT *)&(nid_objs[n]));
-                }
-        else if (added == NULL)
-                return(NULL);
-        else
-                {
-                ad.type=ADDED_NID;
-                ad.obj= &ob;
-                ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL)
-                        return(adp->obj);
-                else
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2OBJ,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                }
-        }
-
-const char *OBJ_nid2sn(int n)
-        {
-        ADDED_OBJ ad,*adp;
-        ASN1_OBJECT ob;
-
-        if ((n >= 0) && (n < NUM_NID))
-                {
-                if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                return(nid_objs[n].sn);
-                }
-        else if (added == NULL)
-                return(NULL);
-        else
-                {
-                ad.type=ADDED_NID;
-                ad.obj= &ob;
-                ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL)
-                        return(adp->obj->sn);
-                else
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2SN,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                }
-        }
-
-const char *OBJ_nid2ln(int n)
-        {
-        ADDED_OBJ ad,*adp;
-        ASN1_OBJECT ob;
-
-        if ((n >= 0) && (n < NUM_NID))
-                {
-                if ((n != NID_undef) && (nid_objs[n].nid == NID_undef))
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                return(nid_objs[n].ln);
-                }
-        else if (added == NULL)
-                return(NULL);
-        else
-                {
-                ad.type=ADDED_NID;
-                ad.obj= &ob;
-                ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL)
-                        return(adp->obj->ln);
-                else
-                        {
-                        OBJerr(OBJ_F_OBJ_NID2LN,OBJ_R_UNKNOWN_NID);
-                        return(NULL);
-                        }
-                }
-        }
-
-int OBJ_obj2nid(ASN1_OBJECT *a)
-        {
-        ASN1_OBJECT **op;
-        ADDED_OBJ ad,*adp;
-
-        if (a == NULL)
-                return(NID_undef);
-        if (a->nid != 0)
-                return(a->nid);
-
-        if (added != NULL)
-                {
-                ad.type=ADDED_DATA;
-                ad.obj=a;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL) return (adp->obj->nid);
-                }
-        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ,
-                sizeof(ASN1_OBJECT *),(int (*)())obj_cmp);
-        if (op == NULL)
-                return(NID_undef);
-        return((*op)->nid);
-        }
-
-/* Convert an object name into an ASN1_OBJECT
- * if "noname" is not set then search for short and long names first.
- * This will convert the "dotted" form into an object: unlike OBJ_txt2nid
- * it can be used with any objects, not just registered ones.
- */
-
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
-        {
-        int nid = NID_undef;
-        ASN1_OBJECT *op=NULL;
-        unsigned char *buf,*p;
-        int i, j;
-
-        if(!no_name) {
-                if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
-                        ((nid = OBJ_ln2nid(s)) != NID_undef) ) 
-                                        return OBJ_nid2obj(nid);
-        }
-
-        /* Work out size of content octets */
-        i=a2d_ASN1_OBJECT(NULL,0,s,-1);
-        if (i <= 0) {
-                /* Clear the error */
-                ERR_get_error();
-                return NULL;
-        }
-        /* Work out total size */
-        j = ASN1_object_size(0,i,V_ASN1_OBJECT);
-
-        if((buf=(unsigned char *)Malloc(j)) == NULL) return NULL;
-
-        p = buf;
-        /* Write out tag+length */
-        ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
-        /* Write out contents */
-        a2d_ASN1_OBJECT(p,i,s,-1);
-        
-        p=buf;
-        op=d2i_ASN1_OBJECT(NULL,&p,i);
-        Free(buf);
-        return op;
-        }
-
-int OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name)
-{
-        int i,idx=0,n=0,len,nid;
-        unsigned long l;
-        unsigned char *p;
-        const char *s;
-        char tbuf[32];
-
-        if (buf_len <= 0) return(0);
-
-        if ((a == NULL) || (a->data == NULL)) {
-                buf[0]='\0';
-                return(0);
-        }
-
-        nid=OBJ_obj2nid(a);
-        if ((nid == NID_undef) || no_name) {
-                len=a->length;
-                p=a->data;
-
-                idx=0;
-                l=0;
-                while (idx < a->length) {
-                        l|=(p[idx]&0x7f);
-                        if (!(p[idx] & 0x80)) break;
-                        l<<=7L;
-                        idx++;
-                }
-                idx++;
-                i=(int)(l/40);
-                if (i > 2) i=2;
-                l-=(long)(i*40);
-
-                sprintf(tbuf,"%d.%lu",i,l);
-                i=strlen(tbuf);
-                strncpy(buf,tbuf,buf_len);
-                buf_len-=i;
-                buf+=i;
-                n+=i;
-
-                l=0;
-                for (; idx<len; idx++) {
-                        l|=p[idx]&0x7f;
-                        if (!(p[idx] & 0x80)) {
-                                sprintf(tbuf,".%lu",l);
-                                i=strlen(tbuf);
-                                if (buf_len > 0)
-                                        strncpy(buf,tbuf,buf_len);
-                                buf_len-=i;
-                                buf+=i;
-                                n+=i;
-                                l=0;
-                        }
-                        l<<=7L;
-                }
-        } else {
-                s=OBJ_nid2ln(nid);
-                if (s == NULL)
-                        s=OBJ_nid2sn(nid);
-                strncpy(buf,s,buf_len);
-                n=strlen(s);
-        }
-        buf[buf_len-1]='\0';
-        return(n);
-}
-
-int OBJ_txt2nid(char *s)
-{
-        ASN1_OBJECT *obj;
-        int nid;
-        obj = OBJ_txt2obj(s, 0);
-        nid = OBJ_obj2nid(obj);
-        ASN1_OBJECT_free(obj);
-        return nid;
-}
-
-int OBJ_ln2nid(const char *s)
-        {
-        ASN1_OBJECT o,*oo= &o,**op;
-        ADDED_OBJ ad,*adp;
-
-        o.ln=s;
-        if (added != NULL)
-                {
-                ad.type=ADDED_LNAME;
-                ad.obj= &o;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL) return (adp->obj->nid);
-                }
-        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN,
-                sizeof(ASN1_OBJECT *),(int (*)())ln_cmp);
-        if (op == NULL) return(NID_undef);
-        return((*op)->nid);
-        }
-
-int OBJ_sn2nid(const char *s)
-        {
-        ASN1_OBJECT o,*oo= &o,**op;
-        ADDED_OBJ ad,*adp;
-
-        o.sn=s;
-        if (added != NULL)
-                {
-                ad.type=ADDED_SNAME;
-                ad.obj= &o;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
-                if (adp != NULL) return (adp->obj->nid);
-                }
-        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN,
-                sizeof(ASN1_OBJECT *),(int (*)())sn_cmp);
-        if (op == NULL) return(NID_undef);
-        return((*op)->nid);
-        }
-
-static int obj_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
-        {
-        int j;
-        ASN1_OBJECT *a= *ap;
-        ASN1_OBJECT *b= *bp;
-
-        j=(a->length - b->length);
-        if (j) return(j);
-        return(memcmp(a->data,b->data,a->length));
-        }
-
-char *OBJ_bsearch(char *key, char *base, int num, int size, int (*cmp)())
-        {
-        int l,h,i,c;
-        char *p;
-
-        if (num == 0) return(NULL);
-        l=0;
-        h=num;
-        while (l < h)
-                {
-                i=(l+h)/2;
-                p= &(base[i*size]);
-                c=(*cmp)(key,p);
-                if (c < 0)
-                        h=i;
-                else if (c > 0)
-                        l=i+1;
-                else
-                        return(p);
-                }
-#ifdef CHARSET_EBCDIC
-/* THIS IS A KLUDGE - Because the *_obj is sorted in ASCII order, and
- * I don't have perl (yet), we revert to a *LINEAR* search
- * when the object wasn't found in the binary search.
- */
-        for (i=0; i<num; ++i) {
-                p= &(base[i*size]);
-                if ((*cmp)(key,p) == 0)
-                        return p;
-        }
-#endif
-        return(NULL);
-        }
-
-int OBJ_create_objects(BIO *in)
-        {
-        MS_STATIC char buf[512];
-        int i,num=0;
-        char *o,*s,*l=NULL;
-
-        for (;;)
-                {
-                s=o=NULL;
-                i=BIO_gets(in,buf,512);
-                if (i <= 0) return(num);
-                buf[i-1]='\0';
-                if (!isalnum((unsigned char)buf[0])) return(num);
-                o=s=buf;
-                while (isdigit((unsigned char)*s) || (*s == '.'))
-                        s++;
-                if (*s != '\0')
-                        {
-                        *(s++)='\0';
-                        while (isspace((unsigned char)*s))
-                                s++;
-                        if (*s == '\0')
-                                s=NULL;
-                        else
-                                {
-                                l=s;
-                                while ((*l != '\0') && !isspace((unsigned char)*l))
-                                        l++;
-                                if (*l != '\0')
-                                        {
-                                        *(l++)='\0';
-                                        while (isspace((unsigned char)*l))
-                                                l++;
-                                        if (*l == '\0') l=NULL;
-                                        }
-                                else
-                                        l=NULL;
-                                }
-                        }
-                else
-                        s=NULL;
-                if ((o == NULL) || (*o == '\0')) return(num);
-                if (!OBJ_create(o,s,l)) return(num);
-                num++;
-                }
-        /* return(num); */
-        }
-
-int OBJ_create(char *oid, char *sn, char *ln)
-        {
-        int ok=0;
-        ASN1_OBJECT *op=NULL;
-        unsigned char *buf;
-        int i;
-
-        i=a2d_ASN1_OBJECT(NULL,0,oid,-1);
-        if (i <= 0) return(0);
-
-        if ((buf=(unsigned char *)Malloc(i)) == NULL)
-                {
-                OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE);
-                return(0);
-                }
-        i=a2d_ASN1_OBJECT(buf,i,oid,-1);
-        op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
-        if (op == NULL) 
-                goto err;
-        ok=OBJ_add_object(op);
-err:
-        ASN1_OBJECT_free(op);
-        Free((char *)buf);
-        return(ok);
-        }
-
diff --git a/src/lib/libcrypto/objects/obj_dat.pl b/src/lib/libcrypto/objects/obj_dat.pl
deleted file mode 100644
index 5043daef2a..0000000000
--- a/src/lib/libcrypto/objects/obj_dat.pl
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/local/bin/perl
-
-sub obj_cmp
-        {
-        local(@a,@b,$_,$r);
-
-        $A=$obj_len{$obj{$nid{$a}}};
-        $B=$obj_len{$obj{$nid{$b}}};
-
-        $r=($A-$B);
-        return($r) if $r != 0;
-
-        $A=$obj_der{$obj{$nid{$a}}};
-        $B=$obj_der{$obj{$nid{$b}}};
-
-        return($A cmp $B);
-        }
-
-sub expand_obj
-        {
-        local(*v)=@_;
-        local($k,$d);
-        local($i);
-
-        do      {
-                $i=0;
-                foreach $k (keys %v)
-                        {
-                        if (($v{$k} =~ s/(OBJ_[^,]+),/$v{$1},/))
-                                { $i++; }
-                        }
-                } while($i);
-        foreach $k (keys %v)
-                {
-                @a=split(/,/,$v{$k});
-                $objn{$k}=$#a+1;
-                }
-        return(%objn);
-        }
-
-while (<>)
-        {
-        next unless /^\#define\s+(\S+)\s+(.*)$/;
-        $v=$1;
-        $d=$2;
-        if ($v =~ /^SN_(.*)$/)
-                { $sn{$1}=$d; }
-        elsif ($v =~ /^LN_(.*)$/)
-                { $ln{$1}=$d; }
-        elsif ($v =~ /^NID_(.*)$/)
-                { $nid{$d}=$1; }
-        elsif ($v =~ /^OBJ_(.*)$/)
-                {
-                $obj{$1}=$v;
-                $objd{$v}=$d;
-                }
-        }
-
-%ob=&expand_obj(*objd);
-
-@a=sort { $a <=> $b } keys %nid;
-$n=$a[$#a]+1;
-
-@lvalues=();
-$lvalues=0;
-
-for ($i=0; $i<$n; $i++)
-        {
-        if (!defined($nid{$i}))
-                {
-                push(@out,"{NULL,NULL,NID_undef,0,NULL},\n");
-                }
-        else
-                {
-                $sn=defined($sn{$nid{$i}})?"$sn{$nid{$i}}":"NULL";
-                $ln=defined($ln{$nid{$i}})?"$ln{$nid{$i}}":"NULL";
-                $sn=$ln if ($sn eq "NULL");
-                $ln=$sn if ($ln eq "NULL");
-                $out ="{";
-                $out.=$sn;
-                $out.=",".$ln;
-                $out.=",NID_$nid{$i},";
-                if (defined($obj{$nid{$i}}))
-                        {
-                        $v=$objd{$obj{$nid{$i}}};
-                        $v =~ s/L//g;
-                        $v =~ s/,/ /g;
-                        $r=&der_it($v);
-                        $z="";
-                        $length=0;
-                        foreach (unpack("C*",$r))
-                                {
-                                $z.=sprintf("0x%02X,",$_);
-                                $length++;
-                                }
-                        $obj_der{$obj{$nid{$i}}}=$z;
-                        $obj_len{$obj{$nid{$i}}}=$length;
-
-                        push(@lvalues,sprintf("%-45s/* [%3d] %s */\n",
-                                $z,$lvalues,$obj{$nid{$i}}));
-                        $out.="$length,&(lvalues[$lvalues]),0";
-                        $lvalues+=$length;
-                        }
-                else
-                        {
-                        $out.="0,NULL";
-                        }
-                $out.="},\n";
-                push(@out,$out);
-                }
-        }
-
-@a=grep(defined($sn{$nid{$_}}),0 .. $n);
-foreach (sort { $sn{$nid{$a}} cmp $sn{$nid{$b}} } @a)
-        {
-        push(@sn,sprintf("&(nid_objs[%2d]),/* $sn{$nid{$_}} */\n",$_));
-        }
-
-@a=grep(defined($ln{$nid{$_}}),0 .. $n);
-foreach (sort { $ln{$nid{$a}} cmp $ln{$nid{$b}} } @a)
-        {
-        push(@ln,sprintf("&(nid_objs[%2d]),/* $ln{$nid{$_}} */\n",$_));
-        }
-
-@a=grep(defined($obj{$nid{$_}}),0 .. $n);
-foreach (sort obj_cmp @a)
-        {
-        $m=$obj{$nid{$_}};
-        $v=$objd{$m};
-        $v =~ s/L//g;
-        $v =~ s/,/ /g;
-        push(@ob,sprintf("&(nid_objs[%2d]),/* %-32s %s */\n",$_,$m,$v));
-        }
-
-print <<'EOF';
-/* lib/obj/obj_dat.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* THIS FILE IS GENERATED FROM Objects.h by obj_dat.pl via the
- * following command:
- * perl obj_dat.pl < objects.h > obj_dat.h
- */
-
-EOF
-
-printf "#define NUM_NID %d\n",$n;
-printf "#define NUM_SN %d\n",$#sn+1;
-printf "#define NUM_LN %d\n",$#ln+1;
-printf "#define NUM_OBJ %d\n\n",$#ob+1;
-
-printf "static unsigned char lvalues[%d]={\n",$lvalues+1;
-print @lvalues;
-print "};\n\n";
-
-printf "static ASN1_OBJECT nid_objs[NUM_NID]={\n";
-foreach (@out)
-        {
-        if (length($_) > 75)
-                {
-                $out="";
-                foreach (split(/,/))
-                        {
-                        $t=$out.$_.",";
-                        if (length($t) > 70)
-                                {
-                                print "$out\n";
-                                $t="\t$_,";
-                                }
-                        $out=$t;
-                        }
-                chop $out;
-                print "$out";
-                }
-        else
-                { print $_; }
-        }
-print  "};\n\n";
-
-printf "static ASN1_OBJECT *sn_objs[NUM_SN]={\n";
-print  @sn;
-print  "};\n\n";
-
-printf "static ASN1_OBJECT *ln_objs[NUM_LN]={\n";
-print  @ln;
-print  "};\n\n";
-
-printf "static ASN1_OBJECT *obj_objs[NUM_OBJ]={\n";
-print  @ob;
-print  "};\n\n";
-
-sub der_it
-        {
-        local($v)=@_;
-        local(@a,$i,$ret,@r);
-
-        @a=split(/\s+/,$v);
-        $ret.=pack("C*",$a[0]*40+$a[1]);
-        shift @a;
-        shift @a;
-        foreach (@a)
-                {
-                @r=();
-                $t=0;
-                while ($_ >= 128)
-                        {
-                        $x=$_%128;
-                        $_/=128;
-                        push(@r,((($t++)?0x80:0)|$x));
-                        }
-                push(@r,((($t++)?0x80:0)|$_));
-                $ret.=pack("C*",reverse(@r));
-                }
-        return($ret);
-        }
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c
deleted file mode 100644
index cef401db27..0000000000
--- a/src/lib/libcrypto/objects/obj_err.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/objects/obj_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/objects.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA OBJ_str_functs[]=
-        {
-{ERR_PACK(0,OBJ_F_OBJ_CREATE,0),        "OBJ_create"},
-{ERR_PACK(0,OBJ_F_OBJ_DUP,0),   "OBJ_dup"},
-{ERR_PACK(0,OBJ_F_OBJ_NID2LN,0),        "OBJ_nid2ln"},
-{ERR_PACK(0,OBJ_F_OBJ_NID2OBJ,0),       "OBJ_nid2obj"},
-{ERR_PACK(0,OBJ_F_OBJ_NID2SN,0),        "OBJ_nid2sn"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA OBJ_str_reasons[]=
-        {
-{OBJ_R_MALLOC_FAILURE                    ,"malloc failure"},
-{OBJ_R_UNKNOWN_NID                       ,"unknown nid"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_OBJ_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_OBJ,OBJ_str_functs);
-                ERR_load_strings(ERR_LIB_OBJ,OBJ_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c
deleted file mode 100644
index 1a1ba0fc06..0000000000
--- a/src/lib/libcrypto/objects/obj_lib.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* crypto/objects/obj_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 <openssl/lhash.h>
-#include <openssl/objects.h>
-#include <openssl/buffer.h>
-
-ASN1_OBJECT *OBJ_dup(ASN1_OBJECT *o)
-        {
-        ASN1_OBJECT *r;
-        int i;
-        char *ln=NULL;
-
-        if (o == NULL) return(NULL);
-        if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC))
-                return(o);
-
-        r=ASN1_OBJECT_new();
-        if (r == NULL)
-                {
-                OBJerr(OBJ_F_OBJ_DUP,ERR_R_ASN1_LIB);
-                return(NULL);
-                }
-        r->data=Malloc(o->length);
-        if (r->data == NULL)
-                goto err;
-        memcpy(r->data,o->data,o->length);
-        r->length=o->length;
-        r->nid=o->nid;
-        r->ln=r->sn=NULL;
-        if (o->ln != NULL)
-                {
-                i=strlen(o->ln)+1;
-                r->ln=ln=Malloc(i);
-                if (r->ln == NULL) goto err;
-                memcpy(ln,o->ln,i);
-                }
-
-        if (o->sn != NULL)
-                {
-                char *s;
-
-                i=strlen(o->sn)+1;
-                r->sn=s=Malloc(i);
-                if (r->sn == NULL) goto err;
-                memcpy(s,o->sn,i);
-                }
-        r->flags=o->flags|(ASN1_OBJECT_FLAG_DYNAMIC|
-                ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|ASN1_OBJECT_FLAG_DYNAMIC_DATA);
-        return(r);
-err:
-        OBJerr(OBJ_F_OBJ_DUP,ERR_R_MALLOC_FAILURE);
-        if (r != NULL)
-                {
-                if (ln != NULL) Free(ln);
-                if (r->data != NULL) Free(r->data);
-                Free(r);
-                }
-        return(NULL);
-        }
-
-int OBJ_cmp(ASN1_OBJECT *a, ASN1_OBJECT *b)
-        {
-        int ret;
-
-        ret=(a->length-b->length);
-        if (ret) return(ret);
-        return(memcmp(a->data,b->data,a->length));
-        }
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
deleted file mode 100644
index d03748e022..0000000000
--- a/src/lib/libcrypto/objects/objects.h
+++ /dev/null
@@ -1,968 +0,0 @@
-/* crypto/objects/objects.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_OBJECTS_H
-#define HEADER_OBJECTS_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define SN_undef                        "UNDEF"
-#define LN_undef                        "undefined"
-#define NID_undef                       0
-#define OBJ_undef                       0L
-
-#define SN_Algorithm                    "Algorithm"
-#define LN_algorithm                    "algorithm"
-#define NID_algorithm                   38
-#define OBJ_algorithm                   1L,3L,14L,3L,2L
-
-#define LN_rsadsi                       "rsadsi"
-#define NID_rsadsi                      1
-#define OBJ_rsadsi                      1L,2L,840L,113549L
-
-#define LN_pkcs                         "pkcs"
-#define NID_pkcs                        2
-#define OBJ_pkcs                        OBJ_rsadsi,1L
-
-#define SN_md2                          "MD2"
-#define LN_md2                          "md2"
-#define NID_md2                         3
-#define OBJ_md2                         OBJ_rsadsi,2L,2L
-
-#define SN_md5                          "MD5"
-#define LN_md5                          "md5"
-#define NID_md5                         4
-#define OBJ_md5                         OBJ_rsadsi,2L,5L
-
-#define SN_rc4                          "RC4"
-#define LN_rc4                          "rc4"
-#define NID_rc4                         5
-#define OBJ_rc4                         OBJ_rsadsi,3L,4L
-
-#define LN_rsaEncryption                "rsaEncryption"
-#define NID_rsaEncryption               6
-#define OBJ_rsaEncryption               OBJ_pkcs,1L,1L
-
-#define SN_md2WithRSAEncryption         "RSA-MD2"
-#define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption        7
-#define OBJ_md2WithRSAEncryption        OBJ_pkcs,1L,2L
-
-#define SN_md5WithRSAEncryption         "RSA-MD5"
-#define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption        8
-#define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
-
-#define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC        9
-#define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
-
-#define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC        10
-#define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
-
-#define LN_X500                         "X500"
-#define NID_X500                        11
-#define OBJ_X500                        2L,5L
-
-#define LN_X509                         "X509"
-#define NID_X509                        12
-#define OBJ_X509                        OBJ_X500,4L
-
-#define SN_commonName                   "CN"
-#define LN_commonName                   "commonName"
-#define NID_commonName                  13
-#define OBJ_commonName                  OBJ_X509,3L
-
-#define SN_countryName                  "C"
-#define LN_countryName                  "countryName"
-#define NID_countryName                 14
-#define OBJ_countryName                 OBJ_X509,6L
-
-#define SN_localityName                 "L"
-#define LN_localityName                 "localityName"
-#define NID_localityName                15
-#define OBJ_localityName                OBJ_X509,7L
-
-/* Postal Address? PA */
-
-/* should be "ST" (rfc1327) but MS uses 'S' */
-#define SN_stateOrProvinceName          "ST"
-#define LN_stateOrProvinceName          "stateOrProvinceName"
-#define NID_stateOrProvinceName         16
-#define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#define SN_organizationName             "O"
-#define LN_organizationName             "organizationName"
-#define NID_organizationName            17
-#define OBJ_organizationName            OBJ_X509,10L
-
-#define SN_organizationalUnitName       "OU"
-#define LN_organizationalUnitName       "organizationalUnitName"
-#define NID_organizationalUnitName      18
-#define OBJ_organizationalUnitName      OBJ_X509,11L
-
-#define SN_rsa                          "RSA"
-#define LN_rsa                          "rsa"
-#define NID_rsa                         19
-#define OBJ_rsa                         OBJ_X500,8L,1L,1L
-
-#define LN_pkcs7                        "pkcs7"
-#define NID_pkcs7                       20
-#define OBJ_pkcs7                       OBJ_pkcs,7L
-
-#define LN_pkcs7_data                   "pkcs7-data"
-#define NID_pkcs7_data                  21
-#define OBJ_pkcs7_data                  OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed                 "pkcs7-signedData"
-#define NID_pkcs7_signed                22
-#define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#define NID_pkcs7_enveloped             23
-#define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped     "pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped    24
-#define OBJ_pkcs7_signedAndEnveloped    OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest                 "pkcs7-digestData"
-#define NID_pkcs7_digest                25
-#define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#define NID_pkcs7_encrypted             26
-#define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#define LN_pkcs3                        "pkcs3"
-#define NID_pkcs3                       27
-#define OBJ_pkcs3                       OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement               "dhKeyAgreement"
-#define NID_dhKeyAgreement              28
-#define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#define SN_des_ecb                      "DES-ECB"
-#define LN_des_ecb                      "des-ecb"
-#define NID_des_ecb                     29
-#define OBJ_des_ecb                     OBJ_algorithm,6L
-
-#define SN_des_cfb64                    "DES-CFB"
-#define LN_des_cfb64                    "des-cfb"
-#define NID_des_cfb64                   30
-/* IV + num */
-#define OBJ_des_cfb64                   OBJ_algorithm,9L
-
-#define SN_des_cbc                      "DES-CBC"
-#define LN_des_cbc                      "des-cbc"
-#define NID_des_cbc                     31
-/* IV */
-#define OBJ_des_cbc                     OBJ_algorithm,7L
-
-#define SN_des_ede                      "DES-EDE"
-#define LN_des_ede                      "des-ede"
-#define NID_des_ede                     32
-/* ?? */
-#define OBJ_des_ede                     OBJ_algorithm,17L
-
-#define SN_des_ede3                     "DES-EDE3"
-#define LN_des_ede3                     "des-ede3"
-#define NID_des_ede3                    33
-
-#define SN_idea_cbc                     "IDEA-CBC"
-#define LN_idea_cbc                     "idea-cbc"
-#define NID_idea_cbc                    34
-
-#define SN_idea_cfb64                   "IDEA-CFB"
-#define LN_idea_cfb64                   "idea-cfb"
-#define NID_idea_cfb64                  35
-
-#define SN_idea_ecb                     "IDEA-ECB"
-#define LN_idea_ecb                     "idea-ecb"
-#define NID_idea_ecb                    36
-
-#define SN_rc2_cbc                      "RC2-CBC"
-#define LN_rc2_cbc                      "rc2-cbc"
-#define NID_rc2_cbc                     37
-#define OBJ_rc2_cbc                     OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb                      "RC2-ECB"
-#define LN_rc2_ecb                      "rc2-ecb"
-#define NID_rc2_ecb                     38
-
-#define SN_rc2_cfb64                    "RC2-CFB"
-#define LN_rc2_cfb64                    "rc2-cfb"
-#define NID_rc2_cfb64                   39
-
-#define SN_rc2_ofb64                    "RC2-OFB"
-#define LN_rc2_ofb64                    "rc2-ofb"
-#define NID_rc2_ofb64                   40
-
-#define SN_sha                          "SHA"
-#define LN_sha                          "sha"
-#define NID_sha                         41
-#define OBJ_sha                         OBJ_algorithm,18L
-
-#define SN_shaWithRSAEncryption         "RSA-SHA"
-#define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption        42
-#define OBJ_shaWithRSAEncryption        OBJ_algorithm,15L
-
-#define SN_des_ede_cbc                  "DES-EDE-CBC"
-#define LN_des_ede_cbc                  "des-ede-cbc"
-#define NID_des_ede_cbc                 43
-
-#define SN_des_ede3_cbc                 "DES-EDE3-CBC"
-#define LN_des_ede3_cbc                 "des-ede3-cbc"
-#define NID_des_ede3_cbc                44
-#define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#define SN_des_ofb64                    "DES-OFB"
-#define LN_des_ofb64                    "des-ofb"
-#define NID_des_ofb64                   45
-#define OBJ_des_ofb64                   OBJ_algorithm,8L
-
-#define SN_idea_ofb64                   "IDEA-OFB"
-#define LN_idea_ofb64                   "idea-ofb"
-#define NID_idea_ofb64                  46
-
-#define LN_pkcs9                        "pkcs9"
-#define NID_pkcs9                       47
-#define OBJ_pkcs9                       OBJ_pkcs,9L
-
-#define SN_pkcs9_emailAddress           "Email"
-#define LN_pkcs9_emailAddress           "emailAddress"
-#define NID_pkcs9_emailAddress          48
-#define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName       "unstructuredName"
-#define NID_pkcs9_unstructuredName      49
-#define OBJ_pkcs9_unstructuredName      OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType            "contentType"
-#define NID_pkcs9_contentType           50
-#define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest          "messageDigest"
-#define NID_pkcs9_messageDigest         51
-#define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime            "signingTime"
-#define NID_pkcs9_signingTime           52
-#define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature       "countersignature"
-#define NID_pkcs9_countersignature      53
-#define OBJ_pkcs9_countersignature      OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword      "challengePassword"
-#define NID_pkcs9_challengePassword     54
-#define OBJ_pkcs9_challengePassword     OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress    "unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress   55
-#define OBJ_pkcs9_unstructuredAddress   OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes      "extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes     56
-#define OBJ_pkcs9_extCertAttributes     OBJ_pkcs9,9L
-
-#define SN_netscape                     "Netscape"
-#define LN_netscape                     "Netscape Communications Corp."
-#define NID_netscape                    57
-#define OBJ_netscape                    2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension      "nsCertExt"
-#define LN_netscape_cert_extension      "Netscape Certificate Extension"
-#define NID_netscape_cert_extension     58
-#define OBJ_netscape_cert_extension     OBJ_netscape,1L
-
-#define SN_netscape_data_type           "nsDataType"
-#define LN_netscape_data_type           "Netscape Data Type"
-#define NID_netscape_data_type          59
-#define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#define SN_des_ede_cfb64                "DES-EDE-CFB"
-#define LN_des_ede_cfb64                "des-ede-cfb"
-#define NID_des_ede_cfb64               60
-
-#define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#define LN_des_ede3_cfb64               "des-ede3-cfb"
-#define NID_des_ede3_cfb64              61
-
-#define SN_des_ede_ofb64                "DES-EDE-OFB"
-#define LN_des_ede_ofb64                "des-ede-ofb"
-#define NID_des_ede_ofb64               62
-
-#define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#define LN_des_ede3_ofb64               "des-ede3-ofb"
-#define NID_des_ede3_ofb64              63
-
-/* I'm not sure about the object ID */
-#define SN_sha1                         "SHA1"
-#define LN_sha1                         "sha1"
-#define NID_sha1                        64
-#define OBJ_sha1                        OBJ_algorithm,26L
-/* 28 Jun 1996 - eay */
-/* #define OBJ_sha1                     1L,3L,14L,2L,26L,05L <- wrong */
-
-#define SN_sha1WithRSAEncryption        "RSA-SHA1"
-#define LN_sha1WithRSAEncryption        "sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption       65
-#define OBJ_sha1WithRSAEncryption       OBJ_pkcs,1L,5L
-
-#define SN_dsaWithSHA                   "DSA-SHA"
-#define LN_dsaWithSHA                   "dsaWithSHA"
-#define NID_dsaWithSHA                  66
-#define OBJ_dsaWithSHA                  OBJ_algorithm,13L
-
-#define SN_dsa_2                        "DSA-old"
-#define LN_dsa_2                        "dsaEncryption-old"
-#define NID_dsa_2                       67
-#define OBJ_dsa_2                       OBJ_algorithm,12L
-
-/* proposed by microsoft to RSA */
-#define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC       68
-#define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L 
-
-/* proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now
- * defined explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something
- * completely different.
- */
-#define LN_id_pbkdf2                    "PBKDF2"
-#define NID_id_pbkdf2                   69
-#define OBJ_id_pbkdf2                   OBJ_pkcs,5L,12L 
-
-#define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2               70
-/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
-#define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#define SN_netscape_cert_type           "nsCertType"
-#define LN_netscape_cert_type           "Netscape Cert Type"
-#define NID_netscape_cert_type          71
-#define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url            "nsBaseUrl"
-#define LN_netscape_base_url            "Netscape Base Url"
-#define NID_netscape_base_url           72
-#define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url      "nsRevocationUrl"
-#define LN_netscape_revocation_url      "Netscape Revocation Url"
-#define NID_netscape_revocation_url     73
-#define OBJ_netscape_revocation_url     OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url   "nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url   "Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url  74
-#define OBJ_netscape_ca_revocation_url  OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url         "nsRenewalUrl"
-#define LN_netscape_renewal_url         "Netscape Renewal Url"
-#define NID_netscape_renewal_url        75
-#define OBJ_netscape_renewal_url        OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url       "nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url       "Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url      76
-#define OBJ_netscape_ca_policy_url      OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name     "nsSslServerName"
-#define LN_netscape_ssl_server_name     "Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name    77
-#define OBJ_netscape_ssl_server_name    OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment             "nsComment"
-#define LN_netscape_comment             "Netscape Comment"
-#define NID_netscape_comment            78
-#define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence       "nsCertSequence"
-#define LN_netscape_cert_sequence       "Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence      79
-#define OBJ_netscape_cert_sequence      OBJ_netscape_data_type,5L
-
-#define SN_desx_cbc                     "DESX-CBC"
-#define LN_desx_cbc                     "desx-cbc"
-#define NID_desx_cbc                    80
-
-#define SN_ld_ce                        "ld-ce"
-#define NID_ld_ce                       81
-#define OBJ_ld_ce                       2L,5L,29L
-
-#define SN_subject_key_identifier       "subjectKeyIdentifier"
-#define LN_subject_key_identifier       "X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier      82
-#define OBJ_subject_key_identifier      OBJ_ld_ce,14L
-
-#define SN_key_usage                    "keyUsage"
-#define LN_key_usage                    "X509v3 Key Usage"
-#define NID_key_usage                   83
-#define OBJ_key_usage                   OBJ_ld_ce,15L
-
-#define SN_private_key_usage_period     "privateKeyUsagePeriod"
-#define LN_private_key_usage_period     "X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period    84
-#define OBJ_private_key_usage_period    OBJ_ld_ce,16L
-
-#define SN_subject_alt_name             "subjectAltName"
-#define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#define NID_subject_alt_name            85
-#define OBJ_subject_alt_name            OBJ_ld_ce,17L
-
-#define SN_issuer_alt_name              "issuerAltName"
-#define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name             86
-#define OBJ_issuer_alt_name             OBJ_ld_ce,18L
-
-#define SN_basic_constraints            "basicConstraints"
-#define LN_basic_constraints            "X509v3 Basic Constraints"
-#define NID_basic_constraints           87
-#define OBJ_basic_constraints           OBJ_ld_ce,19L
-
-#define SN_crl_number                   "crlNumber"
-#define LN_crl_number                   "X509v3 CRL Number"
-#define NID_crl_number                  88
-#define OBJ_crl_number                  OBJ_ld_ce,20L
-
-#define SN_certificate_policies         "certificatePolicies"
-#define LN_certificate_policies         "X509v3 Certificate Policies"
-#define NID_certificate_policies        89
-#define OBJ_certificate_policies        OBJ_ld_ce,32L
-
-#define SN_authority_key_identifier     "authorityKeyIdentifier"
-#define LN_authority_key_identifier     "X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier    90
-#define OBJ_authority_key_identifier    OBJ_ld_ce,35L
-
-#define SN_bf_cbc                       "BF-CBC"
-#define LN_bf_cbc                       "bf-cbc"
-#define NID_bf_cbc                      91
-
-#define SN_bf_ecb                       "BF-ECB"
-#define LN_bf_ecb                       "bf-ecb"
-#define NID_bf_ecb                      92
-
-#define SN_bf_cfb64                     "BF-CFB"
-#define LN_bf_cfb64                     "bf-cfb"
-#define NID_bf_cfb64                    93
-
-#define SN_bf_ofb64                     "BF-OFB"
-#define LN_bf_ofb64                     "bf-ofb"
-#define NID_bf_ofb64                    94
-
-#define SN_mdc2                         "MDC2"
-#define LN_mdc2                         "mdc2"
-#define NID_mdc2                        95
-#define OBJ_mdc2                        2L,5L,8L,3L,101L
-/* An alternative?                      1L,3L,14L,3L,2L,19L */
-
-#define SN_mdc2WithRSA                  "RSA-MDC2"
-#define LN_mdc2WithRSA                  "mdc2withRSA"
-#define NID_mdc2WithRSA                 96
-#define OBJ_mdc2WithRSA                 2L,5L,8L,3L,100L
-
-#define SN_rc4_40                       "RC4-40"
-#define LN_rc4_40                       "rc4-40"
-#define NID_rc4_40                      97
-
-#define SN_rc2_40_cbc                   "RC2-40-CBC"
-#define LN_rc2_40_cbc                   "rc2-40-cbc"
-#define NID_rc2_40_cbc                  98
-
-#define SN_givenName                    "G"
-#define LN_givenName                    "givenName"
-#define NID_givenName                   99
-#define OBJ_givenName                   OBJ_X509,42L
-
-#define SN_surname                      "S"
-#define LN_surname                      "surname"
-#define NID_surname                     100
-#define OBJ_surname                     OBJ_X509,4L
-
-#define SN_initials                     "I"
-#define LN_initials                     "initials"
-#define NID_initials                    101
-#define OBJ_initials                    OBJ_X509,43L
-
-#define SN_uniqueIdentifier             "UID"
-#define LN_uniqueIdentifier             "uniqueIdentifier"
-#define NID_uniqueIdentifier            102
-#define OBJ_uniqueIdentifier            OBJ_X509,45L
-
-#define SN_crl_distribution_points      "crlDistributionPoints"
-#define LN_crl_distribution_points      "X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points     103
-#define OBJ_crl_distribution_points     OBJ_ld_ce,31L
-
-#define SN_md5WithRSA                   "RSA-NP-MD5"
-#define LN_md5WithRSA                   "md5WithRSA"
-#define NID_md5WithRSA                  104
-#define OBJ_md5WithRSA                  OBJ_algorithm,3L
-
-#define SN_serialNumber                 "SN"
-#define LN_serialNumber                 "serialNumber"
-#define NID_serialNumber                105
-#define OBJ_serialNumber                OBJ_X509,5L
-
-#define SN_title                        "T"
-#define LN_title                        "title"
-#define NID_title                       106
-#define OBJ_title                       OBJ_X509,12L
-
-#define SN_description                  "D"
-#define LN_description                  "description"
-#define NID_description                 107
-#define OBJ_description                 OBJ_X509,13L
-
-/* CAST5 is CAST-128, I'm just sticking with the documentation */
-#define SN_cast5_cbc                    "CAST5-CBC"
-#define LN_cast5_cbc                    "cast5-cbc"
-#define NID_cast5_cbc                   108
-#define OBJ_cast5_cbc                   1L,2L,840L,113533L,7L,66L,10L
-
-#define SN_cast5_ecb                    "CAST5-ECB"
-#define LN_cast5_ecb                    "cast5-ecb"
-#define NID_cast5_ecb                   109
-
-#define SN_cast5_cfb64                  "CAST5-CFB"
-#define LN_cast5_cfb64                  "cast5-cfb"
-#define NID_cast5_cfb64                 110
-
-#define SN_cast5_ofb64                  "CAST5-OFB"
-#define LN_cast5_ofb64                  "cast5-ofb"
-#define NID_cast5_ofb64                 111
-
-#define LN_pbeWithMD5AndCast5_CBC       "pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC      112
-#define OBJ_pbeWithMD5AndCast5_CBC      1L,2L,840L,113533L,7L,66L,12L
-
-/* This is one sun will soon be using :-(
- * id-dsa-with-sha1 ID  ::= {
- *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
- */
-#define SN_dsaWithSHA1                  "DSA-SHA1"
-#define LN_dsaWithSHA1                  "dsaWithSHA1"
-#define NID_dsaWithSHA1                 113
-#define OBJ_dsaWithSHA1                 1L,2L,840L,10040L,4L,3L
-
-#define NID_md5_sha1                    114
-#define SN_md5_sha1                     "MD5-SHA1"
-#define LN_md5_sha1                     "md5-sha1"
-
-#define SN_sha1WithRSA                  "RSA-SHA1-2"
-#define LN_sha1WithRSA                  "sha1WithRSA"
-#define NID_sha1WithRSA                 115
-#define OBJ_sha1WithRSA                 OBJ_algorithm,29L
-
-#define SN_dsa                          "DSA"
-#define LN_dsa                          "dsaEncryption"
-#define NID_dsa                         116
-#define OBJ_dsa                         1L,2L,840L,10040L,4L,1L
-
-#define SN_ripemd160                    "RIPEMD160"
-#define LN_ripemd160                    "ripemd160"
-#define NID_ripemd160                   117
-#define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
-
-/* The name should actually be rsaSignatureWithripemd160, but I'm going
- * to contiune using the convention I'm using with the other ciphers */
-#define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#define NID_ripemd160WithRSA            119
-#define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-/* Taken from rfc2040
- *  RC5_CBC_Parameters ::= SEQUENCE {
- *      version           INTEGER (v1_0(16)),
- *      rounds            INTEGER (8..127),
- *      blockSizeInBits   INTEGER (64, 128),
- *      iv                OCTET STRING OPTIONAL
- *      }
- */
-#define SN_rc5_cbc                      "RC5-CBC"
-#define LN_rc5_cbc                      "rc5-cbc"
-#define NID_rc5_cbc                     120
-#define OBJ_rc5_cbc                     OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb                      "RC5-ECB"
-#define LN_rc5_ecb                      "rc5-ecb"
-#define NID_rc5_ecb                     121
-
-#define SN_rc5_cfb64                    "RC5-CFB"
-#define LN_rc5_cfb64                    "rc5-cfb"
-#define NID_rc5_cfb64                   122
-
-#define SN_rc5_ofb64                    "RC5-OFB"
-#define LN_rc5_ofb64                    "rc5-ofb"
-#define NID_rc5_ofb64                   123
-
-#define SN_rle_compression              "RLE"
-#define LN_rle_compression              "run length compression"
-#define NID_rle_compression             124
-#define OBJ_rle_compression             1L,1L,1L,1L,666L.1L
-
-#define SN_zlib_compression             "ZLIB"
-#define LN_zlib_compression             "zlib compression"
-#define NID_zlib_compression            125
-#define OBJ_zlib_compression            1L,1L,1L,1L,666L.2L
-
-#define SN_ext_key_usage                "extendedKeyUsage"
-#define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#define NID_ext_key_usage               126
-#define OBJ_ext_key_usage               OBJ_ld_ce,37
-
-#define SN_id_pkix                      "PKIX"
-#define NID_id_pkix                     127
-#define OBJ_id_pkix                     1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_kp                        "id-kp"
-#define NID_id_kp                       128
-#define OBJ_id_kp                       OBJ_id_pkix,3L
-
-/* PKIX extended key usage OIDs */
-
-#define SN_server_auth                  "serverAuth"
-#define LN_server_auth                  "TLS Web Server Authentication"
-#define NID_server_auth                 129
-#define OBJ_server_auth                 OBJ_id_kp,1L
-
-#define SN_client_auth                  "clientAuth"
-#define LN_client_auth                  "TLS Web Client Authentication"
-#define NID_client_auth                 130
-#define OBJ_client_auth                 OBJ_id_kp,2L
-
-#define SN_code_sign                    "codeSigning"
-#define LN_code_sign                    "Code Signing"
-#define NID_code_sign                   131
-#define OBJ_code_sign                   OBJ_id_kp,3L
-
-#define SN_email_protect                "emailProtection"
-#define LN_email_protect                "E-mail Protection"
-#define NID_email_protect               132
-#define OBJ_email_protect               OBJ_id_kp,4L
-
-#define SN_time_stamp                   "timeStamping"
-#define LN_time_stamp                   "Time Stamping"
-#define NID_time_stamp                  133
-#define OBJ_time_stamp                  OBJ_id_kp,8L
-
-/* Additional extended key usage OIDs: Microsoft */
-
-#define SN_ms_code_ind                  "msCodeInd"
-#define LN_ms_code_ind                  "Microsoft Individual Code Signing"
-#define NID_ms_code_ind                 134
-#define OBJ_ms_code_ind                 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com                  "msCodeCom"
-#define LN_ms_code_com                  "Microsoft Commercial Code Signing"
-#define NID_ms_code_com                 135
-#define OBJ_ms_code_com                 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign                  "msCTLSign"
-#define LN_ms_ctl_sign                  "Microsoft Trust List Signing"
-#define NID_ms_ctl_sign                 136
-#define OBJ_ms_ctl_sign                 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc                       "msSGC"
-#define LN_ms_sgc                       "Microsoft Server Gated Crypto"
-#define NID_ms_sgc                      137
-#define OBJ_ms_sgc                      1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs                       "msEFS"
-#define LN_ms_efs                       "Microsoft Encrypted File System"
-#define NID_ms_efs                      138
-#define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-/* Addidional usage: Netscape */
-
-#define SN_ns_sgc                       "nsSGC"
-#define LN_ns_sgc                       "Netscape Server Gated Crypto"
-#define NID_ns_sgc                      139
-#define OBJ_ns_sgc                      OBJ_netscape,4L,1L
-
-#define SN_delta_crl                    "deltaCRL"
-#define LN_delta_crl                    "X509v3 Delta CRL Indicator"
-#define NID_delta_crl                   140
-#define OBJ_delta_crl                   OBJ_ld_ce,27L
-
-#define SN_crl_reason                   "CRLReason"
-#define LN_crl_reason                   "CRL Reason Code"
-#define NID_crl_reason                  141
-#define OBJ_crl_reason                  OBJ_ld_ce,21L
-
-#define SN_invalidity_date              "invalidityDate"
-#define LN_invalidity_date              "Invalidity Date"
-#define NID_invalidity_date             142
-#define OBJ_invalidity_date             OBJ_ld_ce,24L
-
-#define SN_sxnet                        "SXNetID"
-#define LN_sxnet                        "Strong Extranet ID"
-#define NID_sxnet                       143
-#define OBJ_sxnet                       1L,3L,101L,1L,4L,1L
-
-/* PKCS12 and related OBJECT IDENTIFIERS */
-
-#define OBJ_pkcs12                      OBJ_pkcs,12L
-#define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
-
-#define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4    144
-#define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
-
-#define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4     145
-#define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
-
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
-
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
-
-#define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC        148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
-
-#define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC 149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
-
-#define OBJ_pkcs12_Version1     OBJ_pkcs12, 10L
-
-#define OBJ_pkcs12_BagIds       OBJ_pkcs12_Version1, 1L
-
-#define LN_keyBag               "keyBag"
-#define NID_keyBag              150
-#define OBJ_keyBag              OBJ_pkcs12_BagIds, 1L
-
-#define LN_pkcs8ShroudedKeyBag  "pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag 151
-#define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
-
-#define LN_certBag              "certBag"
-#define NID_certBag             152
-#define OBJ_certBag             OBJ_pkcs12_BagIds, 3L
-
-#define LN_crlBag               "crlBag"
-#define NID_crlBag              153
-#define OBJ_crlBag              OBJ_pkcs12_BagIds, 4L
-
-#define LN_secretBag            "secretBag"
-#define NID_secretBag           154
-#define OBJ_secretBag           OBJ_pkcs12_BagIds, 5L
-
-#define LN_safeContentsBag      "safeContentsBag"
-#define NID_safeContentsBag     155
-#define OBJ_safeContentsBag     OBJ_pkcs12_BagIds, 6L
-
-#define LN_friendlyName         "friendlyName"
-#define NID_friendlyName        156
-#define OBJ_friendlyName        OBJ_pkcs9, 20L
-
-#define LN_localKeyID           "localKeyID"
-#define NID_localKeyID          157
-#define OBJ_localKeyID          OBJ_pkcs9, 21L
-
-#define OBJ_certTypes           OBJ_pkcs9, 22L
-
-#define LN_x509Certificate      "x509Certificate"
-#define NID_x509Certificate     158
-#define OBJ_x509Certificate     OBJ_certTypes, 1L
-
-#define LN_sdsiCertificate      "sdsiCertificate"
-#define NID_sdsiCertificate     159
-#define OBJ_sdsiCertificate     OBJ_certTypes, 2L
-
-#define OBJ_crlTypes            OBJ_pkcs9, 23L
-
-#define LN_x509Crl              "x509Crl"
-#define NID_x509Crl             160
-#define OBJ_x509Crl             OBJ_crlTypes, 1L
-
-/* PKCS#5 v2 OIDs */
-
-#define LN_pbes2                "PBES2"
-#define NID_pbes2               161
-#define OBJ_pbes2               OBJ_pkcs,5L,13L
-
-#define LN_pbmac1               "PBMAC1"
-#define NID_pbmac1              162
-#define OBJ_pbmac1              OBJ_pkcs,5L,14L
-
-#define LN_hmacWithSHA1         "hmacWithSHA1"
-#define NID_hmacWithSHA1        163
-#define OBJ_hmacWithSHA1        OBJ_rsadsi,2L,7L
-
-/* Policy Qualifier Ids */
-
-#define LN_id_qt_cps            "Policy Qualifier CPS"
-#define SN_id_qt_cps            "id-qt-cps"
-#define NID_id_qt_cps           164
-#define OBJ_id_qt_cps           OBJ_id_pkix,2L,1L
-
-#define LN_id_qt_unotice        "Policy Qualifier User Notice"
-#define SN_id_qt_unotice        "id-qt-unotice"
-#define NID_id_qt_unotice       165
-#define OBJ_id_qt_unotice       OBJ_id_pkix,2L,2L
-
-#define SN_rc2_64_cbc                   "RC2-64-CBC"
-#define LN_rc2_64_cbc                   "rc2-64-cbc"
-#define NID_rc2_64_cbc                  166
-
-#define SN_SMIMECapabilities            "SMIME-CAPS"
-#define LN_SMIMECapabilities            "S/MIME Capabilities"
-#define NID_SMIMECapabilities           167
-#define OBJ_SMIMECapabilities           OBJ_id_pkcs9,15L
-
-#define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC        168
-#define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
-
-#define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC        169
-#define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
-
-#define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC       170
-#define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
-
-#include <openssl/bio.h>
-#include <openssl/asn1.h>
-
-#define OBJ_NAME_TYPE_UNDEF             0x00
-#define OBJ_NAME_TYPE_MD_METH           0x01
-#define OBJ_NAME_TYPE_CIPHER_METH       0x02
-#define OBJ_NAME_TYPE_PKEY_METH         0x03
-#define OBJ_NAME_TYPE_COMP_METH         0x04
-#define OBJ_NAME_TYPE_NUM               0x05
-
-#define OBJ_NAME_ALIAS          0x8000
-
-
-typedef struct obj_name_st
-        {
-        int type;
-        int alias;
-        const char *name;
-        const char *data;
-        } OBJ_NAME;
-
-#define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
-
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func)(),int (*cmp_func)(),
-        void (*free_func)());
-const char *OBJ_NAME_get(const char *name,int type);
-int OBJ_NAME_add(const char *name,int type,const char *data);
-int OBJ_NAME_remove(const char *name,int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
-
-ASN1_OBJECT *   OBJ_dup(ASN1_OBJECT *o);
-ASN1_OBJECT *   OBJ_nid2obj(int n);
-const char *    OBJ_nid2ln(int n);
-const char *    OBJ_nid2sn(int n);
-int             OBJ_obj2nid(ASN1_OBJECT *o);
-ASN1_OBJECT *   OBJ_txt2obj(const char *s, int no_name);
-int     OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name);
-int             OBJ_txt2nid(char *s);
-int             OBJ_ln2nid(const char *s);
-int             OBJ_sn2nid(const char *s);
-int             OBJ_cmp(ASN1_OBJECT *a,ASN1_OBJECT *b);
-char *          OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)());
-
-void            ERR_load_OBJ_strings(void );
-
-int             OBJ_new_nid(int num);
-int             OBJ_add_object(ASN1_OBJECT *obj);
-int             OBJ_create(char *oid,char *sn,char *ln);
-void            OBJ_cleanup(void );
-int             OBJ_create_objects(BIO *in);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/objects/objects.txt b/src/lib/libcrypto/objects/objects.txt
deleted file mode 100644
index cb276e90e9..0000000000
--- a/src/lib/libcrypto/objects/objects.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-1 2                     : ISO member bodies
-1 2 840                 : US (ANSI)
-1 2 840 113549          : rsadsi        : RSA Data Security, Inc.
-1 2 840 113549 1        : pkcs          : RSA Data Security, Inc. PKCS
-1 2 840 113549 1 1 1    : rsaEncryption
-1 2 840 113549 1 1 2    : md2withRSAEncryption
-1 2 840 113549 1 1 4    : md5withRSAEncryption
-1 2 840 113549 1 7      : pkcs-7
-1 2 840 113549 1 7 1    : pkcs-7-data
-1 2 840 113549 1 7 2    : pkcs-7-signedData
-1 2 840 113549 1 7 3    : pkcs-7-envelopedData
-1 2 840 113549 1 7 4    : pkcs-7-signedAndEnvelopedData
-1 2 840 113549 1 7 5    : pkcs-7-digestData
-1 2 840 113549 1 7 6    : pkcs-7-encryptedData
-1 2 840 113549 2 2      : md2
-1 2 840 113549 2 4      : md4
-1 2 840 113549 2 5      : md5
-1 2 840 113549 3 4      : rc4
-1 2 840 113549 5 1      : pbeWithMD2AndDES_CBC
-1 2 840 113549 5 3      : pbeWithMD5AndDES_CBC
-2 5                     : X500          : directory services (X.500)
-2 5 4                   : X509
-2 5 4 3                 : commonName
-2 5 4 6                 : countryName
-2 5 4 7                 : localityName
-2 5 4 8                 : stateOrProvinceName
-2 5 4 10                : organizationName
-2 5 4 11                : organizationalUnitName
-2 5 8                   : directory services - algorithms
-2 5 8 1 1               : rsa
-
-algorithm 18            : sha
-encryptionAlgorithm 1   : rsa
-algorithm 11            : rsaSignature
-
-algorithm 6             : desECB
-algorithm 7             : desCBC
-algorithm 8             : desOFB
-algorithm 9             : desCFB
-algorithm 17            : desEDE2
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h
deleted file mode 100644
index b841347f05..0000000000
--- a/src/lib/libcrypto/opensslv.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef HEADER_OPENSSLV_H
-#define HEADER_OPENSSLV_H
-
-/* Numeric release version identifier:
- * MMNNFFRBB: major minor fix final beta/patch
- * For example:
- * 0.9.3-dev      0x00903000
- * 0.9.3beta1     0x00903001
- * 0.9.3beta2-dev 0x00903002
- * 0.9.3beta2     0x00903002
- * 0.9.3          0x00903100
- * 0.9.3a         0x00903101
- * 0.9.4          0x00904100
- * 1.2.3z         0x1020311a
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- */
-#define OPENSSL_VERSION_NUMBER  0x00904100L
-#define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.4 09 Aug 1999"
-#define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
-
-#endif /* HEADER_OPENSSLV_H */
diff --git a/src/lib/libcrypto/pem/message b/src/lib/libcrypto/pem/message
deleted file mode 100644
index e8bf9d7592..0000000000
--- a/src/lib/libcrypto/pem/message
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVACY-ENHANCED MESSAGE-----
-Proc-Type: 4,ENCRYPTED
-Proc-Type: 4,MIC-ONLY
-Proc-Type: 4,MIC-CLEAR
-Content-Domain: RFC822
-DEK-Info: DES-CBC,0123456789abcdef
-Originator-Certificate
- xxxx
-Issuer-Certificate
- xxxx
-MIC-Info: RSA-MD5,RSA,
- xxxx
-
-
------END PRIVACY-ENHANCED MESSAGE-----
-
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
deleted file mode 100644
index fc333e42c8..0000000000
--- a/src/lib/libcrypto/pem/pem.h
+++ /dev/null
@@ -1,625 +0,0 @@
-/* crypto/pem/pem.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PEM_H
-#define HEADER_PEM_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem2.h>
-
-#define PEM_BUFSIZE             1024
-
-#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     "ANY 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_PKCS8        "ENCRYPTED PRIVATE KEY"
-#define PEM_STRING_PKCS8INF     "PRIVATE KEY"
-#define PEM_STRING_DHPARAMS     "DH PARAMETERS"
-#define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
-#define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
-
-
-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;
-
-/* These macros make the PEM_read/PEM_write functions easier to maintain and
- * write. Now they are all implemented with either:
- * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...)
- */
-
-#ifdef NO_FP_API
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-
-#else
-
-#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
-type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return((type *)PEM_ASN1_read((char *(*)())d2i_##asn1, str,fp,(char **)x,\
-        cb,u)); \
-} \
-
-#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x) \
-{ \
-return(PEM_ASN1_write((int (*)())i2d_##asn1,str,fp, (char *)x, \
-                                                         NULL,NULL,0,NULL,NULL)); \
-} 
-
-#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return(PEM_ASN1_write((int (*)())i2d_##asn1,str,fp, \
-                (char *)x,enc,kstr,klen,cb,u)); \
-        }
-
-#endif
-
-#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return((type *)PEM_ASN1_read_bio((char *(*)())d2i_##asn1, str,bp,\
-                                                        (char **)x,cb,u)); \
-}
-
-#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x) \
-{ \
-return(PEM_ASN1_write_bio((int (*)())i2d_##asn1,str,bp, (char *)x, \
-                                                         NULL,NULL,0,NULL,NULL)); \
-}
-
-#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return(PEM_ASN1_write_bio((int (*)())i2d_##asn1,str,bp, \
-                (char *)x,enc,kstr,klen,cb,u)); \
-        }
-
-#define IMPLEMENT_PEM_write(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_fp(name, type, str, asn1) 
-
-#define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write(name, type, str, asn1)
-
-#define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb(name, type, str, asn1)
-
-/* These are the same except they are for the declarations */
-
-#if defined(WIN16) || defined(NO_FP_API)
-
-#define DECLARE_PEM_read_fp(name, type) /**/
-#define DECLARE_PEM_write_fp(name, type) /**/
-#define DECLARE_PEM_write_cb_fp(name, type) /**/
-
-#else
-
-#define DECLARE_PEM_read_fp(name, type) \
-        type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
-
-#define DECLARE_PEM_write_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x);
-
-#define DECLARE_PEM_write_cb_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-#endif
-
-#ifdef HEADER_BIO_H
-#define DECLARE_PEM_read_bio(name, type) \
-        type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
-
-#define DECLARE_PEM_write_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x);
-
-#define DECLARE_PEM_write_cb_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-#else
-
-#define DECLARE_PEM_read_bio(name, type) /**/
-#define DECLARE_PEM_write_bio(name, type) /**/
-#define DECLARE_PEM_write_cb_bio(name, type) /**/
-
-#endif
-
-#define DECLARE_PEM_write(name, type) \
-        DECLARE_PEM_write_bio(name, type) \
-        DECLARE_PEM_write_fp(name, type) 
-
-#define DECLARE_PEM_write_cb(name, type) \
-        DECLARE_PEM_write_cb_bio(name, type) \
-        DECLARE_PEM_write_cb_fp(name, type) 
-
-#define DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_read_bio(name, type) \
-        DECLARE_PEM_read_fp(name, type)
-
-#define DECLARE_PEM_rw(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write(name, type)
-
-#define DECLARE_PEM_rw_cb(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_cb(name, type)
-
-#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,NULL)
-#define PEM_write_X509(fp,x) \
-                PEM_ASN1_write((int (*)())i2d_X509,PEM_STRING_X509,fp, \
-                        (char *)x, NULL,NULL,0,NULL,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,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,NULL)
-#define PEM_write_RSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
-                PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,\
-                        (char *)x,enc,kstr,klen,cb,u)
-#define PEM_write_RSAPublicKey(fp,x) \
-                PEM_ASN1_write((int (*)())i2d_RSAPublicKey,\
-                        PEM_STRING_RSA_PUBLIC,fp,(char *)x,NULL,NULL,0,NULL,NULL)
-#define PEM_write_DSAPrivateKey(fp,x,enc,kstr,klen,cb,u) \
-                PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,\
-                        (char *)x,enc,kstr,klen,cb,u)
-#define PEM_write_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
-                PEM_ASN1_write((int (*)())i2d_PrivateKey,\
-                (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),\
-                        bp,(char *)x,enc,kstr,klen,cb,u)
-#define PEM_write_PKCS7(fp,x) \
-                PEM_ASN1_write((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,fp, \
-                        (char *)x, NULL,NULL,0,NULL,NULL)
-#define PEM_write_DHparams(fp,x) \
-                PEM_ASN1_write((int (*)())i2d_DHparams,PEM_STRING_DHPARAMS,fp,\
-                        (char *)x,NULL,NULL,0,NULL,NULL)
-
-#define PEM_write_NETSCAPE_CERT_SEQUENCE(fp,x) \
-                PEM_ASN1_write((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
-                        PEM_STRING_X509,fp, \
-                        (char *)x, NULL,NULL,0,NULL,NULL)
-
-#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
-        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb,u)
-#define PEM_read_X509(fp,x,cb,u) (X509 *)PEM_ASN1_read( \
-        (char *(*)())d2i_X509,PEM_STRING_X509,fp,(char **)x,cb,u)
-#define PEM_read_X509_REQ(fp,x,cb,u) (X509_REQ *)PEM_ASN1_read( \
-        (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,fp,(char **)x,cb,u)
-#define PEM_read_X509_CRL(fp,x,cb,u) (X509_CRL *)PEM_ASN1_read( \
-        (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,fp,(char **)x,cb,u)
-#define PEM_read_RSAPrivateKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
-        (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,fp,(char **)x,cb,u)
-#define PEM_read_RSAPublicKey(fp,x,cb,u) (RSA *)PEM_ASN1_read( \
-        (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb,u)
-#define PEM_read_DSAPrivateKey(fp,x,cb,u) (DSA *)PEM_ASN1_read( \
-        (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,fp,(char **)x,cb,u)
-#define PEM_read_PrivateKey(fp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read( \
-        (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,fp,(char **)x,cb,u)
-#define PEM_read_PKCS7(fp,x,cb,u) (PKCS7 *)PEM_ASN1_read( \
-        (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,fp,(char **)x,cb,u)
-#define PEM_read_DHparams(fp,x,cb,u) (DH *)PEM_ASN1_read( \
-        (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,fp,(char **)x,cb,u)
-
-#define PEM_read_NETSCAPE_CERT_SEQUENCE(fp,x,cb,u) \
-                (NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read( \
-        (char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,fp,\
-                                                        (char **)x,cb,u)
-
-#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,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,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,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,NULL)
-#define PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
-                PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,\
-                        bp,(char *)x,enc,kstr,klen,cb,u)
-#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,NULL)
-#define PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \
-                PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,\
-                        bp,(char *)x,enc,kstr,klen,cb,u)
-#define PEM_write_bio_PrivateKey(bp,x,enc,kstr,klen,cb,u) \
-                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,u)
-#define PEM_write_bio_PKCS7(bp,x) \
-                PEM_ASN1_write_bio((int (*)())i2d_PKCS7,PEM_STRING_PKCS7,bp, \
-                        (char *)x, NULL,NULL,0,NULL,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,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,NULL)
-
-#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE(bp,x) \
-                PEM_ASN1_write_bio((int (*)())i2d_NETSCAPE_CERT_SEQUENCE, \
-                        PEM_STRING_X509,bp, \
-                        (char *)x, NULL,NULL,0,NULL,NULL)
-
-#define PEM_read_bio_SSL_SESSION(bp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,bp,(char **)x,cb,u)
-#define PEM_read_bio_X509(bp,x,cb,u) (X509 *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_X509,PEM_STRING_X509,bp,(char **)x,cb,u)
-#define PEM_read_bio_X509_REQ(bp,x,cb,u) (X509_REQ *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_X509_REQ,PEM_STRING_X509_REQ,bp,(char **)x,cb,u)
-#define PEM_read_bio_X509_CRL(bp,x,cb,u) (X509_CRL *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_X509_CRL,PEM_STRING_X509_CRL,bp,(char **)x,cb,u)
-#define PEM_read_bio_RSAPrivateKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_RSAPrivateKey,PEM_STRING_RSA,bp,(char **)x,cb,u)
-#define PEM_read_bio_RSAPublicKey(bp,x,cb,u) (RSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_RSAPublicKey,PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb,u)
-#define PEM_read_bio_DSAPrivateKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_DSAPrivateKey,PEM_STRING_DSA,bp,(char **)x,cb,u)
-#define PEM_read_bio_PrivateKey(bp,x,cb,u) (EVP_PKEY *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_PrivateKey,PEM_STRING_EVP_PKEY,bp,(char **)x,cb,u)
-
-#define PEM_read_bio_PKCS7(bp,x,cb,u) (PKCS7 *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_PKCS7,PEM_STRING_PKCS7,bp,(char **)x,cb,u)
-#define PEM_read_bio_DHparams(bp,x,cb,u) (DH *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_DHparams,PEM_STRING_DHPARAMS,bp,(char **)x,cb,u)
-#define PEM_read_bio_DSAparams(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_DSAparams,PEM_STRING_DSAPARAMS,bp,(char **)x,cb,u)
-
-#define PEM_read_bio_NETSCAPE_CERT_SEQUENCE(bp,x,cb,u) \
-                (NETSCAPE_CERT_SEQUENCE *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,PEM_STRING_X509,bp,\
-                                                        (char **)x,cb,u)
-
-#endif
-
-#if 1
-/* "userdata": new with OpenSSL 0.9.4 */
-typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
-#else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb(char *buf, int size, int rwflag);
-#endif
-
-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,
-        pem_password_cb *callback,void *u);
-
-#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,const char *name,char *hdr,unsigned char *data,
-                long len);
-char *  PEM_ASN1_read_bio(char *(*d2i)(),const char *name,BIO *bp,char **x,
-                pem_password_cb *cb, void *u);
-int     PEM_ASN1_write_bio(int (*i2d)(),const char *name,BIO *bp,char *x,
-                           const EVP_CIPHER *enc,unsigned char *kstr,int klen,
-                           pem_password_cb *cb, void *u);
-STACK_OF(X509_INFO) *   PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
-int     PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
-                unsigned char *kstr, int klen, pem_password_cb *cd, void *u);
-#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)(),const char *name,FILE *fp,char **x,
-        pem_password_cb *cb, void *u);
-int     PEM_ASN1_write(int (*i2d)(),const char *name,FILE *fp,char *x,
-                       const EVP_CIPHER *enc,unsigned char *kstr,int klen,
-                       pem_password_cb *callback, void *u);
-STACK_OF(X509_INFO) *   PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-        pem_password_cb *cb, void *u);
-#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, const char *type, int len, char *str);
-
-#ifndef SSLEAY_MACROS
-
-#ifdef VMS
-#include <openssl/vms_idhacks.h>
-#endif
-
-DECLARE_PEM_rw(X509, X509)
-
-DECLARE_PEM_rw(X509_REQ, X509_REQ)
-
-DECLARE_PEM_rw(X509_CRL, X509_CRL)
-
-DECLARE_PEM_rw(PKCS7, PKCS7)
-
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-
-DECLARE_PEM_rw(PKCS8, X509_SIG)
-
-DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-
-#ifndef NO_RSA
-
-DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-
-DECLARE_PEM_rw(RSAPublicKey, RSA)
-
-#endif
-
-#ifndef NO_DSA
-
-DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-
-DECLARE_PEM_rw(DSAparams, DSA)
-
-#endif
-
-#ifndef NO_DH
-
-DECLARE_PEM_rw(DHparams, DH)
-
-#endif
-
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
-
-int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
-                                  char *, int, pem_password_cb *, void *);
-int PEM_write_PKCS8PrivateKey(FILE *fp,EVP_PKEY *x,const EVP_CIPHER *enc,
-                              char *kstr,int klen, pem_password_cb *cd, void *u);
-#endif /* SSLEAY_MACROS */
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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_F_PEM_WRITE_PKCS8PRIVATEKEY            118
-#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_WRITE_BIO_PKCS8PRIVATEKEY              119
-#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_ERROR_CONVERTING_PRIVATE_KEY               115
-#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/pem/pem2.h b/src/lib/libcrypto/pem/pem2.h
deleted file mode 100644
index 4a016aacd2..0000000000
--- a/src/lib/libcrypto/pem/pem2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This header only exists to break a circular dependency between pem and err
- * Ben 30 Jan 1999.
- */
-
-void ERR_load_PEM_strings(void);
diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
deleted file mode 100644
index bc473f3cff..0000000000
--- a/src/lib/libcrypto/pem/pem_all.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* crypto/pem/pem_all.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>
-#undef SSLEAY_MACROS
-#include "cryptlib.h"
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pkcs7.h>
-#include <openssl/pem.h>
-
-IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)
-
-IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)
-
-IMPLEMENT_PEM_rw(X509_CRL, X509_CRL, PEM_STRING_X509_CRL, X509_CRL)
-
-IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
-
-IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
-                                        PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
-
-IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
-IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
-                                                         PKCS8_PRIV_KEY_INFO)
-
-#ifndef NO_RSA
-
-IMPLEMENT_PEM_rw_cb(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
-
-IMPLEMENT_PEM_rw(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
-
-#endif
-
-#ifndef NO_DSA
-
-IMPLEMENT_PEM_rw_cb(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
-
-IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
-
-#endif
-
-#ifndef NO_DH
-
-IMPLEMENT_PEM_rw(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)
-
-#endif
-
-
-/* The PrivateKey case is not that straightforward.
- *   IMPLEMENT_PEM_rw_cb(PrivateKey, EVP_PKEY, PEM_STRING_EVP_PKEY, PrivateKey)
- * does not work, RSA and DSA keys have specific strings.
- * (When reading, parameter PEM_STRING_EVP_PKEY is a wildcard for anything
- * appropriate.)
- */
-IMPLEMENT_PEM_read(PrivateKey, EVP_PKEY, PEM_STRING_EVP_PKEY, PrivateKey)
-IMPLEMENT_PEM_write_cb(PrivateKey, EVP_PKEY, ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), PrivateKey)
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c
deleted file mode 100644
index fa70f60998..0000000000
--- a/src/lib/libcrypto/pem/pem_err.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/pem/pem_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/pem.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA PEM_str_functs[]=
-        {
-{ERR_PACK(0,PEM_F_DEF_CALLBACK,0),      "DEF_CALLBACK"},
-{ERR_PACK(0,PEM_F_LOAD_IV,0),   "LOAD_IV"},
-{ERR_PACK(0,PEM_F_PEM_ASN1_READ,0),     "PEM_ASN1_read"},
-{ERR_PACK(0,PEM_F_PEM_ASN1_READ_BIO,0), "PEM_ASN1_read_bio"},
-{ERR_PACK(0,PEM_F_PEM_ASN1_WRITE,0),    "PEM_ASN1_write"},
-{ERR_PACK(0,PEM_F_PEM_ASN1_WRITE_BIO,0),        "PEM_ASN1_write_bio"},
-{ERR_PACK(0,PEM_F_PEM_DO_HEADER,0),     "PEM_do_header"},
-{ERR_PACK(0,PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY,0),   "PEM_F_PEM_WRITE_PKCS8PRIVATEKEY"},
-{ERR_PACK(0,PEM_F_PEM_GET_EVP_CIPHER_INFO,0),   "PEM_get_EVP_CIPHER_INFO"},
-{ERR_PACK(0,PEM_F_PEM_READ,0),  "PEM_read"},
-{ERR_PACK(0,PEM_F_PEM_READ_BIO,0),      "PEM_read_bio"},
-{ERR_PACK(0,PEM_F_PEM_SEALFINAL,0),     "PEM_SealFinal"},
-{ERR_PACK(0,PEM_F_PEM_SEALINIT,0),      "PEM_SealInit"},
-{ERR_PACK(0,PEM_F_PEM_SIGNFINAL,0),     "PEM_SignFinal"},
-{ERR_PACK(0,PEM_F_PEM_WRITE,0), "PEM_write"},
-{ERR_PACK(0,PEM_F_PEM_WRITE_BIO,0),     "PEM_write_bio"},
-{ERR_PACK(0,PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY,0),     "PEM_write_bio_PKCS8PrivateKey"},
-{ERR_PACK(0,PEM_F_PEM_X509_INFO_READ,0),        "PEM_X509_INFO_read"},
-{ERR_PACK(0,PEM_F_PEM_X509_INFO_READ_BIO,0),    "PEM_X509_INFO_read_bio"},
-{ERR_PACK(0,PEM_F_PEM_X509_INFO_WRITE_BIO,0),   "PEM_X509_INFO_write_bio"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA PEM_str_reasons[]=
-        {
-{PEM_R_BAD_BASE64_DECODE                 ,"bad base64 decode"},
-{PEM_R_BAD_DECRYPT                       ,"bad decrypt"},
-{PEM_R_BAD_END_LINE                      ,"bad end line"},
-{PEM_R_BAD_IV_CHARS                      ,"bad iv chars"},
-{PEM_R_BAD_PASSWORD_READ                 ,"bad password read"},
-{PEM_R_ERROR_CONVERTING_PRIVATE_KEY      ,"error converting private key"},
-{PEM_R_NOT_DEK_INFO                      ,"not dek info"},
-{PEM_R_NOT_ENCRYPTED                     ,"not encrypted"},
-{PEM_R_NOT_PROC_TYPE                     ,"not proc type"},
-{PEM_R_NO_START_LINE                     ,"no start line"},
-{PEM_R_PROBLEMS_GETTING_PASSWORD         ,"problems getting password"},
-{PEM_R_PUBLIC_KEY_NO_RSA                 ,"public key no rsa"},
-{PEM_R_READ_KEY                          ,"read key"},
-{PEM_R_SHORT_HEADER                      ,"short header"},
-{PEM_R_UNSUPPORTED_CIPHER                ,"unsupported cipher"},
-{PEM_R_UNSUPPORTED_ENCRYPTION            ,"unsupported encryption"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_PEM_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_PEM,PEM_str_functs);
-                ERR_load_strings(ERR_LIB_PEM,PEM_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
deleted file mode 100644
index fec18a4c2e..0000000000
--- a/src/lib/libcrypto/pem/pem_info.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* crypto/pem/pem_info.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 <openssl/buffer.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-
-#ifndef NO_FP_API
-STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
-        {
-        BIO *b;
-        STACK_OF(X509_INFO) *ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                PEMerr(PEM_F_PEM_X509_INFO_READ,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_X509_INFO_read_bio(b,sk,cb,u);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
-        {
-        X509_INFO *xi=NULL;
-        char *name=NULL,*header=NULL,**pp;
-        unsigned char *data=NULL,*p;
-        long len,error=0;
-        int ok=0;
-        STACK_OF(X509_INFO) *ret=NULL;
-        unsigned int i,raw;
-        char *(*d2i)();
-
-        if (sk == NULL)
-                {
-                if ((ret=sk_X509_INFO_new_null()) == NULL)
-                        {
-                        PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                }
-        else
-                ret=sk;
-
-        if ((xi=X509_INFO_new()) == NULL) goto err;
-        for (;;)
-                {
-                raw=0;
-                i=PEM_read_bio(bp,&name,&header,&data,&len);
-                if (i == 0)
-                        {
-                        error=ERR_GET_REASON(ERR_peek_error());
-                        if (error == PEM_R_NO_START_LINE)
-                                {
-                                ERR_clear_error();
-                                break;
-                                }
-                        goto err;
-                        }
-start:
-                if (    (strcmp(name,PEM_STRING_X509) == 0) ||
-                        (strcmp(name,PEM_STRING_X509_OLD) == 0))
-                        {
-                        d2i=(char *(*)())d2i_X509;
-                        if (xi->x509 != NULL)
-                                {
-                                if (!sk_X509_INFO_push(ret,xi)) goto err;
-                                if ((xi=X509_INFO_new()) == NULL) goto err;
-                                goto start;
-                                }
-                        pp=(char **)&(xi->x509);
-                        }
-                else if (strcmp(name,PEM_STRING_X509_CRL) == 0)
-                        {
-                        d2i=(char *(*)())d2i_X509_CRL;
-                        if (xi->crl != NULL)
-                                {
-                                if (!sk_X509_INFO_push(ret,xi)) goto err;
-                                if ((xi=X509_INFO_new()) == NULL) goto err;
-                                goto start;
-                                }
-                        pp=(char **)&(xi->crl);
-                        }
-                else
-#ifndef NO_RSA
-                        if (strcmp(name,PEM_STRING_RSA) == 0)
-                        {
-                        d2i=(char *(*)())d2i_RSAPrivateKey;
-                        if (xi->x_pkey != NULL) 
-                                {
-                                if (!sk_X509_INFO_push(ret,xi)) goto err;
-                                if ((xi=X509_INFO_new()) == NULL) goto err;
-                                goto start;
-                                }
-
-                        xi->enc_data=NULL;
-                        xi->enc_len=0;
-
-                        xi->x_pkey=X509_PKEY_new();
-                        if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                                goto err;
-                        xi->x_pkey->dec_pkey->type=EVP_PKEY_RSA;
-                        pp=(char **)&(xi->x_pkey->dec_pkey->pkey.rsa);
-                        if ((int)strlen(header) > 10) /* assume encrypted */
-                                raw=1;
-                        }
-                else
-#endif
-#ifndef NO_DSA
-                        if (strcmp(name,PEM_STRING_DSA) == 0)
-                        {
-                        d2i=(char *(*)())d2i_DSAPrivateKey;
-                        if (xi->x_pkey != NULL) 
-                                {
-                                if (!sk_X509_INFO_push(ret,xi)) goto err;
-                                if ((xi=X509_INFO_new()) == NULL) goto err;
-                                goto start;
-                                }
-
-                        xi->enc_data=NULL;
-                        xi->enc_len=0;
-
-                        xi->x_pkey=X509_PKEY_new();
-                        if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                                goto err;
-                        xi->x_pkey->dec_pkey->type=EVP_PKEY_DSA;
-                        pp=(char **)&(xi->x_pkey->dec_pkey->pkey.dsa);
-                        if ((int)strlen(header) > 10) /* assume encrypted */
-                                raw=1;
-                        }
-                else
-#endif
-                        {
-                        d2i=NULL;
-                        pp=NULL;
-                        }
-
-                if (d2i != NULL)
-                        {
-                        if (!raw)
-                                {
-                                EVP_CIPHER_INFO cipher;
-
-                                if (!PEM_get_EVP_CIPHER_INFO(header,&cipher))
-                                        goto err;
-                                if (!PEM_do_header(&cipher,data,&len,cb,u))
-                                        goto err;
-                                p=data;
-                                if (d2i(pp,&p,len) == NULL)
-                                        {
-                                        PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_ASN1_LIB);
-                                        goto err;
-                                        }
-                                }
-                        else
-                                { /* encrypted RSA data */
-                                if (!PEM_get_EVP_CIPHER_INFO(header,
-                                        &xi->enc_cipher)) goto err;
-                                xi->enc_data=(char *)data;
-                                xi->enc_len=(int)len;
-                                data=NULL;
-                                }
-                        }
-                else    {
-                        /* unknown */
-                        }
-                if (name != NULL) Free(name);
-                if (header != NULL) Free(header);
-                if (data != NULL) Free(data);
-                name=NULL;
-                header=NULL;
-                data=NULL;
-                }
-
-        /* if the last one hasn't been pushed yet and there is anything
-         * in it then add it to the stack ... 
-         */
-        if ((xi->x509 != NULL) || (xi->crl != NULL) ||
-                (xi->x_pkey != NULL) || (xi->enc_data != NULL))
-                {
-                if (!sk_X509_INFO_push(ret,xi)) goto err;
-                xi=NULL;
-                }
-        ok=1;
-err:
-        if (xi != NULL) X509_INFO_free(xi);
-        if (!ok)
-                {
-                for (i=0; ((int)i)<sk_X509_INFO_num(ret); i++)
-                        {
-                        xi=sk_X509_INFO_value(ret,i);
-                        X509_INFO_free(xi);
-                        }
-                if (ret != sk) sk_X509_INFO_free(ret);
-                ret=NULL;
-                }
-                
-        if (name != NULL) Free(name);
-        if (header != NULL) Free(header);
-        if (data != NULL) Free(data);
-        return(ret);
-        }
-
-
-/* A TJH addition */
-int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u)
-        {
-        EVP_CIPHER_CTX ctx;
-        int i,ret=0;
-        unsigned char *data=NULL;
-        const char *objstr=NULL;
-        char buf[PEM_BUFSIZE];
-        unsigned char *iv=NULL;
-        
-        if (enc != NULL)
-                {
-                objstr=OBJ_nid2sn(EVP_CIPHER_nid(enc));
-                if (objstr == NULL)
-                        {
-                        PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO,PEM_R_UNSUPPORTED_CIPHER);
-                        goto err;
-                        }
-                }
-
-        /* now for the fun part ... if we have a private key then 
-         * we have to be able to handle a not-yet-decrypted key
-         * being written out correctly ... if it is decrypted or
-         * it is non-encrypted then we use the base code
-         */
-        if (xi->x_pkey!=NULL)
-                {
-                if ( (xi->enc_data!=NULL) && (xi->enc_len>0) )
-                        {
-                        /* copy from wierdo names into more normal things */
-                        iv=xi->enc_cipher.iv;
-                        data=(unsigned char *)xi->enc_data;
-                        i=xi->enc_len;
-
-                        /* we take the encryption data from the
-                         * internal stuff rather than what the
-                         * user has passed us ... as we have to 
-                         * match exactly for some strange reason
-                         */
-                        objstr=OBJ_nid2sn(
-                                EVP_CIPHER_nid(xi->enc_cipher.cipher));
-                        if (objstr == NULL)
-                                {
-                                PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO,PEM_R_UNSUPPORTED_CIPHER);
-                                goto err;
-                                }
-
-                        /* create the right magic header stuff */
-                        buf[0]='\0';
-                        PEM_proc_type(buf,PEM_TYPE_ENCRYPTED);
-                        PEM_dek_info(buf,objstr,8,(char *)iv);
-
-                        /* use the normal code to write things out */
-                        i=PEM_write_bio(bp,PEM_STRING_RSA,buf,data,i);
-                        if (i <= 0) goto err;
-                        }
-                else
-                        {
-                        /* Add DSA/DH */
-#ifndef NO_RSA
-                        /* normal optionally encrypted stuff */
-                        if (PEM_write_bio_RSAPrivateKey(bp,
-                                xi->x_pkey->dec_pkey->pkey.rsa,
-                                enc,kstr,klen,cb,u)<=0)
-                                goto err;
-#endif
-                        }
-                }
-
-        /* if we have a certificate then write it out now */
-        if ((xi->x509 != NULL) || (PEM_write_bio_X509(bp,xi->x509) <= 0))
-                goto err;
-
-        /* we are ignoring anything else that is loaded into the X509_INFO
-         * structure for the moment ... as I don't need it so I'm not
-         * coding it here and Eric can do it when this makes it into the
-         * base library --tjh
-         */
-
-        ret=1;
-
-err:
-        memset((char *)&ctx,0,sizeof(ctx));
-        memset(buf,0,PEM_BUFSIZE);
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
deleted file mode 100644
index 90f02011ba..0000000000
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/* crypto/pem/pem_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 <openssl/buffer.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/pkcs12.h>
-#ifndef NO_DES
-#include <openssl/des.h>
-#endif
-
-const char *PEM_version="PEM" OPENSSL_VERSION_PTEXT;
-
-#define MIN_LENGTH      4
-
-static int def_callback(char *buf, int num, int w, void *userdata);
-static int load_iv(unsigned char **fromp,unsigned char *to, int num);
-
-static int def_callback(char *buf, int num, int w, void *userdata)
-        {
-#ifdef NO_FP_API
-        /* We should not ever call the default callback routine from
-         * windows. */
-        PEMerr(PEM_F_DEF_CALLBACK,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return(-1);
-#else
-        int i,j;
-        const char *prompt;
-
-        prompt=EVP_get_pw_prompt();
-        if (prompt == NULL)
-                prompt="Enter PEM pass phrase:";
-
-        for (;;)
-                {
-                i=EVP_read_pw_string(buf,num,prompt,w);
-                if (i != 0)
-                        {
-                        PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
-                        memset(buf,0,(unsigned int)num);
-                        return(-1);
-                        }
-                j=strlen(buf);
-                if (j < MIN_LENGTH)
-                        {
-                        fprintf(stderr,"phrase is too short, needs to be at least %d chars\n",MIN_LENGTH);
-                        }
-                else
-                        break;
-                }
-        return(j);
-#endif
-        }
-
-void PEM_proc_type(char *buf, int type)
-        {
-        const char *str;
-
-        if (type == PEM_TYPE_ENCRYPTED)
-                str="ENCRYPTED";
-        else if (type == PEM_TYPE_MIC_CLEAR)
-                str="MIC-CLEAR";
-        else if (type == PEM_TYPE_MIC_ONLY)
-                str="MIC-ONLY";
-        else
-                str="BAD-TYPE";
-                
-        strcat(buf,"Proc-Type: 4,");
-        strcat(buf,str);
-        strcat(buf,"\n");
-        }
-
-void PEM_dek_info(char *buf, const char *type, int len, char *str)
-        {
-        static unsigned char map[17]="0123456789ABCDEF";
-        long i;
-        int j;
-
-        strcat(buf,"DEK-Info: ");
-        strcat(buf,type);
-        strcat(buf,",");
-        j=strlen(buf);
-        for (i=0; i<len; i++)
-                {
-                buf[j+i*2]  =map[(str[i]>>4)&0x0f];
-                buf[j+i*2+1]=map[(str[i]   )&0x0f];
-                }
-        buf[j+i*2]='\n';
-        buf[j+i*2+1]='\0';
-        }
-
-#ifndef NO_FP_API
-char *PEM_ASN1_read(char *(*d2i)(), const char *name, FILE *fp, char **x,
-             pem_password_cb *cb, void *u)
-        {
-        BIO *b;
-        char *ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                PEMerr(PEM_F_PEM_ASN1_READ,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_ASN1_read_bio(d2i,name,b,x,cb,u);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-char *PEM_ASN1_read_bio(char *(*d2i)(), const char *name, BIO *bp, char **x,
-             pem_password_cb *cb, void *u)
-        {
-        EVP_CIPHER_INFO cipher;
-        char *nm=NULL,*header=NULL;
-        unsigned char *p=NULL,*data=NULL;
-        long len;
-        char *ret=NULL;
-
-        for (;;)
-                {
-                if (!PEM_read_bio(bp,&nm,&header,&data,&len)) return(NULL);
-                if (    (strcmp(nm,name) == 0) ||
-                        ((strcmp(nm,PEM_STRING_RSA) == 0) &&
-                         (strcmp(name,PEM_STRING_EVP_PKEY) == 0)) ||
-                        ((strcmp(nm,PEM_STRING_DSA) == 0) &&
-                         (strcmp(name,PEM_STRING_EVP_PKEY) == 0)) ||
-                        ((strcmp(nm,PEM_STRING_PKCS8) == 0) &&
-                         (strcmp(name,PEM_STRING_EVP_PKEY) == 0)) ||
-                        ((strcmp(nm,PEM_STRING_PKCS8INF) == 0) &&
-                         (strcmp(name,PEM_STRING_EVP_PKEY) == 0)) ||
-                        ((strcmp(nm,PEM_STRING_X509_OLD) == 0) &&
-                         (strcmp(name,PEM_STRING_X509) == 0)) ||
-                        ((strcmp(nm,PEM_STRING_X509_REQ_OLD) == 0) &&
-                         (strcmp(name,PEM_STRING_X509_REQ) == 0)) 
-                        )
-                        break;
-                Free(nm);
-                Free(header);
-                Free(data);
-                }
-        if (!PEM_get_EVP_CIPHER_INFO(header,&cipher)) goto err;
-        if (!PEM_do_header(&cipher,data,&len,cb,u)) goto err;
-        p=data;
-        if (strcmp(name,PEM_STRING_EVP_PKEY) == 0) {
-                if (strcmp(nm,PEM_STRING_RSA) == 0)
-                        ret=d2i(EVP_PKEY_RSA,x,&p,len);
-                else if (strcmp(nm,PEM_STRING_DSA) == 0)
-                        ret=d2i(EVP_PKEY_DSA,x,&p,len);
-                else if (strcmp(nm,PEM_STRING_PKCS8INF) == 0) {
-                        PKCS8_PRIV_KEY_INFO *p8inf;
-                        p8inf=d2i_PKCS8_PRIV_KEY_INFO(
-                                        (PKCS8_PRIV_KEY_INFO **) x, &p, len);
-                        ret = (char *)EVP_PKCS82PKEY(p8inf);
-                        PKCS8_PRIV_KEY_INFO_free(p8inf);
-                } else if (strcmp(nm,PEM_STRING_PKCS8) == 0) {
-                        PKCS8_PRIV_KEY_INFO *p8inf;
-                        X509_SIG *p8;
-                        int klen;
-                        char psbuf[PEM_BUFSIZE];
-                        p8 = d2i_X509_SIG((X509_SIG **)x, &p, len);
-                        if(!p8) goto p8err;
-                        if (cb) klen=cb(psbuf,PEM_BUFSIZE,0,u);
-                        else klen=def_callback(psbuf,PEM_BUFSIZE,0,u);
-                        if (klen <= 0) {
-                                PEMerr(PEM_F_PEM_ASN1_READ_BIO,
-                                                PEM_R_BAD_PASSWORD_READ);
-                                goto err;
-                        }
-                        p8inf = M_PKCS8_decrypt(p8, psbuf, klen);
-                        X509_SIG_free(p8);
-                        if(!p8inf) goto p8err;
-                        ret = (char *)EVP_PKCS82PKEY(p8inf);
-                        PKCS8_PRIV_KEY_INFO_free(p8inf);
-                }
-        } else  ret=d2i(x,&p,len);
-p8err:
-        if (ret == NULL)
-                PEMerr(PEM_F_PEM_ASN1_READ_BIO,ERR_R_ASN1_LIB);
-err:
-        Free(nm);
-        Free(header);
-        Free(data);
-        return(ret);
-        }
-
-#ifndef NO_FP_API
-int PEM_ASN1_write(int (*i2d)(), const char *name, FILE *fp, char *x,
-             const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-             pem_password_cb *callback, void *u)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                PEMerr(PEM_F_PEM_ASN1_WRITE,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_ASN1_write_bio(i2d,name,b,x,enc,kstr,klen,callback,u);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x,
-             const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-             pem_password_cb *callback, void *u)
-        {
-        EVP_CIPHER_CTX ctx;
-        int dsize=0,i,j,ret=0;
-        unsigned char *p,*data=NULL;
-        const char *objstr=NULL;
-        char buf[PEM_BUFSIZE];
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        unsigned char iv[EVP_MAX_IV_LENGTH];
-        
-        if (enc != NULL)
-                {
-                objstr=OBJ_nid2sn(EVP_CIPHER_nid(enc));
-                if (objstr == NULL)
-                        {
-                        PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,PEM_R_UNSUPPORTED_CIPHER);
-                        goto err;
-                        }
-                }
-
-        if ((dsize=i2d(x,NULL)) < 0)
-                {
-                PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,ERR_R_MALLOC_FAILURE);
-                dsize=0;
-                goto err;
-                }
-        /* dzise + 8 bytes are needed */
-        data=(unsigned char *)Malloc((unsigned int)dsize+20);
-        if (data == NULL)
-                {
-                PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        p=data;
-        i=i2d(x,&p);
-
-        if (enc != NULL)
-                {
-                if (kstr == NULL)
-                        {
-                        if (callback == NULL)
-                                klen=def_callback(buf,PEM_BUFSIZE,1,u);
-                        else
-                                klen=(*callback)(buf,PEM_BUFSIZE,1,u);
-                        if (klen <= 0)
-                                {
-                                PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,PEM_R_READ_KEY);
-                                goto err;
-                                }
-#ifdef CHARSET_EBCDIC
-                        /* Convert the pass phrase from EBCDIC */
-                        ebcdic2ascii(buf, buf, klen);
-#endif
-                        kstr=(unsigned char *)buf;
-                        }
-                RAND_seed(data,i);/* put in the RSA key. */
-                RAND_bytes(iv,8);       /* Generate a salt */
-                /* The 'iv' is used as the iv and as a salt.  It is
-                 * NOT taken from the BytesToKey function */
-                EVP_BytesToKey(enc,EVP_md5(),iv,kstr,klen,1,key,NULL);
-
-                if (kstr == (unsigned char *)buf) memset(buf,0,PEM_BUFSIZE);
-
-                buf[0]='\0';
-                PEM_proc_type(buf,PEM_TYPE_ENCRYPTED);
-                PEM_dek_info(buf,objstr,8,(char *)iv);
-                /* k=strlen(buf); */
-        
-                EVP_EncryptInit(&ctx,enc,key,iv);
-                EVP_EncryptUpdate(&ctx,data,&j,data,i);
-                EVP_EncryptFinal(&ctx,&(data[j]),&i);
-                i+=j;
-                ret=1;
-                }
-        else
-                {
-                ret=1;
-                buf[0]='\0';
-                }
-        i=PEM_write_bio(bp,name,buf,data,i);
-        if (i <= 0) ret=0;
-err:
-        memset(key,0,sizeof(key));
-        memset(iv,0,sizeof(iv));
-        memset((char *)&ctx,0,sizeof(ctx));
-        memset(buf,0,PEM_BUFSIZE);
-        memset(data,0,(unsigned int)dsize);
-        Free(data);
-        return(ret);
-        }
-
-int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
-             pem_password_cb *callback,void *u)
-        {
-        int i,j,o,klen;
-        long len;
-        EVP_CIPHER_CTX ctx;
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        char buf[PEM_BUFSIZE];
-
-        len= *plen;
-
-        if (cipher->cipher == NULL) return(1);
-        if (callback == NULL)
-                klen=def_callback(buf,PEM_BUFSIZE,0,u);
-        else
-                klen=callback(buf,PEM_BUFSIZE,0,u);
-        if (klen <= 0)
-                {
-                PEMerr(PEM_F_PEM_DO_HEADER,PEM_R_BAD_PASSWORD_READ);
-                return(0);
-                }
-#ifdef CHARSET_EBCDIC
-        /* Convert the pass phrase from EBCDIC */
-        ebcdic2ascii(buf, buf, klen);
-#endif
-
-        EVP_BytesToKey(cipher->cipher,EVP_md5(),&(cipher->iv[0]),
-                (unsigned char *)buf,klen,1,key,NULL);
-
-        j=(int)len;
-        EVP_DecryptInit(&ctx,cipher->cipher,key,&(cipher->iv[0]));
-        EVP_DecryptUpdate(&ctx,data,&i,data,j);
-        o=EVP_DecryptFinal(&ctx,&(data[i]),&j);
-        EVP_CIPHER_CTX_cleanup(&ctx);
-        memset((char *)buf,0,sizeof(buf));
-        memset((char *)key,0,sizeof(key));
-        j+=i;
-        if (!o)
-                {
-                PEMerr(PEM_F_PEM_DO_HEADER,PEM_R_BAD_DECRYPT);
-                return(0);
-                }
-        *plen=j;
-        return(1);
-        }
-
-int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
-        {
-        int o;
-        const EVP_CIPHER *enc=NULL;
-        char *p,c;
-
-        cipher->cipher=NULL;
-        if ((header == NULL) || (*header == '\0') || (*header == '\n'))
-                return(1);
-        if (strncmp(header,"Proc-Type: ",11) != 0)
-                { PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_NOT_PROC_TYPE); return(0); }
-        header+=11;
-        if (*header != '4') return(0); header++;
-        if (*header != ',') return(0); header++;
-        if (strncmp(header,"ENCRYPTED",9) != 0)
-                { PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_NOT_ENCRYPTED); return(0); }
-        for (; (*header != '\n') && (*header != '\0'); header++)
-                ;
-        if (*header == '\0')
-                { PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_SHORT_HEADER); return(0); }
-        header++;
-        if (strncmp(header,"DEK-Info: ",10) != 0)
-                { PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_NOT_DEK_INFO); return(0); }
-        header+=10;
-
-        p=header;
-        for (;;)
-                {
-                c= *header;
-#ifndef CHARSET_EBCDIC
-                if (!(  ((c >= 'A') && (c <= 'Z')) || (c == '-') ||
-                        ((c >= '0') && (c <= '9'))))
-                        break;
-#else
-                if (!(  isupper(c) || (c == '-') ||
-                        isdigit(c)))
-                        break;
-#endif
-                header++;
-                }
-        *header='\0';
-        o=OBJ_sn2nid(p);
-        cipher->cipher=enc=EVP_get_cipherbyname(p);
-        *header=c;
-        header++;
-
-        if (enc == NULL)
-                {
-                PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_UNSUPPORTED_ENCRYPTION);
-                return(0);
-                }
-        if (!load_iv((unsigned char **)&header,&(cipher->iv[0]),8)) return(0);
-
-        return(1);
-        }
-
-static int load_iv(unsigned char **fromp, unsigned char *to, int num)
-        {
-        int v,i;
-        unsigned char *from;
-
-        from= *fromp;
-        for (i=0; i<num; i++) to[i]=0;
-        num*=2;
-        for (i=0; i<num; i++)
-                {
-                if ((*from >= '0') && (*from <= '9'))
-                        v= *from-'0';
-                else if ((*from >= 'A') && (*from <= 'F'))
-                        v= *from-'A'+10;
-                else if ((*from >= 'a') && (*from <= 'f'))
-                        v= *from-'a'+10;
-                else
-                        {
-                        PEMerr(PEM_F_LOAD_IV,PEM_R_BAD_IV_CHARS);
-                        return(0);
-                        }
-                from++;
-                to[i/2]|=v<<(long)((!(i&1))*4);
-                }
-
-        *fromp=from;
-        return(1);
-        }
-
-#ifndef NO_FP_API
-int PEM_write(FILE *fp, char *name, char *header, unsigned char *data,
-             long len)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                PEMerr(PEM_F_PEM_WRITE,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_write_bio(b, name, header, data,len);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
-             long len)
-        {
-        int nlen,n,i,j,outl;
-        unsigned char *buf;
-        EVP_ENCODE_CTX ctx;
-        int reason=ERR_R_BUF_LIB;
-        
-        EVP_EncodeInit(&ctx);
-        nlen=strlen(name);
-
-        if (    (BIO_write(bp,"-----BEGIN ",11) != 11) ||
-                (BIO_write(bp,name,nlen) != nlen) ||
-                (BIO_write(bp,"-----\n",6) != 6))
-                goto err;
-                
-        i=strlen(header);
-        if (i > 0)
-                {
-                if (    (BIO_write(bp,header,i) != i) ||
-                        (BIO_write(bp,"\n",1) != 1))
-                        goto err;
-                }
-
-        buf=(unsigned char *)Malloc(PEM_BUFSIZE*8);
-        if (buf == NULL)
-                {
-                reason=ERR_R_MALLOC_FAILURE;
-                goto err;
-                }
-
-        i=j=0;
-        while (len > 0)
-                {
-                n=(int)((len>(PEM_BUFSIZE*5))?(PEM_BUFSIZE*5):len);
-                EVP_EncodeUpdate(&ctx,buf,&outl,&(data[j]),n);
-                if ((outl) && (BIO_write(bp,(char *)buf,outl) != outl))
-                        goto err;
-                i+=outl;
-                len-=n;
-                j+=n;
-                }
-        EVP_EncodeFinal(&ctx,buf,&outl);
-        if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err;
-        Free(buf);
-        if (    (BIO_write(bp,"-----END ",9) != 9) ||
-                (BIO_write(bp,name,nlen) != nlen) ||
-                (BIO_write(bp,"-----\n",6) != 6))
-                goto err;
-        return(i+outl);
-err:
-        PEMerr(PEM_F_PEM_WRITE_BIO,reason);
-        return(0);
-        }
-
-#ifndef NO_FP_API
-int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,
-             long *len)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-                {
-                PEMerr(PEM_F_PEM_READ,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=PEM_read_bio(b, name, header, data,len);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
-             long *len)
-        {
-        EVP_ENCODE_CTX ctx;
-        int end=0,i,k,bl=0,hl=0,nohead=0;
-        char buf[256];
-        BUF_MEM *nameB;
-        BUF_MEM *headerB;
-        BUF_MEM *dataB,*tmpB;
-        
-        nameB=BUF_MEM_new();
-        headerB=BUF_MEM_new();
-        dataB=BUF_MEM_new();
-        if ((nameB == NULL) || (headerB == NULL) || (dataB == NULL))
-                {
-                PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-
-        buf[254]='\0';
-        for (;;)
-                {
-                i=BIO_gets(bp,buf,254);
-
-                if (i <= 0)
-                        {
-                        PEMerr(PEM_F_PEM_READ_BIO,PEM_R_NO_START_LINE);
-                        goto err;
-                        }
-
-                while ((i >= 0) && (buf[i] <= ' ')) i--;
-                buf[++i]='\n'; buf[++i]='\0';
-
-                if (strncmp(buf,"-----BEGIN ",11) == 0)
-                        {
-                        i=strlen(&(buf[11]));
-
-                        if (strncmp(&(buf[11+i-6]),"-----\n",6) != 0)
-                                continue;
-                        if (!BUF_MEM_grow(nameB,i+9))
-                                {
-                                PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
-                        memcpy(nameB->data,&(buf[11]),i-6);
-                        nameB->data[i-6]='\0';
-                        break;
-                        }
-                }
-        hl=0;
-        if (!BUF_MEM_grow(headerB,256))
-                { PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE); goto err; }
-        headerB->data[0]='\0';
-        for (;;)
-                {
-                i=BIO_gets(bp,buf,254);
-                if (i <= 0) break;
-
-                while ((i >= 0) && (buf[i] <= ' ')) i--;
-                buf[++i]='\n'; buf[++i]='\0';
-
-                if (buf[0] == '\n') break;
-                if (!BUF_MEM_grow(headerB,hl+i+9))
-                        { PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE); goto err; }
-                if (strncmp(buf,"-----END ",9) == 0)
-                        {
-                        nohead=1;
-                        break;
-                        }
-                memcpy(&(headerB->data[hl]),buf,i);
-                headerB->data[hl+i]='\0';
-                hl+=i;
-                }
-
-        bl=0;
-        if (!BUF_MEM_grow(dataB,1024))
-                { PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE); goto err; }
-        dataB->data[0]='\0';
-        if (!nohead)
-                {
-                for (;;)
-                        {
-                        i=BIO_gets(bp,buf,254);
-                        if (i <= 0) break;
-
-                        while ((i >= 0) && (buf[i] <= ' ')) i--;
-                        buf[++i]='\n'; buf[++i]='\0';
-
-                        if (i != 65) end=1;
-                        if (strncmp(buf,"-----END ",9) == 0)
-                                break;
-                        if (i > 65) break;
-                        if (!BUF_MEM_grow(dataB,i+bl+9))
-                                {
-                                PEMerr(PEM_F_PEM_READ_BIO,ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
-                        memcpy(&(dataB->data[bl]),buf,i);
-                        dataB->data[bl+i]='\0';
-                        bl+=i;
-                        if (end)
-                                {
-                                buf[0]='\0';
-                                i=BIO_gets(bp,buf,254);
-                                if (i <= 0) break;
-
-                                while ((i >= 0) && (buf[i] <= ' ')) i--;
-                                buf[++i]='\n'; buf[++i]='\0';
-
-                                break;
-                                }
-                        }
-                }
-        else
-                {
-                tmpB=headerB;
-                headerB=dataB;
-                dataB=tmpB;
-                bl=hl;
-                }
-        i=strlen(nameB->data);
-        if (    (strncmp(buf,"-----END ",9) != 0) ||
-                (strncmp(nameB->data,&(buf[9]),i) != 0) ||
-                (strncmp(&(buf[9+i]),"-----\n",6) != 0))
-                {
-                PEMerr(PEM_F_PEM_READ_BIO,PEM_R_BAD_END_LINE);
-                goto err;
-                }
-
-        EVP_DecodeInit(&ctx);
-        i=EVP_DecodeUpdate(&ctx,
-                (unsigned char *)dataB->data,&bl,
-                (unsigned char *)dataB->data,bl);
-        if (i < 0)
-                {
-                PEMerr(PEM_F_PEM_READ_BIO,PEM_R_BAD_BASE64_DECODE);
-                goto err;
-                }
-        i=EVP_DecodeFinal(&ctx,(unsigned char *)&(dataB->data[bl]),&k);
-        if (i < 0)
-                {
-                PEMerr(PEM_F_PEM_READ_BIO,PEM_R_BAD_BASE64_DECODE);
-                goto err;
-                }
-        bl+=k;
-
-        if (bl == 0) goto err;
-        *name=nameB->data;
-        *header=headerB->data;
-        *data=(unsigned char *)dataB->data;
-        *len=bl;
-        Free(nameB);
-        Free(headerB);
-        Free(dataB);
-        return(1);
-err:
-        BUF_MEM_free(nameB);
-        BUF_MEM_free(headerB);
-        BUF_MEM_free(dataB);
-        return(0);
-        }
-
-/* This function writes a private key in PKCS#8 format: it is a "drop in"
- * replacement for PEM_write_bio_PrivateKey(). As usual if 'enc' is NULL then
- * it uses the unencrypted private key form. It uses PKCS#5 v2.0 password based
- * encryption algorithms.
- */
-
-int PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                                  char *kstr, int klen,
-                                  pem_password_cb *cb, void *u)
-{
-        X509_SIG *p8;
-        PKCS8_PRIV_KEY_INFO *p8inf;
-        char buf[PEM_BUFSIZE];
-        int ret;
-        if(!(p8inf = EVP_PKEY2PKCS8(x))) {
-                PEMerr(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY,
-                                        PEM_R_ERROR_CONVERTING_PRIVATE_KEY);
-                return 0;
-        }
-        if(enc) {
-                if(!kstr) {
-                        if(!cb) klen = def_callback(buf, PEM_BUFSIZE, 1, u);
-                        else klen = cb(buf, PEM_BUFSIZE, 1, u);
-                        if(klen <= 0) {
-                                PEMerr(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY,
-                                                                PEM_R_READ_KEY);
-                                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                                return 0;
-                        }
-                                
-                        kstr = buf;
-                }
-                p8 = PKCS8_encrypt(-1, enc, kstr, klen, NULL, 0, 0, p8inf);
-                if(kstr == buf) memset(buf, 0, klen);
-                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                ret = PEM_write_bio_PKCS8(bp, p8);
-                X509_SIG_free(p8);
-                return ret;
-        } else {
-                ret = PEM_write_bio_PKCS8_PRIV_KEY_INFO(bp, p8inf);
-                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                return ret;
-        }
-}
-
-int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                              char *kstr, int klen, pem_password_cb *cb, void *u)
-{
-        BIO *bp;
-        int ret;
-        if(!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
-                PEMerr(PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY,ERR_R_BUF_LIB);
-                return(0);
-        }
-        ret = PEM_write_bio_PKCS8PrivateKey(bp, x, enc, kstr, klen, cb, u);
-        BIO_free(bp);
-        return ret;
-}
diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c
deleted file mode 100644
index 23f95beb1e..0000000000
--- a/src/lib/libcrypto/pem/pem_seal.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* crypto/pem/pem_seal.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_RSA
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-
-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)
-        {
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        int ret= -1;
-        int i,j,max=0;
-        char *s=NULL;
-
-        for (i=0; i<npubk; i++)
-                {
-                if (pubk[i]->type != EVP_PKEY_RSA)
-                        {
-                        PEMerr(PEM_F_PEM_SEALINIT,PEM_R_PUBLIC_KEY_NO_RSA);
-                        goto err;
-                        }
-                j=RSA_size(pubk[i]->pkey.rsa);
-                if (j > max) max=j;
-                }
-        s=(char *)Malloc(max*2);
-        if (s == NULL)
-                {
-                PEMerr(PEM_F_PEM_SEALINIT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        EVP_EncodeInit(&(ctx->encode));
-        EVP_SignInit(&(ctx->md),md_type);
-
-        ret=EVP_SealInit(&(ctx->cipher),type,ek,ekl,iv,pubk,npubk);
-        if (!ret) goto err;
-
-        /* base64 encode the keys */
-        for (i=0; i<npubk; i++)
-                {
-                j=EVP_EncodeBlock((unsigned char *)s,ek[i],
-                        RSA_size(pubk[i]->pkey.rsa));
-                ekl[i]=j;
-                memcpy(ek[i],s,j+1);
-                }
-
-        ret=npubk;
-err:
-        if (s != NULL) Free(s);
-        memset(key,0,EVP_MAX_KEY_LENGTH);
-        return(ret);
-        }
-
-void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
-        unsigned char buffer[1600];
-        int i,j;
-
-        *outl=0;
-        EVP_SignUpdate(&(ctx->md),in,inl);
-        for (;;)
-                {
-                if (inl <= 0) break;
-                if (inl > 1200)
-                        i=1200;
-                else
-                        i=inl;
-                EVP_EncryptUpdate(&(ctx->cipher),buffer,&j,in,i);
-                EVP_EncodeUpdate(&(ctx->encode),out,&j,buffer,j);
-                *outl+=j;
-                out+=j;
-                in+=i;
-                inl-=i;
-                }
-        }
-
-int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
-             unsigned char *out, int *outl, EVP_PKEY *priv)
-        {
-        unsigned char *s=NULL;
-        int ret=0,j;
-        unsigned int i;
-
-        if (priv->type != EVP_PKEY_RSA)
-                {
-                PEMerr(PEM_F_PEM_SEALFINAL,PEM_R_PUBLIC_KEY_NO_RSA);
-                goto err;
-                }
-        i=RSA_size(priv->pkey.rsa);
-        if (i < 100) i=100;
-        s=(unsigned char *)Malloc(i*2);
-        if (s == NULL)
-                {
-                PEMerr(PEM_F_PEM_SEALFINAL,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        EVP_EncryptFinal(&(ctx->cipher),s,(int *)&i);
-        EVP_EncodeUpdate(&(ctx->encode),out,&j,s,i);
-        *outl=j;
-        out+=j;
-        EVP_EncodeFinal(&(ctx->encode),out,&j);
-        *outl+=j;
-
-        if (!EVP_SignFinal(&(ctx->md),s,&i,priv)) goto err;
-        *sigl=EVP_EncodeBlock(sig,s,i);
-
-        ret=1;
-err:
-        memset((char *)&(ctx->md),0,sizeof(ctx->md));
-        memset((char *)&(ctx->cipher),0,sizeof(ctx->cipher));
-        if (s != NULL) Free(s);
-        return(ret);
-        }
-#endif
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c
deleted file mode 100644
index aabafb702d..0000000000
--- a/src/lib/libcrypto/pem/pem_sign.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* crypto/pem/pem_sign.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 <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-
-void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
-        {
-        EVP_DigestInit(ctx,type);
-        }
-
-void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
-             unsigned int count)
-        {
-        EVP_DigestUpdate(ctx,data,count);
-        }
-
-int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
-             EVP_PKEY *pkey)
-        {
-        unsigned char *m;
-        int i,ret=0;
-        unsigned int m_len;
-
-        m=(unsigned char *)Malloc(EVP_PKEY_size(pkey)+2);
-        if (m == NULL)
-                {
-                PEMerr(PEM_F_PEM_SIGNFINAL,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        if (EVP_SignFinal(ctx,m,&m_len,pkey) <= 0) goto err;
-
-        i=EVP_EncodeBlock(sigret,m,m_len);
-        *siglen=i;
-        ret=1;
-err:
-        /* ctx has been zeroed by EVP_SignFinal() */
-        if (m != NULL) Free(m);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/pem/pkcs7.lis b/src/lib/libcrypto/pem/pkcs7.lis
deleted file mode 100644
index be90c5d87f..0000000000
--- a/src/lib/libcrypto/pem/pkcs7.lis
+++ /dev/null
@@ -1,22 +0,0 @@
-21     0:d=0 hl=2 l=  0 cons: univ: SEQUENCE          
- 00     2:d=0 hl=2 l=  9 prim: univ: OBJECT_IDENTIFIER :pkcs-7-signedData
- 21    13:d=0 hl=2 l=  0 cons: cont: 00                 # explicit tag
-  21    15:d=0 hl=2 l=  0 cons: univ: SEQUENCE          
-   00    17:d=0 hl=2 l=  1 prim: univ: INTEGER          # version 
-   20    20:d=0 hl=2 l=  0 cons: univ: SET               
-   21    22:d=0 hl=2 l=  0 cons: univ: SEQUENCE          
-    00    24:d=0 hl=2 l=  9 prim: univ: OBJECT_IDENTIFIER :pkcs-7-data
-    00    35:d=0 hl=2 l=  0 prim: univ: EOC               
-   21    37:d=0 hl=2 l=  0 cons: cont: 00               # cert tag
-    20    39:d=0 hl=4 l=545 cons: univ: SEQUENCE          
-    20   588:d=0 hl=4 l=524 cons: univ: SEQUENCE          
-    00  1116:d=0 hl=2 l=  0 prim: univ: EOC               
-   21  1118:d=0 hl=2 l=  0 cons: cont: 01               # crl tag
-    20  1120:d=0 hl=4 l=653 cons: univ: SEQUENCE          
-    20  1777:d=0 hl=4 l=285 cons: univ: SEQUENCE          
-    00  2066:d=0 hl=2 l=  0 prim: univ: EOC               
-   21  2068:d=0 hl=2 l=  0 cons: univ: SET              # signers 
-    00  2070:d=0 hl=2 l=  0 prim: univ: EOC               
-  00  2072:d=0 hl=2 l=  0 prim: univ: EOC               
- 00  2074:d=0 hl=2 l=  0 prim: univ: EOC               
-00  2076:d=0 hl=2 l=  0 prim: univ: EOC               
diff --git a/src/lib/libcrypto/perlasm/cbc.pl b/src/lib/libcrypto/perlasm/cbc.pl
deleted file mode 100644
index 0145c4f0cc..0000000000
--- a/src/lib/libcrypto/perlasm/cbc.pl
+++ /dev/null
@@ -1,342 +0,0 @@
-#!/usr/local/bin/perl
-
-# void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
-# des_cblock (*input);
-# des_cblock (*output);
-# long length;
-# des_key_schedule schedule;
-# des_cblock (*ivec);
-# int enc;
-#
-# calls 
-# des_encrypt((DES_LONG *)tin,schedule,DES_ENCRYPT);
-#
-
-#&cbc("des_ncbc_encrypt","des_encrypt",0);
-#&cbc("BF_cbc_encrypt","BF_encrypt","BF_encrypt",
-#       1,4,5,3,5,-1);
-#&cbc("des_ncbc_encrypt","des_encrypt","des_encrypt",
-#       0,4,5,3,5,-1);
-#&cbc("des_ede3_cbc_encrypt","des_encrypt3","des_decrypt3",
-#       0,6,7,3,4,5);
-#
-# When doing a cipher that needs bigendian order,
-# for encrypt, the iv is kept in bigendian form,
-# while for decrypt, it is kept in little endian.
-sub cbc
-        {
-        local($name,$enc_func,$dec_func,$swap,$iv_off,$enc_off,$p1,$p2,$p3)=@_;
-        # name is the function name
-        # enc_func and dec_func and the functions to call for encrypt/decrypt
-        # swap is true if byte order needs to be reversed
-        # iv_off is parameter number for the iv 
-        # enc_off is parameter number for the encrypt/decrypt flag
-        # p1,p2,p3 are the offsets for parameters to be passed to the
-        # underlying calls.
-
-        &function_begin_B($name,"");
-        &comment("");
-
-        $in="esi";
-        $out="edi";
-        $count="ebp";
-
-        &push("ebp");
-        &push("ebx");
-        &push("esi");
-        &push("edi");
-
-        $data_off=4;
-        $data_off+=4 if ($p1 > 0);
-        $data_off+=4 if ($p2 > 0);
-        $data_off+=4 if ($p3 > 0);
-
-        &mov($count,    &wparam(2));    # length
-
-        &comment("getting iv ptr from parameter $iv_off");
-        &mov("ebx",     &wparam($iv_off));      # Get iv ptr
-
-        &mov($in,       &DWP(0,"ebx","",0));#   iv[0]
-        &mov($out,      &DWP(4,"ebx","",0));#   iv[1]
-
-        &push($out);
-        &push($in);
-        &push($out);    # used in decrypt for iv[1]
-        &push($in);     # used in decrypt for iv[0]
-
-        &mov("ebx",     "esp");         # This is the address of tin[2]
-
-        &mov($in,       &wparam(0));    # in
-        &mov($out,      &wparam(1));    # out
-
-        # We have loaded them all, how lets push things
-        &comment("getting encrypt flag from parameter $enc_off");
-        &mov("ecx",     &wparam($enc_off));     # Get enc flag
-        if ($p3 > 0)
-                {
-                &comment("get and push parameter $p3");
-                if ($enc_off != $p3)
-                        { &mov("eax",   &wparam($p3)); &push("eax"); }
-                else    { &push("ecx"); }
-                }
-        if ($p2 > 0)
-                {
-                &comment("get and push parameter $p2");
-                if ($enc_off != $p2)
-                        { &mov("eax",   &wparam($p2)); &push("eax"); }
-                else    { &push("ecx"); }
-                }
-        if ($p1 > 0)
-                {
-                &comment("get and push parameter $p1");
-                if ($enc_off != $p1)
-                        { &mov("eax",   &wparam($p1)); &push("eax"); }
-                else    { &push("ecx"); }
-                }
-        &push("ebx");           # push data/iv
-
-        &cmp("ecx",0);
-        &jz(&label("decrypt"));
-
-        &and($count,0xfffffff8);
-        &mov("eax",     &DWP($data_off,"esp","",0));    # load iv[0]
-        &mov("ebx",     &DWP($data_off+4,"esp","",0));  # load iv[1]
-
-        &jz(&label("encrypt_finish"));
-
-        #############################################################
-
-        &set_label("encrypt_loop");
-        # encrypt start 
-        # "eax" and "ebx" hold iv (or the last cipher text)
-
-        &mov("ecx",     &DWP(0,$in,"",0));      # load first 4 bytes
-        &mov("edx",     &DWP(4,$in,"",0));      # second 4 bytes
-
-        &xor("eax",     "ecx");
-        &xor("ebx",     "edx");
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-        &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
-
-        &call($enc_func);
-
-        &mov("eax",     &DWP($data_off,"esp","",0));
-        &mov("ebx",     &DWP($data_off+4,"esp","",0));
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP(0,$out,"",0),"eax");
-        &mov(&DWP(4,$out,"",0),"ebx");
-
-        # eax and ebx are the next iv.
-
-        &add($in,       8);
-        &add($out,      8);
-
-        &sub($count,    8);
-        &jnz(&label("encrypt_loop"));
-
-###################################################################3
-        &set_label("encrypt_finish");
-        &mov($count,    &wparam(2));    # length
-        &and($count,    7);
-        &jz(&label("finish"));
-        &xor("ecx","ecx");
-        &xor("edx","edx");
-        &mov($count,&DWP(&label("cbc_enc_jmp_table"),"",$count,4));
-        &jmp_ptr($count);
-
-&set_label("ej7");
-        &xor("edx",             "edx") if $ppro; # ppro friendly
-        &movb(&HB("edx"),       &BP(6,$in,"",0));
-        &shl("edx",8);
-&set_label("ej6");
-        &movb(&HB("edx"),       &BP(5,$in,"",0));
-&set_label("ej5");
-        &movb(&LB("edx"),       &BP(4,$in,"",0));
-&set_label("ej4");
-        &mov("ecx",             &DWP(0,$in,"",0));
-        &jmp(&label("ejend"));
-&set_label("ej3");
-        &movb(&HB("ecx"),       &BP(2,$in,"",0));
-        &xor("ecx",             "ecx") if $ppro; # ppro friendly
-        &shl("ecx",8);
-&set_label("ej2");
-        &movb(&HB("ecx"),       &BP(1,$in,"",0));
-&set_label("ej1");
-        &movb(&LB("ecx"),       &BP(0,$in,"",0));
-&set_label("ejend");
-
-        &xor("eax",     "ecx");
-        &xor("ebx",     "edx");
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-        &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
-
-        &call($enc_func);
-
-        &mov("eax",     &DWP($data_off,"esp","",0));
-        &mov("ebx",     &DWP($data_off+4,"esp","",0));
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP(0,$out,"",0),"eax");
-        &mov(&DWP(4,$out,"",0),"ebx");
-
-        &jmp(&label("finish"));
-
-        #############################################################
-        #############################################################
-        &set_label("decrypt",1);
-        # decrypt start 
-        &and($count,0xfffffff8);
-        # The next 2 instructions are only for if the jz is taken
-        &mov("eax",     &DWP($data_off+8,"esp","",0));  # get iv[0]
-        &mov("ebx",     &DWP($data_off+12,"esp","",0)); # get iv[1]
-        &jz(&label("decrypt_finish"));
-
-        &set_label("decrypt_loop");
-        &mov("eax",     &DWP(0,$in,"",0));      # load first 4 bytes
-        &mov("ebx",     &DWP(4,$in,"",0));      # second 4 bytes
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-        &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
-
-        &call($dec_func);
-
-        &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-        &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov("ecx",     &DWP($data_off+8,"esp","",0));  # get iv[0]
-        &mov("edx",     &DWP($data_off+12,"esp","",0)); # get iv[1]
-
-        &xor("ecx",     "eax");
-        &xor("edx",     "ebx");
-
-        &mov("eax",     &DWP(0,$in,"",0));      # get old cipher text,
-        &mov("ebx",     &DWP(4,$in,"",0));      # next iv actually
-
-        &mov(&DWP(0,$out,"",0),"ecx");
-        &mov(&DWP(4,$out,"",0),"edx");
-
-        &mov(&DWP($data_off+8,"esp","",0),      "eax"); # save iv
-        &mov(&DWP($data_off+12,"esp","",0),     "ebx"); #
-
-        &add($in,       8);
-        &add($out,      8);
-
-        &sub($count,    8);
-        &jnz(&label("decrypt_loop"));
-############################ ENDIT #######################3
-        &set_label("decrypt_finish");
-        &mov($count,    &wparam(2));    # length
-        &and($count,    7);
-        &jz(&label("finish"));
-
-        &mov("eax",     &DWP(0,$in,"",0));      # load first 4 bytes
-        &mov("ebx",     &DWP(4,$in,"",0));      # second 4 bytes
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-        &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
-
-        &call($dec_func);
-
-        &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-        &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-
-        &bswap("eax")   if $swap;
-        &bswap("ebx")   if $swap;
-
-        &mov("ecx",     &DWP($data_off+8,"esp","",0));  # get iv[0]
-        &mov("edx",     &DWP($data_off+12,"esp","",0)); # get iv[1]
-
-        &xor("ecx",     "eax");
-        &xor("edx",     "ebx");
-
-        # this is for when we exit
-        &mov("eax",     &DWP(0,$in,"",0));      # get old cipher text,
-        &mov("ebx",     &DWP(4,$in,"",0));      # next iv actually
-
-&set_label("dj7");
-        &rotr("edx",    16);
-        &movb(&BP(6,$out,"",0), &LB("edx"));
-        &shr("edx",16);
-&set_label("dj6");
-        &movb(&BP(5,$out,"",0), &HB("edx"));
-&set_label("dj5");
-        &movb(&BP(4,$out,"",0), &LB("edx"));
-&set_label("dj4");
-        &mov(&DWP(0,$out,"",0), "ecx");
-        &jmp(&label("djend"));
-&set_label("dj3");
-        &rotr("ecx",    16);
-        &movb(&BP(2,$out,"",0), &LB("ecx"));
-        &shl("ecx",16);
-&set_label("dj2");
-        &movb(&BP(1,$in,"",0),  &HB("ecx"));
-&set_label("dj1");
-        &movb(&BP(0,$in,"",0),  &LB("ecx"));
-&set_label("djend");
-
-        # final iv is still in eax:ebx
-        &jmp(&label("finish"));
-
-
-############################ FINISH #######################3
-        &set_label("finish",1);
-        &mov("ecx",     &wparam($iv_off));      # Get iv ptr
-
-        #################################################
-        $total=16+4;
-        $total+=4 if ($p1 > 0);
-        $total+=4 if ($p2 > 0);
-        $total+=4 if ($p3 > 0);
-        &add("esp",$total);
-
-        &mov(&DWP(0,"ecx","",0),        "eax"); # save iv
-        &mov(&DWP(4,"ecx","",0),        "ebx"); # save iv
-
-        &function_end_A($name);
-
-        &set_label("cbc_enc_jmp_table",1);
-        &data_word("0");
-        &data_word(&label("ej1"));
-        &data_word(&label("ej2"));
-        &data_word(&label("ej3"));
-        &data_word(&label("ej4"));
-        &data_word(&label("ej5"));
-        &data_word(&label("ej6"));
-        &data_word(&label("ej7"));
-        &set_label("cbc_dec_jmp_table",1);
-        &data_word("0");
-        &data_word(&label("dj1"));
-        &data_word(&label("dj2"));
-        &data_word(&label("dj3"));
-        &data_word(&label("dj4"));
-        &data_word(&label("dj5"));
-        &data_word(&label("dj6"));
-        &data_word(&label("dj7"));
-
-        &function_end_B($name);
-        
-        }
-
-1;
diff --git a/src/lib/libcrypto/perlasm/readme b/src/lib/libcrypto/perlasm/readme
deleted file mode 100644
index f02bbee75a..0000000000
--- a/src/lib/libcrypto/perlasm/readme
+++ /dev/null
@@ -1,124 +0,0 @@
-The perl scripts in this directory are my 'hack' to generate
-multiple different assembler formats via the one origional script.
-
-The way to use this library is to start with adding the path to this directory
-and then include it.
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-The first thing we do is setup the file and type of assember
-
-&asm_init($ARGV[0],$0);
-
-The first argument is the 'type'.  Currently
-'cpp', 'sol', 'a.out', 'elf' or 'win32'.
-Argument 2 is the file name.
-
-The reciprocal function is
-&asm_finish() which should be called at the end.
-
-There are 2 main 'packages'. x86ms.pl, which is the microsoft assembler,
-and x86unix.pl which is the unix (gas) version.
-
-Functions of interest are:
-&external_label("des_SPtrans"); declare and external variable
-&LB(reg);                       Low byte for a register
-&HB(reg);                       High byte for a register
-&BP(off,base,index,scale)       Byte pointer addressing
-&DWP(off,base,index,scale)      Word pointer addressing
-&stack_push(num)                Basically a 'sub esp, num*4' with extra
-&stack_pop(num)                 inverse of stack_push
-&function_begin(name,extra)     Start a function with pushing of
-                                edi, esi, ebx and ebp.  extra is extra win32
-                                external info that may be required.
-&function_begin_B(name,extra)   Same as norma function_begin but no pushing.
-&function_end(name)             Call at end of function.
-&function_end_A(name)           Standard pop and ret, for use inside functions
-&function_end_B(name)           Call at end but with poping or 'ret'.
-&swtmp(num)                     Address on stack temp word.
-&wparam(num)                    Parameter number num, that was push
-                                in C convention.  This all works over pushes
-                                and pops.
-&comment("hello there")         Put in a comment.
-&label("loop")                  Refer to a label, normally a jmp target.
-&set_label("loop")              Set a label at this point.
-&data_word(word)                Put in a word of data.
-
-So how does this all hold together?  Given
-
-int calc(int len, int *data)
-        {
-        int i,j=0;
-
-        for (i=0; i<len; i++)
-                {
-                j+=other(data[i]);
-                }
-        }
-
-So a very simple version of this function could be coded as
-
-        push(@INC,"perlasm","../../perlasm");
-        require "x86asm.pl";
-        
-        &asm_init($ARGV[0],"cacl.pl");
-
-        &external_label("other");
-
-        $tmp1=  "eax";
-        $j=     "edi";
-        $data=  "esi";
-        $i=     "ebp";
-
-        &comment("a simple function");
-        &function_begin("calc");
-        &mov(   $data,          &wparam(1)); # data
-        &xor(   $j,             $j);
-        &xor(   $i,             $i);
-
-        &set_label("loop");
-        &cmp(   $i,             &wparam(0));
-        &jge(   &label("end"));
-
-        &mov(   $tmp1,          &DWP(0,$data,$i,4));
-        &push(  $tmp1);
-        &call(  "other");
-        &add(   $j,             "eax");
-        &pop(   $tmp1);
-        &inc(   $i);
-        &jmp(   &label("loop"));
-
-        &set_label("end");
-        &mov(   "eax",          $j);
-
-        &function_end("calc");
-
-        &asm_finish();
-
-The above example is very very unoptimised but gives an idea of how
-things work.
-
-There is also a cbc mode function generator in cbc.pl
-
-&cbc(   $name,
-        $encrypt_function_name,
-        $decrypt_function_name,
-        $true_if_byte_swap_needed,
-        $parameter_number_for_iv,
-        $parameter_number_for_encrypt_flag,
-        $first_parameter_to_pass,
-        $second_parameter_to_pass,
-        $third_parameter_to_pass);
-
-So for example, given
-void BF_encrypt(BF_LONG *data,BF_KEY *key);
-void BF_decrypt(BF_LONG *data,BF_KEY *key);
-void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *ks, unsigned char *iv, int enc);
-
-&cbc("BF_cbc_encrypt","BF_encrypt","BF_encrypt",1,4,5,3,-1,-1);
-
-&cbc("des_ncbc_encrypt","des_encrypt","des_encrypt",0,4,5,3,5,-1);
-&cbc("des_ede3_cbc_encrypt","des_encrypt3","des_decrypt3",0,6,7,3,4,5);
-
diff --git a/src/lib/libcrypto/perlasm/x86asm.pl b/src/lib/libcrypto/perlasm/x86asm.pl
deleted file mode 100644
index 44e330eb8d..0000000000
--- a/src/lib/libcrypto/perlasm/x86asm.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-
-# require 'x86asm.pl';
-# &asm_init("cpp","des-586.pl");
-# XXX
-# XXX
-# main'asm_finish
-
-sub main'asm_finish
-        {
-        &file_end();
-        &asm_finish_cpp() if $cpp;
-        print &asm_get_output();
-        }
-
-sub main'asm_init
-        {
-        ($type,$fn,$i386)=@_;
-        $filename=$fn;
-
-        $cpp=$sol=$aout=$win32=0;
-        if (    ($type eq "elf"))
-                { require "x86unix.pl"; }
-        elsif ( ($type eq "a.out"))
-                { $aout=1; require "x86unix.pl"; }
-        elsif ( ($type eq "sol"))
-                { $sol=1; require "x86unix.pl"; }
-        elsif ( ($type eq "cpp"))
-                { $cpp=1; require "x86unix.pl"; }
-        elsif ( ($type eq "win32"))
-                { $win32=1; require "x86ms.pl"; }
-        elsif ( ($type eq "win32n"))
-                { $win32=1; require "x86nasm.pl"; }
-        else
-                {
-                print STDERR <<"EOF";
-Pick one target type from
-        elf     - linux, FreeBSD etc
-        a.out   - old linux
-        sol     - x86 solaris
-        cpp     - format so x86unix.cpp can be used
-        win32   - Windows 95/Windows NT
-        win32n  - Windows 95/Windows NT NASM format
-EOF
-                exit(1);
-                }
-
-        &asm_init_output();
-
-&comment("Don't even think of reading this code");
-&comment("It was automatically generated by $filename");
-&comment("Which is a perl program used to generate the x86 assember for");
-&comment("any of elf, a.out, BSDI,Win32, or Solaris");
-&comment("eric <eay\@cryptsoft.com>");
-&comment("");
-
-        $filename =~ s/\.pl$//;
-        &file($filename);
-        }
-
-sub asm_finish_cpp
-        {
-        return unless $cpp;
-
-        local($tmp,$i);
-        foreach $i (&get_labels())
-                {
-                $tmp.="#define $i _$i\n";
-                }
-        print <<"EOF";
-/* 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) && !defined(ELF))
-$tmp
-#endif
-
-#ifdef OUT
-#define OK      1
-#define ALIGN   4
-#endif
-
-#if defined(BSDI) && !defined(ELF)
-#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 :-) */
-EOF
-        }
-
-1;
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
deleted file mode 100644
index ae3d9de3b4..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_add.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* p12_add.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Pack an object into an OCTET STRING and turn into a safebag */
-
-PKCS12_SAFEBAG *PKCS12_pack_safebag (char *obj, int (*i2d)(), int nid1,
-             int nid2)
-{
-        PKCS12_BAGS *bag;
-        PKCS12_SAFEBAG *safebag;
-        if (!(bag = PKCS12_BAGS_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        bag->type = OBJ_nid2obj(nid1);
-        if (!ASN1_pack_string(obj, i2d, &bag->value.octet)) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        if (!(safebag = PKCS12_SAFEBAG_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_SAFEBAG, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        safebag->value.bag = bag;
-        safebag->type = OBJ_nid2obj(nid2);
-        return safebag;
-}
-
-/* Turn PKCS8 object into a keybag */
-
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8)
-{
-        PKCS12_SAFEBAG *bag;
-        if (!(bag = PKCS12_SAFEBAG_new())) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_KEYBAG,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        bag->type = OBJ_nid2obj(NID_keyBag);
-        bag->value.keybag = p8;
-        return bag;
-}
-
-/* Turn PKCS8 object into a shrouded keybag */
-
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (int pbe_nid, const char *pass,
-             int passlen, unsigned char *salt, int saltlen, int iter,
-             PKCS8_PRIV_KEY_INFO *p8)
-{
-        PKCS12_SAFEBAG *bag;
-
-        /* Set up the safe bag */
-        if (!(bag = PKCS12_SAFEBAG_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        bag->type = OBJ_nid2obj(NID_pkcs8ShroudedKeyBag);
-        if (!(bag->value.shkeybag = 
-          PKCS8_encrypt(pbe_nid, NULL, pass, passlen, salt, saltlen, iter,
-                                                                         p8))) {
-                PKCS12err(PKCS12_F_PKCS12_MAKE_SHKEYBAG, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        return bag;
-}
-
-/* Turn a stack of SAFEBAGS into a PKCS#7 data Contentinfo */
-PKCS7 *PKCS12_pack_p7data (STACK *sk)
-{
-        PKCS7 *p7;
-        if (!(p7 = PKCS7_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        p7->type = OBJ_nid2obj(NID_pkcs7_data);
-        if (!(p7->d.data = ASN1_OCTET_STRING_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        
-        if (!ASN1_seq_pack(sk, i2d_PKCS12_SAFEBAG, &p7->d.data->data,
-                                        &p7->d.data->length)) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, PKCS12_R_CANT_PACK_STRUCTURE);
-                return NULL;
-        }
-        return p7;
-}
-
-/* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
-
-PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, const char *pass, int passlen,
-             unsigned char *salt, int saltlen, int iter, STACK *bags)
-{
-        PKCS7 *p7;
-        X509_ALGOR *pbe;
-        if (!(p7 = PKCS7_new())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        p7->type = OBJ_nid2obj(NID_pkcs7_encrypted);
-        if (!(p7->d.encrypted = PKCS7_ENCRYPT_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        ASN1_INTEGER_set (p7->d.encrypted->version, 0);
-        p7->d.encrypted->enc_data->content_type = OBJ_nid2obj(NID_pkcs7_data);
-        if (!(pbe = PKCS5_pbe_set (pbe_nid, iter, salt, saltlen))) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
-        p7->d.encrypted->enc_data->algorithm = pbe;
-        ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
-        if (!(p7->d.encrypted->enc_data->enc_data =
-        PKCS12_i2d_encrypt (pbe, i2d_PKCS12_SAFEBAG, pass, passlen,
-                                 (char *)bags, 1))) {
-                PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, PKCS12_R_ENCRYPT_ERROR);
-                return NULL;
-        }
-
-        return p7;
-}
-
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                         const char *pass, int passlen,
-                         unsigned char *salt, int saltlen, int iter,
-                                                PKCS8_PRIV_KEY_INFO *p8inf)
-{
-        X509_SIG *p8;
-        X509_ALGOR *pbe;
-
-        if (!(p8 = X509_SIG_new())) {
-                PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        if(pbe_nid == -1) pbe = PKCS5_pbe2_set(cipher, iter, salt, saltlen);
-        else pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen);
-        if(!pbe) {
-                PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        X509_ALGOR_free(p8->algor);
-        p8->algor = pbe;
-        ASN1_OCTET_STRING_free(p8->digest);
-        if (!(p8->digest = 
-        PKCS12_i2d_encrypt (pbe, i2d_PKCS8_PRIV_KEY_INFO, pass, passlen,
-                                                 (char *)p8inf, 0))) {
-                PKCS12err(PKCS12_F_PKCS8_ENCRYPT, PKCS12_R_ENCRYPT_ERROR);
-                return NULL;
-        }
-
-        return p8;
-}
diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c
deleted file mode 100644
index 31c9782b77..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_attr.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* p12_attr.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Add a local keyid to a safebag */
-
-int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
-             int namelen)
-{
-        X509_ATTRIBUTE *attrib;
-        ASN1_BMPSTRING *oct;
-        ASN1_TYPE *keyid;
-        if (!(keyid = ASN1_TYPE_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        keyid->type = V_ASN1_OCTET_STRING;
-        if (!(oct = ASN1_OCTET_STRING_new())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (!ASN1_OCTET_STRING_set(oct, name, namelen)) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        keyid->value.octet_string = oct;
-        if (!(attrib = X509_ATTRIBUTE_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        attrib->object = OBJ_nid2obj(NID_localKeyID);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_ASN1_TYPE_push (attrib->value.set,keyid);
-        attrib->set = 1;
-        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_X509_ATTRIBUTE_push (bag->attrib, attrib);
-        return 1;
-}
-
-/* Add key usage to PKCS#8 structure */
-
-int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
-{
-        X509_ATTRIBUTE *attrib;
-        ASN1_BIT_STRING *bstr;
-        ASN1_TYPE *keyid;
-        unsigned char us_val;
-        us_val = (unsigned char) usage;
-        if (!(keyid = ASN1_TYPE_new ())) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        keyid->type = V_ASN1_BIT_STRING;
-        if (!(bstr = ASN1_BIT_STRING_new())) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (!ASN1_BIT_STRING_set(bstr, &us_val, 1)) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        keyid->value.bit_string = bstr;
-        if (!(attrib = X509_ATTRIBUTE_new ())) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        attrib->object = OBJ_nid2obj(NID_key_usage);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_ASN1_TYPE_push (attrib->value.set,keyid);
-        attrib->set = 1;
-        if (!p8->attributes
-            && !(p8->attributes = sk_X509_ATTRIBUTE_new (NULL))) {
-                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_X509_ATTRIBUTE_push (p8->attributes, attrib);
-        return 1;
-}
-
-/* Add a friendlyname to a safebag */
-
-int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, const char *name,
-                                 int namelen)
-{
-        unsigned char *uniname;
-        int ret, unilen;
-        if (!asc2uni(name, &uniname, &unilen)) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        ret = PKCS12_add_friendlyname_uni (bag, uniname, unilen);
-        Free(uniname);
-        return ret;
-}
-        
-
-int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
-                                 const unsigned char *name, int namelen)
-{
-        X509_ATTRIBUTE *attrib;
-        ASN1_BMPSTRING *bmp;
-        ASN1_TYPE *fname;
-        /* Zap ending double null if included */
-        if(!name[namelen - 1] && !name[namelen - 2]) namelen -= 2;
-        if (!(fname = ASN1_TYPE_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        fname->type = V_ASN1_BMPSTRING;
-        if (!(bmp = ASN1_BMPSTRING_new())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (!(bmp->data = Malloc (namelen))) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        memcpy (bmp->data, name, namelen);
-        bmp->length = namelen;
-        fname->value.bmpstring = bmp;
-        if (!(attrib = X509_ATTRIBUTE_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        attrib->object = OBJ_nid2obj(NID_friendlyName);
-        if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_ASN1_TYPE_push (attrib->value.set,fname);
-        attrib->set = 1;
-        if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
-                                                        ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        sk_X509_ATTRIBUTE_push (bag->attrib, attrib);
-        return PKCS12_OK;
-}
-
-ASN1_TYPE *PKCS12_get_attr_gen (STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
-{
-        X509_ATTRIBUTE *attrib;
-        int i;
-        if (!attrs) return NULL;
-        for (i = 0; i < sk_X509_ATTRIBUTE_num (attrs); i++) {
-                attrib = sk_X509_ATTRIBUTE_value (attrs, i);
-                if (OBJ_obj2nid (attrib->object) == attr_nid) {
-                        if (sk_ASN1_TYPE_num (attrib->value.set))
-                            return sk_ASN1_TYPE_value(attrib->value.set, 0);
-                        else return NULL;
-                }
-        }
-        return NULL;
-}
-
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
-{
-        ASN1_TYPE *atype;
-        if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;
-        if (atype->type != V_ASN1_BMPSTRING) return NULL;
-        return uni2asc(atype->value.bmpstring->data,
-                                 atype->value.bmpstring->length);
-}
-
diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c
deleted file mode 100644
index 6de6f8128f..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_crpt.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* p12_crpt.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* PKCS#12 specific PBE functions */
-
-void PKCS12_PBE_add(void)
-{
-#ifndef NO_RC4
-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC4, EVP_rc4(), EVP_sha1(),
-                                                         PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC4, EVP_rc4_40(), EVP_sha1(),
-                                                         PKCS12_PBE_keyivgen);
-#endif
-EVP_PBE_alg_add(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
-                        EVP_des_ede3_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And2_Key_TripleDES_CBC, 
-                        EVP_des_ede_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
-#ifndef NO_RC2
-EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC2_CBC, EVP_rc2_cbc(),
-                                        EVP_sha1(), PKCS12_PBE_keyivgen);
-EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),
-                                        EVP_sha1(), PKCS12_PBE_keyivgen);
-#endif
-}
-
-int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md, int en_de)
-{
-        PBEPARAM *pbe;
-        int saltlen, iter;
-        unsigned char *salt, *pbuf;
-        unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
-
-        /* Extract useful info from parameter */
-        pbuf = param->value.sequence->data;
-        if (!param || (param->type != V_ASN1_SEQUENCE) ||
-           !(pbe = d2i_PBEPARAM (NULL, &pbuf, param->value.sequence->length))) {
-                EVPerr(PKCS12_F_PKCS12_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                return 0;
-        }
-
-        if (!pbe->iter) iter = 1;
-        else iter = ASN1_INTEGER_get (pbe->iter);
-        salt = pbe->salt->data;
-        saltlen = pbe->salt->length;
-        if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID,
-                             iter, EVP_CIPHER_key_length(cipher), key, md)) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN,PKCS12_R_KEY_GEN_ERROR);
-                PBEPARAM_free(pbe);
-                return 0;
-        }
-        if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_IV_ID,
-                                iter, EVP_CIPHER_iv_length(cipher), iv, md)) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN,PKCS12_R_IV_GEN_ERROR);
-                PBEPARAM_free(pbe);
-                return 0;
-        }
-        PBEPARAM_free(pbe);
-        EVP_CipherInit(ctx, cipher, key, iv, en_de);
-        memset(key, 0, EVP_MAX_KEY_LENGTH);
-        memset(iv, 0, EVP_MAX_IV_LENGTH);
-        return 1;
-}
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c
deleted file mode 100644
index 56d88b0759..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_crt.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* p12_crt.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-             STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter,
-             int keytype)
-{
-        PKCS12 *p12;
-        STACK *bags, *safes;
-        PKCS12_SAFEBAG *bag;
-        PKCS8_PRIV_KEY_INFO *p8;
-        PKCS7 *authsafe;
-        X509 *tcert;
-        int i;
-        unsigned char keyid[EVP_MAX_MD_SIZE];
-        unsigned int keyidlen;
-
-        /* Set defaults */
-        if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
-        if(!nid_key) nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-        if(!iter) iter = PKCS12_DEFAULT_ITER;
-        if(!mac_iter) mac_iter = 1;
-
-        if(!pkey || !cert) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,PKCS12_R_INVALID_NULL_ARGUMENT);
-                return NULL;
-        }
-
-        if(!(bags = sk_new (NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        /* Add user certificate */
-        if(!(bag = M_PKCS12_x5092certbag(cert))) return NULL;
-        if(name && !PKCS12_add_friendlyname(bag, name, -1)) return NULL;
-        X509_digest(cert, EVP_sha1(), keyid, &keyidlen);
-        if(!PKCS12_add_localkeyid(bag, keyid, keyidlen)) return NULL;
-
-        if(!sk_push(bags, (char *)bag)) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        
-        /* Add all other certificates */
-        if(ca) {
-                for(i = 0; i < sk_num(ca); i++) {
-                        tcert = (X509 *)sk_value(ca, i);
-                        if(!(bag = M_PKCS12_x5092certbag(tcert))) return NULL;
-                        if(!sk_push(bags, (char *)bag)) {
-                                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                                return NULL;
-                        }
-                }
-        }
-
-        /* Turn certbags into encrypted authsafe */
-        authsafe = PKCS12_pack_p7encdata (nid_cert, pass, -1, NULL, 0,
-                                          iter, bags);
-        sk_pop_free(bags, PKCS12_SAFEBAG_free);
-
-        if (!authsafe) return NULL;
-
-        if(!(safes = sk_new (NULL)) || !sk_push(safes, (char *)authsafe)) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        /* Make a shrouded key bag */
-        if(!(p8 = EVP_PKEY2PKCS8 (pkey))) return NULL;
-        if(keytype && !PKCS8_add_keyusage(p8, keytype)) return NULL;
-        bag = PKCS12_MAKE_SHKEYBAG (nid_key, pass, -1, NULL, 0, iter, p8);
-        if(!bag) return NULL;
-        PKCS8_PRIV_KEY_INFO_free(p8);
-        if (name && !PKCS12_add_friendlyname (bag, name, -1)) return NULL;
-        if(!PKCS12_add_localkeyid (bag, keyid, keyidlen)) return NULL;
-        if(!(bags = sk_new(NULL)) || !sk_push (bags, (char *)bag)) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        /* Turn it into unencrypted safe bag */
-        if(!(authsafe = PKCS12_pack_p7data (bags))) return NULL;
-        sk_pop_free(bags, PKCS12_SAFEBAG_free);
-        if(!sk_push(safes, (char *)authsafe)) {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        if(!(p12 = PKCS12_init (NID_pkcs7_data))) return NULL;
-
-        if(!M_PKCS12_pack_authsafes (p12, safes)) return NULL;
-
-        sk_pop_free(safes, PKCS7_free);
-
-        if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL))
-            return NULL;
-
-        return p12;
-
-}
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
deleted file mode 100644
index d3d288e187..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* p12_decr.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Define this to dump decrypted output to files called DERnnn */
-/*#define DEBUG_DECRYPT*/
-
-
-/* Encrypt/Decrypt a buffer based on password and algor, result in a
- * Malloc'ed buffer
- */
-
-unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, const char *pass,
-             int passlen, unsigned char *in, int inlen, unsigned char **data,
-             int *datalen, int en_de)
-{
-        unsigned char *out;
-        int outlen, i;
-        EVP_CIPHER_CTX ctx;
-
-        /* Decrypt data */
-        if (!EVP_PBE_CipherInit (algor->algorithm, pass, passlen,
-                                         algor->parameter, &ctx, en_de)) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR);
-                return NULL;
-        }
-
-        if(!(out = Malloc (inlen + EVP_CIPHER_CTX_block_size(&ctx)))) {
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        EVP_CipherUpdate (&ctx, out, &i, in, inlen);
-        outlen = i;
-        if(!EVP_CipherFinal (&ctx, out + i, &i)) {
-                Free (out);
-                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,PKCS12_R_PKCS12_CIPHERFINAL_ERROR);
-                return NULL;
-        }
-        outlen += i;
-        if (datalen) *datalen = outlen;
-        if (data) *data = out;
-        return out;
-
-}
-
-/* Decrypt an OCTET STRING and decode ASN1 structure 
- * if seq & 1 'obj' is a stack of structures to be encoded
- * if seq & 2 zero buffer after use
- * as a sequence.
- */
-
-char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(),
-             void (*free_func)(), const char *pass, int passlen,
-             ASN1_OCTET_STRING *oct, int seq)
-{
-        unsigned char *out, *p;
-        char *ret;
-        int outlen;
-
-        if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,
-                               &out, &outlen, 0)) {
-                PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);
-                return NULL;
-        }
-        p = out;
-#ifdef DEBUG_DECRYPT
-        {
-                FILE *op;
-
-                char fname[30];
-                static int fnm = 1;
-                sprintf(fname, "DER%d", fnm++);
-                op = fopen(fname, "wb");
-                fwrite (p, 1, outlen, op);
-                fclose(op);
-        }
-#endif
-        if (seq & 1) ret = (char *) d2i_ASN1_SET(NULL, &p, outlen, d2i,
-                                free_func, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-        else ret = d2i(NULL, &p, outlen);
-        if (seq & 2) memset(out, 0, outlen);
-        if(!ret) PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_DECODE_ERROR);
-        Free (out);
-        return ret;
-}
-
-/* Encode ASN1 structure and encrypt, return OCTET STRING 
- * if 'seq' is non-zero 'obj' is a stack of structures to be encoded
- * as a sequence
- */
-
-ASN1_OCTET_STRING *PKCS12_i2d_encrypt (X509_ALGOR *algor, int (*i2d)(),
-                                       const char *pass, int passlen,
-                                       char *obj, int seq)
-{
-        ASN1_OCTET_STRING *oct;
-        unsigned char *in, *p;
-        int inlen;
-        if (!(oct = ASN1_OCTET_STRING_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_I2D_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        if (seq) inlen = i2d_ASN1_SET((STACK *)obj, NULL, i2d, V_ASN1_SEQUENCE,
-                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);
-        else inlen = i2d (obj, NULL);
-        if (!inlen) {
-                PKCS12err(PKCS12_F_PKCS12_I2D_ENCRYPT,PKCS12_R_ENCODE_ERROR);
-                return NULL;
-        }
-        if (!(in = Malloc (inlen))) {
-                PKCS12err(PKCS12_F_PKCS12_I2D_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        p = in;
-        if (seq) i2d_ASN1_SET((STACK *)obj, &p, i2d, V_ASN1_SEQUENCE,
-                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);
-        else i2d (obj, &p);
-        if (!PKCS12_pbe_crypt (algor, pass, passlen, in, inlen, &oct->data,
-                                 &oct->length, 1)) {
-                PKCS12err(PKCS12_F_PKCS12_I2D_ENCRYPT,PKCS12_R_ENCRYPT_ERROR);
-                Free(in);
-                return NULL;
-        }
-        Free (in);
-        return oct;
-}
diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
deleted file mode 100644
index dc6ab41db8..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* p12_init.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Initialise a PKCS12 structure to take data */
-
-PKCS12 *PKCS12_init (int mode)
-{
-        PKCS12 *pkcs12;
-        if (!(pkcs12 = PKCS12_new())) {
-                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        if (!(pkcs12->version = ASN1_INTEGER_new ())) {
-                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        ASN1_INTEGER_set (pkcs12->version, 3);
-        if (!(pkcs12->authsafes = PKCS7_new())) {
-                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        pkcs12->authsafes->type = OBJ_nid2obj(mode);
-        switch (mode) {
-                case NID_pkcs7_data:
-                        if (!(pkcs12->authsafes->d.data =
-                                 ASN1_OCTET_STRING_new())) {
-                        PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
-                        return NULL;
-                }
-                break;
-                default:
-                        PKCS12err(PKCS12_F_PKCS12_INIT,PKCS12_R_UNSUPPORTED_PKCS12_MODE);
-                        PKCS12_free(pkcs12);
-                        return NULL;
-                break;
-        }
-                
-        return pkcs12;
-}
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
deleted file mode 100644
index 25d8cdae57..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* p12_key.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-
-/* Uncomment out this line to get debugging info about key generation */
-/*#define DEBUG_KEYGEN*/
-#ifdef DEBUG_KEYGEN
-#include <bio.h>
-extern BIO *bio_err;
-void h__dump (unsigned char *p, int len);
-#endif
-
-/* PKCS12 compatible key/IV generation */
-#ifndef min
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-int PKCS12_key_gen_asc (const char *pass, int passlen, unsigned char *salt,
-             int saltlen, int id, int iter, int n, unsigned char *out,
-             const EVP_MD *md_type)
-{
-        int ret;
-        unsigned char *unipass;
-        int uniplen;
-        if (!asc2uni (pass, &unipass, &uniplen)) {
-                PKCS12err(PKCS12_F_PKCS12_KEY_GEN_ASC,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        ret = PKCS12_key_gen_uni (unipass, uniplen, salt, saltlen,
-                                                 id, iter, n, out, md_type);
-        memset(unipass, 0, uniplen);    /* Clear password from memory */
-        Free(unipass);
-        return ret;
-}
-
-int PKCS12_key_gen_uni (unsigned char *pass, int passlen, unsigned char *salt,
-             int saltlen, int id, int iter, int n, unsigned char *out,
-             const EVP_MD *md_type)
-{
-        unsigned char *B, *D, *I, *p, *Ai;
-        int Slen, Plen, Ilen;
-        int i, j, u, v;
-        BIGNUM *Ij, *Bpl1;      /* These hold Ij and B + 1 */
-        EVP_MD_CTX ctx;
-#ifdef  DEBUG_KEYGEN
-        unsigned char *tmpout = out;
-        int tmpn = n;
-        BIO_printf (bio_err, "KEYGEN DEBUG\n");
-        BIO_printf (bio_err, "ID %d, ITER %d\n", id, iter);
-        BIO_printf (bio_err, "Password (length %d):\n", passlen);
-        h__dump (pass, passlen);
-        BIO_printf (bio_err, "Salt (length %d):\n", saltlen);
-        h__dump (salt, saltlen);
-        BIO_printf (bio_err, "ID %d, ITER %d\n\n", id, iter);
-#endif
-        v = EVP_MD_block_size (md_type);
-        u = EVP_MD_size (md_type);
-        D = Malloc (v);
-        Ai = Malloc (u);
-        B = Malloc (v + 1);
-        Slen = v * ((saltlen+v-1)/v);
-        Plen = v * ((passlen+v-1)/v);
-        Ilen = Slen + Plen;
-        I = Malloc (Ilen);
-        Ij = BN_new();
-        Bpl1 = BN_new();
-        if (!D || !Ai || !B || !I || !Ij || !Bpl1) {
-                PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        for (i = 0; i < v; i++) D[i] = id;
-        p = I;
-        for (i = 0; i < Slen; i++) *p++ = salt[i % saltlen];
-        for (i = 0; i < Plen; i++) *p++ = pass[i % passlen];
-        for (;;) {
-                EVP_DigestInit (&ctx, md_type);
-                EVP_DigestUpdate (&ctx, D, v);
-                EVP_DigestUpdate (&ctx, I, Ilen);
-                EVP_DigestFinal (&ctx, Ai, NULL);
-                for (j = 1; j < iter; j++) {
-                        EVP_DigestInit (&ctx, md_type);
-                        EVP_DigestUpdate (&ctx, Ai, u);
-                        EVP_DigestFinal (&ctx, Ai, NULL);
-                }
-                memcpy (out, Ai, min (n, u));
-                if (u >= n) {
-                        Free (Ai);
-                        Free (B);
-                        Free (D);
-                        Free (I);
-                        BN_free (Ij);
-                        BN_free (Bpl1);
-#ifdef DEBUG_KEYGEN
-                        BIO_printf (bio_err, "Output KEY (length %d)\n", tmpn);
-                        h__dump (tmpout, tmpn);
-#endif
-                        return 1;       
-                }
-                n -= u;
-                out += u;
-                for (j = 0; j < v; j++) B[j] = Ai[j % u];
-                /* Work out B + 1 first then can use B as tmp space */
-                BN_bin2bn (B, v, Bpl1);
-                BN_add_word (Bpl1, 1);
-                for (j = 0; j < Ilen ; j+=v) {
-                        BN_bin2bn (I + j, v, Ij);
-                        BN_add (Ij, Ij, Bpl1);
-                        BN_bn2bin (Ij, B);
-                        /* If more than 2^(v*8) - 1 cut off MSB */
-                        if (BN_num_bytes (Ij) > v) {
-                                BN_bn2bin (Ij, B);
-                                memcpy (I + j, B + 1, v);
-                        } else BN_bn2bin (Ij, I + j);
-                }
-        }
-}
-#ifdef DEBUG_KEYGEN
-void h__dump (unsigned char *p, int len)
-{
-        for (; len --; p++) BIO_printf (bio_err, "%02X", *p);
-        BIO_printf (bio_err, "\n");     
-}
-#endif
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
deleted file mode 100644
index 767e1303da..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/* p12_kiss.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Simplified PKCS#12 routines */
-
-static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca);
-static int parse_bags( STACK *bags, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
-static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
-/* Parse and decrypt a PKCS#12 structure returning user key, user cert
- * and other (CA) certs. Note either ca should be NULL, *ca should be NULL,
- * or it should point to a valid STACK structure. pkey and cert can be
- * passed unitialised.
- */
-
-int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-             STACK **ca)
-{
-
-/* Check for NULL PKCS12 structure */
-
-if(!p12) {
-        PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER);
-        return 0;
-}
-
-/* Allocate stack for ca certificates if needed */
-if ((ca != NULL) && (*ca == NULL)) {
-        if (!(*ca = sk_new(NULL))) {
-                PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-}
-
-if(pkey) *pkey = NULL;
-if(cert) *cert = NULL;
-
-/* Check the mac */
-
-if (!PKCS12_verify_mac (p12, pass, -1)) {
-        PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
-        goto err;
-}
-
-if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) {
-        PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR);
-        goto err;
-}
-
-return 1;
-
-err:
-
-if (pkey && *pkey) EVP_PKEY_free (*pkey);
-if (cert && *cert) X509_free (*cert);
-if (ca) sk_pop_free (*ca, X509_free);
-return 0;
-
-}
-
-/* Parse the outer PKCS#12 structure */
-
-static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen,
-             EVP_PKEY **pkey, X509 **cert, STACK **ca)
-{
-        STACK *asafes, *bags;
-        int i, bagnid;
-        PKCS7 *p7;
-        ASN1_OCTET_STRING *keyid = NULL;
-        char keymatch = 0;
-        if (!( asafes = M_PKCS12_unpack_authsafes (p12))) return 0;
-        for (i = 0; i < sk_num (asafes); i++) {
-                p7 = (PKCS7 *) sk_value (asafes, i);
-                bagnid = OBJ_obj2nid (p7->type);
-                if (bagnid == NID_pkcs7_data) {
-                        bags = M_PKCS12_unpack_p7data (p7);
-                } else if (bagnid == NID_pkcs7_encrypted) {
-                        bags = M_PKCS12_unpack_p7encdata (p7, pass, passlen);
-                } else continue;
-                if (!bags) {
-                        sk_pop_free (asafes, PKCS7_free);
-                        return 0;
-                }
-                if (!parse_bags (bags, pass, passlen, pkey, cert, ca,
-                                                         &keyid, &keymatch)) {
-                        sk_pop_free (bags, PKCS12_SAFEBAG_free);
-                        sk_pop_free (asafes, PKCS7_free);
-                        return 0;
-                }
-                sk_pop_free (bags, PKCS12_SAFEBAG_free);
-        }
-        sk_pop_free (asafes, PKCS7_free);
-        if (keyid) ASN1_OCTET_STRING_free (keyid);
-        return 1;
-}
-
-
-static int parse_bags (STACK *bags, const char *pass, int passlen,
-                       EVP_PKEY **pkey, X509 **cert, STACK **ca,
-                       ASN1_OCTET_STRING **keyid, char *keymatch)
-{
-        int i;
-        for (i = 0; i < sk_num (bags); i++) {
-                if (!parse_bag ((PKCS12_SAFEBAG *)sk_value (bags, i),
-                         pass, passlen, pkey, cert, ca, keyid,
-                                                         keymatch)) return 0;
-        }
-        return 1;
-}
-
-#define MATCH_KEY  0x1
-#define MATCH_CERT 0x2
-#define MATCH_ALL  0x3
-
-static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen,
-                      EVP_PKEY **pkey, X509 **cert, STACK **ca,
-                      ASN1_OCTET_STRING **keyid,
-             char *keymatch)
-{
-        PKCS8_PRIV_KEY_INFO *p8;
-        X509 *x509;
-        ASN1_OCTET_STRING *lkey = NULL;
-        ASN1_TYPE *attrib;
-
-
-        if ((attrib = PKCS12_get_attr (bag, NID_localKeyID)))
-                                            lkey = attrib->value.octet_string;
-
-        /* Check for any local key id matching (if needed) */
-        if (lkey && ((*keymatch & MATCH_ALL) != MATCH_ALL)) {
-                if (*keyid) {
-                        if (ASN1_OCTET_STRING_cmp (*keyid, lkey)) lkey = NULL;
-                } else {
-                        if (!(*keyid = ASN1_OCTET_STRING_dup (lkey))) {
-                                PKCS12err(PKCS12_F_PARSE_BAGS,ERR_R_MALLOC_FAILURE);
-                                return 0;
-                    }
-                }
-        }
-        
-        switch (M_PKCS12_bag_type(bag))
-        {
-        case NID_keyBag:
-                if (!lkey || !pkey) return 1;   
-                if (!(*pkey = EVP_PKCS82PKEY (bag->value.keybag))) return 0;
-                *keymatch |= MATCH_KEY;
-        break;
-
-        case NID_pkcs8ShroudedKeyBag:
-                if (!lkey || !pkey) return 1;   
-                if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen)))
-                                return 0;
-                *pkey = EVP_PKCS82PKEY (p8);
-                PKCS8_PRIV_KEY_INFO_free (p8);
-                if (!(*pkey)) return 0;
-                *keymatch |= MATCH_KEY;
-        break;
-
-        case NID_certBag:
-                if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
-                                                                 return 1;
-                if (!(x509 = M_PKCS12_certbag2x509(bag))) return 0;
-                if (lkey) {
-                        *keymatch |= MATCH_CERT;
-                        if (cert) *cert = x509;
-                } else if (ca) sk_push (*ca, (char *)x509);
-        break;
-
-        case NID_safeContentsBag:
-                return parse_bags(bag->value.safes, pass, passlen,
-                                        pkey, cert, ca, keyid, keymatch);
-        break;
-
-        default:
-                return 1;
-        break;
-        }
-        return 1;
-}
-
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
deleted file mode 100644
index bac558d6b9..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* p12_mutl.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef NO_HMAC
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/hmac.h>
-#include <openssl/rand.h>
-#include <openssl/pkcs12.h>
-
-/* Generate a MAC */
-int PKCS12_gen_mac (PKCS12 *p12, const char *pass, int passlen,
-                    unsigned char *mac, unsigned int *maclen)
-{
-        const EVP_MD *md_type;
-        HMAC_CTX hmac;
-        unsigned char key[PKCS12_MAC_KEY_LENGTH], *salt;
-        int saltlen, iter;
-        salt = p12->mac->salt->data;
-        saltlen = p12->mac->salt->length;
-        if (!p12->mac->iter) iter = 1;
-        else iter = ASN1_INTEGER_get (p12->mac->iter);
-        if(!(md_type =
-                 EVP_get_digestbyobj (p12->mac->dinfo->algor->algorithm))) {
-                PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_UNKNOWN_DIGEST_ALGORITHM);
-                return 0;
-        }
-        if(!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_MAC_ID, iter,
-                                 PKCS12_MAC_KEY_LENGTH, key, md_type)) {
-                PKCS12err(PKCS12_F_PKCS12_GEN_MAC,PKCS12_R_KEY_GEN_ERROR);
-                return 0;
-        }
-        HMAC_Init (&hmac, key, PKCS12_MAC_KEY_LENGTH, md_type);
-        HMAC_Update (&hmac, p12->authsafes->d.data->data,
-                                         p12->authsafes->d.data->length);
-        HMAC_Final (&hmac, mac, maclen);
-        return 1;
-}
-
-/* Verify the mac */
-int PKCS12_verify_mac (PKCS12 *p12, const char *pass, int passlen)
-{
-        unsigned char mac[EVP_MAX_MD_SIZE];
-        unsigned int maclen;
-        if(p12->mac == NULL) {
-                PKCS12err(PKCS12_F_VERIFY_MAC,PKCS12_R_MAC_ABSENT);
-                return 0;
-        }
-        if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) {
-                PKCS12err(PKCS12_F_VERIFY_MAC,PKCS12_R_MAC_GENERATION_ERROR);
-                return 0;
-        }
-        if ((maclen != (unsigned int)p12->mac->dinfo->digest->length)
-        || memcmp (mac, p12->mac->dinfo->digest->data, maclen)) {
-                PKCS12err(PKCS12_F_VERIFY_MAC,PKCS12_R_MAC_VERIFY_ERROR);
-                return 0;
-        }
-        return 1;
-}
-
-/* Set a mac */
-
-int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen,
-             unsigned char *salt, int saltlen, int iter, EVP_MD *md_type)
-{
-        unsigned char mac[EVP_MAX_MD_SIZE];
-        unsigned int maclen;
-
-        if (!md_type) md_type = EVP_sha1();
-        if (PKCS12_setup_mac (p12, iter, salt, saltlen, md_type) ==
-                                        PKCS12_ERROR) {
-                PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_SETUP_ERROR);
-                return 0;
-        }
-        if (!PKCS12_gen_mac (p12, pass, passlen, mac, &maclen)) {
-                PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_GENERATION_ERROR);
-                return 0;
-        }
-        if (!(ASN1_OCTET_STRING_set (p12->mac->dinfo->digest, mac, maclen))) {
-                PKCS12err(PKCS12_F_PKCS12_SET_MAC,PKCS12_R_MAC_STRING_SET_ERROR);
-                                                return 0;
-        }
-        return 1;
-}
-
-/* Set up a mac structure */
-int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
-             EVP_MD *md_type)
-{
-        if (!(p12->mac = PKCS12_MAC_DATA_new ())) return PKCS12_ERROR;
-        if (iter > 1) {
-                if(!(p12->mac->iter = ASN1_INTEGER_new())) {
-                        PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
-                        return 0;
-                }
-                ASN1_INTEGER_set (p12->mac->iter, iter);
-        }
-        if (!saltlen) saltlen = PKCS12_SALT_LEN;
-        p12->mac->salt->length = saltlen;
-        if (!(p12->mac->salt->data = Malloc (saltlen))) {
-                PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if (!salt) RAND_bytes (p12->mac->salt->data, saltlen);
-        else memcpy (p12->mac->salt->data, salt, saltlen);
-        p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type));
-        if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) {
-                PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        p12->mac->dinfo->algor->parameter->type = V_ASN1_NULL;
-        
-        return 1;
-}
-#endif
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
deleted file mode 100644
index 2adcbc95e1..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* p12_utl.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/pkcs12.h>
-
-/* Cheap and nasty Unicode stuff */
-
-unsigned char *asc2uni (const char *asc, unsigned char **uni, int *unilen)
-{
-        int ulen, i;
-        unsigned char *unitmp;
-        ulen = strlen(asc)*2  + 2;
-        if (!(unitmp = Malloc (ulen))) return NULL;
-        for (i = 0; i < ulen; i+=2) {
-                unitmp[i] = 0;
-                unitmp[i + 1] = asc[i>>1];
-        }
-        if (unilen) *unilen = ulen;
-        if (uni) *uni = unitmp;
-        return unitmp;
-}
-
-char *uni2asc (unsigned char *uni, int unilen)
-{
-        int asclen, i;
-        char *asctmp;
-        asclen = unilen / 2;
-        /* If no terminating zero allow for one */
-        if (uni[unilen - 1]) asclen++;
-        uni++;
-        if (!(asctmp = Malloc (asclen))) return NULL;
-        for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i];
-        asctmp[asclen - 1] = 0;
-        return asctmp;
-}
-
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
-{
-        return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12);
-}
-
-#ifndef NO_FP_API
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
-{
-        return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12);
-}
-#endif
-
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
-{
-        return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new,
-         (char *(*)())d2i_PKCS12, bp, (unsigned char **)p12);
-}
-#ifndef NO_FP_API
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
-{
-        return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new, 
-         (char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12));
-}
-#endif
-
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c
deleted file mode 100644
index 38d7be7675..0000000000
--- a/src/lib/libcrypto/pkcs12/pk12err.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* crypto/pkcs12/pk12err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/pkcs12.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA PKCS12_str_functs[]=
-        {
-{ERR_PACK(0,PKCS12_F_PARSE_BAGS,0),     "PARSE_BAGS"},
-{ERR_PACK(0,PKCS12_F_PKCS12_ADD_FRIENDLYNAME,0),        "PKCS12_ADD_FRIENDLYNAME"},
-{ERR_PACK(0,PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC,0),    "PKCS12_add_friendlyname_asc"},
-{ERR_PACK(0,PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,0),    "PKCS12_add_friendlyname_uni"},
-{ERR_PACK(0,PKCS12_F_PKCS12_ADD_LOCALKEYID,0),  "PKCS12_add_localkeyid"},
-{ERR_PACK(0,PKCS12_F_PKCS12_CREATE,0),  "PKCS12_create"},
-{ERR_PACK(0,PKCS12_F_PKCS12_DECRYPT_D2I,0),     "PKCS12_decrypt_d2i"},
-{ERR_PACK(0,PKCS12_F_PKCS12_GEN_MAC,0), "PKCS12_gen_mac"},
-{ERR_PACK(0,PKCS12_F_PKCS12_I2D_ENCRYPT,0),     "PKCS12_i2d_encrypt"},
-{ERR_PACK(0,PKCS12_F_PKCS12_INIT,0),    "PKCS12_init"},
-{ERR_PACK(0,PKCS12_F_PKCS12_KEY_GEN_ASC,0),     "PKCS12_key_gen_asc"},
-{ERR_PACK(0,PKCS12_F_PKCS12_KEY_GEN_UNI,0),     "PKCS12_key_gen_uni"},
-{ERR_PACK(0,PKCS12_F_PKCS12_MAKE_KEYBAG,0),     "PKCS12_MAKE_KEYBAG"},
-{ERR_PACK(0,PKCS12_F_PKCS12_MAKE_SHKEYBAG,0),   "PKCS12_MAKE_SHKEYBAG"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PACK_P7DATA,0),     "PKCS12_pack_p7data"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PACK_P7ENCDATA,0),  "PKCS12_pack_p7encdata"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PACK_SAFEBAG,0),    "PKCS12_pack_safebag"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PARSE,0),   "PKCS12_parse"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PBE_CRYPT,0),       "PKCS12_pbe_crypt"},
-{ERR_PACK(0,PKCS12_F_PKCS12_PBE_KEYIVGEN,0),    "PKCS12_PBE_keyivgen"},
-{ERR_PACK(0,PKCS12_F_PKCS12_SETUP_MAC,0),       "PKCS12_setup_mac"},
-{ERR_PACK(0,PKCS12_F_PKCS12_SET_MAC,0), "PKCS12_set_mac"},
-{ERR_PACK(0,PKCS12_F_PKCS8_ADD_KEYUSAGE,0),     "PKCS8_add_keyusage"},
-{ERR_PACK(0,PKCS12_F_PKCS8_ENCRYPT,0),  "PKCS8_encrypt"},
-{ERR_PACK(0,PKCS12_F_VERIFY_MAC,0),     "VERIFY_MAC"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA PKCS12_str_reasons[]=
-        {
-{PKCS12_R_CANT_PACK_STRUCTURE            ,"cant pack structure"},
-{PKCS12_R_DECODE_ERROR                   ,"decode error"},
-{PKCS12_R_ENCODE_ERROR                   ,"encode error"},
-{PKCS12_R_ENCRYPT_ERROR                  ,"encrypt error"},
-{PKCS12_R_INVALID_NULL_ARGUMENT          ,"invalid null argument"},
-{PKCS12_R_INVALID_NULL_PKCS12_POINTER    ,"invalid null pkcs12 pointer"},
-{PKCS12_R_IV_GEN_ERROR                   ,"iv gen error"},
-{PKCS12_R_KEY_GEN_ERROR                  ,"key gen error"},
-{PKCS12_R_MAC_ABSENT                     ,"mac absent"},
-{PKCS12_R_MAC_GENERATION_ERROR           ,"mac generation error"},
-{PKCS12_R_MAC_SETUP_ERROR                ,"mac setup error"},
-{PKCS12_R_MAC_STRING_SET_ERROR           ,"mac string set error"},
-{PKCS12_R_MAC_VERIFY_ERROR               ,"mac verify error"},
-{PKCS12_R_MAC_VERIFY_FAILURE             ,"mac verify failure"},
-{PKCS12_R_PARSE_ERROR                    ,"parse error"},
-{PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR  ,"pkcs12 algor cipherinit error"},
-{PKCS12_R_PKCS12_CIPHERFINAL_ERROR       ,"pkcs12 cipherfinal error"},
-{PKCS12_R_PKCS12_PBE_CRYPT_ERROR         ,"pkcs12 pbe crypt error"},
-{PKCS12_R_UNKNOWN_DIGEST_ALGORITHM       ,"unknown digest algorithm"},
-{PKCS12_R_UNSUPPORTED_PKCS12_MODE        ,"unsupported pkcs12 mode"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_PKCS12_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_functs);
-                ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
deleted file mode 100644
index 4cfba5e6c6..0000000000
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/* pkcs12.h */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PKCS12_H
-#define HEADER_PKCS12_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-
-#define PKCS12_KEY_ID   1
-#define PKCS12_IV_ID    2
-#define PKCS12_MAC_ID   3
-
-/* Default iteration count */
-#ifndef PKCS12_DEFAULT_ITER
-#define PKCS12_DEFAULT_ITER     PKCS5_DEFAULT_ITER
-#endif
-
-#define PKCS12_MAC_KEY_LENGTH 20
-
-#define PKCS12_SALT_LEN 8
-
-/* Uncomment out next line for unicode password and names, otherwise ASCII */
-
-/*#define PBE_UNICODE*/
-
-#ifdef PBE_UNICODE
-#define PKCS12_key_gen PKCS12_key_gen_uni
-#define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni
-#else
-#define PKCS12_key_gen PKCS12_key_gen_asc
-#define PKCS12_add_friendlyname PKCS12_add_friendlyname_asc
-#endif
-
-/* MS key usage constants */
-
-#define KEY_EX  0x10
-#define KEY_SIG 0x80
-
-typedef struct {
-X509_SIG *dinfo;
-ASN1_OCTET_STRING *salt;
-ASN1_INTEGER *iter;     /* defaults to 1 */
-} PKCS12_MAC_DATA;
-
-typedef struct {
-ASN1_INTEGER *version;
-PKCS12_MAC_DATA *mac;
-PKCS7 *authsafes;
-} PKCS12;
-
-typedef struct {
-ASN1_OBJECT *type;
-union {
-        struct pkcs12_bag_st *bag; /* secret, crl and certbag */
-        struct pkcs8_priv_key_info_st   *keybag; /* keybag */
-        X509_SIG *shkeybag; /* shrouded key bag */
-        STACK /* PKCS12_SAFEBAG */ *safes;
-        ASN1_TYPE *other;
-}value;
-STACK_OF(X509_ATTRIBUTE) *attrib;
-ASN1_TYPE *rest;
-} PKCS12_SAFEBAG;
-
-typedef struct pkcs12_bag_st {
-ASN1_OBJECT *type;
-union {
-        ASN1_OCTET_STRING *x509cert;
-        ASN1_OCTET_STRING *x509crl;
-        ASN1_OCTET_STRING *octet;
-        ASN1_IA5STRING *sdsicert;
-        ASN1_TYPE *other; /* Secret or other bag */
-}value;
-} PKCS12_BAGS;
-
-#define PKCS12_ERROR    0
-#define PKCS12_OK       1
-
-#define M_PKCS12_bag_type(bag) OBJ_obj2nid(bag->type)
-#define M_PKCS12_cert_bag_type(bag) OBJ_obj2nid(bag->value.bag->type)
-#define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
-
-#define M_PKCS12_x5092certbag(x509) \
-PKCS12_pack_safebag ((char *)(x509), i2d_X509, NID_x509Certificate, NID_certBag)
-
-#define M_PKCS12_x509crl2certbag(crl) \
-PKCS12_pack_safebag ((char *)(crl), i2d_X509CRL, NID_x509Crl, NID_crlBag)
-
-#define M_PKCS12_certbag2x509(bg) \
-(X509 *) ASN1_unpack_string ((bg)->value.bag->value.octet, \
-(char *(*)())d2i_X509)
-
-#define M_PKCS12_certbag2x509crl(bg) \
-(X509CRL *) ASN1_unpack_string ((bg)->value.bag->value.octet, \
-(char *(*)())d2i_X509CRL)
-
-/*#define M_PKCS12_pkcs82rsa(p8) \
-(RSA *) ASN1_unpack_string ((p8)->pkey, (char *(*)())d2i_RSAPrivateKey)*/
-
-#define M_PKCS12_unpack_p7data(p7) \
-ASN1_seq_unpack ((p7)->d.data->data, p7->d.data->length, \
-                         (char *(*)())d2i_PKCS12_SAFEBAG, PKCS12_SAFEBAG_free)
-
-#define M_PKCS12_pack_authsafes(p12, safes) \
-ASN1_seq_pack((safes), (int (*)())i2d_PKCS7,\
-        &(p12)->authsafes->d.data->data, &(p12)->authsafes->d.data->length)
-
-#define M_PKCS12_unpack_authsafes(p12) \
-ASN1_seq_unpack((p12)->authsafes->d.data->data, \
-                (p12)->authsafes->d.data->length, (char *(*)())d2i_PKCS7, \
-                                                        PKCS7_free)
-
-#define M_PKCS12_unpack_p7encdata(p7, pass, passlen) \
-(STACK *) PKCS12_decrypt_d2i ((p7)->d.encrypted->enc_data->algorithm,\
-                         (char *(*)())d2i_PKCS12_SAFEBAG, PKCS12_SAFEBAG_free, \
-                                                        (pass), (passlen), \
-                        (p7)->d.encrypted->enc_data->enc_data, 3)
-
-#define M_PKCS12_decrypt_skey(bag, pass, passlen) \
-(PKCS8_PRIV_KEY_INFO *) PKCS12_decrypt_d2i ((bag)->value.shkeybag->algor, \
-(char *(*)())d2i_PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free, \
-                                                (pass), (passlen), \
-                         (bag)->value.shkeybag->digest, 2)
-
-#define M_PKCS8_decrypt(p8, pass, passlen) \
-(PKCS8_PRIV_KEY_INFO *) PKCS12_decrypt_d2i ((p8)->algor, \
-(char *(*)())d2i_PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free,\
-                         (pass), (passlen), (p8)->digest, 2)
-
-#define PKCS12_get_attr(bag, attr_nid) \
-                         PKCS12_get_attr_gen(bag->attrib, attr_nid)
-
-#define PKCS8_get_attr(p8, attr_nid) \
-                PKCS12_get_attr_gen(p8->attributes, attr_nid)
-
-#define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0)
-
-
-PKCS12_SAFEBAG *PKCS12_pack_safebag(char *obj, int (*i2d)(), int nid1, int nid2);
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, 
-                        const char *pass, int passlen,
-                        unsigned char *salt, int saltlen, int iter,
-                        PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
-                                     int passlen, unsigned char *salt,
-                                     int saltlen, int iter,
-                                     PKCS8_PRIV_KEY_INFO *p8);
-PKCS7 *PKCS12_pack_p7data(STACK *sk);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             STACK *bags);
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
-                                int namelen);
-int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
-                                int passlen, unsigned char *in, int inlen,
-                                unsigned char **data, int *datalen, int en_de);
-char *PKCS12_decrypt_d2i(X509_ALGOR *algor, char *(*d2i)(),
-                         void (*free_func)(), const char *pass, int passlen,
-                         ASN1_STRING *oct, int seq);
-ASN1_STRING *PKCS12_i2d_encrypt(X509_ALGOR *algor, int (*i2d)(),
-                                const char *pass, int passlen, char *obj,
-                                int seq);
-PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md_type,
-                         int en_de);
-int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                         unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *salt, int saltlen, int iter,
-                   EVP_MD *md_type);
-int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-                                         int saltlen, EVP_MD *md_type);
-unsigned char *asc2uni(const char *asc, unsigned char **uni, int *unilen);
-char *uni2asc(unsigned char *uni, int unilen);
-int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp);
-PKCS12_BAGS *PKCS12_BAGS_new(void);
-PKCS12_BAGS *d2i_PKCS12_BAGS(PKCS12_BAGS **a, unsigned char **pp, long length);
-void PKCS12_BAGS_free(PKCS12_BAGS *a);
-int i2d_PKCS12(PKCS12 *a, unsigned char **pp);
-PKCS12 *d2i_PKCS12(PKCS12 **a, unsigned char **pp, long length);
-PKCS12 *PKCS12_new(void);
-void PKCS12_free(PKCS12 *a);
-int i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **pp);
-PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(void);
-PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, unsigned char **pp,
-                                                                 long length);
-void PKCS12_MAC_DATA_free(PKCS12_MAC_DATA *a);
-int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **pp);
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_new(void);
-PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp,
-                                                                 long length);
-void PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a);
-void ERR_load_PKCS12_strings(void);
-void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK **ca);
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-                         STACK *ca, int nid_key, int nid_cert, int iter,
-                                                 int mac_iter, int keytype);
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the PKCS12 functions. */
-
-/* Function codes. */
-#define PKCS12_F_PARSE_BAGS                              103
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME                 100
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC             127
-#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI             102
-#define PKCS12_F_PKCS12_ADD_LOCALKEYID                   104
-#define PKCS12_F_PKCS12_CREATE                           105
-#define PKCS12_F_PKCS12_DECRYPT_D2I                      106
-#define PKCS12_F_PKCS12_GEN_MAC                          107
-#define PKCS12_F_PKCS12_I2D_ENCRYPT                      108
-#define PKCS12_F_PKCS12_INIT                             109
-#define PKCS12_F_PKCS12_KEY_GEN_ASC                      110
-#define PKCS12_F_PKCS12_KEY_GEN_UNI                      111
-#define PKCS12_F_PKCS12_MAKE_KEYBAG                      112
-#define PKCS12_F_PKCS12_MAKE_SHKEYBAG                    113
-#define PKCS12_F_PKCS12_PACK_P7DATA                      114
-#define PKCS12_F_PKCS12_PACK_P7ENCDATA                   115
-#define PKCS12_F_PKCS12_PACK_SAFEBAG                     117
-#define PKCS12_F_PKCS12_PARSE                            118
-#define PKCS12_F_PKCS12_PBE_CRYPT                        119
-#define PKCS12_F_PKCS12_PBE_KEYIVGEN                     120
-#define PKCS12_F_PKCS12_SETUP_MAC                        122
-#define PKCS12_F_PKCS12_SET_MAC                          123
-#define PKCS12_F_PKCS8_ADD_KEYUSAGE                      124
-#define PKCS12_F_PKCS8_ENCRYPT                           125
-#define PKCS12_F_VERIFY_MAC                              126
-
-/* Reason codes. */
-#define PKCS12_R_CANT_PACK_STRUCTURE                     100
-#define PKCS12_R_DECODE_ERROR                            101
-#define PKCS12_R_ENCODE_ERROR                            102
-#define PKCS12_R_ENCRYPT_ERROR                           103
-#define PKCS12_R_INVALID_NULL_ARGUMENT                   104
-#define PKCS12_R_INVALID_NULL_PKCS12_POINTER             105
-#define PKCS12_R_IV_GEN_ERROR                            106
-#define PKCS12_R_KEY_GEN_ERROR                           107
-#define PKCS12_R_MAC_ABSENT                              108
-#define PKCS12_R_MAC_GENERATION_ERROR                    109
-#define PKCS12_R_MAC_SETUP_ERROR                         110
-#define PKCS12_R_MAC_STRING_SET_ERROR                    111
-#define PKCS12_R_MAC_VERIFY_ERROR                        112
-#define PKCS12_R_MAC_VERIFY_FAILURE                      113
-#define PKCS12_R_PARSE_ERROR                             114
-#define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR           115
-#define PKCS12_R_PKCS12_CIPHERFINAL_ERROR                116
-#define PKCS12_R_PKCS12_PBE_CRYPT_ERROR                  117
-#define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM                118
-#define PKCS12_R_UNSUPPORTED_PKCS12_MODE                 119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
deleted file mode 100644
index dee81b547a..0000000000
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/* crypto/pkcs7/pk7_doit.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 <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
-                         void *value);
-static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
-        {
-        int i,j;
-        BIO *out=NULL,*btmp=NULL;
-        X509_ALGOR *xa;
-        const EVP_MD *evp_md;
-        const EVP_CIPHER *evp_cipher=NULL;
-        STACK_OF(X509_ALGOR) *md_sk=NULL;
-        STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
-        X509_ALGOR *xalg=NULL;
-        PKCS7_RECIP_INFO *ri=NULL;
-        EVP_PKEY *pkey;
-
-        i=OBJ_obj2nid(p7->type);
-        p7->state=PKCS7_S_HEADER;
-
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                md_sk=p7->d.sign->md_algs;
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                rsk=p7->d.signed_and_enveloped->recipientinfo;
-                md_sk=p7->d.signed_and_enveloped->md_algs;
-                xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
-                evp_cipher=p7->d.signed_and_enveloped->enc_data->cipher;
-                if (evp_cipher == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATAINIT,
-                                                PKCS7_R_CIPHER_NOT_INITIALIZED);
-                        goto err;
-                        }
-                break;
-        case NID_pkcs7_enveloped:
-                rsk=p7->d.enveloped->recipientinfo;
-                xalg=p7->d.enveloped->enc_data->algorithm;
-                evp_cipher=p7->d.enveloped->enc_data->cipher;
-                if (evp_cipher == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATAINIT,
-                                                PKCS7_R_CIPHER_NOT_INITIALIZED);
-                        goto err;
-                        }
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
-                goto err;
-                }
-
-        if (md_sk != NULL)
-                {
-                for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
-                        {
-                        xa=sk_X509_ALGOR_value(md_sk,i);
-                        if ((btmp=BIO_new(BIO_f_md())) == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
-                                goto err;
-                                }
-
-                        j=OBJ_obj2nid(xa->algorithm);
-                        evp_md=EVP_get_digestbyname(OBJ_nid2sn(j));
-                        if (evp_md == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNKNOWN_DIGEST_TYPE);
-                                goto err;
-                                }
-
-                        BIO_set_md(btmp,evp_md);
-                        if (out == NULL)
-                                out=btmp;
-                        else
-                                BIO_push(out,btmp);
-                        btmp=NULL;
-                        }
-                }
-
-        if (evp_cipher != NULL)
-                {
-                unsigned char key[EVP_MAX_KEY_LENGTH];
-                unsigned char iv[EVP_MAX_IV_LENGTH];
-                int keylen,ivlen;
-                int jj,max;
-                unsigned char *tmp;
-                EVP_CIPHER_CTX *ctx;
-
-                if ((btmp=BIO_new(BIO_f_cipher())) == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);
-                        goto err;
-                        }
-                BIO_get_cipher_ctx(btmp, &ctx);
-                keylen=EVP_CIPHER_key_length(evp_cipher);
-                ivlen=EVP_CIPHER_iv_length(evp_cipher);
-                RAND_bytes(key,keylen);
-                xalg->algorithm = OBJ_nid2obj(EVP_CIPHER_type(evp_cipher));
-                if (ivlen > 0) RAND_bytes(iv,ivlen);
-                EVP_CipherInit(ctx, evp_cipher, key, iv, 1);
-
-                if (ivlen > 0) {
-                        if (xalg->parameter == NULL) 
-                                                xalg->parameter=ASN1_TYPE_new();
-                        if(EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) < 0)
-                                                                       goto err;
-                }
-
-                /* Lets do the pub key stuff :-) */
-                max=0;
-                for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
-                        {
-                        ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
-                        if (ri->cert == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_MISSING_CERIPEND_INFO);
-                                goto err;
-                                }
-                        pkey=X509_get_pubkey(ri->cert);
-                        jj=EVP_PKEY_size(pkey);
-                        EVP_PKEY_free(pkey);
-                        if (max < jj) max=jj;
-                        }
-                if ((tmp=(unsigned char *)Malloc(max)) == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
-                        {
-                        ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
-                        pkey=X509_get_pubkey(ri->cert);
-                        jj=EVP_PKEY_encrypt(tmp,key,keylen,pkey);
-                        EVP_PKEY_free(pkey);
-                        if (jj <= 0)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_EVP_LIB);
-                                Free(tmp);
-                                goto err;
-                                }
-                        ASN1_OCTET_STRING_set(ri->enc_key,tmp,jj);
-                        }
-                Free(tmp);
-                memset(key, 0, keylen);
-
-                if (out == NULL)
-                        out=btmp;
-                else
-                        BIO_push(out,btmp);
-                btmp=NULL;
-                }
-
-        if (bio == NULL) /* ??????????? */
-                {
-                if (p7->detached)
-                        bio=BIO_new(BIO_s_null());
-                else
-                        {
-                        bio=BIO_new(BIO_s_mem());
-                        /* We need to set this so that when we have read all
-                         * the data, the encrypt BIO, if present, will read
-                         * EOF and encode the last few bytes */
-                        BIO_set_mem_eof_return(bio,0);
-
-                        if (PKCS7_type_is_signed(p7) &&
-                                PKCS7_type_is_data(p7->d.sign->contents))
-                                {
-                                ASN1_OCTET_STRING *os;
-
-                                os=p7->d.sign->contents->d.data;
-                                if (os->length > 0)
-                                        BIO_write(bio,(char *)os->data,
-                                                os->length);
-                                }
-                        }
-                }
-        BIO_push(out,bio);
-        bio=NULL;
-        if (0)
-                {
-err:
-                if (out != NULL)
-                        BIO_free_all(out);
-                if (btmp != NULL)
-                        BIO_free_all(btmp);
-                out=NULL;
-                }
-        return(out);
-        }
-
-/* int */
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
-        {
-        int i,j;
-        BIO *out=NULL,*btmp=NULL,*etmp=NULL,*bio=NULL;
-        char *tmp=NULL;
-        X509_ALGOR *xa;
-        ASN1_OCTET_STRING *data_body=NULL;
-        const EVP_MD *evp_md;
-        const EVP_CIPHER *evp_cipher=NULL;
-        EVP_CIPHER_CTX *evp_ctx=NULL;
-        X509_ALGOR *enc_alg=NULL;
-        STACK_OF(X509_ALGOR) *md_sk=NULL;
-        STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
-        X509_ALGOR *xalg=NULL;
-        PKCS7_RECIP_INFO *ri=NULL;
-/*      EVP_PKEY *pkey; */
-#if 0
-        X509_STORE_CTX s_ctx;
-#endif
-
-        i=OBJ_obj2nid(p7->type);
-        p7->state=PKCS7_S_HEADER;
-
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                data_body=p7->d.sign->contents->d.data;
-                md_sk=p7->d.sign->md_algs;
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                rsk=p7->d.signed_and_enveloped->recipientinfo;
-                md_sk=p7->d.signed_and_enveloped->md_algs;
-                data_body=p7->d.signed_and_enveloped->enc_data->enc_data;
-                enc_alg=p7->d.signed_and_enveloped->enc_data->algorithm;
-                evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm)));
-                if (evp_cipher == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
-                        goto err;
-                        }
-                xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
-                break;
-        case NID_pkcs7_enveloped:
-                rsk=p7->d.enveloped->recipientinfo;
-                enc_alg=p7->d.enveloped->enc_data->algorithm;
-                data_body=p7->d.enveloped->enc_data->enc_data;
-                evp_cipher=EVP_get_cipherbyname(OBJ_nid2sn(OBJ_obj2nid(enc_alg->algorithm)));
-                if (evp_cipher == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
-                        goto err;
-                        }
-                xalg=p7->d.enveloped->enc_data->algorithm;
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
-                goto err;
-                }
-
-        /* We will be checking the signature */
-        if (md_sk != NULL)
-                {
-                for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
-                        {
-                        xa=sk_X509_ALGOR_value(md_sk,i);
-                        if ((btmp=BIO_new(BIO_f_md())) == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
-                                goto err;
-                                }
-
-                        j=OBJ_obj2nid(xa->algorithm);
-                        evp_md=EVP_get_digestbyname(OBJ_nid2sn(j));
-                        if (evp_md == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNKNOWN_DIGEST_TYPE);
-                                goto err;
-                                }
-
-                        BIO_set_md(btmp,evp_md);
-                        if (out == NULL)
-                                out=btmp;
-                        else
-                                BIO_push(out,btmp);
-                        btmp=NULL;
-                        }
-                }
-
-        if (evp_cipher != NULL)
-                {
-#if 0
-                unsigned char key[EVP_MAX_KEY_LENGTH];
-                unsigned char iv[EVP_MAX_IV_LENGTH];
-                unsigned char *p;
-                int keylen,ivlen;
-                int max;
-                X509_OBJECT ret;
-#endif
-                int jj;
-
-                if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_BIO_LIB);
-                        goto err;
-                        }
-
-                /* It was encrypted, we need to decrypt the secret key
-                 * with the private key */
-
-                /* Find the recipientInfo which matches the passed certificate
-                 * (if any)
-                 */
-
-                for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++) {
-                        ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
-                        if(!X509_NAME_cmp(ri->issuer_and_serial->issuer,
-                                        pcert->cert_info->issuer) &&
-                             !ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
-                                        ri->issuer_and_serial->serial)) break;
-                        ri=NULL;
-                }
-                if (ri == NULL) {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,
-                                 PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
-                        return(NULL);
-                }
-
-                jj=EVP_PKEY_size(pkey);
-                tmp=Malloc(jj+10);
-                if (tmp == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-
-                jj=EVP_PKEY_decrypt((unsigned char *)tmp,
-                        ASN1_STRING_data(ri->enc_key),
-                        ASN1_STRING_length(ri->enc_key),
-                        pkey);
-                if (jj <= 0)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,ERR_R_EVP_LIB);
-                        goto err;
-                        }
-
-                evp_ctx=NULL;
-                BIO_get_cipher_ctx(etmp,&evp_ctx);
-                EVP_CipherInit(evp_ctx,evp_cipher,NULL,NULL,0);
-                if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)
-                        return(NULL);
-
-                if (jj != EVP_CIPHER_CTX_key_length(evp_ctx))
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATADECODE,
-                                        PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH);
-                        goto err;
-                        }
-                EVP_CipherInit(evp_ctx,NULL,(unsigned char *)tmp,NULL,0);
-
-                memset(tmp,0,jj);
-
-                if (out == NULL)
-                        out=etmp;
-                else
-                        BIO_push(out,etmp);
-                etmp=NULL;
-                }
-
-#if 1
-        if (p7->detached || (in_bio != NULL))
-                {
-                bio=in_bio;
-                }
-        else 
-                {
-                bio=BIO_new(BIO_s_mem());
-                /* We need to set this so that when we have read all
-                 * the data, the encrypt BIO, if present, will read
-                 * EOF and encode the last few bytes */
-                BIO_set_mem_eof_return(bio,0);
-
-                if (data_body->length > 0)
-                        BIO_write(bio,(char *)data_body->data,data_body->length);
-                }
-        BIO_push(out,bio);
-        bio=NULL;
-#endif
-        if (0)
-                {
-err:
-                if (out != NULL) BIO_free_all(out);
-                if (btmp != NULL) BIO_free_all(btmp);
-                if (etmp != NULL) BIO_free_all(etmp);
-                if (bio != NULL) BIO_free_all(bio);
-                out=NULL;
-                }
-        if (tmp != NULL)
-                Free(tmp);
-        return(out);
-        }
-
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
-        {
-        int ret=0;
-        int i,j;
-        BIO *btmp;
-        BUF_MEM *buf_mem=NULL;
-        BUF_MEM *buf=NULL;
-        PKCS7_SIGNER_INFO *si;
-        EVP_MD_CTX *mdc,ctx_tmp;
-        STACK_OF(X509_ATTRIBUTE) *sk;
-        STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL;
-        unsigned char *p,*pp=NULL;
-        int x;
-        ASN1_OCTET_STRING *os=NULL;
-
-        i=OBJ_obj2nid(p7->type);
-        p7->state=PKCS7_S_HEADER;
-
-        switch (i)
-                {
-        case NID_pkcs7_signedAndEnveloped:
-                /* XXXXXXXXXXXXXXXX */
-                si_sk=p7->d.signed_and_enveloped->signer_info;
-                os=ASN1_OCTET_STRING_new();
-                p7->d.signed_and_enveloped->enc_data->enc_data=os;
-                break;
-        case NID_pkcs7_enveloped:
-                /* XXXXXXXXXXXXXXXX */
-                os=ASN1_OCTET_STRING_new();
-                p7->d.enveloped->enc_data->enc_data=os;
-                break;
-        case NID_pkcs7_signed:
-                si_sk=p7->d.sign->signer_info;
-                os=p7->d.sign->contents->d.data;
-                /* If detached data then the content is excluded */
-                if(p7->detached) {
-                        ASN1_OCTET_STRING_free(os);
-                        p7->d.sign->contents->d.data = NULL;
-                }
-                break;
-                }
-
-        if (si_sk != NULL)
-                {
-                if ((buf=BUF_MEM_new()) == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB);
-                        goto err;
-                        }
-                for (i=0; i<sk_PKCS7_SIGNER_INFO_num(si_sk); i++)
-                        {
-                        si=sk_PKCS7_SIGNER_INFO_value(si_sk,i);
-                        if (si->pkey == NULL) continue;
-
-                        j=OBJ_obj2nid(si->digest_alg->algorithm);
-
-                        btmp=bio;
-                        for (;;)
-                                {
-                                if ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) 
-                                        == NULL)
-                                        {
-                                        PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
-                                        goto err;
-                                        }
-                                BIO_get_md_ctx(btmp,&mdc);
-                                if (mdc == NULL)
-                                        {
-                                        PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_INTERNAL_ERROR);
-                                        goto err;
-                                        }
-                                if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == j)
-                                        break;
-                                else
-                                        btmp=btmp->next_bio;
-                                }
-                        
-                        /* We now have the EVP_MD_CTX, lets do the
-                         * signing. */
-                        memcpy(&ctx_tmp,mdc,sizeof(ctx_tmp));
-                        if (!BUF_MEM_grow(buf,EVP_PKEY_size(si->pkey)))
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_BIO_LIB);
-                                goto err;
-                                }
-
-                        sk=si->auth_attr;
-
-                        /* If there are attributes, we add the digest
-                         * attribute and only sign the attributes */
-                        if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
-                                {
-                                unsigned char md_data[EVP_MAX_MD_SIZE];
-                                unsigned int md_len;
-                                ASN1_OCTET_STRING *digest;
-                                ASN1_UTCTIME *sign_time;
-                                const EVP_MD *md_tmp;
-
-                                /* Add signing time */
-                                sign_time=X509_gmtime_adj(NULL,0);
-                                PKCS7_add_signed_attribute(si,
-                                        NID_pkcs9_signingTime,
-                                        V_ASN1_UTCTIME,sign_time);
-
-                                /* Add digest */
-                                md_tmp=EVP_MD_CTX_type(&ctx_tmp);
-                                EVP_DigestFinal(&ctx_tmp,md_data,&md_len);
-                                digest=ASN1_OCTET_STRING_new();
-                                ASN1_OCTET_STRING_set(digest,md_data,md_len);
-                                PKCS7_add_signed_attribute(si,
-                                        NID_pkcs9_messageDigest,
-                                        V_ASN1_OCTET_STRING,digest);
-
-                                /* Now sign the mess */
-                                EVP_SignInit(&ctx_tmp,md_tmp);
-                                x=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL,
-                                           i2d_X509_ATTRIBUTE,
-                                           V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-                                pp=(unsigned char *)Malloc(x);
-                                p=pp;
-                                i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p,
-                                           i2d_X509_ATTRIBUTE,
-                                           V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-                                EVP_SignUpdate(&ctx_tmp,pp,x);
-                                Free(pp);
-                                pp=NULL;
-                                }
-
-                        if (si->pkey->type == EVP_PKEY_DSA)
-                                ctx_tmp.digest=EVP_dss1();
-
-                        if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,
-                                (unsigned int *)&buf->length,si->pkey))
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_EVP_LIB);
-                                goto err;
-                                }
-                        if (!ASN1_STRING_set(si->enc_digest,
-                                (unsigned char *)buf->data,buf->length))
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATASIGN,ERR_R_ASN1_LIB);
-                                goto err;
-                                }
-                        }
-                }
-
-        if (!p7->detached)
-                {
-                btmp=BIO_find_type(bio,BIO_TYPE_MEM);
-                if (btmp == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_DATASIGN,PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-                        goto err;
-                        }
-                BIO_get_mem_ptr(btmp,&buf_mem);
-                ASN1_OCTET_STRING_set(os,
-                        (unsigned char *)buf_mem->data,buf_mem->length);
-                }
-        if (pp != NULL) Free(pp);
-        pp=NULL;
-
-        ret=1;
-err:
-        if (buf != NULL) BUF_MEM_free(buf);
-        return(ret);
-        }
-
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
-             PKCS7 *p7, PKCS7_SIGNER_INFO *si)
-        {
-        PKCS7_ISSUER_AND_SERIAL *ias;
-        int ret=0,i;
-        STACK_OF(X509) *cert;
-        X509 *x509;
-
-        if (PKCS7_type_is_signed(p7))
-                {
-                cert=p7->d.sign->cert;
-                }
-        else if (PKCS7_type_is_signedAndEnveloped(p7))
-                {
-                cert=p7->d.signed_and_enveloped->cert;
-                }
-        else
-                {
-                PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
-                goto err;
-                }
-        /* XXXXXXXXXXXXXXXXXXXXXXX */
-        ias=si->issuer_and_serial;
-
-        x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);
-
-        /* were we able to find the cert in passed to us */
-        if (x509 == NULL)
-                {
-                PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_CERTIFICATE);
-                goto err;
-                }
-
-        /* Lets verify */
-        X509_STORE_CTX_init(ctx,cert_store,x509,cert);
-        i=X509_verify_cert(ctx);
-        if (i <= 0) 
-                {
-                PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
-                goto err;
-                }
-        X509_STORE_CTX_cleanup(ctx);
-
-        return PKCS7_signatureVerify(bio, p7, si, x509);
-        err:
-        return ret;
-        }
-
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                                                                X509 *x509)
-        {
-        ASN1_OCTET_STRING *os;
-        EVP_MD_CTX mdc_tmp,*mdc;
-        unsigned char *pp,*p;
-        int ret=0,i;
-        int md_type;
-        STACK_OF(X509_ATTRIBUTE) *sk;
-        BIO *btmp;
-        EVP_PKEY *pkey;
-
-        if (!PKCS7_type_is_signed(p7) && 
-                                !PKCS7_type_is_signedAndEnveloped(p7)) {
-                PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                                PKCS7_R_WRONG_PKCS7_TYPE);
-                goto err;
-        }
-
-        md_type=OBJ_obj2nid(si->digest_alg->algorithm);
-
-        btmp=bio;
-        for (;;)
-                {
-                if ((btmp == NULL) ||
-                        ((btmp=BIO_find_type(btmp,BIO_TYPE_MD)) == NULL))
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                        PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
-                        goto err;
-                        }
-                BIO_get_md_ctx(btmp,&mdc);
-                if (mdc == NULL)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                                        PKCS7_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                if (EVP_MD_type(EVP_MD_CTX_type(mdc)) == md_type)
-                        break;
-                btmp=btmp->next_bio;    
-                }
-
-        /* mdc is the digest ctx that we want, unless there are attributes,
-         * in which case the digest is the signed attributes */
-        memcpy(&mdc_tmp,mdc,sizeof(mdc_tmp));
-
-        sk=si->auth_attr;
-        if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
-                {
-                unsigned char md_dat[EVP_MAX_MD_SIZE];
-                unsigned int md_len;
-                ASN1_OCTET_STRING *message_digest;
-
-                EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);
-                message_digest=PKCS7_digest_from_attributes(sk);
-                if (!message_digest)
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                        PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
-                        goto err;
-                        }
-                if ((message_digest->length != (int)md_len) ||
-                        (memcmp(message_digest->data,md_dat,md_len)))
-                        {
-#if 0
-{
-int ii;
-for (ii=0; ii<message_digest->length; ii++)
-        printf("%02X",message_digest->data[ii]); printf(" sent\n");
-for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
-}
-#endif
-                        PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                                        PKCS7_R_DIGEST_FAILURE);
-                        ret= -1;
-                        goto err;
-                        }
-
-                EVP_VerifyInit(&mdc_tmp,EVP_get_digestbynid(md_type));
-                /* Note: when forming the encoding of the attributes we
-                 * shouldn't reorder them or this will break the signature.
-                 * This is done by using the IS_SEQUENCE flag.
-                 */
-                i=i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,NULL,i2d_X509_ATTRIBUTE,
-                        V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE);
-                pp=Malloc(i);
-                p=pp;
-                i2d_ASN1_SET_OF_X509_ATTRIBUTE(sk,&p,i2d_X509_ATTRIBUTE,
-                        V_ASN1_SET,V_ASN1_UNIVERSAL, IS_SEQUENCE);
-                EVP_VerifyUpdate(&mdc_tmp,pp,i);
-
-                Free(pp);
-                }
-
-        os=si->enc_digest;
-        pkey = X509_get_pubkey(x509);
-        if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1();
-
-        i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
-        EVP_PKEY_free(pkey);
-        if (i <= 0)
-                {
-                PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY,
-                                                PKCS7_R_SIGNATURE_FAILURE);
-                ret= -1;
-                goto err;
-                }
-        else
-                ret=1;
-err:
-        return(ret);
-        }
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx)
-        {
-        STACK_OF(PKCS7_RECIP_INFO) *rsk;
-        PKCS7_RECIP_INFO *ri;
-        int i;
-
-        i=OBJ_obj2nid(p7->type);
-        if (i != NID_pkcs7_signedAndEnveloped) return(NULL);
-        rsk=p7->d.signed_and_enveloped->recipientinfo;
-        ri=sk_PKCS7_RECIP_INFO_value(rsk,0);
-        if (sk_PKCS7_RECIP_INFO_num(rsk) <= idx) return(NULL);
-        ri=sk_PKCS7_RECIP_INFO_value(rsk,idx);
-        return(ri->issuer_and_serial);
-        }
-
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid)
-        {
-        return(get_attribute(si->auth_attr,nid));
-        }
-
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid)
-        {
-        return(get_attribute(si->unauth_attr,nid));
-        }
-
-static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
-        {
-        int i;
-        X509_ATTRIBUTE *xa;
-        ASN1_OBJECT *o;
-
-        o=OBJ_nid2obj(nid);
-        if (!o || !sk) return(NULL);
-        for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
-                {
-                xa=sk_X509_ATTRIBUTE_value(sk,i);
-                if (OBJ_cmp(xa->object,o) == 0)
-                        {
-                        if (xa->set && sk_ASN1_TYPE_num(xa->value.set))
-                                return(sk_ASN1_TYPE_value(xa->value.set,0));
-                        else
-                                return(NULL);
-                        }
-                }
-        return(NULL);
-        }
-
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
-{
-        ASN1_TYPE *astype;
-        if(!(astype = get_attribute(sk, NID_pkcs9_messageDigest))) return NULL;
-        return astype->value.octet_string;
-}
-
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk)
-        {
-        int i;
-
-        if (p7si->auth_attr != NULL)
-                sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr,X509_ATTRIBUTE_free);
-        p7si->auth_attr=sk_X509_ATTRIBUTE_dup(sk);
-        for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
-                {
-                if ((sk_X509_ATTRIBUTE_set(p7si->auth_attr,i,
-                        X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
-                    == NULL)
-                        return(0);
-                }
-        return(1);
-        }
-
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si, STACK_OF(X509_ATTRIBUTE) *sk)
-        {
-        int i;
-
-        if (p7si->unauth_attr != NULL)
-                sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr,
-                                           X509_ATTRIBUTE_free);
-        p7si->unauth_attr=sk_X509_ATTRIBUTE_dup(sk);
-        for (i=0; i<sk_X509_ATTRIBUTE_num(sk); i++)
-                {
-                if ((sk_X509_ATTRIBUTE_set(p7si->unauth_attr,i,
-                        X509_ATTRIBUTE_dup(sk_X509_ATTRIBUTE_value(sk,i))))
-                    == NULL)
-                        return(0);
-                }
-        return(1);
-        }
-
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-             void *value)
-        {
-        return(add_attribute(&(p7si->auth_attr),nid,atrtype,value));
-        }
-
-int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-             void *value)
-        {
-        return(add_attribute(&(p7si->unauth_attr),nid,atrtype,value));
-        }
-
-static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
-                         void *value)
-        {
-        X509_ATTRIBUTE *attr=NULL;
-
-        if (*sk == NULL)
-                {
-                *sk = sk_X509_ATTRIBUTE_new(NULL);
-new_attrib:
-                attr=X509_ATTRIBUTE_create(nid,atrtype,value);
-                sk_X509_ATTRIBUTE_push(*sk,attr);
-                }
-        else
-                {
-                int i;
-
-                for (i=0; i<sk_X509_ATTRIBUTE_num(*sk); i++)
-                        {
-                        attr=sk_X509_ATTRIBUTE_value(*sk,i);
-                        if (OBJ_obj2nid(attr->object) == nid)
-                                {
-                                X509_ATTRIBUTE_free(attr);
-                                attr=X509_ATTRIBUTE_create(nid,atrtype,value);
-                                sk_X509_ATTRIBUTE_set(*sk,i,attr);
-                                goto end;
-                                }
-                        }
-                goto new_attrib;
-                }
-end:
-        return(1);
-        }
-
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
deleted file mode 100644
index 8b863d0558..0000000000
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* crypto/pkcs7/pk7_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 <openssl/objects.h>
-#include <openssl/x509.h>
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
-        {
-        int nid;
-        long ret;
-
-        nid=OBJ_obj2nid(p7->type);
-
-        switch (cmd)
-                {
-        case PKCS7_OP_SET_DETACHED_SIGNATURE:
-                if (nid == NID_pkcs7_signed)
-                        {
-                        ret=p7->detached=(int)larg;
-                        }
-                else
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
-                        ret=0;
-                        }
-                break;
-        case PKCS7_OP_GET_DETACHED_SIGNATURE:
-                if (nid == NID_pkcs7_signed)
-                        {
-                        ret=p7->detached;
-                        }
-                else
-                        {
-                        PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
-                        ret=0;
-                        }
-                        
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
-                ret=0;
-                }
-        return(ret);
-        }
-
-int PKCS7_content_new(PKCS7 *p7, int type)
-        {
-        PKCS7 *ret=NULL;
-
-        if ((ret=PKCS7_new()) == NULL) goto err;
-        if (!PKCS7_set_type(ret,type)) goto err;
-        if (!PKCS7_set_content(p7,ret)) goto err;
-
-        return(1);
-err:
-        if (ret != NULL) PKCS7_free(ret);
-        return(0);
-        }
-
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
-        {
-        int i;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                if (p7->d.sign->contents != NULL)
-                        PKCS7_content_free(p7->d.sign->contents);
-                p7->d.sign->contents=p7_data;
-                break;
-        case NID_pkcs7_digest:
-        case NID_pkcs7_data:
-        case NID_pkcs7_enveloped:
-        case NID_pkcs7_signedAndEnveloped:
-        case NID_pkcs7_encrypted:
-        default:
-                PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
-                goto err;
-                }
-        return(1);
-err:
-        return(0);
-        }
-
-int PKCS7_set_type(PKCS7 *p7, int type)
-        {
-        ASN1_OBJECT *obj;
-
-        PKCS7_content_free(p7);
-        obj=OBJ_nid2obj(type); /* will not fail */
-
-        switch (type)
-                {
-        case NID_pkcs7_signed:
-                p7->type=obj;
-                if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
-                        goto err;
-                ASN1_INTEGER_set(p7->d.sign->version,1);
-                break;
-        case NID_pkcs7_data:
-                p7->type=obj;
-                if ((p7->d.data=ASN1_OCTET_STRING_new()) == NULL)
-                        goto err;
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                p7->type=obj;
-                if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
-                        == NULL) goto err;
-                ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
-/*              p7->d.signed_and_enveloped->enc_data->content_type=
-                        OBJ_nid2obj(NID_pkcs7_encrypted);*/
-                        
-                break;
-        case NID_pkcs7_enveloped:
-                p7->type=obj;
-                if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
-                        == NULL) goto err;
-                ASN1_INTEGER_set(p7->d.enveloped->version,0);
-                break;
-        case NID_pkcs7_digest:
-        case NID_pkcs7_encrypted:
-        default:
-                PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
-                goto err;
-                }
-        return(1);
-err:
-        return(0);
-        }
-
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
-        {
-        int i,j,nid;
-        X509_ALGOR *alg;
-        STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
-        STACK_OF(X509_ALGOR) *md_sk;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                signer_sk=      p7->d.sign->signer_info;
-                md_sk=          p7->d.sign->md_algs;
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                signer_sk=      p7->d.signed_and_enveloped->signer_info;
-                md_sk=          p7->d.signed_and_enveloped->md_algs;
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
-                return(0);
-                }
-
-        nid=OBJ_obj2nid(psi->digest_alg->algorithm);
-
-        /* If the digest is not currently listed, add it */
-        j=0;
-        for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
-                {
-                alg=sk_X509_ALGOR_value(md_sk,i);
-                if (OBJ_obj2nid(alg->algorithm) == nid)
-                        {
-                        j=1;
-                        break;
-                        }
-                }
-        if (!j) /* we need to add another algorithm */
-                {
-                alg=X509_ALGOR_new();
-                alg->algorithm=OBJ_nid2obj(nid);
-                sk_X509_ALGOR_push(md_sk,alg);
-                }
-
-        sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
-        return(1);
-        }
-
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
-        {
-        int i;
-        STACK_OF(X509) **sk;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                sk= &(p7->d.sign->cert);
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                sk= &(p7->d.signed_and_enveloped->cert);
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
-                return(0);
-                }
-
-        if (*sk == NULL)
-                *sk=sk_X509_new_null();
-        CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
-        sk_X509_push(*sk,x509);
-        return(1);
-        }
-
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
-        {
-        int i;
-        STACK_OF(X509_CRL) **sk;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signed:
-                sk= &(p7->d.sign->crl);
-                break;
-        case NID_pkcs7_signedAndEnveloped:
-                sk= &(p7->d.signed_and_enveloped->crl);
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
-                return(0);
-                }
-
-        if (*sk == NULL)
-                *sk=sk_X509_CRL_new_null();
-
-        CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
-        sk_X509_CRL_push(*sk,crl);
-        return(1);
-        }
-
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-             EVP_MD *dgst)
-        {
-        /* We now need to add another PKCS7_SIGNER_INFO entry */
-        ASN1_INTEGER_set(p7i->version,1);
-        X509_NAME_set(&p7i->issuer_and_serial->issuer,
-                X509_get_issuer_name(x509));
-
-        /* because ASN1_INTEGER_set is used to set a 'long' we will do
-         * things the ugly way. */
-        ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
-        p7i->issuer_and_serial->serial=
-                ASN1_INTEGER_dup(X509_get_serialNumber(x509));
-
-        /* lets keep the pkey around for a while */
-        CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
-        p7i->pkey=pkey;
-
-        /* Set the algorithms */
-        if (pkey->type == EVP_PKEY_DSA)
-                p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
-        else    
-                p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
-
-        if (p7i->digest_alg->parameter != NULL)
-                ASN1_TYPE_free(p7i->digest_alg->parameter);
-        if ((p7i->digest_alg->parameter=ASN1_TYPE_new()) == NULL)
-                goto err;
-        p7i->digest_alg->parameter->type=V_ASN1_NULL;
-
-        p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_PKEY_type(pkey->type));
-
-        if (p7i->digest_enc_alg->parameter != NULL)
-                ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
-        if ((p7i->digest_enc_alg->parameter=ASN1_TYPE_new()) == NULL)
-                goto err;
-        p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
-
-        return(1);
-err:
-        return(0);
-        }
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
-             EVP_MD *dgst)
-        {
-        PKCS7_SIGNER_INFO *si;
-
-        if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
-        if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
-        if (!PKCS7_add_signer(p7,si)) goto err;
-        return(si);
-err:
-        return(NULL);
-        }
-
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
-        {
-        if (PKCS7_type_is_signed(p7))
-                {
-                return(p7->d.sign->signer_info);
-                }
-        else if (PKCS7_type_is_signedAndEnveloped(p7))
-                {
-                return(p7->d.signed_and_enveloped->signer_info);
-                }
-        else
-                return(NULL);
-        }
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
-        {
-        PKCS7_RECIP_INFO *ri;
-
-        if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
-        if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
-        if (!PKCS7_add_recipient_info(p7,ri)) goto err;
-        return(ri);
-err:
-        return(NULL);
-        }
-
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
-        {
-        int i;
-        STACK_OF(PKCS7_RECIP_INFO) *sk;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signedAndEnveloped:
-                sk=     p7->d.signed_and_enveloped->recipientinfo;
-                break;
-        case NID_pkcs7_enveloped:
-                sk=     p7->d.enveloped->recipientinfo;
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
-                return(0);
-                }
-
-        sk_PKCS7_RECIP_INFO_push(sk,ri);
-        return(1);
-        }
-
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
-        {
-        ASN1_INTEGER_set(p7i->version,0);
-        X509_NAME_set(&p7i->issuer_and_serial->issuer,
-                X509_get_issuer_name(x509));
-
-        ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
-        p7i->issuer_and_serial->serial=
-                ASN1_INTEGER_dup(X509_get_serialNumber(x509));
-
-        X509_ALGOR_free(p7i->key_enc_algor);
-        p7i->key_enc_algor=(X509_ALGOR *)ASN1_dup(i2d_X509_ALGOR,
-                (char *(*)())d2i_X509_ALGOR,
-                (char *)x509->cert_info->key->algor);
-
-        CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
-        p7i->cert=x509;
-
-        return(1);
-        }
-
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
-        {
-        if (PKCS7_type_is_signed(p7))
-                return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
-                        si->issuer_and_serial->issuer,
-                        si->issuer_and_serial->serial));
-        else
-                return(NULL);
-        }
-
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
-        {
-        int i;
-        PKCS7_ENC_CONTENT *ec;
-
-        i=OBJ_obj2nid(p7->type);
-        switch (i)
-                {
-        case NID_pkcs7_signedAndEnveloped:
-                ec=p7->d.signed_and_enveloped->enc_data;
-                break;
-        case NID_pkcs7_enveloped:
-                ec=p7->d.enveloped->enc_data;
-                break;
-        default:
-                PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
-                return(0);
-                }
-
-        /* Setup cipher OID */
-
-        ec->cipher = cipher;
-        return 1;
-        }
-
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
deleted file mode 100644
index c42bd6d391..0000000000
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/* crypto/pkcs7/pkcs7.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_PKCS7_H
-#define HEADER_PKCS7_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-
-#ifdef VMS
-#include <openssl/vms_idhacks.h>
-#endif
-
-#ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
-#undef PKCS7_ISSUER_AND_SERIAL
-#endif
-
-/*
-Encryption_ID           DES-CBC
-Digest_ID               MD5
-Digest_Encryption_ID    rsaEncryption
-Key_Encryption_ID       rsaEncryption
-*/
-
-typedef struct pkcs7_issuer_and_serial_st
-        {
-        X509_NAME *issuer;
-        ASN1_INTEGER *serial;
-        } PKCS7_ISSUER_AND_SERIAL;
-
-typedef struct pkcs7_signer_info_st
-        {
-        ASN1_INTEGER                    *version;       /* version 1 */
-        PKCS7_ISSUER_AND_SERIAL         *issuer_and_serial;
-        X509_ALGOR                      *digest_alg;
-        STACK_OF(X509_ATTRIBUTE)        *auth_attr;     /* [ 0 ] */
-        X509_ALGOR                      *digest_enc_alg;
-        ASN1_OCTET_STRING               *enc_digest;
-        STACK_OF(X509_ATTRIBUTE)        *unauth_attr;   /* [ 1 ] */
-
-        /* The private key to sign with */
-        EVP_PKEY                        *pkey;
-        } PKCS7_SIGNER_INFO;
-
-DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
-
-typedef struct pkcs7_recip_info_st
-        {
-        ASN1_INTEGER                    *version;       /* version 0 */
-        PKCS7_ISSUER_AND_SERIAL         *issuer_and_serial;
-        X509_ALGOR                      *key_enc_algor;
-        ASN1_OCTET_STRING               *enc_key;
-        X509                            *cert; /* get the pub-key from this */
-        } PKCS7_RECIP_INFO;
-
-DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
-
-typedef struct pkcs7_signed_st
-        {
-        ASN1_INTEGER                    *version;       /* version 1 */
-        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
-        STACK_OF(X509)                  *cert;          /* [ 0 ] */
-        STACK_OF(X509_CRL)              *crl;           /* [ 1 ] */
-        STACK_OF(PKCS7_SIGNER_INFO)     *signer_info;
-
-        struct pkcs7_st                 *contents;
-        } PKCS7_SIGNED;
-/* The above structure is very very similar to PKCS7_SIGN_ENVELOPE.
- * How about merging the two */
-
-typedef struct pkcs7_enc_content_st
-        {
-        ASN1_OBJECT                     *content_type;
-        X509_ALGOR                      *algorithm;
-        ASN1_OCTET_STRING               *enc_data;      /* [ 0 ] */
-        const EVP_CIPHER                *cipher;
-        } PKCS7_ENC_CONTENT;
-
-typedef struct pkcs7_enveloped_st
-        {
-        ASN1_INTEGER                    *version;       /* version 0 */
-        STACK_OF(PKCS7_RECIP_INFO)      *recipientinfo;
-        PKCS7_ENC_CONTENT               *enc_data;
-        } PKCS7_ENVELOPE;
-
-typedef struct pkcs7_signedandenveloped_st
-        {
-        ASN1_INTEGER                    *version;       /* version 1 */
-        STACK_OF(X509_ALGOR)            *md_algs;       /* md used */
-        STACK_OF(X509)                  *cert;          /* [ 0 ] */
-        STACK_OF(X509_CRL)              *crl;           /* [ 1 ] */
-        STACK_OF(PKCS7_SIGNER_INFO)     *signer_info;
-
-        PKCS7_ENC_CONTENT               *enc_data;
-        STACK_OF(PKCS7_RECIP_INFO)      *recipientinfo;
-        } PKCS7_SIGN_ENVELOPE;
-
-typedef struct pkcs7_digest_st
-        {
-        ASN1_INTEGER                    *version;       /* version 0 */
-        X509_ALGOR                      *md;            /* md used */
-        struct pkcs7_st                 *contents;
-        ASN1_OCTET_STRING               *digest;
-        } PKCS7_DIGEST;
-
-typedef struct pkcs7_encrypted_st
-        {
-        ASN1_INTEGER                    *version;       /* version 0 */
-        PKCS7_ENC_CONTENT               *enc_data;
-        } PKCS7_ENCRYPT;
-
-typedef struct pkcs7_st
-        {
-        /* The following is non NULL if it contains ASN1 encoding of
-         * this structure */
-        unsigned char *asn1;
-        long length;
-
-#define PKCS7_S_HEADER  0
-#define PKCS7_S_BODY    1
-#define PKCS7_S_TAIL    2
-        int state; /* used during processing */
-
-        int detached;
-
-        ASN1_OBJECT *type;
-        /* content as defined by the type */
-        /* all encryption/message digests are applied to the 'contents',
-         * leaving out the 'type' field. */
-        union   {
-                char *ptr;
-
-                /* NID_pkcs7_data */
-                ASN1_OCTET_STRING *data;
-
-                /* NID_pkcs7_signed */
-                PKCS7_SIGNED *sign;
-
-                /* NID_pkcs7_enveloped */
-                PKCS7_ENVELOPE *enveloped;
-
-                /* NID_pkcs7_signedAndEnveloped */
-                PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-
-                /* NID_pkcs7_digest */
-                PKCS7_DIGEST *digest;
-
-                /* NID_pkcs7_encrypted */
-                PKCS7_ENCRYPT *encrypted;
-                } d;
-        } PKCS7;
-
-#define PKCS7_OP_SET_DETACHED_SIGNATURE 1
-#define PKCS7_OP_GET_DETACHED_SIGNATURE 2
-
-#define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
-#define PKCS7_get_attributes(si)        ((si)->unauth_attr)
-
-#define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-#define PKCS7_type_is_signedAndEnveloped(a) \
-                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-#define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-
-#define PKCS7_set_detached(p,v) \
-                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-#define PKCS7_get_detached(p) \
-                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-#ifdef SSLEAY_MACROS
-#ifndef PKCS7_ISSUER_AND_SERIAL_digest
-#define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
-        ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
-                        (char *)data,md,len)
-#endif
-#endif
-
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void );
-void                    PKCS7_ISSUER_AND_SERIAL_free(
-                                PKCS7_ISSUER_AND_SERIAL *a);
-int                     i2d_PKCS7_ISSUER_AND_SERIAL(
-                                PKCS7_ISSUER_AND_SERIAL *a,unsigned char **pp);
-PKCS7_ISSUER_AND_SERIAL *d2i_PKCS7_ISSUER_AND_SERIAL(
-                                PKCS7_ISSUER_AND_SERIAL **a,
-                                unsigned char **pp, long length);
-
-#ifndef SSLEAY_MACROS
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,EVP_MD *type,
-        unsigned char *md,unsigned int *len);
-#ifndef NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp,PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp,PKCS7 *p7);
-#endif
-PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp,PKCS7 **p7);
-int i2d_PKCS7_bio(BIO *bp,PKCS7 *p7);
-#endif
-
-PKCS7_SIGNER_INFO       *PKCS7_SIGNER_INFO_new(void);
-void                    PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a);
-int                     i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a,
-                                unsigned char **pp);
-PKCS7_SIGNER_INFO       *d2i_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO **a,
-                                unsigned char **pp,long length);
-
-PKCS7_RECIP_INFO        *PKCS7_RECIP_INFO_new(void);
-void                    PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a);
-int                     i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a,
-                                unsigned char **pp);
-PKCS7_RECIP_INFO        *d2i_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO **a,
-                                unsigned char **pp,long length);
-
-PKCS7_SIGNED            *PKCS7_SIGNED_new(void);
-void                    PKCS7_SIGNED_free(PKCS7_SIGNED *a);
-int                     i2d_PKCS7_SIGNED(PKCS7_SIGNED *a,
-                                unsigned char **pp);
-PKCS7_SIGNED            *d2i_PKCS7_SIGNED(PKCS7_SIGNED **a,
-                                unsigned char **pp,long length);
-
-PKCS7_ENC_CONTENT       *PKCS7_ENC_CONTENT_new(void);
-void                    PKCS7_ENC_CONTENT_free(PKCS7_ENC_CONTENT *a);
-int                     i2d_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT *a,
-                                unsigned char **pp);
-PKCS7_ENC_CONTENT       *d2i_PKCS7_ENC_CONTENT(PKCS7_ENC_CONTENT **a,
-                                unsigned char **pp,long length);
-
-PKCS7_ENVELOPE          *PKCS7_ENVELOPE_new(void);
-void                    PKCS7_ENVELOPE_free(PKCS7_ENVELOPE *a);
-int                     i2d_PKCS7_ENVELOPE(PKCS7_ENVELOPE *a,
-                                unsigned char **pp);
-PKCS7_ENVELOPE          *d2i_PKCS7_ENVELOPE(PKCS7_ENVELOPE **a,
-                                unsigned char **pp,long length);
-
-PKCS7_SIGN_ENVELOPE     *PKCS7_SIGN_ENVELOPE_new(void);
-void                    PKCS7_SIGN_ENVELOPE_free(PKCS7_SIGN_ENVELOPE *a);
-int                     i2d_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE *a,
-                                unsigned char **pp);
-PKCS7_SIGN_ENVELOPE     *d2i_PKCS7_SIGN_ENVELOPE(PKCS7_SIGN_ENVELOPE **a,
-                                unsigned char **pp,long length);
-
-PKCS7_DIGEST            *PKCS7_DIGEST_new(void);
-void                    PKCS7_DIGEST_free(PKCS7_DIGEST *a);
-int                     i2d_PKCS7_DIGEST(PKCS7_DIGEST *a,
-                                unsigned char **pp);
-PKCS7_DIGEST            *d2i_PKCS7_DIGEST(PKCS7_DIGEST **a,
-                                unsigned char **pp,long length);
-
-PKCS7_ENCRYPT           *PKCS7_ENCRYPT_new(void);
-void                    PKCS7_ENCRYPT_free(PKCS7_ENCRYPT *a);
-int                     i2d_PKCS7_ENCRYPT(PKCS7_ENCRYPT *a,
-                                unsigned char **pp);
-PKCS7_ENCRYPT           *d2i_PKCS7_ENCRYPT(PKCS7_ENCRYPT **a,
-                                unsigned char **pp,long length);
-
-PKCS7                   *PKCS7_new(void);
-void                    PKCS7_free(PKCS7 *a);
-void                    PKCS7_content_free(PKCS7 *a);
-int                     i2d_PKCS7(PKCS7 *a,
-                                unsigned char **pp);
-PKCS7                   *d2i_PKCS7(PKCS7 **a,
-                                unsigned char **pp,long length);
-
-void ERR_load_PKCS7_strings(void);
-
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
-
-int PKCS7_set_type(PKCS7 *p7, int type);
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-        EVP_MD *dgst);
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-        BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si); 
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                                                                X509 *x509);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
-
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-        EVP_PKEY *pkey, EVP_MD *dgst);
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si,int nid,int type,
-        void *data);
-int PKCS7_add_attribute (PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-        void *value);
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,STACK_OF(X509_ATTRIBUTE) *sk);
-
-
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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_DATADECODE                         112
-#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
-#define PKCS7_F_PKCS7_SIGNATUREVERIFY                    113
-
-/* Reason codes. */
-#define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
-#define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH            100
-#define PKCS7_R_DIGEST_FAILURE                           101
-#define PKCS7_R_INTERNAL_ERROR                           102
-#define PKCS7_R_MISSING_CERIPEND_INFO                    103
-#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
-#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
-#define PKCS7_R_SIGNATURE_FAILURE                        105
-#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
-#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
-#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
-#define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
-#define PKCS7_R_UNKNOWN_OPERATION                        110
-#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
-#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
-#define PKCS7_R_WRONG_CONTENT_TYPE                       113
-#define PKCS7_R_WRONG_PKCS7_TYPE                         114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c
deleted file mode 100644
index 82be3c2ca1..0000000000
--- a/src/lib/libcrypto/pkcs7/pkcs7err.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* crypto/pkcs7/pkcs7err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/pkcs7.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA PKCS7_str_functs[]=
-        {
-{ERR_PACK(0,PKCS7_F_PKCS7_ADD_CERTIFICATE,0),   "PKCS7_add_certificate"},
-{ERR_PACK(0,PKCS7_F_PKCS7_ADD_CRL,0),   "PKCS7_add_crl"},
-{ERR_PACK(0,PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,0),        "PKCS7_add_recipient_info"},
-{ERR_PACK(0,PKCS7_F_PKCS7_ADD_SIGNER,0),        "PKCS7_add_signer"},
-{ERR_PACK(0,PKCS7_F_PKCS7_CTRL,0),      "PKCS7_ctrl"},
-{ERR_PACK(0,PKCS7_F_PKCS7_DATADECODE,0),        "PKCS7_dataDecode"},
-{ERR_PACK(0,PKCS7_F_PKCS7_DATAINIT,0),  "PKCS7_dataInit"},
-{ERR_PACK(0,PKCS7_F_PKCS7_DATASIGN,0),  "PKCS7_DATASIGN"},
-{ERR_PACK(0,PKCS7_F_PKCS7_DATAVERIFY,0),        "PKCS7_dataVerify"},
-{ERR_PACK(0,PKCS7_F_PKCS7_SET_CIPHER,0),        "PKCS7_set_cipher"},
-{ERR_PACK(0,PKCS7_F_PKCS7_SET_CONTENT,0),       "PKCS7_set_content"},
-{ERR_PACK(0,PKCS7_F_PKCS7_SET_TYPE,0),  "PKCS7_set_type"},
-{ERR_PACK(0,PKCS7_F_PKCS7_SIGNATUREVERIFY,0),   "PKCS7_signatureVerify"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA PKCS7_str_reasons[]=
-        {
-{PKCS7_R_CIPHER_NOT_INITIALIZED          ,"cipher not initialized"},
-{PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH   ,"decrypted key is wrong length"},
-{PKCS7_R_DIGEST_FAILURE                  ,"digest failure"},
-{PKCS7_R_INTERNAL_ERROR                  ,"internal error"},
-{PKCS7_R_MISSING_CERIPEND_INFO           ,"missing ceripend info"},
-{PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE,"no recipient matches certificate"},
-{PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE,"operation not supported on this type"},
-{PKCS7_R_SIGNATURE_FAILURE               ,"signature failure"},
-{PKCS7_R_UNABLE_TO_FIND_CERTIFICATE      ,"unable to find certificate"},
-{PKCS7_R_UNABLE_TO_FIND_MEM_BIO          ,"unable to find mem bio"},
-{PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST   ,"unable to find message digest"},
-{PKCS7_R_UNKNOWN_DIGEST_TYPE             ,"unknown digest type"},
-{PKCS7_R_UNKNOWN_OPERATION               ,"unknown operation"},
-{PKCS7_R_UNSUPPORTED_CIPHER_TYPE         ,"unsupported cipher type"},
-{PKCS7_R_UNSUPPORTED_CONTENT_TYPE        ,"unsupported content type"},
-{PKCS7_R_WRONG_CONTENT_TYPE              ,"wrong content type"},
-{PKCS7_R_WRONG_PKCS7_TYPE                ,"wrong pkcs7 type"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_PKCS7_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_functs);
-                ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h
deleted file mode 100644
index fd8ee38366..0000000000
--- a/src/lib/libcrypto/rand/rand.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* crypto/rand/rand.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_RAND_H
-#define HEADER_RAND_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rand_meth_st
-        {
-        void (*seed)(const void *buf, int num);
-        void (*bytes)(unsigned char *buf, int num);
-        void (*cleanup)(void);
-        } RAND_METHOD;
-
-void RAND_set_rand_method(RAND_METHOD *meth);
-RAND_METHOD *RAND_get_rand_method(void );
-RAND_METHOD *RAND_SSLeay(void);
-void RAND_cleanup(void );
-void RAND_bytes(unsigned char *buf,int num);
-void RAND_seed(const void *buf,int num);
-int  RAND_load_file(const char *file,long max_bytes);
-int  RAND_write_file(const char *file);
-char *RAND_file_name(char *file,int num);
-#ifdef WINDOWS
-void RAND_screen(void);
-#endif
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c
deleted file mode 100644
index 34c6d5b968..0000000000
--- a/src/lib/libcrypto/rand/rand_lib.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/rand/rand_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 <sys/types.h>
-#include <time.h>
-#include <openssl/rand.h>
-
-#ifdef NO_RAND
-static RAND_METHOD *rand_meth=NULL;
-#else
-extern RAND_METHOD rand_ssleay_meth;
-static RAND_METHOD *rand_meth= &rand_ssleay_meth;
-#endif
-
-void RAND_set_rand_method(RAND_METHOD *meth)
-        {
-        rand_meth=meth;
-        }
-
-RAND_METHOD *RAND_get_rand_method(void)
-        {
-        return(rand_meth);
-        }
-
-void RAND_cleanup(void)
-        {
-        if (rand_meth != NULL)
-                rand_meth->cleanup();
-        }
-
-void RAND_seed(const void *buf, int num)
-        {
-        if (rand_meth != NULL)
-                rand_meth->seed(buf,num);
-        }
-
-void RAND_bytes(unsigned char *buf, int num)
-        {
-        if (rand_meth != NULL)
-                rand_meth->bytes(buf,num);
-        }
-
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
deleted file mode 100644
index 6829d4ec37..0000000000
--- a/src/lib/libcrypto/rand/randfile.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* crypto/rand/randfile.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 <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "openssl/e_os.h"
-
-#include <openssl/rand.h>
-
-#undef BUFSIZE
-#define BUFSIZE 1024
-#define RAND_DATA 1024
-
-/* #define RFILE ".rand" - defined in ../../e_os.h */
-
-int RAND_load_file(const char *file, long bytes)
-        {
-        MS_STATIC unsigned char buf[BUFSIZE];
-        struct stat sb;
-        int i,ret=0,n;
-        FILE *in;
-
-        if (file == NULL) return(0);
-
-        i=stat(file,&sb);
-        /* If the state fails, put some crap in anyway */
-        RAND_seed(&sb,sizeof(sb));
-        ret+=sizeof(sb);
-        if (i < 0) return(0);
-        if (bytes <= 0) return(ret);
-
-        in=fopen(file,"rb");
-        if (in == NULL) goto err;
-        for (;;)
-                {
-                n=(bytes < BUFSIZE)?(int)bytes:BUFSIZE;
-                i=fread(buf,1,n,in);
-                if (i <= 0) break;
-                /* even if n != i, use the full array */
-                RAND_seed(buf,n);
-                ret+=i;
-                bytes-=n;
-                if (bytes <= 0) break;
-                }
-        fclose(in);
-        memset(buf,0,BUFSIZE);
-err:
-        return(ret);
-        }
-
-int RAND_write_file(const char *file)
-        {
-        unsigned char buf[BUFSIZE];
-        int i,ret=0;
-        FILE *out;
-        int n;
-
-        /* Under VMS, fopen(file, "wb") will craete a new version of the
-           same file.  This is not good, so let's try updating an existing
-           one, and create file only if it doesn't already exist.  This
-           should be completely harmless on system that have no file
-           versions.                                    -- Richard Levitte */
-        out=fopen(file,"rb+");
-        if (out == NULL && errno == ENOENT)
-                {
-                errno = 0;
-                out=fopen(file,"wb");
-                }
-        if (out == NULL) goto err;
-        chmod(file,0600);
-        n=RAND_DATA;
-        for (;;)
-                {
-                i=(n > BUFSIZE)?BUFSIZE:n;
-                n-=BUFSIZE;
-                RAND_bytes(buf,i);
-                i=fwrite(buf,1,i,out);
-                if (i <= 0)
-                        {
-                        ret=0;
-                        break;
-                        }
-                ret+=i;
-                if (n <= 0) break;
-                }
-        fclose(out);
-        memset(buf,0,BUFSIZE);
-err:
-        return(ret);
-        }
-
-char *RAND_file_name(char *buf, int size)
-        {
-        char *s;
-        char *ret=NULL;
-
-        s=getenv("RANDFILE");
-        if (s != NULL)
-                {
-                strncpy(buf,s,size-1);
-                buf[size-1]='\0';
-                ret=buf;
-                }
-        else
-                {
-                s=getenv("HOME");
-                if (s == NULL) return(RFILE);
-                if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
-                        return(RFILE);
-                strcpy(buf,s);
-#ifndef VMS
-                strcat(buf,"/");
-#endif
-                strcat(buf,RFILE);
-                ret=buf;
-                }
-        return(ret);
-        }
diff --git a/src/lib/libcrypto/rc2/rc2.h b/src/lib/libcrypto/rc2/rc2.h
deleted file mode 100644
index 9571efb755..0000000000
--- a/src/lib/libcrypto/rc2/rc2.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/rc2/rc2.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC2_H
-#define HEADER_RC2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_RC2
-#error RC2 is disabled.
-#endif
-
-#define RC2_ENCRYPT     1
-#define RC2_DECRYPT     0
-
-#include <openssl/opensslconf.h> /* RC2_INT */
-#define RC2_BLOCK       8
-#define RC2_KEY_LENGTH  16
-
-typedef struct rc2_key_st
-        {
-        RC2_INT data[64];
-        } RC2_KEY;
-
- 
-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);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/rc2/rc2_cbc.c b/src/lib/libcrypto/rc2/rc2_cbc.c
deleted file mode 100644
index 1202184e85..0000000000
--- a/src/lib/libcrypto/rc2/rc2_cbc.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* crypto/rc2/rc2_cbc.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 <openssl/rc2.h>
-#include "rc2_locl.h"
-
-void RC2_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-             RC2_KEY *ks, unsigned char *iv, int encrypt)
-        {
-        register unsigned long tin0,tin1;
-        register unsigned long tout0,tout1,xor0,xor1;
-        register long l=length;
-        unsigned long tin[2];
-
-        if (encrypt)
-                {
-                c2l(iv,tout0);
-                c2l(iv,tout1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0);
-                        c2l(in,tin1);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        RC2_encrypt(tin,ks);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
-                if (l != -8)
-                        {
-                        c2ln(in,tin0,tin1,l+8);
-                        tin0^=tout0;
-                        tin1^=tout1;
-                        tin[0]=tin0;
-                        tin[1]=tin1;
-                        RC2_encrypt(tin,ks);
-                        tout0=tin[0]; l2c(tout0,out);
-                        tout1=tin[1]; l2c(tout1,out);
-                        }
-                l2c(tout0,iv);
-                l2c(tout1,iv);
-                }
-        else
-                {
-                c2l(iv,xor0);
-                c2l(iv,xor1);
-                iv-=8;
-                for (l-=8; l>=0; l-=8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        RC2_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2c(tout0,out);
-                        l2c(tout1,out);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                if (l != -8)
-                        {
-                        c2l(in,tin0); tin[0]=tin0;
-                        c2l(in,tin1); tin[1]=tin1;
-                        RC2_decrypt(tin,ks);
-                        tout0=tin[0]^xor0;
-                        tout1=tin[1]^xor1;
-                        l2cn(tout0,tout1,out,l+8);
-                        xor0=tin0;
-                        xor1=tin1;
-                        }
-                l2c(xor0,iv);
-                l2c(xor1,iv);
-                }
-        tin0=tin1=tout0=tout1=xor0=xor1=0;
-        tin[0]=tin[1]=0;
-        }
-
-void RC2_encrypt(unsigned long *d, RC2_KEY *key)
-        {
-        int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
-        unsigned long l;
-
-        l=d[0];
-        x0=(RC2_INT)l&0xffff;
-        x1=(RC2_INT)(l>>16L);
-        l=d[1];
-        x2=(RC2_INT)l&0xffff;
-        x3=(RC2_INT)(l>>16L);
-
-        n=3;
-        i=5;
-
-        p0=p1= &(key->data[0]);
-        for (;;)
-                {
-                t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff;
-                x0=(t<<1)|(t>>15);
-                t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff;
-                x1=(t<<2)|(t>>14);
-                t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff;
-                x2=(t<<3)|(t>>13);
-                t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff;
-                x3=(t<<5)|(t>>11);
-
-                if (--i == 0)
-                        {
-                        if (--n == 0) break;
-                        i=(n == 2)?6:5;
-
-                        x0+=p1[x3&0x3f];
-                        x1+=p1[x0&0x3f];
-                        x2+=p1[x1&0x3f];
-                        x3+=p1[x2&0x3f];
-                        }
-                }
-
-        d[0]=(unsigned long)(x0&0xffff)|((unsigned long)(x1&0xffff)<<16L);
-        d[1]=(unsigned long)(x2&0xffff)|((unsigned long)(x3&0xffff)<<16L);
-        }
-
-void RC2_decrypt(unsigned long *d, RC2_KEY *key)
-        {
-        int i,n;
-        register RC2_INT *p0,*p1;
-        register RC2_INT x0,x1,x2,x3,t;
-        unsigned long l;
-
-        l=d[0];
-        x0=(RC2_INT)l&0xffff;
-        x1=(RC2_INT)(l>>16L);
-        l=d[1];
-        x2=(RC2_INT)l&0xffff;
-        x3=(RC2_INT)(l>>16L);
-
-        n=3;
-        i=5;
-
-        p0= &(key->data[63]);
-        p1= &(key->data[0]);
-        for (;;)
-                {
-                t=((x3<<11)|(x3>>5))&0xffff;
-                x3=(t-(x0& ~x2)-(x1&x2)- *(p0--))&0xffff;
-                t=((x2<<13)|(x2>>3))&0xffff;
-                x2=(t-(x3& ~x1)-(x0&x1)- *(p0--))&0xffff;
-                t=((x1<<14)|(x1>>2))&0xffff;
-                x1=(t-(x2& ~x0)-(x3&x0)- *(p0--))&0xffff;
-                t=((x0<<15)|(x0>>1))&0xffff;
-                x0=(t-(x1& ~x3)-(x2&x3)- *(p0--))&0xffff;
-
-                if (--i == 0)
-                        {
-                        if (--n == 0) break;
-                        i=(n == 2)?6:5;
-
-                        x3=(x3-p1[x2&0x3f])&0xffff;
-                        x2=(x2-p1[x1&0x3f])&0xffff;
-                        x1=(x1-p1[x0&0x3f])&0xffff;
-                        x0=(x0-p1[x3&0x3f])&0xffff;
-                        }
-                }
-
-        d[0]=(unsigned long)(x0&0xffff)|((unsigned long)(x1&0xffff)<<16L);
-        d[1]=(unsigned long)(x2&0xffff)|((unsigned long)(x3&0xffff)<<16L);
-        }
-
diff --git a/src/lib/libcrypto/rc2/rc2_ecb.c b/src/lib/libcrypto/rc2/rc2_ecb.c
deleted file mode 100644
index 7d77b9186c..0000000000
--- a/src/lib/libcrypto/rc2/rc2_ecb.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/rc2/rc2_ecb.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 <openssl/rc2.h>
-#include "rc2_locl.h"
-#include <openssl/opensslv.h>
-
-const char *RC2_version="RC2" OPENSSL_VERSION_PTEXT;
-
-/* RC2 as implemented frm a posting from
- * Newsgroups: sci.crypt
- * Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann)
- * Subject: Specification for Ron Rivests Cipher No.2
- * Message-ID: <4fk39f$f70@net.auckland.ac.nz>
- * Date: 11 Feb 1996 06:45:03 GMT
- */
-
-void RC2_ecb_encrypt(unsigned char *in, unsigned char *out, RC2_KEY *ks,
-             int encrypt)
-        {
-        unsigned long l,d[2];
-
-        c2l(in,l); d[0]=l;
-        c2l(in,l); d[1]=l;
-        if (encrypt)
-                RC2_encrypt(d,ks);
-        else
-                RC2_decrypt(d,ks);
-        l=d[0]; l2c(l,out);
-        l=d[1]; l2c(l,out);
-        l=d[0]=d[1]=0;
-        }
-
diff --git a/src/lib/libcrypto/rc2/rc2_locl.h b/src/lib/libcrypto/rc2/rc2_locl.h
deleted file mode 100644
index 565cd17619..0000000000
--- a/src/lib/libcrypto/rc2/rc2_locl.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* crypto/rc2/rc2_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#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))
-
-#define C_RC2(n) \
-        t=(x0+(x1& ~x3)+(x2&x3)+ *(p0++))&0xffff; \
-        x0=(t<<1)|(t>>15); \
-        t=(x1+(x2& ~x0)+(x3&x0)+ *(p0++))&0xffff; \
-        x1=(t<<2)|(t>>14); \
-        t=(x2+(x3& ~x1)+(x0&x1)+ *(p0++))&0xffff; \
-        x2=(t<<3)|(t>>13); \
-        t=(x3+(x0& ~x2)+(x1&x2)+ *(p0++))&0xffff; \
-        x3=(t<<5)|(t>>11);
-
diff --git a/src/lib/libcrypto/rc2/rc2_skey.c b/src/lib/libcrypto/rc2/rc2_skey.c
deleted file mode 100644
index 7143c4e591..0000000000
--- a/src/lib/libcrypto/rc2/rc2_skey.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* crypto/rc2/rc2_skey.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 <openssl/rc2.h>
-#include "rc2_locl.h"
-
-static unsigned char key_table[256]={
-        0xd9,0x78,0xf9,0xc4,0x19,0xdd,0xb5,0xed,0x28,0xe9,0xfd,0x79,
-        0x4a,0xa0,0xd8,0x9d,0xc6,0x7e,0x37,0x83,0x2b,0x76,0x53,0x8e,
-        0x62,0x4c,0x64,0x88,0x44,0x8b,0xfb,0xa2,0x17,0x9a,0x59,0xf5,
-        0x87,0xb3,0x4f,0x13,0x61,0x45,0x6d,0x8d,0x09,0x81,0x7d,0x32,
-        0xbd,0x8f,0x40,0xeb,0x86,0xb7,0x7b,0x0b,0xf0,0x95,0x21,0x22,
-        0x5c,0x6b,0x4e,0x82,0x54,0xd6,0x65,0x93,0xce,0x60,0xb2,0x1c,
-        0x73,0x56,0xc0,0x14,0xa7,0x8c,0xf1,0xdc,0x12,0x75,0xca,0x1f,
-        0x3b,0xbe,0xe4,0xd1,0x42,0x3d,0xd4,0x30,0xa3,0x3c,0xb6,0x26,
-        0x6f,0xbf,0x0e,0xda,0x46,0x69,0x07,0x57,0x27,0xf2,0x1d,0x9b,
-        0xbc,0x94,0x43,0x03,0xf8,0x11,0xc7,0xf6,0x90,0xef,0x3e,0xe7,
-        0x06,0xc3,0xd5,0x2f,0xc8,0x66,0x1e,0xd7,0x08,0xe8,0xea,0xde,
-        0x80,0x52,0xee,0xf7,0x84,0xaa,0x72,0xac,0x35,0x4d,0x6a,0x2a,
-        0x96,0x1a,0xd2,0x71,0x5a,0x15,0x49,0x74,0x4b,0x9f,0xd0,0x5e,
-        0x04,0x18,0xa4,0xec,0xc2,0xe0,0x41,0x6e,0x0f,0x51,0xcb,0xcc,
-        0x24,0x91,0xaf,0x50,0xa1,0xf4,0x70,0x39,0x99,0x7c,0x3a,0x85,
-        0x23,0xb8,0xb4,0x7a,0xfc,0x02,0x36,0x5b,0x25,0x55,0x97,0x31,
-        0x2d,0x5d,0xfa,0x98,0xe3,0x8a,0x92,0xae,0x05,0xdf,0x29,0x10,
-        0x67,0x6c,0xba,0xc9,0xd3,0x00,0xe6,0xcf,0xe1,0x9e,0xa8,0x2c,
-        0x63,0x16,0x01,0x3f,0x58,0xe2,0x89,0xa9,0x0d,0x38,0x34,0x1b,
-        0xab,0x33,0xff,0xb0,0xbb,0x48,0x0c,0x5f,0xb9,0xb1,0xcd,0x2e,
-        0xc5,0xf3,0xdb,0x47,0xe5,0xa5,0x9c,0x77,0x0a,0xa6,0x20,0x68,
-        0xfe,0x7f,0xc1,0xad,
-        };
-
-/* It has come to my attention that there are 2 versions of the RC2
- * key schedule.  One which is normal, and anther which has a hook to
- * use a reduced key length.
- * BSAFE uses the 'retarded' version.  What I previously shipped is
- * the same as specifying 1024 for the 'bits' parameter.  Bsafe uses
- * a version where the bits parameter is the same as len*8 */
-void RC2_set_key(RC2_KEY *key, int len, unsigned char *data, int bits)
-        {
-        int i,j;
-        unsigned char *k;
-        RC2_INT *ki;
-        unsigned int c,d;
-
-        k= (unsigned char *)&(key->data[0]);
-        *k=0; /* for if there is a zero length key */
-
-        if (len > 128) len=128;
-        if (bits <= 0) bits=1024;
-        if (bits > 1024) bits=1024;
-
-        for (i=0; i<len; i++)
-                k[i]=data[i];
-
-        /* expand table */
-        d=k[len-1];
-        j=0;
-        for (i=len; i < 128; i++,j++)
-                {
-                d=key_table[(k[j]+d)&0xff];
-                k[i]=d;
-                }
-
-        /* hmm.... key reduction to 'bits' bits */
-
-        j=(bits+7)>>3;
-        i=128-j;
-        c= (0xff>>(-bits & 0x07));
-
-        d=key_table[k[i]&c];
-        k[i]=d;
-        while (i--)
-                {
-                d=key_table[k[i+j]^d];
-                k[i]=d;
-                }
-
-        /* copy from bytes into RC2_INT's */
-        ki= &(key->data[63]);
-        for (i=127; i>=0; i-=2)
-                *(ki--)=((k[i]<<8)|k[i-1])&0xffff;
-        }
-
diff --git a/src/lib/libcrypto/rc2/rc2cfb64.c b/src/lib/libcrypto/rc2/rc2cfb64.c
deleted file mode 100644
index 5e3fa07d90..0000000000
--- a/src/lib/libcrypto/rc2/rc2cfb64.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* crypto/rc2/rc2cfb64.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 <openssl/rc2.h>
-#include "rc2_locl.h"
-
-/* The input and output encrypted as though 64bit cfb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-
-void RC2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             RC2_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
-        {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        unsigned long ti[2];
-        unsigned char *iv,c,cc;
-
-        iv=(unsigned char *)ivec;
-        if (encrypt)
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0); ti[0]=v0;
-                                c2l(iv,v1); ti[1]=v1;
-                                RC2_encrypt((unsigned long *)ti,schedule);
-                                iv=(unsigned char *)ivec;
-                                t=ti[0]; l2c(t,iv);
-                                t=ti[1]; l2c(t,iv);
-                                iv=(unsigned char *)ivec;
-                                }
-                        c= *(in++)^iv[n];
-                        *(out++)=c;
-                        iv[n]=c;
-                        n=(n+1)&0x07;
-                        }
-                }
-        else
-                {
-                while (l--)
-                        {
-                        if (n == 0)
-                                {
-                                c2l(iv,v0); ti[0]=v0;
-                                c2l(iv,v1); ti[1]=v1;
-                                RC2_encrypt((unsigned long *)ti,schedule);
-                                iv=(unsigned char *)ivec;
-                                t=ti[0]; l2c(t,iv);
-                                t=ti[1]; l2c(t,iv);
-                                iv=(unsigned char *)ivec;
-                                }
-                        cc= *(in++);
-                        c=iv[n];
-                        iv[n]=cc;
-                        *(out++)=c^cc;
-                        n=(n+1)&0x07;
-                        }
-                }
-        v0=v1=ti[0]=ti[1]=t=c=cc=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/rc2/rc2ofb64.c b/src/lib/libcrypto/rc2/rc2ofb64.c
deleted file mode 100644
index 42cdd40cdd..0000000000
--- a/src/lib/libcrypto/rc2/rc2ofb64.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/rc2/rc2ofb64.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 <openssl/rc2.h>
-#include "rc2_locl.h"
-
-/* The input and output encrypted as though 64bit ofb mode is being
- * used.  The extra state information to record how much of the
- * 64bit block we have used is contained in *num;
- */
-void RC2_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             RC2_KEY *schedule, unsigned char *ivec, int *num)
-        {
-        register unsigned long v0,v1,t;
-        register int n= *num;
-        register long l=length;
-        unsigned char d[8];
-        register char *dp;
-        unsigned long ti[2];
-        unsigned char *iv;
-        int save=0;
-
-        iv=(unsigned char *)ivec;
-        c2l(iv,v0);
-        c2l(iv,v1);
-        ti[0]=v0;
-        ti[1]=v1;
-        dp=(char *)d;
-        l2c(v0,dp);
-        l2c(v1,dp);
-        while (l--)
-                {
-                if (n == 0)
-                        {
-                        RC2_encrypt((unsigned long *)ti,schedule);
-                        dp=(char *)d;
-                        t=ti[0]; l2c(t,dp);
-                        t=ti[1]; l2c(t,dp);
-                        save++;
-                        }
-                *(out++)= *(in++)^d[n];
-                n=(n+1)&0x07;
-                }
-        if (save)
-                {
-                v0=ti[0];
-                v1=ti[1];
-                iv=(unsigned char *)ivec;
-                l2c(v0,iv);
-                l2c(v1,iv);
-                }
-        t=v0=v1=ti[0]=ti[1]=0;
-        *num=n;
-        }
-
diff --git a/src/lib/libcrypto/rc2/rrc2.doc b/src/lib/libcrypto/rc2/rrc2.doc
deleted file mode 100644
index f93ee003d2..0000000000
--- a/src/lib/libcrypto/rc2/rrc2.doc
+++ /dev/null
@@ -1,219 +0,0 @@
->From cygnus.mincom.oz.au!minbne.mincom.oz.au!bunyip.cc.uq.oz.au!munnari.OZ.AU!comp.vuw.ac.nz!waikato!auckland.ac.nz!news Mon Feb 12 18:48:17 EST 1996
-Article 23601 of sci.crypt:
-Path: cygnus.mincom.oz.au!minbne.mincom.oz.au!bunyip.cc.uq.oz.au!munnari.OZ.AU!comp.vuw.ac.nz!waikato!auckland.ac.nz!news
->From: pgut01@cs.auckland.ac.nz (Peter Gutmann)
-Newsgroups: sci.crypt
-Subject: Specification for Ron Rivests Cipher No.2
-Date: 11 Feb 1996 06:45:03 GMT
-Organization: University of Auckland
-Lines: 203
-Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann)
-Message-ID: <4fk39f$f70@net.auckland.ac.nz>
-NNTP-Posting-Host: cs26.cs.auckland.ac.nz
-X-Newsreader: NN version 6.5.0 #3 (NOV)
-
-
-
-
-                           Ron Rivest's Cipher No.2
-                           ------------------------
- 
-Ron Rivest's Cipher No.2 (hereafter referred to as RRC.2, other people may
-refer to it by other names) is word oriented, operating on a block of 64 bits
-divided into four 16-bit words, with a key table of 64 words.  All data units
-are little-endian.  This functional description of the algorithm is based in
-the paper "The RC5 Encryption Algorithm" (RC5 is a trademark of RSADSI), using
-the same general layout, terminology, and pseudocode style.
- 
- 
-Notation and RRC.2 Primitive Operations
- 
-RRC.2 uses the following primitive operations:
- 
-1. Two's-complement addition of words, denoted by "+".  The inverse operation,
-   subtraction, is denoted by "-".
-2. Bitwise exclusive OR, denoted by "^".
-3. Bitwise AND, denoted by "&".
-4. Bitwise NOT, denoted by "~".
-5. A left-rotation of words; the rotation of word x left by y is denoted
-   x <<< y.  The inverse operation, right-rotation, is denoted x >>> y.
- 
-These operations are directly and efficiently supported by most processors.
- 
- 
-The RRC.2 Algorithm
- 
-RRC.2 consists of three components, a *key expansion* algorithm, an
-*encryption* algorithm, and a *decryption* algorithm.
- 
- 
-Key Expansion
- 
-The purpose of the key-expansion routine is to expand the user's key K to fill
-the expanded key array S, so S resembles an array of random binary words
-determined by the user's secret key K.
- 
-Initialising the S-box
- 
-RRC.2 uses a single 256-byte S-box derived from the ciphertext contents of
-Beale Cipher No.1 XOR'd with a one-time pad.  The Beale Ciphers predate modern
-cryptography by enough time that there should be no concerns about trapdoors
-hidden in the data.  They have been published widely, and the S-box can be
-easily recreated from the one-time pad values and the Beale Cipher data taken
-from a standard source.  To initialise the S-box:
- 
-  for i = 0 to 255 do
-    sBox[ i ] = ( beale[ i ] mod 256 ) ^ pad[ i ]
- 
-The contents of Beale Cipher No.1 and the necessary one-time pad are given as
-an appendix at the end of this document.  For efficiency, implementors may wish
-to skip the Beale Cipher expansion and store the sBox table directly.
- 
-Expanding the Secret Key to 128 Bytes
- 
-The secret key is first expanded to fill 128 bytes (64 words).  The expansion
-consists of taking the sum of the first and last bytes in the user key, looking
-up the sum (modulo 256) in the S-box, and appending the result to the key.  The
-operation is repeated with the second byte and new last byte of the key until
-all 128 bytes have been generated.  Note that the following pseudocode treats
-the S array as an array of 128 bytes rather than 64 words.
- 
-  for j = 0 to length-1 do
-    S[ j ] = K[ j ]
-  for j = length to 127 do
-    s[ j ] = sBox[ ( S[ j-length ] + S[ j-1 ] ) mod 256 ];
- 
-At this point it is possible to perform a truncation of the effective key
-length to ease the creation of espionage-enabled software products.  However
-since the author cannot conceive why anyone would want to do this, it will not
-be considered further.
- 
-The final phase of the key expansion involves replacing the first byte of S
-with the entry selected from the S-box:
- 
-  S[ 0 ] = sBox[ S[ 0 ] ]
- 
- 
-Encryption
- 
-The cipher has 16 full rounds, each divided into 4 subrounds.  Two of the full
-rounds perform an additional transformation on the data.  Note that the
-following pseudocode treats the S array as an array of 64 words rather than 128
-bytes.
- 
-  for i = 0 to 15 do
-    j = i * 4;
-    word0 = ( word0 + ( word1 & ~word3 ) + ( word2 & word3 ) + S[ j+0 ] ) <<< 1
-    word1 = ( word1 + ( word2 & ~word0 ) + ( word3 & word0 ) + S[ j+1 ] ) <<< 2
-    word2 = ( word2 + ( word3 & ~word1 ) + ( word0 & word1 ) + S[ j+2 ] ) <<< 3
-    word3 = ( word3 + ( word0 & ~word2 ) + ( word1 & word2 ) + S[ j+3 ] ) <<< 5
- 
-In addition the fifth and eleventh rounds add the contents of the S-box indexed
-by one of the data words to another of the data words following the four
-subrounds as follows:
- 
-    word0 = word0 + S[ word3 & 63 ];
-    word1 = word1 + S[ word0 & 63 ];
-    word2 = word2 + S[ word1 & 63 ];
-    word3 = word3 + S[ word2 & 63 ];
- 
- 
-Decryption
- 
-The decryption operation is simply the inverse of the encryption operation.
-Note that the following pseudocode treats the S array as an array of 64 words
-rather than 128 bytes.
- 
-  for i = 15 downto 0 do
-    j = i * 4;
-    word3 = ( word3 >>> 5 ) - ( word0 & ~word2 ) - ( word1 & word2 ) - S[ j+3 ]
-    word2 = ( word2 >>> 3 ) - ( word3 & ~word1 ) - ( word0 & word1 ) - S[ j+2 ]
-    word1 = ( word1 >>> 2 ) - ( word2 & ~word0 ) - ( word3 & word0 ) - S[ j+1 ]
-    word0 = ( word0 >>> 1 ) - ( word1 & ~word3 ) - ( word2 & word3 ) - S[ j+0 ]
- 
-In addition the fifth and eleventh rounds subtract the contents of the S-box
-indexed by one of the data words from another one of the data words following
-the four subrounds as follows:
- 
-    word3 = word3 - S[ word2 & 63 ]
-    word2 = word2 - S[ word1 & 63 ]
-    word1 = word1 - S[ word0 & 63 ]
-    word0 = word0 - S[ word3 & 63 ]
- 
- 
-Test Vectors
- 
-The following test vectors may be used to test the correctness of an RRC.2
-implementation:
- 
-  Key:      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  Plain:    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  Cipher:   0x1C, 0x19, 0x8A, 0x83, 0x8D, 0xF0, 0x28, 0xB7
- 
-  Key:      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
-  Plain:    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  Cipher:   0x21, 0x82, 0x9C, 0x78, 0xA9, 0xF9, 0xC0, 0x74
- 
-  Key:      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  Plain:    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-  Cipher:   0x13, 0xDB, 0x35, 0x17, 0xD3, 0x21, 0x86, 0x9E
- 
-  Key:      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-            0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
-  Plain:    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  Cipher:   0x50, 0xDC, 0x01, 0x62, 0xBD, 0x75, 0x7F, 0x31
- 
- 
-Appendix: Beale Cipher No.1, "The Locality of the Vault", and One-time Pad for
-          Creating the S-Box
- 
-Beale Cipher No.1.
- 
-  71, 194,  38,1701,  89,  76,  11,  83,1629,  48,  94,  63, 132,  16, 111,  95,
-  84, 341, 975,  14,  40,  64,  27,  81, 139, 213,  63,  90,1120,   8,  15,   3,
- 126,2018,  40,  74, 758, 485, 604, 230, 436, 664, 582, 150, 251, 284, 308, 231,
- 124, 211, 486, 225, 401, 370,  11, 101, 305, 139, 189,  17,  33,  88, 208, 193,
- 145,   1,  94,  73, 416, 918, 263,  28, 500, 538, 356, 117, 136, 219,  27, 176,
- 130,  10, 460,  25, 485,  18, 436,  65,  84, 200, 283, 118, 320, 138,  36, 416,
- 280,  15,  71, 224, 961,  44,  16, 401,  39,  88,  61, 304,  12,  21,  24, 283,
- 134,  92,  63, 246, 486, 682,   7, 219, 184, 360, 780,  18,  64, 463, 474, 131,
- 160,  79,  73, 440,  95,  18,  64, 581,  34,  69, 128, 367, 460,  17,  81,  12,
- 103, 820,  62, 110,  97, 103, 862,  70,  60,1317, 471, 540, 208, 121, 890, 346,
-  36, 150,  59, 568, 614,  13, 120,  63, 219, 812,2160,1780,  99,  35,  18,  21,
- 136, 872,  15,  28, 170,  88,   4,  30,  44, 112,  18, 147, 436, 195, 320,  37,
- 122, 113,   6, 140,   8, 120, 305,  42,  58, 461,  44, 106, 301,  13, 408, 680,
-  93,  86, 116, 530,  82, 568,   9, 102,  38, 416,  89,  71, 216, 728, 965, 818,
-   2,  38, 121, 195,  14, 326, 148, 234,  18,  55, 131, 234, 361, 824,   5,  81,
- 623,  48, 961,  19,  26,  33,  10,1101, 365,  92,  88, 181, 275, 346, 201, 206
- 
-One-time Pad.
- 
- 158, 186, 223,  97,  64, 145, 190, 190, 117, 217, 163,  70, 206, 176, 183, 194,
- 146,  43, 248, 141,   3,  54,  72, 223, 233, 153,  91, 210,  36, 131, 244, 161,
- 105, 120, 113, 191, 113,  86,  19, 245, 213, 221,  43,  27, 242, 157,  73, 213,
- 193,  92, 166,  10,  23, 197, 112, 110, 193,  30, 156,  51, 125,  51, 158,  67,
- 197, 215,  59, 218, 110, 246, 181,   0, 135,  76, 164,  97,  47,  87, 234, 108,
- 144, 127,   6,   6, 222, 172,  80, 144,  22, 245, 207,  70, 227, 182, 146, 134,
- 119, 176,  73,  58, 135,  69,  23, 198,   0, 170,  32, 171, 176, 129,  91,  24,
- 126,  77, 248,   0, 118,  69,  57,  60, 190, 171, 217,  61, 136, 169, 196,  84,
- 168, 167, 163, 102, 223,  64, 174, 178, 166, 239, 242, 195, 249,  92,  59,  38,
- 241,  46, 236,  31,  59, 114,  23,  50, 119, 186,   7,  66, 212,  97, 222, 182,
- 230, 118, 122,  86, 105,  92, 179, 243, 255, 189, 223, 164, 194, 215,  98,  44,
-  17,  20,  53, 153, 137, 224, 176, 100, 208, 114,  36, 200, 145, 150, 215,  20,
-  87,  44, 252,  20, 235, 242, 163, 132,  63,  18,   5, 122,  74,  97,  34,  97,
- 142,  86, 146, 221, 179, 166, 161,  74,  69, 182,  88, 120, 128,  58,  76, 155,
-  15,  30,  77, 216, 165, 117, 107,  90, 169, 127, 143, 181, 208, 137, 200, 127,
- 170, 195,  26,  84, 255, 132, 150,  58, 103, 250, 120, 221, 237,  37,   8,  99
- 
- 
-Implementation
- 
-A non-US based programmer who has never seen any encryption code before will
-shortly be implementing RRC.2 based solely on this specification and not on
-knowledge of any other encryption algorithms.  Stand by.
-
-
-
diff --git a/src/lib/libcrypto/rc2/version b/src/lib/libcrypto/rc2/version
deleted file mode 100644
index 6f89d595f1..0000000000
--- a/src/lib/libcrypto/rc2/version
+++ /dev/null
@@ -1,22 +0,0 @@
-1.1 23/08/96 - eay
-        Changed RC2_set_key() so it now takes another argument.  Many
-        thanks to Peter Gutmann <pgut01@cs.auckland.ac.nz> for the
-        clarification and origional specification of RC2.  BSAFE uses
-        this last parameter, 'bits'.  It the key is 128 bits, BSAFE
-        also sets this parameter to 128.  The old behaviour can be
-        duplicated by setting this parameter to 1024.
-
-1.0 08/04/96 - eay
-        First version of SSLeay with rc2.  This has been written from the spec
-        posted sci.crypt.  It is in this directory under rrc2.doc
-        I have no test values for any mode other than ecb, my wrappers for the
-        other modes should be ok since they are basically the same as
-        the ones taken from idea and des :-).  I have implemented them as
-        little-endian operators.
-        While rc2 is included because it is used with SSL, I don't know how
-        far I trust it.  It is about the same speed as IDEA and DES.
-        So if you are paranoid, used Tripple DES, else IDEA.  If RC2
-        does get used more, perhaps more people will look for weaknesses in
-        it.
-        
-
diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
deleted file mode 100644
index 7ef889e5a1..0000000000
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/local/bin/perl
-
-# define for pentium pro friendly version
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],"rc4-586.pl");
-
-$tx="eax";
-$ty="ebx";
-$x="ecx";
-$y="edx";
-$in="esi";
-$out="edi";
-$d="ebp";
-
-&RC4("RC4");
-
-&asm_finish();
-
-sub RC4_loop
-        {
-        local($n,$p,$char)=@_;
-
-        &comment("Round $n");
-
-        if ($char)
-                {
-                if ($p >= 0)
-                        {
-                         &mov($ty,      &swtmp(2));
-                        &cmp($ty,       $in);
-                         &jle(&label("finished"));
-                        &inc($in);
-                        }
-                else
-                        {
-                        &add($ty,       8);
-                         &inc($in);
-                        &cmp($ty,       $in);
-                         &jl(&label("finished"));
-                        &mov(&swtmp(2), $ty);
-                        }
-                }
-        # Moved out
-        # &mov( $tx,            &DWP(0,$d,$x,4)) if $p < 0;
-
-         &add(  $y,             $tx);
-        &and(   $y,             0xff);
-         &inc(  $x);                    # NEXT ROUND 
-        &mov(   $ty,            &DWP(0,$d,$y,4));
-         # XXX
-        &mov(   &DWP(-4,$d,$x,4),$ty);                  # AGI
-         &add(  $ty,            $tx);
-        &and(   $x,             0xff);  # NEXT ROUND
-         &and(  $ty,            0xff);
-        &mov(   &DWP(0,$d,$y,4),$tx);
-         &nop();
-        &mov(   $ty,            &DWP(0,$d,$ty,4));
-         &mov(  $tx,            &DWP(0,$d,$x,4)) if $p < 1; # NEXT ROUND
-         # XXX
-
-        if (!$char)
-                {
-                #moved up into last round
-                if ($p >= 1)
-                        {
-                        &add(   $out,   8)
-                        }
-                &movb(  &BP($n,"esp","",0),     &LB($ty));
-                }
-        else
-                {
-                # Note in+=8 has occured
-                &movb(  &HB($ty),       &BP(-1,$in,"",0));
-                 # XXX
-                &xorb(&LB($ty),         &HB($ty));
-                 # XXX
-                &movb(&BP($n,$out,"",0),&LB($ty));
-                }
-        }
-
-
-sub RC4
-        {
-        local($name)=@_;
-
-        &function_begin_B($name,"");
-
-        &comment("");
-
-        &push("ebp");
-         &push("ebx");
-        &mov(   $d,     &wparam(0));    # key
-         &mov(  $ty,    &wparam(1));    # num
-        &push("esi");
-         &push("edi");
-
-        &mov(   $x,     &DWP(0,$d,"",1));
-         &mov(  $y,     &DWP(4,$d,"",1));
-
-        &mov(   $in,    &wparam(2));
-         &inc(  $x);
-
-        &stack_push(3); # 3 temp variables
-         &add(  $d,     8);
-        &and(   $x,             0xff);
-
-         &lea(  $ty,    &DWP(-8,$ty,$in));
-
-        # check for 0 length input
-
-        &mov(   $out,   &wparam(3));
-         &mov(  &swtmp(2),      $ty);   # this is now address to exit at
-        &mov(   $tx,    &DWP(0,$d,$x,4));
-
-         &cmp(  $ty,    $in);
-        &jl(    &label("end")); # less than 8 bytes
-
-        &set_label("start");
-
-        # filling DELAY SLOT
-        &add(   $in,    8);
-
-        &RC4_loop(0,-1,0);
-        &RC4_loop(1,0,0);
-        &RC4_loop(2,0,0);
-        &RC4_loop(3,0,0);
-        &RC4_loop(4,0,0);
-        &RC4_loop(5,0,0);
-        &RC4_loop(6,0,0);
-        &RC4_loop(7,1,0);
-        
-        &comment("apply the cipher text");
-        # xor the cipher data with input
-
-        #&add(  $out,   8); #moved up into last round
-
-        &mov(   $tx,    &swtmp(0));
-         &mov(  $ty,    &DWP(-8,$in,"",0));
-        &xor(   $tx,    $ty);
-         &mov(  $ty,    &DWP(-4,$in,"",0)); 
-        &mov(   &DWP(-8,$out,"",0),     $tx);
-         &mov(  $tx,    &swtmp(1));
-        &xor(   $tx,    $ty);
-         &mov(  $ty,    &swtmp(2));     # load end ptr;
-        &mov(   &DWP(-4,$out,"",0),     $tx);
-         &mov(  $tx,            &DWP(0,$d,$x,4));
-        &cmp($in,       $ty);
-         &jle(&label("start"));
-
-        &set_label("end");
-
-        # There is quite a bit of extra crap in RC4_loop() for this
-        # first round
-        &RC4_loop(0,-1,1);
-        &RC4_loop(1,0,1);
-        &RC4_loop(2,0,1);
-        &RC4_loop(3,0,1);
-        &RC4_loop(4,0,1);
-        &RC4_loop(5,0,1);
-        &RC4_loop(6,1,1);
-
-        &set_label("finished");
-        &dec(   $x);
-         &stack_pop(3);
-        &mov(   &DWP(-4,$d,"",0),$y);
-         &movb( &BP(-8,$d,"",0),&LB($x));
-
-        &function_end($name);
-        }
-
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h
deleted file mode 100644
index 7418c2a9a2..0000000000
--- a/src/lib/libcrypto/rc4/rc4.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/rc4/rc4.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC4_H
-#define HEADER_RC4_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_RC4
-#error RC4 is disabled.
-#endif
-
-#include <openssl/opensslconf.h> /* RC4_INT */
-
-typedef struct rc4_key_st
-        {
-        RC4_INT x,y;
-        RC4_INT data[256];
-        } RC4_KEY;
-
- 
-const 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);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/rc4/rc4_enc.c b/src/lib/libcrypto/rc4/rc4_enc.c
deleted file mode 100644
index 3256bea8cc..0000000000
--- a/src/lib/libcrypto/rc4/rc4_enc.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* crypto/rc4/rc4_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 <openssl/rc4.h>
-#include "rc4_locl.h"
-
-/* RC4 as implemented from a posting from
- * Newsgroups: sci.crypt
- * From: sterndark@netcom.com (David Sterndark)
- * Subject: RC4 Algorithm revealed.
- * Message-ID: <sternCvKL4B.Hyy@netcom.com>
- * Date: Wed, 14 Sep 1994 06:35:31 GMT
- */
-
-void RC4(RC4_KEY *key, unsigned long len, unsigned char *indata,
-             unsigned char *outdata)
-        {
-        register RC4_INT *d;
-        register RC4_INT x,y,tx,ty;
-        int i;
-        
-        x=key->x;     
-        y=key->y;     
-        d=key->data; 
-
-#define LOOP(in,out) \
-                x=((x+1)&0xff); \
-                tx=d[x]; \
-                y=(tx+y)&0xff; \
-                d[x]=ty=d[y]; \
-                d[y]=tx; \
-                (out) = d[(tx+ty)&0xff]^ (in);
-
-#ifndef RC4_INDEX
-#define RC4_LOOP(a,b,i) LOOP(*((a)++),*((b)++))
-#else
-#define RC4_LOOP(a,b,i) LOOP(a[i],b[i])
-#endif
-
-        i=(int)(len>>3L);
-        if (i)
-                {
-                for (;;)
-                        {
-                        RC4_LOOP(indata,outdata,0);
-                        RC4_LOOP(indata,outdata,1);
-                        RC4_LOOP(indata,outdata,2);
-                        RC4_LOOP(indata,outdata,3);
-                        RC4_LOOP(indata,outdata,4);
-                        RC4_LOOP(indata,outdata,5);
-                        RC4_LOOP(indata,outdata,6);
-                        RC4_LOOP(indata,outdata,7);
-#ifdef RC4_INDEX
-                        indata+=8;
-                        outdata+=8;
-#endif
-                        if (--i == 0) break;
-                        }
-                }
-        i=(int)len&0x07;
-        if (i)
-                {
-                for (;;)
-                        {
-                        RC4_LOOP(indata,outdata,0); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,1); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,2); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,3); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,4); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,5); if (--i == 0) break;
-                        RC4_LOOP(indata,outdata,6); if (--i == 0) break;
-                        }
-                }               
-        key->x=x;     
-        key->y=y;
-        }
diff --git a/src/lib/libcrypto/rc4/rc4_locl.h b/src/lib/libcrypto/rc4/rc4_locl.h
deleted file mode 100644
index 3bb80b6ce9..0000000000
--- a/src/lib/libcrypto/rc4/rc4_locl.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef HEADER_RC4_LOCL_H
-#define HEADER_RC4_LOCL_H
-#include <openssl/opensslconf.h>
-#endif
diff --git a/src/lib/libcrypto/rc4/rc4_skey.c b/src/lib/libcrypto/rc4/rc4_skey.c
deleted file mode 100644
index c67a445f1f..0000000000
--- a/src/lib/libcrypto/rc4/rc4_skey.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* crypto/rc4/rc4_skey.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 <openssl/rc4.h>
-#include "rc4_locl.h"
-#include <openssl/opensslv.h>
-
-const char *RC4_version="RC4" OPENSSL_VERSION_PTEXT;
-
-const char *RC4_options(void)
-        {
-#ifdef RC4_INDEX
-        if (sizeof(RC4_INT) == 1)
-                return("rc4(idx,char)");
-        else
-                return("rc4(idx,int)");
-#else
-        if (sizeof(RC4_INT) == 1)
-                return("rc4(ptr,char)");
-        else
-                return("rc4(ptr,int)");
-#endif
-        }
-
-/* RC4 as implemented from a posting from
- * Newsgroups: sci.crypt
- * From: sterndark@netcom.com (David Sterndark)
- * Subject: RC4 Algorithm revealed.
- * Message-ID: <sternCvKL4B.Hyy@netcom.com>
- * Date: Wed, 14 Sep 1994 06:35:31 GMT
- */
-
-void RC4_set_key(RC4_KEY *key, int len, register unsigned char *data)
-        {
-        register RC4_INT tmp;
-        register int id1,id2;
-        register RC4_INT *d;
-        unsigned int i;
-        
-        d= &(key->data[0]);
-        for (i=0; i<256; i++)
-                d[i]=i;
-        key->x = 0;     
-        key->y = 0;     
-        id1=id2=0;     
-
-#define SK_LOOP(n) { \
-                tmp=d[(n)]; \
-                id2 = (data[id1] + tmp + id2) & 0xff; \
-                if (++id1 == len) id1=0; \
-                d[(n)]=d[id2]; \
-                d[id2]=tmp; }
-
-        for (i=0; i < 256; i+=4)
-                {
-                SK_LOOP(i+0);
-                SK_LOOP(i+1);
-                SK_LOOP(i+2);
-                SK_LOOP(i+3);
-                }
-        }
-    
diff --git a/src/lib/libcrypto/ripemd/README b/src/lib/libcrypto/ripemd/README
deleted file mode 100644
index 7097707264..0000000000
--- a/src/lib/libcrypto/ripemd/README
+++ /dev/null
@@ -1,15 +0,0 @@
-RIPEMD-160
-http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
-
-This is my implementation of RIPEMD-160.  The pentium assember is a little
-off the pace since I only get 1050 cycles, while the best is 1013.
-I have a few ideas for how to get another 20 or so cycles, but at
-this point I will not bother right now.  I belive the trick will be
-to remove my 'copy X array onto stack' until inside the RIP1() finctions the
-first time round.  To do this I need another register and will only have one
-temporary one.  A bit tricky....  I can also cleanup the saving of the 5 words
-after the first half of the calculation.  I should read the origional
-value, add then write.  Currently I just save the new and read the origioal.
-I then read both at the end.  Bad.
-
-eric (20-Jan-1998)
diff --git a/src/lib/libcrypto/ripemd/asm/rmd-586.pl b/src/lib/libcrypto/ripemd/asm/rmd-586.pl
deleted file mode 100644
index e53c5fadba..0000000000
--- a/src/lib/libcrypto/ripemd/asm/rmd-586.pl
+++ /dev/null
@@ -1,582 +0,0 @@
-#!/usr/local/bin/perl
-
-# Normal is the
-# ripemd160_block_x86(MD5_CTX *c, ULONG *X);
-# version, non-normal is the
-# ripemd160_block_x86(MD5_CTX *c, ULONG *X,int blocks);
-
-$normal=0;
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-$A="eax";
-$B="ebx";
-$C="ecx";
-$D="edx";
-$E="ebp";
-$tmp1="esi";
-$tmp2="edi";
-
-$KL1=0x5A827999;
-$KL2=0x6ED9EBA1;
-$KL3=0x8F1BBCDC;
-$KL4=0xA953FD4E;
-$KR0=0x50A28BE6;
-$KR1=0x5C4DD124; 
-$KR2=0x6D703EF3;
-$KR3=0x7A6D76E9;
-
-
-@wl=(    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
-         7, 4,13, 1,10, 6,15, 3,12, 0, 9, 5, 2,14,11, 8,
-         3,10,14, 4, 9,15, 8, 1, 2, 7, 0, 6,13,11, 5,12,
-         1, 9,11,10, 0, 8,12, 4,13, 3, 7,15,14, 5, 6, 2,
-         4, 0, 5, 9, 7,12, 2,10,14, 1, 3, 8,11, 6,15,13,
-         );
-
-@wr=(    5,14, 7, 0, 9, 2,11, 4,13, 6,15, 8, 1,10, 3,12,
-         6,11, 3, 7, 0,13, 5,10,14,15, 8,12, 4, 9, 1, 2,
-        15, 5, 1, 3, 7,14, 6, 9,11, 8,12, 2,10, 0, 4,13,
-         8, 6, 4, 1, 3,11,15, 0, 5,12, 2,13, 9, 7,10,14,
-        12,15,10, 4, 1, 5, 8, 7, 6, 2,13,14, 0, 3, 9,11,
-        );
-
-@sl=(   11,14,15,12, 5, 8, 7, 9,11,13,14,15, 6, 7, 9, 8,
-         7, 6, 8,13,11, 9, 7,15, 7,12,15, 9,11, 7,13,12,
-        11,13, 6, 7,14, 9,13,15,14, 8,13, 6, 5,12, 7, 5,
-        11,12,14,15,14,15, 9, 8, 9,14, 5, 6, 8, 6, 5,12,
-         9,15, 5,11, 6, 8,13,12, 5,12,13,14,11, 8, 5, 6,
-         );
-
-@sr=(    8, 9, 9,11,13,15,15, 5, 7, 7, 8,11,14,14,12, 6,
-         9,13,15, 7,12, 8, 9,11, 7, 7,12, 7, 6,15,13,11,
-         9, 7,15,11, 8, 6, 6,14,12,13, 5,14,13,13, 7, 5,
-        15, 5, 8,11,14,14, 6,14, 6, 9,12, 9,12, 5,15, 8,
-         8, 5,12, 9,12, 5,14, 6, 8,13, 6, 5,15,13,11,11,
-        );
-
-&ripemd160_block("ripemd160_block_x86");
-&asm_finish();
-
-sub Xv
-        {
-        local($n)=@_;
-        return(&swtmp($n+1));
-        # tmp on stack
-        }
-
-sub Np
-        {
-        local($p)=@_;
-        local(%n)=($A,$E,$B,$A,$C,$B,$D,$C,$E,$D);
-        return($n{$p});
-        }
-
-sub RIP1
-        {
-        local($a,$b,$c,$d,$e,$pos,$s,$o,$pos2)=@_;
-
-        &comment($p++);
-        if ($p & 1)
-                {
-         &mov($tmp1,    $c) if $o == -1;
-        &xor($tmp1,     $d) if $o == -1;
-         &mov($tmp2,    &Xv($pos));
-        &xor($tmp1,     $b);
-         &add($a,       $tmp2);
-        &rotl($c,       10);
-        &add($a,        $tmp1);
-         &mov($tmp1,    &Np($c));       # NEXT
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        else
-                {
-         &xor($tmp1,    $d);
-        &mov($tmp2,     &Xv($pos));
-         &xor($tmp1,    $b);
-        &add($a,        $tmp1);
-         &mov($tmp1,    &Np($c)) if $o <= 0;
-         &mov($tmp1,    -1) if $o == 1;
-         # XXX if $o == 2;
-        &rotl($c,       10);
-        &add($a,        $tmp2);
-         &xor($tmp1,    &Np($d)) if $o <= 0;
-         &mov($tmp2,    &Xv($pos2)) if $o == 1;
-         &mov($tmp2,    &wparam(0)) if $o == 2;
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        }
-
-sub RIP2
-        {
-        local($a,$b,$c,$d,$e,$pos,$pos2,$s,$K,$o)=@_;
-
-# XXXXXX
-        &comment($p++);
-        if ($p & 1)
-                {
-#        &mov($tmp2,    &Xv($pos)) if $o < -1;
-#       &mov($tmp1,     -1) if $o < -1;
-
-         &add($a,       $tmp2);
-        &mov($tmp2,     $c);
-         &sub($tmp1,    $b);
-        &and($tmp2,     $b);
-         &and($tmp1,    $d);
-        &or($tmp2,      $tmp1);
-         &mov($tmp1,    &Xv($pos2)) if $o <= 0; # XXXXXXXXXXXXXX
-         # XXX
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2,1));
-         &mov($tmp2,    -1) if $o <= 0;
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        else
-                {
-         # XXX
-         &add($a,       $tmp1);
-        &mov($tmp1,     $c);
-         &sub($tmp2,    $b);
-        &and($tmp1,     $b);
-         &and($tmp2,    $d);
-        if ($o != 2)
-                {
-        &or($tmp1,      $tmp2);
-         &mov($tmp2,    &Xv($pos2)) if $o <= 0;
-         &mov($tmp2,    -1) if $o == 1;
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp1,1));
-         &mov($tmp1,    -1) if $o <= 0;
-         &sub($tmp2,    &Np($c)) if $o == 1;
-                } else {
-        &or($tmp2,      $tmp1);
-         &mov($tmp1,    &Np($c));
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2,1));
-         &xor($tmp1,    &Np($d));
-                }
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        }
-
-sub RIP3
-        {
-        local($a,$b,$c,$d,$e,$pos,$s,$K,$o,$pos2)=@_;
-
-        &comment($p++);
-        if ($p & 1)
-                {
-#        &mov($tmp2,    -1) if $o < -1;
-#       &sub($tmp2,     $c) if $o < -1;
-         &mov($tmp1,    &Xv($pos));
-        &or($tmp2,      $b);
-         &add($a,       $tmp1);
-        &xor($tmp2,     $d);
-         &mov($tmp1,    -1) if $o <= 0;         # NEXT
-         # XXX
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2,1));
-         &sub($tmp1,    &Np($c)) if $o <= 0;    # NEXT
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        else
-                {
-         &mov($tmp2,    &Xv($pos));
-        &or($tmp1,      $b);
-         &add($a,       $tmp2);
-        &xor($tmp1,     $d);
-         &mov($tmp2,    -1) if $o <= 0;         # NEXT
-         &mov($tmp2,    -1) if $o == 1;
-         &mov($tmp2,    &Xv($pos2)) if $o == 2;
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp1,1));
-         &sub($tmp2,    &Np($c)) if $o <= 0;    # NEXT
-         &mov($tmp1,    &Np($d)) if $o == 1;
-         &mov($tmp1,    -1) if $o == 2;
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        }
-
-sub RIP4
-        {
-        local($a,$b,$c,$d,$e,$pos,$s,$K,$o)=@_;
-
-        &comment($p++);
-        if ($p & 1)
-                {
-#        &mov($tmp2,    -1) if $o == -2;
-#       &mov($tmp1,     $d) if $o == -2;
-         &sub($tmp2,    $d);
-        &and($tmp1,     $b);
-         &and($tmp2,    $c);
-        &or($tmp2,      $tmp1);
-         &mov($tmp1,    &Xv($pos));
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2));
-         &mov($tmp2,    -1) unless $o > 0;      # NEXT
-         # XXX
-        &add($a,        $tmp1);
-         &mov($tmp1,    &Np($d)) unless $o > 0; # NEXT
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        else
-                {
-         &sub($tmp2,    $d);
-        &and($tmp1,     $b);
-         &and($tmp2,    $c);
-        &or($tmp2,      $tmp1);
-         &mov($tmp1,    &Xv($pos));
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2));
-         &mov($tmp2,    -1) if $o == 0; # NEXT
-         &mov($tmp2,    -1) if $o == 1;
-         &mov($tmp2,    -1) if $o == 2;
-         # XXX
-        &add($a,        $tmp1);
-         &mov($tmp1,    &Np($d)) if $o == 0;    # NEXT
-         &sub($tmp2,    &Np($d)) if $o == 1;
-         &sub($tmp2,    &Np($c)) if $o == 2;
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        }
-
-sub RIP5
-        {
-        local($a,$b,$c,$d,$e,$pos,$s,$K,$o)=@_;
-
-        &comment($p++);
-        if ($p & 1)
-                {
-         &mov($tmp2,    -1) if $o == -2;
-        &sub($tmp2,     $d) if $o == -2;
-         &mov($tmp1,    &Xv($pos));
-        &or($tmp2,      $c);
-         &add($a,       $tmp1);
-        &xor($tmp2,     $b);
-         &mov($tmp1,    -1) if $o <= 0;
-         # XXX
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp2,1));
-         &sub($tmp1,    &Np($d)) if $o <= 0;
-         # XXX
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        else
-                {
-         &mov($tmp2,    &Xv($pos));
-        &or($tmp1,      $c);
-         &add($a,       $tmp2);
-        &xor($tmp1,     $b);
-         &mov($tmp2,    -1) if $o <= 0;
-         &mov($tmp2,    &wparam(0)) if $o == 1; # Middle code
-         &mov($tmp2,    -1) if $o == 2;
-        &rotl($c,       10);
-        &lea($a,        &DWP($K,$a,$tmp1,1));
-         &sub($tmp2,    &Np($d)) if $o <= 0;
-         &mov(&swtmp(1+16),     $A) if $o == 1;
-         &mov($tmp1,    &Np($d)) if $o == 2;
-        &rotl($a,       $s);
-        &add($a,        $e);
-                }
-        }
-
-sub ripemd160_block
-        {
-        local($name)=@_;
-
-        &function_begin_B($name,"",3);
-
-        # parameter 1 is the RIPEMD160_CTX structure.
-        # A     0
-        # B     4
-        # C     8
-        # D     12
-        # E     16
-
-        &push("esi");
-         &mov($C,       &wparam(2));
-        &push("edi");
-         &mov($tmp1,    &wparam(1)); # edi
-        &push("ebp");
-         &add($C,       $tmp1); # offset we end at
-        &push("ebx");
-         &sub($C,       64);
-        &stack_push(16+5+1);
-         # XXX
-
-        &mov(&swtmp(0), $C);
-         &mov($tmp2,    &wparam(0)); # Done at end of loop
-
-        &set_label("start") unless $normal;
-        &comment("");
-
-        # &mov($tmp1,   &wparam(1)); # Done at end of loop
-        # &mov($tmp2,   &wparam(0)); # Done at end of loop
-
-        for ($z=0; $z<16; $z+=2)
-                {
-                &mov($A,                &DWP( $z*4,$tmp1,"",0));
-                 &mov($B,               &DWP( ($z+1)*4,$tmp1,"",0));
-                &mov(&swtmp(1+$z),      $A);
-                 &mov(&swtmp(1+$z+1),   $B);
-                }
-        &add($tmp1,     64);
-         &mov($A,       &DWP( 0,$tmp2,"",0));
-        &mov(&wparam(1),$tmp1);
-         &mov($B,       &DWP( 4,$tmp2,"",0));
-        &mov($C,        &DWP( 8,$tmp2,"",0));
-         &mov($D,       &DWP(12,$tmp2,"",0));
-        &mov($E,        &DWP(16,$tmp2,"",0));
-
-        &RIP1($A,$B,$C,$D,$E,$wl[ 0],$sl[ 0],-1);
-        &RIP1($E,$A,$B,$C,$D,$wl[ 1],$sl[ 1],0);
-        &RIP1($D,$E,$A,$B,$C,$wl[ 2],$sl[ 2],0);
-        &RIP1($C,$D,$E,$A,$B,$wl[ 3],$sl[ 3],0);
-        &RIP1($B,$C,$D,$E,$A,$wl[ 4],$sl[ 4],0);
-        &RIP1($A,$B,$C,$D,$E,$wl[ 5],$sl[ 5],0);
-        &RIP1($E,$A,$B,$C,$D,$wl[ 6],$sl[ 6],0);
-        &RIP1($D,$E,$A,$B,$C,$wl[ 7],$sl[ 7],0);
-        &RIP1($C,$D,$E,$A,$B,$wl[ 8],$sl[ 8],0);
-        &RIP1($B,$C,$D,$E,$A,$wl[ 9],$sl[ 9],0);
-        &RIP1($A,$B,$C,$D,$E,$wl[10],$sl[10],0);
-        &RIP1($E,$A,$B,$C,$D,$wl[11],$sl[11],0);
-        &RIP1($D,$E,$A,$B,$C,$wl[12],$sl[12],0);
-        &RIP1($C,$D,$E,$A,$B,$wl[13],$sl[13],0);
-        &RIP1($B,$C,$D,$E,$A,$wl[14],$sl[14],0);
-        &RIP1($A,$B,$C,$D,$E,$wl[15],$sl[15],1,$wl[16]);
-
-        &RIP2($E,$A,$B,$C,$D,$wl[16],$wl[17],$sl[16],$KL1,-1);
-        &RIP2($D,$E,$A,$B,$C,$wl[17],$wl[18],$sl[17],$KL1,0);
-        &RIP2($C,$D,$E,$A,$B,$wl[18],$wl[19],$sl[18],$KL1,0);
-        &RIP2($B,$C,$D,$E,$A,$wl[19],$wl[20],$sl[19],$KL1,0);
-        &RIP2($A,$B,$C,$D,$E,$wl[20],$wl[21],$sl[20],$KL1,0);
-        &RIP2($E,$A,$B,$C,$D,$wl[21],$wl[22],$sl[21],$KL1,0);
-        &RIP2($D,$E,$A,$B,$C,$wl[22],$wl[23],$sl[22],$KL1,0);
-        &RIP2($C,$D,$E,$A,$B,$wl[23],$wl[24],$sl[23],$KL1,0);
-        &RIP2($B,$C,$D,$E,$A,$wl[24],$wl[25],$sl[24],$KL1,0);
-        &RIP2($A,$B,$C,$D,$E,$wl[25],$wl[26],$sl[25],$KL1,0);
-        &RIP2($E,$A,$B,$C,$D,$wl[26],$wl[27],$sl[26],$KL1,0);
-        &RIP2($D,$E,$A,$B,$C,$wl[27],$wl[28],$sl[27],$KL1,0);
-        &RIP2($C,$D,$E,$A,$B,$wl[28],$wl[29],$sl[28],$KL1,0);
-        &RIP2($B,$C,$D,$E,$A,$wl[29],$wl[30],$sl[29],$KL1,0);
-        &RIP2($A,$B,$C,$D,$E,$wl[30],$wl[31],$sl[30],$KL1,0);
-        &RIP2($E,$A,$B,$C,$D,$wl[31],$wl[32],$sl[31],$KL1,1);
-
-        &RIP3($D,$E,$A,$B,$C,$wl[32],$sl[32],$KL2,-1);
-        &RIP3($C,$D,$E,$A,$B,$wl[33],$sl[33],$KL2,0);
-        &RIP3($B,$C,$D,$E,$A,$wl[34],$sl[34],$KL2,0);
-        &RIP3($A,$B,$C,$D,$E,$wl[35],$sl[35],$KL2,0);
-        &RIP3($E,$A,$B,$C,$D,$wl[36],$sl[36],$KL2,0);
-        &RIP3($D,$E,$A,$B,$C,$wl[37],$sl[37],$KL2,0);
-        &RIP3($C,$D,$E,$A,$B,$wl[38],$sl[38],$KL2,0);
-        &RIP3($B,$C,$D,$E,$A,$wl[39],$sl[39],$KL2,0);
-        &RIP3($A,$B,$C,$D,$E,$wl[40],$sl[40],$KL2,0);
-        &RIP3($E,$A,$B,$C,$D,$wl[41],$sl[41],$KL2,0);
-        &RIP3($D,$E,$A,$B,$C,$wl[42],$sl[42],$KL2,0);
-        &RIP3($C,$D,$E,$A,$B,$wl[43],$sl[43],$KL2,0);
-        &RIP3($B,$C,$D,$E,$A,$wl[44],$sl[44],$KL2,0);
-        &RIP3($A,$B,$C,$D,$E,$wl[45],$sl[45],$KL2,0);
-        &RIP3($E,$A,$B,$C,$D,$wl[46],$sl[46],$KL2,0);
-        &RIP3($D,$E,$A,$B,$C,$wl[47],$sl[47],$KL2,1);
-
-        &RIP4($C,$D,$E,$A,$B,$wl[48],$sl[48],$KL3,-1);
-        &RIP4($B,$C,$D,$E,$A,$wl[49],$sl[49],$KL3,0);
-        &RIP4($A,$B,$C,$D,$E,$wl[50],$sl[50],$KL3,0);
-        &RIP4($E,$A,$B,$C,$D,$wl[51],$sl[51],$KL3,0);
-        &RIP4($D,$E,$A,$B,$C,$wl[52],$sl[52],$KL3,0);
-        &RIP4($C,$D,$E,$A,$B,$wl[53],$sl[53],$KL3,0);
-        &RIP4($B,$C,$D,$E,$A,$wl[54],$sl[54],$KL3,0);
-        &RIP4($A,$B,$C,$D,$E,$wl[55],$sl[55],$KL3,0);
-        &RIP4($E,$A,$B,$C,$D,$wl[56],$sl[56],$KL3,0);
-        &RIP4($D,$E,$A,$B,$C,$wl[57],$sl[57],$KL3,0);
-        &RIP4($C,$D,$E,$A,$B,$wl[58],$sl[58],$KL3,0);
-        &RIP4($B,$C,$D,$E,$A,$wl[59],$sl[59],$KL3,0);
-        &RIP4($A,$B,$C,$D,$E,$wl[60],$sl[60],$KL3,0);
-        &RIP4($E,$A,$B,$C,$D,$wl[61],$sl[61],$KL3,0);
-        &RIP4($D,$E,$A,$B,$C,$wl[62],$sl[62],$KL3,0);
-        &RIP4($C,$D,$E,$A,$B,$wl[63],$sl[63],$KL3,1);
-
-        &RIP5($B,$C,$D,$E,$A,$wl[64],$sl[64],$KL4,-1);
-        &RIP5($A,$B,$C,$D,$E,$wl[65],$sl[65],$KL4,0);
-        &RIP5($E,$A,$B,$C,$D,$wl[66],$sl[66],$KL4,0);
-        &RIP5($D,$E,$A,$B,$C,$wl[67],$sl[67],$KL4,0);
-        &RIP5($C,$D,$E,$A,$B,$wl[68],$sl[68],$KL4,0);
-        &RIP5($B,$C,$D,$E,$A,$wl[69],$sl[69],$KL4,0);
-        &RIP5($A,$B,$C,$D,$E,$wl[70],$sl[70],$KL4,0);
-        &RIP5($E,$A,$B,$C,$D,$wl[71],$sl[71],$KL4,0);
-        &RIP5($D,$E,$A,$B,$C,$wl[72],$sl[72],$KL4,0);
-        &RIP5($C,$D,$E,$A,$B,$wl[73],$sl[73],$KL4,0);
-        &RIP5($B,$C,$D,$E,$A,$wl[74],$sl[74],$KL4,0);
-        &RIP5($A,$B,$C,$D,$E,$wl[75],$sl[75],$KL4,0);
-        &RIP5($E,$A,$B,$C,$D,$wl[76],$sl[76],$KL4,0);
-        &RIP5($D,$E,$A,$B,$C,$wl[77],$sl[77],$KL4,0);
-        &RIP5($C,$D,$E,$A,$B,$wl[78],$sl[78],$KL4,0);
-        &RIP5($B,$C,$D,$E,$A,$wl[79],$sl[79],$KL4,1);
-
-        # &mov($tmp2,   &wparam(0)); # moved into last RIP5
-        # &mov(&swtmp(1+16),    $A);
-         &mov($A,       &DWP( 0,$tmp2,"",0));
-        &mov(&swtmp(1+17),      $B);
-         &mov(&swtmp(1+18),     $C);
-        &mov($B,        &DWP( 4,$tmp2,"",0));
-         &mov(&swtmp(1+19),     $D);
-        &mov($C,        &DWP( 8,$tmp2,"",0));
-         &mov(&swtmp(1+20),     $E);
-        &mov($D,        &DWP(12,$tmp2,"",0));
-         &mov($E,       &DWP(16,$tmp2,"",0));
-
-        &RIP5($A,$B,$C,$D,$E,$wr[ 0],$sr[ 0],$KR0,-2);
-        &RIP5($E,$A,$B,$C,$D,$wr[ 1],$sr[ 1],$KR0,0);
-        &RIP5($D,$E,$A,$B,$C,$wr[ 2],$sr[ 2],$KR0,0);
-        &RIP5($C,$D,$E,$A,$B,$wr[ 3],$sr[ 3],$KR0,0);
-        &RIP5($B,$C,$D,$E,$A,$wr[ 4],$sr[ 4],$KR0,0);
-        &RIP5($A,$B,$C,$D,$E,$wr[ 5],$sr[ 5],$KR0,0);
-        &RIP5($E,$A,$B,$C,$D,$wr[ 6],$sr[ 6],$KR0,0);
-        &RIP5($D,$E,$A,$B,$C,$wr[ 7],$sr[ 7],$KR0,0);
-        &RIP5($C,$D,$E,$A,$B,$wr[ 8],$sr[ 8],$KR0,0);
-        &RIP5($B,$C,$D,$E,$A,$wr[ 9],$sr[ 9],$KR0,0);
-        &RIP5($A,$B,$C,$D,$E,$wr[10],$sr[10],$KR0,0);
-        &RIP5($E,$A,$B,$C,$D,$wr[11],$sr[11],$KR0,0);
-        &RIP5($D,$E,$A,$B,$C,$wr[12],$sr[12],$KR0,0);
-        &RIP5($C,$D,$E,$A,$B,$wr[13],$sr[13],$KR0,0);
-        &RIP5($B,$C,$D,$E,$A,$wr[14],$sr[14],$KR0,0);
-        &RIP5($A,$B,$C,$D,$E,$wr[15],$sr[15],$KR0,2);
-
-        &RIP4($E,$A,$B,$C,$D,$wr[16],$sr[16],$KR1,-2);
-        &RIP4($D,$E,$A,$B,$C,$wr[17],$sr[17],$KR1,0);
-        &RIP4($C,$D,$E,$A,$B,$wr[18],$sr[18],$KR1,0);
-        &RIP4($B,$C,$D,$E,$A,$wr[19],$sr[19],$KR1,0);
-        &RIP4($A,$B,$C,$D,$E,$wr[20],$sr[20],$KR1,0);
-        &RIP4($E,$A,$B,$C,$D,$wr[21],$sr[21],$KR1,0);
-        &RIP4($D,$E,$A,$B,$C,$wr[22],$sr[22],$KR1,0);
-        &RIP4($C,$D,$E,$A,$B,$wr[23],$sr[23],$KR1,0);
-        &RIP4($B,$C,$D,$E,$A,$wr[24],$sr[24],$KR1,0);
-        &RIP4($A,$B,$C,$D,$E,$wr[25],$sr[25],$KR1,0);
-        &RIP4($E,$A,$B,$C,$D,$wr[26],$sr[26],$KR1,0);
-        &RIP4($D,$E,$A,$B,$C,$wr[27],$sr[27],$KR1,0);
-        &RIP4($C,$D,$E,$A,$B,$wr[28],$sr[28],$KR1,0);
-        &RIP4($B,$C,$D,$E,$A,$wr[29],$sr[29],$KR1,0);
-        &RIP4($A,$B,$C,$D,$E,$wr[30],$sr[30],$KR1,0);
-        &RIP4($E,$A,$B,$C,$D,$wr[31],$sr[31],$KR1,2);
-
-        &RIP3($D,$E,$A,$B,$C,$wr[32],$sr[32],$KR2,-2);
-        &RIP3($C,$D,$E,$A,$B,$wr[33],$sr[33],$KR2,0);
-        &RIP3($B,$C,$D,$E,$A,$wr[34],$sr[34],$KR2,0);
-        &RIP3($A,$B,$C,$D,$E,$wr[35],$sr[35],$KR2,0);
-        &RIP3($E,$A,$B,$C,$D,$wr[36],$sr[36],$KR2,0);
-        &RIP3($D,$E,$A,$B,$C,$wr[37],$sr[37],$KR2,0);
-        &RIP3($C,$D,$E,$A,$B,$wr[38],$sr[38],$KR2,0);
-        &RIP3($B,$C,$D,$E,$A,$wr[39],$sr[39],$KR2,0);
-        &RIP3($A,$B,$C,$D,$E,$wr[40],$sr[40],$KR2,0);
-        &RIP3($E,$A,$B,$C,$D,$wr[41],$sr[41],$KR2,0);
-        &RIP3($D,$E,$A,$B,$C,$wr[42],$sr[42],$KR2,0);
-        &RIP3($C,$D,$E,$A,$B,$wr[43],$sr[43],$KR2,0);
-        &RIP3($B,$C,$D,$E,$A,$wr[44],$sr[44],$KR2,0);
-        &RIP3($A,$B,$C,$D,$E,$wr[45],$sr[45],$KR2,0);
-        &RIP3($E,$A,$B,$C,$D,$wr[46],$sr[46],$KR2,0);
-        &RIP3($D,$E,$A,$B,$C,$wr[47],$sr[47],$KR2,2,$wr[48]);
-
-        &RIP2($C,$D,$E,$A,$B,$wr[48],$wr[49],$sr[48],$KR3,-2);
-        &RIP2($B,$C,$D,$E,$A,$wr[49],$wr[50],$sr[49],$KR3,0);
-        &RIP2($A,$B,$C,$D,$E,$wr[50],$wr[51],$sr[50],$KR3,0);
-        &RIP2($E,$A,$B,$C,$D,$wr[51],$wr[52],$sr[51],$KR3,0);
-        &RIP2($D,$E,$A,$B,$C,$wr[52],$wr[53],$sr[52],$KR3,0);
-        &RIP2($C,$D,$E,$A,$B,$wr[53],$wr[54],$sr[53],$KR3,0);
-        &RIP2($B,$C,$D,$E,$A,$wr[54],$wr[55],$sr[54],$KR3,0);
-        &RIP2($A,$B,$C,$D,$E,$wr[55],$wr[56],$sr[55],$KR3,0);
-        &RIP2($E,$A,$B,$C,$D,$wr[56],$wr[57],$sr[56],$KR3,0);
-        &RIP2($D,$E,$A,$B,$C,$wr[57],$wr[58],$sr[57],$KR3,0);
-        &RIP2($C,$D,$E,$A,$B,$wr[58],$wr[59],$sr[58],$KR3,0);
-        &RIP2($B,$C,$D,$E,$A,$wr[59],$wr[60],$sr[59],$KR3,0);
-        &RIP2($A,$B,$C,$D,$E,$wr[60],$wr[61],$sr[60],$KR3,0);
-        &RIP2($E,$A,$B,$C,$D,$wr[61],$wr[62],$sr[61],$KR3,0);
-        &RIP2($D,$E,$A,$B,$C,$wr[62],$wr[63],$sr[62],$KR3,0);
-        &RIP2($C,$D,$E,$A,$B,$wr[63],$wr[64],$sr[63],$KR3,2);
-
-        &RIP1($B,$C,$D,$E,$A,$wr[64],$sr[64],-2);
-        &RIP1($A,$B,$C,$D,$E,$wr[65],$sr[65],0);
-        &RIP1($E,$A,$B,$C,$D,$wr[66],$sr[66],0);
-        &RIP1($D,$E,$A,$B,$C,$wr[67],$sr[67],0);
-        &RIP1($C,$D,$E,$A,$B,$wr[68],$sr[68],0);
-        &RIP1($B,$C,$D,$E,$A,$wr[69],$sr[69],0);
-        &RIP1($A,$B,$C,$D,$E,$wr[70],$sr[70],0);
-        &RIP1($E,$A,$B,$C,$D,$wr[71],$sr[71],0);
-        &RIP1($D,$E,$A,$B,$C,$wr[72],$sr[72],0);
-        &RIP1($C,$D,$E,$A,$B,$wr[73],$sr[73],0);
-        &RIP1($B,$C,$D,$E,$A,$wr[74],$sr[74],0);
-        &RIP1($A,$B,$C,$D,$E,$wr[75],$sr[75],0);
-        &RIP1($E,$A,$B,$C,$D,$wr[76],$sr[76],0);
-        &RIP1($D,$E,$A,$B,$C,$wr[77],$sr[77],0);
-        &RIP1($C,$D,$E,$A,$B,$wr[78],$sr[78],0);
-        &RIP1($B,$C,$D,$E,$A,$wr[79],$sr[79],2);
-
-        # &mov($tmp2,   &wparam(0)); # Moved into last round
-
-         &mov($tmp1,    &DWP( 4,$tmp2,"",0));   # ctx->B
-        &add($D,        $tmp1); 
-         &mov($tmp1,    &swtmp(1+18));          # $c
-        &add($D,        $tmp1);
-
-         &mov($tmp1,    &DWP( 8,$tmp2,"",0));   # ctx->C
-        &add($E,        $tmp1); 
-         &mov($tmp1,    &swtmp(1+19));          # $d
-        &add($E,        $tmp1);
-
-         &mov($tmp1,    &DWP(12,$tmp2,"",0));   # ctx->D
-        &add($A,        $tmp1); 
-         &mov($tmp1,    &swtmp(1+20));          # $e
-        &add($A,        $tmp1);
-
-
-         &mov($tmp1,    &DWP(16,$tmp2,"",0));   # ctx->E
-        &add($B,        $tmp1); 
-         &mov($tmp1,    &swtmp(1+16));          # $a
-        &add($B,        $tmp1);
-
-         &mov($tmp1,    &DWP( 0,$tmp2,"",0));   # ctx->A
-        &add($C,        $tmp1); 
-         &mov($tmp1,    &swtmp(1+17));          # $b
-        &add($C,        $tmp1);
-
-        &mov(&DWP( 0,$tmp2,"",0),       $D);
-         &mov(&DWP( 4,$tmp2,"",0),      $E);
-        &mov(&DWP( 8,$tmp2,"",0),       $A);
-         &mov(&DWP(12,$tmp2,"",0),      $B);
-        &mov(&DWP(16,$tmp2,"",0),       $C);
-
-        &mov($tmp2,             &swtmp(0));
-         &mov($tmp1,            &wparam(1));
-
-        &cmp($tmp2,$tmp1);
-         &mov($tmp2,    &wparam(0));
-
-        # XXX
-         &jge(&label("start"));
-
-        &stack_pop(16+5+1);
-
-        &pop("ebx");
-        &pop("ebp");
-        &pop("edi");
-        &pop("esi");
-        &ret();
-        &function_end_B($name);
-        }
-
diff --git a/src/lib/libcrypto/ripemd/ripemd.h b/src/lib/libcrypto/ripemd/ripemd.h
deleted file mode 100644
index ab76be4c33..0000000000
--- a/src/lib/libcrypto/ripemd/ripemd.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/ripemd/ripemd.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_RIPEMD_H
-#define HEADER_RIPEMD_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_RIPEMD
-#error RIPEMD is disabled.
-#endif
-
-#define RIPEMD160_CBLOCK        64
-#define RIPEMD160_LBLOCK        16
-#define RIPEMD160_BLOCK         16
-#define RIPEMD160_LAST_BLOCK    56
-#define RIPEMD160_LENGTH_BLOCK  8
-#define RIPEMD160_DIGEST_LENGTH 20
-
-typedef struct RIPEMD160state_st
-        {
-        unsigned long A,B,C,D,E;
-        unsigned long Nl,Nh;
-        unsigned long data[RIPEMD160_LBLOCK];
-        int num;
-        } RIPEMD160_CTX;
-
-void RIPEMD160_Init(RIPEMD160_CTX *c);
-void RIPEMD160_Update(RIPEMD160_CTX *c, unsigned char *data, unsigned long len);
-void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-unsigned char *RIPEMD160(unsigned char *d, unsigned long n, unsigned char *md);
-void RIPEMD160_Transform(RIPEMD160_CTX *c, unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/ripemd/rmd_dgst.c b/src/lib/libcrypto/ripemd/rmd_dgst.c
deleted file mode 100644
index b590856229..0000000000
--- a/src/lib/libcrypto/ripemd/rmd_dgst.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/* crypto/ripemd/rmd_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 "rmd_locl.h"
-#include <openssl/opensslv.h>
-
-char *RMD160_version="RIPE-MD160" OPENSSL_VERSION_PTEXT;
-
-#  ifdef RMD160_ASM
-     void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p,int num);
-#    define ripemd160_block ripemd160_block_x86
-#  else
-     void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p,int num);
-#  endif
-void RIPEMD160_Init(RIPEMD160_CTX *c)
-        {
-        c->A=RIPEMD160_A;
-        c->B=RIPEMD160_B;
-        c->C=RIPEMD160_C;
-        c->D=RIPEMD160_D;
-        c->E=RIPEMD160_E;
-        c->Nl=0;
-        c->Nh=0;
-        c->num=0;
-        }
-
-void RIPEMD160_Update(RIPEMD160_CTX *c, register unsigned char *data,
-             unsigned long len)
-        {
-        register ULONG *p;
-        int sw,sc;
-        ULONG l;
-
-        if (len == 0) return;
-
-        l=(c->Nl+(len<<3))&0xffffffffL;
-        if (l < c->Nl) /* overflow */
-                c->Nh++;
-        c->Nh+=(len>>29);
-        c->Nl=l;
-
-        if (c->num != 0)
-                {
-                p=c->data;
-                sw=c->num>>2;
-                sc=c->num&0x03;
-
-                if ((c->num+len) >= RIPEMD160_CBLOCK)
-                        {
-                        l= p[sw];
-                        p_c2l(data,l,sc);
-                        p[sw++]=l;
-                        for (; sw<RIPEMD160_LBLOCK; sw++)
-                                {
-                                c2l(data,l);
-                                p[sw]=l;
-                                }
-                        len-=(RIPEMD160_CBLOCK-c->num);
-
-                        ripemd160_block(c,p,64);
-                        c->num=0;
-                        /* drop through and do the rest */
-                        }
-                else
-                        {
-                        int ew,ec;
-
-                        c->num+=(int)len;
-                        if ((sc+len) < 4) /* ugly, add char's to a word */
-                                {
-                                l= p[sw];
-                                p_c2l_p(data,l,sc,len);
-                                p[sw]=l;
-                                }
-                        else
-                                {
-                                ew=(c->num>>2);
-                                ec=(c->num&0x03);
-                                l= p[sw];
-                                p_c2l(data,l,sc);
-                                p[sw++]=l;
-                                for (; sw < ew; sw++)
-                                        { c2l(data,l); p[sw]=l; }
-                                if (ec)
-                                        {
-                                        c2l_p(data,l,ec);
-                                        p[sw]=l;
-                                        }
-                                }
-                        return;
-                        }
-                }
-        /* we now can process the input data in blocks of RIPEMD160_CBLOCK
-         * chars and save the leftovers to c->data. */
-#ifdef L_ENDIAN
-        if ((((unsigned long)data)%sizeof(ULONG)) == 0)
-                {
-                sw=(int)len/RIPEMD160_CBLOCK;
-                if (sw > 0)
-                        {
-                        sw*=RIPEMD160_CBLOCK;
-                        ripemd160_block(c,(ULONG *)data,sw);
-                        data+=sw;
-                        len-=sw;
-                        }
-                }
-#endif
-        p=c->data;
-        while (len >= RIPEMD160_CBLOCK)
-                {
-#if defined(L_ENDIAN) || defined(B_ENDIAN)
-                if (p != (unsigned long *)data)
-                        memcpy(p,data,RIPEMD160_CBLOCK);
-                data+=RIPEMD160_CBLOCK;
-#ifdef B_ENDIAN
-                for (sw=(RIPEMD160_LBLOCK/4); sw; sw--)
-                        {
-                        Endian_Reverse32(p[0]);
-                        Endian_Reverse32(p[1]);
-                        Endian_Reverse32(p[2]);
-                        Endian_Reverse32(p[3]);
-                        p+=4;
-                        }
-#endif
-#else
-                for (sw=(RIPEMD160_LBLOCK/4); sw; sw--)
-                        {
-                        c2l(data,l); *(p++)=l;
-                        c2l(data,l); *(p++)=l;
-                        c2l(data,l); *(p++)=l;
-                        c2l(data,l); *(p++)=l; 
-                        } 
-#endif
-                p=c->data;
-                ripemd160_block(c,p,64);
-                len-=RIPEMD160_CBLOCK;
-                }
-        sc=(int)len;
-        c->num=sc;
-        if (sc)
-                {
-                sw=sc>>2;       /* words to copy */
-#ifdef L_ENDIAN
-                p[sw]=0;
-                memcpy(p,data,sc);
-#else
-                sc&=0x03;
-                for ( ; sw; sw--)
-                        { c2l(data,l); *(p++)=l; }
-                c2l_p(data,l,sc);
-                *p=l;
-#endif
-                }
-        }
-
-void RIPEMD160_Transform(RIPEMD160_CTX *c, unsigned char *b)
-        {
-        ULONG p[16];
-#if !defined(L_ENDIAN)
-        ULONG *q;
-        int i;
-#endif
-
-#if defined(B_ENDIAN) || defined(L_ENDIAN)
-        memcpy(p,b,64);
-#ifdef B_ENDIAN
-        q=p;
-        for (i=(RIPEMD160_LBLOCK/4); i; i--)
-                {
-                Endian_Reverse32(q[0]);
-                Endian_Reverse32(q[1]);
-                Endian_Reverse32(q[2]);
-                Endian_Reverse32(q[3]);
-                q+=4;
-                }
-#endif
-#else
-        q=p;
-        for (i=(RIPEMD160_LBLOCK/4); i; i--)
-                {
-                ULONG l;
-                c2l(b,l); *(q++)=l;
-                c2l(b,l); *(q++)=l;
-                c2l(b,l); *(q++)=l;
-                c2l(b,l); *(q++)=l; 
-                } 
-#endif
-        ripemd160_block(c,p,64);
-        }
-
-#ifndef RMD160_ASM
-
-void ripemd160_block(RIPEMD160_CTX *ctx, register ULONG *X, int num)
-        {
-        register ULONG A,B,C,D,E;
-        ULONG a,b,c,d,e;
-
-        for (;;)
-                {
-                A=ctx->A; B=ctx->B; C=ctx->C; D=ctx->D; E=ctx->E;
-
-        RIP1(A,B,C,D,E,WL00,SL00);
-        RIP1(E,A,B,C,D,WL01,SL01);
-        RIP1(D,E,A,B,C,WL02,SL02);
-        RIP1(C,D,E,A,B,WL03,SL03);
-        RIP1(B,C,D,E,A,WL04,SL04);
-        RIP1(A,B,C,D,E,WL05,SL05);
-        RIP1(E,A,B,C,D,WL06,SL06);
-        RIP1(D,E,A,B,C,WL07,SL07);
-        RIP1(C,D,E,A,B,WL08,SL08);
-        RIP1(B,C,D,E,A,WL09,SL09);
-        RIP1(A,B,C,D,E,WL10,SL10);
-        RIP1(E,A,B,C,D,WL11,SL11);
-        RIP1(D,E,A,B,C,WL12,SL12);
-        RIP1(C,D,E,A,B,WL13,SL13);
-        RIP1(B,C,D,E,A,WL14,SL14);
-        RIP1(A,B,C,D,E,WL15,SL15);
-
-        RIP2(E,A,B,C,D,WL16,SL16,KL1);
-        RIP2(D,E,A,B,C,WL17,SL17,KL1);
-        RIP2(C,D,E,A,B,WL18,SL18,KL1);
-        RIP2(B,C,D,E,A,WL19,SL19,KL1);
-        RIP2(A,B,C,D,E,WL20,SL20,KL1);
-        RIP2(E,A,B,C,D,WL21,SL21,KL1);
-        RIP2(D,E,A,B,C,WL22,SL22,KL1);
-        RIP2(C,D,E,A,B,WL23,SL23,KL1);
-        RIP2(B,C,D,E,A,WL24,SL24,KL1);
-        RIP2(A,B,C,D,E,WL25,SL25,KL1);
-        RIP2(E,A,B,C,D,WL26,SL26,KL1);
-        RIP2(D,E,A,B,C,WL27,SL27,KL1);
-        RIP2(C,D,E,A,B,WL28,SL28,KL1);
-        RIP2(B,C,D,E,A,WL29,SL29,KL1);
-        RIP2(A,B,C,D,E,WL30,SL30,KL1);
-        RIP2(E,A,B,C,D,WL31,SL31,KL1);
-
-        RIP3(D,E,A,B,C,WL32,SL32,KL2);
-        RIP3(C,D,E,A,B,WL33,SL33,KL2);
-        RIP3(B,C,D,E,A,WL34,SL34,KL2);
-        RIP3(A,B,C,D,E,WL35,SL35,KL2);
-        RIP3(E,A,B,C,D,WL36,SL36,KL2);
-        RIP3(D,E,A,B,C,WL37,SL37,KL2);
-        RIP3(C,D,E,A,B,WL38,SL38,KL2);
-        RIP3(B,C,D,E,A,WL39,SL39,KL2);
-        RIP3(A,B,C,D,E,WL40,SL40,KL2);
-        RIP3(E,A,B,C,D,WL41,SL41,KL2);
-        RIP3(D,E,A,B,C,WL42,SL42,KL2);
-        RIP3(C,D,E,A,B,WL43,SL43,KL2);
-        RIP3(B,C,D,E,A,WL44,SL44,KL2);
-        RIP3(A,B,C,D,E,WL45,SL45,KL2);
-        RIP3(E,A,B,C,D,WL46,SL46,KL2);
-        RIP3(D,E,A,B,C,WL47,SL47,KL2);
-
-        RIP4(C,D,E,A,B,WL48,SL48,KL3);
-        RIP4(B,C,D,E,A,WL49,SL49,KL3);
-        RIP4(A,B,C,D,E,WL50,SL50,KL3);
-        RIP4(E,A,B,C,D,WL51,SL51,KL3);
-        RIP4(D,E,A,B,C,WL52,SL52,KL3);
-        RIP4(C,D,E,A,B,WL53,SL53,KL3);
-        RIP4(B,C,D,E,A,WL54,SL54,KL3);
-        RIP4(A,B,C,D,E,WL55,SL55,KL3);
-        RIP4(E,A,B,C,D,WL56,SL56,KL3);
-        RIP4(D,E,A,B,C,WL57,SL57,KL3);
-        RIP4(C,D,E,A,B,WL58,SL58,KL3);
-        RIP4(B,C,D,E,A,WL59,SL59,KL3);
-        RIP4(A,B,C,D,E,WL60,SL60,KL3);
-        RIP4(E,A,B,C,D,WL61,SL61,KL3);
-        RIP4(D,E,A,B,C,WL62,SL62,KL3);
-        RIP4(C,D,E,A,B,WL63,SL63,KL3);
-
-        RIP5(B,C,D,E,A,WL64,SL64,KL4);
-        RIP5(A,B,C,D,E,WL65,SL65,KL4);
-        RIP5(E,A,B,C,D,WL66,SL66,KL4);
-        RIP5(D,E,A,B,C,WL67,SL67,KL4);
-        RIP5(C,D,E,A,B,WL68,SL68,KL4);
-        RIP5(B,C,D,E,A,WL69,SL69,KL4);
-        RIP5(A,B,C,D,E,WL70,SL70,KL4);
-        RIP5(E,A,B,C,D,WL71,SL71,KL4);
-        RIP5(D,E,A,B,C,WL72,SL72,KL4);
-        RIP5(C,D,E,A,B,WL73,SL73,KL4);
-        RIP5(B,C,D,E,A,WL74,SL74,KL4);
-        RIP5(A,B,C,D,E,WL75,SL75,KL4);
-        RIP5(E,A,B,C,D,WL76,SL76,KL4);
-        RIP5(D,E,A,B,C,WL77,SL77,KL4);
-        RIP5(C,D,E,A,B,WL78,SL78,KL4);
-        RIP5(B,C,D,E,A,WL79,SL79,KL4);
-
-        a=A; b=B; c=C; d=D; e=E;
-        /* Do other half */
-        A=ctx->A; B=ctx->B; C=ctx->C; D=ctx->D; E=ctx->E;
-
-        RIP5(A,B,C,D,E,WR00,SR00,KR0);
-        RIP5(E,A,B,C,D,WR01,SR01,KR0);
-        RIP5(D,E,A,B,C,WR02,SR02,KR0);
-        RIP5(C,D,E,A,B,WR03,SR03,KR0);
-        RIP5(B,C,D,E,A,WR04,SR04,KR0);
-        RIP5(A,B,C,D,E,WR05,SR05,KR0);
-        RIP5(E,A,B,C,D,WR06,SR06,KR0);
-        RIP5(D,E,A,B,C,WR07,SR07,KR0);
-        RIP5(C,D,E,A,B,WR08,SR08,KR0);
-        RIP5(B,C,D,E,A,WR09,SR09,KR0);
-        RIP5(A,B,C,D,E,WR10,SR10,KR0);
-        RIP5(E,A,B,C,D,WR11,SR11,KR0);
-        RIP5(D,E,A,B,C,WR12,SR12,KR0);
-        RIP5(C,D,E,A,B,WR13,SR13,KR0);
-        RIP5(B,C,D,E,A,WR14,SR14,KR0);
-        RIP5(A,B,C,D,E,WR15,SR15,KR0);
-
-        RIP4(E,A,B,C,D,WR16,SR16,KR1);
-        RIP4(D,E,A,B,C,WR17,SR17,KR1);
-        RIP4(C,D,E,A,B,WR18,SR18,KR1);
-        RIP4(B,C,D,E,A,WR19,SR19,KR1);
-        RIP4(A,B,C,D,E,WR20,SR20,KR1);
-        RIP4(E,A,B,C,D,WR21,SR21,KR1);
-        RIP4(D,E,A,B,C,WR22,SR22,KR1);
-        RIP4(C,D,E,A,B,WR23,SR23,KR1);
-        RIP4(B,C,D,E,A,WR24,SR24,KR1);
-        RIP4(A,B,C,D,E,WR25,SR25,KR1);
-        RIP4(E,A,B,C,D,WR26,SR26,KR1);
-        RIP4(D,E,A,B,C,WR27,SR27,KR1);
-        RIP4(C,D,E,A,B,WR28,SR28,KR1);
-        RIP4(B,C,D,E,A,WR29,SR29,KR1);
-        RIP4(A,B,C,D,E,WR30,SR30,KR1);
-        RIP4(E,A,B,C,D,WR31,SR31,KR1);
-
-        RIP3(D,E,A,B,C,WR32,SR32,KR2);
-        RIP3(C,D,E,A,B,WR33,SR33,KR2);
-        RIP3(B,C,D,E,A,WR34,SR34,KR2);
-        RIP3(A,B,C,D,E,WR35,SR35,KR2);
-        RIP3(E,A,B,C,D,WR36,SR36,KR2);
-        RIP3(D,E,A,B,C,WR37,SR37,KR2);
-        RIP3(C,D,E,A,B,WR38,SR38,KR2);
-        RIP3(B,C,D,E,A,WR39,SR39,KR2);
-        RIP3(A,B,C,D,E,WR40,SR40,KR2);
-        RIP3(E,A,B,C,D,WR41,SR41,KR2);
-        RIP3(D,E,A,B,C,WR42,SR42,KR2);
-        RIP3(C,D,E,A,B,WR43,SR43,KR2);
-        RIP3(B,C,D,E,A,WR44,SR44,KR2);
-        RIP3(A,B,C,D,E,WR45,SR45,KR2);
-        RIP3(E,A,B,C,D,WR46,SR46,KR2);
-        RIP3(D,E,A,B,C,WR47,SR47,KR2);
-
-        RIP2(C,D,E,A,B,WR48,SR48,KR3);
-        RIP2(B,C,D,E,A,WR49,SR49,KR3);
-        RIP2(A,B,C,D,E,WR50,SR50,KR3);
-        RIP2(E,A,B,C,D,WR51,SR51,KR3);
-        RIP2(D,E,A,B,C,WR52,SR52,KR3);
-        RIP2(C,D,E,A,B,WR53,SR53,KR3);
-        RIP2(B,C,D,E,A,WR54,SR54,KR3);
-        RIP2(A,B,C,D,E,WR55,SR55,KR3);
-        RIP2(E,A,B,C,D,WR56,SR56,KR3);
-        RIP2(D,E,A,B,C,WR57,SR57,KR3);
-        RIP2(C,D,E,A,B,WR58,SR58,KR3);
-        RIP2(B,C,D,E,A,WR59,SR59,KR3);
-        RIP2(A,B,C,D,E,WR60,SR60,KR3);
-        RIP2(E,A,B,C,D,WR61,SR61,KR3);
-        RIP2(D,E,A,B,C,WR62,SR62,KR3);
-        RIP2(C,D,E,A,B,WR63,SR63,KR3);
-
-        RIP1(B,C,D,E,A,WR64,SR64);
-        RIP1(A,B,C,D,E,WR65,SR65);
-        RIP1(E,A,B,C,D,WR66,SR66);
-        RIP1(D,E,A,B,C,WR67,SR67);
-        RIP1(C,D,E,A,B,WR68,SR68);
-        RIP1(B,C,D,E,A,WR69,SR69);
-        RIP1(A,B,C,D,E,WR70,SR70);
-        RIP1(E,A,B,C,D,WR71,SR71);
-        RIP1(D,E,A,B,C,WR72,SR72);
-        RIP1(C,D,E,A,B,WR73,SR73);
-        RIP1(B,C,D,E,A,WR74,SR74);
-        RIP1(A,B,C,D,E,WR75,SR75);
-        RIP1(E,A,B,C,D,WR76,SR76);
-        RIP1(D,E,A,B,C,WR77,SR77);
-        RIP1(C,D,E,A,B,WR78,SR78);
-        RIP1(B,C,D,E,A,WR79,SR79);
-
-        D     =ctx->B+c+D;
-        ctx->B=ctx->C+d+E;
-        ctx->C=ctx->D+e+A;
-        ctx->D=ctx->E+a+B;
-        ctx->E=ctx->A+b+C;
-        ctx->A=D;
-
-        X+=16;
-        num-=64;
-        if (num <= 0) break;
-                }
-        }
-#endif
-
-void RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c)
-        {
-        register int i,j;
-        register ULONG l;
-        register ULONG *p;
-        static unsigned char end[4]={0x80,0x00,0x00,0x00};
-        unsigned char *cp=end;
-
-        /* c->num should definitly have room for at least one more byte. */
-        p=c->data;
-        j=c->num;
-        i=j>>2;
-
-        /* purify often complains about the following line as an
-         * Uninitialized Memory Read.  While this can be true, the
-         * following p_c2l macro will reset l when that case is true.
-         * This is because j&0x03 contains the number of 'valid' bytes
-         * already in p[i].  If and only if j&0x03 == 0, the UMR will
-         * occur but this is also the only time p_c2l will do
-         * l= *(cp++) instead of l|= *(cp++)
-         * Many thanks to Alex Tang <altitude@cic.net> for pickup this
-         * 'potential bug' */
-#ifdef PURIFY
-        if ((j&0x03) == 0) p[i]=0;
-#endif
-        l=p[i];
-        p_c2l(cp,l,j&0x03);
-        p[i]=l;
-        i++;
-        /* i is the next 'undefined word' */
-        if (c->num >= RIPEMD160_LAST_BLOCK)
-                {
-                for (; i<RIPEMD160_LBLOCK; i++)
-                        p[i]=0;
-                ripemd160_block(c,p,64);
-                i=0;
-                }
-        for (; i<(RIPEMD160_LBLOCK-2); i++)
-                p[i]=0;
-        p[RIPEMD160_LBLOCK-2]=c->Nl;
-        p[RIPEMD160_LBLOCK-1]=c->Nh;
-        ripemd160_block(c,p,64);
-        cp=md;
-        l=c->A; l2c(l,cp);
-        l=c->B; l2c(l,cp);
-        l=c->C; l2c(l,cp);
-        l=c->D; l2c(l,cp);
-        l=c->E; l2c(l,cp);
-
-        /* clear stuff, ripemd160_block may be leaving some stuff on the stack
-         * but I'm not worried :-) */
-        c->num=0;
-/*      memset((char *)&c,0,sizeof(c));*/
-        }
-
-#ifdef undef
-int printit(unsigned long *l)
-        {
-        int i,ii;
-
-        for (i=0; i<2; i++)
-                {
-                for (ii=0; ii<8; ii++)
-                        {
-                        fprintf(stderr,"%08lx ",l[i*8+ii]);
-                        }
-                fprintf(stderr,"\n");
-                }
-        }
-#endif
diff --git a/src/lib/libcrypto/ripemd/rmd_locl.h b/src/lib/libcrypto/ripemd/rmd_locl.h
deleted file mode 100644
index d6ba02001a..0000000000
--- a/src/lib/libcrypto/ripemd/rmd_locl.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/* crypto/ripemd/rmd_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/ripemd.h>
-
-#define ULONG   unsigned long
-#define UCHAR   unsigned char
-#define UINT    unsigned int
-
-#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
-
-#define F1(x,y,z)        ((x)^(y)^(z))
-#define F2(x,y,z)       (((x)&(y))|((~x)&z))
-#define F3(x,y,z)       (((x)|(~y))^(z))
-#define F4(x,y,z)       (((x)&(z))|((y)&(~(z))))
-#define F5(x,y,z)        ((x)^((y)|(~(z))))
-
-#define RIPEMD160_A     0x67452301L
-#define RIPEMD160_B     0xEFCDAB89L
-#define RIPEMD160_C     0x98BADCFEL
-#define RIPEMD160_D     0x10325476L
-#define RIPEMD160_E     0xC3D2E1F0L
-
-#include "rmdconst.h"
-
-#define RIP1(a,b,c,d,e,w,s) { \
-        a+=F1(b,c,d)+X[w]; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
-
-#define RIP2(a,b,c,d,e,w,s,K) { \
-        a+=F2(b,c,d)+X[w]+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
-
-#define RIP3(a,b,c,d,e,w,s,K) { \
-        a+=F3(b,c,d)+X[w]+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
-
-#define RIP4(a,b,c,d,e,w,s,K) { \
-        a+=F4(b,c,d)+X[w]+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
-
-#define RIP5(a,b,c,d,e,w,s,K) { \
-        a+=F5(b,c,d)+X[w]+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
-
diff --git a/src/lib/libcrypto/ripemd/rmd_one.c b/src/lib/libcrypto/ripemd/rmd_one.c
deleted file mode 100644
index 5b6ff14714..0000000000
--- a/src/lib/libcrypto/ripemd/rmd_one.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* crypto/ripemd/rmd_one.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 "rmd_locl.h"
-
-unsigned char *RIPEMD160(unsigned char *d, unsigned long n,
-             unsigned char *md)
-        {
-        RIPEMD160_CTX c;
-        static unsigned char m[RIPEMD160_DIGEST_LENGTH];
-
-        if (md == NULL) md=m;
-        RIPEMD160_Init(&c);
-        RIPEMD160_Update(&c,d,n);
-        RIPEMD160_Final(md,&c);
-        memset(&c,0,sizeof(c)); /* security consideration */
-        return(md);
-        }
-
diff --git a/src/lib/libcrypto/ripemd/rmdconst.h b/src/lib/libcrypto/ripemd/rmdconst.h
deleted file mode 100644
index 59c48dead1..0000000000
--- a/src/lib/libcrypto/ripemd/rmdconst.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/* crypto/ripemd/rmdconst.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 KL0 0x00000000L
-#define KL1 0x5A827999L
-#define KL2 0x6ED9EBA1L
-#define KL3 0x8F1BBCDCL
-#define KL4 0xA953FD4EL
-
-#define KR0 0x50A28BE6L
-#define KR1 0x5C4DD124L
-#define KR2 0x6D703EF3L
-#define KR3 0x7A6D76E9L
-#define KR4 0x00000000L
-
-#define WL00  0
-#define SL00 11
-#define WL01  1
-#define SL01 14
-#define WL02  2
-#define SL02 15
-#define WL03  3
-#define SL03 12
-#define WL04  4
-#define SL04  5
-#define WL05  5
-#define SL05  8
-#define WL06  6
-#define SL06  7
-#define WL07  7
-#define SL07  9
-#define WL08  8
-#define SL08 11
-#define WL09  9
-#define SL09 13
-#define WL10 10
-#define SL10 14
-#define WL11 11
-#define SL11 15
-#define WL12 12
-#define SL12  6
-#define WL13 13
-#define SL13  7
-#define WL14 14
-#define SL14  9
-#define WL15 15
-#define SL15  8
-
-#define WL16  7
-#define SL16  7
-#define WL17  4
-#define SL17  6
-#define WL18 13
-#define SL18  8
-#define WL19  1
-#define SL19 13
-#define WL20 10
-#define SL20 11
-#define WL21  6
-#define SL21  9
-#define WL22 15
-#define SL22  7
-#define WL23  3
-#define SL23 15
-#define WL24 12
-#define SL24  7
-#define WL25  0
-#define SL25 12
-#define WL26  9
-#define SL26 15
-#define WL27  5
-#define SL27  9
-#define WL28  2
-#define SL28 11
-#define WL29 14
-#define SL29  7
-#define WL30 11
-#define SL30 13
-#define WL31  8
-#define SL31 12
-
-#define WL32  3
-#define SL32 11
-#define WL33 10
-#define SL33 13
-#define WL34 14
-#define SL34  6
-#define WL35  4
-#define SL35  7
-#define WL36  9
-#define SL36 14
-#define WL37 15
-#define SL37  9
-#define WL38  8
-#define SL38 13
-#define WL39  1
-#define SL39 15
-#define WL40  2
-#define SL40 14
-#define WL41  7
-#define SL41  8
-#define WL42  0
-#define SL42 13
-#define WL43  6
-#define SL43  6
-#define WL44 13
-#define SL44  5
-#define WL45 11
-#define SL45 12
-#define WL46  5
-#define SL46  7
-#define WL47 12
-#define SL47  5
-
-#define WL48  1
-#define SL48 11
-#define WL49  9
-#define SL49 12
-#define WL50 11
-#define SL50 14
-#define WL51 10
-#define SL51 15
-#define WL52  0
-#define SL52 14
-#define WL53  8
-#define SL53 15
-#define WL54 12
-#define SL54  9
-#define WL55  4
-#define SL55  8
-#define WL56 13
-#define SL56  9
-#define WL57  3
-#define SL57 14
-#define WL58  7
-#define SL58  5
-#define WL59 15
-#define SL59  6
-#define WL60 14
-#define SL60  8
-#define WL61  5
-#define SL61  6
-#define WL62  6
-#define SL62  5
-#define WL63  2
-#define SL63 12
-
-#define WL64  4
-#define SL64  9
-#define WL65  0
-#define SL65 15
-#define WL66  5
-#define SL66  5
-#define WL67  9
-#define SL67 11
-#define WL68  7
-#define SL68  6
-#define WL69 12
-#define SL69  8
-#define WL70  2
-#define SL70 13
-#define WL71 10
-#define SL71 12
-#define WL72 14
-#define SL72  5
-#define WL73  1
-#define SL73 12
-#define WL74  3
-#define SL74 13
-#define WL75  8
-#define SL75 14
-#define WL76 11
-#define SL76 11
-#define WL77  6
-#define SL77  8
-#define WL78 15
-#define SL78  5
-#define WL79 13
-#define SL79  6
-
-#define WR00  5
-#define SR00  8
-#define WR01 14
-#define SR01  9
-#define WR02  7
-#define SR02  9
-#define WR03  0
-#define SR03 11
-#define WR04  9
-#define SR04 13
-#define WR05  2
-#define SR05 15
-#define WR06 11
-#define SR06 15
-#define WR07  4
-#define SR07  5
-#define WR08 13
-#define SR08  7
-#define WR09  6
-#define SR09  7
-#define WR10 15
-#define SR10  8
-#define WR11  8
-#define SR11 11
-#define WR12  1
-#define SR12 14
-#define WR13 10
-#define SR13 14
-#define WR14  3
-#define SR14 12
-#define WR15 12
-#define SR15  6
-
-#define WR16  6
-#define SR16  9
-#define WR17 11
-#define SR17 13
-#define WR18  3
-#define SR18 15
-#define WR19  7
-#define SR19  7
-#define WR20  0
-#define SR20 12
-#define WR21 13
-#define SR21  8
-#define WR22  5
-#define SR22  9
-#define WR23 10
-#define SR23 11
-#define WR24 14
-#define SR24  7
-#define WR25 15
-#define SR25  7
-#define WR26  8
-#define SR26 12
-#define WR27 12
-#define SR27  7
-#define WR28  4
-#define SR28  6
-#define WR29  9
-#define SR29 15
-#define WR30  1
-#define SR30 13
-#define WR31  2
-#define SR31 11
-
-#define WR32 15
-#define SR32  9
-#define WR33  5
-#define SR33  7
-#define WR34  1
-#define SR34 15
-#define WR35  3
-#define SR35 11
-#define WR36  7
-#define SR36  8
-#define WR37 14
-#define SR37  6
-#define WR38  6
-#define SR38  6
-#define WR39  9
-#define SR39 14
-#define WR40 11
-#define SR40 12
-#define WR41  8
-#define SR41 13
-#define WR42 12
-#define SR42  5
-#define WR43  2
-#define SR43 14
-#define WR44 10
-#define SR44 13
-#define WR45  0
-#define SR45 13
-#define WR46  4
-#define SR46  7
-#define WR47 13
-#define SR47  5
-
-#define WR48  8
-#define SR48 15
-#define WR49  6
-#define SR49  5
-#define WR50  4
-#define SR50  8
-#define WR51  1
-#define SR51 11
-#define WR52  3
-#define SR52 14
-#define WR53 11
-#define SR53 14
-#define WR54 15
-#define SR54  6
-#define WR55  0
-#define SR55 14
-#define WR56  5
-#define SR56  6
-#define WR57 12
-#define SR57  9
-#define WR58  2
-#define SR58 12
-#define WR59 13
-#define SR59  9
-#define WR60  9
-#define SR60 12
-#define WR61  7
-#define SR61  5
-#define WR62 10
-#define SR62 15
-#define WR63 14
-#define SR63  8
-
-#define WR64 12
-#define SR64  8
-#define WR65 15
-#define SR65  5
-#define WR66 10
-#define SR66 12
-#define WR67  4
-#define SR67  9
-#define WR68  1
-#define SR68 12
-#define WR69  5
-#define SR69  5
-#define WR70  8
-#define SR70 14
-#define WR71  7
-#define SR71  6
-#define WR72  6
-#define SR72  8
-#define WR73  2
-#define SR73 13
-#define WR74 13
-#define SR74  6
-#define WR75 14
-#define SR75  5
-#define WR76  0
-#define SR76 15
-#define WR77  3
-#define SR77 13
-#define WR78  9
-#define SR78 11
-#define WR79 11
-#define SR79 11
-
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
deleted file mode 100644
index 9230b2fcc9..0000000000
--- a/src/lib/libcrypto/rsa/rsa.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/* crypto/rsa/rsa.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_RSA_H
-#define HEADER_RSA_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
-
-#ifdef NO_RSA
-#error RSA is disabled.
-#endif
-
-typedef struct rsa_st RSA;
-
-typedef struct rsa_meth_st
-        {
-        const char *name;
-        int (*rsa_pub_enc)(int flen,unsigned char *from,unsigned char *to,
-                           RSA *rsa,int padding);
-        int (*rsa_pub_dec)(int flen,unsigned char *from,unsigned char *to,
-                           RSA *rsa,int padding);
-        int (*rsa_priv_enc)(int flen,unsigned char *from,unsigned char *to,
-                            RSA *rsa,int padding);
-        int (*rsa_priv_dec)(int flen,unsigned char *from,unsigned char *to,
-                            RSA *rsa,int padding);
-        int (*rsa_mod_exp)(BIGNUM *r0,BIGNUM *I,RSA *rsa); /* Can be null */
-        int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                          const BIGNUM *m, BN_CTX *ctx,
-                          BN_MONT_CTX *m_ctx); /* Can be null */
-        int (*init)(RSA *rsa);          /* called at new */
-        int (*finish)(RSA *rsa);        /* called at free */
-        int flags;                      /* RSA_METHOD_FLAG_* things */
-        char *app_data;                 /* may be needed! */
-        } RSA_METHOD;
-
-struct rsa_st
-        {
-        /* The first parameter is used to pickup errors where
-         * this is passed instead of aEVP_PKEY, it is set to 0 */
-        int pad;
-        int version;
-        RSA_METHOD *meth;
-        BIGNUM *n;
-        BIGNUM *e;
-        BIGNUM *d;
-        BIGNUM *p;
-        BIGNUM *q;
-        BIGNUM *dmp1;
-        BIGNUM *dmq1;
-        BIGNUM *iqmp;
-        /* be careful using this if the RSA structure is shared */
-        CRYPTO_EX_DATA ex_data;
-        int references;
-        int flags;
-
-        /* Used to cache montgomery values */
-        BN_MONT_CTX *_method_mod_n;
-        BN_MONT_CTX *_method_mod_p;
-        BN_MONT_CTX *_method_mod_q;
-
-        /* all BIGNUM values are actually in the following data, if it is not
-         * NULL */
-        char *bignum_data;
-        BN_BLINDING *blinding;
-        };
-
-#define RSA_3   0x3L
-#define RSA_F4  0x10001L
-
-#define RSA_METHOD_FLAG_NO_CHECK        0x01 /* don't check pub/private match */
-
-#define RSA_FLAG_CACHE_PUBLIC           0x02
-#define RSA_FLAG_CACHE_PRIVATE          0x04
-#define RSA_FLAG_BLINDING               0x08
-#define RSA_FLAG_THREAD_SAFE            0x10
-/* This flag means the private key operations will be handled by rsa_mod_exp
- * and that they do not depend on the private key components being present:
- * for example a key stored in external hardware. Without this flag bn_mod_exp
- * gets called when private key components are absent.
- */
-#define RSA_FLAG_EXT_PKEY               0x20
-
-#define RSA_PKCS1_PADDING       1
-#define RSA_SSLV23_PADDING      2
-#define RSA_NO_PADDING          3
-#define RSA_PKCS1_OAEP_PADDING  4
-
-#define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,(char *)arg)
-#define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
-
-RSA *   RSA_new(void);
-RSA *   RSA_new_method(RSA_METHOD *method);
-int     RSA_size(RSA *);
-RSA *   RSA_generate_key(int bits, unsigned long e,void
-                (*callback)(int,int,void *),void *cb_arg);
-int     RSA_check_key(RSA *);
-        /* next 4 return -1 on error */
-int     RSA_public_encrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-int     RSA_private_encrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-int     RSA_public_decrypt(int flen, unsigned char *from, 
-                unsigned char *to, RSA *rsa,int padding);
-int     RSA_private_decrypt(int flen, unsigned char *from, 
-                unsigned char *to, RSA *rsa,int padding);
-void    RSA_free (RSA *r);
-
-int     RSA_flags(RSA *r);
-
-void RSA_set_default_method(RSA_METHOD *meth);
-RSA_METHOD *RSA_get_default_method(void);
-RSA_METHOD *RSA_get_method(RSA *rsa);
-RSA_METHOD *RSA_set_method(RSA *rsa, RSA_METHOD *meth);
-
-/* This function needs the memory locking malloc callbacks to be installed */
-int RSA_memory_lock(RSA *r);
-
-/* If you have RSAref compiled in. */
-RSA_METHOD *RSA_PKCS1_RSAref(void);
-
-/* these are the actual SSLeay RSA functions */
-RSA_METHOD *RSA_PKCS1_SSLeay(void);
-
-void    ERR_load_RSA_strings(void );
-
-RSA *   d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length);
-int     i2d_RSAPublicKey(RSA *a, unsigned char **pp);
-RSA *   d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length);
-int     i2d_RSAPrivateKey(RSA *a, unsigned char **pp);
-#ifndef NO_FP_API
-int     RSA_print_fp(FILE *fp, RSA *r,int offset);
-#endif
-
-#ifdef HEADER_BIO_H
-int     RSA_print(BIO *bp, RSA *r,int offset);
-#endif
-
-int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
-RSA *d2i_Netscape_RSA(RSA **a, unsigned char **pp, long length, int (*cb)());
-/* Naughty internal function required elsewhere, to handle a MS structure
- * that is the same as the netscape one :-) */
-RSA *d2i_Netscape_RSA_2(RSA **a, unsigned char **pp, long length, int (*cb)());
-
-/* The following 2 functions sign and verify a X509_SIG ASN1 object
- * inside PKCS#1 padded RSA encryption */
-int RSA_sign(int type, unsigned char *m, unsigned int m_len,
-        unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify(int type, unsigned char *m, unsigned int m_len,
-        unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-/* The following 2 function sign and verify a ASN1_OCTET_STRING
- * object inside PKCS#1 padded RSA encryption */
-int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len,
-        unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len,
-        unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
-void RSA_blinding_off(RSA *rsa);
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
-int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen,
-        unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
-int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen,
-        unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
-                               unsigned char *f,int fl,unsigned char *p,
-                               int pl);
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
-                                 unsigned char *f,int fl,int rsa_len,
-                                 unsigned char *p,int pl);
-int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
-int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
-        unsigned char *f,int fl,int rsa_len);
-int RSA_padding_add_none(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
-int RSA_padding_check_none(unsigned char *to,int tlen,
-        unsigned char *f,int fl,int rsa_len);
-
-int RSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-int RSA_set_ex_data(RSA *r,int idx,char *arg);
-char *RSA_get_ex_data(RSA *r, int idx);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the RSA functions. */
-
-/* Function codes. */
-#define RSA_F_MEMORY_LOCK                                100
-#define RSA_F_RSA_CHECK_KEY                              123
-#define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    101
-#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    102
-#define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     103
-#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     104
-#define RSA_F_RSA_GENERATE_KEY                           105
-#define RSA_F_RSA_NEW_METHOD                             106
-#define RSA_F_RSA_PADDING_ADD_NONE                       107
-#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
-#define RSA_F_RSA_PADDING_ADD_SSLV23                     110
-#define RSA_F_RSA_PADDING_CHECK_NONE                     111
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               122
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             112
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             113
-#define RSA_F_RSA_PADDING_CHECK_SSLV23                   114
-#define RSA_F_RSA_PRINT                                  115
-#define RSA_F_RSA_PRINT_FP                               116
-#define RSA_F_RSA_SIGN                                   117
-#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118
-#define RSA_F_RSA_VERIFY                                 119
-#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
-
-/* 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_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_DATA_TOO_SMALL_FOR_KEY_SIZE                122
-#define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
-#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
-#define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
-#define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
-#define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
-#define RSA_R_KEY_SIZE_TOO_SMALL                         120
-#define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
-#define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
-#define RSA_R_OAEP_DECODING_ERROR                        121
-#define RSA_R_PADDING_CHECK_FAILED                       114
-#define RSA_R_P_NOT_PRIME                                128
-#define RSA_R_Q_NOT_PRIME                                129
-#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
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/rsa/rsa_chk.c b/src/lib/libcrypto/rsa/rsa_chk.c
deleted file mode 100644
index 91b9115798..0000000000
--- a/src/lib/libcrypto/rsa/rsa_chk.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* crypto/rsa/rsa_chk.c  -*- Mode: C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/rsa.h>
-
-
-int RSA_check_key(RSA *key)
-        {
-        BIGNUM *i, *j, *k, *l, *m;
-        BN_CTX *ctx;
-        int r;
-        int ret=1;
-        
-        i = BN_new();
-        j = BN_new();
-        k = BN_new();
-        l = BN_new();
-        m = BN_new();
-        ctx = BN_CTX_new();
-        if (i == NULL || j == NULL || k == NULL || l == NULL ||
-                m == NULL || ctx == NULL)
-                {
-                ret = -1;
-                RSAerr(RSA_F_RSA_CHECK_KEY, ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        
-        /* p prime? */
-        r = BN_is_prime(key->p, BN_prime_checks, NULL, NULL, NULL);
-        if (r != 1)
-                {
-                ret = r;
-                if (r != 0)
-                        goto err;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_P_NOT_PRIME);
-                }
-        
-        /* q prime? */
-        r = BN_is_prime(key->q, BN_prime_checks, NULL, NULL, NULL);
-        if (r != 1)
-                {
-                ret = r;
-                if (r != 0)
-                        goto err;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_Q_NOT_PRIME);
-                }
-        
-        /* n = p*q? */
-        r = BN_mul(i, key->p, key->q, ctx);
-        if (!r) { ret = -1; goto err; }
-        
-        if (BN_cmp(i, key->n) != 0)
-                {
-                ret = 0;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_N_DOES_NOT_EQUAL_P_Q);
-                }
-        
-        /* d*e = 1  mod lcm(p-1,q-1)? */
-
-        r = BN_sub(i, key->p, BN_value_one());
-        if (!r) { ret = -1; goto err; }
-        r = BN_sub(j, key->q, BN_value_one());
-        if (!r) { ret = -1; goto err; }
-
-        /* now compute k = lcm(i,j) */
-        r = BN_mul(l, i, j, ctx);
-        if (!r) { ret = -1; goto err; }
-        r = BN_gcd(m, i, j, ctx);
-        if (!r) { ret = -1; goto err; }
-        r = BN_div(k, NULL, l, m, ctx); /* remainder is 0 */
-        if (!r) { ret = -1; goto err; }
-
-        r = BN_mod_mul(i, key->d, key->e, k, ctx);
-        if (!r) { ret = -1; goto err; }
-
-        if (!BN_is_one(i))
-                {
-                ret = 0;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_D_E_NOT_CONGRUENT_TO_1);
-                }
-        
-        if (key->dmp1 != NULL && key->dmq1 != NULL && key->iqmp != NULL)
-                {
-                /* dmp1 = d mod (p-1)? */
-                r = BN_sub(i, key->p, BN_value_one());
-                if (!r) { ret = -1; goto err; }
-
-                r = BN_mod(j, key->d, i, ctx);
-                if (!r) { ret = -1; goto err; }
-
-                if (BN_cmp(j, key->dmp1) != 0)
-                        {
-                        ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                                RSA_R_DMP1_NOT_CONGRUENT_TO_D);
-                        }
-        
-                /* dmq1 = d mod (q-1)? */    
-                r = BN_sub(i, key->q, BN_value_one());
-                if (!r) { ret = -1; goto err; }
-        
-                r = BN_mod(j, key->d, i, ctx);
-                if (!r) { ret = -1; goto err; }
-
-                if (BN_cmp(j, key->dmq1) != 0)
-                        {
-                        ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                                RSA_R_DMQ1_NOT_CONGRUENT_TO_D);
-                        }
-        
-                /* iqmp = q^-1 mod p? */
-                if(!BN_mod_inverse(i, key->q, key->p, ctx))
-                        {
-                        ret = -1;
-                        goto err;
-                        }
-
-                if (BN_cmp(i, key->iqmp) != 0)
-                        {
-                        ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                                RSA_R_IQMP_NOT_INVERSE_OF_Q);
-                        }
-                }
-
- err:
-        if (i != NULL) BN_free(i);
-        if (j != NULL) BN_free(j);
-        if (k != NULL) BN_free(k);
-        if (l != NULL) BN_free(l);
-        if (m != NULL) BN_free(m);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return (ret);
-        }
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
deleted file mode 100644
index 776324860c..0000000000
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ /dev/null
@@ -1,288 +0,0 @@
-
-/* This file has been explicitly broken by ryker for OpenBSD, July
- * 1, 1998. In spite of the title, there is no implementation of the
- * RSA algorithm left in this file. All these routines will return an
- * error and fail when called. They exist as stubs and can be
- * ressurected from the bit bucket by someone in the free world once
- * the RSA algorithm is no longer subject to patent problems. Eric
- * Young's original copyright is below. 
- */
-
-/* crypto/rsa/rsa_eay.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-
-static int RSA_eay_public_encrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_encrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_public_decrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_decrypt(int flen, unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *i, RSA *rsa);
-static int RSA_eay_init(RSA *rsa);
-static int RSA_eay_finish(RSA *rsa);
-static RSA_METHOD rsa_pkcs1_eay_meth={
-        "Eric Young's PKCS#1 RSA",
-        RSA_eay_public_encrypt,
-        RSA_eay_public_decrypt,
-        RSA_eay_private_encrypt,
-        RSA_eay_private_decrypt,
-        RSA_eay_mod_exp,
-        BN_mod_exp_mont,
-        RSA_eay_init,
-        RSA_eay_finish,
-        0,
-        NULL,
-        };
-
-RSA_METHOD *RSA_PKCS1_SSLeay(void)
-        {
-        return(&rsa_pkcs1_eay_meth);
-        }
-
-static int RSA_eay_public_encrypt(int flen, unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        num=BN_num_bytes(rsa->n);
-        if ((buf=(unsigned char *)Malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);
-                break;
-#ifndef NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);
-                break;
-#endif
-        case RSA_SSLV23_PADDING:
-                i=RSA_padding_add_SSLv23(buf,num,from,flen);
-                break;
-        case RSA_NO_PADDING:
-                i=RSA_padding_add_none(buf,num,from,flen);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (i <= 0) goto err;
-
-        if (BN_bin2bn(buf,num,&f) == NULL) goto err;
-        
-        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
-                {
-                if ((rsa->_method_mod_n=BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set(rsa->_method_mod_n,rsa->n,ctx))
-                            goto err;
-                }
-
-        if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
-                rsa->_method_mod_n)) goto err;
-
-        /* put in leading 0 bytes if the number is less than the
-         * length of the modulus */
-        j=BN_num_bytes(&ret);
-        i=BN_bn2bin(&ret,&(to[num-j]));
-        for (k=0; k<(num-i); k++)
-                to[k]=0;
-
-        r=num;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL) 
-                {
-                memset(buf,0,num);
-                Free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_private_encrypt(int flen, unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        /* Body of this routine removed for OpenBSD - will return
-         * when the RSA patent expires
-         */
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&ret);
-        BN_clear_free(&f);
-        if (buf != NULL)
-                {
-                memset(buf,0,num);
-                Free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_private_decrypt(int flen, unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int j,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        /* Body of this routine removed for OpenBSD - will return
-         * when the RSA patent expires
-         */
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL)
-                {
-                memset(buf,0,num);
-                Free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_public_decrypt(int flen, unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        /* Body of this routine removed for OpenBSD - will return
-         * when the RSA patent expires
-         */
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL)
-                {
-                memset(buf,0,num);
-                Free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
-        {
-        BIGNUM r1,m1;
-        int ret=0;
-        BN_CTX *ctx;
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        BN_init(&m1);
-        BN_init(&r1);
-
-        /* Body of this routine removed for OpenBSD - will return
-         * when the RSA patent expires
-         */
-err:
-        BN_clear_free(&m1);
-        BN_clear_free(&r1);
-        BN_CTX_free(ctx);
-        return(ret);
-        }
-
-static int RSA_eay_init(RSA *rsa)
-        {
-        rsa->flags|=RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE;
-        return(1);
-        }
-
-static int RSA_eay_finish(RSA *rsa)
-        {
-        if (rsa->_method_mod_n != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_n);
-        if (rsa->_method_mod_p != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_p);
-        if (rsa->_method_mod_q != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_q);
-        return(1);
-        }
-
-
diff --git a/src/lib/libcrypto/rsa/rsa_err.c b/src/lib/libcrypto/rsa/rsa_err.c
deleted file mode 100644
index 9fb15e398d..0000000000
--- a/src/lib/libcrypto/rsa/rsa_err.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* crypto/rsa/rsa_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/rsa.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA RSA_str_functs[]=
-        {
-{ERR_PACK(0,RSA_F_MEMORY_LOCK,0),       "MEMORY_LOCK"},
-{ERR_PACK(0,RSA_F_RSA_CHECK_KEY,0),     "RSA_check_key"},
-{ERR_PACK(0,RSA_F_RSA_EAY_PRIVATE_DECRYPT,0),   "RSA_EAY_PRIVATE_DECRYPT"},
-{ERR_PACK(0,RSA_F_RSA_EAY_PRIVATE_ENCRYPT,0),   "RSA_EAY_PRIVATE_ENCRYPT"},
-{ERR_PACK(0,RSA_F_RSA_EAY_PUBLIC_DECRYPT,0),    "RSA_EAY_PUBLIC_DECRYPT"},
-{ERR_PACK(0,RSA_F_RSA_EAY_PUBLIC_ENCRYPT,0),    "RSA_EAY_PUBLIC_ENCRYPT"},
-{ERR_PACK(0,RSA_F_RSA_GENERATE_KEY,0),  "RSA_generate_key"},
-{ERR_PACK(0,RSA_F_RSA_NEW_METHOD,0),    "RSA_new_method"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_ADD_NONE,0),      "RSA_padding_add_none"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_ADD_PKCS1_OAEP,0),        "RSA_padding_add_PKCS1_OAEP"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1,0),      "RSA_padding_add_PKCS1_type_1"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2,0),      "RSA_padding_add_PKCS1_type_2"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_ADD_SSLV23,0),    "RSA_padding_add_SSLv23"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_CHECK_NONE,0),    "RSA_padding_check_none"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP,0),      "RSA_padding_check_PKCS1_OAEP"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,0),    "RSA_padding_check_PKCS1_type_1"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,0),    "RSA_padding_check_PKCS1_type_2"},
-{ERR_PACK(0,RSA_F_RSA_PADDING_CHECK_SSLV23,0),  "RSA_padding_check_SSLv23"},
-{ERR_PACK(0,RSA_F_RSA_PRINT,0), "RSA_print"},
-{ERR_PACK(0,RSA_F_RSA_PRINT_FP,0),      "RSA_print_fp"},
-{ERR_PACK(0,RSA_F_RSA_SIGN,0),  "RSA_sign"},
-{ERR_PACK(0,RSA_F_RSA_SIGN_ASN1_OCTET_STRING,0),        "RSA_sign_ASN1_OCTET_STRING"},
-{ERR_PACK(0,RSA_F_RSA_VERIFY,0),        "RSA_verify"},
-{ERR_PACK(0,RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,0),      "RSA_verify_ASN1_OCTET_STRING"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA RSA_str_reasons[]=
-        {
-{RSA_R_ALGORITHM_MISMATCH                ,"algorithm mismatch"},
-{RSA_R_BAD_E_VALUE                       ,"bad e value"},
-{RSA_R_BAD_FIXED_HEADER_DECRYPT          ,"bad fixed header decrypt"},
-{RSA_R_BAD_PAD_BYTE_COUNT                ,"bad pad byte count"},
-{RSA_R_BAD_SIGNATURE                     ,"bad signature"},
-{RSA_R_BLOCK_TYPE_IS_NOT_01              ,"block type is not 01"},
-{RSA_R_BLOCK_TYPE_IS_NOT_02              ,"block type is not 02"},
-{RSA_R_DATA_GREATER_THAN_MOD_LEN         ,"data greater than mod len"},
-{RSA_R_DATA_TOO_LARGE                    ,"data too large"},
-{RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE       ,"data too large for key size"},
-{RSA_R_DATA_TOO_SMALL                    ,"data too small"},
-{RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE       ,"data too small for key size"},
-{RSA_R_D_E_NOT_CONGRUENT_TO_1            ,"d e not congruent to 1"},
-{RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY        ,"digest too big for rsa key"},
-{RSA_R_DMP1_NOT_CONGRUENT_TO_D           ,"dmp1 not congruent to d"},
-{RSA_R_DMQ1_NOT_CONGRUENT_TO_D           ,"dmq1 not congruent to d"},
-{RSA_R_IQMP_NOT_INVERSE_OF_Q             ,"iqmp not inverse of q"},
-{RSA_R_KEY_SIZE_TOO_SMALL                ,"key size too small"},
-{RSA_R_NULL_BEFORE_BLOCK_MISSING         ,"null before block missing"},
-{RSA_R_N_DOES_NOT_EQUAL_P_Q              ,"n does not equal p q"},
-{RSA_R_OAEP_DECODING_ERROR               ,"oaep decoding error"},
-{RSA_R_PADDING_CHECK_FAILED              ,"padding check failed"},
-{RSA_R_P_NOT_PRIME                       ,"p not prime"},
-{RSA_R_Q_NOT_PRIME                       ,"q not prime"},
-{RSA_R_SSLV3_ROLLBACK_ATTACK             ,"sslv3 rollback attack"},
-{RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD,"the asn1 object identifier is not known for this md"},
-{RSA_R_UNKNOWN_ALGORITHM_TYPE            ,"unknown algorithm type"},
-{RSA_R_UNKNOWN_PADDING_TYPE              ,"unknown padding type"},
-{RSA_R_WRONG_SIGNATURE_LENGTH            ,"wrong signature length"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_RSA_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_RSA,RSA_str_functs);
-                ERR_load_strings(ERR_LIB_RSA,RSA_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/rsa/rsa_gen.c b/src/lib/libcrypto/rsa/rsa_gen.c
deleted file mode 100644
index 3227dba794..0000000000
--- a/src/lib/libcrypto/rsa/rsa_gen.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/rsa/rsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-
-RSA *RSA_generate_key(int bits, unsigned long e_value,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        RSA *rsa=NULL;
-        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL,*tmp;
-        int bitsp,bitsq,ok= -1,n=0,i;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        ctx2=BN_CTX_new();
-        if (ctx2 == NULL) goto err;
-
-        /* Body of this routine removed for OpenBSD - will return
-         * when the RSA patent expires
-         */
-
-err:
-        if (ok == -1)
-                {
-                RSAerr(RSA_F_RSA_GENERATE_KEY,ERR_LIB_BN);
-                ok=0;
-                }
-        BN_CTX_free(ctx);
-        BN_CTX_free(ctx2);
-        
-        if (!ok)
-                {
-                if (rsa != NULL) RSA_free(rsa);
-                return(NULL);
-                }
-        else
-                return(rsa);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c
deleted file mode 100644
index c0ca2923a6..0000000000
--- a/src/lib/libcrypto/rsa/rsa_lib.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* crypto/rsa/rsa_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 <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-
-const char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
-
-static RSA_METHOD *default_RSA_meth=NULL;
-static int rsa_meth_num=0;
-static STACK *rsa_meth=NULL;
-
-RSA *RSA_new(void)
-        {
-        return(RSA_new_method(NULL));
-        }
-
-void RSA_set_default_method(RSA_METHOD *meth)
-        {
-        default_RSA_meth=meth;
-        }
-
-RSA_METHOD *RSA_get_default_method(void)
-{
-        return default_RSA_meth;
-}
-
-RSA_METHOD *RSA_get_method(RSA *rsa)
-{
-        return rsa->meth;
-}
-
-RSA_METHOD *RSA_set_method(RSA *rsa, RSA_METHOD *meth)
-{
-        RSA_METHOD *mtmp;
-        mtmp = rsa->meth;
-        if (mtmp->finish) mtmp->finish(rsa);
-        rsa->meth = meth;
-        if (meth->init) meth->init(rsa);
-        return mtmp;
-}
-
-RSA *RSA_new_method(RSA_METHOD *meth)
-        {
-        RSA *ret;
-
-        if (default_RSA_meth == NULL)
-                {
-#ifdef RSAref
-                default_RSA_meth=RSA_PKCS1_RSAref();
-#else
-                default_RSA_meth=RSA_PKCS1_SSLeay();
-#endif
-                }
-        ret=(RSA *)Malloc(sizeof(RSA));
-        if (ret == NULL)
-                {
-                RSAerr(RSA_F_RSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-
-        if (meth == NULL)
-                ret->meth=default_RSA_meth;
-        else
-                ret->meth=meth;
-
-        ret->pad=0;
-        ret->version=0;
-        ret->n=NULL;
-        ret->e=NULL;
-        ret->d=NULL;
-        ret->p=NULL;
-        ret->q=NULL;
-        ret->dmp1=NULL;
-        ret->dmq1=NULL;
-        ret->iqmp=NULL;
-        ret->references=1;
-        ret->_method_mod_n=NULL;
-        ret->_method_mod_p=NULL;
-        ret->_method_mod_q=NULL;
-        ret->blinding=NULL;
-        ret->bignum_data=NULL;
-        ret->flags=ret->meth->flags;
-        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
-                {
-                Free(ret);
-                ret=NULL;
-                }
-        else
-                CRYPTO_new_ex_data(rsa_meth,(char *)ret,&ret->ex_data);
-        return(ret);
-        }
-
-void RSA_free(RSA *r)
-        {
-        int i;
-
-        if (r == NULL) return;
-
-        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_RSA);
-#ifdef REF_PRINT
-        REF_PRINT("RSA",r);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"RSA_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        CRYPTO_free_ex_data(rsa_meth,(char *)r,&r->ex_data);
-
-        if (r->meth->finish != NULL)
-                r->meth->finish(r);
-
-        if (r->n != NULL) BN_clear_free(r->n);
-        if (r->e != NULL) BN_clear_free(r->e);
-        if (r->d != NULL) BN_clear_free(r->d);
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->q != NULL) BN_clear_free(r->q);
-        if (r->dmp1 != NULL) BN_clear_free(r->dmp1);
-        if (r->dmq1 != NULL) BN_clear_free(r->dmq1);
-        if (r->iqmp != NULL) BN_clear_free(r->iqmp);
-        if (r->blinding != NULL) BN_BLINDING_free(r->blinding);
-        if (r->bignum_data != NULL) Free_locked(r->bignum_data);
-        Free(r);
-        }
-
-int RSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-             int (*dup_func)(), void (*free_func)())
-        {
-        rsa_meth_num++;
-        return(CRYPTO_get_ex_new_index(rsa_meth_num-1,
-                &rsa_meth,argl,argp,new_func,dup_func,free_func));
-        }
-
-int RSA_set_ex_data(RSA *r, int idx, char *arg)
-        {
-        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
-        }
-
-char *RSA_get_ex_data(RSA *r, int idx)
-        {
-        return(CRYPTO_get_ex_data(&r->ex_data,idx));
-        }
-
-int RSA_size(RSA *r)
-        {
-        return(BN_num_bytes(r->n));
-        }
-
-int RSA_public_encrypt(int flen, unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding));
-        }
-
-int RSA_private_encrypt(int flen, unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding));
-        }
-
-int RSA_private_decrypt(int flen, unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding));
-        }
-
-int RSA_public_decrypt(int flen, unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding));
-        }
-
-int RSA_flags(RSA *r)
-        {
-        return((r == NULL)?0:r->meth->flags);
-        }
-
-void RSA_blinding_off(RSA *rsa)
-        {
-        if (rsa->blinding != NULL)
-                {
-                BN_BLINDING_free(rsa->blinding);
-                rsa->blinding=NULL;
-                }
-        rsa->flags&= ~RSA_FLAG_BLINDING;
-        }
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
-        {
-        BIGNUM *A,*Ai;
-        BN_CTX *ctx;
-        int ret=0;
-
-        if (p_ctx == NULL)
-                {
-                if ((ctx=BN_CTX_new()) == NULL) goto err;
-                }
-        else
-                ctx=p_ctx;
-
-        if (rsa->blinding != NULL)
-                BN_BLINDING_free(rsa->blinding);
-
-        A= &(ctx->bn[0]);
-        ctx->tos++;
-        if (!BN_rand(A,BN_num_bits(rsa->n)-1,1,0)) goto err;
-        if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;
-
-        if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))
-            goto err;
-        rsa->blinding=BN_BLINDING_new(A,Ai,rsa->n);
-        ctx->tos--;
-        rsa->flags|=RSA_FLAG_BLINDING;
-        BN_free(Ai);
-        ret=1;
-err:
-        if (ctx != p_ctx) BN_CTX_free(ctx);
-        return(ret);
-        }
-
-int RSA_memory_lock(RSA *r)
-        {
-        int i,j,k,off;
-        char *p;
-        BIGNUM *bn,**t[6],*b;
-        BN_ULONG *ul;
-
-        if (r->d == NULL) return(1);
-        t[0]= &r->d;
-        t[1]= &r->p;
-        t[2]= &r->q;
-        t[3]= &r->dmp1;
-        t[4]= &r->dmq1;
-        t[5]= &r->iqmp;
-        k=sizeof(BIGNUM)*6;
-        off=k/sizeof(BN_ULONG)+1;
-        j=1;
-        for (i=0; i<6; i++)
-                j+= (*t[i])->top;
-        if ((p=Malloc_locked((off+j)*sizeof(BN_ULONG))) == NULL)
-                {
-                RSAerr(RSA_F_MEMORY_LOCK,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        bn=(BIGNUM *)p;
-        ul=(BN_ULONG *)&(p[off]);
-        for (i=0; i<6; i++)
-                {
-                b= *(t[i]);
-                *(t[i])= &(bn[i]);
-                memcpy((char *)&(bn[i]),(char *)b,sizeof(BIGNUM));
-                bn[i].flags=BN_FLG_STATIC_DATA;
-                bn[i].d=ul;
-                memcpy((char *)ul,b->d,sizeof(BN_ULONG)*b->top);
-                ul+=b->top;
-                BN_clear_free(b);
-                }
-        
-        /* I should fix this so it can still be done */
-        r->flags&= ~(RSA_FLAG_CACHE_PRIVATE|RSA_FLAG_CACHE_PUBLIC);
-
-        r->bignum_data=p;
-        return(1);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_none.c b/src/lib/libcrypto/rsa/rsa_none.c
deleted file mode 100644
index f22fce5016..0000000000
--- a/src/lib/libcrypto/rsa/rsa_none.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* crypto/rsa/rsa_none.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 <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-
-int RSA_padding_add_none(unsigned char *to, int tlen, unsigned char *from,
-             int flen)
-        {
-        if (flen > tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return(0);
-                }
-
-        if (flen < tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE);
-                return(0);
-                }
-        
-        memcpy(to,from,(unsigned int)flen);
-        return(1);
-        }
-
-int RSA_padding_check_none(unsigned char *to, int tlen, unsigned char *from,
-             int flen, int num)
-        {
-
-        if (flen > tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_NONE,RSA_R_DATA_TOO_LARGE);
-                return(-1);
-                }
-
-        memset(to,0,tlen-flen);
-        memcpy(to+tlen-flen,from,flen);
-        return(tlen);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c
deleted file mode 100644
index 843c40c864..0000000000
--- a/src/lib/libcrypto/rsa/rsa_oaep.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* crypto/rsa/rsa_oaep.c */
-/* Written by Ulf Moeller. This software is distributed on an "AS IS"
-   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
-
-/* EME_OAEP as defined in RFC 2437 (PKCS #1 v2.0) */
-
-#if !defined(NO_SHA) && !defined(NO_SHA1)
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/sha.h>
-#include <openssl/rand.h>
-
-int MGF1(unsigned char *mask, long len, unsigned char *seed, long seedlen);
-
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-             unsigned char *from, int flen, unsigned char *param, int plen)
-    {
-    int i, emlen = tlen - 1;
-    unsigned char *db, *seed;
-    unsigned char *dbmask, seedmask[SHA_DIGEST_LENGTH];
-
-    if (flen > emlen - 2 * SHA_DIGEST_LENGTH - 1)
-        {
-        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP,
-               RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-        return (0);
-        }
-
-    if (emlen < 2 * SHA_DIGEST_LENGTH + 1)
-        {
-        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, RSA_R_KEY_SIZE_TOO_SMALL);
-        return (0);
-        }
-    
-    dbmask = Malloc(emlen - SHA_DIGEST_LENGTH);
-    if (dbmask == NULL)
-        {
-        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
-        return (0);
-        }
-
-    to[0] = 0;
-    seed = to + 1;
-    db = to + SHA_DIGEST_LENGTH + 1;
-
-    SHA1(param, plen, db);
-    memset(db + SHA_DIGEST_LENGTH, 0,
-           emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
-    db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
-    memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int) flen);
-    RAND_bytes(seed, SHA_DIGEST_LENGTH);
-#ifdef PKCS_TESTVECT
-    memcpy(seed,
-           "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
-           20);
-#endif
-
-    MGF1(dbmask, emlen - SHA_DIGEST_LENGTH, seed, SHA_DIGEST_LENGTH);
-    for (i = 0; i < emlen - SHA_DIGEST_LENGTH; i++)
-        db[i] ^= dbmask[i];
-
-    MGF1(seedmask, SHA_DIGEST_LENGTH, db, emlen - SHA_DIGEST_LENGTH);
-    for (i = 0; i < SHA_DIGEST_LENGTH; i++)
-        seed[i] ^= seedmask[i];
-
-    Free(dbmask);
-    return (1);
-    }
-
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-             unsigned char *from, int flen, int num, unsigned char *param,
-             int plen)
-    {
-    int i, dblen, mlen = -1;
-    unsigned char *maskeddb;
-    int lzero;
-    unsigned char *db, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH];
-
-    if (--num < 2 * SHA_DIGEST_LENGTH + 1)
-        {
-        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
-        return (-1);
-        }
-
-    dblen = num - SHA_DIGEST_LENGTH;
-    db = Malloc(dblen);
-    if (db == NULL)
-        {
-        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
-        return (-1);
-        }
-
-    lzero = num - flen;
-    maskeddb = from - lzero + SHA_DIGEST_LENGTH;
-    
-    MGF1(seed, SHA_DIGEST_LENGTH, maskeddb, dblen);
-    for (i = lzero; i < SHA_DIGEST_LENGTH; i++)
-        seed[i] ^= from[i - lzero];
-  
-    MGF1(db, dblen, seed, SHA_DIGEST_LENGTH);
-    for (i = 0; i < dblen; i++)
-        db[i] ^= maskeddb[i];
-
-    SHA1(param, plen, phash);
-
-    if (memcmp(db, phash, SHA_DIGEST_LENGTH) != 0)
-        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
-    else
-        {
-        for (i = SHA_DIGEST_LENGTH; i < dblen; i++)
-            if (db[i] != 0x00)
-                break;
-        if (db[i] != 0x01 || i++ >= dblen)
-            RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP,
-                   RSA_R_OAEP_DECODING_ERROR);
-        else
-            {
-            mlen = dblen - i;
-            if (tlen < mlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, RSA_R_DATA_TOO_LARGE);
-                mlen = -1;
-                }
-            else
-                memcpy(to, db + i, mlen);
-            }
-        }
-    Free(db);
-    return (mlen);
-    }
-
-int MGF1(unsigned char *mask, long len, unsigned char *seed, long seedlen)
-    {
-    long i, outlen = 0;
-    unsigned char cnt[4];
-    SHA_CTX c;
-    unsigned char md[SHA_DIGEST_LENGTH];
-
-    for (i = 0; outlen < len; i++)
-        {
-        cnt[0] = (i >> 24) & 255, cnt[1] = (i >> 16) & 255,
-          cnt[2] = (i >> 8) & 255, cnt[3] = i & 255;
-        SHA1_Init(&c);
-        SHA1_Update(&c, seed, seedlen);
-        SHA1_Update(&c, cnt, 4);
-        if (outlen + SHA_DIGEST_LENGTH <= len)
-            {
-            SHA1_Final(mask + outlen, &c);
-            outlen += SHA_DIGEST_LENGTH;
-            }
-        else
-            {
-            SHA1_Final(md, &c);
-            memcpy(mask + outlen, md, len - outlen);
-            outlen = len;
-            }
-        }
-    return (0);
-    }
-#endif
diff --git a/src/lib/libcrypto/rsa/rsa_pk1.c b/src/lib/libcrypto/rsa/rsa_pk1.c
deleted file mode 100644
index f0ae51f234..0000000000
--- a/src/lib/libcrypto/rsa/rsa_pk1.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* crypto/rsa/rsa_pk1.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 <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-             unsigned char *from, int flen)
-        {
-        int j;
-        unsigned char *p;
-
-        if (flen > (tlen-11))
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return(0);
-                }
-        
-        p=(unsigned char *)to;
-
-        *(p++)=0;
-        *(p++)=1; /* Private Key BT (Block Type) */
-
-        /* padd out with 0xff data */
-        j=tlen-3-flen;
-        memset(p,0xff,j);
-        p+=j;
-        *(p++)='\0';
-        memcpy(p,from,(unsigned int)flen);
-        return(1);
-        }
-
-int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-             unsigned char *from, int flen, int num)
-        {
-        int i,j;
-        unsigned char *p;
-
-        p=from;
-        if ((num != (flen+1)) || (*(p++) != 01))
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,RSA_R_BLOCK_TYPE_IS_NOT_01);
-                return(-1);
-                }
-
-        /* scan over padding data */
-        j=flen-1; /* one for type. */
-        for (i=0; i<j; i++)
-                {
-                if (*p != 0xff) /* should decrypt to 0xff */
-                        {
-                        if (*p == 0)
-                                { p++; break; }
-                        else    {
-                                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,RSA_R_BAD_FIXED_HEADER_DECRYPT);
-                                return(-1);
-                                }
-                        }
-                p++;
-                }
-
-        if (i == j)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,RSA_R_NULL_BEFORE_BLOCK_MISSING);
-                return(-1);
-                }
-
-        if (i < 8)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1,RSA_R_BAD_PAD_BYTE_COUNT);
-                return(-1);
-                }
-        i++; /* Skip over the '\0' */
-        j-=i;
-        memcpy(to,p,(unsigned int)j);
-
-        return(j);
-        }
-
-int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-             unsigned char *from, int flen)
-        {
-        int i,j;
-        unsigned char *p;
-        
-        if (flen > (tlen-11))
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return(0);
-                }
-        
-        p=(unsigned char *)to;
-
-        *(p++)=0;
-        *(p++)=2; /* Public Key BT (Block Type) */
-
-        /* pad out with non-zero random data */
-        j=tlen-3-flen;
-
-        RAND_bytes(p,j);
-        for (i=0; i<j; i++)
-                {
-                if (*p == '\0')
-                        do      {
-                                RAND_bytes(p,1);
-                                } while (*p == '\0');
-                p++;
-                }
-
-        *(p++)='\0';
-
-        memcpy(p,from,(unsigned int)flen);
-        return(1);
-        }
-
-int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-             unsigned char *from, int flen, int num)
-        {
-        int i,j;
-        unsigned char *p;
-
-        p=from;
-        if ((num != (flen+1)) || (*(p++) != 02))
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_BLOCK_TYPE_IS_NOT_02);
-                return(-1);
-                }
-#ifdef PKCS1_CHECK
-        return(num-11);
-#endif
-
-        /* scan over padding data */
-        j=flen-1; /* one for type. */
-        for (i=0; i<j; i++)
-                if (*(p++) == 0) break;
-
-        if (i == j)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_NULL_BEFORE_BLOCK_MISSING);
-                return(-1);
-                }
-
-        if (i < 8)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_BAD_PAD_BYTE_COUNT);
-                return(-1);
-                }
-        i++; /* Skip over the '\0' */
-        j-=i;
-        memcpy(to,p,(unsigned int)j);
-
-        return(j);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c
deleted file mode 100644
index 73b8b0c7ad..0000000000
--- a/src/lib/libcrypto/rsa/rsa_saos.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* crypto/rsa/rsa_saos.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 <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa)
-        {
-        ASN1_OCTET_STRING sig;
-        int i,j,ret=1;
-        unsigned char *p,*s;
-
-        sig.type=V_ASN1_OCTET_STRING;
-        sig.length=m_len;
-        sig.data=m;
-
-        i=i2d_ASN1_OCTET_STRING(&sig,NULL);
-        j=RSA_size(rsa);
-        if ((i-RSA_PKCS1_PADDING) > j)
-                {
-                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
-                return(0);
-                }
-        s=(unsigned char *)Malloc((unsigned int)j+1);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        p=s;
-        i2d_ASN1_OCTET_STRING(&sig,&p);
-        i=RSA_private_encrypt(i,s,sigret,rsa,RSA_PKCS1_PADDING);
-        if (i <= 0)
-                ret=0;
-        else
-                *siglen=i;
-
-        memset(s,0,(unsigned int)j+1);
-        Free(s);
-        return(ret);
-        }
-
-int RSA_verify_ASN1_OCTET_STRING(int dtype, unsigned char *m,
-             unsigned int m_len, unsigned char *sigbuf, unsigned int siglen,
-             RSA *rsa)
-        {
-        int i,ret=0;
-        unsigned char *p,*s;
-        ASN1_OCTET_STRING *sig=NULL;
-
-        if (siglen != (unsigned int)RSA_size(rsa))
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,RSA_R_WRONG_SIGNATURE_LENGTH);
-                return(0);
-                }
-
-        s=(unsigned char *)Malloc((unsigned int)siglen);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
-
-        if (i <= 0) goto err;
-
-        p=s;
-        sig=d2i_ASN1_OCTET_STRING(NULL,&p,(long)i);
-        if (sig == NULL) goto err;
-
-        if (    ((unsigned int)sig->length != m_len) ||
-                (memcmp(m,sig->data,m_len) != 0))
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,RSA_R_BAD_SIGNATURE);
-                }
-        else
-                ret=1;
-err:
-        if (sig != NULL) ASN1_OCTET_STRING_free(sig);
-        memset(s,0,(unsigned int)siglen);
-        Free(s);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_sign.c b/src/lib/libcrypto/rsa/rsa_sign.c
deleted file mode 100644
index 1740494a4c..0000000000
--- a/src/lib/libcrypto/rsa/rsa_sign.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* crypto/rsa/rsa_sign.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 <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int RSA_sign(int type, unsigned char *m, unsigned int m_len,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa)
-        {
-        X509_SIG sig;
-        ASN1_TYPE parameter;
-        int i,j,ret=1;
-        unsigned char *p,*s;
-        X509_ALGOR algor;
-        ASN1_OCTET_STRING digest;
-
-        sig.algor= &algor;
-        sig.algor->algorithm=OBJ_nid2obj(type);
-        if (sig.algor->algorithm == NULL)
-                {
-                RSAerr(RSA_F_RSA_SIGN,RSA_R_UNKNOWN_ALGORITHM_TYPE);
-                return(0);
-                }
-        if (sig.algor->algorithm->length == 0)
-                {
-                RSAerr(RSA_F_RSA_SIGN,RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
-                return(0);
-                }
-        parameter.type=V_ASN1_NULL;
-        parameter.value.ptr=NULL;
-        sig.algor->parameter= &parameter;
-
-        sig.digest= &digest;
-        sig.digest->data=m;
-        sig.digest->length=m_len;
-
-        i=i2d_X509_SIG(&sig,NULL);
-        j=RSA_size(rsa);
-        if ((i-RSA_PKCS1_PADDING) > j)
-                {
-                RSAerr(RSA_F_RSA_SIGN,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
-                return(0);
-                }
-        s=(unsigned char *)Malloc((unsigned int)j+1);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_SIGN,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        p=s;
-        i2d_X509_SIG(&sig,&p);
-        i=RSA_private_encrypt(i,s,sigret,rsa,RSA_PKCS1_PADDING);
-        if (i <= 0)
-                ret=0;
-        else
-                *siglen=i;
-
-        memset(s,0,(unsigned int)j+1);
-        Free(s);
-        return(ret);
-        }
-
-int RSA_verify(int dtype, unsigned char *m, unsigned int m_len,
-             unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
-        {
-        int i,ret=0,sigtype;
-        unsigned char *p,*s;
-        X509_SIG *sig=NULL;
-
-        if (siglen != (unsigned int)RSA_size(rsa))
-                {
-                RSAerr(RSA_F_RSA_VERIFY,RSA_R_WRONG_SIGNATURE_LENGTH);
-                return(0);
-                }
-
-        s=(unsigned char *)Malloc((unsigned int)siglen);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_VERIFY,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
-
-        if (i <= 0) goto err;
-
-        p=s;
-        sig=d2i_X509_SIG(NULL,&p,(long)i);
-
-        if (sig == NULL) goto err;
-        sigtype=OBJ_obj2nid(sig->algor->algorithm);
-
-
-#ifdef RSA_DEBUG
-        /* put a backward compatability flag in EAY */
-        fprintf(stderr,"in(%s) expect(%s)\n",OBJ_nid2ln(sigtype),
-                OBJ_nid2ln(dtype));
-#endif
-        if (sigtype != dtype)
-                {
-                if (((dtype == NID_md5) &&
-                        (sigtype == NID_md5WithRSAEncryption)) ||
-                        ((dtype == NID_md2) &&
-                        (sigtype == NID_md2WithRSAEncryption)))
-                        {
-                        /* ok, we will let it through */
-#if !defined(NO_STDIO) && !defined(WIN16)
-                        fprintf(stderr,"signature has problems, re-make with post SSLeay045\n");
-#endif
-                        }
-                else
-                        {
-                        RSAerr(RSA_F_RSA_VERIFY,RSA_R_ALGORITHM_MISMATCH);
-                        goto err;
-                        }
-                }
-        if (    ((unsigned int)sig->digest->length != m_len) ||
-                (memcmp(m,sig->digest->data,m_len) != 0))
-                {
-                RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
-                }
-        else
-                ret=1;
-err:
-        if (sig != NULL) X509_SIG_free(sig);
-        memset(s,0,(unsigned int)siglen);
-        Free(s);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/rsa/rsa_ssl.c b/src/lib/libcrypto/rsa/rsa_ssl.c
deleted file mode 100644
index 1050844f8d..0000000000
--- a/src/lib/libcrypto/rsa/rsa_ssl.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* crypto/rsa/rsa_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 "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-
-int RSA_padding_add_SSLv23(unsigned char *to, int tlen, unsigned char *from,
-             int flen)
-        {
-        int i,j;
-        unsigned char *p;
-        
-        if (flen > (tlen-11))
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_SSLV23,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return(0);
-                }
-        
-        p=(unsigned char *)to;
-
-        *(p++)=0;
-        *(p++)=2; /* Public Key BT (Block Type) */
-
-        /* pad out with non-zero random data */
-        j=tlen-3-8-flen;
-
-        RAND_bytes(p,j);
-        for (i=0; i<j; i++)
-                {
-                if (*p == '\0')
-                        do      {
-                                RAND_bytes(p,1);
-                                } while (*p == '\0');
-                p++;
-                }
-
-        memset(p,3,8);
-        p+=8;
-        *(p++)='\0';
-
-        memcpy(p,from,(unsigned int)flen);
-        return(1);
-        }
-
-int RSA_padding_check_SSLv23(unsigned char *to, int tlen, unsigned char *from,
-             int flen, int num)
-        {
-        int i,j,k;
-        unsigned char *p;
-
-        p=from;
-        if (flen < 10)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_DATA_TOO_SMALL);
-                return(-1);
-                }
-        if ((num != (flen+1)) || (*(p++) != 02))
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_BLOCK_TYPE_IS_NOT_02);
-                return(-1);
-                }
-
-        /* scan over padding data */
-        j=flen-1; /* one for type */
-        for (i=0; i<j; i++)
-                if (*(p++) == 0) break;
-
-        if ((i == j) || (i < 8))
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_NULL_BEFORE_BLOCK_MISSING);
-                return(-1);
-                }
-        for (k= -8; k<0; k++)
-                {
-                if (p[k] !=  0x03) break;
-                }
-        if (k == 0)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_SSLV3_ROLLBACK_ATTACK);
-                return(-1);
-                }
-
-        i++; /* Skip over the '\0' */
-        j-=i;
-        memcpy(to,p,(unsigned int)j);
-
-        return(j);
-        }
-
diff --git a/src/lib/libcrypto/sha/asm/sha1-586.pl b/src/lib/libcrypto/sha/asm/sha1-586.pl
deleted file mode 100644
index 04e42ab09f..0000000000
--- a/src/lib/libcrypto/sha/asm/sha1-586.pl
+++ /dev/null
@@ -1,491 +0,0 @@
-#!/usr/local/bin/perl
-
-$normal=0;
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],"sha1-586.pl",$ARGV[$#ARGV] eq "386");
-
-$A="eax";
-$B="ebx";
-$C="ecx";
-$D="edx";
-$E="edi";
-$T="esi";
-$tmp1="ebp";
-
-$off=9*4;
-
-@K=(0x5a827999,0x6ed9eba1,0x8f1bbcdc,0xca62c1d6);
-
-&sha1_block("sha1_block_x86");
-
-&asm_finish();
-
-sub Nn
-        {
-        local($p)=@_;
-        local(%n)=($A,$T,$B,$A,$C,$B,$D,$C,$E,$D,$T,$E);
-        return($n{$p});
-        }
-
-sub Np
-        {
-        local($p)=@_;
-        local(%n)=($A,$T,$B,$A,$C,$B,$D,$C,$E,$D,$T,$E);
-        local(%n)=($A,$B,$B,$C,$C,$D,$D,$E,$E,$T,$T,$A);
-        return($n{$p});
-        }
-
-sub Na
-        {
-        local($n)=@_;
-        return( (($n   )&0x0f),
-                (($n+ 2)&0x0f),
-                (($n+ 8)&0x0f),
-                (($n+13)&0x0f),
-                (($n+ 1)&0x0f));
-        }
-
-sub X_expand
-        {
-        local($in)=@_;
-
-        &comment("First, load the words onto the stack in network byte order");
-        for ($i=0; $i<16; $i++)
-                {
-                &mov("eax",&DWP(($i+0)*4,$in,"",0)) unless $i == 0;
-                &bswap("eax");
-                &mov(&swtmp($i+0),"eax");
-                }
-
-        &comment("We now have the X array on the stack");
-        &comment("starting at sp-4");
-        }
-
-# Rules of engagement
-# F is always trashable at the start, the running total.
-# E becomes the next F so it can be trashed after it has been 'accumulated'
-# F becomes A in the next round.  We don't need to access it much.
-# During the X update part, the result ends up in $X[$n0].
-
-sub BODY_00_15
-        {
-        local($pos,$K,$X,$n,$a,$b,$c,$d,$e,$f)=@_;
-
-return if $n & 1;
-        &comment("00_15 $n");
-
-         &mov($f,$c);
-
-        &mov($tmp1,$a);
-         &xor($f,$d);                   # F2
-
-        &rotl($tmp1,5);                 # A2
-
-        &and($f,$b);                    # F3
-         &add($tmp1,$e);
-
-        &rotr($b,1);                    # B1    <- F
-         &mov($e,&swtmp($n));           # G1
-
-        &rotr($b,1);                    # B1    <- F
-         &xor($f,$d);                   # F4
-
-        &lea($tmp1,&DWP($K,$tmp1,$e,1));
-
-############################
-#       &BODY_40_59( 0,$K[2],$X,42,$A,$B,$C,$D,$E,$T);
-#       &BODY_40_59( 0,$K[2],$X,43,$T,$A,$B,$C,$D,$E);
-$n++;
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-        ($b,$c,$d,$e,$f,$a)=($a,$b,$c,$d,$e,$f);
-
-         &mov($f,$c);
-
-        &add($a,$tmp1);         # MOVED DOWN
-         &xor($f,$d);                   # F2
-
-        &mov($tmp1,$a);
-         &and($f,$b);                   # F3
-
-        &rotl($tmp1,5);                 # A2
-
-        &add($tmp1,$e);
-         &mov($e,&swtmp($n));           # G1
-
-        &rotr($b,1);                    # B1    <- F
-         &xor($f,$d);                   # F4
-
-        &rotr($b,1);                    # B1    <- F
-         &lea($tmp1,&DWP($K,$tmp1,$e,1));
-
-        &add($f,$tmp1);
-        }
-
-sub BODY_16_19
-        {
-        local($pos,$K,$X,$n,$a,$b,$c,$d,$e,$f)=@_;
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-
-return if $n & 1;
-        &comment("16_19 $n");
-
- &nop() if ($pos < 0);
-&mov($tmp1,&swtmp($n0));                        # X1
- &mov($f,&swtmp($n1));                  # X2
-&xor($f,$tmp1);                         # X3
- &mov($tmp1,&swtmp($n2));               # X4
-&xor($f,$tmp1);                         # X5
- &mov($tmp1,&swtmp($n3));               # X6
-&xor($f,$tmp1);                         # X7 - slot
- &mov($tmp1,$c);                        # F1
-&rotl($f,1);                            # X8 - slot
- &xor($tmp1,$d);                        # F2
-&mov(&swtmp($n0),$f);                   # X9 - anytime
- &and($tmp1,$b);                        # F3
-&lea($f,&DWP($K,$f,$e,1));              # tot=X+K+e
- &xor($tmp1,$d);                                # F4
-&mov($e,$a);                            # A1
- &add($f,$tmp1);                        # tot+=F();
-
-&rotl($e,5);                            # A2
-
-&rotr($b,1);                            # B1    <- F
- &add($f,$e);                           # tot+=a
-
-############################
-#       &BODY_40_59( 0,$K[2],$X,42,$A,$B,$C,$D,$E,$T);
-#       &BODY_40_59( 0,$K[2],$X,43,$T,$A,$B,$C,$D,$E);
-$n++;
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-        ($b,$c,$d,$e,$f,$a)=($a,$b,$c,$d,$e,$f);
-
-
-&mov($f,&swtmp($n0));                   # X1
- &mov($tmp1,&swtmp($n1));               # X2
-&xor($f,$tmp1);                         # X3
- &mov($tmp1,&swtmp($n2));               # X4
-&xor($f,$tmp1);                         # X5
- &mov($tmp1,&swtmp($n3));               # X6
-&rotr($c,1); #&rotr($b,1);              # B1    <- F # MOVED DOWN
- &xor($f,$tmp1);                                # X7 - slot
-&rotl($f,1);                            # X8 - slot
- &mov($tmp1,$c);                        # F1
-&xor($tmp1,$d);                 # F2
- &mov(&swtmp($n0),$f);                  # X9 - anytime
-&and($tmp1,$b);                 # F3
- &lea($f,&DWP($K,$f,$e,1));             # tot=X+K+e
-
-&xor($tmp1,$d);                         # F4
- &mov($e,$a);                           # A1
-
-&rotl($e,5);                            # A2
-
-&rotr($b,1);                            # B1    <- F
- &add($f,$e);                           # tot+=a
-
-&rotr($b,1);                            # B1    <- F
- &add($f,$tmp1);                        # tot+=F();
-
-        }
-
-sub BODY_20_39
-        {
-        local($pos,$K,$X,$n,$a,$b,$c,$d,$e,$f)=@_;
-
-        &comment("20_39 $n");
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-
-&mov($f,&swtmp($n0));                   # X1
- &mov($tmp1,&swtmp($n1));               # X2
-&xor($f,$tmp1);                         # X3
- &mov($tmp1,&swtmp($n2));               # X4
-&xor($f,$tmp1);                         # X5
- &mov($tmp1,&swtmp($n3));               # X6
-&xor($f,$tmp1);                         # X7 - slot
- &mov($tmp1,$b);                        # F1
-&rotl($f,1);                            # X8 - slot
- &xor($tmp1,$c);                        # F2
-&mov(&swtmp($n0),$f);                   # X9 - anytime
- &xor($tmp1,$d);                        # F3
-
-&lea($f,&DWP($K,$f,$e,1));              # tot=X+K+e
- &mov($e,$a);                           # A1
-
-&rotl($e,5);                            # A2
-
-if ($n != 79) # last loop       
-        {
-        &rotr($b,1);                            # B1    <- F
-         &add($e,$tmp1);                        # tmp1=F()+a
-
-        &rotr($b,1);                            # B2    <- F
-         &add($f,$e);                           # tot+=tmp1;
-        }
-else
-        {
-        &add($e,$tmp1);                         # tmp1=F()+a
-         &mov($tmp1,&wparam(0));
-
-        &rotr($b,1);                            # B1    <- F
-         &add($f,$e);                           # tot+=tmp1;
-
-        &rotr($b,1);                            # B2    <- F
-        }
-        }
-
-sub BODY_40_59
-        {
-        local($pos,$K,$X,$n,$a,$b,$c,$d,$e,$f)=@_;
-
-        &comment("40_59 $n");
-        return if $n & 1;
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-
-&mov($f,&swtmp($n0));                   # X1
- &mov($tmp1,&swtmp($n1));               # X2
-&xor($f,$tmp1);                         # X3
- &mov($tmp1,&swtmp($n2));               # X4
-&xor($f,$tmp1);                         # X5
- &mov($tmp1,&swtmp($n3));               # X6
-&xor($f,$tmp1);                         # X7 - slot
- &mov($tmp1,$b);                        # F1
-&rotl($f,1);                            # X8 - slot
- &or($tmp1,$c);                         # F2
-&mov(&swtmp($n0),$f);                   # X9 - anytime
- &and($tmp1,$d);                        # F3
-
-&lea($f,&DWP($K,$f,$e,1));              # tot=X+K+e
- &mov($e,$b);                           # F4
-
-&rotr($b,1);                            # B1    <- F
- &and($e,$c);                           # F5
-
-&or($tmp1,$e);                          # F6
- &mov($e,$a);                           # A1
-
-&rotl($e,5);                            # A2
-
-&add($tmp1,$e);                 # tmp1=F()+a
-
-############################
-#       &BODY_40_59( 0,$K[2],$X,42,$A,$B,$C,$D,$E,$T);
-#       &BODY_40_59( 0,$K[2],$X,43,$T,$A,$B,$C,$D,$E);
-$n++;
-        local($n0,$n1,$n2,$n3,$np)=&Na($n);
-        ($b,$c,$d,$e,$f,$a)=($a,$b,$c,$d,$e,$f);
-
- &mov($f,&swtmp($n0));                  # X1
-&add($a,$tmp1);                         # tot+=tmp1; # moved was add f,tmp1
- &mov($tmp1,&swtmp($n1));               # X2
-&xor($f,$tmp1);                         # X3
- &mov($tmp1,&swtmp($n2));               # X4
-&xor($f,$tmp1);                         # X5
- &mov($tmp1,&swtmp($n3));               # X6
-&rotr($c,1);                            # B2    <- F # moved was rotr b,1
- &xor($f,$tmp1);                        # X7 - slot
-&rotl($f,1);                            # X8 - slot
- &mov($tmp1,$b);                        # F1
-&mov(&swtmp($n0),$f);                   # X9 - anytime
- &or($tmp1,$c);                         # F2
-&lea($f,&DWP($K,$f,$e,1));              # tot=X+K+e
- &mov($e,$b);                           # F4
-&and($tmp1,$d);                         # F3
- &and($e,$c);                           # F5
-
-&or($tmp1,$e);                          # F6
- &mov($e,$a);                           # A1
-
-&rotl($e,5);                            # A2
-
-&rotr($b,1);                            # B1    <- F
- &add($tmp1,$e);                        # tmp1=F()+a
-
-&rotr($b,1);                            # B2    <- F
- &add($f,$tmp1);                        # tot+=tmp1;
-        }
-
-sub BODY_60_79
-        {
-        &BODY_20_39(@_);
-        }
-
-sub sha1_block
-        {
-        local($name)=@_;
-
-        &function_begin_B($name,"");
-
-        # parameter 1 is the MD5_CTX structure.
-        # A     0
-        # B     4
-        # C     8
-        # D     12
-        # E     16
-
-        &push("esi");
-         &push("ebp");
-        &mov("eax",     &wparam(2));
-         &mov("esi",    &wparam(1));
-        &add("eax",     "esi"); # offset to leave on
-         &mov("ebp",    &wparam(0));
-        &push("ebx");
-         &sub("eax",    64);
-        &push("edi");
-         &mov($B,       &DWP( 4,"ebp","",0));
-        &stack_push(18);
-         &mov($D,       &DWP(12,"ebp","",0));
-        &mov($E,        &DWP(16,"ebp","",0));
-         &mov($C,       &DWP( 8,"ebp","",0));
-        &mov(&swtmp(17),"eax");
-
-        &comment("First we need to setup the X array");
-         &mov("eax",&DWP(0,"esi","",0)); # pulled out of X_expand
-
-        &set_label("start") unless $normal;
-
-        &X_expand("esi");
-         &mov(&swtmp(16),"esi");
-
-        &comment("");
-        &comment("Start processing");
-
-        # odd start
-        &mov($A,        &DWP( 0,"ebp","",0));
-        $X="esp";
-        &BODY_00_15(-2,$K[0],$X, 0,$A,$B,$C,$D,$E,$T);
-        &BODY_00_15( 0,$K[0],$X, 1,$T,$A,$B,$C,$D,$E);
-        &BODY_00_15( 0,$K[0],$X, 2,$E,$T,$A,$B,$C,$D);
-        &BODY_00_15( 0,$K[0],$X, 3,$D,$E,$T,$A,$B,$C);
-        &BODY_00_15( 0,$K[0],$X, 4,$C,$D,$E,$T,$A,$B);
-        &BODY_00_15( 0,$K[0],$X, 5,$B,$C,$D,$E,$T,$A);
-        &BODY_00_15( 0,$K[0],$X, 6,$A,$B,$C,$D,$E,$T);
-        &BODY_00_15( 0,$K[0],$X, 7,$T,$A,$B,$C,$D,$E);
-        &BODY_00_15( 0,$K[0],$X, 8,$E,$T,$A,$B,$C,$D);
-        &BODY_00_15( 0,$K[0],$X, 9,$D,$E,$T,$A,$B,$C);
-        &BODY_00_15( 0,$K[0],$X,10,$C,$D,$E,$T,$A,$B);
-        &BODY_00_15( 0,$K[0],$X,11,$B,$C,$D,$E,$T,$A);
-        &BODY_00_15( 0,$K[0],$X,12,$A,$B,$C,$D,$E,$T);
-        &BODY_00_15( 0,$K[0],$X,13,$T,$A,$B,$C,$D,$E);
-        &BODY_00_15( 0,$K[0],$X,14,$E,$T,$A,$B,$C,$D);
-        &BODY_00_15( 1,$K[0],$X,15,$D,$E,$T,$A,$B,$C);
-        &BODY_16_19(-1,$K[0],$X,16,$C,$D,$E,$T,$A,$B);
-        &BODY_16_19( 0,$K[0],$X,17,$B,$C,$D,$E,$T,$A);
-        &BODY_16_19( 0,$K[0],$X,18,$A,$B,$C,$D,$E,$T);
-        &BODY_16_19( 1,$K[0],$X,19,$T,$A,$B,$C,$D,$E);
-
-        &BODY_20_39(-1,$K[1],$X,20,$E,$T,$A,$B,$C,$D);
-        &BODY_20_39( 0,$K[1],$X,21,$D,$E,$T,$A,$B,$C);
-        &BODY_20_39( 0,$K[1],$X,22,$C,$D,$E,$T,$A,$B);
-        &BODY_20_39( 0,$K[1],$X,23,$B,$C,$D,$E,$T,$A);
-        &BODY_20_39( 0,$K[1],$X,24,$A,$B,$C,$D,$E,$T);
-        &BODY_20_39( 0,$K[1],$X,25,$T,$A,$B,$C,$D,$E);
-        &BODY_20_39( 0,$K[1],$X,26,$E,$T,$A,$B,$C,$D);
-        &BODY_20_39( 0,$K[1],$X,27,$D,$E,$T,$A,$B,$C);
-        &BODY_20_39( 0,$K[1],$X,28,$C,$D,$E,$T,$A,$B);
-        &BODY_20_39( 0,$K[1],$X,29,$B,$C,$D,$E,$T,$A);
-        &BODY_20_39( 0,$K[1],$X,30,$A,$B,$C,$D,$E,$T);
-        &BODY_20_39( 0,$K[1],$X,31,$T,$A,$B,$C,$D,$E);
-        &BODY_20_39( 0,$K[1],$X,32,$E,$T,$A,$B,$C,$D);
-        &BODY_20_39( 0,$K[1],$X,33,$D,$E,$T,$A,$B,$C);
-        &BODY_20_39( 0,$K[1],$X,34,$C,$D,$E,$T,$A,$B);
-        &BODY_20_39( 0,$K[1],$X,35,$B,$C,$D,$E,$T,$A);
-        &BODY_20_39( 0,$K[1],$X,36,$A,$B,$C,$D,$E,$T);
-        &BODY_20_39( 0,$K[1],$X,37,$T,$A,$B,$C,$D,$E);
-        &BODY_20_39( 0,$K[1],$X,38,$E,$T,$A,$B,$C,$D);
-        &BODY_20_39( 1,$K[1],$X,39,$D,$E,$T,$A,$B,$C);
-
-        &BODY_40_59(-1,$K[2],$X,40,$C,$D,$E,$T,$A,$B);
-        &BODY_40_59( 0,$K[2],$X,41,$B,$C,$D,$E,$T,$A);
-        &BODY_40_59( 0,$K[2],$X,42,$A,$B,$C,$D,$E,$T);
-        &BODY_40_59( 0,$K[2],$X,43,$T,$A,$B,$C,$D,$E);
-        &BODY_40_59( 0,$K[2],$X,44,$E,$T,$A,$B,$C,$D);
-        &BODY_40_59( 0,$K[2],$X,45,$D,$E,$T,$A,$B,$C);
-        &BODY_40_59( 0,$K[2],$X,46,$C,$D,$E,$T,$A,$B);
-        &BODY_40_59( 0,$K[2],$X,47,$B,$C,$D,$E,$T,$A);
-        &BODY_40_59( 0,$K[2],$X,48,$A,$B,$C,$D,$E,$T);
-        &BODY_40_59( 0,$K[2],$X,49,$T,$A,$B,$C,$D,$E);
-        &BODY_40_59( 0,$K[2],$X,50,$E,$T,$A,$B,$C,$D);
-        &BODY_40_59( 0,$K[2],$X,51,$D,$E,$T,$A,$B,$C);
-        &BODY_40_59( 0,$K[2],$X,52,$C,$D,$E,$T,$A,$B);
-        &BODY_40_59( 0,$K[2],$X,53,$B,$C,$D,$E,$T,$A);
-        &BODY_40_59( 0,$K[2],$X,54,$A,$B,$C,$D,$E,$T);
-        &BODY_40_59( 0,$K[2],$X,55,$T,$A,$B,$C,$D,$E);
-        &BODY_40_59( 0,$K[2],$X,56,$E,$T,$A,$B,$C,$D);
-        &BODY_40_59( 0,$K[2],$X,57,$D,$E,$T,$A,$B,$C);
-        &BODY_40_59( 0,$K[2],$X,58,$C,$D,$E,$T,$A,$B);
-        &BODY_40_59( 1,$K[2],$X,59,$B,$C,$D,$E,$T,$A);
-
-        &BODY_60_79(-1,$K[3],$X,60,$A,$B,$C,$D,$E,$T);
-        &BODY_60_79( 0,$K[3],$X,61,$T,$A,$B,$C,$D,$E);
-        &BODY_60_79( 0,$K[3],$X,62,$E,$T,$A,$B,$C,$D);
-        &BODY_60_79( 0,$K[3],$X,63,$D,$E,$T,$A,$B,$C);
-        &BODY_60_79( 0,$K[3],$X,64,$C,$D,$E,$T,$A,$B);
-        &BODY_60_79( 0,$K[3],$X,65,$B,$C,$D,$E,$T,$A);
-        &BODY_60_79( 0,$K[3],$X,66,$A,$B,$C,$D,$E,$T);
-        &BODY_60_79( 0,$K[3],$X,67,$T,$A,$B,$C,$D,$E);
-        &BODY_60_79( 0,$K[3],$X,68,$E,$T,$A,$B,$C,$D);
-        &BODY_60_79( 0,$K[3],$X,69,$D,$E,$T,$A,$B,$C);
-        &BODY_60_79( 0,$K[3],$X,70,$C,$D,$E,$T,$A,$B);
-        &BODY_60_79( 0,$K[3],$X,71,$B,$C,$D,$E,$T,$A);
-        &BODY_60_79( 0,$K[3],$X,72,$A,$B,$C,$D,$E,$T);
-        &BODY_60_79( 0,$K[3],$X,73,$T,$A,$B,$C,$D,$E);
-        &BODY_60_79( 0,$K[3],$X,74,$E,$T,$A,$B,$C,$D);
-        &BODY_60_79( 0,$K[3],$X,75,$D,$E,$T,$A,$B,$C);
-        &BODY_60_79( 0,$K[3],$X,76,$C,$D,$E,$T,$A,$B);
-        &BODY_60_79( 0,$K[3],$X,77,$B,$C,$D,$E,$T,$A);
-        &BODY_60_79( 0,$K[3],$X,78,$A,$B,$C,$D,$E,$T);
-        &BODY_60_79( 2,$K[3],$X,79,$T,$A,$B,$C,$D,$E);
-
-        &comment("End processing");
-        &comment("");
-        # D is the tmp value
-
-        # E -> A
-        # T -> B
-        # A -> C
-        # B -> D
-        # C -> E
-        # D -> T
-
-        # The last 2 have been moved into the last loop
-        # &mov($tmp1,&wparam(0));
-
-         &mov($D,       &DWP(12,$tmp1,"",0));
-        &add($D,$B);
-         &mov($B,       &DWP( 4,$tmp1,"",0));
-        &add($B,$T);
-         &mov($T,       $A);
-        &mov($A,        &DWP( 0,$tmp1,"",0));
-         &mov(&DWP(12,$tmp1,"",0),$D);
-
-        &add($A,$E);
-         &mov($E,       &DWP(16,$tmp1,"",0));
-        &add($E,$C);
-         &mov($C,       &DWP( 8,$tmp1,"",0));
-        &add($C,$T);
-
-         &mov(&DWP( 0,$tmp1,"",0),$A);
-        &mov("esi",&swtmp(16));
-         &mov(&DWP( 8,$tmp1,"",0),$C);  # This is for looping
-        &add("esi",64);
-         &mov("eax",&swtmp(17));
-        &mov(&DWP(16,$tmp1,"",0),$E);
-         &cmp("eax","esi");
-        &mov(&DWP( 4,$tmp1,"",0),$B);   # This is for looping
-         &jl(&label("end"));
-        &mov("eax",&DWP(0,"esi","",0)); # Pulled down from 
-         &jmp(&label("start"));
-
-        &set_label("end");
-        &stack_pop(18);
-         &pop("edi");
-        &pop("ebx");
-         &pop("ebp");
-        &pop("esi");
-         &ret();
-        &function_end_B($name);
-        }
-
diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
deleted file mode 100644
index cd6960ee1a..0000000000
--- a/src/lib/libcrypto/sha/sha.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-#define HEADER_SHA_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef NO_SHA
-#error SHA is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(WIN16) || defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(_CRAY) || defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
-#define SHA_LONG unsigned int
-#endif
-
-#define SHA_LBLOCK      16
-#define SHA_CBLOCK      (SHA_LBLOCK*4)  /* SHA treats input data as a
-                                         * contiguous array of 32 bit
-                                         * wide big-endian values. */
-#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-#define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st
-        {
-        SHA_LONG h0,h1,h2,h3,h4;
-        SHA_LONG Nl,Nh;
-        SHA_LONG data[SHA_LBLOCK];
-        int num;
-        } SHA_CTX;
-
-#ifndef NO_SHA0
-void SHA_Init(SHA_CTX *c);
-void SHA_Update(SHA_CTX *c, const unsigned char *data, unsigned long len);
-void SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, unsigned long n,unsigned char *md);
-void SHA_Transform(SHA_CTX *c, unsigned char *data);
-#endif
-#ifndef NO_SHA1
-void SHA1_Init(SHA_CTX *c);
-void SHA1_Update(SHA_CTX *c, const unsigned char *data, unsigned long len);
-void SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, unsigned long n,unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, unsigned char *data);
-#endif
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/sha/sha1_one.c b/src/lib/libcrypto/sha/sha1_one.c
deleted file mode 100644
index 861752eaa7..0000000000
--- a/src/lib/libcrypto/sha/sha1_one.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* crypto/sha/sha1_one.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/sha.h>
-
-#ifndef NO_SHA1
-unsigned char *SHA1(const unsigned char *d, unsigned long n, unsigned char *md)
-        {
-        SHA_CTX c;
-        static unsigned char m[SHA_DIGEST_LENGTH];
-
-        if (md == NULL) md=m;
-        SHA1_Init(&c);
-        SHA1_Update(&c,d,n);
-        SHA1_Final(md,&c);
-        memset(&c,0,sizeof(c));
-        return(md);
-        }
-#endif
diff --git a/src/lib/libcrypto/sha/sha1dgst.c b/src/lib/libcrypto/sha/sha1dgst.c
deleted file mode 100644
index 66e885dd76..0000000000
--- a/src/lib/libcrypto/sha/sha1dgst.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/* crypto/sha/sha1dgst.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#undef  SHA_0
-#define SHA_1
-#include <openssl/sha.h>
-#include "sha_locl.h"
-#include <openssl/opensslv.h>
-
-#ifndef NO_SHA1
-char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
-
-/* Implemented from SHA-1 document - The Secure Hash Algorithm
- */
-
-#define INIT_DATA_h0 0x67452301UL
-#define INIT_DATA_h1 0xefcdab89UL
-#define INIT_DATA_h2 0x98badcfeUL
-#define INIT_DATA_h3 0x10325476UL
-#define INIT_DATA_h4 0xc3d2e1f0UL
-
-#define K_00_19 0x5a827999UL
-#define K_20_39 0x6ed9eba1UL
-#define K_40_59 0x8f1bbcdcUL
-#define K_60_79 0xca62c1d6UL
-
-#ifdef SHA1_ASM
-   void sha1_block_x86(SHA_CTX *c, register SHA_LONG *p, int num);
-#  define sha1_block(c,p,n) sha1_block_x86((c),(p),(n)*SHA_CBLOCK)
-#else
-   static void sha1_block(SHA_CTX *c, register SHA_LONG *p, int num);
-#endif
-
-#if !defined(B_ENDIAN) && defined(SHA1_ASM)
-#  define       M_c2nl          c2l
-#  define       M_p_c2nl        p_c2l
-#  define       M_c2nl_p        c2l_p
-#  define       M_p_c2nl_p      p_c2l_p
-#  define       M_nl2c          l2c
-#else
-#  define       M_c2nl          c2nl
-#  define       M_p_c2nl        p_c2nl
-#  define       M_c2nl_p        c2nl_p
-#  define       M_p_c2nl_p      p_c2nl_p
-#  define       M_nl2c          nl2c
-#endif
-
-void SHA1_Init(SHA_CTX *c)
-        {
-        c->h0=INIT_DATA_h0;
-        c->h1=INIT_DATA_h1;
-        c->h2=INIT_DATA_h2;
-        c->h3=INIT_DATA_h3;
-        c->h4=INIT_DATA_h4;
-        c->Nl=0;
-        c->Nh=0;
-        c->num=0;
-        }
-
-void SHA1_Update(SHA_CTX *c, register const unsigned char *data,
-             unsigned long len)
-        {
-        register SHA_LONG *p;
-        int ew,ec,sw,sc;
-        SHA_LONG l;
-
-        if (len == 0) return;
-
-        l=(c->Nl+(len<<3))&0xffffffffL;
-        if (l < c->Nl) /* overflow */
-                c->Nh++;
-        c->Nh+=(len>>29);
-        c->Nl=l;
-
-        if (c->num != 0)
-                {
-                p=c->data;
-                sw=c->num>>2;
-                sc=c->num&0x03;
-
-                if ((c->num+len) >= SHA_CBLOCK)
-                        {
-                        l= p[sw];
-                        M_p_c2nl(data,l,sc);
-                        p[sw++]=l;
-                        for (; sw<SHA_LBLOCK; sw++)
-                                {
-                                M_c2nl(data,l);
-                                p[sw]=l;
-                                }
-                        len-=(SHA_CBLOCK-c->num);
-
-                        sha1_block(c,p,1);
-                        c->num=0;
-                        /* drop through and do the rest */
-                        }
-                else
-                        {
-                        c->num+=(int)len;
-                        if ((sc+len) < 4) /* ugly, add char's to a word */
-                                {
-                                l= p[sw];
-                                M_p_c2nl_p(data,l,sc,len);
-                                p[sw]=l;
-                                }
-                        else
-                                {
-                                ew=(c->num>>2);
-                                ec=(c->num&0x03);
-                                l= p[sw];
-                                M_p_c2nl(data,l,sc);
-                                p[sw++]=l;
-                                for (; sw < ew; sw++)
-                                        { M_c2nl(data,l); p[sw]=l; }
-                                if (ec)
-                                        {
-                                        M_c2nl_p(data,l,ec);
-                                        p[sw]=l;
-                                        }
-                                }
-                        return;
-                        }
-                }
-        /* We can only do the following code for assember, the reason
-         * being that the sha1_block 'C' version changes the values
-         * in the 'data' array.  The assember code avoids this and
-         * copies it to a local array.  I should be able to do this for
-         * the C version as well....
-         */
-#if SHA_LONG_LOG2==2
-#if defined(B_ENDIAN) || defined(SHA1_ASM)
-        if ((((unsigned long)data)%sizeof(SHA_LONG)) == 0)
-                {
-                sw=len/SHA_CBLOCK;
-                if (sw)
-                        {
-                        sha1_block(c,(SHA_LONG *)data,sw);
-                        sw*=SHA_CBLOCK;
-                        data+=sw;
-                        len-=sw;
-                        }
-                }
-#endif
-#endif
-        /* we now can process the input data in blocks of SHA_CBLOCK
-         * chars and save the leftovers to c->data. */
-        p=c->data;
-        while (len >= SHA_CBLOCK)
-                {
-#if SHA_LONG_LOG2==2
-#if defined(B_ENDIAN) || defined(SHA1_ASM)
-#define SHA_NO_TAIL_CODE
-                /*
-                 * Basically we get here only when data happens
-                 * to be unaligned.
-                 */
-                if (p != (SHA_LONG *)data)
-                        memcpy(p,data,SHA_CBLOCK);
-                data+=SHA_CBLOCK;
-                sha1_block(c,p=c->data,1);
-                len-=SHA_CBLOCK;
-#elif defined(L_ENDIAN)
-#define BE_COPY(dst,src,i)      {                               \
-                                l = ((SHA_LONG *)src)[i];       \
-                                Endian_Reverse32(l);            \
-                                dst[i] = l;                     \
-                                }
-                if ((((unsigned long)data)%sizeof(SHA_LONG)) == 0)
-                        {
-                        for (sw=(SHA_LBLOCK/4); sw; sw--)
-                                {
-                                BE_COPY(p,data,0);
-                                BE_COPY(p,data,1);
-                                BE_COPY(p,data,2);
-                                BE_COPY(p,data,3);
-                                p+=4;
-                                data += 4*sizeof(SHA_LONG);
-                                }
-                        sha1_block(c,p=c->data,1);
-                        len-=SHA_CBLOCK;
-                        continue;
-                        }
-#endif
-#endif
-#ifndef SHA_NO_TAIL_CODE
-                /*
-                 * In addition to "sizeof(SHA_LONG)!= 4" case the
-                 * following code covers unaligned access cases on
-                 * little-endian machines.
-                 *                      <appro@fy.chalmers.se>
-                 */
-                p=c->data;
-                for (sw=(SHA_LBLOCK/4); sw; sw--)
-                        {
-                        M_c2nl(data,l); p[0]=l;
-                        M_c2nl(data,l); p[1]=l;
-                        M_c2nl(data,l); p[2]=l;
-                        M_c2nl(data,l); p[3]=l;
-                        p+=4;
-                        }
-                p=c->data;
-                sha1_block(c,p,1);
-                len-=SHA_CBLOCK;
-#endif
-                }
-        ec=(int)len;
-        c->num=ec;
-        ew=(ec>>2);
-        ec&=0x03;
-
-        for (sw=0; sw < ew; sw++)
-                { M_c2nl(data,l); p[sw]=l; }
-        M_c2nl_p(data,l,ec);
-        p[sw]=l;
-        }
-
-void SHA1_Transform(SHA_CTX *c, unsigned char *b)
-        {
-        SHA_LONG p[SHA_LBLOCK];
-
-#if SHA_LONG_LOG2==2
-#if defined(B_ENDIAN) || defined(SHA1_ASM)
-        memcpy(p,b,SHA_CBLOCK);
-        sha1_block(c,p,1);
-        return;
-#elif defined(L_ENDIAN)
-        if (((unsigned long)b%sizeof(SHA_LONG)) == 0)
-                {
-                SHA_LONG *q;
-                int i;
-
-                q=p;
-                for (i=(SHA_LBLOCK/4); i; i--)
-                        {
-                        unsigned long l;
-                        BE_COPY(q,b,0); /* BE_COPY was defined above */
-                        BE_COPY(q,b,1);
-                        BE_COPY(q,b,2);
-                        BE_COPY(q,b,3);
-                        q+=4;
-                        b+=4*sizeof(SHA_LONG);
-                        }
-                sha1_block(c,p,1);
-                return;
-                }
-#endif
-#endif
-#ifndef SHA_NO_TAIL_CODE /* defined above, see comment */
-                {
-                SHA_LONG *q;
-                int i;
-        
-                q=p;
-                for (i=(SHA_LBLOCK/4); i; i--)
-                        {
-                        SHA_LONG l;
-                        c2nl(b,l); *(q++)=l;
-                        c2nl(b,l); *(q++)=l;
-                        c2nl(b,l); *(q++)=l;
-                        c2nl(b,l); *(q++)=l; 
-                        } 
-                sha1_block(c,p,1);
-                }
-#endif
-        }
-
-#ifndef SHA1_ASM
-static void sha1_block(SHA_CTX *c, register SHA_LONG *W, int num)
-        {
-        register SHA_LONG A,B,C,D,E,T;
-        SHA_LONG X[SHA_LBLOCK];
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-        for (;;)
-                {
-        BODY_00_15( 0,A,B,C,D,E,T,W);
-        BODY_00_15( 1,T,A,B,C,D,E,W);
-        BODY_00_15( 2,E,T,A,B,C,D,W);
-        BODY_00_15( 3,D,E,T,A,B,C,W);
-        BODY_00_15( 4,C,D,E,T,A,B,W);
-        BODY_00_15( 5,B,C,D,E,T,A,W);
-        BODY_00_15( 6,A,B,C,D,E,T,W);
-        BODY_00_15( 7,T,A,B,C,D,E,W);
-        BODY_00_15( 8,E,T,A,B,C,D,W);
-        BODY_00_15( 9,D,E,T,A,B,C,W);
-        BODY_00_15(10,C,D,E,T,A,B,W);
-        BODY_00_15(11,B,C,D,E,T,A,W);
-        BODY_00_15(12,A,B,C,D,E,T,W);
-        BODY_00_15(13,T,A,B,C,D,E,W);
-        BODY_00_15(14,E,T,A,B,C,D,W);
-        BODY_00_15(15,D,E,T,A,B,C,W);
-        BODY_16_19(16,C,D,E,T,A,B,W,W,W,W);
-        BODY_16_19(17,B,C,D,E,T,A,W,W,W,W);
-        BODY_16_19(18,A,B,C,D,E,T,W,W,W,W);
-        BODY_16_19(19,T,A,B,C,D,E,W,W,W,X);
-
-        BODY_20_31(20,E,T,A,B,C,D,W,W,W,X);
-        BODY_20_31(21,D,E,T,A,B,C,W,W,W,X);
-        BODY_20_31(22,C,D,E,T,A,B,W,W,W,X);
-        BODY_20_31(23,B,C,D,E,T,A,W,W,W,X);
-        BODY_20_31(24,A,B,C,D,E,T,W,W,X,X);
-        BODY_20_31(25,T,A,B,C,D,E,W,W,X,X);
-        BODY_20_31(26,E,T,A,B,C,D,W,W,X,X);
-        BODY_20_31(27,D,E,T,A,B,C,W,W,X,X);
-        BODY_20_31(28,C,D,E,T,A,B,W,W,X,X);
-        BODY_20_31(29,B,C,D,E,T,A,W,W,X,X);
-        BODY_20_31(30,A,B,C,D,E,T,W,X,X,X);
-        BODY_20_31(31,T,A,B,C,D,E,W,X,X,X);
-        BODY_32_39(32,E,T,A,B,C,D,X);
-        BODY_32_39(33,D,E,T,A,B,C,X);
-        BODY_32_39(34,C,D,E,T,A,B,X);
-        BODY_32_39(35,B,C,D,E,T,A,X);
-        BODY_32_39(36,A,B,C,D,E,T,X);
-        BODY_32_39(37,T,A,B,C,D,E,X);
-        BODY_32_39(38,E,T,A,B,C,D,X);
-        BODY_32_39(39,D,E,T,A,B,C,X);
-
-        BODY_40_59(40,C,D,E,T,A,B,X);
-        BODY_40_59(41,B,C,D,E,T,A,X);
-        BODY_40_59(42,A,B,C,D,E,T,X);
-        BODY_40_59(43,T,A,B,C,D,E,X);
-        BODY_40_59(44,E,T,A,B,C,D,X);
-        BODY_40_59(45,D,E,T,A,B,C,X);
-        BODY_40_59(46,C,D,E,T,A,B,X);
-        BODY_40_59(47,B,C,D,E,T,A,X);
-        BODY_40_59(48,A,B,C,D,E,T,X);
-        BODY_40_59(49,T,A,B,C,D,E,X);
-        BODY_40_59(50,E,T,A,B,C,D,X);
-        BODY_40_59(51,D,E,T,A,B,C,X);
-        BODY_40_59(52,C,D,E,T,A,B,X);
-        BODY_40_59(53,B,C,D,E,T,A,X);
-        BODY_40_59(54,A,B,C,D,E,T,X);
-        BODY_40_59(55,T,A,B,C,D,E,X);
-        BODY_40_59(56,E,T,A,B,C,D,X);
-        BODY_40_59(57,D,E,T,A,B,C,X);
-        BODY_40_59(58,C,D,E,T,A,B,X);
-        BODY_40_59(59,B,C,D,E,T,A,X);
-
-        BODY_60_79(60,A,B,C,D,E,T,X);
-        BODY_60_79(61,T,A,B,C,D,E,X);
-        BODY_60_79(62,E,T,A,B,C,D,X);
-        BODY_60_79(63,D,E,T,A,B,C,X);
-        BODY_60_79(64,C,D,E,T,A,B,X);
-        BODY_60_79(65,B,C,D,E,T,A,X);
-        BODY_60_79(66,A,B,C,D,E,T,X);
-        BODY_60_79(67,T,A,B,C,D,E,X);
-        BODY_60_79(68,E,T,A,B,C,D,X);
-        BODY_60_79(69,D,E,T,A,B,C,X);
-        BODY_60_79(70,C,D,E,T,A,B,X);
-        BODY_60_79(71,B,C,D,E,T,A,X);
-        BODY_60_79(72,A,B,C,D,E,T,X);
-        BODY_60_79(73,T,A,B,C,D,E,X);
-        BODY_60_79(74,E,T,A,B,C,D,X);
-        BODY_60_79(75,D,E,T,A,B,C,X);
-        BODY_60_79(76,C,D,E,T,A,B,X);
-        BODY_60_79(77,B,C,D,E,T,A,X);
-        BODY_60_79(78,A,B,C,D,E,T,X);
-        BODY_60_79(79,T,A,B,C,D,E,X);
-        
-        c->h0=(c->h0+E)&0xffffffffL; 
-        c->h1=(c->h1+T)&0xffffffffL;
-        c->h2=(c->h2+A)&0xffffffffL;
-        c->h3=(c->h3+B)&0xffffffffL;
-        c->h4=(c->h4+C)&0xffffffffL;
-
-        if (--num <= 0) break;
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-        W+=SHA_LBLOCK;  /* Note! This can happen only when sizeof(SHA_LONG)
-                         * is 4. Whenever it's not the actual case this
-                         * function is never called with num larger than 1
-                         * and we never advance down here.
-                         *                      <appro@fy.chalmers.se>
-                         */
-                }
-        }
-#endif
-
-void SHA1_Final(unsigned char *md, SHA_CTX *c)
-        {
-        register int i,j;
-        register SHA_LONG l;
-        register SHA_LONG *p;
-        static unsigned char end[4]={0x80,0x00,0x00,0x00};
-        unsigned char *cp=end;
-
-        /* c->num should definitly have room for at least one more byte. */
-        p=c->data;
-        j=c->num;
-        i=j>>2;
-#ifdef PURIFY
-        if ((j&0x03) == 0) p[i]=0;
-#endif
-        l=p[i];
-        M_p_c2nl(cp,l,j&0x03);
-        p[i]=l;
-        i++;
-        /* i is the next 'undefined word' */
-        if (c->num >= SHA_LAST_BLOCK)
-                {
-                for (; i<SHA_LBLOCK; i++)
-                        p[i]=0;
-                sha1_block(c,p,1);
-                i=0;
-                }
-        for (; i<(SHA_LBLOCK-2); i++)
-                p[i]=0;
-        p[SHA_LBLOCK-2]=c->Nh;
-        p[SHA_LBLOCK-1]=c->Nl;
-#if SHA_LONG_LOG2==2
-#if !defined(B_ENDIAN) && defined(SHA1_ASM)
-        Endian_Reverse32(p[SHA_LBLOCK-2]);
-        Endian_Reverse32(p[SHA_LBLOCK-1]);
-#endif
-#endif
-        sha1_block(c,p,1);
-        cp=md;
-        l=c->h0; nl2c(l,cp);
-        l=c->h1; nl2c(l,cp);
-        l=c->h2; nl2c(l,cp);
-        l=c->h3; nl2c(l,cp);
-        l=c->h4; nl2c(l,cp);
-
-        c->num=0;
-        /* sha_block may be leaving some stuff on the stack
-         * but I'm not worried :-)
-        memset((void *)c,0,sizeof(SHA_CTX));
-         */
-        }
-#endif
-
diff --git a/src/lib/libcrypto/sha/sha_locl.h b/src/lib/libcrypto/sha/sha_locl.h
deleted file mode 100644
index 6646a8915b..0000000000
--- a/src/lib/libcrypto/sha/sha_locl.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/* crypto/sha/sha_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/opensslconf.h>
-
-#ifdef undef
-/* one or the other needs to be defined */
-#ifndef SHA_1 /* FIPE 180-1 */
-#define SHA_0 /* FIPS 180   */
-#endif
-#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))
-
-#ifndef SHA_LONG_LOG2
-#define SHA_LONG_LOG2   2       /* default to 32 bits */
-#endif
-
-#undef ROTATE
-#undef Endian_Reverse32
-#if defined(WIN32)
-#define ROTATE(a,n)     _lrotl(a,n)
-#elif defined(__GNUC__) && !defined(PEDANTIC)
-/* some inline assembler templates by <appro@fy.chalmers.se> */
-#if defined(__i386) && !defined(NO_ASM)
-#define ROTATE(a,n)     ({ register unsigned int ret;   \
-                                asm ("roll %1,%0"       \
-                                : "=r"(ret)             \
-                                : "I"(n), "0"(a)        \
-                                : "cc");                \
-                           ret;                         \
-                        })
-#ifndef I386_ONLY
-#define Endian_Reverse32(a) \
-                        { register unsigned int ltmp=(a);       \
-                                asm ("bswapl %0"        \
-                                : "=r"(ltmp) : "0"(ltmp));      \
-                          (a)=ltmp;                     \
-                        }
-#endif
-#elif defined(__powerpc)
-#define ROTATE(a,n)     ({ register unsigned int ret;           \
-                                asm ("rlwinm %0,%1,%2,0,31"     \
-                                : "=r"(ret)                     \
-                                : "r"(a), "I"(n));              \
-                           ret;                                 \
-                        })
-/* Endian_Reverse32 is not needed for PowerPC */
-#endif
-#endif
-
-/* A nice byte order reversal from Wei Dai <weidai@eskimo.com> */
-#ifdef ROTATE
-#ifndef Endian_Reverse32
-/* 5 instructions with rotate instruction, else 9 */
-#define Endian_Reverse32(a) \
-        { \
-        unsigned long t=(a); \
-        (a)=((ROTATE(t,8)&0x00FF00FF)|(ROTATE((t&0x00FF00FF),24))); \
-        }
-#endif
-#else
-#define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
-#ifndef Endian_Reverse32
-/* 6 instructions with rotate instruction, else 8 */
-#define Endian_Reverse32(a) \
-        { \
-        unsigned long t=(a); \
-        t=(((t>>8)&0x00FF00FF)|((t&0x00FF00FF)<<8)); \
-        (a)=ROTATE(t,16); \
-        }
-#endif
-/*
- * Originally the middle line started with l=(((l&0xFF00FF00)>>8)|...
- * It's rewritten as above for two reasons:
- *      - RISCs aren't good at long constants and have to explicitely
- *        compose 'em with several (well, usually 2) instructions in a
- *        register before performing the actual operation and (as you
- *        already realized:-) having same constant should inspire the
- *        compiler to permanently allocate the only register for it;
- *      - most modern CPUs have two ALUs, but usually only one has
- *        circuitry for shifts:-( this minor tweak inspires compiler
- *        to schedule shift instructions in a better way...
- *
- *                              <appro@fy.chalmers.se>
- */
-#endif
-
-/* 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)
-
-#undef Xupdate
-#ifdef SHA_0
-#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
-#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/safestack.h b/src/lib/libcrypto/stack/safestack.h
deleted file mode 100644
index 38934981e3..0000000000
--- a/src/lib/libcrypto/stack/safestack.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SAFESTACK_H
-#define HEADER_SAFESTACK_H
-
-#include <openssl/stack.h>
-
-#define STACK_OF(type)  STACK_##type
-
-#define DECLARE_STACK_OF(type) \
-typedef struct stack_st_##type  \
-    { \
-    STACK stack; \
-    } STACK_OF(type); \
-STACK_OF(type) *sk_##type##_new(int (*cmp)(type **,type **)); \
-STACK_OF(type) *sk_##type##_new_null(void); \
-void sk_##type##_free(STACK_OF(type) *sk); \
-int sk_##type##_num(const STACK_OF(type) *sk); \
-type *sk_##type##_value(const STACK_OF(type) *sk,int n); \
-type *sk_##type##_set(STACK_OF(type) *sk,int n,type *v); \
-void sk_##type##_zero(STACK_OF(type) *sk); \
-int sk_##type##_push(STACK_OF(type) *sk,type *v); \
-int sk_##type##_unshift(STACK_OF(type) *sk,type *v); \
-int sk_##type##_find(STACK_OF(type) *sk,type *v); \
-type *sk_##type##_delete(STACK_OF(type) *sk,int n); \
-void sk_##type##_delete_ptr(STACK_OF(type) *sk,type *v); \
-int sk_##type##_insert(STACK_OF(type) *sk,type *v,int n); \
-int (*sk_##type##_set_cmp_func(STACK_OF(type) *sk, \
-                               int (*cmp)(type **,type **)))(type **,type **); \
-STACK_OF(type) *sk_##type##_dup(STACK_OF(type) *sk); \
-void sk_##type##_pop_free(STACK_OF(type) *sk,void (*func)(type *)); \
-type *sk_##type##_shift(STACK_OF(type) *sk); \
-type *sk_##type##_pop(STACK_OF(type) *sk); \
-void sk_##type##_sort(STACK_OF(type) *sk);
-
-#define IMPLEMENT_STACK_OF(type) \
-STACK_OF(type) *sk_##type##_new(int (*cmp)(type **,type **)) \
-    { return (STACK_OF(type) *)sk_new(cmp); } \
-STACK_OF(type) *sk_##type##_new_null() \
-    { return (STACK_OF(type) *)sk_new_null(); } \
-void sk_##type##_free(STACK_OF(type) *sk) \
-    { sk_free((STACK *)sk); } \
-int sk_##type##_num(const STACK_OF(type) *sk) \
-    { return M_sk_num((const STACK *)sk); } \
-type *sk_##type##_value(const STACK_OF(type) *sk,int n) \
-    { return (type *)sk_value((STACK *)sk,n); } \
-type *sk_##type##_set(STACK_OF(type) *sk,int n,type *v) \
-    { return (type *)(sk_set((STACK *)sk,n,(char *)v)); } \
-void sk_##type##_zero(STACK_OF(type) *sk) \
-    { sk_zero((STACK *)sk); } \
-int sk_##type##_push(STACK_OF(type) *sk,type *v) \
-    { return sk_push((STACK *)sk,(char *)v); } \
-int sk_##type##_unshift(STACK_OF(type) *sk,type *v) \
-    { return sk_unshift((STACK *)sk,(char *)v); } \
-int sk_##type##_find(STACK_OF(type) *sk,type *v) \
-    { return sk_find((STACK *)sk,(char *)v); } \
-type *sk_##type##_delete(STACK_OF(type) *sk,int n) \
-    { return (type *)sk_delete((STACK *)sk,n); } \
-void sk_##type##_delete_ptr(STACK_OF(type) *sk,type *v) \
-    { sk_delete_ptr((STACK *)sk,(char *)v); } \
-int sk_##type##_insert(STACK_OF(type) *sk,type *v,int n) \
-    { return sk_insert((STACK *)sk,(char *)v,n); } \
-int (*sk_##type##_set_cmp_func(STACK_OF(type) *sk, \
-                               int (*cmp)(type **,type **)))(type **,type **) \
-    { return (int (*)(type **,type **))sk_set_cmp_func((STACK *)sk,cmp); } \
-STACK_OF(type) *sk_##type##_dup(STACK_OF(type) *sk) \
-    { return (STACK_OF(type) *)sk_dup((STACK *)sk); } \
-void sk_##type##_pop_free(STACK_OF(type) *sk,void (*func)(type *)) \
-    { sk_pop_free((STACK *)sk,func); } \
-type *sk_##type##_shift(STACK_OF(type) *sk) \
-    { return (type *)sk_shift((STACK *)sk); } \
-type *sk_##type##_pop(STACK_OF(type) *sk) \
-    { return (type *)sk_pop((STACK *)sk); } \
-void sk_##type##_sort(STACK_OF(type) *sk) \
-    { sk_sort((STACK *)sk); }
-
-#endif /* ndef HEADER_SAFESTACK_H */
diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c
deleted file mode 100644
index 8b96713884..0000000000
--- a/src/lib/libcrypto/stack/stack.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* crypto/stack/stack.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.]
- */
-
-/* Code for stacks
- * Author - Eric Young v 1.0
- * 1.2 eay 12-Mar-97 -  Modified sk_find so that it _DOES_ return the
- *                      lowest index for the seached item.
- *
- * 1.1 eay - Take from netdb and added to SSLeay
- *
- * 1.0 eay - First version 29/07/92
- */
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/stack.h>
-
-#undef MIN_NODES
-#define MIN_NODES       4
-
-const char *STACK_version="Stack" OPENSSL_VERSION_PTEXT;
-
-#define FP_ICC  (int (*)(const void *,const void *))
-#include <errno.h>
-
-int (*sk_set_cmp_func(STACK *sk, int (*c)()))(void)
-        {
-        int (*old)()=sk->comp;
-
-        if (sk->comp != c)
-                sk->sorted=0;
-        sk->comp=c;
-
-        return old;
-        }
-
-STACK *sk_dup(STACK *sk)
-        {
-        STACK *ret;
-        char **s;
-
-        if ((ret=sk_new(sk->comp)) == NULL) goto err;
-        s=(char **)Realloc((char *)ret->data,
-                (unsigned int)sizeof(char *)*sk->num_alloc);
-        if (s == NULL) goto err;
-        ret->data=s;
-
-        ret->num=sk->num;
-        memcpy(ret->data,sk->data,sizeof(char *)*sk->num);
-        ret->sorted=sk->sorted;
-        ret->num_alloc=sk->num_alloc;
-        ret->comp=sk->comp;
-        return(ret);
-err:
-        return(NULL);
-        }
-
-STACK *sk_new(int (*c)())
-        {
-        STACK *ret;
-        int i;
-
-        if ((ret=(STACK *)Malloc(sizeof(STACK))) == NULL)
-                goto err0;
-        if ((ret->data=(char **)Malloc(sizeof(char *)*MIN_NODES)) == NULL)
-                goto err1;
-        for (i=0; i<MIN_NODES; i++)
-                ret->data[i]=NULL;
-        ret->comp=c;
-        ret->num_alloc=MIN_NODES;
-        ret->num=0;
-        ret->sorted=0;
-        return(ret);
-err1:
-        Free((char *)ret);
-err0:
-        return(NULL);
-        }
-
-int sk_insert(STACK *st, char *data, int loc)
-        {
-        char **s;
-
-        if(st == NULL) return 0;
-        if (st->num_alloc <= st->num+1)
-                {
-                s=(char **)Realloc((char *)st->data,
-                        (unsigned int)sizeof(char *)*st->num_alloc*2);
-                if (s == NULL)
-                        return(0);
-                st->data=s;
-                st->num_alloc*=2;
-                }
-        if ((loc >= (int)st->num) || (loc < 0))
-                st->data[st->num]=data;
-        else
-                {
-                int i;
-                char **f,**t;
-
-                f=(char **)st->data;
-                t=(char **)&(st->data[1]);
-                for (i=st->num; i>=loc; i--)
-                        t[i]=f[i];
-                        
-#ifdef undef /* no memmove on sunos :-( */
-                memmove( (char *)&(st->data[loc+1]),
-                        (char *)&(st->data[loc]),
-                        sizeof(char *)*(st->num-loc));
-#endif
-                st->data[loc]=data;
-                }
-        st->num++;
-        st->sorted=0;
-        return(st->num);
-        }
-
-char *sk_delete_ptr(STACK *st, char *p)
-        {
-        int i;
-
-        for (i=0; i<st->num; i++)
-                if (st->data[i] == p)
-                        return(sk_delete(st,i));
-        return(NULL);
-        }
-
-char *sk_delete(STACK *st, int loc)
-        {
-        char *ret;
-        int i,j;
-
-        if ((st == NULL) || (st->num == 0) || (loc < 0)
-                                         || (loc >= st->num)) return(NULL);
-
-        ret=st->data[loc];
-        if (loc != st->num-1)
-                {
-                j=st->num-1;
-                for (i=loc; i<j; i++)
-                        st->data[i]=st->data[i+1];
-                /* In theory memcpy is not safe for this
-                 * memcpy( &(st->data[loc]),
-                 *      &(st->data[loc+1]),
-                 *      sizeof(char *)*(st->num-loc-1));
-                 */
-                }
-        st->num--;
-        return(ret);
-        }
-
-int sk_find(STACK *st, char *data)
-        {
-        char **r;
-        int i;
-        int (*comp_func)();
-        if(st == NULL) return -1;
-
-        if (st->comp == NULL)
-                {
-                for (i=0; i<st->num; i++)
-                        if (st->data[i] == data)
-                                return(i);
-                return(-1);
-                }
-        sk_sort(st);
-        if (data == NULL) return(-1);
-        comp_func=(int (*)())st->comp;
-        r=(char **)bsearch(&data,(char *)st->data,
-                st->num,sizeof(char *),FP_ICC comp_func);
-        if (r == NULL) return(-1);
-        i=(int)(r-st->data);
-        for ( ; i>0; i--)
-                if ((*st->comp)(&(st->data[i-1]),&data) < 0)
-                        break;
-        return(i);
-        }
-
-int sk_push(STACK *st, char *data)
-        {
-        return(sk_insert(st,data,st->num));
-        }
-
-int sk_unshift(STACK *st, char *data)
-        {
-        return(sk_insert(st,data,0));
-        }
-
-char *sk_shift(STACK *st)
-        {
-        if (st == NULL) return(NULL);
-        if (st->num <= 0) return(NULL);
-        return(sk_delete(st,0));
-        }
-
-char *sk_pop(STACK *st)
-        {
-        if (st == NULL) return(NULL);
-        if (st->num <= 0) return(NULL);
-        return(sk_delete(st,st->num-1));
-        }
-
-void sk_zero(STACK *st)
-        {
-        if (st == NULL) return;
-        if (st->num <= 0) return;
-        memset((char *)st->data,0,sizeof(st->data)*st->num);
-        st->num=0;
-        }
-
-void sk_pop_free(STACK *st, void (*func)())
-        {
-        int i;
-
-        if (st == NULL) return;
-        for (i=0; i<st->num; i++)
-                if (st->data[i] != NULL)
-                        func(st->data[i]);
-        sk_free(st);
-        }
-
-void sk_free(STACK *st)
-        {
-        if (st == NULL) return;
-        if (st->data != NULL) Free((char *)st->data);
-        Free((char *)st);
-        }
-
-int sk_num(STACK *st)
-{
-        if(st == NULL) return -1;
-        return st->num;
-}
-
-char *sk_value(STACK *st, int i)
-{
-        if(st == NULL) return NULL;
-        return st->data[i];
-}
-
-char *sk_set(STACK *st, int i, char *value)
-{
-        if(st == NULL) return NULL;
-        return (st->data[i] = value);
-}
-
-void sk_sort(STACK *st)
-    {
-    if (!st->sorted)
-        {
-        int (*comp_func)();
-
-        comp_func=(int (*)())st->comp;
-        qsort(st->data,st->num,sizeof(char *),FP_ICC comp_func);
-        st->sorted=1;
-        }
-    }
diff --git a/src/lib/libcrypto/stack/stack.h b/src/lib/libcrypto/stack/stack.h
deleted file mode 100644
index 0f825cc0c4..0000000000
--- a/src/lib/libcrypto/stack/stack.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/stack/stack.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_STACK_H
-#define HEADER_STACK_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct stack_st
-        {
-        int num;
-        char **data;
-        int sorted;
-
-        int num_alloc;
-        int (*comp)();
-        } STACK;
-
-
-#define sk_new_null()   sk_new(NULL)
-
-#define M_sk_num(sk)            ((sk)->num)
-#define M_sk_value(sk,n)        ((sk)->data[n])
-
-int sk_num(STACK *);
-char *sk_value(STACK *, int);
-
-char *sk_set(STACK *, int, char *);
-
-STACK *sk_new(int (*cmp)());
-void sk_free(STACK *);
-void sk_pop_free(STACK *st, void (*func)());
-int sk_insert(STACK *sk,char *data,int where);
-char *sk_delete(STACK *st,int loc);
-char *sk_delete_ptr(STACK *st, char *p);
-int sk_find(STACK *st,char *data);
-int sk_push(STACK *st,char *data);
-int sk_unshift(STACK *st,char *data);
-char *sk_shift(STACK *st);
-char *sk_pop(STACK *st);
-void sk_zero(STACK *st);
-int (*sk_set_cmp_func(STACK *sk, int (*c)()))();
-STACK *sk_dup(STACK *st);
-void sk_sort(STACK *st);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
deleted file mode 100644
index 9a9fa5ce55..0000000000
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* crypto/txt_db/txt_db.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 "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/txt_db.h>
-
-#undef BUFSIZE
-#define BUFSIZE 512
-
-const char *TXT_DB_version="TXT_DB" OPENSSL_VERSION_PTEXT;
-
-TXT_DB *TXT_DB_read(BIO *in, int num)
-        {
-        TXT_DB *ret=NULL;
-        int er=1;
-        int esc=0;
-        long ln=0;
-        int i,add,n;
-        int size=BUFSIZE;
-        int offset=0;
-        char *p,**pp,*f;
-        BUF_MEM *buf=NULL;
-
-        if ((buf=BUF_MEM_new()) == NULL) goto err;
-        if (!BUF_MEM_grow(buf,size)) goto err;
-
-        if ((ret=(TXT_DB *)Malloc(sizeof(TXT_DB))) == NULL)
-                goto err;
-        ret->num_fields=num;
-        ret->index=NULL;
-        ret->qual=NULL;
-        if ((ret->data=sk_new_null()) == NULL)
-                goto err;
-        if ((ret->index=(LHASH **)Malloc(sizeof(LHASH *)*num)) == NULL)
-                goto err;
-        if ((ret->qual=(int (**)())Malloc(sizeof(int (**)())*num)) == NULL)
-                goto err;
-        for (i=0; i<num; i++)
-                {
-                ret->index[i]=NULL;
-                ret->qual[i]=NULL;
-                }
-
-        add=(num+1)*sizeof(char *);
-        buf->data[size-1]='\0';
-        offset=0;
-        for (;;)
-                {
-                if (offset != 0)
-                        {
-                        size+=BUFSIZE;
-                        if (!BUF_MEM_grow(buf,size)) goto err;
-                        }
-                buf->data[offset]='\0';
-                BIO_gets(in,&(buf->data[offset]),size-offset);
-                ln++;
-                if (buf->data[offset] == '\0') break;
-                if ((offset == 0) && (buf->data[0] == '#')) continue;
-                i=strlen(&(buf->data[offset]));
-                offset+=i;
-                if (buf->data[offset-1] != '\n')
-                        continue;
-                else
-                        {
-                        buf->data[offset-1]='\0'; /* blat the '\n' */
-                        p=(char *)Malloc(add+offset);
-                        offset=0;
-                        }
-                pp=(char **)p;
-                p+=add;
-                n=0;
-                pp[n++]=p;
-                i=0;
-                f=buf->data;
-
-                esc=0;
-                for (;;)
-                        {
-                        if (*f == '\0') break;
-                        if (*f == '\t')
-                                {
-                                if (esc)
-                                        p--;
-                                else
-                                        {       
-                                        *(p++)='\0';
-                                        f++;
-                                        if (n >=  num) break;
-                                        pp[n++]=p;
-                                        continue;
-                                        }
-                                }
-                        esc=(*f == '\\');
-                        *(p++)= *(f++);
-                        }
-                *(p++)='\0';
-                if ((n != num) || (*f != '\0'))
-                        {
-#if !defined(NO_STDIO) && !defined(WIN16)       /* temporaty fix :-( */
-                        fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
-#endif
-                        er=2;
-                        goto err;
-                        }
-                pp[n]=p;
-                if (!sk_push(ret->data,(char *)pp))
-                        {
-#if !defined(NO_STDIO) && !defined(WIN16)       /* temporaty fix :-( */
-                        fprintf(stderr,"failure in sk_push\n");
-#endif
-                        er=2;
-                        goto err;
-                        }
-                }
-        er=0;
-err:
-        BUF_MEM_free(buf);
-        if (er)
-                {
-#if !defined(NO_STDIO) && !defined(WIN16)
-                if (er == 1) fprintf(stderr,"Malloc failure\n");
-#endif
-                if (ret->data != NULL) sk_free(ret->data);
-                if (ret->index != NULL) Free(ret->index);
-                if (ret->qual != NULL) Free((char *)ret->qual);
-                if (ret != NULL) Free(ret);
-                return(NULL);
-                }
-        else
-                return(ret);
-        }
-
-char **TXT_DB_get_by_index(TXT_DB *db, int idx, char **value)
-        {
-        char **ret;
-        LHASH *lh;
-
-        if (idx >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(NULL);
-                }
-        lh=db->index[idx];
-        if (lh == NULL)
-                {
-                db->error=DB_ERROR_NO_INDEX;
-                return(NULL);
-                }
-        ret=(char **)lh_retrieve(lh,(char *)value);
-        db->error=DB_ERROR_OK;
-        return(ret);
-        }
-
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(),
-             unsigned long (*hash)(), int (*cmp)())
-        {
-        LHASH *idx;
-        char *r;
-        int i,n;
-
-        if (field >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(0);
-                }
-        if ((idx=lh_new(hash,cmp)) == NULL)
-                {
-                db->error=DB_ERROR_MALLOC;
-                return(0);
-                }
-        n=sk_num(db->data);
-        for (i=0; i<n; i++)
-                {
-                r=(char *)sk_value(db->data,i);
-                if ((qual != NULL) && (qual(r) == 0)) continue;
-                if ((r=lh_insert(idx,r)) != NULL)
-                        {
-                        db->error=DB_ERROR_INDEX_CLASH;
-                        db->arg1=sk_find(db->data,r);
-                        db->arg2=i;
-                        lh_free(idx);
-                        return(0);
-                        }
-                }
-        if (db->index[field] != NULL) lh_free(db->index[field]);
-        db->index[field]=idx;
-        db->qual[field]=qual;
-        return(1);
-        }
-
-long TXT_DB_write(BIO *out, TXT_DB *db)
-        {
-        long i,j,n,nn,l,tot=0;
-        char *p,**pp,*f;
-        BUF_MEM *buf=NULL;
-        long ret= -1;
-
-        if ((buf=BUF_MEM_new()) == NULL)
-                goto err;
-        n=sk_num(db->data);
-        nn=db->num_fields;
-        for (i=0; i<n; i++)
-                {
-                pp=(char **)sk_value(db->data,i);
-
-                l=0;
-                for (j=0; j<nn; j++)
-                        {
-                        if (pp[j] != NULL)
-                                l+=strlen(pp[j]);
-                        }
-                if (!BUF_MEM_grow(buf,(int)(l*2+nn))) goto err;
-
-                p=buf->data;
-                for (j=0; j<nn; j++)
-                        {
-                        f=pp[j];
-                        if (f != NULL)
-                                for (;;) 
-                                        {
-                                        if (*f == '\0') break;
-                                        if (*f == '\t') *(p++)='\\';
-                                        *(p++)= *(f++);
-                                        }
-                        *(p++)='\t';
-                        }
-                p[-1]='\n';
-                j=p-buf->data;
-                if (BIO_write(out,buf->data,(int)j) != j)
-                        goto err;
-                tot+=j;
-                }
-        ret=tot;
-err:
-        if (buf != NULL) BUF_MEM_free(buf);
-        return(ret);
-        }
-
-int TXT_DB_insert(TXT_DB *db, char **row)
-        {
-        int i;
-        char **r;
-
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        r=(char **)lh_retrieve(db->index[i],(char *)row);
-                        if (r != NULL)
-                                {
-                                db->error=DB_ERROR_INDEX_CLASH;
-                                db->arg1=i;
-                                db->arg_row=r;
-                                goto err;
-                                }
-                        }
-                }
-        /* We have passed the index checks, now just append and insert */
-        if (!sk_push(db->data,(char *)row))
-                {
-                db->error=DB_ERROR_MALLOC;
-                goto err;
-                }
-
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        lh_insert(db->index[i],(char *)row);
-                        }
-                }
-        return(1);
-err:
-        return(0);
-        }
-
-void TXT_DB_free(TXT_DB *db)
-        {
-        int i,n;
-        char **p,*max;
-
-        if(db == NULL)
-            return;
-
-        if (db->index != NULL)
-                {
-                for (i=db->num_fields-1; i>=0; i--)
-                        if (db->index[i] != NULL) lh_free(db->index[i]);
-                Free(db->index);
-                }
-        if (db->qual != NULL)
-                Free(db->qual);
-        if (db->data != NULL)
-                {
-                for (i=sk_num(db->data)-1; i>=0; i--)
-                        {
-                        /* check if any 'fields' have been allocated
-                         * from outside of the initial block */
-                        p=(char **)sk_value(db->data,i);
-                        max=p[db->num_fields]; /* last address */
-                        if (max == NULL) /* new row */
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        if (p[n] != NULL) Free(p[n]);
-                                }
-                        else
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        {
-                                        if (((p[n] < (char *)p) || (p[n] > max))
-                                                && (p[n] != NULL))
-                                                Free(p[n]);
-                                        }
-                                }
-                        Free(sk_value(db->data,i));
-                        }
-                sk_free(db->data);
-                }
-        Free(db);
-        }
diff --git a/src/lib/libcrypto/txt_db/txt_db.h b/src/lib/libcrypto/txt_db/txt_db.h
deleted file mode 100644
index 58b9de1353..0000000000
--- a/src/lib/libcrypto/txt_db/txt_db.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/txt_db/txt_db.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_TXT_DB_H
-#define HEADER_TXT_DB_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/stack.h>
-#include <openssl/lhash.h>
-
-#define DB_ERROR_OK                     0
-#define DB_ERROR_MALLOC                 1
-#define DB_ERROR_INDEX_CLASH            2
-#define DB_ERROR_INDEX_OUT_OF_RANGE     3
-#define DB_ERROR_NO_INDEX               4
-#define DB_ERROR_INSERT_INDEX_CLASH     5
-
-typedef struct txt_db_st
-        {
-        int num_fields;
-        STACK /* char ** */ *data;
-        LHASH **index;
-        int (**qual)();
-        long error;
-        long arg1;
-        long arg2;
-        char **arg_row;
-        } TXT_DB;
-
-#ifdef HEADER_BIO_H
-TXT_DB *TXT_DB_read(BIO *in, int num);
-long TXT_DB_write(BIO *out, TXT_DB *db);
-#else
-TXT_DB *TXT_DB_read(char *in, int num);
-long TXT_DB_write(char *out, TXT_DB *db);
-#endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(),
-         unsigned long (*hash)(),int (*cmp)());
-void TXT_DB_free(TXT_DB *db);
-char **TXT_DB_get_by_index(TXT_DB *db, int idx, char **value);
-int TXT_DB_insert(TXT_DB *db,char **value);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
deleted file mode 100644
index 4b3bccb13e..0000000000
--- a/src/lib/libcrypto/util/mkerr.pl
+++ /dev/null
@@ -1,503 +0,0 @@
-#!/usr/local/bin/perl -w
-
-my $config = "crypto/err/openssl.ec";
-my $debug = 0;
-my $rebuild = 0;
-my $static = 1;
-my $recurse = 0;
-my $reindex = 0;
-my $dowrite = 0;
-
-
-while (@ARGV) {
-        my $arg = $ARGV[0];
-        if($arg eq "-conf") {
-                shift @ARGV;
-                $config = shift @ARGV;
-        } elsif($arg eq "-debug") {
-                $debug = 1;
-                shift @ARGV;
-        } elsif($arg eq "-rebuild") {
-                $rebuild = 1;
-                shift @ARGV;
-        } elsif($arg eq "-recurse") {
-                $recurse = 1;
-                shift @ARGV;
-        } elsif($arg eq "-reindex") {
-                $reindex = 1;
-                shift @ARGV;
-        } elsif($arg eq "-nostatic") {
-                $static = 0;
-                shift @ARGV;
-        } elsif($arg eq "-write") {
-                $dowrite = 1;
-                shift @ARGV;
-        } else {
-                last;
-        }
-}
-
-if($recurse) {
-        @source = (<crypto/*.c>, <crypto/*/*.c>, ,<rsaref/*.c>, <ssl/*.c>);
-} else {
-        @source = @ARGV;
-}
-
-# Read in the config file
-
-open(IN, "<$config") || die "Can't open config file $config";
-
-# Parse config file
-
-while(<IN>)
-{
-        if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
-                $hinc{$1} = $2;
-                $cskip{$3} = $1;
-                if($3 ne "NONE") {
-                        $csrc{$1} = $3;
-                        $fmax{$1} = 99;
-                        $rmax{$1} = 99;
-                        $fnew{$1} = 0;
-                        $rnew{$1} = 0;
-                }
-        } elsif (/^F\s+(\S+)/) {
-        # Add extra function with $1
-        } elsif (/^R\s+(\S+)\s+(\S+)/) {
-                $rextra{$1} = $2;
-                $rcodes{$1} = $2;
-        }
-}
-
-close IN;
-
-# Scan each header file in turn and make a list of error codes
-# and function names
-
-while (($lib, $hdr) = each %hinc)
-{
-        next if($hdr eq "NONE");
-        print STDERR "Scanning header file $hdr\n" if $debug; 
-        open(IN, "<$hdr") || die "Can't open Header file $hdr\n";
-        my $line = "", $def= "";
-        while(<IN>) {
-            last if(/BEGIN\s+ERROR\s+CODES/);
-            if ($line ne '') {
-                $_ = $line . $_;
-                $line = '';
-            }
-
-            if (/\\$/) {
-                $line = $_;
-                next;
-            }
-
-            $cpp = 1 if /^#.*ifdef.*cplusplus/;  # skip "C" declaration
-            if ($cpp) {
-                $cpp = 0 if /^#.*endif/;
-                next;
-            }
-
-            next if (/^#/);                      # skip preprocessor directives
-
-            s/\/\*.*?\*\///gs;                   # ignore comments
-            s/{[^{}]*}//gs;                      # ignore {} blocks
-
-            if (/{|\/\*/) { # Add a } so editor works...
-                $line = $_;
-            } else {
-                $def .= $_;
-            }
-        }
-
-        foreach (split /;/, $def) {
-            s/^[\n\s]*//g;
-            s/[\n\s]*$//g;
-            next if(/typedef\W/);
-            if (/\(\*(\w*)\([^\)]+/) {
-                my $name = $1;
-                $name =~ tr/[a-z]/[A-Z]/;
-                $ftrans{$name} = $1;
-            } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s){
-                # K&R C
-                next ;
-            } elsif (/\w+\W+\w+\W*\(.*\)$/s) {
-                while (not /\(\)$/s) {
-                    s/[^\(\)]*\)$/\)/s;
-                    s/\([^\(\)]*\)\)$/\)/s;
-                }
-                s/\(void\)//;
-                /(\w+)\W*\(\)/s;
-                my $name = $1;
-                $name =~ tr/[a-z]/[A-Z]/;
-                $ftrans{$name} = $1;
-            } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {
-                print STDERR "Header $hdr: cannot parse: $_;\n";
-            }
-        }
-
-        next if $reindex;
-
-        # Scan function and reason codes and store them: keep a note of the
-        # maximum code used.
-
-        while(<IN>) {
-                if(/^#define\s+(\S+)\s+(\S+)/) {
-                        $name = $1;
-                        $code = $2;
-                        unless($name =~ /^${lib}_([RF])_(\w+)$/) {
-                                print STDERR "Invalid error code $name\n";
-                                next;
-                        }
-                        if($1 eq "R") {
-                                $rcodes{$name} = $code;
-                                if(!(exists $rextra{$name}) &&
-                                         ($code > $rmax{$lib}) ) {
-                                        $rmax{$lib} = $code;
-                                }
-                        } else {
-                                if($code > $fmax{$lib}) {
-                                        $fmax{$lib} = $code;
-                                }
-                                $fcodes{$name} = $code;
-                        }
-                }
-        }
-        close IN;
-}
-
-# Scan each C source file and look for function and reason codes
-# This is done by looking for strings that "look like" function or
-# reason codes: basically anything consisting of all upper case and
-# numerics which has _F_ or _R_ in it and which has the name of an
-# error library at the start. This seems to work fine except for the
-# oddly named structure BIO_F_CTX which needs to be ignored.
-# If a code doesn't exist in list compiled from headers then mark it
-# with the value "X" as a place holder to give it a value later.
-# Store all function and reason codes found in %ufcodes and %urcodes
-# so all those unreferenced can be printed out.
-
-
-foreach $file (@source) {
-        # Don't parse the error source file.
-        next if exists $cskip{$file};
-        open(IN, "<$file") || die "Can't open source file $file\n";
-        while(<IN>) {
-                if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
-                        next unless exists $csrc{$2};
-                        next if($1 eq "BIO_F_BUFFER_CTX");
-                        $ufcodes{$1} = 1;
-                        if(!exists $fcodes{$1}) {
-                                $fcodes{$1} = "X";
-                                $fnew{$2}++;
-                        }
-                        $notrans{$1} = 1 unless exists $ftrans{$3};
-                }
-                if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {
-                        next unless exists $csrc{$2};
-                        $urcodes{$1} = 1;
-                        if(!exists $rcodes{$1}) {
-                                $rcodes{$1} = "X";
-                                $rnew{$2}++;
-                        }
-                } 
-        }
-        close IN;
-}
-
-# Now process each library in turn.
-
-foreach $lib (keys %csrc)
-{
-        my $hfile = $hinc{$lib};
-        my $cfile = $csrc{$lib};
-        if(!$fnew{$lib} && !$rnew{$lib}) {
-                print STDERR "$lib:\t\tNo new error codes\n";
-                next unless $rebuild;
-        } else {
-                print STDERR "$lib:\t\t$fnew{$lib} New Functions,";
-                print STDERR " $rnew{$lib} New Reasons.\n";
-                next unless $dowrite;
-        }
-
-        # If we get here then we have some new error codes so we
-        # need to rebuild the header file and C file.
-
-        # Make a sorted list of error and reason codes for later use.
-
-        my @function = sort grep(/^${lib}_/,keys %fcodes);
-        my @reasons = sort grep(/^${lib}_/,keys %rcodes);
-
-        # Rewrite the header file
-
-        open(IN, "<$hfile") || die "Can't Open Header File $hfile\n";
-
-        # Copy across the old file
-        while(<IN>) {
-                push @out, $_;
-                last if (/BEGIN ERROR CODES/);
-        }
-        close IN;
-
-        open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";
-
-        print OUT @out;
-        undef @out;
-        print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the $lib functions. */
-
-/* Function codes. */
-EOF
-
-        foreach $i (@function) {
-                $z=6-int(length($i)/8);
-                if($fcodes{$i} eq "X") {
-                        $fcodes{$i} = ++$fmax{$lib};
-                        print STDERR "New Function code $i\n" if $debug;
-                }
-                printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
-        }
-
-        print OUT "\n/* Reason codes. */\n";
-
-        foreach $i (@reasons) {
-                $z=6-int(length($i)/8);
-                if($rcodes{$i} eq "X") {
-                        $rcodes{$i} = ++$rmax{$lib};
-                        print STDERR "New Reason code   $i\n" if $debug;
-                }
-                printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
-        }
-        print OUT <<"EOF";
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
-EOF
-        close OUT;
-
-        # Rewrite the C source file containing the error details.
-
-        my $hincf;
-        if($static) {
-                $hfile =~ /([^\/]+)$/;
-                $hincf = "<openssl/$1>";
-        } else {
-                $hincf = "\"$hfile\"";
-        }
-
-
-        open (OUT,">$cfile") || die "Can't open $cfile for writing";
-
-        print OUT <<"EOF";
-/* $cfile */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core\@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay\@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh\@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include $hincf
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA ${lib}_str_functs[]=
-        {
-EOF
-        # Add each function code: if a function name is found then use it.
-        foreach $i (@function) {
-                my $fn;
-                $i =~ /^${lib}_F_(\S+)$/;
-                $fn = $1;
-                if(exists $ftrans{$fn}) {
-                        $fn = $ftrans{$fn};
-                }
-                print OUT "{ERR_PACK(0,$i,0),\t\"$fn\"},\n";
-        }
-        print OUT <<"EOF";
-{0,NULL}
-        };
-
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-        {
-EOF
-        # Add each reason code.
-        foreach $i (@reasons) {
-                my $rn;
-                my $nspc = 0;
-                $i =~ /^${lib}_R_(\S+)$/;
-                $rn = $1;
-                $rn =~ tr/_[A-Z]/ [a-z]/;
-                $nspc = 40 - length($i) unless length($i) > 40;
-                $nspc = " " x $nspc;
-                print OUT "{${i}${nspc},\"$rn\"},\n";
-        }
-if($static) {
-        print OUT <<"EOF";
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_${lib}_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_${lib},${lib}_str_functs);
-                ERR_load_strings(ERR_LIB_${lib},${lib}_str_reasons);
-#endif
-
-                }
-        }
-EOF
-} else {
-        print OUT <<"EOF";
-{0,NULL}
-        };
-
-#endif
-
-#ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0      ,${lib}_LIB_NAME},
-{0,NULL}
-        };
-#endif
-
-
-int ${lib}_lib_error_code=0;
-
-void ERR_load_${lib}_strings(void)
-        {
-        static int init=1;
-
-        if (${lib}_lib_error_code == 0)
-                ${lib}_lib_error_code=ERR_get_next_error_library();
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-                ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
-#endif
-
-#ifdef ${lib}_LIB_NAME
-                ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-                ERR_load_strings(0,${lib}_lib_name);
-#endif;
-                }
-        }
-
-void ERR_${lib}_error(int function, int reason, char *file, int line)
-        {
-        if (${lib}_lib_error_code == 0)
-                ${lib}_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-        }
-EOF
-
-}
-
-        close OUT;
-
-}
-
-if($debug && defined(%notrans)) {
-        print STDERR "The following function codes were not translated:\n";
-        foreach(sort keys %notrans)
-        {
-                print STDERR "$_\n";
-        }
-}
-
-# Make a list of unreferenced function and reason codes
-
-foreach (keys %fcodes) {
-        push (@funref, $_) unless exists $ufcodes{$_};
-}
-
-foreach (keys %rcodes) {
-        push (@runref, $_) unless exists $urcodes{$_};
-}
-
-if($debug && defined(@funref) ) {
-        print STDERR "The following function codes were not referenced:\n";
-        foreach(sort @funref)
-        {
-                print STDERR "$_\n";
-        }
-}
-
-if($debug && defined(@runref) ) {
-        print STDERR "The following reason codes were not referenced:\n";
-        foreach(sort @runref)
-        {
-                print STDERR "$_\n";
-        }
-}
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
deleted file mode 100644
index 734e39ac77..0000000000
--- a/src/lib/libcrypto/x509/by_dir.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* crypto/x509/by_dir.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 <time.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/x509.h>
-
-typedef struct lookup_dir_st
-        {
-        BUF_MEM *buffer;
-        int num_dirs;
-        char **dirs;
-        int *dirs_type;
-        int num_dirs_alloced;
-        } BY_DIR;
-
-static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-        char **ret);
-static int new_dir(X509_LOOKUP *lu);
-static void free_dir(X509_LOOKUP *lu);
-static int add_cert_dir(BY_DIR *ctx,const char *dir,int type);
-static int get_cert_by_subject(X509_LOOKUP *xl,int type,X509_NAME *name,
-        X509_OBJECT *ret);
-X509_LOOKUP_METHOD x509_dir_lookup=
-        {
-        "Load certs from files in a directory",
-        new_dir,                /* new */
-        free_dir,               /* free */
-        NULL,                   /* init */
-        NULL,                   /* shutdown */
-        dir_ctrl,               /* ctrl */
-        get_cert_by_subject,    /* get_by_subject */
-        NULL,                   /* get_by_issuer_serial */
-        NULL,                   /* get_by_fingerprint */
-        NULL,                   /* get_by_alias */
-        };
-
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
-        {
-        return(&x509_dir_lookup);
-        }
-
-static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-             char **retp)
-        {
-        int ret=0;
-        BY_DIR *ld;
-        char *dir;
-
-        ld=(BY_DIR *)ctx->method_data;
-
-        switch (cmd)
-                {
-        case X509_L_ADD_DIR:
-                if (argl == X509_FILETYPE_DEFAULT)
-                        {
-                        ret=add_cert_dir(ld,X509_get_default_cert_dir(),
-                                X509_FILETYPE_PEM);
-                        if (!ret)
-                                {
-                                X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR);
-                                }
-                        else
-                                {
-                                dir=(char *)Getenv(X509_get_default_cert_dir_env());
-                                ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
-                                }
-                        }
-                else
-                        ret=add_cert_dir(ld,argp,(int)argl);
-                break;
-                }
-        return(ret);
-        }
-
-static int new_dir(X509_LOOKUP *lu)
-        {
-        BY_DIR *a;
-
-        if ((a=(BY_DIR *)Malloc(sizeof(BY_DIR))) == NULL)
-                return(0);
-        if ((a->buffer=BUF_MEM_new()) == NULL)
-                {
-                Free(a);
-                return(0);
-                }
-        a->num_dirs=0;
-        a->dirs=NULL;
-        a->dirs_type=NULL;
-        a->num_dirs_alloced=0;
-        lu->method_data=(char *)a;
-        return(1);
-        }
-
-static void free_dir(X509_LOOKUP *lu)
-        {
-        BY_DIR *a;
-        int i;
-
-        a=(BY_DIR *)lu->method_data;
-        for (i=0; i<a->num_dirs; i++)
-                if (a->dirs[i] != NULL) Free(a->dirs[i]);
-        if (a->dirs != NULL) Free(a->dirs);
-        if (a->dirs_type != NULL) Free(a->dirs_type);
-        if (a->buffer != NULL) BUF_MEM_free(a->buffer);
-        Free(a);
-        }
-
-static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
-        {
-        int j,len;
-        int *ip;
-        const char *s,*ss,*p;
-        char **pp;
-
-        if (dir == NULL || !*dir)
-            {
-            X509err(X509_F_ADD_CERT_DIR,X509_R_INVALID_DIRECTORY);
-            return 0;
-            }
-
-        s=dir;
-        p=s;
-        for (;;)
-                {
-                if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0'))
-                        {
-                        ss=s;
-                        s=p+1;
-                        len=(int)(p-ss);
-                        if (len == 0) continue;
-                        for (j=0; j<ctx->num_dirs; j++)
-                                if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
-                                        continue;
-                        if (ctx->num_dirs_alloced < (ctx->num_dirs+1))
-                                {
-                                ctx->num_dirs_alloced+=10;
-                                pp=(char **)Malloc(ctx->num_dirs_alloced*
-                                        sizeof(char *));
-                                ip=(int *)Malloc(ctx->num_dirs_alloced*
-                                        sizeof(int));
-                                if ((pp == NULL) || (ip == NULL))
-                                        {
-                                        X509err(X509_F_ADD_CERT_DIR,ERR_R_MALLOC_FAILURE);
-                                        return(0);
-                                        }
-                                memcpy(pp,ctx->dirs,(ctx->num_dirs_alloced-10)*
-                                        sizeof(char *));
-                                memcpy(ip,ctx->dirs_type,(ctx->num_dirs_alloced-10)*
-                                        sizeof(int));
-                                if (ctx->dirs != NULL)
-                                        Free((char *)ctx->dirs);
-                                if (ctx->dirs_type != NULL)
-                                        Free((char *)ctx->dirs_type);
-                                ctx->dirs=pp;
-                                ctx->dirs_type=ip;
-                                }
-                        ctx->dirs_type[ctx->num_dirs]=type;
-                        ctx->dirs[ctx->num_dirs]=(char *)Malloc((unsigned int)len+1);
-                        if (ctx->dirs[ctx->num_dirs] == NULL) return(0);
-                        strncpy(ctx->dirs[ctx->num_dirs],ss,(unsigned int)len);
-                        ctx->dirs[ctx->num_dirs][len]='\0';
-                        ctx->num_dirs++;
-                        }
-                if (*p == '\0') break;
-                p++;
-                }
-        return(1);
-        }
-
-static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
-             X509_OBJECT *ret)
-        {
-        BY_DIR *ctx;
-        union   {
-                struct  {
-                        X509 st_x509;
-                        X509_CINF st_x509_cinf;
-                        } x509;
-                struct  {
-                        X509_CRL st_crl;
-                        X509_CRL_INFO st_crl_info;
-                        } crl;
-                } data;
-        int ok=0;
-        int i,j,k;
-        unsigned long h;
-        BUF_MEM *b=NULL;
-        struct stat st;
-        X509_OBJECT stmp,*tmp;
-        const char *postfix="";
-
-        if (name == NULL) return(0);
-
-        stmp.type=type;
-        if (type == X509_LU_X509)
-                {
-                data.x509.st_x509.cert_info= &data.x509.st_x509_cinf;
-                data.x509.st_x509_cinf.subject=name;
-                stmp.data.x509= &data.x509.st_x509;
-                postfix="";
-                }
-        else if (type == X509_LU_CRL)
-                {
-                data.crl.st_crl.crl= &data.crl.st_crl_info;
-                data.crl.st_crl_info.issuer=name;
-                stmp.data.crl= &data.crl.st_crl;
-                postfix="r";
-                }
-        else
-                {
-                X509err(X509_F_GET_CERT_BY_SUBJECT,X509_R_WRONG_LOOKUP_TYPE);
-                goto finish;
-                }
-
-        if ((b=BUF_MEM_new()) == NULL)
-                {
-                X509err(X509_F_GET_CERT_BY_SUBJECT,ERR_R_BUF_LIB);
-                goto finish;
-                }
-        
-        ctx=(BY_DIR *)xl->method_data;
-
-        h=X509_NAME_hash(name);
-        for (i=0; i<ctx->num_dirs; i++)
-                {
-                j=strlen(ctx->dirs[i])+1+8+6+1+1;
-                if (!BUF_MEM_grow(b,j))
-                        {
-                        X509err(X509_F_GET_CERT_BY_SUBJECT,ERR_R_MALLOC_FAILURE);
-                        goto finish;
-                        }
-                k=0;
-                for (;;)
-                        {
-                        sprintf(b->data,"%s/%08lx.%s%d",ctx->dirs[i],h,
-                                postfix,k);
-                        k++;
-                        if (stat(b->data,&st) < 0)
-                                break;
-                        /* found one. */
-                        if (type == X509_LU_X509)
-                                {
-                                if ((X509_load_cert_file(xl,b->data,
-                                        ctx->dirs_type[i])) == 0)
-                                        break;
-                                }
-                        else if (type == X509_LU_CRL)
-                                {
-                                if ((X509_load_crl_file(xl,b->data,
-                                        ctx->dirs_type[i])) == 0)
-                                        break;
-                                }
-                        /* else case will caught higher up */
-                        }
-
-                /* we have added it to the cache so now pull
-                 * it out again */
-                CRYPTO_r_lock(CRYPTO_LOCK_X509_STORE);
-                tmp=(X509_OBJECT *)lh_retrieve(xl->store_ctx->certs,
-                        (char *)&stmp);
-                CRYPTO_r_unlock(CRYPTO_LOCK_X509_STORE);
-
-                if (tmp != NULL)
-                        {
-                        ok=1;
-                        ret->type=tmp->type;
-                        memcpy(&ret->data,&tmp->data,sizeof(ret->data));
-                        /* If we were going to up the reference count,
-                         * we would need to do it on a perl 'type'
-                         * basis */
-        /*              CRYPTO_add(&tmp->data.x509->references,1,
-                                CRYPTO_LOCK_X509);*/
-                        goto finish;
-                        }
-                }
-finish:
-        if (b != NULL) BUF_MEM_free(b);
-        return(ok);
-        }
-
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
deleted file mode 100644
index 00ee5e8bbc..0000000000
--- a/src/lib/libcrypto/x509/by_file.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* crypto/x509/by_file.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 <time.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-
-#ifndef NO_STDIO
-
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-        long argl, char **ret);
-X509_LOOKUP_METHOD x509_file_lookup=
-        {
-        "Load file into cache",
-        NULL,           /* new */
-        NULL,           /* free */
-        NULL,           /* init */
-        NULL,           /* shutdown */
-        by_file_ctrl,   /* ctrl */
-        NULL,           /* get_by_subject */
-        NULL,           /* get_by_issuer_serial */
-        NULL,           /* get_by_fingerprint */
-        NULL,           /* get_by_alias */
-        };
-
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
-        {
-        return(&x509_file_lookup);
-        }
-
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-             char **ret)
-        {
-        int ok=0,ok2=0;
-        char *file;
-
-        switch (cmd)
-                {
-        case X509_L_FILE_LOAD:
-                if (argl == X509_FILETYPE_DEFAULT)
-                        {
-                        ok=X509_load_cert_file(ctx,X509_get_default_cert_file(),
-                                X509_FILETYPE_PEM);
-                        ok2=X509_load_crl_file(ctx,X509_get_default_cert_file(),
-                                X509_FILETYPE_PEM);
-                        if (!ok || !ok2)
-                                {
-                                X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS);
-                                }
-                        else
-                                {
-                                file=(char *)Getenv(X509_get_default_cert_file_env());
-                                ok=X509_load_cert_file(ctx,file,
-                                        X509_FILETYPE_PEM);
-                                ok2=X509_load_crl_file(ctx,file,
-                                        X509_FILETYPE_PEM);
-                                }
-                        }
-                else
-                        {
-                        ok=X509_load_cert_file(ctx,argp,(int)argl);
-                        ok2=X509_load_crl_file(ctx,argp,(int)argl);
-                        }
-                break;
-                }
-        return((ok && ok2)?ok:0);
-        }
-
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
-        {
-        int ret=0;
-        BIO *in=NULL;
-        int i,count=0;
-        X509 *x=NULL;
-
-        if (file == NULL) return(1);
-        in=BIO_new(BIO_s_file_internal());
-
-        if ((in == NULL) || (BIO_read_filename(in,file) <= 0))
-                {
-                X509err(X509_F_X509_LOAD_CERT_FILE,ERR_R_SYS_LIB);
-                goto err;
-                }
-
-        if (type == X509_FILETYPE_PEM)
-                {
-                for (;;)
-                        {
-                        x=PEM_read_bio_X509(in,NULL,NULL,NULL);
-                        if (x == NULL)
-                                {
-                                if ((ERR_GET_REASON(ERR_peek_error()) ==
-                                        PEM_R_NO_START_LINE) && (count > 0))
-                                        {
-                                        ERR_clear_error();
-                                        break;
-                                        }
-                                else
-                                        {
-                                        X509err(X509_F_X509_LOAD_CERT_FILE,
-                                                ERR_R_PEM_LIB);
-                                        goto err;
-                                        }
-                                }
-                        i=X509_STORE_add_cert(ctx->store_ctx,x);
-                        if (!i) goto err;
-                        count++;
-                        X509_free(x);
-                        x=NULL;
-                        }
-                ret=count;
-                }
-        else if (type == X509_FILETYPE_ASN1)
-                {
-                x=d2i_X509_bio(in,NULL);
-                if (x == NULL)
-                        {
-                        X509err(X509_F_X509_LOAD_CERT_FILE,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                i=X509_STORE_add_cert(ctx->store_ctx,x);
-                if (!i) goto err;
-                ret=i;
-                }
-        else
-                {
-                X509err(X509_F_X509_LOAD_CERT_FILE,X509_R_BAD_X509_FILETYPE);
-                goto err;
-                }
-err:
-        if (x != NULL) X509_free(x);
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
-        {
-        int ret=0;
-        BIO *in=NULL;
-        int i,count=0;
-        X509_CRL *x=NULL;
-
-        if (file == NULL) return(1);
-        in=BIO_new(BIO_s_file_internal());
-
-        if ((in == NULL) || (BIO_read_filename(in,file) <= 0))
-                {
-                X509err(X509_F_X509_LOAD_CRL_FILE,ERR_R_SYS_LIB);
-                goto err;
-                }
-
-        if (type == X509_FILETYPE_PEM)
-                {
-                for (;;)
-                        {
-                        x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
-                        if (x == NULL)
-                                {
-                                if ((ERR_GET_REASON(ERR_peek_error()) ==
-                                        PEM_R_NO_START_LINE) && (count > 0))
-                                        {
-                                        ERR_clear_error();
-                                        break;
-                                        }
-                                else
-                                        {
-                                        X509err(X509_F_X509_LOAD_CRL_FILE,
-                                                ERR_R_PEM_LIB);
-                                        goto err;
-                                        }
-                                }
-                        i=X509_STORE_add_crl(ctx->store_ctx,x);
-                        if (!i) goto err;
-                        count++;
-                        X509_CRL_free(x);
-                        x=NULL;
-                        }
-                ret=count;
-                }
-        else if (type == X509_FILETYPE_ASN1)
-                {
-                x=d2i_X509_CRL_bio(in,NULL);
-                if (x == NULL)
-                        {
-                        X509err(X509_F_X509_LOAD_CRL_FILE,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                i=X509_STORE_add_crl(ctx->store_ctx,x);
-                if (!i) goto err;
-                ret=i;
-                }
-        else
-                {
-                X509err(X509_F_X509_LOAD_CRL_FILE,X509_R_BAD_X509_FILETYPE);
-                goto err;
-                }
-err:
-        if (x != NULL) X509_CRL_free(x);
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-
-#endif /* NO_STDIO */
-
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
deleted file mode 100644
index 35f9484f8b..0000000000
--- a/src/lib/libcrypto/x509/x509.h
+++ /dev/null
@@ -1,989 +0,0 @@
-/* crypto/x509/x509.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_X509_H
-#define HEADER_X509_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#ifdef VMS
-#undef X509_REVOKED_get_ext_by_critical
-#define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic
-#endif
-
-#include <openssl/stack.h>
-#include <openssl/asn1.h>
-#include <openssl/safestack.h>
-
-#ifndef NO_RSA
-#include <openssl/rsa.h>
-#endif
-
-#ifndef NO_DSA
-#include <openssl/dsa.h>
-#endif
-
-#ifndef NO_DH
-#include <openssl/dh.h>
-#endif
-
-#include <openssl/evp.h>
-
-
-#ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
-#undef X509_NAME
-#endif
-
-#define X509_FILETYPE_PEM       1
-#define X509_FILETYPE_ASN1      2
-#define X509_FILETYPE_DEFAULT   3
-
-#define X509v3_KU_DIGITAL_SIGNATURE     0x0080
-#define X509v3_KU_NON_REPUDIATION       0x0040
-#define X509v3_KU_KEY_ENCIPHERMENT      0x0020
-#define X509v3_KU_DATA_ENCIPHERMENT     0x0010
-#define X509v3_KU_KEY_AGREEMENT         0x0008
-#define X509v3_KU_KEY_CERT_SIGN         0x0004
-#define X509v3_KU_CRL_SIGN              0x0002
-#define X509v3_KU_ENCIPHER_ONLY         0x0001
-#define X509v3_KU_DECIPHER_ONLY         0x8000
-#define X509v3_KU_UNDEF                 0xffff
-
-typedef struct X509_objects_st
-        {
-        int nid;
-        int (*a2i)();
-        int (*i2a)();
-        } X509_OBJECTS;
-
-typedef struct X509_algor_st
-        {
-        ASN1_OBJECT *algorithm;
-        ASN1_TYPE *parameter;
-        } X509_ALGOR;
-
-DECLARE_STACK_OF(X509_ALGOR)
-DECLARE_ASN1_SET_OF(X509_ALGOR)
-
-typedef struct X509_val_st
-        {
-        ASN1_UTCTIME *notBefore;
-        ASN1_UTCTIME *notAfter;
-        } X509_VAL;
-
-typedef struct X509_pubkey_st
-        {
-        X509_ALGOR *algor;
-        ASN1_BIT_STRING *public_key;
-        EVP_PKEY *pkey;
-        } X509_PUBKEY;
-
-typedef struct X509_sig_st
-        {
-        X509_ALGOR *algor;
-        ASN1_OCTET_STRING *digest;
-        } X509_SIG;
-
-typedef struct X509_name_entry_st
-        {
-        ASN1_OBJECT *object;
-        ASN1_STRING *value;
-        int set;
-        int size;       /* temp variable */
-        } X509_NAME_ENTRY;
-
-DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
-
-/* we always keep X509_NAMEs in 2 forms. */
-typedef struct X509_name_st
-        {
-        STACK_OF(X509_NAME_ENTRY) *entries;
-        int modified;   /* true if 'bytes' needs to be built */
-#ifdef HEADER_BUFFER_H
-        BUF_MEM *bytes;
-#else
-        char *bytes;
-#endif
-        unsigned long hash; /* Keep the hash around for lookups */
-        } X509_NAME;
-
-DECLARE_STACK_OF(X509_NAME)
-
-#define X509_EX_V_NETSCAPE_HACK         0x8000
-#define X509_EX_V_INIT                  0x0001
-typedef struct X509_extension_st
-        {
-        ASN1_OBJECT *object;
-        short critical;
-        short netscape_hack;
-        ASN1_OCTET_STRING *value;
-        long argl;                      /* used when decoding */
-        char *argp;                     /* used when decoding */
-        void (*ex_free)();              /* clear argp stuff */
-        } X509_EXTENSION;
-
-DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
-
-/* a sequence of these are used */
-typedef struct x509_attributes_st
-        {
-        ASN1_OBJECT *object;
-        int set; /* 1 for a set, 0 for a single item (which is wrong) */
-        union   {
-                char            *ptr;
-/* 1 */         STACK_OF(ASN1_TYPE) *set;
-/* 0 */         ASN1_TYPE       *single;
-                } value;
-        } X509_ATTRIBUTE;
-
-DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
-
-typedef struct X509_req_info_st
-        {
-        ASN1_INTEGER *version;
-        X509_NAME *subject;
-        X509_PUBKEY *pubkey;
-        /*  d=2 hl=2 l=  0 cons: cont: 00 */
-        STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-        int req_kludge;
-        } X509_REQ_INFO;
-
-typedef struct X509_req_st
-        {
-        X509_REQ_INFO *req_info;
-        X509_ALGOR *sig_alg;
-        ASN1_BIT_STRING *signature;
-        int references;
-        } X509_REQ;
-
-typedef struct x509_cinf_st
-        {
-        ASN1_INTEGER *version;          /* [ 0 ] default of v1 */
-        ASN1_INTEGER *serialNumber;
-        X509_ALGOR *signature;
-        X509_NAME *issuer;
-        X509_VAL *validity;
-        X509_NAME *subject;
-        X509_PUBKEY *key;
-        ASN1_BIT_STRING *issuerUID;             /* [ 1 ] optional in v2 */
-        ASN1_BIT_STRING *subjectUID;            /* [ 2 ] optional in v2 */
-        STACK_OF(X509_EXTENSION) *extensions;   /* [ 3 ] optional in v3 */
-        } X509_CINF;
-
-typedef struct x509_st
-        {
-        X509_CINF *cert_info;
-        X509_ALGOR *sig_alg;
-        ASN1_BIT_STRING *signature;
-        int valid;
-        int references;
-        char *name;
-        } X509;
-
-DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
-
-typedef struct X509_revoked_st
-        {
-        ASN1_INTEGER *serialNumber;
-        ASN1_UTCTIME *revocationDate;
-        STACK_OF(X509_EXTENSION) /* optional */ *extensions;
-        int sequence; /* load sequence */
-        } X509_REVOKED;
-
-DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st
-        {
-        ASN1_INTEGER *version;
-        X509_ALGOR *sig_alg;
-        X509_NAME *issuer;
-        ASN1_UTCTIME *lastUpdate;
-        ASN1_UTCTIME *nextUpdate;
-        STACK_OF(X509_REVOKED) *revoked;
-        STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
-        } X509_CRL_INFO;
-
-typedef struct X509_crl_st
-        {
-        /* actual signature */
-        X509_CRL_INFO *crl;
-        X509_ALGOR *sig_alg;
-        ASN1_BIT_STRING *signature;
-        int references;
-        } X509_CRL;
-
-DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_OF(X509_CRL)
-
-typedef struct private_key_st
-        {
-        int version;
-        /* The PKCS#8 data types */
-        X509_ALGOR *enc_algor;
-        ASN1_OCTET_STRING *enc_pkey;    /* encrypted pub key */
-
-        /* When decrypted, the following will not be NULL */
-        EVP_PKEY *dec_pkey;
-
-        /* used to encrypt and decrypt */
-        int key_length;
-        char *key_data;
-        int key_free;   /* true if we should auto free key_data */
-
-        /* expanded version of 'enc_algor' */
-        EVP_CIPHER_INFO cipher;
-
-        int references;
-        } X509_PKEY;
-
-#ifdef HEADER_ENVELOPE_H
-typedef struct X509_info_st
-        {
-        X509 *x509;
-        X509_CRL *crl;
-        X509_PKEY *x_pkey;
-
-        EVP_CIPHER_INFO enc_cipher;
-        int enc_len;
-        char *enc_data;
-
-        int references;
-        } X509_INFO;
-
-DECLARE_STACK_OF(X509_INFO)
-#endif
-
-/* The next 2 structures and their 8 routines were sent to me by
- * Pat Richard <patr@x509.com> and are used to manipulate
- * Netscapes spki strucutres - usefull if you are writing a CA web page
- */
-typedef struct Netscape_spkac_st
-        {
-        X509_PUBKEY *pubkey;
-        ASN1_IA5STRING *challenge;      /* challenge sent in atlas >= PR2 */
-        } NETSCAPE_SPKAC;
-
-typedef struct Netscape_spki_st
-        {
-        NETSCAPE_SPKAC *spkac;  /* signed public key and challenge */
-        X509_ALGOR *sig_algor;
-        ASN1_BIT_STRING *signature;
-        } NETSCAPE_SPKI;
-
-/* Netscape certificate sequence structure */
-typedef struct Netscape_certificate_sequence
-        {
-        ASN1_OBJECT *type;
-        STACK_OF(X509) *certs;
-        } NETSCAPE_CERT_SEQUENCE;
-
-typedef struct CBCParameter_st
-        {
-        unsigned char iv[8];
-        } CBC_PARAM;
-
-/* Password based encryption structure */
-
-typedef struct PBEPARAM_st {
-ASN1_OCTET_STRING *salt;
-ASN1_INTEGER *iter;
-} PBEPARAM;
-
-/* Password based encryption V2 structures */
-
-typedef struct PBE2PARAM_st {
-X509_ALGOR *keyfunc;
-X509_ALGOR *encryption;
-} PBE2PARAM;
-
-typedef struct PBKDF2PARAM_st {
-ASN1_TYPE *salt;        /* Usually OCTET STRING but could be anything */
-ASN1_INTEGER *iter;
-ASN1_INTEGER *keylength;
-X509_ALGOR *prf;
-} PBKDF2PARAM;
-
-
-/* PKCS#8 private key info structure */
-
-typedef struct pkcs8_priv_key_info_st
-        {
-        int broken;     /* Flag for various broken formats */
-#define PKCS8_OK        0
-#define PKCS8_NO_OCTET  1
-        ASN1_INTEGER *version;
-        X509_ALGOR *pkeyalg;
-        ASN1_TYPE *pkey; /* Should be OCTET STRING but some are broken */
-        STACK_OF(X509_ATTRIBUTE) *attributes;
-        } PKCS8_PRIV_KEY_INFO;
-
-#include <openssl/x509_vfy.h>
-#include <openssl/pkcs7.h>
-
-#ifdef SSLEAY_MACROS
-#define X509_verify(a,r) ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,\
-        a->signature,(char *)a->cert_info,r)
-#define X509_REQ_verify(a,r) ASN1_verify((int (*)())i2d_X509_REQ_INFO, \
-        a->sig_alg,a->signature,(char *)a->req_info,r)
-#define X509_CRL_verify(a,r) ASN1_verify((int (*)())i2d_X509_CRL_INFO, \
-        a->sig_alg, a->signature,(char *)a->crl,r)
-
-#define X509_sign(x,pkey,md) \
-        ASN1_sign((int (*)())i2d_X509_CINF, x->cert_info->signature, \
-                x->sig_alg, x->signature, (char *)x->cert_info,pkey,md)
-#define X509_REQ_sign(x,pkey,md) \
-        ASN1_sign((int (*)())i2d_X509_REQ_INFO,x->sig_alg, NULL, \
-                x->signature, (char *)x->req_info,pkey,md)
-#define X509_CRL_sign(x,pkey,md) \
-        ASN1_sign((int (*)())i2d_X509_CRL_INFO,x->crl->sig_alg,x->sig_alg, \
-                x->signature, (char *)x->crl,pkey,md)
-#define NETSCAPE_SPKI_sign(x,pkey,md) \
-        ASN1_sign((int (*)())i2d_NETSCAPE_SPKAC, x->sig_algor,NULL, \
-                x->signature, (char *)x->spkac,pkey,md)
-
-#define X509_dup(x509) (X509 *)ASN1_dup((int (*)())i2d_X509, \
-                (char *(*)())d2i_X509,(char *)x509)
-#define X509_ATTRIBUTE_dup(xa) (X509_ATTRIBUTE *)ASN1_dup(\
-                (int (*)())i2d_X509_ATTRIBUTE, \
-                (char *(*)())d2i_X509_ATTRIBUTE,(char *)xa)
-#define X509_EXTENSION_dup(ex) (X509_EXTENSION *)ASN1_dup( \
-                (int (*)())i2d_X509_EXTENSION, \
-                (char *(*)())d2i_X509_EXTENSION,(char *)ex)
-#define d2i_X509_fp(fp,x509) (X509 *)ASN1_d2i_fp((char *(*)())X509_new, \
-                (char *(*)())d2i_X509, (fp),(unsigned char **)(x509))
-#define i2d_X509_fp(fp,x509) ASN1_i2d_fp(i2d_X509,fp,(unsigned char *)x509)
-#define d2i_X509_bio(bp,x509) (X509 *)ASN1_d2i_bio((char *(*)())X509_new, \
-                (char *(*)())d2i_X509, (bp),(unsigned char **)(x509))
-#define i2d_X509_bio(bp,x509) ASN1_i2d_bio(i2d_X509,bp,(unsigned char *)x509)
-
-#define X509_CRL_dup(crl) (X509_CRL *)ASN1_dup((int (*)())i2d_X509_CRL, \
-                (char *(*)())d2i_X509_CRL,(char *)crl)
-#define d2i_X509_CRL_fp(fp,crl) (X509_CRL *)ASN1_d2i_fp((char *(*)()) \
-                X509_CRL_new,(char *(*)())d2i_X509_CRL, (fp),\
-                (unsigned char **)(crl))
-#define i2d_X509_CRL_fp(fp,crl) ASN1_i2d_fp(i2d_X509_CRL,fp,\
-                (unsigned char *)crl)
-#define d2i_X509_CRL_bio(bp,crl) (X509_CRL *)ASN1_d2i_bio((char *(*)()) \
-                X509_CRL_new,(char *(*)())d2i_X509_CRL, (bp),\
-                (unsigned char **)(crl))
-#define i2d_X509_CRL_bio(bp,crl) ASN1_i2d_bio(i2d_X509_CRL,bp,\
-                (unsigned char *)crl)
-
-#define PKCS7_dup(p7) (PKCS7 *)ASN1_dup((int (*)())i2d_PKCS7, \
-                (char *(*)())d2i_PKCS7,(char *)p7)
-#define d2i_PKCS7_fp(fp,p7) (PKCS7 *)ASN1_d2i_fp((char *(*)()) \
-                PKCS7_new,(char *(*)())d2i_PKCS7, (fp),\
-                (unsigned char **)(p7))
-#define i2d_PKCS7_fp(fp,p7) ASN1_i2d_fp(i2d_PKCS7,fp,\
-                (unsigned char *)p7)
-#define d2i_PKCS7_bio(bp,p7) (PKCS7 *)ASN1_d2i_bio((char *(*)()) \
-                PKCS7_new,(char *(*)())d2i_PKCS7, (bp),\
-                (unsigned char **)(p7))
-#define i2d_PKCS7_bio(bp,p7) ASN1_i2d_bio(i2d_PKCS7,bp,\
-                (unsigned char *)p7)
-
-#define X509_REQ_dup(req) (X509_REQ *)ASN1_dup((int (*)())i2d_X509_REQ, \
-                (char *(*)())d2i_X509_REQ,(char *)req)
-#define d2i_X509_REQ_fp(fp,req) (X509_REQ *)ASN1_d2i_fp((char *(*)())\
-                X509_REQ_new, (char *(*)())d2i_X509_REQ, (fp),\
-                (unsigned char **)(req))
-#define i2d_X509_REQ_fp(fp,req) ASN1_i2d_fp(i2d_X509_REQ,fp,\
-                (unsigned char *)req)
-#define d2i_X509_REQ_bio(bp,req) (X509_REQ *)ASN1_d2i_bio((char *(*)())\
-                X509_REQ_new, (char *(*)())d2i_X509_REQ, (bp),\
-                (unsigned char **)(req))
-#define i2d_X509_REQ_bio(bp,req) ASN1_i2d_bio(i2d_X509_REQ,bp,\
-                (unsigned char *)req)
-
-#define RSAPublicKey_dup(rsa) (RSA *)ASN1_dup((int (*)())i2d_RSAPublicKey, \
-                (char *(*)())d2i_RSAPublicKey,(char *)rsa)
-#define RSAPrivateKey_dup(rsa) (RSA *)ASN1_dup((int (*)())i2d_RSAPrivateKey, \
-                (char *(*)())d2i_RSAPrivateKey,(char *)rsa)
-
-#define d2i_RSAPrivateKey_fp(fp,rsa) (RSA *)ASN1_d2i_fp((char *(*)())\
-                RSA_new,(char *(*)())d2i_RSAPrivateKey, (fp), \
-                (unsigned char **)(rsa))
-#define i2d_RSAPrivateKey_fp(fp,rsa) ASN1_i2d_fp(i2d_RSAPrivateKey,fp, \
-                (unsigned char *)rsa)
-#define d2i_RSAPrivateKey_bio(bp,rsa) (RSA *)ASN1_d2i_bio((char *(*)())\
-                RSA_new,(char *(*)())d2i_RSAPrivateKey, (bp), \
-                (unsigned char **)(rsa))
-#define i2d_RSAPrivateKey_bio(bp,rsa) ASN1_i2d_bio(i2d_RSAPrivateKey,bp, \
-                (unsigned char *)rsa)
-
-#define d2i_RSAPublicKey_fp(fp,rsa) (RSA *)ASN1_d2i_fp((char *(*)())\
-                RSA_new,(char *(*)())d2i_RSAPublicKey, (fp), \
-                (unsigned char **)(rsa))
-#define i2d_RSAPublicKey_fp(fp,rsa) ASN1_i2d_fp(i2d_RSAPublicKey,fp, \
-                (unsigned char *)rsa)
-#define d2i_RSAPublicKey_bio(bp,rsa) (RSA *)ASN1_d2i_bio((char *(*)())\
-                RSA_new,(char *(*)())d2i_RSAPublicKey, (bp), \
-                (unsigned char **)(rsa))
-#define i2d_RSAPublicKey_bio(bp,rsa) ASN1_i2d_bio(i2d_RSAPublicKey,bp, \
-                (unsigned char *)rsa)
-
-#define d2i_DSAPrivateKey_fp(fp,dsa) (DSA *)ASN1_d2i_fp((char *(*)())\
-                DSA_new,(char *(*)())d2i_DSAPrivateKey, (fp), \
-                (unsigned char **)(dsa))
-#define i2d_DSAPrivateKey_fp(fp,dsa) ASN1_i2d_fp(i2d_DSAPrivateKey,fp, \
-                (unsigned char *)dsa)
-#define d2i_DSAPrivateKey_bio(bp,dsa) (DSA *)ASN1_d2i_bio((char *(*)())\
-                DSA_new,(char *(*)())d2i_DSAPrivateKey, (bp), \
-                (unsigned char **)(dsa))
-#define i2d_DSAPrivateKey_bio(bp,dsa) ASN1_i2d_bio(i2d_DSAPrivateKey,bp, \
-                (unsigned char *)dsa)
-
-#define X509_ALGOR_dup(xn) (X509_ALGOR *)ASN1_dup((int (*)())i2d_X509_ALGOR,\
-                (char *(*)())d2i_X509_ALGOR,(char *)xn)
-
-#define X509_NAME_dup(xn) (X509_NAME *)ASN1_dup((int (*)())i2d_X509_NAME, \
-                (char *(*)())d2i_X509_NAME,(char *)xn)
-#define X509_NAME_ENTRY_dup(ne) (X509_NAME_ENTRY *)ASN1_dup( \
-                (int (*)())i2d_X509_NAME_ENTRY, \
-                (char *(*)())d2i_X509_NAME_ENTRY,\
-                (char *)ne)
-
-#define X509_digest(data,type,md,len) \
-        ASN1_digest((int (*)())i2d_X509,type,(char *)data,md,len)
-#define X509_NAME_digest(data,type,md,len) \
-        ASN1_digest((int (*)())i2d_X509_NAME,type,(char *)data,md,len)
-#ifndef PKCS7_ISSUER_AND_SERIAL_digest
-#define PKCS7_ISSUER_AND_SERIAL_digest(data,type,md,len) \
-        ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,\
-                (char *)data,md,len)
-#endif
-#endif
-
-#define X509_EXT_PACK_UNKNOWN   1
-#define X509_EXT_PACK_STRING    2
-
-#define         X509_get_version(x) ASN1_INTEGER_get((x)->cert_info->version)
-/* #define      X509_get_serialNumber(x) ((x)->cert_info->serialNumber) */
-#define         X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
-#define         X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
-#define         X509_extract_key(x)     X509_get_pubkey(x) /*****/
-#define         X509_REQ_get_version(x) ASN1_INTEGER_get((x)->req_info->version)
-#define         X509_REQ_get_subject_name(x) ((x)->req_info->subject)
-#define         X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
-#define         X509_name_cmp(a,b)      X509_NAME_cmp((a),(b))
-#define         X509_get_signature_type(x) EVP_PKEY_type(OBJ_obj2nid((x)->sig_alg->algorithm))
-
-#define         X509_CRL_get_version(x) ASN1_INTEGER_get((x)->crl->version)
-#define         X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
-#define         X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
-#define         X509_CRL_get_issuer(x) ((x)->crl->issuer)
-#define         X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
-
-/* This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf) */
-#define         X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
-
-
-const char *X509_verify_cert_error_string(long n);
-
-#ifndef SSLEAY_MACROS
-#ifdef HEADER_ENVELOPE_H
-int X509_verify(X509 *a, EVP_PKEY *r);
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
-
-int X509_digest(X509 *data,EVP_MD *type,unsigned char *md,unsigned int *len);
-int X509_NAME_digest(X509_NAME *data,EVP_MD *type,
-        unsigned char *md,unsigned int *len);
-#endif
-
-#ifndef NO_FP_API
-X509 *d2i_X509_fp(FILE *fp, X509 **x509);
-int i2d_X509_fp(FILE *fp,X509 *x509);
-X509_CRL *d2i_X509_CRL_fp(FILE *fp,X509_CRL **crl);
-int i2d_X509_CRL_fp(FILE *fp,X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_fp(FILE *fp,X509_REQ **req);
-int i2d_X509_REQ_fp(FILE *fp,X509_REQ *req);
-#ifndef NO_RSA
-RSA *d2i_RSAPrivateKey_fp(FILE *fp,RSA **rsa);
-int i2d_RSAPrivateKey_fp(FILE *fp,RSA *rsa);
-RSA *d2i_RSAPublicKey_fp(FILE *fp,RSA **rsa);
-int i2d_RSAPublicKey_fp(FILE *fp,RSA *rsa);
-#endif
-#ifndef NO_DSA
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-X509_SIG *d2i_PKCS8_fp(FILE *fp,X509_SIG **p8);
-int i2d_PKCS8_fp(FILE *fp,X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,PKCS8_PRIV_KEY_INFO *p8inf);
-#endif
-#endif
-
-#ifdef HEADER_BIO_H
-X509 *d2i_X509_bio(BIO *bp,X509 **x509);
-int i2d_X509_bio(BIO *bp,X509 *x509);
-X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL **crl);
-int i2d_X509_CRL_bio(BIO *bp,X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_bio(BIO *bp,X509_REQ **req);
-int i2d_X509_REQ_bio(BIO *bp,X509_REQ *req);
-#ifndef NO_RSA
-RSA *d2i_RSAPrivateKey_bio(BIO *bp,RSA **rsa);
-int i2d_RSAPrivateKey_bio(BIO *bp,RSA *rsa);
-RSA *d2i_RSAPublicKey_bio(BIO *bp,RSA **rsa);
-int i2d_RSAPublicKey_bio(BIO *bp,RSA *rsa);
-#endif
-#ifndef NO_DSA
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-#endif
-X509_SIG *d2i_PKCS8_bio(BIO *bp,X509_SIG **p8);
-int i2d_PKCS8_bio(BIO *bp,X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,PKCS8_PRIV_KEY_INFO *p8inf);
-#endif
-
-X509 *X509_dup(X509 *x509);
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex);
-X509_CRL *X509_CRL_dup(X509_CRL *crl);
-X509_REQ *X509_REQ_dup(X509_REQ *req);
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
-X509_NAME *X509_NAME_dup(X509_NAME *xn);
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
-#ifndef NO_RSA
-RSA *RSAPublicKey_dup(RSA *rsa);
-RSA *RSAPrivateKey_dup(RSA *rsa);
-#endif
-
-#endif /* !SSLEAY_MACROS */
-
-int             X509_cmp_current_time(ASN1_UTCTIME *s);
-ASN1_UTCTIME *  X509_gmtime_adj(ASN1_UTCTIME *s, long adj);
-
-const char *    X509_get_default_cert_area(void );
-const char *    X509_get_default_cert_dir(void );
-const char *    X509_get_default_cert_file(void );
-const char *    X509_get_default_cert_dir_env(void );
-const char *    X509_get_default_cert_file_env(void );
-const char *    X509_get_default_private_dir(void );
-
-X509_REQ *      X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, EVP_MD *md);
-X509 *          X509_REQ_to_X509(X509_REQ *r, int days,EVP_PKEY *pkey);
-void ERR_load_X509_strings(void );
-
-X509_ALGOR *    X509_ALGOR_new(void );
-void            X509_ALGOR_free(X509_ALGOR *a);
-int             i2d_X509_ALGOR(X509_ALGOR *a,unsigned char **pp);
-X509_ALGOR *    d2i_X509_ALGOR(X509_ALGOR **a,unsigned char **pp,
-                        long length);
-
-X509_VAL *      X509_VAL_new(void );
-void            X509_VAL_free(X509_VAL *a);
-int             i2d_X509_VAL(X509_VAL *a,unsigned char **pp);
-X509_VAL *      d2i_X509_VAL(X509_VAL **a,unsigned char **pp,
-                        long length);
-
-X509_PUBKEY *   X509_PUBKEY_new(void );
-void            X509_PUBKEY_free(X509_PUBKEY *a);
-int             i2d_X509_PUBKEY(X509_PUBKEY *a,unsigned char **pp);
-X509_PUBKEY *   d2i_X509_PUBKEY(X509_PUBKEY **a,unsigned char **pp,
-                        long length);
-int             X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *      X509_PUBKEY_get(X509_PUBKEY *key);
-int             X509_get_pubkey_parameters(EVP_PKEY *pkey,
-                                           STACK_OF(X509) *chain);
-
-
-X509_SIG *      X509_SIG_new(void );
-void            X509_SIG_free(X509_SIG *a);
-int             i2d_X509_SIG(X509_SIG *a,unsigned char **pp);
-X509_SIG *      d2i_X509_SIG(X509_SIG **a,unsigned char **pp,long length);
-
-X509_REQ_INFO *X509_REQ_INFO_new(void);
-void            X509_REQ_INFO_free(X509_REQ_INFO *a);
-int             i2d_X509_REQ_INFO(X509_REQ_INFO *a,unsigned char **pp);
-X509_REQ_INFO *d2i_X509_REQ_INFO(X509_REQ_INFO **a,unsigned char **pp,
-                        long length);
-
-X509_REQ *      X509_REQ_new(void);
-void            X509_REQ_free(X509_REQ *a);
-int             i2d_X509_REQ(X509_REQ *a,unsigned char **pp);
-X509_REQ *      d2i_X509_REQ(X509_REQ **a,unsigned char **pp,long length);
-
-X509_ATTRIBUTE *X509_ATTRIBUTE_new(void );
-void            X509_ATTRIBUTE_free(X509_ATTRIBUTE *a);
-int             i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a,unsigned char **pp);
-X509_ATTRIBUTE *d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a,unsigned char **pp,
-                        long length);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
-
-
-X509_EXTENSION *X509_EXTENSION_new(void );
-void            X509_EXTENSION_free(X509_EXTENSION *a);
-int             i2d_X509_EXTENSION(X509_EXTENSION *a,unsigned char **pp);
-X509_EXTENSION *d2i_X509_EXTENSION(X509_EXTENSION **a,unsigned char **pp,
-                        long length);
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_new(void);
-void            X509_NAME_ENTRY_free(X509_NAME_ENTRY *a);
-int             i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a,unsigned char **pp);
-X509_NAME_ENTRY *d2i_X509_NAME_ENTRY(X509_NAME_ENTRY **a,unsigned char **pp,
-                        long length);
-
-X509_NAME *     X509_NAME_new(void);
-void            X509_NAME_free(X509_NAME *a);
-int             i2d_X509_NAME(X509_NAME *a,unsigned char **pp);
-X509_NAME *     d2i_X509_NAME(X509_NAME **a,unsigned char **pp,long length);
-int             X509_NAME_set(X509_NAME **xn, X509_NAME *name);
-
-
-X509_CINF *     X509_CINF_new(void);
-void            X509_CINF_free(X509_CINF *a);
-int             i2d_X509_CINF(X509_CINF *a,unsigned char **pp);
-X509_CINF *     d2i_X509_CINF(X509_CINF **a,unsigned char **pp,long length);
-
-X509 *          X509_new(void);
-void            X509_free(X509 *a);
-int             i2d_X509(X509 *a,unsigned char **pp);
-X509 *          d2i_X509(X509 **a,unsigned char **pp,long length);
-
-X509_REVOKED *  X509_REVOKED_new(void);
-void            X509_REVOKED_free(X509_REVOKED *a);
-int             i2d_X509_REVOKED(X509_REVOKED *a,unsigned char **pp);
-X509_REVOKED *  d2i_X509_REVOKED(X509_REVOKED **a,unsigned char **pp,long length);
-
-X509_CRL_INFO *X509_CRL_INFO_new(void);
-void            X509_CRL_INFO_free(X509_CRL_INFO *a);
-int             i2d_X509_CRL_INFO(X509_CRL_INFO *a,unsigned char **pp);
-X509_CRL_INFO *d2i_X509_CRL_INFO(X509_CRL_INFO **a,unsigned char **pp,
-                        long length);
-
-X509_CRL *      X509_CRL_new(void);
-void            X509_CRL_free(X509_CRL *a);
-int             i2d_X509_CRL(X509_CRL *a,unsigned char **pp);
-X509_CRL *      d2i_X509_CRL(X509_CRL **a,unsigned char **pp,long length);
-
-X509_PKEY *     X509_PKEY_new(void );
-void            X509_PKEY_free(X509_PKEY *a);
-int             i2d_X509_PKEY(X509_PKEY *a,unsigned char **pp);
-X509_PKEY *     d2i_X509_PKEY(X509_PKEY **a,unsigned char **pp,long length);
-
-NETSCAPE_SPKI * NETSCAPE_SPKI_new(void );
-void            NETSCAPE_SPKI_free(NETSCAPE_SPKI *a);
-int             i2d_NETSCAPE_SPKI(NETSCAPE_SPKI *a,unsigned char **pp);
-NETSCAPE_SPKI * d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a,unsigned char **pp,
-                        long length);
-
-NETSCAPE_SPKAC *NETSCAPE_SPKAC_new(void );
-void            NETSCAPE_SPKAC_free(NETSCAPE_SPKAC *a);
-int             i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a,unsigned char **pp);
-NETSCAPE_SPKAC *d2i_NETSCAPE_SPKAC(NETSCAPE_SPKAC **a,unsigned char **pp,
-                long length);
-
-
-int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp);
-NETSCAPE_CERT_SEQUENCE *NETSCAPE_CERT_SEQUENCE_new(void);
-NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a, unsigned char **pp, long length);
-void NETSCAPE_CERT_SEQUENCE_free(NETSCAPE_CERT_SEQUENCE *a);
-
-#ifdef HEADER_ENVELOPE_H
-X509_INFO *     X509_INFO_new(void);
-void            X509_INFO_free(X509_INFO *a);
-char *          X509_NAME_oneline(X509_NAME *a,char *buf,int size);
-
-int ASN1_verify(int (*i2d)(), X509_ALGOR *algor1,
-        ASN1_BIT_STRING *signature,char *data,EVP_PKEY *pkey);
-
-int ASN1_digest(int (*i2d)(),EVP_MD *type,char *data,
-        unsigned char *md,unsigned int *len);
-
-int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2,
-        ASN1_BIT_STRING *signature,
-        char *data,EVP_PKEY *pkey, const EVP_MD *type);
-#endif
-
-int             X509_set_version(X509 *x,long version);
-int             X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *  X509_get_serialNumber(X509 *x);
-int             X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *     X509_get_issuer_name(X509 *a);
-int             X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *     X509_get_subject_name(X509 *a);
-int             X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm);
-int             X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm);
-int             X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-EVP_PKEY *      X509_get_pubkey(X509 *x);
-int             X509_certificate_type(X509 *x,EVP_PKEY *pubkey /* optional */);
-
-int             X509_REQ_set_version(X509_REQ *x,long version);
-int             X509_REQ_set_subject_name(X509_REQ *req,X509_NAME *name);
-int             X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *      X509_REQ_get_pubkey(X509_REQ *req);
-
-int             X509_check_private_key(X509 *x509,EVP_PKEY *pkey);
-
-int             X509_issuer_and_serial_cmp(X509 *a, X509 *b);
-unsigned long   X509_issuer_and_serial_hash(X509 *a);
-
-int             X509_issuer_name_cmp(X509 *a, X509 *b);
-unsigned long   X509_issuer_name_hash(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);
-
-int             X509_CRL_cmp(X509_CRL *a,X509_CRL *b);
-#ifndef NO_FP_API
-int             X509_print_fp(FILE *bp,X509 *x);
-int             X509_CRL_print_fp(FILE *bp,X509_CRL *x);
-int             X509_REQ_print_fp(FILE *bp,X509_REQ *req);
-#endif
-
-#ifdef HEADER_BIO_H
-int             X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
-int             X509_print(BIO *bp,X509 *x);
-int             X509_CRL_print(BIO *bp,X509_CRL *x);
-int             X509_REQ_print(BIO *bp,X509_REQ *req);
-#endif
-
-int             X509_NAME_entry_count(X509_NAME *name);
-int             X509_NAME_get_text_by_NID(X509_NAME *name, int nid,
-                        char *buf,int len);
-int             X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-                        char *buf,int len);
-
-/* NOTE: you should be passsing -1, not 0 as lastpos.  The functions that use
- * lastpos, seach after that position on. */
-int             X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
-int             X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj,
-                        int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
-int             X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne,
-                        int loc, int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                        int type,unsigned char *bytes, int len);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                        ASN1_OBJECT *obj, int type,unsigned char *bytes,
-                        int len);
-int             X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne,
-                        ASN1_OBJECT *obj);
-int             X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                        unsigned char *bytes, int len);
-ASN1_OBJECT *   X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
-ASN1_STRING *   X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
-
-int             X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
-int             X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-                                      int nid, int lastpos);
-int             X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-                                      ASN1_OBJECT *obj,int lastpos);
-int             X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-                                           int crit, int lastpos);
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc);
-
-int             X509_get_ext_count(X509 *x);
-int             X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
-int             X509_get_ext_by_OBJ(X509 *x,ASN1_OBJECT *obj,int lastpos);
-int             X509_get_ext_by_critical(X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(X509 *x, int loc);
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
-int             X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
-
-int             X509_CRL_get_ext_count(X509_CRL *x);
-int             X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
-int             X509_CRL_get_ext_by_OBJ(X509_CRL *x,ASN1_OBJECT *obj,int lastpos);
-int             X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
-int             X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
-
-int             X509_REVOKED_get_ext_count(X509_REVOKED *x);
-int             X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
-int             X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x,ASN1_OBJECT *obj,int lastpos);
-int             X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
-int             X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-                        int nid, int crit, ASN1_OCTET_STRING *data);
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-                        ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data);
-int             X509_EXTENSION_set_object(X509_EXTENSION *ex,ASN1_OBJECT *obj);
-int             X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
-int             X509_EXTENSION_set_data(X509_EXTENSION *ex,
-                        ASN1_OCTET_STRING *data);
-ASN1_OBJECT *   X509_EXTENSION_get_object(X509_EXTENSION *ex);
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
-int             X509_EXTENSION_get_critical(X509_EXTENSION *ex);
-
-int             X509_verify_cert(X509_STORE_CTX *ctx);
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk,X509_NAME *name,
-                                     ASN1_INTEGER *serial);
-X509 *X509_find_by_subject(STACK_OF(X509) *sk,X509_NAME *name);
-
-int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp);
-PBEPARAM *PBEPARAM_new(void);
-PBEPARAM *d2i_PBEPARAM(PBEPARAM **a, unsigned char **pp, long length);
-void PBEPARAM_free(PBEPARAM *a);
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                                         unsigned char *salt, int saltlen);
-
-int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp);
-PBKDF2PARAM *PBKDF2PARAM_new(void);
-PBKDF2PARAM *d2i_PBKDF2PARAM(PBKDF2PARAM **a, unsigned char **pp, long length);
-void PBKDF2PARAM_free(PBKDF2PARAM *a);
-
-int i2d_PBE2PARAM(PBE2PARAM *a, unsigned char **pp);
-PBE2PARAM *PBE2PARAM_new(void);
-PBE2PARAM *d2i_PBE2PARAM(PBE2PARAM **a, unsigned char **pp, long length);
-void PBE2PARAM_free(PBE2PARAM *a);
-
-/* PKCS#8 utilities */
-
-int i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **pp);
-PKCS8_PRIV_KEY_INFO *PKCS8_PRIV_KEY_INFO_new(void);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO **a,
-                                         unsigned char **pp, long length);
-void PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a);
-
-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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_X509_CHECK_PRIVATE_KEY                    128
-#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_CANT_CHECK_DH_KEY                         114
-#define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
-#define X509_R_ERR_ASN1_LIB                              102
-#define X509_R_INVALID_DIRECTORY                         113
-#define X509_R_KEY_TYPE_MISMATCH                         115
-#define X509_R_KEY_VALUES_MISMATCH                       116
-#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_KEY_TYPE                          117
-#define X509_R_UNKNOWN_NID                               109
-#define X509_R_UNSUPPORTED_ALGORITHM                     111
-#define X509_R_WRONG_LOOKUP_TYPE                         112
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
deleted file mode 100644
index 9a93bae3ff..0000000000
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* crypto/x509/x509_cmp.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 <sys/types.h>
-#include <sys/stat.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int X509_issuer_and_serial_cmp(X509 *a, X509 *b)
-        {
-        int i;
-        X509_CINF *ai,*bi;
-
-        ai=a->cert_info;
-        bi=b->cert_info;
-        i=ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber);
-        if (i) return(i);
-        return(X509_NAME_cmp(ai->issuer,bi->issuer));
-        }
-
-#ifndef NO_MD5
-unsigned long X509_issuer_and_serial_hash(X509 *a)
-        {
-        unsigned long ret=0;
-        MD5_CTX ctx;
-        unsigned char md[16];
-        char str[256];
-
-        X509_NAME_oneline(a->cert_info->issuer,str,256);
-        ret=strlen(str);
-        MD5_Init(&ctx);
-        MD5_Update(&ctx,(unsigned char *)str,ret);
-        MD5_Update(&ctx,(unsigned char *)a->cert_info->serialNumber->data,
-                (unsigned long)a->cert_info->serialNumber->length);
-        MD5_Final(&(md[0]),&ctx);
-        ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
-                ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
-                )&0xffffffffL;
-        return(ret);
-        }
-#endif
-        
-int X509_issuer_name_cmp(X509 *a, X509 *b)
-        {
-        return(X509_NAME_cmp(a->cert_info->issuer,b->cert_info->issuer));
-        }
-
-int X509_subject_name_cmp(X509 *a, X509 *b)
-        {
-        return(X509_NAME_cmp(a->cert_info->subject,b->cert_info->subject));
-        }
-
-int X509_CRL_cmp(X509_CRL *a, X509_CRL *b)
-        {
-        return(X509_NAME_cmp(a->crl->issuer,b->crl->issuer));
-        }
-
-X509_NAME *X509_get_issuer_name(X509 *a)
-        {
-        return(a->cert_info->issuer);
-        }
-
-unsigned long X509_issuer_name_hash(X509 *x)
-        {
-        return(X509_NAME_hash(x->cert_info->issuer));
-        }
-
-X509_NAME *X509_get_subject_name(X509 *a)
-        {
-        return(a->cert_info->subject);
-        }
-
-ASN1_INTEGER *X509_get_serialNumber(X509 *a)
-        {
-        return(a->cert_info->serialNumber);
-        }
-
-unsigned long X509_subject_name_hash(X509 *x)
-        {
-        return(X509_NAME_hash(x->cert_info->subject));
-        }
-
-int X509_NAME_cmp(X509_NAME *a, X509_NAME *b)
-        {
-        int i,j;
-        X509_NAME_ENTRY *na,*nb;
-
-        if (sk_X509_NAME_ENTRY_num(a->entries)
-            != sk_X509_NAME_ENTRY_num(b->entries))
-                return sk_X509_NAME_ENTRY_num(a->entries)
-                  -sk_X509_NAME_ENTRY_num(b->entries);
-        for (i=sk_X509_NAME_ENTRY_num(a->entries)-1; i>=0; i--)
-                {
-                na=sk_X509_NAME_ENTRY_value(a->entries,i);
-                nb=sk_X509_NAME_ENTRY_value(b->entries,i);
-                j=na->value->length-nb->value->length;
-                if (j) return(j);
-                j=memcmp(na->value->data,nb->value->data,
-                        na->value->length);
-                if (j) return(j);
-                j=na->set-nb->set;
-                if (j) return(j);
-                }
-
-        /* We will check the object types after checking the values
-         * since the values will more often be different than the object
-         * types. */
-        for (i=sk_X509_NAME_ENTRY_num(a->entries)-1; i>=0; i--)
-                {
-                na=sk_X509_NAME_ENTRY_value(a->entries,i);
-                nb=sk_X509_NAME_ENTRY_value(b->entries,i);
-                j=OBJ_cmp(na->object,nb->object);
-                if (j) return(j);
-                }
-        return(0);
-        }
-
-#ifndef NO_MD5
-/* I now DER encode the name and hash it.  Since I cache the DER encoding,
- * this is reasonably effiecent. */
-unsigned long X509_NAME_hash(X509_NAME *x)
-        {
-        unsigned long ret=0;
-        unsigned char md[16];
-        unsigned char str[256],*p,*pp;
-        int i;
-
-        i=i2d_X509_NAME(x,NULL);
-        if (i > sizeof(str))
-                p=Malloc(i);
-        else
-                p=str;
-
-        pp=p;
-        i2d_X509_NAME(x,&pp);
-        MD5((unsigned char *)p,i,&(md[0]));
-        if (p != str) Free(p);
-
-        ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
-                ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
-                )&0xffffffffL;
-        return(ret);
-        }
-#endif
-
-/* Search a stack of X509 for a match */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
-                ASN1_INTEGER *serial)
-        {
-        int i;
-        X509_CINF cinf;
-        X509 x,*x509=NULL;
-
-        x.cert_info= &cinf;
-        cinf.serialNumber=serial;
-        cinf.issuer=name;
-
-        for (i=0; i<sk_X509_num(sk); i++)
-                {
-                x509=sk_X509_value(sk,i);
-                if (X509_issuer_and_serial_cmp(x509,&x) == 0)
-                        return(x509);
-                }
-        return(NULL);
-        }
-
-X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name)
-        {
-        X509 *x509;
-        int i;
-
-        for (i=0; i<sk_X509_num(sk); i++)
-                {
-                x509=sk_X509_value(sk,i);
-                if (X509_NAME_cmp(X509_get_subject_name(x509),name) == 0)
-                        return(x509);
-                }
-        return(NULL);
-        }
-
-EVP_PKEY *X509_get_pubkey(X509 *x)
-        {
-        if ((x == NULL) || (x->cert_info == NULL))
-                return(NULL);
-        return(X509_PUBKEY_get(x->cert_info->key));
-        }
-
-int X509_check_private_key(X509 *x, EVP_PKEY *k)
-        {
-        EVP_PKEY *xk=NULL;
-        int ok=0;
-
-        xk=X509_get_pubkey(x);
-        if (xk->type != k->type)
-            {
-            X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_TYPE_MISMATCH);
-            goto err;
-            }
-        switch (k->type)
-                {
-#ifndef NO_RSA
-        case EVP_PKEY_RSA:
-                if (BN_cmp(xk->pkey.rsa->n,k->pkey.rsa->n) != 0
-                    || BN_cmp(xk->pkey.rsa->e,k->pkey.rsa->e) != 0)
-                    {
-                    X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
-                    goto err;
-                    }
-                break;
-#endif
-#ifndef NO_DSA
-        case EVP_PKEY_DSA:
-                if (BN_cmp(xk->pkey.dsa->pub_key,k->pkey.dsa->pub_key) != 0)
-                    {
-                    X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
-                    goto err;
-                    }
-                break;
-#endif
-#ifndef NO_DH
-        case EVP_PKEY_DH:
-                /* No idea */
-                X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_CANT_CHECK_DH_KEY);
-                goto err;
-#endif
-        default:
-                X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_UNKNOWN_KEY_TYPE);
-                goto err;
-                }
-
-        ok=1;
-err:
-        EVP_PKEY_free(xk);
-        return(ok);
-        }
diff --git a/src/lib/libcrypto/x509/x509_d2.c b/src/lib/libcrypto/x509/x509_d2.c
deleted file mode 100644
index 3e7ec5b432..0000000000
--- a/src/lib/libcrypto/x509/x509_d2.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/x509/x509_d2.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 <sys/types.h>
-#include <sys/stat.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-
-#ifndef NO_STDIO
-int X509_STORE_set_default_paths(X509_STORE *ctx)
-        {
-        X509_LOOKUP *lookup;
-
-        lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
-        if (lookup == NULL) return(0);
-        X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-
-        lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir());
-        if (lookup == NULL) return(0);
-        X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-        
-        /* clear any errors */
-        ERR_clear_error();
-
-        return(1);
-        }
-
-int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
-                const char *path)
-        {
-        X509_LOOKUP *lookup;
-
-        if (file != NULL)
-                {
-                lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_file());
-                if (lookup == NULL) return(0);
-                X509_LOOKUP_load_file(lookup,file,X509_FILETYPE_PEM);
-                }
-        if (path != NULL)
-                {
-                lookup=X509_STORE_add_lookup(ctx,X509_LOOKUP_hash_dir());
-                if (lookup == NULL) return(0);
-                X509_LOOKUP_add_dir(lookup,path,X509_FILETYPE_PEM);
-                }
-        if ((path == NULL) && (file == NULL))
-                return(0);
-        return(1);
-        }
-
-#endif
diff --git a/src/lib/libcrypto/x509/x509_def.c b/src/lib/libcrypto/x509/x509_def.c
deleted file mode 100644
index c4bee71569..0000000000
--- a/src/lib/libcrypto/x509/x509_def.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/x509/x509_def.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 <sys/types.h>
-#include <sys/stat.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-
-const char *X509_get_default_private_dir(void)
-        { return(X509_PRIVATE_DIR); }
-        
-const char *X509_get_default_cert_area(void)
-        { return(X509_CERT_AREA); }
-
-const char *X509_get_default_cert_dir(void)
-        { return(X509_CERT_DIR); }
-
-const char *X509_get_default_cert_file(void)
-        { return(X509_CERT_FILE); }
-
-const char *X509_get_default_cert_dir_env(void)
-        { return(X509_CERT_DIR_EVP); }
-
-const char *X509_get_default_cert_file_env(void)
-        { return(X509_CERT_FILE_EVP); }
-
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c
deleted file mode 100644
index 9afd4ccde5..0000000000
--- a/src/lib/libcrypto/x509/x509_err.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* crypto/x509/x509_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA X509_str_functs[]=
-        {
-{ERR_PACK(0,X509_F_ADD_CERT_DIR,0),     "ADD_CERT_DIR"},
-{ERR_PACK(0,X509_F_BY_FILE_CTRL,0),     "BY_FILE_CTRL"},
-{ERR_PACK(0,X509_F_DIR_CTRL,0), "DIR_CTRL"},
-{ERR_PACK(0,X509_F_GET_CERT_BY_SUBJECT,0),      "GET_CERT_BY_SUBJECT"},
-{ERR_PACK(0,X509_F_X509V3_ADD_EXT,0),   "X509v3_add_ext"},
-{ERR_PACK(0,X509_F_X509_CHECK_PRIVATE_KEY,0),   "X509_check_private_key"},
-{ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_NID,0),     "X509_EXTENSION_create_by_NID"},
-{ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_OBJ,0),     "X509_EXTENSION_create_by_OBJ"},
-{ERR_PACK(0,X509_F_X509_GET_PUBKEY_PARAMETERS,0),       "X509_get_pubkey_parameters"},
-{ERR_PACK(0,X509_F_X509_LOAD_CERT_FILE,0),      "X509_load_cert_file"},
-{ERR_PACK(0,X509_F_X509_LOAD_CRL_FILE,0),       "X509_load_crl_file"},
-{ERR_PACK(0,X509_F_X509_NAME_ADD_ENTRY,0),      "X509_NAME_add_entry"},
-{ERR_PACK(0,X509_F_X509_NAME_ENTRY_CREATE_BY_NID,0),    "X509_NAME_ENTRY_create_by_NID"},
-{ERR_PACK(0,X509_F_X509_NAME_ENTRY_SET_OBJECT,0),       "X509_NAME_ENTRY_set_object"},
-{ERR_PACK(0,X509_F_X509_NAME_ONELINE,0),        "X509_NAME_oneline"},
-{ERR_PACK(0,X509_F_X509_NAME_PRINT,0),  "X509_NAME_print"},
-{ERR_PACK(0,X509_F_X509_PRINT_FP,0),    "X509_print_fp"},
-{ERR_PACK(0,X509_F_X509_PUBKEY_GET,0),  "X509_PUBKEY_get"},
-{ERR_PACK(0,X509_F_X509_PUBKEY_SET,0),  "X509_PUBKEY_set"},
-{ERR_PACK(0,X509_F_X509_REQ_PRINT,0),   "X509_REQ_print"},
-{ERR_PACK(0,X509_F_X509_REQ_PRINT_FP,0),        "X509_REQ_print_fp"},
-{ERR_PACK(0,X509_F_X509_REQ_TO_X509,0), "X509_REQ_to_X509"},
-{ERR_PACK(0,X509_F_X509_STORE_ADD_CERT,0),      "X509_STORE_add_cert"},
-{ERR_PACK(0,X509_F_X509_STORE_ADD_CRL,0),       "X509_STORE_add_crl"},
-{ERR_PACK(0,X509_F_X509_TO_X509_REQ,0), "X509_to_X509_REQ"},
-{ERR_PACK(0,X509_F_X509_VERIFY_CERT,0), "X509_verify_cert"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA X509_str_reasons[]=
-        {
-{X509_R_BAD_X509_FILETYPE                ,"bad x509 filetype"},
-{X509_R_CANT_CHECK_DH_KEY                ,"cant check dh key"},
-{X509_R_CERT_ALREADY_IN_HASH_TABLE       ,"cert already in hash table"},
-{X509_R_ERR_ASN1_LIB                     ,"err asn1 lib"},
-{X509_R_INVALID_DIRECTORY                ,"invalid directory"},
-{X509_R_KEY_TYPE_MISMATCH                ,"key type mismatch"},
-{X509_R_KEY_VALUES_MISMATCH              ,"key values mismatch"},
-{X509_R_LOADING_CERT_DIR                 ,"loading cert dir"},
-{X509_R_LOADING_DEFAULTS                 ,"loading defaults"},
-{X509_R_NO_CERT_SET_FOR_US_TO_VERIFY     ,"no cert set for us to verify"},
-{X509_R_SHOULD_RETRY                     ,"should retry"},
-{X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN,"unable to find parameters in chain"},
-{X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY   ,"unable to get certs public key"},
-{X509_R_UNKNOWN_KEY_TYPE                 ,"unknown key type"},
-{X509_R_UNKNOWN_NID                      ,"unknown nid"},
-{X509_R_UNSUPPORTED_ALGORITHM            ,"unsupported algorithm"},
-{X509_R_WRONG_LOOKUP_TYPE                ,"wrong lookup type"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_X509_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_X509,X509_str_functs);
-                ERR_load_strings(ERR_LIB_X509,X509_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/x509/x509_ext.c b/src/lib/libcrypto/x509/x509_ext.c
deleted file mode 100644
index f8565a60b2..0000000000
--- a/src/lib/libcrypto/x509/x509_ext.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* crypto/x509/x509_ext.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/stack.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509_CRL_get_ext_count(X509_CRL *x)
-        {
-        return(X509v3_get_ext_count(x->crl->extensions));
-        }
-
-int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->crl->extensions,nid,lastpos));
-        }
-
-int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->crl->extensions,obj,lastpos));
-        }
-
-int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->crl->extensions,crit,lastpos));
-        }
-
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc)
-        {
-        return(X509v3_get_ext(x->crl->extensions,loc));
-        }
-
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
-        {
-        return(X509v3_delete_ext(x->crl->extensions,loc));
-        }
-
-int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->crl->extensions),ex,loc) != NULL);
-        }
-
-int X509_get_ext_count(X509 *x)
-        {
-        return(X509v3_get_ext_count(x->cert_info->extensions));
-        }
-
-int X509_get_ext_by_NID(X509 *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->cert_info->extensions,nid,lastpos));
-        }
-
-int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->cert_info->extensions,obj,lastpos));
-        }
-
-int X509_get_ext_by_critical(X509 *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->cert_info->extensions,crit,lastpos));
-        }
-
-X509_EXTENSION *X509_get_ext(X509 *x, int loc)
-        {
-        return(X509v3_get_ext(x->cert_info->extensions,loc));
-        }
-
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc)
-        {
-        return(X509v3_delete_ext(x->cert_info->extensions,loc));
-        }
-
-int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->cert_info->extensions),ex,loc) != NULL);
-        }
-
-int X509_REVOKED_get_ext_count(X509_REVOKED *x)
-        {
-        return(X509v3_get_ext_count(x->extensions));
-        }
-
-int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->extensions,nid,lastpos));
-        }
-
-int X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x, ASN1_OBJECT *obj,
-             int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->extensions,obj,lastpos));
-        }
-
-int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->extensions,crit,lastpos));
-        }
-
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc)
-        {
-        return(X509v3_get_ext(x->extensions,loc));
-        }
-
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc)
-        {
-        return(X509v3_delete_ext(x->extensions,loc));
-        }
-
-int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->extensions),ex,loc) != NULL);
-        }
-
-IMPLEMENT_STACK_OF(X509_EXTENSION)
-IMPLEMENT_ASN1_SET_OF(X509_EXTENSION)
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
deleted file mode 100644
index 18bfecb11e..0000000000
--- a/src/lib/libcrypto/x509/x509_lu.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* crypto/x509/x509_lu.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 <openssl/lhash.h>
-#include <openssl/x509.h>
-
-static STACK *x509_store_meth=NULL;
-static STACK *x509_store_ctx_meth=NULL;
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
-        {
-        X509_LOOKUP *ret;
-
-        ret=(X509_LOOKUP *)Malloc(sizeof(X509_LOOKUP));
-        if (ret == NULL) return(NULL);
-
-        ret->init=0;
-        ret->skip=0;
-        ret->method=method;
-        ret->method_data=NULL;
-        ret->store_ctx=NULL;
-        if ((method->new_item != NULL) && !method->new_item(ret))
-                {
-                Free(ret);
-                return(NULL);
-                }
-        return(ret);
-        }
-
-void X509_LOOKUP_free(X509_LOOKUP *ctx)
-        {
-        if (ctx == NULL) return;
-        if (    (ctx->method != NULL) &&
-                (ctx->method->free != NULL))
-                ctx->method->free(ctx);
-        Free(ctx);
-        }
-
-int X509_LOOKUP_init(X509_LOOKUP *ctx)
-        {
-        if (ctx->method == NULL) return(0);
-        if (ctx->method->init != NULL)
-                return(ctx->method->init(ctx));
-        else
-                return(1);
-        }
-
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx)
-        {
-        if (ctx->method == NULL) return(0);
-        if (ctx->method->shutdown != NULL)
-                return(ctx->method->shutdown(ctx));
-        else
-                return(1);
-        }
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-             char **ret)
-        {
-        if (ctx->method == NULL) return(-1);
-        if (ctx->method->ctrl != NULL)
-                return(ctx->method->ctrl(ctx,cmd,argc,argl,ret));
-        else
-                return(1);
-        }
-
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
-             X509_OBJECT *ret)
-        {
-        if ((ctx->method == NULL) || (ctx->method->get_by_subject == NULL))
-                return(X509_LU_FAIL);
-        if (ctx->skip) return(0);
-        return(ctx->method->get_by_subject(ctx,type,name,ret));
-        }
-
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-             ASN1_INTEGER *serial, X509_OBJECT *ret)
-        {
-        if ((ctx->method == NULL) ||
-                (ctx->method->get_by_issuer_serial == NULL))
-                return(X509_LU_FAIL);
-        return(ctx->method->get_by_issuer_serial(ctx,type,name,serial,ret));
-        }
-
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-             unsigned char *bytes, int len, X509_OBJECT *ret)
-        {
-        if ((ctx->method == NULL) || (ctx->method->get_by_fingerprint == NULL))
-                return(X509_LU_FAIL);
-        return(ctx->method->get_by_fingerprint(ctx,type,bytes,len,ret));
-        }
-
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,
-             X509_OBJECT *ret)
-        {
-        if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
-                return(X509_LU_FAIL);
-        return(ctx->method->get_by_alias(ctx,type,str,len,ret));
-        }
-
-static unsigned long x509_object_hash(X509_OBJECT *a)
-        {
-        unsigned long h;
-
-        switch (a->type)
-                {
-        case X509_LU_X509:
-                h=X509_NAME_hash(a->data.x509->cert_info->subject);
-                break;
-        case X509_LU_CRL:
-                h=X509_NAME_hash(a->data.crl->crl->issuer);
-                break;
-        default:
-                abort();
-                }
-        return(h);
-        }
-
-static int x509_object_cmp(X509_OBJECT *a, X509_OBJECT *b)
-        {
-        int ret;
-
-        ret=(a->type - b->type);
-        if (ret) return(ret);
-        switch (a->type)
-                {
-        case X509_LU_X509:
-                ret=X509_subject_name_cmp(a->data.x509,b->data.x509);
-                break;
-        case X509_LU_CRL:
-                ret=X509_CRL_cmp(a->data.crl,b->data.crl);
-                break;
-        default:
-                abort();
-                }
-        return(ret);
-        }
-
-X509_STORE *X509_STORE_new(void)
-        {
-        X509_STORE *ret;
-
-        if ((ret=(X509_STORE *)Malloc(sizeof(X509_STORE))) == NULL)
-                return(NULL);
-        ret->certs=lh_new(x509_object_hash,x509_object_cmp);
-        ret->cache=1;
-        ret->get_cert_methods=sk_X509_LOOKUP_new_null();
-        ret->verify=NULL;
-        ret->verify_cb=NULL;
-        memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
-        ret->references=1;
-        ret->depth=0;
-        return(ret);
-        }
-
-static void cleanup(X509_OBJECT *a)
-        {
-        if (a->type == X509_LU_X509)
-                {
-                X509_free(a->data.x509);
-                }
-        else if (a->type == X509_LU_CRL)
-                {
-                X509_CRL_free(a->data.crl);
-                }
-        else
-                abort();
-
-        Free(a);
-        }
-
-void X509_STORE_free(X509_STORE *vfy)
-        {
-        int i;
-        STACK_OF(X509_LOOKUP) *sk;
-        X509_LOOKUP *lu;
-
-        if(vfy == NULL)
-            return;
-
-        sk=vfy->get_cert_methods;
-        for (i=0; i<sk_X509_LOOKUP_num(sk); i++)
-                {
-                lu=sk_X509_LOOKUP_value(sk,i);
-                X509_LOOKUP_shutdown(lu);
-                X509_LOOKUP_free(lu);
-                }
-        sk_X509_LOOKUP_free(sk);
-
-        CRYPTO_free_ex_data(x509_store_meth,(char *)vfy,&vfy->ex_data);
-        lh_doall(vfy->certs,cleanup);
-        lh_free(vfy->certs);
-        Free(vfy);
-        }
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m)
-        {
-        int i;
-        STACK_OF(X509_LOOKUP) *sk;
-        X509_LOOKUP *lu;
-
-        sk=v->get_cert_methods;
-        for (i=0; i<sk_X509_LOOKUP_num(sk); i++)
-                {
-                lu=sk_X509_LOOKUP_value(sk,i);
-                if (m == lu->method)
-                        {
-                        return(lu);
-                        }
-                }
-        /* a new one */
-        lu=X509_LOOKUP_new(m);
-        if (lu == NULL)
-                return(NULL);
-        else
-                {
-                lu->store_ctx=v;
-                if (sk_X509_LOOKUP_push(v->get_cert_methods,lu))
-                        return(lu);
-                else
-                        {
-                        X509_LOOKUP_free(lu);
-                        return(NULL);
-                        }
-                }
-        }
-
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
-             X509_OBJECT *ret)
-        {
-        X509_STORE *ctx=vs->ctx;
-        X509_LOOKUP *lu;
-        X509_OBJECT stmp,*tmp;
-        int i,j;
-
-        tmp=X509_OBJECT_retrieve_by_subject(ctx->certs,type,name);
-
-        if (tmp == NULL)
-                {
-                for (i=vs->current_method; i<sk_X509_LOOKUP_num(ctx->get_cert_methods); i++)
-                        {
-                        lu=sk_X509_LOOKUP_value(ctx->get_cert_methods,i);
-                        j=X509_LOOKUP_by_subject(lu,type,name,&stmp);
-                        if (j < 0)
-                                {
-                                vs->current_method=j;
-                                return(j);
-                                }
-                        else if (j)
-                                {
-                                tmp= &stmp;
-                                break;
-                                }
-                        }
-                vs->current_method=0;
-                if (tmp == NULL)
-                        return(0);
-                }
-
-/*      if (ret->data.ptr != NULL)
-                X509_OBJECT_free_contents(ret); */
-
-        ret->type=tmp->type;
-        ret->data.ptr=tmp->data.ptr;
-
-        X509_OBJECT_up_ref_count(ret);
-
-        return(1);
-        }
-
-void X509_OBJECT_up_ref_count(X509_OBJECT *a)
-        {
-        switch (a->type)
-                {
-        case X509_LU_X509:
-                CRYPTO_add(&a->data.x509->references,1,CRYPTO_LOCK_X509);
-                break;
-        case X509_LU_CRL:
-                CRYPTO_add(&a->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
-                break;
-                }
-        }
-
-void X509_OBJECT_free_contents(X509_OBJECT *a)
-        {
-        switch (a->type)
-                {
-        case X509_LU_X509:
-                X509_free(a->data.x509);
-                break;
-        case X509_LU_CRL:
-                X509_CRL_free(a->data.crl);
-                break;
-                }
-        }
-
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(LHASH *h, int type,
-             X509_NAME *name)
-        {
-        X509_OBJECT stmp,*tmp;
-        X509 x509_s;
-        X509_CINF cinf_s;
-        X509_CRL crl_s;
-        X509_CRL_INFO crl_info_s;
-
-        stmp.type=type;
-        switch (type)
-                {
-        case X509_LU_X509:
-                stmp.data.x509= &x509_s;
-                x509_s.cert_info= &cinf_s;
-                cinf_s.subject=name;
-                break;
-        case X509_LU_CRL:
-                stmp.data.crl= &crl_s;
-                crl_s.crl= &crl_info_s;
-                crl_info_s.issuer=name;
-                break;
-        default:
-                abort();
-                }
-
-        tmp=(X509_OBJECT *)lh_retrieve(h,(char *)&stmp);
-        return(tmp);
-        }
-
-void X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
-             STACK_OF(X509) *chain)
-        {
-        ctx->ctx=store;
-        ctx->current_method=0;
-        ctx->cert=x509;
-        ctx->untrusted=chain;
-        ctx->last_untrusted=0;
-        ctx->valid=0;
-        ctx->chain=NULL;
-        ctx->depth=9;
-        ctx->error=0;
-        ctx->current_cert=NULL;
-        memset(&(ctx->ex_data),0,sizeof(CRYPTO_EX_DATA));
-        }
-
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
-        {
-        if (ctx->chain != NULL)
-                {
-                sk_X509_pop_free(ctx->chain,X509_free);
-                ctx->chain=NULL;
-                }
-        CRYPTO_free_ex_data(x509_store_ctx_meth,(char *)ctx,&(ctx->ex_data));
-        memset(&ctx->ex_data,0,sizeof(CRYPTO_EX_DATA));
-        }
-
-IMPLEMENT_STACK_OF(X509_LOOKUP)
diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
deleted file mode 100644
index 691b71f031..0000000000
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* crypto/x509/x509_obj.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 <openssl/lhash.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/buffer.h>
-
-char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
-        {
-        X509_NAME_ENTRY *ne;
-int i;
-        int n,lold,l,l1,l2,num,j,type;
-        const char *s;
-        char *p;
-        unsigned char *q;
-        BUF_MEM *b=NULL;
-        static char hex[17]="0123456789ABCDEF";
-        int gs_doit[4];
-        char tmp_buf[80];
-#ifdef CHARSET_EBCDIC
-        char ebcdic_buf[1024];
-#endif
-
-        if (buf == NULL)
-                {
-                if ((b=BUF_MEM_new()) == NULL) goto err;
-                if (!BUF_MEM_grow(b,200)) goto err;
-                b->data[0]='\0';
-                len=200;
-                }
-        if (a == NULL)
-            {
-            if(b)
-                {
-                buf=b->data;
-                Free(b);
-                }
-            strncpy(buf,"NO X509_NAME",len);
-            return buf;
-            }
-
-        len--; /* space for '\0' */
-        l=0;
-        for (i=0; i<sk_X509_NAME_ENTRY_num(a->entries); i++)
-                {
-                ne=sk_X509_NAME_ENTRY_value(a->entries,i);
-                n=OBJ_obj2nid(ne->object);
-                if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL))
-                        {
-                        i2t_ASN1_OBJECT(tmp_buf,sizeof(tmp_buf),ne->object);
-                        s=tmp_buf;
-                        }
-                l1=strlen(s);
-
-                type=ne->value->type;
-                num=ne->value->length;
-                q=ne->value->data;
-#ifdef CHARSET_EBCDIC
-                if (type == V_ASN1_GENERALSTRING ||
-                    type == V_ASN1_VISIBLESTRING ||
-                    type == V_ASN1_PRINTABLESTRING ||
-                    type == V_ASN1_TELETEXSTRING ||
-                    type == V_ASN1_VISIBLESTRING ||
-                    type == V_ASN1_IA5STRING) {
-                        ascii2ebcdic(ebcdic_buf, q,
-                                     (num > sizeof ebcdic_buf)
-                                     ? sizeof ebcdic_buf : num);
-                        q=ebcdic_buf;
-                }
-#endif
-
-                if ((type == V_ASN1_GENERALSTRING) && ((num%4) == 0))
-                        {
-                        gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=0;
-                        for (j=0; j<num; j++)
-                                if (q[j] != 0) gs_doit[j&3]=1;
-
-                        if (gs_doit[0]|gs_doit[1]|gs_doit[2])
-                                gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=1;
-                        else
-                                {
-                                gs_doit[0]=gs_doit[1]=gs_doit[2]=0;
-                                gs_doit[3]=1;
-                                }
-                        }
-                else
-                        gs_doit[0]=gs_doit[1]=gs_doit[2]=gs_doit[3]=1;
-
-                for (l2=j=0; j<num; j++)
-                        {
-                        if (!gs_doit[j&3]) continue;
-                        l2++;
-#ifndef CHARSET_EBCDIC
-                        if ((q[j] < ' ') || (q[j] > '~')) l2+=3;
-#else
-                        if ((os_toascii[q[j]] < os_toascii[' ']) ||
-                            (os_toascii[q[j]] > os_toascii['~'])) l2+=3;
-#endif
-                        }
-
-                lold=l;
-                l+=1+l1+1+l2;
-                if (b != NULL)
-                        {
-                        if (!BUF_MEM_grow(b,l+1)) goto err;
-                        p= &(b->data[lold]);
-                        }
-                else if (l > len)
-                        {
-                        break;
-                        }
-                else
-                        p= &(buf[lold]);
-                *(p++)='/';
-                memcpy(p,s,(unsigned int)l1); p+=l1;
-                *(p++)='=';
-
-#ifndef CHARSET_EBCDIC /* q was assigned above already. */
-                q=ne->value->data;
-#endif
-
-                for (j=0; j<num; j++)
-                        {
-                        if (!gs_doit[j&3]) continue;
-#ifndef CHARSET_EBCDIC
-                        n=q[j];
-                        if ((n < ' ') || (n > '~'))
-                                {
-                                *(p++)='\\';
-                                *(p++)='x';
-                                *(p++)=hex[(n>>4)&0x0f];
-                                *(p++)=hex[n&0x0f];
-                                }
-                        else
-                                *(p++)=n;
-#else
-                        n=os_toascii[q[j]];
-                        if ((n < os_toascii[' ']) ||
-                            (n > os_toascii['~']))
-                                {
-                                *(p++)='\\';
-                                *(p++)='x';
-                                *(p++)=hex[(n>>4)&0x0f];
-                                *(p++)=hex[n&0x0f];
-                                }
-                        else
-                                *(p++)=q[j];
-#endif
-                        }
-                *p='\0';
-                }
-        if (b != NULL)
-                {
-                p=b->data;
-                Free(b);
-                }
-        else
-                p=buf;
-        return(p);
-err:
-        X509err(X509_F_X509_NAME_ONELINE,ERR_R_MALLOC_FAILURE);
-        if (b != NULL) BUF_MEM_free(b);
-        return(NULL);
-        }
-
diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
deleted file mode 100644
index bb4697ae60..0000000000
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* crypto/x509/x509_r2x.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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/buffer.h>
-
-X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
-        {
-        X509 *ret=NULL;
-        X509_CINF *xi=NULL;
-        X509_NAME *xn;
-
-        if ((ret=X509_new()) == NULL)
-                {
-                X509err(X509_F_X509_REQ_TO_X509,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* duplicate the request */
-        xi=ret->cert_info;
-
-        if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0)
-                {
-                if ((xi->version=ASN1_INTEGER_new()) == NULL) goto err;
-                if (!ASN1_INTEGER_set(xi->version,2)) goto err;
-/*              xi->extensions=ri->attributes; <- bad, should not ever be done
-                ri->attributes=NULL; */
-                }
-
-        xn=X509_REQ_get_subject_name(r);
-        X509_set_subject_name(ret,X509_NAME_dup(xn));
-        X509_set_issuer_name(ret,X509_NAME_dup(xn));
-
-        X509_gmtime_adj(xi->validity->notBefore,0);
-        X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days);
-
-        X509_set_pubkey(ret,X509_REQ_get_pubkey(r));
-
-        if (!X509_sign(ret,pkey,EVP_md5()))
-                goto err;
-        if (0)
-                {
-err:
-                X509_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
deleted file mode 100644
index 2ef94decd1..0000000000
--- a/src/lib/libcrypto/x509/x509_req.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* crypto/x509/x509_req.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 <openssl/bn.h>
-#include <openssl/evp.h>
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/buffer.h>
-#include <openssl/pem.h>
-
-X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, EVP_MD *md)
-        {
-        X509_REQ *ret;
-        X509_REQ_INFO *ri;
-        int i;
-        EVP_PKEY *pktmp;
-
-        ret=X509_REQ_new();
-        if (ret == NULL)
-                {
-                X509err(X509_F_X509_TO_X509_REQ,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        ri=ret->req_info;
-
-        ri->version->length=1;
-        ri->version->data=(unsigned char *)Malloc(1);
-        if (ri->version->data == NULL) goto err;
-        ri->version->data[0]=0; /* version == 0 */
-
-        if (!X509_REQ_set_subject_name(ret,X509_get_subject_name(x)))
-                goto err;
-
-        pktmp = X509_get_pubkey(x);
-        i=X509_REQ_set_pubkey(ret,pktmp);
-        EVP_PKEY_free(pktmp);
-        if (!i) goto err;
-
-        if (pkey != NULL)
-                {
-                if (!X509_REQ_sign(ret,pkey,md))
-                        goto err;
-                }
-        return(ret);
-err:
-        X509_REQ_free(ret);
-        return(NULL);
-        }
-
-EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)
-        {
-        if ((req == NULL) || (req->req_info == NULL))
-                return(NULL);
-        return(X509_PUBKEY_get(req->req_info->pubkey));
-        }
-
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
deleted file mode 100644
index 5a6f7b414f..0000000000
--- a/src/lib/libcrypto/x509/x509_set.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* crypto/x509/x509_set.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 <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509_set_version(X509 *x, long version)
-        {
-        if (x == NULL) return(0);
-        if (x->cert_info->version == NULL)
-                {
-                if ((x->cert_info->version=ASN1_INTEGER_new()) == NULL)
-                        return(0);
-                }
-        return(ASN1_INTEGER_set(x->cert_info->version,version));
-        }
-
-int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
-        {
-        ASN1_INTEGER *in;
-
-        if (x == NULL) return(0);
-        in=x->cert_info->serialNumber;
-        if (in != serial)
-                {
-                in=ASN1_INTEGER_dup(serial);
-                if (in != NULL)
-                        {
-                        ASN1_INTEGER_free(x->cert_info->serialNumber);
-                        x->cert_info->serialNumber=in;
-                        }
-                }
-        return(in != NULL);
-        }
-
-int X509_set_issuer_name(X509 *x, X509_NAME *name)
-        {
-        if ((x == NULL) || (x->cert_info == NULL)) return(0);
-        return(X509_NAME_set(&x->cert_info->issuer,name));
-        }
-
-int X509_set_subject_name(X509 *x, X509_NAME *name)
-        {
-        if ((x == NULL) || (x->cert_info == NULL)) return(0);
-        return(X509_NAME_set(&x->cert_info->subject,name));
-        }
-
-int X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm)
-        {
-        ASN1_UTCTIME *in;
-
-        if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
-        in=x->cert_info->validity->notBefore;
-        if (in != tm)
-                {
-                in=ASN1_UTCTIME_dup(tm);
-                if (in != NULL)
-                        {
-                        ASN1_UTCTIME_free(x->cert_info->validity->notBefore);
-                        x->cert_info->validity->notBefore=in;
-                        }
-                }
-        return(in != NULL);
-        }
-
-int X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm)
-        {
-        ASN1_UTCTIME *in;
-
-        if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
-        in=x->cert_info->validity->notAfter;
-        if (in != tm)
-                {
-                in=ASN1_UTCTIME_dup(tm);
-                if (in != NULL)
-                        {
-                        ASN1_UTCTIME_free(x->cert_info->validity->notAfter);
-                        x->cert_info->validity->notAfter=in;
-                        }
-                }
-        return(in != NULL);
-        }
-
-int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
-        {
-        if ((x == NULL) || (x->cert_info == NULL)) return(0);
-        return(X509_PUBKEY_set(&(x->cert_info->key),pkey));
-        }
-
-
-
diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c
deleted file mode 100644
index 11a3d2012f..0000000000
--- a/src/lib/libcrypto/x509/x509_txt.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypto/x509/x509_txt.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 <time.h>
-#include <errno.h>
-#include <sys/types.h>
-
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-
-const char *X509_verify_cert_error_string(long n)
-        {
-        static char buf[100];
-
-        switch ((int)n)
-                {
-        case X509_V_OK:
-                return("ok");
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-                return("unable to get issuer certificate");
-        case X509_V_ERR_UNABLE_TO_GET_CRL:
-                return("unable to get certificate CRL");
-        case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
-                return("unable to decrypt certificate's signature");
-        case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
-                return("unable to decrypt CRL's's signature");
-        case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
-                return("unable to decode issuer public key");
-        case X509_V_ERR_CERT_SIGNATURE_FAILURE:
-                return("certificate signature failure");
-        case X509_V_ERR_CRL_SIGNATURE_FAILURE:
-                return("CRL signature failure");
-        case X509_V_ERR_CERT_NOT_YET_VALID:
-                return("certificate is not yet valid");
-        case X509_V_ERR_CRL_NOT_YET_VALID:
-                return("CRL is not yet valid");
-        case X509_V_ERR_CERT_HAS_EXPIRED:
-                return("Certificate has expired");
-        case X509_V_ERR_CRL_HAS_EXPIRED:
-                return("CRL has expired");
-        case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-                return("format error in certificate's notBefore field");
-        case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-                return("format error in certificate's notAfter field");
-        case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
-                return("format error in CRL's lastUpdate field");
-        case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
-                return("format error in CRL's nextUpdate field");
-        case X509_V_ERR_OUT_OF_MEM:
-                return("out of memory");
-        case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-                return("self signed certificate");
-        case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-                return("self signed certificate in certificate chain");
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
-                return("unable to get local issuer certificate");
-        case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-                return("unable to verify the first certificate");
-        case X509_V_ERR_CERT_CHAIN_TOO_LONG:
-                return("certificate chain too long");
-        case X509_V_ERR_CERT_REVOKED:
-                return("certificate revoked");
-        case X509_V_ERR_APPLICATION_VERIFICATION:
-                return("application verification failure");
-        default:
-                sprintf(buf,"error number %ld",n);
-                return(buf);
-                }
-        }
-
-
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
deleted file mode 100644
index dd2f9f1b17..0000000000
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* crypto/x509/x509_v3.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/stack.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
-        {
-        if (x == NULL) return(0);
-        return(sk_X509_EXTENSION_num(x));
-        }
-
-int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
-                          int lastpos)
-        {
-        ASN1_OBJECT *obj;
-
-        obj=OBJ_nid2obj(nid);
-        if (obj == NULL) return(-2);
-        return(X509v3_get_ext_by_OBJ(x,obj,lastpos));
-        }
-
-int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, ASN1_OBJECT *obj,
-                          int lastpos)
-        {
-        int n;
-        X509_EXTENSION *ex;
-
-        if (sk == NULL) return(-1);
-        lastpos++;
-        if (lastpos < 0)
-                lastpos=0;
-        n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++)
-                {
-                ex=sk_X509_EXTENSION_value(sk,lastpos);
-                if (OBJ_cmp(ex->object,obj) == 0)
-                        return(lastpos);
-                }
-        return(-1);
-        }
-
-int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
-                               int lastpos)
-        {
-        int n;
-        X509_EXTENSION *ex;
-
-        if (sk == NULL) return(-1);
-        lastpos++;
-        if (lastpos < 0)
-                lastpos=0;
-        n=sk_X509_EXTENSION_num(sk);
-        for ( ; lastpos < n; lastpos++)
-                {
-                ex=sk_X509_EXTENSION_value(sk,lastpos);
-                if (    (ex->critical && crit) ||
-                        (!ex->critical && !crit))
-                        return(lastpos);
-                }
-        return(-1);
-        }
-
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc)
-        {
-        if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
-                return NULL;
-        else
-                return sk_X509_EXTENSION_value(x,loc);
-        }
-
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc)
-        {
-        X509_EXTENSION *ret;
-
-        if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
-                return(NULL);
-        ret=sk_X509_EXTENSION_delete(x,loc);
-        return(ret);
-        }
-
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc)
-        {
-        X509_EXTENSION *new_ex=NULL;
-        int n;
-        STACK_OF(X509_EXTENSION) *sk=NULL;
-
-        if ((x != NULL) && (*x == NULL))
-                {
-                if ((sk=sk_X509_EXTENSION_new_null()) == NULL)
-                        goto err;
-                }
-        else
-                sk= *x;
-
-        n=sk_X509_EXTENSION_num(sk);
-        if (loc > n) loc=n;
-        else if (loc < 0) loc=n;
-
-        if ((new_ex=X509_EXTENSION_dup(ex)) == NULL)
-                goto err2;
-        if (!sk_X509_EXTENSION_insert(sk,new_ex,loc))
-                goto err;
-        if ((x != NULL) && (*x == NULL))
-                *x=sk;
-        return(sk);
-err:
-        X509err(X509_F_X509V3_ADD_EXT,ERR_R_MALLOC_FAILURE);
-err2:
-        if (new_ex != NULL) X509_EXTENSION_free(new_ex);
-        if (sk != NULL) sk_X509_EXTENSION_free(sk);
-        return(NULL);
-        }
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
-             int crit, ASN1_OCTET_STRING *data)
-        {
-        ASN1_OBJECT *obj;
-        X509_EXTENSION *ret;
-
-        obj=OBJ_nid2obj(nid);
-        if (obj == NULL)
-                {
-                X509err(X509_F_X509_EXTENSION_CREATE_BY_NID,X509_R_UNKNOWN_NID);
-                return(NULL);
-                }
-        ret=X509_EXTENSION_create_by_OBJ(ex,obj,crit,data);
-        if (ret == NULL) ASN1_OBJECT_free(obj);
-        return(ret);
-        }
-
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-             ASN1_OBJECT *obj, int crit, ASN1_OCTET_STRING *data)
-        {
-        X509_EXTENSION *ret;
-
-        if ((ex == NULL) || (*ex == NULL))
-                {
-                if ((ret=X509_EXTENSION_new()) == NULL)
-                        {
-                        X509err(X509_F_X509_EXTENSION_CREATE_BY_OBJ,ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
-                }
-        else
-                ret= *ex;
-
-        if (!X509_EXTENSION_set_object(ret,obj))
-                goto err;
-        if (!X509_EXTENSION_set_critical(ret,crit))
-                goto err;
-        if (!X509_EXTENSION_set_data(ret,data))
-                goto err;
-        
-        if ((ex != NULL) && (*ex == NULL)) *ex=ret;
-        return(ret);
-err:
-        if ((ex == NULL) || (ret != *ex))
-                X509_EXTENSION_free(ret);
-        return(NULL);
-        }
-
-int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
-        {
-        if ((ex == NULL) || (obj == NULL))
-                return(0);
-        ASN1_OBJECT_free(ex->object);
-        ex->object=OBJ_dup(obj);
-        return(1);
-        }
-
-int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
-        {
-        if (ex == NULL) return(0);
-        ex->critical=(crit)?0xFF:0;
-        return(1);
-        }
-
-int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
-        {
-        int i;
-
-        if (ex == NULL) return(0);
-        i=ASN1_OCTET_STRING_set(ex->value,data->data,data->length);
-        if (!i) return(0);
-        return(1);
-        }
-
-ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex)
-        {
-        if (ex == NULL) return(NULL);
-        return(ex->object);
-        }
-
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex)
-        {
-        if (ex == NULL) return(NULL);
-        return(ex->value);
-        }
-
-int X509_EXTENSION_get_critical(X509_EXTENSION *ex)
-        {
-        if (ex == NULL) return(0);
-        return(ex->critical);
-        }
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
deleted file mode 100644
index c72ee4a385..0000000000
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/* crypto/x509/x509_vfy.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 <time.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-
-static int null_callback(int ok,X509_STORE_CTX *e);
-static int internal_verify(X509_STORE_CTX *ctx);
-const char *X509_version="X.509" OPENSSL_VERSION_PTEXT;
-
-static STACK *x509_store_ctx_method=NULL;
-static int x509_store_ctx_num=0;
-#if 0
-static int x509_store_num=1;
-static STACK *x509_store_method=NULL;
-#endif
-
-static int null_callback(int ok, X509_STORE_CTX *e)
-        {
-        return(ok);
-        }
-
-#if 0
-static int x509_subject_cmp(X509 **a, X509 **b)
-        {
-        return(X509_subject_name_cmp(*a,*b));
-        }
-#endif
-
-int X509_verify_cert(X509_STORE_CTX *ctx)
-        {
-        X509 *x,*xtmp,*chain_ss=NULL;
-        X509_NAME *xn;
-        X509_OBJECT obj;
-        int depth,i,ok=0;
-        int num;
-        int (*cb)();
-        STACK_OF(X509) *sktmp=NULL;
-
-        if (ctx->cert == NULL)
-                {
-                X509err(X509_F_X509_VERIFY_CERT,X509_R_NO_CERT_SET_FOR_US_TO_VERIFY);
-                return(-1);
-                }
-
-        cb=ctx->ctx->verify_cb;
-        if (cb == NULL) cb=null_callback;
-
-        /* first we make sure the chain we are going to build is
-         * present and that the first entry is in place */
-        if (ctx->chain == NULL)
-                {
-                if (    ((ctx->chain=sk_X509_new_null()) == NULL) ||
-                        (!sk_X509_push(ctx->chain,ctx->cert)))
-                        {
-                        X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE);
-                        goto end;
-                        }
-                CRYPTO_add(&ctx->cert->references,1,CRYPTO_LOCK_X509);
-                ctx->last_untrusted=1;
-                }
-
-        /* We use a temporary so we can chop and hack at it */
-        if (ctx->untrusted != NULL
-            && (sktmp=sk_X509_dup(ctx->untrusted)) == NULL)
-                {
-                X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE);
-                goto end;
-                }
-
-        num=sk_X509_num(ctx->chain);
-        x=sk_X509_value(ctx->chain,num-1);
-        depth=ctx->depth;
-
-
-        for (;;)
-                {
-                /* If we have enough, we break */
-                if (depth < num) break; /* FIXME: If this happens, we should take
-                                         * note of it and, if appropriate, use the
-                                         * X509_V_ERR_CERT_CHAIN_TOO_LONG error
-                                         * code later.
-                                         */
-
-                /* If we are self signed, we break */
-                xn=X509_get_issuer_name(x);
-                if (X509_NAME_cmp(X509_get_subject_name(x),xn) == 0)
-                        break;
-
-                /* If we were passed a cert chain, use it first */
-                if (ctx->untrusted != NULL)
-                        {
-                        xtmp=X509_find_by_subject(sktmp,xn);
-                        if (xtmp != NULL)
-                                {
-                                if (!sk_X509_push(ctx->chain,xtmp))
-                                        {
-                                        X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE);
-                                        goto end;
-                                        }
-                                CRYPTO_add(&xtmp->references,1,CRYPTO_LOCK_X509);
-                                sk_X509_delete_ptr(sktmp,xtmp);
-                                ctx->last_untrusted++;
-                                x=xtmp;
-                                num++;
-                                /* reparse the full chain for
-                                 * the next one */
-                                continue;
-                                }
-                        }
-                break;
-                }
-
-        /* at this point, chain should contain a list of untrusted
-         * certificates.  We now need to add at least one trusted one,
-         * if possible, otherwise we complain. */
-
-        i=sk_X509_num(ctx->chain);
-        x=sk_X509_value(ctx->chain,i-1);
-        if (X509_NAME_cmp(X509_get_subject_name(x),X509_get_issuer_name(x))
-                == 0)
-                {
-                /* we have a self signed certificate */
-                if (sk_X509_num(ctx->chain) == 1)
-                        {
-                        ctx->error=X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT;
-                        ctx->current_cert=x;
-                        ctx->error_depth=i-1;
-                        ok=cb(0,ctx);
-                        if (!ok) goto end;
-                        }
-                else
-                        {
-                        /* worry more about this one elsewhere */
-                        chain_ss=sk_X509_pop(ctx->chain);
-                        ctx->last_untrusted--;
-                        num--;
-                        x=sk_X509_value(ctx->chain,num-1);
-                        }
-                }
-
-        /* We now lookup certs from the certificate store */
-        for (;;)
-                {
-                /* If we have enough, we break */
-                if (depth < num) break;
-
-                /* If we are self signed, we break */
-                xn=X509_get_issuer_name(x);
-                if (X509_NAME_cmp(X509_get_subject_name(x),xn) == 0)
-                        break;
-
-                ok=X509_STORE_get_by_subject(ctx,X509_LU_X509,xn,&obj);
-                if (ok != X509_LU_X509)
-                        {
-                        if (ok == X509_LU_RETRY)
-                                {
-                                X509_OBJECT_free_contents(&obj);
-                                X509err(X509_F_X509_VERIFY_CERT,X509_R_SHOULD_RETRY);
-                                return(ok);
-                                }
-                        else if (ok != X509_LU_FAIL)
-                                {
-                                X509_OBJECT_free_contents(&obj);
-                                /* not good :-(, break anyway */
-                                return(ok);
-                                }
-                        break;
-                        }
-                x=obj.data.x509;
-                if (!sk_X509_push(ctx->chain,obj.data.x509))
-                        {
-                        X509_OBJECT_free_contents(&obj);
-                        X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE);
-                        return(0);
-                        }
-                num++;
-                }
-
-        /* we now have our chain, lets check it... */
-        xn=X509_get_issuer_name(x);
-        if (X509_NAME_cmp(X509_get_subject_name(x),xn) != 0)
-                {
-                if ((chain_ss == NULL) || (X509_NAME_cmp(X509_get_subject_name(chain_ss),xn) != 0))
-                        {
-                        if (ctx->last_untrusted >= num)
-                                ctx->error=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY;
-                        else
-                                ctx->error=X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT;
-                        ctx->current_cert=x;
-                        }
-                else
-                        {
-
-                        sk_X509_push(ctx->chain,chain_ss);
-                        num++;
-                        ctx->last_untrusted=num;
-                        ctx->current_cert=chain_ss;
-                        ctx->error=X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN;
-                        chain_ss=NULL;
-                        }
-
-                ctx->error_depth=num-1;
-                ok=cb(0,ctx);
-                if (!ok) goto end;
-                }
-
-        /* We may as well copy down any DSA parameters that are required */
-        X509_get_pubkey_parameters(NULL,ctx->chain);
-
-        /* At this point, we have a chain and just need to verify it */
-        if (ctx->ctx->verify != NULL)
-                ok=ctx->ctx->verify(ctx);
-        else
-                ok=internal_verify(ctx);
-        if (0)
-                {
-end:
-                X509_get_pubkey_parameters(NULL,ctx->chain);
-                }
-        if (sktmp != NULL) sk_X509_free(sktmp);
-        if (chain_ss != NULL) X509_free(chain_ss);
-        return(ok);
-        }
-
-static int internal_verify(X509_STORE_CTX *ctx)
-        {
-        int i,ok=0,n;
-        X509 *xs,*xi;
-        EVP_PKEY *pkey=NULL;
-        int (*cb)();
-
-        cb=ctx->ctx->verify_cb;
-        if (cb == NULL) cb=null_callback;
-
-        n=sk_X509_num(ctx->chain);
-        ctx->error_depth=n-1;
-        n--;
-        xi=sk_X509_value(ctx->chain,n);
-        if (X509_NAME_cmp(X509_get_subject_name(xi),
-                X509_get_issuer_name(xi)) == 0)
-                xs=xi;
-        else
-                {
-                if (n <= 0)
-                        {
-                        ctx->error=X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE;
-                        ctx->current_cert=xi;
-                        ok=cb(0,ctx);
-                        goto end;
-                        }
-                else
-                        {
-                        n--;
-                        ctx->error_depth=n;
-                        xs=sk_X509_value(ctx->chain,n);
-                        }
-                }
-
-/*      ctx->error=0;  not needed */
-        while (n >= 0)
-                {
-                ctx->error_depth=n;
-                if (!xs->valid)
-                        {
-                        if ((pkey=X509_get_pubkey(xi)) == NULL)
-                                {
-                                ctx->error=X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY;
-                                ctx->current_cert=xi;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        if (X509_verify(xs,pkey) <= 0)
-                                {
-                                EVP_PKEY_free(pkey);
-                                ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE;
-                                ctx->current_cert=xs;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        EVP_PKEY_free(pkey);
-                        pkey=NULL;
-
-                        i=X509_cmp_current_time(X509_get_notBefore(xs));
-                        if (i == 0)
-                                {
-                                ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD;
-                                ctx->current_cert=xs;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        if (i > 0)
-                                {
-                                ctx->error=X509_V_ERR_CERT_NOT_YET_VALID;
-                                ctx->current_cert=xs;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        xs->valid=1;
-                        }
-
-                i=X509_cmp_current_time(X509_get_notAfter(xs));
-                if (i == 0)
-                        {
-                        ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD;
-                        ctx->current_cert=xs;
-                        ok=(*cb)(0,ctx);
-                        if (!ok) goto end;
-                        }
-
-                if (i < 0)
-                        {
-                        ctx->error=X509_V_ERR_CERT_HAS_EXPIRED;
-                        ctx->current_cert=xs;
-                        ok=(*cb)(0,ctx);
-                        if (!ok) goto end;
-                        }
-
-                /* CRL CHECK */
-
-                /* The last error (if any) is still in the error value */
-                ctx->current_cert=xs;
-                ok=(*cb)(1,ctx);
-                if (!ok) goto end;
-
-                n--;
-                if (n >= 0)
-                        {
-                        xi=xs;
-                        xs=sk_X509_value(ctx->chain,n);
-                        }
-                }
-        ok=1;
-end:
-        return(ok);
-        }
-
-int X509_cmp_current_time(ASN1_UTCTIME *ctm)
-        {
-        char *str;
-        ASN1_UTCTIME atm;
-        time_t offset;
-        char buff1[24],buff2[24],*p;
-        int i,j;
-
-        p=buff1;
-        i=ctm->length;
-        str=(char *)ctm->data;
-        if ((i < 11) || (i > 17)) return(0);
-        memcpy(p,str,10);
-        p+=10;
-        str+=10;
-
-        if ((*str == 'Z') || (*str == '-') || (*str == '+'))
-                { *(p++)='0'; *(p++)='0'; }
-        else    { *(p++)= *(str++); *(p++)= *(str++); }
-        *(p++)='Z';
-        *(p++)='\0';
-
-        if (*str == 'Z')
-                offset=0;
-        else
-                {
-                if ((*str != '+') && (str[5] != '-'))
-                        return(0);
-                offset=((str[1]-'0')*10+(str[2]-'0'))*60;
-                offset+=(str[3]-'0')*10+(str[4]-'0');
-                if (*str == '-')
-                        offset= -offset;
-                }
-        atm.type=V_ASN1_UTCTIME;
-        atm.length=sizeof(buff2);
-        atm.data=(unsigned char *)buff2;
-
-        X509_gmtime_adj(&atm,-offset);
-
-        i=(buff1[0]-'0')*10+(buff1[1]-'0');
-        if (i < 50) i+=100; /* cf. RFC 2459 */
-        j=(buff2[0]-'0')*10+(buff2[1]-'0');
-        if (j < 50) j+=100;
-
-        if (i < j) return (-1);
-        if (i > j) return (1);
-        i=strcmp(buff1,buff2);
-        if (i == 0) /* wait a second then return younger :-) */
-                return(-1);
-        else
-                return(i);
-        }
-
-ASN1_UTCTIME *X509_gmtime_adj(ASN1_UTCTIME *s, long adj)
-        {
-        time_t t;
-
-        time(&t);
-        t+=adj;
-        return(ASN1_UTCTIME_set(s,t));
-        }
-
-int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
-        {
-        EVP_PKEY *ktmp=NULL,*ktmp2;
-        int i,j;
-
-        if ((pkey != NULL) && !EVP_PKEY_missing_parameters(pkey)) return(1);
-
-        for (i=0; i<sk_X509_num(chain); i++)
-                {
-                ktmp=X509_get_pubkey(sk_X509_value(chain,i));
-                if (ktmp == NULL)
-                        {
-                        X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY);
-                        return(0);
-                        }
-                if (!EVP_PKEY_missing_parameters(ktmp))
-                        break;
-                else
-                        {
-                        EVP_PKEY_free(ktmp);
-                        ktmp=NULL;
-                        }
-                }
-        if (ktmp == NULL)
-                {
-                X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN);
-                return(0);
-                }
-
-        /* first, populate the other certs */
-        for (j=i-1; j >= 0; j--)
-                {
-                ktmp2=X509_get_pubkey(sk_X509_value(chain,j));
-                EVP_PKEY_copy_parameters(ktmp2,ktmp);
-                EVP_PKEY_free(ktmp2);
-                }
-        
-        if (pkey != NULL) EVP_PKEY_copy_parameters(pkey,ktmp);
-        EVP_PKEY_free(ktmp);
-        return(1);
-        }
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x)
-        {
-        X509_OBJECT *obj,*r;
-        int ret=1;
-
-        if (x == NULL) return(0);
-        obj=(X509_OBJECT *)Malloc(sizeof(X509_OBJECT));
-        if (obj == NULL)
-                {
-                X509err(X509_F_X509_STORE_ADD_CERT,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        obj->type=X509_LU_X509;
-        obj->data.x509=x;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);
-
-        X509_OBJECT_up_ref_count(obj);
-
-        r=(X509_OBJECT *)lh_insert(ctx->certs,(char *)obj);
-        if (r != NULL)
-                { /* oops, put it back */
-                lh_delete(ctx->certs,(char *)obj);
-                X509_OBJECT_free_contents(obj);
-                Free(obj);
-                lh_insert(ctx->certs,(char *)r);
-                X509err(X509_F_X509_STORE_ADD_CERT,X509_R_CERT_ALREADY_IN_HASH_TABLE);
-                ret=0;
-                }
-
-        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
-
-        return(ret);    
-        }
-
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x)
-        {
-        X509_OBJECT *obj,*r;
-        int ret=1;
-
-        if (x == NULL) return(0);
-        obj=(X509_OBJECT *)Malloc(sizeof(X509_OBJECT));
-        if (obj == NULL)
-                {
-                X509err(X509_F_X509_STORE_ADD_CRL,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        obj->type=X509_LU_CRL;
-        obj->data.crl=x;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_X509_STORE);
-
-        X509_OBJECT_up_ref_count(obj);
-
-        r=(X509_OBJECT *)lh_insert(ctx->certs,(char *)obj);
-        if (r != NULL)
-                { /* oops, put it back */
-                lh_delete(ctx->certs,(char *)obj);
-                X509_OBJECT_free_contents(obj);
-                Free(obj);
-                lh_insert(ctx->certs,(char *)r);
-                X509err(X509_F_X509_STORE_ADD_CRL,X509_R_CERT_ALREADY_IN_HASH_TABLE);
-                ret=0;
-                }
-
-        CRYPTO_w_unlock(CRYPTO_LOCK_X509_STORE);
-
-        return(ret);    
-        }
-
-int X509_STORE_CTX_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-             int (*dup_func)(), void (*free_func)())
-        {
-        x509_store_ctx_num++;
-        return(CRYPTO_get_ex_new_index(x509_store_ctx_num-1,
-                &x509_store_ctx_method,
-                argl,argp,new_func,dup_func,free_func));
-        }
-
-int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data)
-        {
-        return(CRYPTO_set_ex_data(&ctx->ex_data,idx,data));
-        }
-
-void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx)
-        {
-        return(CRYPTO_get_ex_data(&ctx->ex_data,idx));
-        }
-
-int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx)
-        {
-        return(ctx->error);
-        }
-
-void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int err)
-        {
-        ctx->error=err;
-        }
-
-int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx)
-        {
-        return(ctx->error_depth);
-        }
-
-X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx)
-        {
-        return(ctx->current_cert);
-        }
-
-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx)
-        {
-        return(ctx->chain);
-        }
-
-void X509_STORE_CTX_set_cert(X509_STORE_CTX *ctx, X509 *x)
-        {
-        ctx->cert=x;
-        }
-
-void X509_STORE_CTX_set_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *sk)
-        {
-        ctx->untrusted=sk;
-        }
-
-IMPLEMENT_STACK_OF(X509)
-IMPLEMENT_ASN1_SET_OF(X509)
-
-IMPLEMENT_STACK_OF(X509_NAME)
-
-IMPLEMENT_STACK_OF(X509_ATTRIBUTE)
-IMPLEMENT_ASN1_SET_OF(X509_ATTRIBUTE)
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h
deleted file mode 100644
index ecfd4cf9ed..0000000000
--- a/src/lib/libcrypto/x509/x509_vfy.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/* crypto/x509/x509_vfy.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_X509_H
-#include <openssl/x509.h>
-/* openssl/x509.h ends up #include-ing this file at about the only
- * appropriate moment. */
-#endif
-
-#ifndef HEADER_X509_VFY_H
-#define HEADER_X509_VFY_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-
-/* Outer object */
-typedef struct x509_hash_dir_st
-        {
-        int num_dirs;
-        char **dirs;
-        int *dirs_type;
-        int num_dirs_alloced;
-        } X509_HASH_DIR_CTX;
-
-typedef struct x509_file_st
-        {
-        int num_paths;  /* number of paths to files or directories */
-        int num_alloced;
-        char **paths;   /* the list of paths or directories */
-        int *path_type;
-        } X509_CERT_FILE_CTX;
-
-/*******************************/
-/*
-SSL_CTX -> X509_STORE    
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
- 
-SSL     -> X509_STORE_CTX
-                ->X509_STORE    
-
-The X509_STORE holds the tables etc for verification stuff.
-A X509_STORE_CTX is used while validating a single certificate.
-The X509_STORE has X509_LOOKUPs for looking up certs.
-The X509_STORE then calls a function to actually verify the
-certificate chain.
-*/
-
-#define X509_LU_RETRY           -1
-#define X509_LU_FAIL            0
-#define X509_LU_X509            1
-#define X509_LU_CRL             2
-#define X509_LU_PKEY            3
-
-typedef struct x509_object_st
-        {
-        /* one of the above types */
-        int type;
-        union   {
-                char *ptr;
-                X509 *x509;
-                X509_CRL *crl;
-                EVP_PKEY *pkey;
-                } data;
-        } X509_OBJECT;
-
-typedef struct x509_lookup_st X509_LOOKUP;
-
-DECLARE_STACK_OF(X509_LOOKUP)
-
-/* This is a static that defines the function interface */
-typedef struct x509_lookup_method_st
-        {
-        const char *name;
-        int (*new_item)(X509_LOOKUP *ctx);
-        void (*free)(X509_LOOKUP *ctx);
-        int (*init)(X509_LOOKUP *ctx);
-        int (*shutdown)(X509_LOOKUP *ctx);
-        int (*ctrl)(X509_LOOKUP *ctx,int cmd,const char *argc,long argl,
-                        char **ret);
-        int (*get_by_subject)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-                              X509_OBJECT *ret);
-        int (*get_by_issuer_serial)(X509_LOOKUP *ctx,int type,X509_NAME *name,
-                                    ASN1_INTEGER *serial,X509_OBJECT *ret);
-        int (*get_by_fingerprint)(X509_LOOKUP *ctx,int type,
-                                  unsigned char *bytes,int len,
-                                  X509_OBJECT *ret);
-        int (*get_by_alias)(X509_LOOKUP *ctx,int type,char *str,int len,
-                            X509_OBJECT *ret);
-        } X509_LOOKUP_METHOD;
-
-typedef struct x509_store_state_st X509_STORE_CTX;
-
-/* This is used to hold everything.  It is used for all certificate
- * validation.  Once we have a certificate chain, the 'verify'
- * function is then called to actually check the cert chain. */
-typedef struct x509_store_st
-        {
-        /* The following is a cache of trusted certs */
-        int cache;      /* if true, stash any hits */
-#ifdef HEADER_LHASH_H
-        LHASH *certs;   /* cached certs; */ 
-#else
-        char *certs;
-#endif
-
-        /* These are external lookup methods */
-        STACK_OF(X509_LOOKUP) *get_cert_methods;
-        int (*verify)(X509_STORE_CTX *ctx);     /* called to verify a certificate */
-        int (*verify_cb)(int ok,X509_STORE_CTX *ctx);   /* error callback */
-
-        CRYPTO_EX_DATA ex_data;
-        int references;
-        int depth;              /* how deep to look (still unused -- X509_STORE_CTX's depth is used) */
-        }  X509_STORE;
-
-#define X509_STORE_set_depth(ctx,d)       ((ctx)->depth=(d))
-
-#define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))
-#define X509_STORE_set_verify_func(ctx,func)    ((ctx)->verify=(func))
-
-/* This is the functions plus an instance of the local variables. */
-struct x509_lookup_st
-        {
-        int init;                       /* have we been started */
-        int skip;                       /* don't use us. */
-        X509_LOOKUP_METHOD *method;     /* the functions */
-        char *method_data;              /* method data */
-
-        X509_STORE *store_ctx;  /* who owns us */
-        };
-
-/* This is a temporary used when processing cert chains.  Since the
- * gathering of the cert chain can take some time (and have to be
- * 'retried', this needs to be kept and passed around. */
-struct x509_store_state_st      /* X509_STORE_CTX */
-        {
-        X509_STORE *ctx;
-        int current_method;     /* used when looking up certs */
-
-        /* The following are set by the caller */
-        X509 *cert;             /* The cert to check */
-        STACK_OF(X509) *untrusted;      /* chain of X509s - untrusted - passed in */
-
-        /* The following is built up */
-        int depth;              /* how far to go looking up certs */
-        int valid;              /* if 0, rebuild chain */
-        int last_untrusted;     /* index of last untrusted cert */
-        STACK_OF(X509) *chain;          /* chain of X509s - built up and trusted */
-
-        /* When something goes wrong, this is why */
-        int error_depth;
-        int error;
-        X509 *current_cert;
-
-        CRYPTO_EX_DATA ex_data;
-        };
-
-#define X509_STORE_CTX_set_depth(ctx,d)       ((ctx)->depth=(d))
-
-#define X509_STORE_CTX_set_app_data(ctx,data) \
-        X509_STORE_CTX_set_ex_data(ctx,0,data)
-#define X509_STORE_CTX_get_app_data(ctx) \
-        X509_STORE_CTX_get_ex_data(ctx,0)
-
-#define X509_L_FILE_LOAD        1
-#define X509_L_ADD_DIR          2
-
-#define X509_LOOKUP_load_file(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
-
-#define X509_LOOKUP_add_dir(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
-
-#define         X509_V_OK                                       0
-
-#define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
-#define         X509_V_ERR_UNABLE_TO_GET_CRL                    3
-#define         X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4
-#define         X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE      5
-#define         X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY   6
-#define         X509_V_ERR_CERT_SIGNATURE_FAILURE               7
-#define         X509_V_ERR_CRL_SIGNATURE_FAILURE                8
-#define         X509_V_ERR_CERT_NOT_YET_VALID                   9       
-#define         X509_V_ERR_CERT_HAS_EXPIRED                     10
-#define         X509_V_ERR_CRL_NOT_YET_VALID                    11
-#define         X509_V_ERR_CRL_HAS_EXPIRED                      12
-#define         X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD       13
-#define         X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD        14
-#define         X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD       15
-#define         X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD       16
-#define         X509_V_ERR_OUT_OF_MEM                           17
-#define         X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT          18
-#define         X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN            19
-#define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY    20
-#define         X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE      21
-#define         X509_V_ERR_CERT_CHAIN_TOO_LONG                  22
-#define         X509_V_ERR_CERT_REVOKED                         23
-
-/* The application is not happy */
-#define         X509_V_ERR_APPLICATION_VERIFICATION             50
-
-                  /* These functions are being redefined in another directory,
-                     and clash when the linker is case-insensitive, so let's
-                     hide them a little, by giving them an extra 'o' at the
-                     beginning of the name... */
-#ifdef VMS
-#undef X509v3_cleanup_extensions
-#define X509v3_cleanup_extensions oX509v3_cleanup_extensions
-#undef X509v3_add_extension
-#define X509v3_add_extension oX509v3_add_extension
-#undef X509v3_add_netscape_extensions
-#define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions
-#undef X509v3_add_standard_extensions
-#define X509v3_add_standard_extensions oX509v3_add_standard_extensions
-#endif
-
-#ifdef HEADER_LHASH_H
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(LHASH *h,int type,X509_NAME *name);
-#endif
-void X509_OBJECT_up_ref_count(X509_OBJECT *a);
-void X509_OBJECT_free_contents(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void );
-void X509_STORE_free(X509_STORE *v);
-
-void X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                         X509 *x509, STACK_OF(X509) *chain);
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name,
-        X509_OBJECT *ret);
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-        long argl, char **ret);
-
-#ifndef NO_STDIO
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-#endif
-
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
-void X509_LOOKUP_free(X509_LOOKUP *ctx);
-int X509_LOOKUP_init(X509_LOOKUP *ctx);
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
-        X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-        ASN1_INTEGER *serial, X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-        unsigned char *bytes, int len, X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str,
-        int len, X509_OBJECT *ret);
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
-
-#ifndef NO_STDIO
-int     X509_STORE_load_locations (X509_STORE *ctx,
-                const char *file, const char *dir);
-int     X509_STORE_set_default_paths(X509_STORE *ctx);
-#endif
-
-int X509_STORE_CTX_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-int     X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx,int idx,void *data);
-void *  X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx,int idx);
-int     X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-void    X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);
-int     X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-X509 *  X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
-void    X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x);
-void    X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
deleted file mode 100644
index 2a422be350..0000000000
--- a/src/lib/libcrypto/x509/x509name.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/* crypto/x509/x509name.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/stack.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
-        {
-        ASN1_OBJECT *obj;
-
-        obj=OBJ_nid2obj(nid);
-        if (obj == NULL) return(-1);
-        return(X509_NAME_get_text_by_OBJ(name,obj,buf,len));
-        }
-
-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
-             int len)
-        {
-        int i;
-        ASN1_STRING *data;
-
-        i=X509_NAME_get_index_by_OBJ(name,obj,-1);
-        if (i < 0) return(-1);
-        data=X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name,i));
-        i=(data->length > (len-1))?(len-1):data->length;
-        if (buf == NULL) return(data->length);
-        memcpy(buf,data->data,i);
-        buf[i]='\0';
-        return(i);
-        }
-
-int X509_NAME_entry_count(X509_NAME *name)
-        {
-        if (name == NULL) return(0);
-        return(sk_X509_NAME_ENTRY_num(name->entries));
-        }
-
-int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
-        {
-        ASN1_OBJECT *obj;
-
-        obj=OBJ_nid2obj(nid);
-        if (obj == NULL) return(-2);
-        return(X509_NAME_get_index_by_OBJ(name,obj,lastpos));
-        }
-
-/* NOTE: you should be passsing -1, not 0 as lastpos */
-int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-             int lastpos)
-        {
-        int n;
-        X509_NAME_ENTRY *ne;
-        STACK_OF(X509_NAME_ENTRY) *sk;
-
-        if (name == NULL) return(-1);
-        if (lastpos < 0)
-                lastpos= -1;
-        sk=name->entries;
-        n=sk_X509_NAME_ENTRY_num(sk);
-        for (lastpos++; lastpos < n; lastpos++)
-                {
-                ne=sk_X509_NAME_ENTRY_value(sk,lastpos);
-                if (OBJ_cmp(ne->object,obj) == 0)
-                        return(lastpos);
-                }
-        return(-1);
-        }
-
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc)
-        {
-        if(name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
-           || loc < 0)
-                return(NULL);
-        else
-                return(sk_X509_NAME_ENTRY_value(name->entries,loc));
-        }
-
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
-        {
-        X509_NAME_ENTRY *ret;
-        int i,n,set_prev,set_next;
-        STACK_OF(X509_NAME_ENTRY) *sk;
-
-        if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
-            || loc < 0)
-                return(NULL);
-        sk=name->entries;
-        ret=sk_X509_NAME_ENTRY_delete(sk,loc);
-        n=sk_X509_NAME_ENTRY_num(sk);
-        name->modified=1;
-        if (loc == n) return(ret);
-
-        /* else we need to fixup the set field */
-        if (loc != 0)
-                set_prev=(sk_X509_NAME_ENTRY_value(sk,loc-1))->set;
-        else
-                set_prev=ret->set-1;
-        set_next=sk_X509_NAME_ENTRY_value(sk,loc)->set;
-
-        /* set_prev is the previous set
-         * set is the current set
-         * set_next is the following
-         * prev  1 1    1 1     1 1     1 1
-         * set   1      1       2       2
-         * next  1 1    2 2     2 2     3 2
-         * so basically only if prev and next differ by 2, then
-         * re-number down by 1 */
-        if (set_prev+1 < set_next)
-                for (i=loc; i<n; i++)
-                        sk_X509_NAME_ENTRY_value(sk,i)->set--;
-        return(ret);
-        }
-
-/* if set is -1, append to previous set, 0 'a new one', and 1,
- * prepend to the guy we are about to stomp on. */
-int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
-             int set)
-        {
-        X509_NAME_ENTRY *new_name=NULL;
-        int n,i,inc;
-        STACK_OF(X509_NAME_ENTRY) *sk;
-
-        if (name == NULL) return(0);
-        sk=name->entries;
-        n=sk_X509_NAME_ENTRY_num(sk);
-        if (loc > n) loc=n;
-        else if (loc < 0) loc=n;
-
-        name->modified=1;
-
-        if (set == -1)
-                {
-                if (loc == 0)
-                        {
-                        set=0;
-                        inc=1;
-                        }
-                else
-                        {
-                        set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set;
-                        inc=0;
-                        }
-                }
-        else /* if (set >= 0) */
-                {
-                if (loc >= n)
-                        {
-                        if (loc != 0)
-                                set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set+1;
-                        else
-                                set=0;
-                        }
-                else
-                        set=sk_X509_NAME_ENTRY_value(sk,loc)->set;
-                inc=(set == 0)?1:0;
-                }
-
-        if ((new_name=X509_NAME_ENTRY_dup(ne)) == NULL)
-                goto err;
-        new_name->set=set;
-        if (!sk_X509_NAME_ENTRY_insert(sk,new_name,loc))
-                {
-                X509err(X509_F_X509_NAME_ADD_ENTRY,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        if (inc)
-                {
-                n=sk_X509_NAME_ENTRY_num(sk);
-                for (i=loc+1; i<n; i++)
-                        sk_X509_NAME_ENTRY_value(sk,i-1)->set+=1;
-                }       
-        return(1);
-err:
-        if (new_name != NULL)
-                X509_NAME_ENTRY_free(new_name);
-        return(0);
-        }
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-             int type, unsigned char *bytes, int len)
-        {
-        ASN1_OBJECT *obj;
-
-        obj=OBJ_nid2obj(nid);
-        if (obj == NULL)
-                {
-                X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID,X509_R_UNKNOWN_NID);
-                return(NULL);
-                }
-        return(X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len));
-        }
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-             ASN1_OBJECT *obj, int type, unsigned char *bytes, int len)
-        {
-        X509_NAME_ENTRY *ret;
-
-        if ((ne == NULL) || (*ne == NULL))
-                {
-                if ((ret=X509_NAME_ENTRY_new()) == NULL)
-                        return(NULL);
-                }
-        else
-                ret= *ne;
-
-        if (!X509_NAME_ENTRY_set_object(ret,obj))
-                goto err;
-        if (!X509_NAME_ENTRY_set_data(ret,type,bytes,len))
-                goto err;
-        
-        if ((ne != NULL) && (*ne == NULL)) *ne=ret;
-        return(ret);
-err:
-        if ((ne == NULL) || (ret != *ne))
-                X509_NAME_ENTRY_free(ret);
-        return(NULL);
-        }
-
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj)
-        {
-        if ((ne == NULL) || (obj == NULL))
-                {
-                X509err(X509_F_X509_NAME_ENTRY_SET_OBJECT,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        ASN1_OBJECT_free(ne->object);
-        ne->object=OBJ_dup(obj);
-        return((ne->object == NULL)?0:1);
-        }
-
-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-             unsigned char *bytes, int len)
-        {
-        int i;
-
-        if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);
-        if (len < 0) len=strlen((char *)bytes);
-        i=ASN1_STRING_set(ne->value,bytes,len);
-        if (!i) return(0);
-        if (type != V_ASN1_UNDEF)
-                {
-                if (type == V_ASN1_APP_CHOOSE)
-                        ne->value->type=ASN1_PRINTABLE_type(bytes,len);
-                else
-                        ne->value->type=type;
-                }
-        return(1);
-        }
-
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne)
-        {
-        if (ne == NULL) return(NULL);
-        return(ne->object);
-        }
-
-ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne)
-        {
-        if (ne == NULL) return(NULL);
-        return(ne->value);
-        }
-
diff --git a/src/lib/libcrypto/x509/x509rset.c b/src/lib/libcrypto/x509/x509rset.c
deleted file mode 100644
index d9f6b57372..0000000000
--- a/src/lib/libcrypto/x509/x509rset.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* crypto/x509/x509rset.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 <openssl/asn1.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509_REQ_set_version(X509_REQ *x, long version)
-        {
-        if (x == NULL) return(0);
-        return(ASN1_INTEGER_set(x->req_info->version,version));
-        }
-
-int X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name)
-        {
-        if ((x == NULL) || (x->req_info == NULL)) return(0);
-        return(X509_NAME_set(&x->req_info->subject,name));
-        }
-
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
-        {
-        if ((x == NULL) || (x->req_info == NULL)) return(0);
-        return(X509_PUBKEY_set(&x->req_info->pubkey,pkey));
-        }
-
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c
deleted file mode 100644
index 8e78b34458..0000000000
--- a/src/lib/libcrypto/x509/x509type.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* crypto/x509/x509type.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 <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-
-int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
-        {
-        EVP_PKEY *pk;
-        int ret=0,i;
-
-        if (x == NULL) return(0);
-
-        if (pkey == NULL)
-                pk=X509_get_pubkey(x);
-        else
-                pk=pkey;
-
-        if (pk == NULL) return(0);
-
-        switch (pk->type)
-                {
-        case EVP_PKEY_RSA:
-                ret=EVP_PK_RSA|EVP_PKT_SIGN;
-/*              if (!sign only extension) */
-                        ret|=EVP_PKT_ENC;
-        break;
-        case EVP_PKEY_DSA:
-                ret=EVP_PK_DSA|EVP_PKT_SIGN;
-                break;
-        case EVP_PKEY_DH:
-                ret=EVP_PK_DH|EVP_PKT_EXCH;
-                break;
-        default:
-                break;
-                }
-
-        i=X509_get_signature_type(x);
-        switch (i)
-                {
-        case EVP_PKEY_RSA:
-                ret|=EVP_PKS_RSA;
-                break;
-        case EVP_PKS_DSA:
-                ret|=EVP_PKS_DSA;
-                break;
-        default:
-                break;
-                }
-
-        if (EVP_PKEY_size(pk) <= 512)
-                ret|=EVP_PKT_EXP;
-        if(pkey==NULL) EVP_PKEY_free(pk);
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
deleted file mode 100644
index f2af895df0..0000000000
--- a/src/lib/libcrypto/x509/x_all.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/* crypto/x509/x_all.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>
-#undef SSLEAY_MACROS
-#include <openssl/stack.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/asn1.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-int X509_verify(X509 *a, EVP_PKEY *r)
-        {
-        return(ASN1_verify((int (*)())i2d_X509_CINF,a->sig_alg,
-                a->signature,(char *)a->cert_info,r));
-        }
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r)
-        {
-        return( ASN1_verify((int (*)())i2d_X509_REQ_INFO,
-                a->sig_alg,a->signature,(char *)a->req_info,r));
-        }
-
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r)
-        {
-        return(ASN1_verify((int (*)())i2d_X509_CRL_INFO,
-                a->sig_alg, a->signature,(char *)a->crl,r));
-        }
-
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
-        {
-        return(ASN1_verify((int (*)())i2d_NETSCAPE_SPKAC,
-                a->sig_algor,a->signature, (char *)a->spkac,r));
-        }
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
-        {
-        return(ASN1_sign((int (*)())i2d_X509_CINF, x->cert_info->signature,
-                x->sig_alg, x->signature, (char *)x->cert_info,pkey,md));
-        }
-
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
-        {
-        return(ASN1_sign((int (*)())i2d_X509_REQ_INFO,x->sig_alg, NULL,
-                x->signature, (char *)x->req_info,pkey,md));
-        }
-
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
-        {
-        return(ASN1_sign((int (*)())i2d_X509_CRL_INFO,x->crl->sig_alg,
-                x->sig_alg, x->signature, (char *)x->crl,pkey,md));
-        }
-
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
-        {
-        return(ASN1_sign((int (*)())i2d_NETSCAPE_SPKAC, x->sig_algor,NULL,
-                x->signature, (char *)x->spkac,pkey,md));
-        }
-
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa)
-        {
-        return((X509_ATTRIBUTE *)ASN1_dup((int (*)())i2d_X509_ATTRIBUTE,
-                (char *(*)())d2i_X509_ATTRIBUTE,(char *)xa));
-        }
-
-X509 *X509_dup(X509 *x509)
-        {
-        return((X509 *)ASN1_dup((int (*)())i2d_X509,
-                (char *(*)())d2i_X509,(char *)x509));
-        }
-
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex)
-        {
-        return((X509_EXTENSION *)ASN1_dup(
-                (int (*)())i2d_X509_EXTENSION,
-                (char *(*)())d2i_X509_EXTENSION,(char *)ex));
-        }
-
-#ifndef NO_FP_API
-X509 *d2i_X509_fp(FILE *fp, X509 **x509)
-        {
-        return((X509 *)ASN1_d2i_fp((char *(*)())X509_new,
-                (char *(*)())d2i_X509, (fp),(unsigned char **)(x509)));
-        }
-
-int i2d_X509_fp(FILE *fp, X509 *x509)
-        {
-        return(ASN1_i2d_fp(i2d_X509,fp,(unsigned char *)x509));
-        }
-#endif
-
-X509 *d2i_X509_bio(BIO *bp, X509 **x509)
-        {
-        return((X509 *)ASN1_d2i_bio((char *(*)())X509_new,
-                (char *(*)())d2i_X509, (bp),(unsigned char **)(x509)));
-        }
-
-int i2d_X509_bio(BIO *bp, X509 *x509)
-        {
-        return(ASN1_i2d_bio(i2d_X509,bp,(unsigned char *)x509));
-        }
-
-X509_CRL *X509_CRL_dup(X509_CRL *crl)
-        {
-        return((X509_CRL *)ASN1_dup((int (*)())i2d_X509_CRL,
-                (char *(*)())d2i_X509_CRL,(char *)crl));
-        }
-
-#ifndef NO_FP_API
-X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
-        {
-        return((X509_CRL *)ASN1_d2i_fp((char *(*)())
-                X509_CRL_new,(char *(*)())d2i_X509_CRL, (fp),
-                (unsigned char **)(crl)));
-        }
-
-int i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
-        {
-        return(ASN1_i2d_fp(i2d_X509_CRL,fp,(unsigned char *)crl));
-        }
-#endif
-
-X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
-        {
-        return((X509_CRL *)ASN1_d2i_bio((char *(*)())
-                X509_CRL_new,(char *(*)())d2i_X509_CRL, (bp),
-                (unsigned char **)(crl)));
-        }
-
-int i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
-        {
-        return(ASN1_i2d_bio(i2d_X509_CRL,bp,(unsigned char *)crl));
-        }
-
-PKCS7 *PKCS7_dup(PKCS7 *p7)
-        {
-        return((PKCS7 *)ASN1_dup((int (*)())i2d_PKCS7,
-                (char *(*)())d2i_PKCS7,(char *)p7));
-        }
-
-#ifndef NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
-        {
-        return((PKCS7 *)ASN1_d2i_fp((char *(*)())
-                PKCS7_new,(char *(*)())d2i_PKCS7, (fp),
-                (unsigned char **)(p7)));
-        }
-
-int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
-        {
-        return(ASN1_i2d_fp(i2d_PKCS7,fp,(unsigned char *)p7));
-        }
-#endif
-
-PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
-        {
-        return((PKCS7 *)ASN1_d2i_bio((char *(*)())
-                PKCS7_new,(char *(*)())d2i_PKCS7, (bp),
-                (unsigned char **)(p7)));
-        }
-
-int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
-        {
-        return(ASN1_i2d_bio(i2d_PKCS7,bp,(unsigned char *)p7));
-        }
-
-X509_REQ *X509_REQ_dup(X509_REQ *req)
-        {
-        return((X509_REQ *)ASN1_dup((int (*)())i2d_X509_REQ,
-                (char *(*)())d2i_X509_REQ,(char *)req));
-        }
-
-#ifndef NO_FP_API
-X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
-        {
-        return((X509_REQ *)ASN1_d2i_fp((char *(*)())
-                X509_REQ_new, (char *(*)())d2i_X509_REQ, (fp),
-                (unsigned char **)(req)));
-        }
-
-int i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
-        {
-        return(ASN1_i2d_fp(i2d_X509_REQ,fp,(unsigned char *)req));
-        }
-#endif
-
-X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
-        {
-        return((X509_REQ *)ASN1_d2i_bio((char *(*)())
-                X509_REQ_new, (char *(*)())d2i_X509_REQ, (bp),
-                (unsigned char **)(req)));
-        }
-
-int i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
-        {
-        return(ASN1_i2d_bio(i2d_X509_REQ,bp,(unsigned char *)req));
-        }
-
-#ifndef NO_RSA
-RSA *RSAPublicKey_dup(RSA *rsa)
-        {
-        return((RSA *)ASN1_dup((int (*)())i2d_RSAPublicKey,
-                (char *(*)())d2i_RSAPublicKey,(char *)rsa));
-        }
-
-RSA *RSAPrivateKey_dup(RSA *rsa)
-        {
-        return((RSA *)ASN1_dup((int (*)())i2d_RSAPrivateKey,
-                (char *(*)())d2i_RSAPrivateKey,(char *)rsa));
-        }
-
-#ifndef NO_FP_API
-RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
-        {
-        return((RSA *)ASN1_d2i_fp((char *(*)())
-                RSA_new,(char *(*)())d2i_RSAPrivateKey, (fp),
-                (unsigned char **)(rsa)));
-        }
-
-int i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa)
-        {
-        return(ASN1_i2d_fp(i2d_RSAPrivateKey,fp,(unsigned char *)rsa));
-        }
-
-RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
-        {
-        return((RSA *)ASN1_d2i_fp((char *(*)())
-                RSA_new,(char *(*)())d2i_RSAPublicKey, (fp),
-                (unsigned char **)(rsa)));
-        }
-
-int i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa)
-        {
-        return(ASN1_i2d_fp(i2d_RSAPublicKey,fp,(unsigned char *)rsa));
-        }
-#endif
-
-RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
-        {
-        return((RSA *)ASN1_d2i_bio((char *(*)())
-                RSA_new,(char *(*)())d2i_RSAPrivateKey, (bp),
-                (unsigned char **)(rsa)));
-        }
-
-int i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa)
-        {
-        return(ASN1_i2d_bio(i2d_RSAPrivateKey,bp,(unsigned char *)rsa));
-        }
-
-RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa)
-        {
-        return((RSA *)ASN1_d2i_bio((char *(*)())
-                RSA_new,(char *(*)())d2i_RSAPublicKey, (bp),
-                (unsigned char **)(rsa)));
-        }
-
-int i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa)
-        {
-        return(ASN1_i2d_bio(i2d_RSAPublicKey,bp,(unsigned char *)rsa));
-        }
-#endif
-
-#ifndef NO_DSA
-#ifndef NO_FP_API
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
-        {
-        return((DSA *)ASN1_d2i_fp((char *(*)())
-                DSA_new,(char *(*)())d2i_DSAPrivateKey, (fp),
-                (unsigned char **)(dsa)));
-        }
-
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa)
-        {
-        return(ASN1_i2d_fp(i2d_DSAPrivateKey,fp,(unsigned char *)dsa));
-        }
-#endif
-
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
-        {
-        return((DSA *)ASN1_d2i_bio((char *(*)())
-                DSA_new,(char *(*)())d2i_DSAPrivateKey, (bp),
-                (unsigned char **)(dsa)));
-        }
-
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa)
-        {
-        return(ASN1_i2d_bio(i2d_DSAPrivateKey,bp,(unsigned char *)dsa));
-        }
-#endif
-
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn)
-        {
-        return((X509_ALGOR *)ASN1_dup((int (*)())i2d_X509_ALGOR,
-        (char *(*)())d2i_X509_ALGOR,(char *)xn));
-        }
-
-X509_NAME *X509_NAME_dup(X509_NAME *xn)
-        {
-        return((X509_NAME *)ASN1_dup((int (*)())i2d_X509_NAME,
-                (char *(*)())d2i_X509_NAME,(char *)xn));
-        }
-
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne)
-        {
-        return((X509_NAME_ENTRY *)ASN1_dup((int (*)())i2d_X509_NAME_ENTRY,
-                (char *(*)())d2i_X509_NAME_ENTRY,(char *)ne));
-        }
-
-int X509_digest(X509 *data, EVP_MD *type, unsigned char *md,
-             unsigned int *len)
-        {
-        return(ASN1_digest((int (*)())i2d_X509,type,(char *)data,md,len));
-        }
-
-int X509_NAME_digest(X509_NAME *data, EVP_MD *type, unsigned char *md,
-             unsigned int *len)
-        {
-        return(ASN1_digest((int (*)())i2d_X509_NAME,type,(char *)data,md,len));
-        }
-
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data, EVP_MD *type,
-             unsigned char *md, unsigned int *len)
-        {
-        return(ASN1_digest((int (*)())i2d_PKCS7_ISSUER_AND_SERIAL,type,
-                (char *)data,md,len));
-        }
-
-
-#ifndef NO_FP_API
-X509_SIG *d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
-        {
-        return((X509_SIG *)ASN1_d2i_fp((char *(*)())X509_SIG_new,
-                (char *(*)())d2i_X509_SIG, (fp),(unsigned char **)(p8)));
-        }
-
-int i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
-        {
-        return(ASN1_i2d_fp(i2d_X509_SIG,fp,(unsigned char *)p8));
-        }
-#endif
-
-X509_SIG *d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
-        {
-        return((X509_SIG *)ASN1_d2i_bio((char *(*)())X509_SIG_new,
-                (char *(*)())d2i_X509_SIG, (bp),(unsigned char **)(p8)));
-        }
-
-int i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
-        {
-        return(ASN1_i2d_bio(i2d_X509_SIG,bp,(unsigned char *)p8));
-        }
-
-#ifndef NO_FP_API
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf)
-        {
-        return((PKCS8_PRIV_KEY_INFO *)ASN1_d2i_fp(
-                (char *(*)())PKCS8_PRIV_KEY_INFO_new,
-                (char *(*)())d2i_PKCS8_PRIV_KEY_INFO, (fp),
-                                (unsigned char **)(p8inf)));
-        }
-
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf)
-        {
-        return(ASN1_i2d_fp(i2d_PKCS8_PRIV_KEY_INFO,fp,(unsigned char *)p8inf));
-        }
-#endif
-
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf)
-        {
-        return((PKCS8_PRIV_KEY_INFO *)ASN1_d2i_bio(
-                (char *(*)())PKCS8_PRIV_KEY_INFO_new,
-                (char *(*)())d2i_PKCS8_PRIV_KEY_INFO, (bp),
-                                (unsigned char **)(p8inf)));
-        }
-
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf)
-        {
-        return(ASN1_i2d_bio(i2d_PKCS8_PRIV_KEY_INFO,bp,(unsigned char *)p8inf));
-        }
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
deleted file mode 100644
index 4099e6019e..0000000000
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* v3_akey.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-
-static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                        AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist);
-static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                        X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-
-X509V3_EXT_METHOD v3_akey_id = {
-NID_authority_key_identifier, X509V3_EXT_MULTILINE,
-(X509V3_EXT_NEW)AUTHORITY_KEYID_new,
-(X509V3_EXT_FREE)AUTHORITY_KEYID_free,
-(X509V3_EXT_D2I)d2i_AUTHORITY_KEYID,
-(X509V3_EXT_I2D)i2d_AUTHORITY_KEYID,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_AUTHORITY_KEYID,
-(X509V3_EXT_V2I)v2i_AUTHORITY_KEYID,
-NULL,NULL,
-NULL
-};
-
-
-int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len_IMP_opt (a->issuer, i2d_GENERAL_NAMES);
-        M_ASN1_I2D_len_IMP_opt (a->serial, i2d_ASN1_INTEGER);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put_IMP_opt (a->keyid, i2d_ASN1_OCTET_STRING, 0);
-        M_ASN1_I2D_put_IMP_opt (a->issuer, i2d_GENERAL_NAMES, 1);
-        M_ASN1_I2D_put_IMP_opt (a->serial, i2d_ASN1_INTEGER, 2);
-
-        M_ASN1_I2D_finish();
-}
-
-AUTHORITY_KEYID *AUTHORITY_KEYID_new(void)
-{
-        AUTHORITY_KEYID *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, AUTHORITY_KEYID);
-        ret->keyid = NULL;
-        ret->issuer = NULL;
-        ret->serial = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_AUTHORITY_KEYID_NEW);
-}
-
-AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp,
-             long length)
-{
-        M_ASN1_D2I_vars(a,AUTHORITY_KEYID *,AUTHORITY_KEYID_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_IMP_opt (ret->keyid, d2i_ASN1_OCTET_STRING, 0,
-                                                        V_ASN1_OCTET_STRING);
-        M_ASN1_D2I_get_IMP_opt (ret->issuer, d2i_GENERAL_NAMES, 1,
-                                                        V_ASN1_SEQUENCE);
-        M_ASN1_D2I_get_IMP_opt (ret->serial, d2i_ASN1_INTEGER, 2,
-                                                        V_ASN1_INTEGER);
-        M_ASN1_D2I_Finish(a, AUTHORITY_KEYID_free, ASN1_F_D2I_AUTHORITY_KEYID);
-}
-
-void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a)
-{
-        if (a == NULL) return;
-        ASN1_OCTET_STRING_free(a->keyid);
-        sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free);
-        ASN1_INTEGER_free (a->serial);
-        Free ((char *)a);
-}
-
-static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-             AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist)
-{
-        char *tmp;
-        if(akeyid->keyid) {
-                tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length);
-                X509V3_add_value("keyid", tmp, &extlist);
-                Free(tmp);
-        }
-        if(akeyid->issuer) 
-                extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
-        if(akeyid->serial) {
-                tmp = hex_to_string(akeyid->serial->data,
-                                                 akeyid->serial->length);
-                X509V3_add_value("serial", tmp, &extlist);
-                Free(tmp);
-        }
-        return extlist;
-}
-
-/* Currently two options:
- * keyid: use the issuers subject keyid, the value 'always' means its is
- * an error if the issuer certificate doesn't have a key id.
- * issuer: use the issuers cert issuer and serial number. The default is
- * to only use this if keyid is not present. With the option 'always'
- * this is always included.
- */
-
-static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values)
-{
-char keyid=0, issuer=0;
-int i;
-CONF_VALUE *cnf;
-ASN1_OCTET_STRING *ikeyid = NULL;
-X509_NAME *isname = NULL;
-STACK_OF(GENERAL_NAME) * gens = NULL;
-GENERAL_NAME *gen = NULL;
-ASN1_INTEGER *serial = NULL;
-X509_EXTENSION *ext;
-X509 *cert;
-AUTHORITY_KEYID *akeyid;
-for(i = 0; i < sk_CONF_VALUE_num(values); i++) {
-        cnf = sk_CONF_VALUE_value(values, i);
-        if(!strcmp(cnf->name, "keyid")) {
-                keyid = 1;
-                if(cnf->value && !strcmp(cnf->value, "always")) keyid = 2;
-        } else if(!strcmp(cnf->name, "issuer")) {
-                issuer = 1;
-                if(cnf->value && !strcmp(cnf->value, "always")) issuer = 2;
-        } else {
-                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNKNOWN_OPTION);
-                ERR_add_error_data(2, "name=", cnf->name);
-                return NULL;
-        }
-}
-
-
-
-if(!ctx || !ctx->issuer_cert) {
-        if(ctx && (ctx->flags==CTX_TEST)) return AUTHORITY_KEYID_new();
-        X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_NO_ISSUER_CERTIFICATE);
-        return NULL;
-}
-
-cert = ctx->issuer_cert;
-
-if(keyid) {
-        i = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
-        if((i >= 0)  && (ext = X509_get_ext(cert, i)))
-                                                 ikeyid = X509V3_EXT_d2i(ext);
-        if(keyid==2 && !ikeyid) {
-                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
-                return NULL;
-        }
-}
-
-if((issuer && !ikeyid) || (issuer == 2)) {
-        isname = X509_NAME_dup(X509_get_issuer_name(cert));
-        serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
-        if(!isname || !serial) {
-                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
-                goto err;
-        }
-}
-
-if(!(akeyid = AUTHORITY_KEYID_new())) goto err;
-
-if(isname) {
-        if(!(gens = sk_GENERAL_NAME_new(NULL)) || !(gen = GENERAL_NAME_new())
-                || !sk_GENERAL_NAME_push(gens, gen)) {
-                X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-        gen->type = GEN_DIRNAME;
-        gen->d.dirn = isname;
-}
-
-akeyid->issuer = gens;
-akeyid->serial = serial;
-akeyid->keyid = ikeyid;
-
-return akeyid;
-
-err:
-X509_NAME_free(isname);
-ASN1_INTEGER_free(serial);
-ASN1_OCTET_STRING_free(ikeyid);
-return NULL;
-
-}
-
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
deleted file mode 100644
index b5e1f8af96..0000000000
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* v3_alt.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static STACK_OF(GENERAL_NAME) *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(GENERAL_NAME) *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens);
-static int copy_issuer(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens);
-X509V3_EXT_METHOD v3_alt[] = {
-{ NID_subject_alt_name, 0,
-(X509V3_EXT_NEW)GENERAL_NAMES_new,
-(X509V3_EXT_FREE)GENERAL_NAMES_free,
-(X509V3_EXT_D2I)d2i_GENERAL_NAMES,
-(X509V3_EXT_I2D)i2d_GENERAL_NAMES,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_GENERAL_NAMES,
-(X509V3_EXT_V2I)v2i_subject_alt,
-NULL, NULL, NULL},
-{ NID_issuer_alt_name, 0,
-(X509V3_EXT_NEW)GENERAL_NAMES_new,
-(X509V3_EXT_FREE)GENERAL_NAMES_free,
-(X509V3_EXT_D2I)d2i_GENERAL_NAMES,
-(X509V3_EXT_I2D)i2d_GENERAL_NAMES,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_GENERAL_NAMES,
-(X509V3_EXT_V2I)v2i_issuer_alt,
-NULL, NULL, NULL},
-EXT_END
-};
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                STACK_OF(GENERAL_NAME) *gens, STACK_OF(CONF_VALUE) *ret)
-{
-        int i;
-        GENERAL_NAME *gen;
-        for(i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
-                gen = sk_GENERAL_NAME_value(gens, i);
-                ret = i2v_GENERAL_NAME(method, gen, ret);
-        }
-        if(!ret) return sk_CONF_VALUE_new_null();
-        return ret;
-}
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
-                                GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret)
-{
-        char oline[256];
-        unsigned char *p;
-        switch (gen->type)
-        {
-                case GEN_OTHERNAME:
-                X509V3_add_value("othername","<unsupported>", &ret);
-                break;
-
-                case GEN_X400:
-                X509V3_add_value("X400Name","<unsupported>", &ret);
-                break;
-
-                case GEN_EDIPARTY:
-                X509V3_add_value("EdiPartyName","<unsupported>", &ret);
-                break;
-
-                case GEN_EMAIL:
-                X509V3_add_value_uchar("email",gen->d.ia5->data, &ret);
-                break;
-
-                case GEN_DNS:
-                X509V3_add_value_uchar("DNS",gen->d.ia5->data, &ret);
-                break;
-
-                case GEN_URI:
-                X509V3_add_value_uchar("URI",gen->d.ia5->data, &ret);
-                break;
-
-                case GEN_DIRNAME:
-                X509_NAME_oneline(gen->d.dirn, oline, 256);
-                X509V3_add_value("DirName",oline, &ret);
-                break;
-
-                case GEN_IPADD:
-                p = gen->d.ip->data;
-                /* BUG: doesn't support IPV6 */
-                if(gen->d.ip->length != 4) {
-                        X509V3_add_value("IP Address","<invalid>", &ret);
-                        break;
-                }
-                sprintf(oline, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
-                X509V3_add_value("IP Address",oline, &ret);
-                break;
-
-                case GEN_RID:
-                i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
-                X509V3_add_value("Registered ID",oline, &ret);
-                break;
-        }
-        return ret;
-}
-
-static STACK_OF(GENERAL_NAME) *v2i_issuer_alt(X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-        STACK_OF(GENERAL_NAME) *gens = NULL;
-        CONF_VALUE *cnf;
-        int i;
-        if(!(gens = sk_GENERAL_NAME_new(NULL))) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                cnf = sk_CONF_VALUE_value(nval, i);
-                if(!name_cmp(cnf->name, "issuer") && cnf->value &&
-                                                !strcmp(cnf->value, "copy")) {
-                        if(!copy_issuer(ctx, gens)) goto err;
-                } else {
-                        GENERAL_NAME *gen;
-                        if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
-                                                                 goto err; 
-                        sk_GENERAL_NAME_push(gens, gen);
-                }
-        }
-        return gens;
-        err:
-        sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-        return NULL;
-}
-
-/* Append subject altname of issuer to issuer alt name of subject */
-
-static int copy_issuer(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens)
-{
-        STACK_OF(GENERAL_NAME) *ialt;
-        GENERAL_NAME *gen;
-        X509_EXTENSION *ext;
-        int i;
-        if(ctx && (ctx->flags == CTX_TEST)) return 1;
-        if(!ctx || !ctx->issuer_cert) {
-                X509V3err(X509V3_F_COPY_ISSUER,X509V3_R_NO_ISSUER_DETAILS);
-                goto err;
-        }
-        i = X509_get_ext_by_NID(ctx->issuer_cert, NID_subject_alt_name, -1);
-        if(i < 0) return 1;
-        if(!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
-                        !(ialt = X509V3_EXT_d2i(ext)) ) {
-                X509V3err(X509V3_F_COPY_ISSUER,X509V3_R_ISSUER_DECODE_ERROR);
-                goto err;
-        }
-
-        for(i = 0; i < sk_GENERAL_NAME_num(ialt); i++) {
-                gen = sk_GENERAL_NAME_value(ialt, i);
-                if(!sk_GENERAL_NAME_push(gens, gen)) {
-                        X509V3err(X509V3_F_COPY_ISSUER,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                }
-        }
-        sk_GENERAL_NAME_free(ialt);
-
-        return 1;
-                
-        err:
-        return 0;
-        
-}
-
-static STACK_OF(GENERAL_NAME) *v2i_subject_alt(X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-        STACK_OF(GENERAL_NAME) *gens = NULL;
-        CONF_VALUE *cnf;
-        int i;
-        if(!(gens = sk_GENERAL_NAME_new(NULL))) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                cnf = sk_CONF_VALUE_value(nval, i);
-                if(!name_cmp(cnf->name, "email") && cnf->value &&
-                                                !strcmp(cnf->value, "copy")) {
-                        if(!copy_email(ctx, gens)) goto err;
-                } else {
-                        GENERAL_NAME *gen;
-                        if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf)))
-                                                                 goto err; 
-                        sk_GENERAL_NAME_push(gens, gen);
-                }
-        }
-        return gens;
-        err:
-        sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-        return NULL;
-}
-
-/* Copy any email addresses in a certificate or request to 
- * GENERAL_NAMES
- */
-
-static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens)
-{
-        X509_NAME *nm;
-        ASN1_IA5STRING *email = NULL;
-        X509_NAME_ENTRY *ne;
-        GENERAL_NAME *gen = NULL;
-        int i;
-        if(ctx->flags == CTX_TEST) return 1;
-        if(!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
-                X509V3err(X509V3_F_COPY_EMAIL,X509V3_R_NO_SUBJECT_DETAILS);
-                goto err;
-        }
-        /* Find the subject name */
-        if(ctx->subject_cert) nm = X509_get_subject_name(ctx->subject_cert);
-        else nm = X509_REQ_get_subject_name(ctx->subject_req);
-
-        /* Now add any email address(es) to STACK */
-        i = -1;
-        while((i = X509_NAME_get_index_by_NID(nm,
-                                         NID_pkcs9_emailAddress, i)) > 0) {
-                ne = X509_NAME_get_entry(nm, i);
-                email = ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
-                if(!email || !(gen = GENERAL_NAME_new())) {
-                        X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                }
-                gen->d.ia5 = email;
-                email = NULL;
-                gen->type = GEN_EMAIL;
-                if(!sk_GENERAL_NAME_push(gens, gen)) {
-                        X509V3err(X509V3_F_COPY_EMAIL,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                }
-                gen = NULL;
-        }
-
-        
-        return 1;
-                
-        err:
-        GENERAL_NAME_free(gen);
-        ASN1_IA5STRING_free(email);
-        return 0;
-        
-}
-
-STACK_OF(GENERAL_NAME) *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-        GENERAL_NAME *gen;
-        STACK_OF(GENERAL_NAME) *gens = NULL;
-        CONF_VALUE *cnf;
-        int i;
-        if(!(gens = sk_GENERAL_NAME_new(NULL))) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAMES,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                cnf = sk_CONF_VALUE_value(nval, i);
-                if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) goto err; 
-                sk_GENERAL_NAME_push(gens, gen);
-        }
-        return gens;
-        err:
-        sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-        return NULL;
-}
-
-GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                                                         CONF_VALUE *cnf)
-{
-char is_string = 0;
-int type;
-GENERAL_NAME *gen = NULL;
-
-char *name, *value;
-
-name = cnf->name;
-value = cnf->value;
-
-if(!value) {
-        X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_MISSING_VALUE);
-        return NULL;
-}
-
-if(!(gen = GENERAL_NAME_new())) {
-        X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
-        return NULL;
-}
-
-if(!name_cmp(name, "email")) {
-        is_string = 1;
-        type = GEN_EMAIL;
-} else if(!name_cmp(name, "URI")) {
-        is_string = 1;
-        type = GEN_URI;
-} else if(!name_cmp(name, "DNS")) {
-        is_string = 1;
-        type = GEN_DNS;
-} else if(!name_cmp(name, "RID")) {
-        ASN1_OBJECT *obj;
-        if(!(obj = OBJ_txt2obj(value,0))) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_BAD_OBJECT);
-                ERR_add_error_data(2, "value=", value);
-                goto err;
-        }
-        gen->d.rid = obj;
-        type = GEN_RID;
-} else if(!name_cmp(name, "IP")) {
-        int i1,i2,i3,i4;
-        unsigned char ip[4];
-        if((sscanf(value, "%d.%d.%d.%d",&i1,&i2,&i3,&i4) != 4) ||
-            (i1 < 0) || (i1 > 255) || (i2 < 0) || (i2 > 255) ||
-            (i3 < 0) || (i3 > 255) || (i4 < 0) || (i4 > 255) ) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_BAD_IP_ADDRESS);
-                ERR_add_error_data(2, "value=", value);
-                goto err;
-        }
-        ip[0] = i1; ip[1] = i2 ; ip[2] = i3 ; ip[3] = i4;
-        if(!(gen->d.ip = ASN1_OCTET_STRING_new()) ||
-                !ASN1_STRING_set(gen->d.ip, ip, 4)) {
-                        X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
-                        goto err;
-        }
-        type = GEN_IPADD;
-} else {
-        X509V3err(X509V3_F_V2I_GENERAL_NAME,X509V3_R_UNSUPPORTED_OPTION);
-        ERR_add_error_data(2, "name=", name);
-        goto err;
-}
-
-if(is_string) {
-        if(!(gen->d.ia5 = ASN1_IA5STRING_new()) ||
-                      !ASN1_STRING_set(gen->d.ia5, (unsigned char*)value,
-                                       strlen(value))) {
-                X509V3err(X509V3_F_V2I_GENERAL_NAME,ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-}
-
-gen->type = type;
-
-return gen;
-
-err:
-GENERAL_NAME_free(gen);
-return NULL;
-}
diff --git a/src/lib/libcrypto/x509v3/v3_bcons.c b/src/lib/libcrypto/x509v3/v3_bcons.c
deleted file mode 100644
index de2f855c35..0000000000
--- a/src/lib/libcrypto/x509v3/v3_bcons.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* v3_bcons.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist);
-static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-
-X509V3_EXT_METHOD v3_bcons = {
-NID_basic_constraints, 0,
-(X509V3_EXT_NEW)BASIC_CONSTRAINTS_new,
-(X509V3_EXT_FREE)BASIC_CONSTRAINTS_free,
-(X509V3_EXT_D2I)d2i_BASIC_CONSTRAINTS,
-(X509V3_EXT_I2D)i2d_BASIC_CONSTRAINTS,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_BASIC_CONSTRAINTS,
-(X509V3_EXT_V2I)v2i_BASIC_CONSTRAINTS,
-NULL,NULL,
-NULL
-};
-
-
-int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-        if(a->ca) M_ASN1_I2D_len (a->ca, i2d_ASN1_BOOLEAN);
-        M_ASN1_I2D_len (a->pathlen, i2d_ASN1_INTEGER);
-
-        M_ASN1_I2D_seq_total();
-
-        if (a->ca) M_ASN1_I2D_put (a->ca, i2d_ASN1_BOOLEAN);
-        M_ASN1_I2D_put (a->pathlen, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_finish();
-}
-
-BASIC_CONSTRAINTS *BASIC_CONSTRAINTS_new(void)
-{
-        BASIC_CONSTRAINTS *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, BASIC_CONSTRAINTS);
-        ret->ca = 0;
-        ret->pathlen = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_BASIC_CONSTRAINTS_NEW);
-}
-
-BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a,
-             unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,BASIC_CONSTRAINTS *,BASIC_CONSTRAINTS_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        if((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) ==
-                 (V_ASN1_UNIVERSAL|V_ASN1_BOOLEAN) ) {
-                        M_ASN1_D2I_get_int (ret->ca, d2i_ASN1_BOOLEAN);
-        }
-        M_ASN1_D2I_get_opt (ret->pathlen, d2i_ASN1_INTEGER, V_ASN1_INTEGER);
-        M_ASN1_D2I_Finish(a, BASIC_CONSTRAINTS_free, ASN1_F_D2I_BASIC_CONSTRAINTS);
-}
-
-void BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a)
-{
-        if (a == NULL) return;
-        ASN1_INTEGER_free (a->pathlen);
-        Free ((char *)a);
-}
-
-static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-             BASIC_CONSTRAINTS *bcons, STACK_OF(CONF_VALUE) *extlist)
-{
-        X509V3_add_value_bool("CA", bcons->ca, &extlist);
-        X509V3_add_value_int("pathlen", bcons->pathlen, &extlist);
-        return extlist;
-}
-
-static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values)
-{
-        BASIC_CONSTRAINTS *bcons=NULL;
-        CONF_VALUE *val;
-        int i;
-        if(!(bcons = BASIC_CONSTRAINTS_new())) {
-                X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(values); i++) {
-                val = sk_CONF_VALUE_value(values, i);
-                if(!strcmp(val->name, "CA")) {
-                        if(!X509V3_get_value_bool(val, &bcons->ca)) goto err;
-                } else if(!strcmp(val->name, "pathlen")) {
-                        if(!X509V3_get_value_int(val, &bcons->pathlen)) goto err;
-                } else {
-                        X509V3err(X509V3_F_V2I_BASIC_CONSTRAINTS, X509V3_R_INVALID_NAME);
-                        X509V3_conf_err(val);
-                        goto err;
-                }
-        }
-        return bcons;
-        err:
-        BASIC_CONSTRAINTS_free(bcons);
-        return NULL;
-}
-
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c
deleted file mode 100644
index 9828ba15b3..0000000000
--- a/src/lib/libcrypto/x509v3/v3_bitst.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* v3_bitst.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static ASN1_BIT_STRING *asn1_bit_string_new(void);
-static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                ASN1_BIT_STRING *bits,
-                                STACK_OF(CONF_VALUE) *extlist);
-static BIT_STRING_BITNAME ns_cert_type_table[] = {
-{0, "SSL Client", "client"},
-{1, "SSL Server", "server"},
-{2, "S/MIME", "email"},
-{3, "Object Signing", "objsign"},
-{4, "Unused", "reserved"},
-{5, "SSL CA", "sslCA"},
-{6, "S/MIME CA", "emailCA"},
-{7, "Object Signing CA", "objCA"},
-{-1, NULL, NULL}
-};
-
-static BIT_STRING_BITNAME key_usage_type_table[] = {
-{0, "Digital Signature", "digitalSignature"},
-{1, "Non Repudiation", "nonRepudiation"},
-{2, "Key Encipherment", "keyEncipherment"},
-{3, "Data Encipherment", "dataEncipherment"},
-{4, "Key Agreement", "keyAgreement"},
-{5, "Certificate Sign", "keyCertSign"},
-{6, "CRL Sign", "cRLSign"},
-{7, "Encipher Only", "encipherOnly"},
-{8, "Decipher Only", "decipherOnly"},
-{-1, NULL, NULL}
-};
-
-
-
-X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
-X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
-
-static ASN1_BIT_STRING *asn1_bit_string_new(void)
-{
-        return ASN1_BIT_STRING_new();
-}
-
-static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-             ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
-{
-        BIT_STRING_BITNAME *bnam;
-        for(bnam =method->usr_data; bnam->lname; bnam++) {
-                if(ASN1_BIT_STRING_get_bit(bits, bnam->bitnum)) 
-                        X509V3_add_value(bnam->lname, NULL, &ret);
-        }
-        return ret;
-}
-        
-static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-        CONF_VALUE *val;
-        ASN1_BIT_STRING *bs;
-        int i;
-        BIT_STRING_BITNAME *bnam;
-        if(!(bs = ASN1_BIT_STRING_new())) {
-                X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                val = sk_CONF_VALUE_value(nval, i);
-                for(bnam = method->usr_data; bnam->lname; bnam++) {
-                        if(!strcmp(bnam->sname, val->name) ||
-                                !strcmp(bnam->lname, val->name) ) {
-                                ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1);
-                                break;
-                        }
-                }
-                if(!bnam->lname) {
-                        X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
-                                        X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
-                        X509V3_conf_err(val);
-                        ASN1_BIT_STRING_free(bs);
-                        return NULL;
-                }
-        }
-        return bs;
-}
-        
-
diff --git a/src/lib/libcrypto/x509v3/v3_conf.c b/src/lib/libcrypto/x509v3/v3_conf.c
deleted file mode 100644
index f19bb3ad84..0000000000
--- a/src/lib/libcrypto/x509v3/v3_conf.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* v3_conf.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* extension creation utilities */
-
-
-
-#include <stdio.h>
-#include <ctype.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-
-static int v3_check_critical(char **value);
-static int v3_check_generic(char **value);
-static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value);
-static X509_EXTENSION *v3_generic_extension(const char *ext, char *value, int crit, int type);
-static char *conf_lhash_get_string(void *db, char *section, char *value);
-static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, char *section);
-static X509_EXTENSION *do_ext_i2d(X509V3_EXT_METHOD *method, int ext_nid,
-                                                 int crit, void *ext_struc);
-/* LHASH *conf:  Config file    */
-/* char *name:  Name    */
-/* char *value:  Value    */
-X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name,
-             char *value)
-{
-        int crit;
-        int ext_type;
-        X509_EXTENSION *ret;
-        crit = v3_check_critical(&value);
-        if((ext_type = v3_check_generic(&value))) 
-                return v3_generic_extension(name, value, crit, ext_type);
-        ret = do_ext_conf(conf, ctx, OBJ_sn2nid(name), crit, value);
-        if(!ret) {
-                X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_ERROR_IN_EXTENSION);
-                ERR_add_error_data(4,"name=", name, ", value=", value);
-        }
-        return ret;
-}
-
-/* LHASH *conf:  Config file    */
-/* char *value:  Value    */
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid,
-             char *value)
-{
-        int crit;
-        int ext_type;
-        crit = v3_check_critical(&value);
-        if((ext_type = v3_check_generic(&value))) 
-                return v3_generic_extension(OBJ_nid2sn(ext_nid),
-                                                         value, crit, ext_type);
-        return do_ext_conf(conf, ctx, ext_nid, crit, value);
-}
-
-/* LHASH *conf:  Config file    */
-/* char *value:  Value    */
-static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid,
-             int crit, char *value)
-{
-        X509V3_EXT_METHOD *method;
-        X509_EXTENSION *ext;
-        STACK_OF(CONF_VALUE) *nval;
-        void *ext_struc;
-        if(ext_nid == NID_undef) {
-                X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION_NAME);
-                return NULL;
-        }
-        if(!(method = X509V3_EXT_get_nid(ext_nid))) {
-                X509V3err(X509V3_F_DO_EXT_CONF,X509V3_R_UNKNOWN_EXTENSION);
-                return NULL;
-        }
-        /* Now get internal extension representation based on type */
-        if(method->v2i) {
-                if(*value == '@') nval = CONF_get_section(conf, value + 1);
-                else nval = X509V3_parse_list(value);
-                if(!nval) {
-                        X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_INVALID_EXTENSION_STRING);
-                        ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value);
-                        return NULL;
-                }
-                ext_struc = method->v2i(method, ctx, nval);
-                if(*value != '@') sk_CONF_VALUE_pop_free(nval,
-                                                         X509V3_conf_free);
-                if(!ext_struc) return NULL;
-        } else if(method->s2i) {
-                if(!(ext_struc = method->s2i(method, ctx, value))) return NULL;
-        } else if(method->r2i) {
-                if(!ctx->db) {
-                        X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_NO_CONFIG_DATABASE);
-                        return NULL;
-                }
-                if(!(ext_struc = method->r2i(method, ctx, value))) return NULL;
-        } else {
-                X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED);
-                ERR_add_error_data(2, "name=", OBJ_nid2sn(ext_nid));
-                return NULL;
-        }
-
-        ext  = do_ext_i2d(method, ext_nid, crit, ext_struc);
-        method->ext_free(ext_struc);
-        return ext;
-
-}
-
-static X509_EXTENSION *do_ext_i2d(X509V3_EXT_METHOD *method, int ext_nid,
-                                                 int crit, void *ext_struc)
-{
-        unsigned char *ext_der, *p;
-        int ext_len;
-        ASN1_OCTET_STRING *ext_oct;
-        X509_EXTENSION *ext;
-        /* Convert internal representation to DER */
-        ext_len = method->i2d(ext_struc, NULL);
-        if(!(ext_der = Malloc(ext_len))) goto merr;
-        p = ext_der;
-        method->i2d(ext_struc, &p);
-        if(!(ext_oct = ASN1_OCTET_STRING_new())) goto merr;
-        ext_oct->data = ext_der;
-        ext_oct->length = ext_len;
-        
-        ext = X509_EXTENSION_create_by_NID(NULL, ext_nid, crit, ext_oct);
-        if(!ext) goto merr;
-        ASN1_OCTET_STRING_free(ext_oct);
-
-        return ext;
-
-        merr:
-        X509V3err(X509V3_F_DO_EXT_I2D,ERR_R_MALLOC_FAILURE);
-        return NULL;
-
-}
-
-/* Given an internal structure, nid and critical flag create an extension */
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc)
-{
-        X509V3_EXT_METHOD *method;
-        if(!(method = X509V3_EXT_get_nid(ext_nid))) {
-                X509V3err(X509V3_F_X509V3_EXT_I2D,X509V3_R_UNKNOWN_EXTENSION);
-                return NULL;
-        }
-        return do_ext_i2d(method, ext_nid, crit, ext_struc);
-}
-
-/* Check the extension string for critical flag */
-static int v3_check_critical(char **value)
-{
-        char *p = *value;
-        if((strlen(p) < 9) || strncmp(p, "critical,", 9)) return 0;
-        p+=9;
-        while(isspace((unsigned char)*p)) p++;
-        *value = p;
-        return 1;
-}
-
-/* Check extension string for generic extension and return the type */
-static int v3_check_generic(char **value)
-{
-        char *p = *value;
-        if((strlen(p) < 4) || strncmp(p, "DER:,", 4)) return 0;
-        p+=4;
-        while(isspace((unsigned char)*p)) p++;
-        *value = p;
-        return 1;
-}
-
-/* Create a generic extension: for now just handle RAW type */
-static X509_EXTENSION *v3_generic_extension(const char *ext, char *value,
-             int crit, int type)
-{
-unsigned char *ext_der=NULL;
-long ext_len;
-ASN1_OBJECT *obj=NULL;
-ASN1_OCTET_STRING *oct=NULL;
-X509_EXTENSION *extension=NULL;
-if(!(obj = OBJ_txt2obj(ext, 0))) {
-        X509V3err(X509V3_F_V3_GENERIC_EXTENSION,X509V3_R_EXTENSION_NAME_ERROR);
-        ERR_add_error_data(2, "name=", ext);
-        goto err;
-}
-
-if(!(ext_der = string_to_hex(value, &ext_len))) {
-        X509V3err(X509V3_F_V3_GENERIC_EXTENSION,X509V3_R_EXTENSION_VALUE_ERROR);
-        ERR_add_error_data(2, "value=", value);
-        goto err;
-}
-
-if(!(oct = ASN1_OCTET_STRING_new())) {
-        X509V3err(X509V3_F_V3_GENERIC_EXTENSION,ERR_R_MALLOC_FAILURE);
-        goto err;
-}
-
-oct->data = ext_der;
-oct->length = ext_len;
-ext_der = NULL;
-
-extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct);
-
-err:
-ASN1_OBJECT_free(obj);
-ASN1_OCTET_STRING_free(oct);
-if(ext_der) Free(ext_der);
-return extension;
-}
-
-
-/* This is the main function: add a bunch of extensions based on a config file
- * section
- */
-
-int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section,
-             X509 *cert)
-{
-        X509_EXTENSION *ext;
-        STACK_OF(CONF_VALUE) *nval;
-        CONF_VALUE *val;        
-        int i;
-        if(!(nval = CONF_get_section(conf, section))) return 0;
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                val = sk_CONF_VALUE_value(nval, i);
-                if(!(ext = X509V3_EXT_conf(conf, ctx, val->name, val->value)))
-                                                                return 0;
-                if(cert) X509_add_ext(cert, ext, -1);
-                X509_EXTENSION_free(ext);
-        }
-        return 1;
-}
-
-/* Same as above but for a CRL */
-
-int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section,
-             X509_CRL *crl)
-{
-        X509_EXTENSION *ext;
-        STACK_OF(CONF_VALUE) *nval;
-        CONF_VALUE *val;        
-        int i;
-        if(!(nval = CONF_get_section(conf, section))) return 0;
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                val = sk_CONF_VALUE_value(nval, i);
-                if(!(ext = X509V3_EXT_conf(conf, ctx, val->name, val->value)))
-                                                                return 0;
-                if(crl) X509_CRL_add_ext(crl, ext, -1);
-                X509_EXTENSION_free(ext);
-        }
-        return 1;
-}
-
-/* Config database functions */
-
-char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section)
-{
-        if(ctx->db_meth->get_string)
-                        return ctx->db_meth->get_string(ctx->db, name, section);
-        return NULL;
-}
-
-STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section)
-{
-        if(ctx->db_meth->get_section)
-                        return ctx->db_meth->get_section(ctx->db, section);
-        return NULL;
-}
-
-void X509V3_string_free(X509V3_CTX *ctx, char *str)
-{
-        if(!str) return;
-        if(ctx->db_meth->free_string)
-                        ctx->db_meth->free_string(ctx->db, str);
-}
-
-void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section)
-{
-        if(!section) return;
-        if(ctx->db_meth->free_section)
-                        ctx->db_meth->free_section(ctx->db, section);
-}
-
-static char *conf_lhash_get_string(void *db, char *section, char *value)
-{
-        return CONF_get_string(db, section, value);
-}
-
-static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, char *section)
-{
-        return CONF_get_section(db, section);
-}
-
-static X509V3_CONF_METHOD conf_lhash_method = {
-conf_lhash_get_string,
-conf_lhash_get_section,
-NULL,
-NULL
-};
-
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash)
-{
-        ctx->db_meth = &conf_lhash_method;
-        ctx->db = lhash;
-}
-
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subj, X509_REQ *req,
-             X509_CRL *crl, int flags)
-{
-        ctx->issuer_cert = issuer;
-        ctx->subject_cert = subj;
-        ctx->crl = crl;
-        ctx->subject_req = req;
-        ctx->flags = flags;
-}
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
deleted file mode 100644
index b4d4883545..0000000000
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* v3_cpols.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-
-/* Certificate policies extension support: this one is a bit complex... */
-
-static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, BIO *out, int indent);
-static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *value);
-static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals, int indent);
-static void print_notice(BIO *out, USERNOTICE *notice, int indent);
-static POLICYINFO *policy_section(X509V3_CTX *ctx,
-                                 STACK_OF(CONF_VALUE) *polstrs, int ia5org);
-static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
-                                        STACK_OF(CONF_VALUE) *unot, int ia5org);
-static STACK *nref_nos(STACK_OF(CONF_VALUE) *nos);
-
-X509V3_EXT_METHOD v3_cpols = {
-NID_certificate_policies, 0,
-(X509V3_EXT_NEW)CERTIFICATEPOLICIES_new,
-(X509V3_EXT_FREE)CERTIFICATEPOLICIES_free,
-(X509V3_EXT_D2I)d2i_CERTIFICATEPOLICIES,
-(X509V3_EXT_I2D)i2d_CERTIFICATEPOLICIES,
-NULL, NULL,
-NULL, NULL,
-(X509V3_EXT_I2R)i2r_certpol,
-(X509V3_EXT_R2I)r2i_certpol,
-NULL
-};
-
-
-static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
-                X509V3_CTX *ctx, char *value)
-{
-        STACK_OF(POLICYINFO) *pols = NULL;
-        char *pstr;
-        POLICYINFO *pol;
-        ASN1_OBJECT *pobj;
-        STACK_OF(CONF_VALUE) *vals;
-        CONF_VALUE *cnf;
-        int i, ia5org;
-        pols = sk_POLICYINFO_new_null();
-        vals =  X509V3_parse_list(value);
-        ia5org = 0;
-        for(i = 0; i < sk_CONF_VALUE_num(vals); i++) {
-                cnf = sk_CONF_VALUE_value(vals, i);
-                if(cnf->value || !cnf->name ) {
-                        X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_POLICY_IDENTIFIER);
-                        X509V3_conf_err(cnf);
-                        goto err;
-                }
-                pstr = cnf->name;
-                if(!strcmp(pstr,"ia5org")) {
-                        ia5org = 1;
-                        continue;
-                } else if(*pstr == '@') {
-                        STACK_OF(CONF_VALUE) *polsect;
-                        polsect = X509V3_get_section(ctx, pstr + 1);
-                        if(!polsect) {
-                                X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_SECTION);
-
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        pol = policy_section(ctx, polsect, ia5org);
-                        X509V3_section_free(ctx, polsect);
-                        if(!pol) goto err;
-                } else {
-                        if(!(pobj = OBJ_txt2obj(cnf->name, 0))) {
-                                X509V3err(X509V3_F_R2I_CERTPOL,X509V3_R_INVALID_OBJECT_IDENTIFIER);
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        pol = POLICYINFO_new();
-                        pol->policyid = pobj;
-                }
-                sk_POLICYINFO_push(pols, pol);
-        }
-        sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
-        return pols;
-        err:
-        sk_POLICYINFO_pop_free(pols, POLICYINFO_free);
-        return NULL;
-}
-
-static POLICYINFO *policy_section(X509V3_CTX *ctx,
-                                STACK_OF(CONF_VALUE) *polstrs, int ia5org)
-{
-        int i;
-        CONF_VALUE *cnf;
-        POLICYINFO *pol;
-        POLICYQUALINFO *qual;
-        if(!(pol = POLICYINFO_new())) goto merr;
-        for(i = 0; i < sk_CONF_VALUE_num(polstrs); i++) {
-                cnf = sk_CONF_VALUE_value(polstrs, i);
-                if(!strcmp(cnf->name, "policyIdentifier")) {
-                        ASN1_OBJECT *pobj;
-                        if(!(pobj = OBJ_txt2obj(cnf->value, 0))) {
-                                X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_OBJECT_IDENTIFIER);
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        pol->policyid = pobj;
-
-                } else if(!name_cmp(cnf->name, "CPS")) {
-                        if(!pol->qualifiers) pol->qualifiers =
-                                                 sk_POLICYQUALINFO_new_null();
-                        if(!(qual = POLICYQUALINFO_new())) goto merr;
-                        if(!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
-                                                                 goto merr;
-                        qual->pqualid = OBJ_nid2obj(NID_id_qt_cps);
-                        qual->d.cpsuri = ASN1_IA5STRING_new();
-                        if(!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
-                                                 strlen(cnf->value))) goto merr;
-                } else if(!name_cmp(cnf->name, "userNotice")) {
-                        STACK_OF(CONF_VALUE) *unot;
-                        if(*cnf->value != '@') {
-                                X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_EXPECTED_A_SECTION_NAME);
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        unot = X509V3_get_section(ctx, cnf->value + 1);
-                        if(!unot) {
-                                X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_SECTION);
-
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        qual = notice_section(ctx, unot, ia5org);
-                        X509V3_section_free(ctx, unot);
-                        if(!qual) goto err;
-                        if(!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
-                                                                 goto merr;
-                } else {
-                        X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_INVALID_OPTION);
-
-                        X509V3_conf_err(cnf);
-                        goto err;
-                }
-        }
-        if(!pol->policyid) {
-                X509V3err(X509V3_F_POLICY_SECTION,X509V3_R_NO_POLICY_IDENTIFIER);
-                goto err;
-        }
-
-        return pol;
-
-        merr:
-        X509V3err(X509V3_F_POLICY_SECTION,ERR_R_MALLOC_FAILURE);
-
-        err:
-        POLICYINFO_free(pol);
-        return NULL;
-        
-        
-}
-
-static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
-                                        STACK_OF(CONF_VALUE) *unot, int ia5org)
-{
-        int i;
-        CONF_VALUE *cnf;
-        USERNOTICE *not;
-        POLICYQUALINFO *qual;
-        if(!(qual = POLICYQUALINFO_new())) goto merr;
-        qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice);
-        if(!(not = USERNOTICE_new())) goto merr;
-        qual->d.usernotice = not;
-        for(i = 0; i < sk_CONF_VALUE_num(unot); i++) {
-                cnf = sk_CONF_VALUE_value(unot, i);
-                if(!strcmp(cnf->name, "explicitText")) {
-                        not->exptext = ASN1_VISIBLESTRING_new();
-                        if(!ASN1_STRING_set(not->exptext, cnf->value,
-                                                 strlen(cnf->value))) goto merr;
-                } else if(!strcmp(cnf->name, "organization")) {
-                        NOTICEREF *nref;
-                        if(!not->noticeref) {
-                                if(!(nref = NOTICEREF_new())) goto merr;
-                                not->noticeref = nref;
-                        } else nref = not->noticeref;
-                        if(ia5org) nref->organization = ASN1_IA5STRING_new();
-                        else nref->organization = ASN1_VISIBLESTRING_new();
-                        if(!ASN1_STRING_set(nref->organization, cnf->value,
-                                                 strlen(cnf->value))) goto merr;
-                } else if(!strcmp(cnf->name, "noticeNumbers")) {
-                        NOTICEREF *nref;
-                        STACK_OF(CONF_VALUE) *nos;
-                        if(!not->noticeref) {
-                                if(!(nref = NOTICEREF_new())) goto merr;
-                                not->noticeref = nref;
-                        } else nref = not->noticeref;
-                        nos = X509V3_parse_list(cnf->value);
-                        if(!nos || !sk_CONF_VALUE_num(nos)) {
-                                X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_INVALID_NUMBERS);
-                                X509V3_conf_err(cnf);
-                                goto err;
-                        }
-                        nref->noticenos = nref_nos(nos);
-                        sk_CONF_VALUE_pop_free(nos, X509V3_conf_free);
-                        if(!nref->noticenos) goto err;
-                } else {
-                        X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_INVALID_OPTION);
-
-                        X509V3_conf_err(cnf);
-                        goto err;
-                }
-        }
-
-        if(not->noticeref && 
-              (!not->noticeref->noticenos || !not->noticeref->organization)) {
-                        X509V3err(X509V3_F_NOTICE_SECTION,X509V3_R_NEED_ORGANIZATION_AND_NUMBERS);
-                        goto err;
-        }
-
-        return qual;
-
-        merr:
-        X509V3err(X509V3_F_NOTICE_SECTION,ERR_R_MALLOC_FAILURE);
-
-        err:
-        POLICYQUALINFO_free(qual);
-        return NULL;
-}
-
-static STACK *nref_nos(STACK_OF(CONF_VALUE) *nos)
-{
-        STACK *nnums;
-        CONF_VALUE *cnf;
-        ASN1_INTEGER *aint;
-        int i;
-        if(!(nnums = sk_new_null())) goto merr;
-        for(i = 0; i < sk_CONF_VALUE_num(nos); i++) {
-                cnf = sk_CONF_VALUE_value(nos, i);
-                if(!(aint = s2i_ASN1_INTEGER(NULL, cnf->name))) {
-                        X509V3err(X509V3_F_NREF_NOS,X509V3_R_INVALID_NUMBER);
-                        goto err;
-                }
-                if(!sk_push(nnums, (char *)aint)) goto merr;
-        }
-        return nnums;
-
-        merr:
-        X509V3err(X509V3_F_NOTICE_SECTION,ERR_R_MALLOC_FAILURE);
-
-        err:
-        sk_pop_free(nnums, ASN1_STRING_free);
-        return NULL;
-}
-
-
-static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
-                BIO *out, int indent)
-{
-        int i;
-        POLICYINFO *pinfo;
-        /* First print out the policy OIDs */
-        for(i = 0; i < sk_POLICYINFO_num(pol); i++) {
-                pinfo = sk_POLICYINFO_value(pol, i);
-                BIO_printf(out, "%*sPolicy: ", indent, "");
-                i2a_ASN1_OBJECT(out, pinfo->policyid);
-                BIO_puts(out, "\n");
-                if(pinfo->qualifiers)
-                         print_qualifiers(out, pinfo->qualifiers, indent + 2);
-        }
-        return 1;
-}
-
-
-int i2d_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) *a, unsigned char **pp)
-{
-
-return i2d_ASN1_SET_OF_POLICYINFO(a, pp, i2d_POLICYINFO, V_ASN1_SEQUENCE,
-                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);}
-
-STACK_OF(POLICYINFO) *CERTIFICATEPOLICIES_new(void)
-{
-        return sk_POLICYINFO_new_null();
-}
-
-void CERTIFICATEPOLICIES_free(STACK_OF(POLICYINFO) *a)
-{
-        sk_POLICYINFO_pop_free(a, POLICYINFO_free);
-}
-
-STACK_OF(POLICYINFO) *d2i_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) **a,
-                unsigned char **pp,long length)
-{
-return d2i_ASN1_SET_OF_POLICYINFO(a, pp, length, d2i_POLICYINFO,
-                         POLICYINFO_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-
-}
-
-IMPLEMENT_STACK_OF(POLICYINFO)
-IMPLEMENT_ASN1_SET_OF(POLICYINFO)
-
-int i2d_POLICYINFO(POLICYINFO *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->policyid, i2d_ASN1_OBJECT);
-        M_ASN1_I2D_len_SEQUENCE_type(POLICYQUALINFO, a->qualifiers,
-                                                         i2d_POLICYQUALINFO);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->policyid, i2d_ASN1_OBJECT);
-        M_ASN1_I2D_put_SEQUENCE_type(POLICYQUALINFO, a->qualifiers,
-                                                         i2d_POLICYQUALINFO);
-
-        M_ASN1_I2D_finish();
-}
-
-POLICYINFO *POLICYINFO_new(void)
-{
-        POLICYINFO *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, POLICYINFO);
-        ret->policyid = NULL;
-        ret->qualifiers = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_POLICYINFO_NEW);
-}
-
-POLICYINFO *d2i_POLICYINFO(POLICYINFO **a, unsigned char **pp,long length)
-{
-        M_ASN1_D2I_vars(a,POLICYINFO *,POLICYINFO_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->policyid, d2i_ASN1_OBJECT);
-        if(!M_ASN1_D2I_end_sequence()) {
-                M_ASN1_D2I_get_seq_type (POLICYQUALINFO, ret->qualifiers,
-                                 d2i_POLICYQUALINFO, POLICYQUALINFO_free);
-        }
-        M_ASN1_D2I_Finish(a, POLICYINFO_free, ASN1_F_D2I_POLICYINFO);
-}
-
-void POLICYINFO_free(POLICYINFO *a)
-{
-        if (a == NULL) return;
-        ASN1_OBJECT_free(a->policyid);
-        sk_POLICYQUALINFO_pop_free(a->qualifiers, POLICYQUALINFO_free);
-        Free (a);
-}
-
-static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
-                int indent)
-{
-        POLICYQUALINFO *qualinfo;
-        int i;
-        for(i = 0; i < sk_POLICYQUALINFO_num(quals); i++) {
-                qualinfo = sk_POLICYQUALINFO_value(quals, i);
-                switch(OBJ_obj2nid(qualinfo->pqualid))
-                {
-                        case NID_id_qt_cps:
-                        BIO_printf(out, "%*sCPS: %s\n", indent, "",
-                                                qualinfo->d.cpsuri->data);
-                        break;
-                
-                        case NID_id_qt_unotice:
-                        BIO_printf(out, "%*sUser Notice:\n", indent, "");
-                        print_notice(out, qualinfo->d.usernotice, indent + 2);
-                        break;
-
-                        default:
-                        BIO_printf(out, "%*sUnknown Qualifier: ",
-                                                         indent + 2, "");
-                        
-                        i2a_ASN1_OBJECT(out, qualinfo->pqualid);
-                        BIO_puts(out, "\n");
-                        break;
-                }
-        }
-}
-
-static void print_notice(BIO *out, USERNOTICE *notice, int indent)
-{
-        int i;
-        if(notice->noticeref) {
-                NOTICEREF *ref;
-                ref = notice->noticeref;
-                BIO_printf(out, "%*sOrganization: %s\n", indent, "",
-                                                 ref->organization->data);
-                BIO_printf(out, "%*sNumber%s: ", indent, "",
-                                 (sk_num(ref->noticenos) > 1) ? "s" : "");
-                for(i = 0; i < sk_num(ref->noticenos); i++) {
-                        ASN1_INTEGER *num;
-                        char *tmp;
-                        num = (ASN1_INTEGER *)sk_value(ref->noticenos, i);
-                        if(i) BIO_puts(out, ", ");
-                        tmp = i2s_ASN1_INTEGER(NULL, num);
-                        BIO_puts(out, tmp);
-                        Free(tmp);
-                }
-                BIO_puts(out, "\n");
-        }
-        if(notice->exptext)
-                BIO_printf(out, "%*sExplicit Text: %s\n", indent, "",
-                                                         notice->exptext->data);
-}
-                
-        
-
-int i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->pqualid, i2d_ASN1_OBJECT);
-        switch(OBJ_obj2nid(a->pqualid)) {
-                case NID_id_qt_cps:
-                M_ASN1_I2D_len(a->d.cpsuri, i2d_ASN1_IA5STRING);
-                break;
-
-                case NID_id_qt_unotice:
-                M_ASN1_I2D_len(a->d.usernotice, i2d_USERNOTICE);
-                break;
-
-                default:
-                M_ASN1_I2D_len(a->d.other, i2d_ASN1_TYPE);
-                break;
-        }
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->pqualid, i2d_ASN1_OBJECT);
-        switch(OBJ_obj2nid(a->pqualid)) {
-                case NID_id_qt_cps:
-                M_ASN1_I2D_put(a->d.cpsuri, i2d_ASN1_IA5STRING);
-                break;
-
-                case NID_id_qt_unotice:
-                M_ASN1_I2D_put(a->d.usernotice, i2d_USERNOTICE);
-                break;
-
-                default:
-                M_ASN1_I2D_put(a->d.other, i2d_ASN1_TYPE);
-                break;
-        }
-
-        M_ASN1_I2D_finish();
-}
-
-POLICYQUALINFO *POLICYQUALINFO_new(void)
-{
-        POLICYQUALINFO *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, POLICYQUALINFO);
-        ret->pqualid = NULL;
-        ret->d.other = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_POLICYQUALINFO_NEW);
-}
-
-POLICYQUALINFO *d2i_POLICYQUALINFO(POLICYQUALINFO **a, unsigned char **pp,
-                long length)
-{
-        M_ASN1_D2I_vars(a,POLICYQUALINFO *,POLICYQUALINFO_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->pqualid, d2i_ASN1_OBJECT);
-        switch(OBJ_obj2nid(ret->pqualid)) {
-                case NID_id_qt_cps:
-                M_ASN1_D2I_get(ret->d.cpsuri, d2i_ASN1_IA5STRING);
-                break;
-
-                case NID_id_qt_unotice:
-                M_ASN1_D2I_get(ret->d.usernotice, d2i_USERNOTICE);
-                break;
-
-                default:
-                M_ASN1_D2I_get(ret->d.other, d2i_ASN1_TYPE);
-                break;
-        }
-        M_ASN1_D2I_Finish(a, POLICYQUALINFO_free, ASN1_F_D2I_POLICYQUALINFO);
-}
-
-void POLICYQUALINFO_free(POLICYQUALINFO *a)
-{
-        if (a == NULL) return;
-        switch(OBJ_obj2nid(a->pqualid)) {
-                case NID_id_qt_cps:
-                ASN1_IA5STRING_free(a->d.cpsuri);
-                break;
-
-                case NID_id_qt_unotice:
-                USERNOTICE_free(a->d.usernotice);
-                break;
-
-                default:
-                ASN1_TYPE_free(a->d.other);
-                break;
-        }
-        
-        ASN1_OBJECT_free(a->pqualid);
-        Free (a);
-}
-
-int i2d_USERNOTICE(USERNOTICE *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->noticeref, i2d_NOTICEREF);
-        M_ASN1_I2D_len (a->exptext, i2d_DISPLAYTEXT);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->noticeref, i2d_NOTICEREF);
-        M_ASN1_I2D_put (a->exptext, i2d_DISPLAYTEXT);
-
-        M_ASN1_I2D_finish();
-}
-
-USERNOTICE *USERNOTICE_new(void)
-{
-        USERNOTICE *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, USERNOTICE);
-        ret->noticeref = NULL;
-        ret->exptext = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_USERNOTICE_NEW);
-}
-
-USERNOTICE *d2i_USERNOTICE(USERNOTICE **a, unsigned char **pp,long length)
-{
-        M_ASN1_D2I_vars(a,USERNOTICE *,USERNOTICE_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_opt(ret->noticeref, d2i_NOTICEREF, V_ASN1_SEQUENCE);
-        if (!M_ASN1_D2I_end_sequence()) {
-                M_ASN1_D2I_get(ret->exptext, d2i_DISPLAYTEXT);
-        }
-        M_ASN1_D2I_Finish(a, USERNOTICE_free, ASN1_F_D2I_USERNOTICE);
-}
-
-void USERNOTICE_free(USERNOTICE *a)
-{
-        if (a == NULL) return;
-        NOTICEREF_free(a->noticeref);
-        DISPLAYTEXT_free(a->exptext);
-        Free (a);
-}
-
-int i2d_NOTICEREF(NOTICEREF *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->organization, i2d_DISPLAYTEXT);
-        M_ASN1_I2D_len_SEQUENCE(a->noticenos, i2d_ASN1_INTEGER);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->organization, i2d_DISPLAYTEXT);
-        M_ASN1_I2D_put_SEQUENCE(a->noticenos, i2d_ASN1_INTEGER);
-
-        M_ASN1_I2D_finish();
-}
-
-NOTICEREF *NOTICEREF_new(void)
-{
-        NOTICEREF *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, NOTICEREF);
-        ret->organization = NULL;
-        ret->noticenos = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_NOTICEREF_NEW);
-}
-
-NOTICEREF *d2i_NOTICEREF(NOTICEREF **a, unsigned char **pp,long length)
-{
-        M_ASN1_D2I_vars(a,NOTICEREF *,NOTICEREF_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        /* This is to cope with some broken encodings that use IA5STRING for
-         * the organization field
-         */
-        M_ASN1_D2I_get_opt(ret->organization, d2i_ASN1_IA5STRING,
-                                                         V_ASN1_IA5STRING);
-        if(!ret->organization) {
-                 M_ASN1_D2I_get(ret->organization, d2i_DISPLAYTEXT);
-        }
-        M_ASN1_D2I_get_seq(ret->noticenos, d2i_ASN1_INTEGER, ASN1_STRING_free);
-        M_ASN1_D2I_Finish(a, NOTICEREF_free, ASN1_F_D2I_NOTICEREF);
-}
-
-void NOTICEREF_free(NOTICEREF *a)
-{
-        if (a == NULL) return;
-        DISPLAYTEXT_free(a->organization);
-        sk_pop_free(a->noticenos, ASN1_STRING_free);
-        Free (a);
-}
-
-IMPLEMENT_STACK_OF(POLICYQUALINFO)
-IMPLEMENT_ASN1_SET_OF(POLICYQUALINFO)
diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c
deleted file mode 100644
index 897ffb63e4..0000000000
--- a/src/lib/libcrypto/x509v3/v3_crld.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* v3_crld.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-
-static STACK_OF(CONF_VALUE) *i2v_crld(X509V3_EXT_METHOD *method,
-                STACK_OF(DIST_POINT) *crld, STACK_OF(CONF_VALUE) *extlist);
-static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-X509V3_EXT_METHOD v3_crld = {
-NID_crl_distribution_points, X509V3_EXT_MULTILINE,
-(X509V3_EXT_NEW)CRL_DIST_POINTS_new,
-(X509V3_EXT_FREE)CRL_DIST_POINTS_free,
-(X509V3_EXT_D2I)d2i_CRL_DIST_POINTS,
-(X509V3_EXT_I2D)i2d_CRL_DIST_POINTS,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_crld,
-(X509V3_EXT_V2I)v2i_crld,
-NULL, NULL, NULL
-};
-
-static STACK_OF(CONF_VALUE) *i2v_crld(X509V3_EXT_METHOD *method,
-                        STACK_OF(DIST_POINT) *crld, STACK_OF(CONF_VALUE) *exts)
-{
-        DIST_POINT *point;
-        int i;
-        for(i = 0; i < sk_DIST_POINT_num(crld); i++) {
-                point = sk_DIST_POINT_value(crld, i);
-                if(point->distpoint->fullname) {
-                        exts = i2v_GENERAL_NAMES(NULL,
-                                         point->distpoint->fullname, exts);
-                }
-                if(point->reasons) 
-                        X509V3_add_value("reasons","<UNSUPPORTED>", &exts);
-                if(point->CRLissuer)
-                        X509V3_add_value("CRLissuer","<UNSUPPORTED>", &exts);
-                if(point->distpoint->relativename)
-                        X509V3_add_value("RelativeName","<UNSUPPORTED>", &exts);
-        }
-        return exts;
-}
-
-static STACK_OF(DIST_POINT) *v2i_crld(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-        STACK_OF(DIST_POINT) *crld = NULL;
-        STACK_OF(GENERAL_NAME) *gens = NULL;
-        GENERAL_NAME *gen = NULL;
-        CONF_VALUE *cnf;
-        int i;
-        if(!(crld = sk_DIST_POINT_new(NULL))) goto merr;
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                DIST_POINT *point;
-                cnf = sk_CONF_VALUE_value(nval, i);
-                if(!(gen = v2i_GENERAL_NAME(method, ctx, cnf))) goto err; 
-                if(!(gens = GENERAL_NAMES_new())) goto merr;
-                if(!sk_GENERAL_NAME_push(gens, gen)) goto merr;
-                gen = NULL;
-                if(!(point = DIST_POINT_new())) goto merr;
-                if(!sk_DIST_POINT_push(crld, point)) {
-                        DIST_POINT_free(point);
-                        goto merr;
-                }
-                if(!(point->distpoint = DIST_POINT_NAME_new())) goto merr;
-                point->distpoint->fullname = gens;
-                gens = NULL;
-        }
-        return crld;
-
-        merr:
-        X509V3err(X509V3_F_V2I_CRLD,ERR_R_MALLOC_FAILURE);
-        err:
-        GENERAL_NAME_free(gen);
-        GENERAL_NAMES_free(gens);
-        sk_DIST_POINT_pop_free(crld, DIST_POINT_free);
-        return NULL;
-}
-
-int i2d_CRL_DIST_POINTS(STACK_OF(DIST_POINT) *a, unsigned char **pp)
-{
-
-return i2d_ASN1_SET_OF_DIST_POINT(a, pp, i2d_DIST_POINT, V_ASN1_SEQUENCE,
-                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);}
-
-STACK_OF(DIST_POINT) *CRL_DIST_POINTS_new(void)
-{
-        return sk_DIST_POINT_new_null();
-}
-
-void CRL_DIST_POINTS_free(STACK_OF(DIST_POINT) *a)
-{
-        sk_DIST_POINT_pop_free(a, DIST_POINT_free);
-}
-
-STACK_OF(DIST_POINT) *d2i_CRL_DIST_POINTS(STACK_OF(DIST_POINT) **a,
-                unsigned char **pp,long length)
-{
-return d2i_ASN1_SET_OF_DIST_POINT(a, pp, length, d2i_DIST_POINT,
-                         DIST_POINT_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-
-}
-
-IMPLEMENT_STACK_OF(DIST_POINT)
-IMPLEMENT_ASN1_SET_OF(DIST_POINT)
-
-int i2d_DIST_POINT(DIST_POINT *a, unsigned char **pp)
-{
-        int v = 0;
-        M_ASN1_I2D_vars(a);
-        /* NB: underlying type is a CHOICE so need EXPLICIT tagging */
-        M_ASN1_I2D_len_EXP_opt (a->distpoint, i2d_DIST_POINT_NAME, 0, v);
-        M_ASN1_I2D_len_IMP_opt (a->reasons, i2d_ASN1_BIT_STRING);
-        M_ASN1_I2D_len_IMP_opt (a->CRLissuer, i2d_GENERAL_NAMES);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put_EXP_opt (a->distpoint, i2d_DIST_POINT_NAME, 0, v);
-        M_ASN1_I2D_put_IMP_opt (a->reasons, i2d_ASN1_BIT_STRING, 1);
-        M_ASN1_I2D_put_IMP_opt (a->CRLissuer, i2d_GENERAL_NAMES, 2);
-
-        M_ASN1_I2D_finish();
-}
-
-DIST_POINT *DIST_POINT_new(void)
-{
-        DIST_POINT *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, DIST_POINT);
-        ret->distpoint = NULL;
-        ret->reasons = NULL;
-        ret->CRLissuer = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_DIST_POINT_NEW);
-}
-
-DIST_POINT *d2i_DIST_POINT(DIST_POINT **a, unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,DIST_POINT *,DIST_POINT_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_EXP_opt (ret->distpoint, d2i_DIST_POINT_NAME, 0);
-        M_ASN1_D2I_get_IMP_opt (ret->reasons, d2i_ASN1_BIT_STRING, 1,
-                                                        V_ASN1_BIT_STRING);
-        M_ASN1_D2I_get_IMP_opt (ret->CRLissuer, d2i_GENERAL_NAMES, 2,
-                                                        V_ASN1_SEQUENCE);
-        M_ASN1_D2I_Finish(a, DIST_POINT_free, ASN1_F_D2I_DIST_POINT);
-}
-
-void DIST_POINT_free(DIST_POINT *a)
-{
-        if (a == NULL) return;
-        DIST_POINT_NAME_free(a->distpoint);
-        ASN1_BIT_STRING_free(a->reasons);
-        sk_GENERAL_NAME_pop_free(a->CRLissuer, GENERAL_NAME_free);
-        Free ((char *)a);
-}
-
-int i2d_DIST_POINT_NAME(DIST_POINT_NAME *a, unsigned char **pp)
-{
-        int v = 0;
-        M_ASN1_I2D_vars(a);
-
-        if(a->fullname) {
-                M_ASN1_I2D_len_IMP_opt (a->fullname, i2d_GENERAL_NAMES);
-        } else {
-                M_ASN1_I2D_len_EXP_opt (a->relativename, i2d_X509_NAME, 1, v);
-        }
-
-        /* Don't want a SEQUENCE so... */
-        if(pp == NULL) return ret;
-        p = *pp;
-
-        if(a->fullname) {
-                M_ASN1_I2D_put_IMP_opt (a->fullname, i2d_GENERAL_NAMES, 0);
-        } else {
-                M_ASN1_I2D_put_EXP_opt (a->relativename, i2d_X509_NAME, 1, v);
-        }
-        M_ASN1_I2D_finish();
-}
-
-DIST_POINT_NAME *DIST_POINT_NAME_new(void)
-{
-        DIST_POINT_NAME *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, DIST_POINT_NAME);
-        ret->fullname = NULL;
-        ret->relativename = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_DIST_POINT_NAME_NEW);
-}
-
-void DIST_POINT_NAME_free(DIST_POINT_NAME *a)
-{
-        if (a == NULL) return;
-        X509_NAME_free(a->relativename);
-        sk_GENERAL_NAME_pop_free(a->fullname, GENERAL_NAME_free);
-        Free ((char *)a);
-}
-
-DIST_POINT_NAME *d2i_DIST_POINT_NAME(DIST_POINT_NAME **a, unsigned char **pp,
-             long length)
-{
-        unsigned char _tmp, tag;
-        M_ASN1_D2I_vars(a,DIST_POINT_NAME *,DIST_POINT_NAME_new);
-        M_ASN1_D2I_Init();
-        c.slen = length;
-
-        _tmp = M_ASN1_next;
-        tag = _tmp & ~V_ASN1_CONSTRUCTED;
-        
-        if(tag == (0|V_ASN1_CONTEXT_SPECIFIC)) {
-                M_ASN1_D2I_get_imp(ret->fullname, d2i_GENERAL_NAMES,
-                                                        V_ASN1_SEQUENCE);
-        } else if (tag == (1|V_ASN1_CONTEXT_SPECIFIC)) {
-                M_ASN1_D2I_get_EXP_opt (ret->relativename, d2i_X509_NAME, 1);
-        } else {
-                c.error = ASN1_R_BAD_TAG;
-                goto err;
-        }
-
-        M_ASN1_D2I_Finish(a, DIST_POINT_NAME_free, ASN1_F_D2I_DIST_POINT_NAME);
-}
diff --git a/src/lib/libcrypto/x509v3/v3_enum.c b/src/lib/libcrypto/x509v3/v3_enum.c
deleted file mode 100644
index db423548ff..0000000000
--- a/src/lib/libcrypto/x509v3/v3_enum.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* v3_enum.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/x509v3.h>
-
-static ASN1_ENUMERATED *asn1_enumerated_new(void);
-
-static ENUMERATED_NAMES crl_reasons[] = {
-{0, "Unspecified", "unspecified"},
-{1, "Key Compromise", "keyCompromise"},
-{2, "CA Compromise", "CACompromise"},
-{3, "Affiliation Changed", "affiliationChanged"},
-{4, "Superseded", "superseded"},
-{5, "Cessation Of Operation", "cessationOfOperation"},
-{6, "Certificate Hold", "certificateHold"},
-{8, "Remove From CRL", "removeFromCRL"},
-{-1, NULL, NULL}
-};
-
-X509V3_EXT_METHOD v3_crl_reason = { 
-NID_crl_reason, 0,
-(X509V3_EXT_NEW)asn1_enumerated_new,
-(X509V3_EXT_FREE)ASN1_STRING_free,
-(X509V3_EXT_D2I)d2i_ASN1_ENUMERATED,
-(X509V3_EXT_I2D)i2d_ASN1_ENUMERATED,
-(X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
-(X509V3_EXT_S2I)NULL,
-NULL, NULL, NULL, NULL, crl_reasons};
-
-
-static ASN1_ENUMERATED *asn1_enumerated_new(void)
-{
-        return ASN1_ENUMERATED_new();
-}
-
-char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method,
-             ASN1_ENUMERATED *e)
-{
-        ENUMERATED_NAMES *enam;
-        long strval;
-        strval = ASN1_ENUMERATED_get(e);
-        for(enam = method->usr_data; enam->lname; enam++) {
-                if(strval == enam->bitnum) return BUF_strdup(enam->lname);
-        }
-        return i2s_ASN1_ENUMERATED(method, e);
-}
diff --git a/src/lib/libcrypto/x509v3/v3_extku.c b/src/lib/libcrypto/x509v3/v3_extku.c
deleted file mode 100644
index e039d21cbf..0000000000
--- a/src/lib/libcrypto/x509v3/v3_extku.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* v3_extku.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static STACK_OF(ASN1_OBJECT) *v2i_ext_ku(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_ext_ku(X509V3_EXT_METHOD *method,
-                STACK_OF(ASN1_OBJECT) *eku, STACK_OF(CONF_VALUE) *extlist);
-X509V3_EXT_METHOD v3_ext_ku = {
-NID_ext_key_usage, 0,
-(X509V3_EXT_NEW)ext_ku_new,
-(X509V3_EXT_FREE)ext_ku_free,
-(X509V3_EXT_D2I)d2i_ext_ku,
-(X509V3_EXT_I2D)i2d_ext_ku,
-NULL, NULL,
-(X509V3_EXT_I2V)i2v_ext_ku,
-(X509V3_EXT_V2I)v2i_ext_ku,
-NULL,NULL,
-NULL
-};
-
-STACK_OF(ASN1_OBJECT) *ext_ku_new(void)
-{
-        return sk_ASN1_OBJECT_new_null();
-}
-
-void ext_ku_free(STACK_OF(ASN1_OBJECT) *eku)
-{
-        sk_ASN1_OBJECT_pop_free(eku, ASN1_OBJECT_free);
-        return;
-}
-
-int i2d_ext_ku(STACK_OF(ASN1_OBJECT) *a, unsigned char **pp)
-{
-        return i2d_ASN1_SET_OF_ASN1_OBJECT(a, pp, i2d_ASN1_OBJECT,
-                                V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL, IS_SEQUENCE);
-}
-
-STACK_OF(ASN1_OBJECT) *d2i_ext_ku(STACK_OF(ASN1_OBJECT) **a,
-                                        unsigned char **pp, long length)
-{
-        return d2i_ASN1_SET_OF_ASN1_OBJECT(a, pp, length, d2i_ASN1_OBJECT,
-                         ASN1_OBJECT_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-}
-
-
-
-static STACK_OF(CONF_VALUE) *i2v_ext_ku(X509V3_EXT_METHOD *method,
-                STACK_OF(ASN1_OBJECT) *eku, STACK_OF(CONF_VALUE) *ext_list)
-{
-int i;
-ASN1_OBJECT *obj;
-char obj_tmp[80];
-for(i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
-        obj = sk_ASN1_OBJECT_value(eku, i);
-        i2t_ASN1_OBJECT(obj_tmp, 80, obj);
-        X509V3_add_value(NULL, obj_tmp, &ext_list);
-}
-return ext_list;
-}
-
-static STACK_OF(ASN1_OBJECT) *v2i_ext_ku(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
-{
-STACK_OF(ASN1_OBJECT) *extku;
-char *extval;
-ASN1_OBJECT *objtmp;
-CONF_VALUE *val;
-int i;
-
-if(!(extku = sk_ASN1_OBJECT_new(NULL))) {
-        X509V3err(X509V3_F_V2I_EXT_KU,ERR_R_MALLOC_FAILURE);
-        return NULL;
-}
-
-for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-        val = sk_CONF_VALUE_value(nval, i);
-        if(val->value) extval = val->value;
-        else extval = val->name;
-        if(!(objtmp = OBJ_txt2obj(extval, 0))) {
-                sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
-                X509V3err(X509V3_F_V2I_EXT_KU,X509V3_R_INVALID_OBJECT_IDENTIFIER);
-                X509V3_conf_err(val);
-                return NULL;
-        }
-        sk_ASN1_OBJECT_push(extku, objtmp);
-}
-return extku;
-}
diff --git a/src/lib/libcrypto/x509v3/v3_genn.c b/src/lib/libcrypto/x509v3/v3_genn.c
deleted file mode 100644
index af716232f8..0000000000
--- a/src/lib/libcrypto/x509v3/v3_genn.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* v3_genn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp)
-{
-        unsigned char *p;
-        int ret;
-
-        ret = 0;
-
-        /* Save the location of initial TAG */
-        if(pp) p = *pp;
-        else p = NULL;
-
-        /* GEN_DNAME needs special treatment because of EXPLICIT tag */
-
-        if(a->type == GEN_DIRNAME) {
-                int v = 0;
-                M_ASN1_I2D_len_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v);
-                if(!p) return ret;
-                M_ASN1_I2D_put_EXP_opt(a->d.dirn, i2d_X509_NAME, 4, v);
-                *pp = p;
-                return ret;
-        }
-
-        switch(a->type) {
-
-                case GEN_OTHERNAME:
-                case GEN_X400:
-                case GEN_EDIPARTY:
-                ret = i2d_ASN1_TYPE(a->d.other, pp);
-                break;
-
-                case GEN_EMAIL:
-                case GEN_DNS:
-                case GEN_URI:
-                ret = i2d_ASN1_IA5STRING(a->d.ia5, pp);
-                break;
-
-                case GEN_IPADD:
-                ret = i2d_ASN1_OCTET_STRING(a->d.ip, pp);
-                break;
-        
-                case GEN_RID:
-                ret = i2d_ASN1_OBJECT(a->d.rid, pp);
-                break;
-        }
-        /* Replace TAG with IMPLICIT value */
-        if(p) *p = (*p & V_ASN1_CONSTRUCTED) | a->type;
-        return ret;
-}
-
-GENERAL_NAME *GENERAL_NAME_new()
-{
-        GENERAL_NAME *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, GENERAL_NAME);
-        ret->type = -1;
-        ret->d.ptr = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_GENERAL_NAME_NEW);
-}
-
-GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp,
-                                                                 long length)
-{
-        unsigned char _tmp;
-        M_ASN1_D2I_vars(a,GENERAL_NAME *,GENERAL_NAME_new);
-        M_ASN1_D2I_Init();
-        c.slen = length;
-
-        _tmp = M_ASN1_next;
-        ret->type = _tmp & ~V_ASN1_CONSTRUCTED;
-
-        switch(ret->type) {
-                /* Just put these in a "blob" for now */
-                case GEN_OTHERNAME:
-                case GEN_X400:
-                case GEN_EDIPARTY:
-                M_ASN1_D2I_get_imp(ret->d.other, d2i_ASN1_TYPE,V_ASN1_SEQUENCE);
-                break;
-
-                case GEN_EMAIL:
-                case GEN_DNS:
-                case GEN_URI:
-                M_ASN1_D2I_get_imp(ret->d.ia5, d2i_ASN1_IA5STRING,
-                                                        V_ASN1_IA5STRING);
-                break;
-
-                case GEN_DIRNAME:
-                M_ASN1_D2I_get_EXP_opt(ret->d.dirn, d2i_X509_NAME, 4);
-                break;
-
-                case GEN_IPADD:
-                M_ASN1_D2I_get_imp(ret->d.ip, d2i_ASN1_OCTET_STRING,
-                                                        V_ASN1_OCTET_STRING);
-                break;
-        
-                case GEN_RID:
-                M_ASN1_D2I_get_imp(ret->d.rid, d2i_ASN1_OBJECT,V_ASN1_OBJECT);
-                break;
-
-                default:
-                c.error = ASN1_R_BAD_TAG;
-                goto err;
-        }
-
-        c.slen = 0;
-        M_ASN1_D2I_Finish(a, GENERAL_NAME_free, ASN1_F_D2I_GENERAL_NAME);
-}
-
-void GENERAL_NAME_free(GENERAL_NAME *a)
-{
-        if (a == NULL) return;
-        switch(a->type) {
-                case GEN_OTHERNAME:
-                case GEN_X400:
-                case GEN_EDIPARTY:
-                ASN1_TYPE_free(a->d.other);
-                break;
-
-                case GEN_EMAIL:
-                case GEN_DNS:
-                case GEN_URI:
-
-                ASN1_IA5STRING_free(a->d.ia5);
-                break;
-
-                case GEN_DIRNAME:
-                X509_NAME_free(a->d.dirn);
-                break;
-
-                case GEN_IPADD:
-                ASN1_OCTET_STRING_free(a->d.ip);
-                break;
-        
-                case GEN_RID:
-                ASN1_OBJECT_free(a->d.rid);
-                break;
-
-        }
-        Free ((char *)a);
-}
-
-/* Now the GeneralNames versions: a SEQUENCE OF GeneralName These are needed as
- * an explicit functions.
- */
-
-STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new()
-{
-        return sk_GENERAL_NAME_new(NULL);
-}
-
-void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a)
-{
-        sk_GENERAL_NAME_pop_free(a, GENERAL_NAME_free);
-}
-
-STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a,
-                                         unsigned char **pp, long length)
-{
-return d2i_ASN1_SET_OF_GENERAL_NAME(a, pp, length, d2i_GENERAL_NAME,
-                         GENERAL_NAME_free, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-}
-
-int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp)
-{
-return i2d_ASN1_SET_OF_GENERAL_NAME(a, pp, i2d_GENERAL_NAME, V_ASN1_SEQUENCE,
-                                                 V_ASN1_UNIVERSAL, IS_SEQUENCE);
-}
-
-IMPLEMENT_STACK_OF(GENERAL_NAME)
-IMPLEMENT_ASN1_SET_OF(GENERAL_NAME)
-
diff --git a/src/lib/libcrypto/x509v3/v3_ia5.c b/src/lib/libcrypto/x509v3/v3_ia5.c
deleted file mode 100644
index 3446c5cd6a..0000000000
--- a/src/lib/libcrypto/x509v3/v3_ia5.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* v3_ia5.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static ASN1_IA5STRING *ia5string_new(void);
-static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-X509V3_EXT_METHOD v3_ns_ia5_list[] = { 
-EXT_IA5STRING(NID_netscape_base_url),
-EXT_IA5STRING(NID_netscape_revocation_url),
-EXT_IA5STRING(NID_netscape_ca_revocation_url),
-EXT_IA5STRING(NID_netscape_renewal_url),
-EXT_IA5STRING(NID_netscape_ca_policy_url),
-EXT_IA5STRING(NID_netscape_ssl_server_name),
-EXT_IA5STRING(NID_netscape_comment),
-EXT_END
-};
-
-
-static ASN1_IA5STRING *ia5string_new(void)
-{
-        return ASN1_IA5STRING_new();
-}
-
-static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-             ASN1_IA5STRING *ia5)
-{
-        char *tmp;
-        if(!ia5 || !ia5->length) return NULL;
-        tmp = Malloc(ia5->length + 1);
-        memcpy(tmp, ia5->data, ia5->length);
-        tmp[ia5->length] = 0;
-        return tmp;
-}
-
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, char *str)
-{
-        ASN1_IA5STRING *ia5;
-        if(!str) {
-                X509V3err(X509V3_F_S2I_ASN1_IA5STRING,X509V3_R_INVALID_NULL_ARGUMENT);
-                return NULL;
-        }
-        if(!(ia5 = ASN1_IA5STRING_new())) goto err;
-        if(!ASN1_STRING_set((ASN1_STRING *)ia5, (unsigned char*)str,
-                            strlen(str))) {
-                ASN1_IA5STRING_free(ia5);
-                goto err;
-        }
-        return ia5;
-        err:
-        X509V3err(X509V3_F_S2I_ASN1_IA5STRING,ERR_R_MALLOC_FAILURE);
-        return NULL;
-}
-
diff --git a/src/lib/libcrypto/x509v3/v3_int.c b/src/lib/libcrypto/x509v3/v3_int.c
deleted file mode 100644
index 637dd5e128..0000000000
--- a/src/lib/libcrypto/x509v3/v3_int.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* v3_int.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/x509v3.h>
-
-static ASN1_INTEGER *asn1_integer_new(void);
-
-X509V3_EXT_METHOD v3_crl_num = { 
-NID_crl_number, 0,
-(X509V3_EXT_NEW)asn1_integer_new,
-(X509V3_EXT_FREE)ASN1_STRING_free,
-(X509V3_EXT_D2I)d2i_ASN1_INTEGER,
-(X509V3_EXT_I2D)i2d_ASN1_INTEGER,
-(X509V3_EXT_I2S)i2s_ASN1_INTEGER,
-(X509V3_EXT_S2I)NULL,
-NULL, NULL, NULL, NULL, NULL};
-
-
-static ASN1_INTEGER *asn1_integer_new(void)
-{
-        return ASN1_INTEGER_new();
-}
diff --git a/src/lib/libcrypto/x509v3/v3_lib.c b/src/lib/libcrypto/x509v3/v3_lib.c
deleted file mode 100644
index a0aa5de794..0000000000
--- a/src/lib/libcrypto/x509v3/v3_lib.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* v3_lib.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* X509 v3 extension utilities */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static STACK *ext_list = NULL;
-
-static int ext_cmp(X509V3_EXT_METHOD **a, X509V3_EXT_METHOD **b);
-static void ext_list_free(X509V3_EXT_METHOD *ext);
-
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext)
-{
-        if(!ext_list && !(ext_list = sk_new(ext_cmp))) {
-                X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        if(!sk_push(ext_list, (char *)ext)) {
-                X509V3err(X509V3_F_X509V3_EXT_ADD,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        return 1;
-}
-
-static int ext_cmp(X509V3_EXT_METHOD **a, X509V3_EXT_METHOD **b)
-{
-        return ((*a)->ext_nid - (*b)->ext_nid);
-}
-
-X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid)
-{
-        X509V3_EXT_METHOD tmp;
-        int idx;
-        tmp.ext_nid = nid;
-        if(!ext_list || (tmp.ext_nid < 0) ) return NULL;
-        idx = sk_find(ext_list, (char *)&tmp);
-        if(idx == -1) return NULL;
-        return (X509V3_EXT_METHOD *)sk_value(ext_list, idx);
-}
-
-X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext)
-{
-        int nid;
-        if((nid = OBJ_obj2nid(ext->object)) == NID_undef) return NULL;
-        return X509V3_EXT_get_nid(nid);
-}
-
-
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist)
-{
-        for(;extlist->ext_nid!=-1;extlist++) 
-                        if(!X509V3_EXT_add(extlist)) return 0;
-        return 1;
-}
-
-int X509V3_EXT_add_alias(int nid_to, int nid_from)
-{
-        X509V3_EXT_METHOD *ext, *tmpext;
-        if(!(ext = X509V3_EXT_get_nid(nid_from))) {
-                X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,X509V3_R_EXTENSION_NOT_FOUND);
-                return 0;
-        }
-        if(!(tmpext = (X509V3_EXT_METHOD *)Malloc(sizeof(X509V3_EXT_METHOD)))) {
-                X509V3err(X509V3_F_X509V3_EXT_ADD_ALIAS,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
-        *tmpext = *ext;
-        tmpext->ext_nid = nid_to;
-        tmpext->ext_flags |= X509V3_EXT_DYNAMIC;
-        return 1;
-}
-
-void X509V3_EXT_cleanup(void)
-{
-        sk_pop_free(ext_list, ext_list_free);
-        ext_list = NULL;
-}
-
-static void ext_list_free(X509V3_EXT_METHOD *ext)
-{
-        if(ext->ext_flags & X509V3_EXT_DYNAMIC) Free(ext);
-}
-
-extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
-extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet;
-extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;
-
-extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_cpols, v3_crld;
-
-int X509V3_add_standard_extensions(void)
-{
-        X509V3_EXT_add_list(v3_ns_ia5_list);
-        X509V3_EXT_add_list(v3_alt);
-        X509V3_EXT_add(&v3_bcons);
-        X509V3_EXT_add(&v3_nscert);
-        X509V3_EXT_add(&v3_key_usage);
-        X509V3_EXT_add(&v3_ext_ku);
-        X509V3_EXT_add(&v3_skey_id);
-        X509V3_EXT_add(&v3_akey_id);
-        X509V3_EXT_add(&v3_pkey_usage_period);
-        X509V3_EXT_add(&v3_crl_num);
-        X509V3_EXT_add(&v3_sxnet);
-        X509V3_EXT_add(&v3_crl_reason);
-        X509V3_EXT_add(&v3_cpols);
-        X509V3_EXT_add(&v3_crld);
-        return 1;
-}
-
-/* Return an extension internal structure */
-
-void *X509V3_EXT_d2i(X509_EXTENSION *ext)
-{
-        X509V3_EXT_METHOD *method;
-        unsigned char *p;
-        if(!(method = X509V3_EXT_get(ext)) || !method->d2i) return NULL;
-        p = ext->value->data;
-        return method->d2i(NULL, &p, ext->value->length);
-}
-
diff --git a/src/lib/libcrypto/x509v3/v3_pku.c b/src/lib/libcrypto/x509v3/v3_pku.c
deleted file mode 100644
index c13e7d8f45..0000000000
--- a/src/lib/libcrypto/x509v3/v3_pku.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* v3_pku.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-
-static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *usage, BIO *out, int indent);
-/*
-static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
-*/
-X509V3_EXT_METHOD v3_pkey_usage_period = {
-NID_private_key_usage_period, 0,
-(X509V3_EXT_NEW)PKEY_USAGE_PERIOD_new,
-(X509V3_EXT_FREE)PKEY_USAGE_PERIOD_free,
-(X509V3_EXT_D2I)d2i_PKEY_USAGE_PERIOD,
-(X509V3_EXT_I2D)i2d_PKEY_USAGE_PERIOD,
-NULL, NULL, NULL, NULL,
-(X509V3_EXT_I2R)i2r_PKEY_USAGE_PERIOD, NULL,
-NULL
-};
-
-int i2d_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len_IMP_opt (a->notBefore, i2d_ASN1_GENERALIZEDTIME);
-        M_ASN1_I2D_len_IMP_opt (a->notAfter, i2d_ASN1_GENERALIZEDTIME);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put_IMP_opt (a->notBefore, i2d_ASN1_GENERALIZEDTIME, 0);
-        M_ASN1_I2D_put_IMP_opt (a->notAfter, i2d_ASN1_GENERALIZEDTIME, 1);
-
-        M_ASN1_I2D_finish();
-}
-
-PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(void)
-{
-        PKEY_USAGE_PERIOD *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, PKEY_USAGE_PERIOD);
-        ret->notBefore = NULL;
-        ret->notAfter = NULL;
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_PKEY_USAGE_PERIOD_NEW);
-}
-
-PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD **a,
-             unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,PKEY_USAGE_PERIOD *,PKEY_USAGE_PERIOD_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_IMP_opt (ret->notBefore, d2i_ASN1_GENERALIZEDTIME, 0,
-                                                        V_ASN1_GENERALIZEDTIME);
-        M_ASN1_D2I_get_IMP_opt (ret->notAfter, d2i_ASN1_GENERALIZEDTIME, 1,
-                                                        V_ASN1_GENERALIZEDTIME);
-        M_ASN1_D2I_Finish(a, PKEY_USAGE_PERIOD_free, ASN1_F_D2I_PKEY_USAGE_PERIOD);
-}
-
-void PKEY_USAGE_PERIOD_free(PKEY_USAGE_PERIOD *a)
-{
-        if (a == NULL) return;
-        ASN1_GENERALIZEDTIME_free(a->notBefore);
-        ASN1_GENERALIZEDTIME_free(a->notAfter);
-        Free ((char *)a);
-}
-
-static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
-             PKEY_USAGE_PERIOD *usage, BIO *out, int indent)
-{
-        BIO_printf(out, "%*s", indent, "");
-        if(usage->notBefore) {
-                BIO_write(out, "Not Before: ", 12);
-                ASN1_GENERALIZEDTIME_print(out, usage->notBefore);
-                if(usage->notAfter) BIO_write(out, ", ", 2);
-        }
-        if(usage->notAfter) {
-                BIO_write(out, "Not After: ", 11);
-                ASN1_GENERALIZEDTIME_print(out, usage->notAfter);
-        }
-        return 1;
-}
-
-/*
-static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-STACK_OF(CONF_VALUE) *values;
-{
-return NULL;
-}
-*/
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
deleted file mode 100644
index dc20c6bdba..0000000000
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* v3_prn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* X509 v3 extension utilities */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-/* Extension printing routines */
-
-/* Print out a name+value stack */
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
-{
-        int i;
-        CONF_VALUE *nval;
-        if(!val) return;
-        if(!ml || !sk_CONF_VALUE_num(val)) {
-                BIO_printf(out, "%*s", indent, "");
-                if(!sk_CONF_VALUE_num(val)) BIO_puts(out, "<EMPTY>\n");
-        }
-        for(i = 0; i < sk_CONF_VALUE_num(val); i++) {
-                if(ml) BIO_printf(out, "%*s", indent, "");
-                else if(i > 0) BIO_printf(out, ", ");
-                nval = sk_CONF_VALUE_value(val, i);
-                if(!nval->name) BIO_puts(out, nval->value);
-                else if(!nval->value) BIO_puts(out, nval->name);
-                else BIO_printf(out, "%s:%s", nval->name, nval->value);
-                if(ml) BIO_puts(out, "\n");
-        }
-}
-
-/* Main routine: print out a general extension */
-
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
-{
-        char *ext_str = NULL, *value = NULL;
-        unsigned char *p;
-        X509V3_EXT_METHOD *method;      
-        STACK_OF(CONF_VALUE) *nval = NULL;
-        int ok = 1;
-        if(!(method = X509V3_EXT_get(ext))) return 0;
-        p = ext->value->data;
-        if(!(ext_str = method->d2i(NULL, &p, ext->value->length))) return 0;
-        if(method->i2s) {
-                if(!(value = method->i2s(method, ext_str))) {
-                        ok = 0;
-                        goto err;
-                }
-                BIO_printf(out, "%*s%s", indent, "", value);
-        } else if(method->i2v) {
-                if(!(nval = method->i2v(method, ext_str, NULL))) {
-                        ok = 0;
-                        goto err;
-                }
-                X509V3_EXT_val_prn(out, nval, indent,
-                                 method->ext_flags & X509V3_EXT_MULTILINE);
-        } else if(method->i2r) {
-                if(!method->i2r(method, ext_str, out, indent)) ok = 0;
-        } else ok = 0;
-
-        err:
-                sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-                if(value) Free(value);
-                method->ext_free(ext_str);
-                return ok;
-}
-
-#ifndef NO_FP_API
-int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
-{
-        BIO *bio_tmp;
-        int ret;
-        if(!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE))) return 0;
-        ret = X509V3_EXT_print(bio_tmp, ext, flag, indent);
-        BIO_free(bio_tmp);
-        return ret;
-}
-#endif
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c
deleted file mode 100644
index fb3e36014d..0000000000
--- a/src/lib/libcrypto/x509v3/v3_skey.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* v3_skey.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/x509v3.h>
-
-static ASN1_OCTET_STRING *octet_string_new(void);
-static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-X509V3_EXT_METHOD v3_skey_id = { 
-NID_subject_key_identifier, 0,
-(X509V3_EXT_NEW)octet_string_new,
-(X509V3_EXT_FREE)ASN1_STRING_free,
-(X509V3_EXT_D2I)d2i_ASN1_OCTET_STRING,
-(X509V3_EXT_I2D)i2d_ASN1_OCTET_STRING,
-(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
-(X509V3_EXT_S2I)s2i_skey_id,
-NULL, NULL, NULL, NULL, NULL};
-
-
-static ASN1_OCTET_STRING *octet_string_new(void)
-{
-        return ASN1_OCTET_STRING_new();
-}
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-             ASN1_OCTET_STRING *oct)
-{
-        return hex_to_string(oct->data, oct->length);
-}
-
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, char *str)
-{
-        ASN1_OCTET_STRING *oct;
-        long length;
-
-        if(!(oct = ASN1_OCTET_STRING_new())) {
-                X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        if(!(oct->data = string_to_hex(str, &length))) {
-                ASN1_OCTET_STRING_free(oct);
-                return NULL;
-        }
-
-        oct->length = length;
-
-        return oct;
-
-}
-
-static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
-             X509V3_CTX *ctx, char *str)
-{
-        ASN1_OCTET_STRING *oct;
-        ASN1_BIT_STRING *pk;
-        unsigned char pkey_dig[EVP_MAX_MD_SIZE];
-        EVP_MD_CTX md;
-        unsigned int diglen;
-
-        if(strcmp(str, "hash")) return s2i_ASN1_OCTET_STRING(method, ctx, str);
-
-        if(!(oct = ASN1_OCTET_STRING_new())) {
-                X509V3err(X509V3_F_S2I_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-
-        if(ctx && (ctx->flags == CTX_TEST)) return oct;
-
-        if(!ctx || (!ctx->subject_req && !ctx->subject_cert)) {
-                X509V3err(X509V3_F_S2I_ASN1_SKEY_ID,X509V3_R_NO_PUBLIC_KEY);
-                goto err;
-        }
-
-        if(ctx->subject_req) 
-                pk = ctx->subject_req->req_info->pubkey->public_key;
-        else pk = ctx->subject_cert->cert_info->key->public_key;
-
-        if(!pk) {
-                X509V3err(X509V3_F_S2I_ASN1_SKEY_ID,X509V3_R_NO_PUBLIC_KEY);
-                goto err;
-        }
-
-        EVP_DigestInit(&md, EVP_sha1());
-        EVP_DigestUpdate(&md, pk->data, pk->length);
-        EVP_DigestFinal(&md, pkey_dig, &diglen);
-
-        if(!ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
-                X509V3err(X509V3_F_S2I_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-
-        return oct;
-        
-        err:
-        ASN1_OCTET_STRING_free(oct);
-        return NULL;
-}
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
deleted file mode 100644
index 0687bb4e3d..0000000000
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* v3_sxnet.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509v3.h>
-
-/* Support for Thawte strong extranet extension */
-
-#define SXNET_TEST
-
-static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent);
-#ifdef SXNET_TEST
-static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                                                STACK_OF(CONF_VALUE) *nval);
-#endif
-X509V3_EXT_METHOD v3_sxnet = {
-NID_sxnet, X509V3_EXT_MULTILINE,
-(X509V3_EXT_NEW)SXNET_new,
-(X509V3_EXT_FREE)SXNET_free,
-(X509V3_EXT_D2I)d2i_SXNET,
-(X509V3_EXT_I2D)i2d_SXNET,
-NULL, NULL,
-NULL, 
-#ifdef SXNET_TEST
-(X509V3_EXT_V2I)sxnet_v2i,
-#else
-NULL,
-#endif
-(X509V3_EXT_I2R)sxnet_i2r,
-NULL,
-NULL
-};
-
-
-int i2d_SXNET(SXNET *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len_SEQUENCE_type (SXNETID, a->ids, i2d_SXNETID);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put_SEQUENCE_type (SXNETID, a->ids, i2d_SXNETID);
-
-        M_ASN1_I2D_finish();
-}
-
-SXNET *SXNET_new(void)
-{
-        SXNET *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, SXNET);
-        M_ASN1_New(ret->version,ASN1_INTEGER_new);
-        M_ASN1_New(ret->ids,sk_SXNETID_new_null);
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_SXNET_NEW);
-}
-
-SXNET *d2i_SXNET(SXNET **a, unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,SXNET *,SXNET_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get (ret->version, d2i_ASN1_INTEGER);
-        M_ASN1_D2I_get_seq_type (SXNETID, ret->ids, d2i_SXNETID, SXNETID_free);
-        M_ASN1_D2I_Finish(a, SXNET_free, ASN1_F_D2I_SXNET);
-}
-
-void SXNET_free(SXNET *a)
-{
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->version);
-        sk_SXNETID_pop_free(a->ids, SXNETID_free);
-        Free (a);
-}
-
-int i2d_SXNETID(SXNETID *a, unsigned char **pp)
-{
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len (a->zone, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len (a->user, i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put (a->zone, i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put (a->user, i2d_ASN1_OCTET_STRING);
-
-        M_ASN1_I2D_finish();
-}
-
-SXNETID *SXNETID_new(void)
-{
-        SXNETID *ret=NULL;
-        ASN1_CTX c;
-        M_ASN1_New_Malloc(ret, SXNETID);
-        ret->zone = NULL;
-        M_ASN1_New(ret->user,ASN1_OCTET_STRING_new);
-        return (ret);
-        M_ASN1_New_Error(ASN1_F_SXNETID_NEW);
-}
-
-SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length)
-{
-        M_ASN1_D2I_vars(a,SXNETID *,SXNETID_new);
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->zone, d2i_ASN1_INTEGER);
-        M_ASN1_D2I_get(ret->user, d2i_ASN1_OCTET_STRING);
-        M_ASN1_D2I_Finish(a, SXNETID_free, ASN1_F_D2I_SXNETID);
-}
-
-void SXNETID_free(SXNETID *a)
-{
-        if (a == NULL) return;
-        ASN1_INTEGER_free(a->zone);
-        ASN1_OCTET_STRING_free(a->user);
-        Free (a);
-}
-
-static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
-             int indent)
-{
-        long v;
-        char *tmp;
-        SXNETID *id;
-        int i;
-        v = ASN1_INTEGER_get(sx->version);
-        BIO_printf(out, "%*sVersion: %d (0x%X)", indent, "", v + 1, v);
-        for(i = 0; i < sk_SXNETID_num(sx->ids); i++) {
-                id = sk_SXNETID_value(sx->ids, i);
-                tmp = i2s_ASN1_INTEGER(NULL, id->zone);
-                BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
-                Free(tmp);
-                ASN1_OCTET_STRING_print(out, id->user);
-        }
-        return 1;
-}
-
-#ifdef SXNET_TEST
-
-/* NBB: this is used for testing only. It should *not* be used for anything
- * else because it will just take static IDs from the configuration file and
- * they should really be separate values for each user.
- */
-
-
-static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-             STACK_OF(CONF_VALUE) *nval)
-{
-        CONF_VALUE *cnf;
-        SXNET *sx = NULL;
-        int i;
-        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-                cnf = sk_CONF_VALUE_value(nval, i);
-                if(!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1))
-                                                                 return NULL;
-        }
-        return sx;
-}
-                
-        
-#endif
-
-/* Strong Extranet utility functions */
-
-/* Add an id given the zone as an ASCII number */
-
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user,
-             int userlen)
-{
-        ASN1_INTEGER *izone = NULL;
-        if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
-                X509V3err(X509V3_F_SXNET_ADD_ASC,X509V3_R_ERROR_CONVERTING_ZONE);
-                return 0;
-        }
-        return SXNET_add_id_INTEGER(psx, izone, user, userlen);
-}
-
-/* Add an id given the zone as an unsigned long */
-
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
-             int userlen)
-{
-        ASN1_INTEGER *izone = NULL;
-        if(!(izone = ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_ULONG,ERR_R_MALLOC_FAILURE);
-                ASN1_INTEGER_free(izone);
-                return 0;
-        }
-        return SXNET_add_id_INTEGER(psx, izone, user, userlen);
-        
-}
-
-/* Add an id given the zone as an ASN1_INTEGER.
- * Note this version uses the passed integer and doesn't make a copy so don't
- * free it up afterwards.
- */
-
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user,
-             int userlen)
-{
-        SXNET *sx = NULL;
-        SXNETID *id = NULL;
-        if(!psx || !zone || !user) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_INVALID_NULL_ARGUMENT);
-                return 0;
-        }
-        if(userlen == -1) userlen = strlen(user);
-        if(userlen > 64) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_USER_TOO_LONG);
-                return 0;
-        }
-        if(!*psx) {
-                if(!(sx = SXNET_new())) goto err;
-                if(!ASN1_INTEGER_set(sx->version, 0)) goto err;
-                *psx = sx;
-        } else sx = *psx;
-        if(SXNET_get_id_INTEGER(sx, zone)) {
-                X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,X509V3_R_DUPLICATE_ZONE_ID);
-                return 0;
-        }
-
-        if(!(id = SXNETID_new())) goto err;
-        if(userlen == -1) userlen = strlen(user);
-                
-        if(!ASN1_OCTET_STRING_set(id->user, user, userlen)) goto err;
-        if(!sk_SXNETID_push(sx->ids, id)) goto err;
-        id->zone = zone;
-        return 1;
-        
-        err:
-        X509V3err(X509V3_F_SXNET_ADD_ID_INTEGER,ERR_R_MALLOC_FAILURE);
-        SXNETID_free(id);
-        SXNET_free(sx);
-        *psx = NULL;
-        return 0;
-}
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone)
-{
-        ASN1_INTEGER *izone = NULL;
-        ASN1_OCTET_STRING *oct;
-        if(!(izone = s2i_ASN1_INTEGER(NULL, zone))) {
-                X509V3err(X509V3_F_SXNET_GET_ID_ASC,X509V3_R_ERROR_CONVERTING_ZONE);
-                return NULL;
-        }
-        oct = SXNET_get_id_INTEGER(sx, izone);
-        ASN1_INTEGER_free(izone);
-        return oct;
-}
-
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone)
-{
-        ASN1_INTEGER *izone = NULL;
-        ASN1_OCTET_STRING *oct;
-        if(!(izone = ASN1_INTEGER_new()) || !ASN1_INTEGER_set(izone, lzone)) {
-                X509V3err(X509V3_F_SXNET_GET_ID_ULONG,ERR_R_MALLOC_FAILURE);
-                ASN1_INTEGER_free(izone);
-                return NULL;
-        }
-        oct = SXNET_get_id_INTEGER(sx, izone);
-        ASN1_INTEGER_free(izone);
-        return oct;
-}
-
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
-{
-        SXNETID *id;
-        int i;
-        for(i = 0; i < sk_SXNETID_num(sx->ids); i++) {
-                id = sk_SXNETID_value(sx->ids, i);
-                if(!ASN1_INTEGER_cmp(id->zone, zone)) return id->user;
-        }
-        return NULL;
-}
-
-IMPLEMENT_STACK_OF(SXNETID)
-IMPLEMENT_ASN1_SET_OF(SXNETID)
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c
deleted file mode 100644
index 40f71c71b4..0000000000
--- a/src/lib/libcrypto/x509v3/v3_utl.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/* v3_utl.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* X509 v3 extension utilities */
-
-
-#include <stdio.h>
-#include <ctype.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/x509v3.h>
-
-static char *strip_spaces(char *name);
-
-/* Add a CONF_VALUE name value pair to stack */
-
-int X509V3_add_value(const char *name, const char *value,
-                                                STACK_OF(CONF_VALUE) **extlist)
-{
-        CONF_VALUE *vtmp = NULL;
-        char *tname = NULL, *tvalue = NULL;
-        if(name && !(tname = BUF_strdup(name))) goto err;
-        if(value && !(tvalue = BUF_strdup(value))) goto err;;
-        if(!(vtmp = (CONF_VALUE *)Malloc(sizeof(CONF_VALUE)))) goto err;
-        if(!*extlist && !(*extlist = sk_CONF_VALUE_new(NULL))) goto err;
-        vtmp->section = NULL;
-        vtmp->name = tname;
-        vtmp->value = tvalue;
-        if(!sk_CONF_VALUE_push(*extlist, vtmp)) goto err;
-        return 1;
-        err:
-        X509V3err(X509V3_F_X509V3_ADD_VALUE,ERR_R_MALLOC_FAILURE);
-        if(vtmp) Free(vtmp);
-        if(tname) Free(tname);
-        if(tvalue) Free(tvalue);
-        return 0;
-}
-
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist)
-    {
-    return X509V3_add_value(name,(const char *)value,extlist);
-    }
-
-/* Free function for STACK_OF(CONF_VALUE) */
-
-void X509V3_conf_free(CONF_VALUE *conf)
-{
-        if(!conf) return;
-        if(conf->name) Free(conf->name);
-        if(conf->value) Free(conf->value);
-        if(conf->section) Free(conf->section);
-        Free((char *)conf);
-}
-
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist)
-{
-        if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist);
-        return X509V3_add_value(name, "FALSE", extlist);
-}
-
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist)
-{
-        if(asn1_bool) return X509V3_add_value(name, "TRUE", extlist);
-        return 1;
-}
-
-
-char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *a)
-{
-        BIGNUM *bntmp = NULL;
-        char *strtmp = NULL;
-        if(!a) return NULL;
-        if(!(bntmp = ASN1_ENUMERATED_to_BN(a, NULL)) ||
-            !(strtmp = BN_bn2dec(bntmp)) )
-                X509V3err(X509V3_F_I2S_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
-        BN_free(bntmp);
-        return strtmp;
-}
-
-char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *method, ASN1_INTEGER *a)
-{
-        BIGNUM *bntmp = NULL;
-        char *strtmp = NULL;
-        if(!a) return NULL;
-        if(!(bntmp = ASN1_INTEGER_to_BN(a, NULL)) ||
-            !(strtmp = BN_bn2dec(bntmp)) )
-                X509V3err(X509V3_F_I2S_ASN1_INTEGER,ERR_R_MALLOC_FAILURE);
-        BN_free(bntmp);
-        return strtmp;
-}
-
-ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, char *value)
-{
-        BIGNUM *bn = NULL;
-        ASN1_INTEGER *aint;
-        bn = BN_new();
-        if(!value) {
-                X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_INVALID_NULL_VALUE);
-                return 0;
-        }
-        if(!BN_dec2bn(&bn, value)) {
-                X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_BN_DEC2BN_ERROR);
-                return 0;
-        }
-
-        if(!(aint = BN_to_ASN1_INTEGER(bn, NULL))) {
-                X509V3err(X509V3_F_S2I_ASN1_INTEGER,X509V3_R_BN_TO_ASN1_INTEGER_ERROR);
-                return 0;
-        }
-        BN_free(bn);
-        return aint;
-}
-
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-             STACK_OF(CONF_VALUE) **extlist)
-{
-        char *strtmp;
-        int ret;
-        if(!aint) return 1;
-        if(!(strtmp = i2s_ASN1_INTEGER(NULL, aint))) return 0;
-        ret = X509V3_add_value(name, strtmp, extlist);
-        Free(strtmp);
-        return ret;
-}
-
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool)
-{
-        char *btmp;
-        if(!(btmp = value->value)) goto err;
-        if(!strcmp(btmp, "TRUE") || !strcmp(btmp, "true")
-                 || !strcmp(btmp, "Y") || !strcmp(btmp, "y")
-                || !strcmp(btmp, "YES") || !strcmp(btmp, "yes")) {
-                *asn1_bool = 0xff;
-                return 1;
-        } else if(!strcmp(btmp, "FALSE") || !strcmp(btmp, "false")
-                 || !strcmp(btmp, "N") || !strcmp(btmp, "n")
-                || !strcmp(btmp, "NO") || !strcmp(btmp, "no")) {
-                *asn1_bool = 0;
-                return 1;
-        }
-        err:
-        X509V3err(X509V3_F_X509V3_GET_VALUE_BOOL,X509V3_R_INVALID_BOOLEAN_STRING);
-        X509V3_conf_err(value);
-        return 0;
-}
-
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint)
-{
-        ASN1_INTEGER *itmp;
-        if(!(itmp = s2i_ASN1_INTEGER(NULL, value->value))) {
-                X509V3_conf_err(value);
-                return 0;
-        }
-        *aint = itmp;
-        return 1;
-}
-
-#define HDR_NAME        1
-#define HDR_VALUE       2
-
-/*#define DEBUG*/
-
-STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line)
-{
-        char *p, *q, c;
-        char *ntmp, *vtmp;
-        STACK_OF(CONF_VALUE) *values = NULL;
-        char *linebuf;
-        int state;
-        /* We are going to modify the line so copy it first */
-        linebuf = BUF_strdup(line);
-        state = HDR_NAME;
-        ntmp = NULL;
-        /* Go through all characters */
-        for(p = linebuf, q = linebuf; (c = *p) && (c!='\r') && (c!='\n'); p++) {
-
-                switch(state) {
-                        case HDR_NAME:
-                        if(c == ':') {
-                                state = HDR_VALUE;
-                                *p = 0;
-                                ntmp = strip_spaces(q);
-                                if(!ntmp) {
-                                        X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME);
-                                        goto err;
-                                }
-                                q = p + 1;
-                        } else if(c == ',') {
-                                *p = 0;
-                                ntmp = strip_spaces(q);
-                                q = p + 1;
-#ifdef DEBUG
-                                printf("%s\n", ntmp);
-#endif
-                                if(!ntmp) {
-                                        X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME);
-                                        goto err;
-                                }
-                                X509V3_add_value(ntmp, NULL, &values);
-                        }
-                        break ;
-
-                        case HDR_VALUE:
-                        if(c == ',') {
-                                state = HDR_NAME;
-                                *p = 0;
-                                vtmp = strip_spaces(q);
-#ifdef DEBUG
-                                printf("%s\n", ntmp);
-#endif
-                                if(!vtmp) {
-                                        X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_VALUE);
-                                        goto err;
-                                }
-                                X509V3_add_value(ntmp, vtmp, &values);
-                                ntmp = NULL;
-                                q = p + 1;
-                        }
-
-                }
-        }
-
-        if(state == HDR_VALUE) {
-                vtmp = strip_spaces(q);
-#ifdef DEBUG
-                printf("%s=%s\n", ntmp, vtmp);
-#endif
-                if(!vtmp) {
-                        X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_VALUE);
-                        goto err;
-                }
-                X509V3_add_value(ntmp, vtmp, &values);
-        } else {
-                ntmp = strip_spaces(q);
-#ifdef DEBUG
-                printf("%s\n", ntmp);
-#endif
-                if(!ntmp) {
-                        X509V3err(X509V3_F_X509V3_PARSE_LIST, X509V3_R_INVALID_NULL_NAME);
-                        goto err;
-                }
-                X509V3_add_value(ntmp, NULL, &values);
-        }
-Free(linebuf);
-return values;
-
-err:
-Free(linebuf);
-sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
-return NULL;
-
-}
-
-/* Delete leading and trailing spaces from a string */
-static char *strip_spaces(char *name)
-{
-        char *p, *q;
-        /* Skip over leading spaces */
-        p = name;
-        while(*p && isspace((unsigned char)*p)) p++;
-        if(!*p) return NULL;
-        q = p + strlen(p) - 1;
-        while((q != p) && isspace((unsigned char)*q)) q--;
-        if(p != q) q[1] = 0;
-        if(!*p) return NULL;
-        return p;
-}
-
-/* hex string utilities */
-
-/* Given a buffer of length 'len' return a Malloc'ed string with its
- * hex representation
- */
-
-char *hex_to_string(unsigned char *buffer, long len)
-{
-        char *tmp, *q;
-        unsigned char *p;
-        int i;
-        static char hexdig[] = "0123456789ABCDEF";
-        if(!buffer || !len) return NULL;
-        if(!(tmp = Malloc(len * 3 + 1))) {
-                X509V3err(X509V3_F_HEX_TO_STRING,ERR_R_MALLOC_FAILURE);
-                return NULL;
-        }
-        q = tmp;
-        for(i = 0, p = buffer; i < len; i++,p++) {
-                *q++ = hexdig[(*p >> 4) & 0xf];
-                *q++ = hexdig[*p & 0xf];
-                *q++ = ':';
-        }
-        q[-1] = 0;
-        return tmp;
-}
-
-/* Give a string of hex digits convert to
- * a buffer
- */
-
-unsigned char *string_to_hex(char *str, long *len)
-{
-        unsigned char *hexbuf, *q;
-        unsigned char ch, cl, *p;
-        if(!str) {
-                X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_INVALID_NULL_ARGUMENT);
-                return NULL;
-        }
-        if(!(hexbuf = Malloc(strlen(str) >> 1))) goto err;
-        for(p = (unsigned char *)str, q = hexbuf; *p;) {
-                ch = *p++;
-                if(ch == ':') continue;
-                cl = *p++;
-                if(!cl) {
-                        X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ODD_NUMBER_OF_DIGITS);
-                        Free(hexbuf);
-                        return NULL;
-                }
-                if(isupper(ch)) ch = tolower(ch);
-                if(isupper(cl)) cl = tolower(cl);
-
-                if((ch >= '0') && (ch <= '9')) ch -= '0';
-                else if ((ch >= 'a') && (ch <= 'f')) ch -= 'a' - 10;
-                else goto badhex;
-
-                if((cl >= '0') && (cl <= '9')) cl -= '0';
-                else if ((cl >= 'a') && (cl <= 'f')) cl -= 'a' - 10;
-                else goto badhex;
-
-                *q++ = (ch << 4) | cl;
-        }
-
-        if(len) *len = q - hexbuf;
-
-        return hexbuf;
-
-        err:
-        if(hexbuf) Free(hexbuf);
-        X509V3err(X509V3_F_STRING_TO_HEX,ERR_R_MALLOC_FAILURE);
-        return NULL;
-
-        badhex:
-        Free(hexbuf);
-        X509V3err(X509V3_F_STRING_TO_HEX,X509V3_R_ILLEGAL_HEX_DIGIT);
-        return NULL;
-
-}
-
-/* V2I name comparison function: returns zero if 'name' matches
- * cmp or cmp.*
- */
-
-int name_cmp(const char *name, const char *cmp)
-{
-        int len, ret;
-        char c;
-        len = strlen(cmp);
-        if((ret = strncmp(name, cmp, len))) return ret;
-        c = name[len];
-        if(!c || (c=='.')) return 0;
-        return 1;
-}
diff --git a/src/lib/libcrypto/x509v3/v3err.c b/src/lib/libcrypto/x509v3/v3err.c
deleted file mode 100644
index 50efa8d99d..0000000000
--- a/src/lib/libcrypto/x509v3/v3err.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* crypto/x509v3/v3err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA X509V3_str_functs[]=
-        {
-{ERR_PACK(0,X509V3_F_COPY_EMAIL,0),     "COPY_EMAIL"},
-{ERR_PACK(0,X509V3_F_COPY_ISSUER,0),    "COPY_ISSUER"},
-{ERR_PACK(0,X509V3_F_DO_EXT_CONF,0),    "DO_EXT_CONF"},
-{ERR_PACK(0,X509V3_F_DO_EXT_I2D,0),     "DO_EXT_I2D"},
-{ERR_PACK(0,X509V3_F_HEX_TO_STRING,0),  "hex_to_string"},
-{ERR_PACK(0,X509V3_F_I2S_ASN1_ENUMERATED,0),    "i2s_ASN1_ENUMERATED"},
-{ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0),       "i2s_ASN1_INTEGER"},
-{ERR_PACK(0,X509V3_F_NOTICE_SECTION,0), "NOTICE_SECTION"},
-{ERR_PACK(0,X509V3_F_NREF_NOS,0),       "NREF_NOS"},
-{ERR_PACK(0,X509V3_F_POLICY_SECTION,0), "POLICY_SECTION"},
-{ERR_PACK(0,X509V3_F_R2I_CERTPOL,0),    "R2I_CERTPOL"},
-{ERR_PACK(0,X509V3_F_S2I_ASN1_IA5STRING,0),     "S2I_ASN1_IA5STRING"},
-{ERR_PACK(0,X509V3_F_S2I_ASN1_INTEGER,0),       "s2i_ASN1_INTEGER"},
-{ERR_PACK(0,X509V3_F_S2I_ASN1_OCTET_STRING,0),  "s2i_ASN1_OCTET_STRING"},
-{ERR_PACK(0,X509V3_F_S2I_ASN1_SKEY_ID,0),       "S2I_ASN1_SKEY_ID"},
-{ERR_PACK(0,X509V3_F_S2I_S2I_SKEY_ID,0),        "S2I_S2I_SKEY_ID"},
-{ERR_PACK(0,X509V3_F_STRING_TO_HEX,0),  "string_to_hex"},
-{ERR_PACK(0,X509V3_F_SXNET_ADD_ASC,0),  "SXNET_ADD_ASC"},
-{ERR_PACK(0,X509V3_F_SXNET_ADD_ID_INTEGER,0),   "SXNET_add_id_INTEGER"},
-{ERR_PACK(0,X509V3_F_SXNET_ADD_ID_ULONG,0),     "SXNET_add_id_ulong"},
-{ERR_PACK(0,X509V3_F_SXNET_GET_ID_ASC,0),       "SXNET_get_id_asc"},
-{ERR_PACK(0,X509V3_F_SXNET_GET_ID_ULONG,0),     "SXNET_get_id_ulong"},
-{ERR_PACK(0,X509V3_F_V2I_ASN1_BIT_STRING,0),    "V2I_ASN1_BIT_STRING"},
-{ERR_PACK(0,X509V3_F_V2I_AUTHORITY_KEYID,0),    "V2I_AUTHORITY_KEYID"},
-{ERR_PACK(0,X509V3_F_V2I_BASIC_CONSTRAINTS,0),  "V2I_BASIC_CONSTRAINTS"},
-{ERR_PACK(0,X509V3_F_V2I_CRLD,0),       "V2I_CRLD"},
-{ERR_PACK(0,X509V3_F_V2I_EXT_KU,0),     "V2I_EXT_KU"},
-{ERR_PACK(0,X509V3_F_V2I_GENERAL_NAME,0),       "v2i_GENERAL_NAME"},
-{ERR_PACK(0,X509V3_F_V2I_GENERAL_NAMES,0),      "v2i_GENERAL_NAMES"},
-{ERR_PACK(0,X509V3_F_V3_GENERIC_EXTENSION,0),   "V3_GENERIC_EXTENSION"},
-{ERR_PACK(0,X509V3_F_X509V3_ADD_VALUE,0),       "X509V3_add_value"},
-{ERR_PACK(0,X509V3_F_X509V3_EXT_ADD,0), "X509V3_EXT_add"},
-{ERR_PACK(0,X509V3_F_X509V3_EXT_ADD_ALIAS,0),   "X509V3_EXT_add_alias"},
-{ERR_PACK(0,X509V3_F_X509V3_EXT_CONF,0),        "X509V3_EXT_conf"},
-{ERR_PACK(0,X509V3_F_X509V3_EXT_I2D,0), "X509V3_EXT_i2d"},
-{ERR_PACK(0,X509V3_F_X509V3_GET_VALUE_BOOL,0),  "X509V3_get_value_bool"},
-{ERR_PACK(0,X509V3_F_X509V3_PARSE_LIST,0),      "X509V3_parse_list"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA X509V3_str_reasons[]=
-        {
-{X509V3_R_BAD_IP_ADDRESS                 ,"bad ip address"},
-{X509V3_R_BAD_OBJECT                     ,"bad object"},
-{X509V3_R_BN_DEC2BN_ERROR                ,"bn dec2bn error"},
-{X509V3_R_BN_TO_ASN1_INTEGER_ERROR       ,"bn to asn1 integer error"},
-{X509V3_R_DUPLICATE_ZONE_ID              ,"duplicate zone id"},
-{X509V3_R_ERROR_CONVERTING_ZONE          ,"error converting zone"},
-{X509V3_R_ERROR_IN_EXTENSION             ,"error in extension"},
-{X509V3_R_EXPECTED_A_SECTION_NAME        ,"expected a section name"},
-{X509V3_R_EXTENSION_NAME_ERROR           ,"extension name error"},
-{X509V3_R_EXTENSION_NOT_FOUND            ,"extension not found"},
-{X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED,"extension setting not supported"},
-{X509V3_R_EXTENSION_VALUE_ERROR          ,"extension value error"},
-{X509V3_R_ILLEGAL_HEX_DIGIT              ,"illegal hex digit"},
-{X509V3_R_INVALID_BOOLEAN_STRING         ,"invalid boolean string"},
-{X509V3_R_INVALID_EXTENSION_STRING       ,"invalid extension string"},
-{X509V3_R_INVALID_NAME                   ,"invalid name"},
-{X509V3_R_INVALID_NULL_ARGUMENT          ,"invalid null argument"},
-{X509V3_R_INVALID_NULL_NAME              ,"invalid null name"},
-{X509V3_R_INVALID_NULL_VALUE             ,"invalid null value"},
-{X509V3_R_INVALID_NUMBER                 ,"invalid number"},
-{X509V3_R_INVALID_NUMBERS                ,"invalid numbers"},
-{X509V3_R_INVALID_OBJECT_IDENTIFIER      ,"invalid object identifier"},
-{X509V3_R_INVALID_OPTION                 ,"invalid option"},
-{X509V3_R_INVALID_POLICY_IDENTIFIER      ,"invalid policy identifier"},
-{X509V3_R_INVALID_SECTION                ,"invalid section"},
-{X509V3_R_ISSUER_DECODE_ERROR            ,"issuer decode error"},
-{X509V3_R_MISSING_VALUE                  ,"missing value"},
-{X509V3_R_NEED_ORGANIZATION_AND_NUMBERS  ,"need organization and numbers"},
-{X509V3_R_NO_CONFIG_DATABASE             ,"no config database"},
-{X509V3_R_NO_ISSUER_CERTIFICATE          ,"no issuer certificate"},
-{X509V3_R_NO_ISSUER_DETAILS              ,"no issuer details"},
-{X509V3_R_NO_POLICY_IDENTIFIER           ,"no policy identifier"},
-{X509V3_R_NO_PUBLIC_KEY                  ,"no public key"},
-{X509V3_R_NO_SUBJECT_DETAILS             ,"no subject details"},
-{X509V3_R_ODD_NUMBER_OF_DIGITS           ,"odd number of digits"},
-{X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS   ,"unable to get issuer details"},
-{X509V3_R_UNABLE_TO_GET_ISSUER_KEYID     ,"unable to get issuer keyid"},
-{X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT    ,"unknown bit string argument"},
-{X509V3_R_UNKNOWN_EXTENSION              ,"unknown extension"},
-{X509V3_R_UNKNOWN_EXTENSION_NAME         ,"unknown extension name"},
-{X509V3_R_UNKNOWN_OPTION                 ,"unknown option"},
-{X509V3_R_UNSUPPORTED_OPTION             ,"unsupported option"},
-{X509V3_R_USER_TOO_LONG                  ,"user too long"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_X509V3_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_X509V3,X509V3_str_functs);
-                ERR_load_strings(ERR_LIB_X509V3,X509V3_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h
deleted file mode 100644
index 4eb04a5a89..0000000000
--- a/src/lib/libcrypto/x509v3/x509v3.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/* x509v3.h */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_X509V3_H
-#define HEADER_X509V3_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/conf.h>
-
-/* Forward reference */
-struct v3_ext_method;
-struct v3_ext_ctx;
-
-/* Useful typedefs */
-
-typedef void * (*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE)(void *);
-typedef void * (*X509V3_EXT_D2I)(void *, unsigned char ** , long);
-typedef int (*X509V3_EXT_I2D)(void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) * (*X509V3_EXT_I2V)(struct v3_ext_method *method, void *ext, STACK_OF(CONF_VALUE) *extlist);
-typedef void * (*X509V3_EXT_V2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, STACK_OF(CONF_VALUE) *values);
-typedef char * (*X509V3_EXT_I2S)(struct v3_ext_method *method, void *ext);
-typedef void * (*X509V3_EXT_S2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str);
-typedef int (*X509V3_EXT_I2R)(struct v3_ext_method *method, void *ext, BIO *out, int indent);
-typedef void * (*X509V3_EXT_R2I)(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str);
-
-/* V3 extension structure */
-
-struct v3_ext_method {
-int ext_nid;
-int ext_flags;
-X509V3_EXT_NEW ext_new;
-X509V3_EXT_FREE ext_free;
-X509V3_EXT_D2I d2i;
-X509V3_EXT_I2D i2d;
-
-/* The following pair is used for string extensions */
-X509V3_EXT_I2S i2s;
-X509V3_EXT_S2I s2i;
-
-/* The following pair is used for multi-valued extensions */
-X509V3_EXT_I2V i2v;
-X509V3_EXT_V2I v2i;
-
-/* The following are used for raw extensions */
-X509V3_EXT_I2R i2r;
-X509V3_EXT_R2I r2i;
-
-void *usr_data; /* Any extension specific data */
-};
-
-typedef struct X509V3_CONF_METHOD_st {
-char * (*get_string)(void *db, char *section, char *value);
-STACK_OF(CONF_VALUE) * (*get_section)(void *db, char *section);
-void (*free_string)(void *db, char * string);
-void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section);
-} X509V3_CONF_METHOD;
-
-/* Context specific info */
-struct v3_ext_ctx {
-#define CTX_TEST 0x1
-int flags;
-X509 *issuer_cert;
-X509 *subject_cert;
-X509_REQ *subject_req;
-X509_CRL *crl;
-X509V3_CONF_METHOD *db_meth;
-void *db;
-/* Maybe more here */
-};
-
-typedef struct v3_ext_method X509V3_EXT_METHOD;
-typedef struct v3_ext_ctx X509V3_CTX;
-
-/* ext_flags values */
-#define X509V3_EXT_DYNAMIC      0x1
-#define X509V3_EXT_CTX_DEP      0x2
-#define X509V3_EXT_MULTILINE    0x4
-
-typedef struct BIT_STRING_BITNAME_st {
-int bitnum;
-const char *lname;
-const char *sname;
-} BIT_STRING_BITNAME;
-
-typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
-
-typedef struct BASIC_CONSTRAINTS_st {
-int ca;
-ASN1_INTEGER *pathlen;
-} BASIC_CONSTRAINTS;
-
-
-typedef struct PKEY_USAGE_PERIOD_st {
-ASN1_GENERALIZEDTIME *notBefore;
-ASN1_GENERALIZEDTIME *notAfter;
-} PKEY_USAGE_PERIOD;
-
-typedef struct GENERAL_NAME_st {
-
-#define GEN_OTHERNAME   (0|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_EMAIL       (1|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_DNS         (2|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_X400        (3|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_DIRNAME     (4|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_EDIPARTY    (5|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_URI         (6|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_IPADD       (7|V_ASN1_CONTEXT_SPECIFIC)
-#define GEN_RID         (8|V_ASN1_CONTEXT_SPECIFIC)
-
-int type;
-union {
-        char *ptr;
-        ASN1_IA5STRING *ia5;/* rfc822Name, dNSName, uniformResourceIdentifier */
-        ASN1_OCTET_STRING *ip; /* iPAddress */
-        X509_NAME *dirn;                /* dirn */
-        ASN1_OBJECT *rid; /* registeredID */
-        ASN1_TYPE *other; /* otherName, ediPartyName, x400Address */
-} d;
-} GENERAL_NAME;
-
-DECLARE_STACK_OF(GENERAL_NAME)
-DECLARE_ASN1_SET_OF(GENERAL_NAME)
-
-typedef struct DIST_POINT_NAME_st {
-/* NB: this is a CHOICE type and only one of these should be set */
-STACK_OF(GENERAL_NAME) *fullname;
-X509_NAME *relativename;
-} DIST_POINT_NAME;
-
-typedef struct DIST_POINT_st {
-DIST_POINT_NAME *distpoint;
-ASN1_BIT_STRING *reasons;
-STACK_OF(GENERAL_NAME) *CRLissuer;
-} DIST_POINT;
-
-DECLARE_STACK_OF(DIST_POINT)
-DECLARE_ASN1_SET_OF(DIST_POINT)
-
-typedef struct AUTHORITY_KEYID_st {
-ASN1_OCTET_STRING *keyid;
-STACK_OF(GENERAL_NAME) *issuer;
-ASN1_INTEGER *serial;
-} AUTHORITY_KEYID;
-
-/* Strong extranet structures */
-
-typedef struct SXNET_ID_st {
-        ASN1_INTEGER *zone;
-        ASN1_OCTET_STRING *user;
-} SXNETID;
-
-DECLARE_STACK_OF(SXNETID)
-DECLARE_ASN1_SET_OF(SXNETID)
-
-typedef struct SXNET_st {
-        ASN1_INTEGER *version;
-        STACK_OF(SXNETID) *ids;
-} SXNET;
-
-typedef struct NOTICEREF_st {
-        ASN1_STRING *organization;
-        STACK *noticenos;
-} NOTICEREF;
-
-typedef struct USERNOTICE_st {
-        NOTICEREF *noticeref;
-        ASN1_STRING *exptext;
-} USERNOTICE;
-
-typedef struct POLICYQUALINFO_st {
-        ASN1_OBJECT *pqualid;
-        union {
-                ASN1_IA5STRING *cpsuri;
-                USERNOTICE *usernotice;
-                ASN1_TYPE *other;
-        } d;
-} POLICYQUALINFO;
-
-DECLARE_STACK_OF(POLICYQUALINFO)
-DECLARE_ASN1_SET_OF(POLICYQUALINFO)
-
-typedef struct POLICYINFO_st {
-        ASN1_OBJECT *policyid;
-        STACK_OF(POLICYQUALINFO) *qualifiers;
-} POLICYINFO;
-
-DECLARE_STACK_OF(POLICYINFO)
-DECLARE_ASN1_SET_OF(POLICYINFO)
-
-#define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
-
-#define X509V3_set_ctx_test(ctx) \
-                        X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
-#define X509V3_set_ctx_nodb(ctx) ctx->db = NULL;
-
-#define EXT_BITSTRING(nid, table) { nid, 0, \
-                        (X509V3_EXT_NEW)asn1_bit_string_new, \
-                        (X509V3_EXT_FREE)ASN1_STRING_free, \
-                        (X509V3_EXT_D2I)d2i_ASN1_BIT_STRING, \
-                        (X509V3_EXT_I2D)i2d_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-                        (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        (char *)table}
-
-#define EXT_IA5STRING(nid) { nid, 0, \
-                        (X509V3_EXT_NEW)ia5string_new, \
-                        (X509V3_EXT_FREE)ASN1_STRING_free, \
-                        (X509V3_EXT_D2I)d2i_ASN1_IA5STRING, \
-                        (X509V3_EXT_I2D)i2d_ASN1_IA5STRING, \
-                        (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-                        NULL, NULL, NULL, NULL, \
-                        NULL}
-
-#define EXT_END { -1, 0, NULL, NULL, NULL, NULL, NULL, NULL, \
-                         NULL, NULL, NULL, NULL, \
-                         NULL}
-
-void ERR_load_X509V3_strings(void);
-int i2d_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS *a, unsigned char **pp);
-BASIC_CONSTRAINTS *d2i_BASIC_CONSTRAINTS(BASIC_CONSTRAINTS **a, unsigned char **pp, long length);
-BASIC_CONSTRAINTS *BASIC_CONSTRAINTS_new(void);
-void BASIC_CONSTRAINTS_free(BASIC_CONSTRAINTS *a);
-
-int i2d_GENERAL_NAME(GENERAL_NAME *a, unsigned char **pp);
-GENERAL_NAME *d2i_GENERAL_NAME(GENERAL_NAME **a, unsigned char **pp, long length);
-GENERAL_NAME *GENERAL_NAME_new(void);
-void GENERAL_NAME_free(GENERAL_NAME *a);
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);
-
-int i2d_SXNET(SXNET *a, unsigned char **pp);
-SXNET *d2i_SXNET(SXNET **a, unsigned char **pp, long length);
-SXNET *SXNET_new(void);
-void SXNET_free(SXNET *a);
-
-int i2d_SXNETID(SXNETID *a, unsigned char **pp);
-SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length);
-SXNETID *SXNETID_new(void);
-void SXNETID_free(SXNETID *a);
-
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen); 
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen); 
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user, int userlen); 
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
-
-int i2d_AUTHORITY_KEYID(AUTHORITY_KEYID *a, unsigned char **pp);
-AUTHORITY_KEYID *d2i_AUTHORITY_KEYID(AUTHORITY_KEYID **a, unsigned char **pp, long length);
-AUTHORITY_KEYID *AUTHORITY_KEYID_new(void);
-void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a);
-
-int i2d_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD *a, unsigned char **pp);
-PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD(PKEY_USAGE_PERIOD **a, unsigned char **pp, long length);
-PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new(void);
-void PKEY_USAGE_PERIOD_free(PKEY_USAGE_PERIOD *a);
-
-STACK_OF(GENERAL_NAME) *GENERAL_NAMES_new(void);
-void GENERAL_NAMES_free(STACK_OF(GENERAL_NAME) *a);
-STACK_OF(GENERAL_NAME) *d2i_GENERAL_NAMES(STACK_OF(GENERAL_NAME) **a, unsigned char **pp, long length);
-int i2d_GENERAL_NAMES(STACK_OF(GENERAL_NAME) *a, unsigned char **pp);
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                STACK_OF(GENERAL_NAME) *gen, STACK_OF(CONF_VALUE) *extlist);
-STACK_OF(GENERAL_NAME) *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5);
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-
-int i2d_ext_ku(STACK_OF(ASN1_OBJECT) *a, unsigned char **pp);
-STACK_OF(ASN1_OBJECT) *d2i_ext_ku(STACK_OF(ASN1_OBJECT) **a,
-                                        unsigned char **pp, long length);
-void ext_ku_free(STACK_OF(ASN1_OBJECT) *a);
-STACK_OF(ASN1_OBJECT) *ext_ku_new(void);
-
-int i2d_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) *a, unsigned char **pp);
-STACK_OF(POLICYINFO) *CERTIFICATEPOLICIES_new(void);
-void CERTIFICATEPOLICIES_free(STACK_OF(POLICYINFO) *a);
-STACK_OF(POLICYINFO) *d2i_CERTIFICATEPOLICIES(STACK_OF(POLICYINFO) **a, unsigned char **pp, long length);
-
-int i2d_POLICYINFO(POLICYINFO *a, unsigned char **pp);
-POLICYINFO *POLICYINFO_new(void);
-POLICYINFO *d2i_POLICYINFO(POLICYINFO **a, unsigned char **pp, long length);
-void POLICYINFO_free(POLICYINFO *a);
-
-int i2d_POLICYQUALINFO(POLICYQUALINFO *a, unsigned char **pp);
-POLICYQUALINFO *POLICYQUALINFO_new(void);
-POLICYQUALINFO *d2i_POLICYQUALINFO(POLICYQUALINFO **a, unsigned char **pp,
-                                                                 long length);
-void POLICYQUALINFO_free(POLICYQUALINFO *a);
-
-int i2d_USERNOTICE(USERNOTICE *a, unsigned char **pp);
-USERNOTICE *USERNOTICE_new(void);
-USERNOTICE *d2i_USERNOTICE(USERNOTICE **a, unsigned char **pp, long length);
-void USERNOTICE_free(USERNOTICE *a);
-
-int i2d_NOTICEREF(NOTICEREF *a, unsigned char **pp);
-NOTICEREF *NOTICEREF_new(void);
-NOTICEREF *d2i_NOTICEREF(NOTICEREF **a, unsigned char **pp, long length);
-void NOTICEREF_free(NOTICEREF *a);
-
-int i2d_CRL_DIST_POINTS(STACK_OF(DIST_POINT) *a, unsigned char **pp);
-STACK_OF(DIST_POINT) *CRL_DIST_POINTS_new(void);
-void CRL_DIST_POINTS_free(STACK_OF(DIST_POINT) *a);
-STACK_OF(DIST_POINT) *d2i_CRL_DIST_POINTS(STACK_OF(DIST_POINT) **a,
-                unsigned char **pp,long length);
-
-int i2d_DIST_POINT(DIST_POINT *a, unsigned char **pp);
-DIST_POINT *DIST_POINT_new(void);
-DIST_POINT *d2i_DIST_POINT(DIST_POINT **a, unsigned char **pp, long length);
-void DIST_POINT_free(DIST_POINT *a);
-
-int i2d_DIST_POINT_NAME(DIST_POINT_NAME *a, unsigned char **pp);
-DIST_POINT_NAME *DIST_POINT_NAME_new(void);
-void DIST_POINT_NAME_free(DIST_POINT_NAME *a);
-DIST_POINT_NAME *d2i_DIST_POINT_NAME(DIST_POINT_NAME **a, unsigned char **pp,
-             long length);
-
-#ifdef HEADER_CONF_H
-GENERAL_NAME *v2i_GENERAL_NAME(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, CONF_VALUE *cnf);
-void X509V3_conf_free(CONF_VALUE *val);
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH *conf, X509V3_CTX *ctx, int ext_nid, char *value);
-X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value);
-int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509 *cert);
-int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section, X509_CRL *crl);
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash);
-#endif
-
-char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
-STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section);
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                                 X509_REQ *req, X509_CRL *crl, int flags);
-
-int X509V3_add_value(const char *name, const char *value,
-                                                STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                                                STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-                                                STACK_OF(CONF_VALUE) **extlist);
-char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
-ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-void X509V3_EXT_cleanup(void);
-
-X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
-X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
-int X509V3_add_standard_extensions(void);
-STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line);
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-
-char *hex_to_string(unsigned char *buffer, long len);
-unsigned char *string_to_hex(char *str, long *len);
-int name_cmp(const char *name, const char *cmp);
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                                                                 int ml);
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent);
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* Error codes for the X509V3 functions. */
-
-/* Function codes. */
-#define X509V3_F_COPY_EMAIL                              122
-#define X509V3_F_COPY_ISSUER                             123
-#define X509V3_F_DO_EXT_CONF                             124
-#define X509V3_F_DO_EXT_I2D                              135
-#define X509V3_F_HEX_TO_STRING                           111
-#define X509V3_F_I2S_ASN1_ENUMERATED                     121
-#define X509V3_F_I2S_ASN1_INTEGER                        120
-#define X509V3_F_NOTICE_SECTION                          132
-#define X509V3_F_NREF_NOS                                133
-#define X509V3_F_POLICY_SECTION                          131
-#define X509V3_F_R2I_CERTPOL                             130
-#define X509V3_F_S2I_ASN1_IA5STRING                      100
-#define X509V3_F_S2I_ASN1_INTEGER                        108
-#define X509V3_F_S2I_ASN1_OCTET_STRING                   112
-#define X509V3_F_S2I_ASN1_SKEY_ID                        114
-#define X509V3_F_S2I_S2I_SKEY_ID                         115
-#define X509V3_F_STRING_TO_HEX                           113
-#define X509V3_F_SXNET_ADD_ASC                           125
-#define X509V3_F_SXNET_ADD_ID_INTEGER                    126
-#define X509V3_F_SXNET_ADD_ID_ULONG                      127
-#define X509V3_F_SXNET_GET_ID_ASC                        128
-#define X509V3_F_SXNET_GET_ID_ULONG                      129
-#define X509V3_F_V2I_ASN1_BIT_STRING                     101
-#define X509V3_F_V2I_AUTHORITY_KEYID                     119
-#define X509V3_F_V2I_BASIC_CONSTRAINTS                   102
-#define X509V3_F_V2I_CRLD                                134
-#define X509V3_F_V2I_EXT_KU                              103
-#define X509V3_F_V2I_GENERAL_NAME                        117
-#define X509V3_F_V2I_GENERAL_NAMES                       118
-#define X509V3_F_V3_GENERIC_EXTENSION                    116
-#define X509V3_F_X509V3_ADD_VALUE                        105
-#define X509V3_F_X509V3_EXT_ADD                          104
-#define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
-#define X509V3_F_X509V3_EXT_CONF                         107
-#define X509V3_F_X509V3_EXT_I2D                          136
-#define X509V3_F_X509V3_GET_VALUE_BOOL                   110
-#define X509V3_F_X509V3_PARSE_LIST                       109
-
-/* Reason codes. */
-#define X509V3_R_BAD_IP_ADDRESS                          118
-#define X509V3_R_BAD_OBJECT                              119
-#define X509V3_R_BN_DEC2BN_ERROR                         100
-#define X509V3_R_BN_TO_ASN1_INTEGER_ERROR                101
-#define X509V3_R_DUPLICATE_ZONE_ID                       133
-#define X509V3_R_ERROR_CONVERTING_ZONE                   131
-#define X509V3_R_ERROR_IN_EXTENSION                      128
-#define X509V3_R_EXPECTED_A_SECTION_NAME                 137
-#define X509V3_R_EXTENSION_NAME_ERROR                    115
-#define X509V3_R_EXTENSION_NOT_FOUND                     102
-#define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED         103
-#define X509V3_R_EXTENSION_VALUE_ERROR                   116
-#define X509V3_R_ILLEGAL_HEX_DIGIT                       113
-#define X509V3_R_INVALID_BOOLEAN_STRING                  104
-#define X509V3_R_INVALID_EXTENSION_STRING                105
-#define X509V3_R_INVALID_NAME                            106
-#define X509V3_R_INVALID_NULL_ARGUMENT                   107
-#define X509V3_R_INVALID_NULL_NAME                       108
-#define X509V3_R_INVALID_NULL_VALUE                      109
-#define X509V3_R_INVALID_NUMBER                          140
-#define X509V3_R_INVALID_NUMBERS                         141
-#define X509V3_R_INVALID_OBJECT_IDENTIFIER               110
-#define X509V3_R_INVALID_OPTION                          138
-#define X509V3_R_INVALID_POLICY_IDENTIFIER               134
-#define X509V3_R_INVALID_SECTION                         135
-#define X509V3_R_ISSUER_DECODE_ERROR                     126
-#define X509V3_R_MISSING_VALUE                           124
-#define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS           142
-#define X509V3_R_NO_CONFIG_DATABASE                      136
-#define X509V3_R_NO_ISSUER_CERTIFICATE                   121
-#define X509V3_R_NO_ISSUER_DETAILS                       127
-#define X509V3_R_NO_POLICY_IDENTIFIER                    139
-#define X509V3_R_NO_PUBLIC_KEY                           114
-#define X509V3_R_NO_SUBJECT_DETAILS                      125
-#define X509V3_R_ODD_NUMBER_OF_DIGITS                    112
-#define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS            122
-#define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID              123
-#define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT             111
-#define X509V3_R_UNKNOWN_EXTENSION                       129
-#define X509V3_R_UNKNOWN_EXTENSION_NAME                  130
-#define X509V3_R_UNKNOWN_OPTION                          120
-#define X509V3_R_UNSUPPORTED_OPTION                      117
-#define X509V3_R_USER_TOO_LONG                           132
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libssl/LICENSE b/src/lib/libssl/LICENSE
deleted file mode 100644
index b9e18d5e7b..0000000000
--- a/src/lib/libssl/LICENSE
+++ /dev/null
@@ -1,127 +0,0 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* 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.]
- */
-
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
deleted file mode 100644
index f62cde4e5d..0000000000
--- a/src/lib/libssl/bio_ssl.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/* ssl/bio_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>
-#include <errno.h>
-#include <openssl/crypto.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-static int ssl_write(BIO *h,char *buf,int num);
-static int ssl_read(BIO *h,char *buf,int size);
-static int ssl_puts(BIO *h,char *str);
-static long ssl_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int ssl_new(BIO *h);
-static int ssl_free(BIO *data);
-typedef struct bio_ssl_st
-        {
-        SSL *ssl; /* The ssl handle :-) */
-        /* re-negotiate every time the total number of bytes is this size */
-        int num_renegotiates;
-        unsigned long renegotiate_count;
-        unsigned long byte_count;
-        unsigned long renegotiate_timeout;
-        unsigned long last_time;
-        } BIO_SSL;
-
-static BIO_METHOD methods_sslp=
-        {
-        BIO_TYPE_SSL,"ssl",
-        ssl_write,
-        ssl_read,
-        ssl_puts,
-        NULL, /* ssl_gets, */
-        ssl_ctrl,
-        ssl_new,
-        ssl_free,
-        };
-
-BIO_METHOD *BIO_f_ssl(void)
-        {
-        return(&methods_sslp);
-        }
-
-static int ssl_new(BIO *bi)
-        {
-        BIO_SSL *bs;
-
-        bs=(BIO_SSL *)Malloc(sizeof(BIO_SSL));
-        if (bs == NULL)
-                {
-                BIOerr(BIO_F_SSL_NEW,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        memset(bs,0,sizeof(BIO_SSL));
-        bi->init=0;
-        bi->ptr=(char *)bs;
-        bi->flags=0;
-        return(1);
-        }
-
-static int ssl_free(BIO *a)
-        {
-        BIO_SSL *bs;
-
-        if (a == NULL) return(0);
-        bs=(BIO_SSL *)a->ptr;
-        if (bs->ssl != NULL) SSL_shutdown(bs->ssl);
-        if (a->shutdown)
-                {
-                if (a->init && (bs->ssl != NULL))
-                        SSL_free(bs->ssl);
-                a->init=0;
-                a->flags=0;
-                }
-        if (a->ptr != NULL)
-                Free(a->ptr);
-        return(1);
-        }
-        
-static int ssl_read(BIO *b, char *out, int outl)
-        {
-        int ret=1;
-        BIO_SSL *sb;
-        SSL *ssl;
-        int retry_reason=0;
-        int r=0;
-
-        if (out == NULL) return(0);
-        sb=(BIO_SSL *)b->ptr;
-        ssl=sb->ssl;
-
-        BIO_clear_retry_flags(b);
-
-#if 0
-        if (!SSL_is_init_finished(ssl))
-                {
-/*              ret=SSL_do_handshake(ssl); */
-                if (ret > 0)
-                        {
-
-                        outflags=(BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY);
-                        ret= -1;
-                        goto end;
-                        }
-                }
-#endif
-/*      if (ret > 0) */
-        ret=SSL_read(ssl,out,outl);
-
-        switch (SSL_get_error(ssl,ret))
-                {
-        case SSL_ERROR_NONE:
-                if (ret <= 0) break;
-                if (sb->renegotiate_count > 0)
-                        {
-                        sb->byte_count+=ret;
-                        if (sb->byte_count > sb->renegotiate_count)
-                                {
-                                sb->byte_count=0;
-                                sb->num_renegotiates++;
-                                SSL_renegotiate(ssl);
-                                r=1;
-                                }
-                        }
-                if ((sb->renegotiate_timeout > 0) && (!r))
-                        {
-                        unsigned long tm;
-
-                        tm=(unsigned long)time(NULL);
-                        if (tm > sb->last_time+sb->renegotiate_timeout)
-                                {
-                                sb->last_time=tm;
-                                sb->num_renegotiates++;
-                                SSL_renegotiate(ssl);
-                                }
-                        }
-
-                break;
-        case SSL_ERROR_WANT_READ:
-                BIO_set_retry_read(b);
-                break;
-        case SSL_ERROR_WANT_WRITE:
-                BIO_set_retry_write(b);
-                break;
-        case SSL_ERROR_WANT_X509_LOOKUP:
-                BIO_set_retry_special(b);
-                retry_reason=BIO_RR_SSL_X509_LOOKUP;
-                break;
-        case SSL_ERROR_WANT_CONNECT:
-                BIO_set_retry_special(b);
-                retry_reason=BIO_RR_CONNECT;
-                break;
-        case SSL_ERROR_SYSCALL:
-        case SSL_ERROR_SSL:
-        case SSL_ERROR_ZERO_RETURN:
-        default:
-                break;
-                }
-
-        b->retry_reason=retry_reason;
-        return(ret);
-        }
-
-static int ssl_write(BIO *b, char *out, int outl)
-        {
-        int ret,r=0;
-        int retry_reason=0;
-        SSL *ssl;
-        BIO_SSL *bs;
-
-        if (out == NULL) return(0);
-        bs=(BIO_SSL *)b->ptr;
-        ssl=bs->ssl;
-
-        BIO_clear_retry_flags(b);
-
-/*      ret=SSL_do_handshake(ssl);
-        if (ret > 0) */
-        ret=SSL_write(ssl,out,outl);
-
-        switch (SSL_get_error(ssl,ret))
-                {
-        case SSL_ERROR_NONE:
-                if (ret <= 0) break;
-                if (bs->renegotiate_count > 0)
-                        {
-                        bs->byte_count+=ret;
-                        if (bs->byte_count > bs->renegotiate_count)
-                                {
-                                bs->byte_count=0;
-                                bs->num_renegotiates++;
-                                SSL_renegotiate(ssl);
-                                r=1;
-                                }
-                        }
-                if ((bs->renegotiate_timeout > 0) && (!r))
-                        {
-                        unsigned long tm;
-
-                        tm=(unsigned long)time(NULL);
-                        if (tm > bs->last_time+bs->renegotiate_timeout)
-                                {
-                                bs->last_time=tm;
-                                bs->num_renegotiates++;
-                                SSL_renegotiate(ssl);
-                                }
-                        }
-                break;
-        case SSL_ERROR_WANT_WRITE:
-                BIO_set_retry_write(b);
-                break;
-        case SSL_ERROR_WANT_READ:
-                BIO_set_retry_read(b);
-                break;
-        case SSL_ERROR_WANT_X509_LOOKUP:
-                BIO_set_retry_special(b);
-                retry_reason=BIO_RR_SSL_X509_LOOKUP;
-                break;
-        case SSL_ERROR_WANT_CONNECT:
-                BIO_set_retry_special(b);
-                retry_reason=BIO_RR_CONNECT;
-        case SSL_ERROR_SYSCALL:
-        case SSL_ERROR_SSL:
-        default:
-                break;
-                }
-
-        b->retry_reason=retry_reason;
-        return(ret);
-        }
-
-static long ssl_ctrl(BIO *b, int cmd, long num, char *ptr)
-        {
-        SSL **sslp,*ssl;
-        BIO_SSL *bs;
-        BIO *dbio,*bio;
-        long ret=1;
-
-        bs=(BIO_SSL *)b->ptr;
-        ssl=bs->ssl;
-        if ((ssl == NULL)  && (cmd != BIO_C_SET_SSL))
-                return(0);
-        switch (cmd)
-                {
-        case BIO_CTRL_RESET:
-                SSL_shutdown(ssl);
-
-                if (ssl->handshake_func == ssl->method->ssl_connect)
-                        SSL_set_connect_state(ssl);
-                else if (ssl->handshake_func == ssl->method->ssl_accept)
-                        SSL_set_accept_state(ssl);
-
-                SSL_clear(ssl);
-
-                if (b->next_bio != NULL)
-                        ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-                else if (ssl->rbio != NULL)
-                        ret=BIO_ctrl(ssl->rbio,cmd,num,ptr);
-                else
-                        ret=1;
-                break;
-        case BIO_CTRL_INFO:
-                ret=0;
-                break;
-        case BIO_C_SSL_MODE:
-                if (num) /* client mode */
-                        SSL_set_connect_state(ssl);
-                else
-                        SSL_set_accept_state(ssl);
-                break;
-        case BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT:
-                ret=bs->renegotiate_timeout;
-                if (num < 60) num=5;
-                bs->renegotiate_timeout=(unsigned long)num;
-                bs->last_time=(unsigned long)time(NULL);
-                break;
-        case BIO_C_SET_SSL_RENEGOTIATE_BYTES:
-                ret=bs->renegotiate_count;
-                if ((long)num >=512)
-                        bs->renegotiate_count=(unsigned long)num;
-                break;
-        case BIO_C_GET_SSL_NUM_RENEGOTIATES:
-                ret=bs->num_renegotiates;
-                break;
-        case BIO_C_SET_SSL:
-                if (ssl != NULL)
-                        ssl_free(b);
-                b->shutdown=(int)num;
-                ssl=(SSL *)ptr;
-                ((BIO_SSL *)b->ptr)->ssl=ssl;
-                bio=SSL_get_rbio(ssl);
-                if (bio != NULL)
-                        {
-                        if (b->next_bio != NULL)
-                                BIO_push(bio,b->next_bio);
-                        b->next_bio=bio;
-                        CRYPTO_add(&bio->references,1,CRYPTO_LOCK_BIO);
-                        }
-                b->init=1;
-                break;
-        case BIO_C_GET_SSL:
-                if (ptr != NULL)
-                        {
-                        sslp=(SSL **)ptr;
-                        *sslp=ssl;
-                        }
-                else
-                        ret=0;
-                break;
-        case BIO_CTRL_GET_CLOSE:
-                ret=b->shutdown;
-                break;
-        case BIO_CTRL_SET_CLOSE:
-                b->shutdown=(int)num;
-                break;
-        case BIO_CTRL_WPENDING:
-                ret=BIO_ctrl(ssl->wbio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_PENDING:
-                ret=SSL_pending(ssl);
-                if (ret == 0)
-                        ret=BIO_pending(ssl->rbio);
-                break;
-        case BIO_CTRL_FLUSH:
-                BIO_clear_retry_flags(b);
-                ret=BIO_ctrl(ssl->wbio,cmd,num,ptr);
-                BIO_copy_next_retry(b);
-                break;
-        case BIO_CTRL_PUSH:
-                if ((b->next_bio != NULL) && (b->next_bio != ssl->rbio))
-                        {
-                        SSL_set_bio(ssl,b->next_bio,b->next_bio);
-                        CRYPTO_add(&b->next_bio->references,1,CRYPTO_LOCK_BIO);
-                        }
-                break;
-        case BIO_CTRL_POP:
-                /* ugly bit of a hack */
-                if (ssl->rbio != ssl->wbio) /* we are in trouble :-( */
-                        {
-                        BIO_free_all(ssl->wbio);
-                        }
-                ssl->wbio=NULL;
-                ssl->rbio=NULL;
-                break;
-        case BIO_C_DO_STATE_MACHINE:
-                BIO_clear_retry_flags(b);
-
-                b->retry_reason=0;
-                ret=(int)SSL_do_handshake(ssl);
-
-                switch (SSL_get_error(ssl,(int)ret))
-                        {
-                case SSL_ERROR_WANT_READ:
-                        BIO_set_flags(b,
-                                BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY);
-                        break;
-                case SSL_ERROR_WANT_WRITE:
-                        BIO_set_flags(b,
-                                BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY);
-                        break;
-                case SSL_ERROR_WANT_CONNECT:
-                        BIO_set_flags(b,
-                                BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY);
-                        b->retry_reason=b->next_bio->retry_reason;
-                        break;
-                default:
-                        break;
-                        }
-                break;
-        case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-                if (((BIO_SSL *)dbio->ptr)->ssl != NULL)
-                        SSL_free(((BIO_SSL *)dbio->ptr)->ssl);
-                ((BIO_SSL *)dbio->ptr)->ssl=SSL_dup(ssl);
-                ((BIO_SSL *)dbio->ptr)->renegotiate_count=
-                        ((BIO_SSL *)b->ptr)->renegotiate_count;
-                ((BIO_SSL *)dbio->ptr)->byte_count=
-                        ((BIO_SSL *)b->ptr)->byte_count;
-                ((BIO_SSL *)dbio->ptr)->renegotiate_timeout=
-                        ((BIO_SSL *)b->ptr)->renegotiate_timeout;
-                ((BIO_SSL *)dbio->ptr)->last_time=
-                        ((BIO_SSL *)b->ptr)->last_time;
-                ret=(((BIO_SSL *)dbio->ptr)->ssl != NULL);
-                break;
-        case BIO_C_GET_FD:
-                ret=BIO_ctrl(ssl->rbio,cmd,num,ptr);
-                break;
-        case BIO_CTRL_SET_CALLBACK:
-                SSL_set_info_callback(ssl,(void (*)())ptr);
-                break;
-        case BIO_CTRL_GET_CALLBACK:
-                {
-                void (**fptr)();
-
-                fptr=(void (**)())ptr;
-                *fptr=SSL_get_info_callback(ssl);
-                }
-                break;
-        default:
-                ret=BIO_ctrl(ssl->rbio,cmd,num,ptr);
-                break;
-                }
-        return(ret);
-        }
-
-static int ssl_puts(BIO *bp, char *str)
-        {
-        int n,ret;
-
-        n=strlen(str);
-        ret=BIO_write(bp,str,n);
-        return(ret);
-        }
-
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
-        {
-        BIO *ret=NULL,*buf=NULL,*ssl=NULL;
-
-        if ((buf=BIO_new(BIO_f_buffer())) == NULL)
-                return(NULL);
-        if ((ssl=BIO_new_ssl_connect(ctx)) == NULL)
-                goto err;
-        if ((ret=BIO_push(buf,ssl)) == NULL)
-                goto err;
-        return(ret);
-err:
-        if (buf != NULL) BIO_free(buf);
-        if (ssl != NULL) BIO_free(ssl);
-        return(NULL);
-        }
-
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
-        {
-        BIO *ret=NULL,*con=NULL,*ssl=NULL;
-
-        if ((con=BIO_new(BIO_s_connect())) == NULL)
-                return(NULL);
-        if ((ssl=BIO_new_ssl(ctx,1)) == NULL)
-                goto err;
-        if ((ret=BIO_push(ssl,con)) == NULL)
-                goto err;
-        return(ret);
-err:
-        if (con != NULL) BIO_free(con);
-        if (ret != NULL) BIO_free(ret);
-        return(NULL);
-        }
-
-BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
-        {
-        BIO *ret;
-        SSL *ssl;
-
-        if ((ret=BIO_new(BIO_f_ssl())) == NULL)
-                return(NULL);
-        if ((ssl=SSL_new(ctx)) == NULL)
-                {
-                BIO_free(ret);
-                return(NULL);
-                }
-        if (client)
-                SSL_set_connect_state(ssl);
-        else
-                SSL_set_accept_state(ssl);
-                
-        BIO_set_ssl(ret,ssl,BIO_CLOSE);
-        return(ret);
-        }
-
-int BIO_ssl_copy_session_id(BIO *t, BIO *f)
-        {
-        t=BIO_find_type(t,BIO_TYPE_SSL);
-        f=BIO_find_type(f,BIO_TYPE_SSL);
-        if ((t == NULL) || (f == NULL))
-                return(0);
-        if (    (((BIO_SSL *)t->ptr)->ssl == NULL) || 
-                (((BIO_SSL *)f->ptr)->ssl == NULL))
-                return(0);
-        SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl,((BIO_SSL *)f->ptr)->ssl);
-        return(1);
-        }
-
-void BIO_ssl_shutdown(BIO *b)
-        {
-        SSL *s;
-
-        while (b != NULL)
-                {
-                if (b->method->type == BIO_TYPE_SSL)
-                        {
-                        s=((BIO_SSL *)b->ptr)->ssl;
-                        SSL_shutdown(s);
-                        break;
-                        }
-                b=b->next_bio;
-                }
-        }
diff --git a/src/lib/libssl/doc/openssl.cnf b/src/lib/libssl/doc/openssl.cnf
deleted file mode 100644
index d70dd25622..0000000000
--- a/src/lib/libssl/doc/openssl.cnf
+++ /dev/null
@@ -1,214 +0,0 @@
-#
-# OpenSSL example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = $ENV::HOME/.rnd
-oid_file                = $ENV::HOME/.oid
-oid_section             = new_oids
-
-# To use this configuration file with the "-extfile" option of the
-# "openssl x509" utility, name here the section containing the
-# X.509v3 extensions to use:
-# extensions            = 
-# (Alternatively, use a configuration file that has only
-# X.509v3 extensions in its main [= default] section.)
-
-[ new_oids ]
-
-# We can add new OIDs in here for use by 'ca' and 'req'.
-# Add a simple OID like this:
-# testoid1=1.2.3.4
-# Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
-
-####################################################################
-[ 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 = usr_cert              # The extentions to add to the cert
-
-# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
-# so this is commented out by default to leave a V1 CRL.
-# crl_extensions        = crl_ext
-
-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
-x509_extensions = v3_ca # The extentions to add to the self signed cert
-
-[ 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     = World Wide Web 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
-
-# SET-ex3                       = SET extension number 3
-
-[ req_attributes ]
-challengePassword               = A challenge password
-challengePassword_min           = 4
-challengePassword_max           = 20
-
-unstructuredName                = An optional company name
-
-[ usr_cert ]
-
-# These extensions are added when 'ca' signs a request.
-
-# This goes against PKIX guidelines but some CAs do it and some software
-# requires this to avoid interpreting an end user certificate as a CA.
-
-basicConstraints=CA:FALSE
-
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-
-# This is OK for an SSL server.
-# nsCertType                    = server
-
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-
-# For normal client use this is typical
-# nsCertType = client, email
-
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-
-# This is typical in keyUsage for a client certificate.
-# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-
-# This will be displayed in Netscape's comment listbox.
-nsComment                       = "OpenSSL Generated Certificate"
-
-# PKIX recommendations harmless if included in all certificates.
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
-
-# This stuff is for subjectAltName and issuerAltname.
-# Import the email address.
-# subjectAltName=email:copy
-
-# Copy subject details
-# issuerAltName=issuer:copy
-
-#nsCaRevocationUrl              = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-
-[ v3_ca ]
-
-# Extensions for a typical CA
-
-
-# PKIX recommendation.
-
-subjectKeyIdentifier=hash
-
-authorityKeyIdentifier=keyid:always,issuer:always
-
-# This is what PKIX recommends but some broken software chokes on critical
-# extensions.
-#basicConstraints = critical,CA:true
-# So we do this instead.
-basicConstraints = CA:true
-
-# Key usage: this is typical for a CA certificate. However since it will
-# prevent it being used as an test self-signed certificate it is best
-# left out by default.
-# keyUsage = cRLSign, keyCertSign
-
-# Some might want this also
-# nsCertType = sslCA, emailCA
-
-# Include email address in subject alt name: another PKIX recommendation
-# subjectAltName=email:copy
-# Copy issuer details
-# issuerAltName=issuer:copy
-
-# RAW DER hex encoding of an extension: beware experts only!
-# 1.2.3.5=RAW:02:03
-# You can even override a supported extension:
-# basicConstraints= critical, RAW:30:03:01:01:FF
-
-[ crl_ext ]
-
-# CRL extensions.
-# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
-
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always,issuer:always
diff --git a/src/lib/libssl/doc/openssl.txt b/src/lib/libssl/doc/openssl.txt
deleted file mode 100644
index 91b85e5f14..0000000000
--- a/src/lib/libssl/doc/openssl.txt
+++ /dev/null
@@ -1,1174 +0,0 @@
-
-This is some preliminary documentation for OpenSSL.
-
-==============================================================================
-                            BUFFER Library
-==============================================================================
-
-The buffer library handles simple character arrays. Buffers are used for
-various purposes in the library, most notably memory BIOs.
-
-The library uses the BUF_MEM structure defined in buffer.h:
-
-typedef struct buf_mem_st
-{
-        int length;     /* current number of bytes */
-        char *data;
-        int max;        /* size of buffer */
-} BUF_MEM;
-
-'length' is the current size of the buffer in bytes, 'max' is the amount of
-memory allocated to the buffer. There are three functions which handle these
-and one "miscellaneous" function.
-
-BUF_MEM *BUF_MEM_new()
-
-This allocates a new buffer of zero size. Returns the buffer or NULL on error.
-
-void BUF_MEM_free(BUF_MEM *a)
-
-This frees up an already existing buffer. The data is zeroed before freeing
-up in case the buffer contains sensitive data.
-
-int BUF_MEM_grow(BUF_MEM *str, int len)
-
-This changes the size of an already existing buffer. It returns zero on error
-or the new size (i.e. 'len'). Any data already in the buffer is preserved if
-it increases in size.
-
-char * BUF_strdup(char *str)
-
-This is the previously mentioned strdup function: like the standard library
-strdup() it copies a null terminated string into a block of allocated memory
-and returns a pointer to the allocated block.
-
-Unlike the standard C library strdup() this function uses Malloc() and so
-should be used in preference to the standard library strdup() because it can
-be used for memory leak checking or replacing the malloc() function.
-
-The memory allocated from BUF_strdup() should be freed up using the Free()
-function.
-
-==============================================================================
-               OpenSSL X509V3 extension configuration
-==============================================================================
-
-OpenSSL X509V3 extension configuration: preliminary documentation.
-
-INTRODUCTION.
-
-For OpenSSL 0.9.2 the extension code has be considerably enhanced. It is now
-possible to add and print out common X509 V3 certificate and CRL extensions.
-
-BEGINNERS NOTE
-
-For most simple applications you don't need to know too much about extensions:
-the default openssl.cnf values will usually do sensible things.
-
-If you want to know more you can initially quickly look through the sections
-describing how the standard OpenSSL utilities display and add extensions and
-then the list of supported extensions.
-
-For more technical information about the meaning of extensions see:
-
-http://www.imc.org/ietf-pkix/
-http://home.netscape.com/eng/security/certs.html
-
-PRINTING EXTENSIONS.
-
-Extension values are automatically printed out for supported extensions.
-
-openssl x509 -in cert.pem -text
-openssl crl -in crl.pem -text
-
-will give information in the extension printout, for example:
-
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                73:FE:F7:59:A7:E1:26:84:44:D6:44:36:EE:79:1A:95:7C:B1:4B:15
-            X509v3 Authority Key Identifier: 
-                keyid:73:FE:F7:59:A7:E1:26:84:44:D6:44:36:EE:79:1A:95:7C:B1:4B:15, DirName:/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/Email=email@1.address/Email=email@2.address, serial:00
-            X509v3 Key Usage: 
-                Certificate Sign, CRL Sign
-            X509v3 Subject Alternative Name: 
-                email:email@1.address, email:email@2.address
-
-CONFIGURATION FILES.
-
-The OpenSSL utilities 'ca' and 'req' can now have extension sections listing
-which certificate extensions to include. In each case a line:
-
-x509_extensions = extension_section
-
-indicates which section contains the extensions. In the case of 'req' the
-extension section is used when the -x509 option is present to create a
-self signed root certificate.
-
-The 'x509' utility also supports extensions when it signs a certificate.
-The -extfile option is used to set the configuration file containing the
-extensions. In this case a line with:
-
-extensions = extension_section
-
-in the nameless (default) section is used. If no such line is included then
-it uses the default section.
-
-You can also add extensions to CRLs: a line
-
-crl_extensions = crl_extension_section
-
-will include extensions when the -gencrl option is used with the 'ca' utility.
-You can add any extension to a CRL but of the supported extensions only
-issuerAltName and authorityKeyIdentifier make any real sense. Note: these are
-CRL extensions NOT CRL *entry* extensions which cannot currently be generated.
-CRL entry extensions can be displayed.
-
-NB. At this time Netscape Communicator rejects V2 CRLs: to get an old V1 CRL
-you should not include a crl_extensions line in the configuration file.
-
-As with all configuration files you can use the inbuilt environment expansion
-to allow the values to be passed in the environment. Therefore if you have
-several extension sections used for different purposes you can have a line:
-
-x509_extensions = $ENV::ENV_EXT
-
-and set the ENV_EXT environment variable before calling the relevant utility.
-
-EXTENSION SYNTAX.
-
-Extensions have the basic form:
-
-extension_name=[critical,] extension_options
-
-the use of the critical option makes the extension critical. Extreme caution
-should be made when using the critical flag. If an extension is marked
-as critical then any client that does not understand the extension should
-reject it as invalid. Some broken software will reject certificates which
-have *any* critical extensions (these violates PKIX but we have to live
-with it).
-
-There are three main types of extension: string extensions, multi-valued
-extensions, and raw extensions.
-
-String extensions simply have a string which contains either the value itself
-or how it is obtained.
-
-For example:
-
-nsComment="This is a Comment"
-
-Multi-valued extensions have a short form and a long form. The short form
-is a list of names and values:
-
-basicConstraints=critical,CA:true,pathlen:1
-
-The long form allows the values to be placed in a separate section:
-
-basicConstraints=critical,@bs_section
-
-[bs_section]
-
-CA=true
-pathlen=1
-
-Both forms are equivalent. However it should be noted that in some cases the
-same name can appear multiple times, for example,
-
-subjectAltName=email:steve@here,email:steve@there
-
-in this case an equivalent long form is:
-
-subjectAltName=@alt_section
-
-[alt_section]
-
-email.1=steve@here
-email.2=steve@there
-
-This is because the configuration file code cannot handle the same name
-occurring twice in the same extension.
-
-The syntax of raw extensions is governed by the extension code: it can
-for example contain data in multiple sections. The correct syntax to
-use is defined by the extension code itself: check out the certificate
-policies extension for an example.
-
-In addition it is also possible to use the word DER to include arbitrary
-data in any extension.
-
-1.2.3.4=critical,DER:01:02:03:04
-1.2.3.4=DER:01020304
-
-The value following DER is a hex dump of the DER encoding of the extension
-Any extension can be placed in this form to override the default behaviour.
-For example:
-
-basicConstraints=critical,DER:00:01:02:03
-
-WARNING: DER should be used with caution. It is possible to create totally
-invalid extensions unless care is taken.
-
-CURRENTLY SUPPORTED EXTENSIONS.
-
-If you aren't sure about extensions then they can be largely ignored: its only
-when you want to do things like restrict certificate usage when you need to
-worry about them. 
-
-The only extension that a beginner might want to look at is Basic Constraints.
-If in addition you want to try Netscape object signing the you should also
-look at Netscape Certificate Type.
-
-Literal String extensions.
-
-In each case the 'value' of the extension is placed directly in the
-extension. Currently supported extensions in this category are: nsBaseUrl,
-nsRevocationUrl, nsCaRevocationUrl, nsRenewalUrl, nsCaPolicyUrl,
-nsSslServerName and nsComment.
-
-For example:
-
-nsComment="This is a test comment"
-
-Bit Strings.
-
-Bit string extensions just consist of a list of supported bits, currently
-two extensions are in this category: PKIX keyUsage and the Netscape specific
-nsCertType.
-
-nsCertType (netscape certificate type) takes the flags: client, server, email,
-objsign, reserved, sslCA, emailCA, objCA.
-
-keyUsage (PKIX key usage) takes the flags: digitalSignature, nonRepudiation,
-keyEncipherment, dataEncipherment, keyAgreement, keyCertSign, cRLSign,
-encipherOnly, decipherOnly.
-
-For example:
-
-nsCertType=server
-
-keyUsage=digitalSignature, nonRepudiation
-
-Hints on Netscape Certificate Type.
-
-Other than Basic Constraints this is the only extension a beginner might
-want to use, if you want to try Netscape object signing, otherwise it can
-be ignored.
-
-If you want a certificate that can be used just for object signing then:
-
-nsCertType=objsign
-
-will do the job. If you want to use it as a normal end user and server
-certificate as well then
-
-nsCertType=objsign,email,server
-
-is more appropriate. You cannot use a self signed certificate for object
-signing (well Netscape signtool can but it cheats!) so you need to create
-a CA certificate and sign an end user certificate with it.
-
-Side note: If you want to conform to the Netscape specifications then you
-should really also set:
-
-nsCertType=objCA
-
-in the *CA* certificate for just an object signing CA and
-
-nsCertType=objCA,emailCA,sslCA
-
-for everything. Current Netscape software doesn't enforce this so it can
-be omitted.
-
-Basic Constraints.
-
-This is generally the only extension you need to worry about for simple
-applications. If you want your certificate to be usable as a CA certificate
-(in addition to an end user certificate) then you set this to:
-
-basicConstraints=CA:TRUE
-
-if you want to be certain the certificate cannot be used as a CA then do:
-
-basicConstraints=CA:FALSE
-
-The rest of this section describes more advanced usage.
-
-Basic constraints is a multi-valued extension that supports a CA and an
-optional pathlen option. The CA option takes the values true and false and
-pathlen takes an integer. Note if the CA option is false the pathlen option
-should be omitted. 
-
-The pathlen parameter indicates the maximum number of CAs that can appear
-below this one in a chain. So if you have a CA with a pathlen of zero it can
-only be used to sign end user certificates and not further CAs. This all
-assumes that the software correctly interprets this extension of course.
-
-Examples:
-
-basicConstraints=CA:TRUE
-basicConstraints=critical,CA:TRUE, pathlen:0
-
-NOTE: for a CA to be considered valid it must have the CA option set to
-TRUE. An end user certificate MUST NOT have the CA value set to true.
-According to PKIX recommendations it should exclude the extension entirely,
-however some software may require CA set to FALSE for end entity certificates.
-
-Subject Key Identifier.
-
-This is really a string extension and can take two possible values. Either
-a hex string giving details of the extension value to include or the word
-'hash' which then automatically follow PKIX guidelines in selecting and
-appropriate key identifier. The use of the hex string is strongly discouraged.
-
-Example: subjectKeyIdentifier=hash
-
-Authority Key Identifier.
-
-The authority key identifier extension permits two options. keyid and issuer:
-both can take the optional value "always".
-
-If the keyid option is present an attempt is made to copy the subject key
-identifier from the parent certificate. If the value "always" is present
-then an error is returned if the option fails.
-
-The issuer option copies the issuer and serial number from the issuer
-certificate. Normally this will only be done if the keyid option fails or
-is not included: the "always" flag will always include the value.
-
-Subject Alternative Name.
-
-The subject alternative name extension allows various literal values to be
-included in the configuration file. These include "email" (an email address)
-"URI" a uniform resource indicator, "DNS" (a DNS domain name), RID (a
-registered ID: OBJECT IDENTIFIER) and IP (and IP address).
-
-Also the email option include a special 'copy' value. This will automatically
-include and email addresses contained in the certificate subject name in
-the extension.
-
-Examples:
-
-subjectAltName=email:copy,email:my@other.address,URL:http://my.url.here/
-subjectAltName=email:my@other.address,RID:1.2.3.4
-
-Issuer Alternative Name.
-
-The issuer alternative name option supports all the literal options of
-subject alternative name. It does *not* support the email:copy option because
-that would not make sense. It does support an additional issuer:copy option
-that will copy all the subject alternative name values from the issuer 
-certificate (if possible).
-
-CRL distribution points.
-
-This is a multi-valued extension that supports all the literal options of
-subject alternative name. Of the few software packages that currently interpret
-this extension most only interpret the URI option.
-
-Currently each option will set a new DistributionPoint with the fullName
-field set to the given value.
-
-Other fields like cRLissuer and reasons cannot currently be set or displayed:
-at this time no examples were available that used these fields.
-
-If you see this extension with <UNSUPPORTED> when you attempt to print it out
-or it doesn't appear to display correctly then let me know, including the
-certificate (mail me at steve@openssl.org) .
-
-Examples:
-
-crlDistributionPoints=URI:http://www.myhost.com/myca.crl
-crlDistributionPoints=URI:http://www.my.com/my.crl,URI:http://www.oth.com/my.crl
-
-Certificate Policies.
-
-This is a RAW extension. It attempts to display the contents of this extension:
-unfortunately this extension is often improperly encoded.
-
-The certificate policies extension will rarely be used in practice: few
-software packages interpret it correctly or at all. IE5 does partially
-support this extension: but it needs the 'ia5org' option because it will
-only correctly support a broken encoding. Of the options below only the
-policy OID, explicitText and CPS options are displayed with IE5.
-
-All the fields of this extension can be set by using the appropriate syntax.
-
-If you follow the PKIX recommendations of not including any qualifiers and just
-using only one OID then you just include the value of that OID. Multiple OIDs
-can be set separated by commas, for example:
-
-certificatePolicies= 1.2.4.5, 1.1.3.4
-
-If you wish to include qualifiers then the policy OID and qualifiers need to
-be specified in a separate section: this is done by using the @section syntax
-instead of a literal OID value.
-
-The section referred to must include the policy OID using the name
-policyIdentifier, cPSuri qualifiers can be included using the syntax:
-
-CPS.nnn=value
-
-userNotice qualifiers can be set using the syntax:
-
-userNotice.nnn=@notice
-
-The value of the userNotice qualifier is specified in the relevant section.
-This section can include explicitText, organization and noticeNumbers
-options. explicitText and organization are text strings, noticeNumbers is a
-comma separated list of numbers. The organization and noticeNumbers options
-(if included) must BOTH be present. If you use the userNotice option with IE5
-then you need the 'ia5org' option at the top level to modify the encoding:
-otherwise it will not be interpreted properly.
-
-Example:
-
-certificatePolicies=ia5org,1.2.3.4,1.5.6.7.8,@polsect
-
-[polsect]
-
-policyIdentifier = 1.3.5.8
-CPS.1="http://my.host.name/"
-CPS.2="http://my.your.name/"
-userNotice.1=@notice
-
-[notice]
-
-explicitText="Explicit Text Here"
-organization="Organisation Name"
-noticeNumbers=1,2,3,4
-
-TECHNICAL NOTE: the ia5org option changes the type of the 'organization' field,
-according to PKIX it should be of type DisplayText but Verisign uses an 
-IA5STRING and IE5 needs this too.
-
-Display only extensions.
-
-Some extensions are only partially supported and currently are only displayed
-but cannot be set. These include private key usage period, CRL number, and
-CRL reason.
-
-==============================================================================
-                X509V3 Extension code: programmers guide
-==============================================================================
-
-The purpose of the extension code is twofold. It allows an extension to be
-created from a string or structure describing its contents and it prints out an
-extension in a human or machine readable form.
-
-1. Initialisation and cleanup.
-
-X509V3_add_standard_extensions();
-
-This function should be called before any other extension code. It adds support
-for some common PKIX and Netscape extensions. Additional custom extensions can
-be added as well (see later).
-
-void X509V3_EXT_cleanup(void);
-
-This function should be called last to cleanup the extension code. After this
-call no other extension calls should be made.
-
-2. Printing and parsing extensions.
-
-The simplest way to print out extensions is via the standard X509 printing
-routines: if you use the standard X509_print() function, the supported
-extensions will be printed out automatically.
-
-The following functions allow finer control over extension display:
-
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent);
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-
-These two functions print out an individual extension to a BIO or FILE pointer.
-Currently the flag argument is unused and should be set to 0. The 'indent'
-argument is the number of spaces to indent each line.
-
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-
-This function parses an extension and returns its internal structure. The
-precise structure you get back depends on the extension being parsed. If the
-extension if basicConstraints you will get back a pointer to a
-BASIC_CONSTRAINTS structure. Check out the source in crypto/x509v3 for more
-details about the structures returned. The returned structure should be freed
-after use using the relevant free function, BASIC_CONSTRAINTS_free() for 
-example.
-
-3. Generating extensions.
-
-An extension will typically be generated from a configuration file, or some
-other kind of configuration database.
-
-int X509V3_EXT_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section,
-                                                                 X509 *cert);
-int X509V3_EXT_CRL_add_conf(LHASH *conf, X509V3_CTX *ctx, char *section,
-                                                                 X509_CRL *crl);
-
-These functions add all the extensions in the given section to the given
-certificate or CRL. They will normally be called just before the certificate
-or CRL is due to be signed. Both return 0 on error on non zero for success.
-
-In each case 'conf' is the LHASH pointer of the configuration file to use
-and 'section' is the section containing the extension details.
-
-See the 'context functions' section for a description of the ctx paramater.
-
-
-X509_EXTENSION *X509V3_EXT_conf(LHASH *conf, X509V3_CTX *ctx, char *name,
-                                                                 char *value);
-
-This function returns an extension based on a name and value pair, if the
-pair will not need to access other sections in a config file (or there is no
-config file) then the 'conf' parameter can be set to NULL.
-
-X509_EXTENSION *X509V3_EXT_conf_nid(char *conf, X509V3_CTX *ctx, int nid,
-                                                                 char *value);
-
-This function creates an extension in the same way as X509V3_EXT_conf() but
-takes the NID of the extension rather than its name.
-
-For example to produce basicConstraints with the CA flag and a path length of
-10:
-
-x = X509V3_EXT_conf_nid(NULL, NULL, NID_basicConstraints, "CA:TRUE,pathlen:10");
-
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-
-This function sets up an extension from its internal structure. The ext_nid
-parameter is the NID of the extension and 'crit' is the critical flag.
-
-4. Context functions.
-
-The following functions set and manipulate an extension context structure.
-The purpose of the extension context is to allow the extension code to
-access various structures relating to the "environment" of the certificate:
-for example the issuers certificate or the certificate request.
-
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                                 X509_REQ *req, X509_CRL *crl, int flags);
-
-This function sets up an X509V3_CTX structure with details of the certificate
-environment: specifically the issuers certificate, the subject certificate,
-the certificate request and the CRL: if these are not relevant or not
-available then they can be set to NULL. The 'flags' parameter should be set
-to zero.
-
-X509V3_set_ctx_test(ctx)
-
-This macro is used to set the 'ctx' structure to a 'test' value: this is to
-allow the syntax of an extension (or configuration file) to be tested.
-
-X509V3_set_ctx_nodb(ctx)
-
-This macro is used when no configuration database is present.
-
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH *lhash);
-
-This function is used to set the configuration database when it is an LHASH
-structure: typically a configuration file.
-
-The following functions are used to access a configuration database: they
-should only be used in RAW extensions.
-
-char * X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
-
-This function returns the value of the parameter "name" in "section", or NULL
-if there has been an error.
-
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-
-This function frees up the string returned by the above function.
-
-STACK_OF(CONF_VALUE) * X509V3_get_section(X509V3_CTX *ctx, char *section);
-
-This function returns a whole section as a STACK_OF(CONF_VALUE) .
-
-void X509V3_section_free( X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-
-This function frees up the STACK returned by the above function.
-
-Note: it is possible to use the extension code with a custom configuration
-database. To do this the "db_meth" element of the X509V3_CTX structure should
-be set to an X509V3_CTX_METHOD structure. This structure contains the following
-function pointers:
-
-char * (*get_string)(void *db, char *section, char *value);
-STACK_OF(CONF_VALUE) * (*get_section)(void *db, char *section);
-void (*free_string)(void *db, char * string);
-void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section);
-
-these will be called and passed the 'db' element in the X509V3_CTX structure
-to access the database. If a given function is not implemented or not required
-it can be set to NULL.
-
-5. String helper functions.
-
-There are several "i2s" and "s2i" functions that convert structures to and
-from ASCII strings. In all the "i2s" cases the returned string should be
-freed using Free() after use. Since some of these are part of other extension
-code they may take a 'method' parameter. Unless otherwise stated it can be
-safely set to NULL.
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *oct);
-
-This returns a hex string from an ASN1_OCTET_STRING.
-
-char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
-char * i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-
-These return a string decimal representations of an ASN1_INTEGER and an
-ASN1_ENUMERATED type, respectively.
-
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                                   X509V3_CTX *ctx, char *str);
-
-This converts an ASCII hex string to an ASN1_OCTET_STRING.
-
-ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-
-This converts a decimal ASCII string into an ASN1_INTEGER.
-
-6. Multi valued extension helper functions.
-
-The following functions can be used to manipulate STACKs of CONF_VALUE
-structures, as used by multi valued extensions.
-
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-
-This function expects a boolean value in 'value' and sets 'asn1_bool' to
-it. That is it sets it to 0 for FALSE or 0xff for TRUE. The following
-strings are acceptable: "TRUE", "true", "Y", "y", "YES", "yes", "FALSE"
-"false", "N", "n", "NO" or "no".
-
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
-
-This accepts a decimal integer of arbitrary length and sets an ASN1_INTEGER.
-
-int X509V3_add_value(const char *name, const char *value,
-                                                STACK_OF(CONF_VALUE) **extlist);
-
-This simply adds a string name and value pair.
-
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                                                STACK_OF(CONF_VALUE) **extlist);
-
-The same as above but for an unsigned character value.
-
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist);
-
-This adds either "TRUE" or "FALSE" depending on the value of 'ans1_bool'
-
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-                                                STACK_OF(CONF_VALUE) **extlist);
-
-This is the same as above except it adds nothing if asn1_bool is FALSE.
-
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-                                                STACK_OF(CONF_VALUE) **extlist);
-
-This function adds the value of the ASN1_INTEGER in decimal form.
-
-7. Other helper functions.
-
-<to be added>
-
-ADDING CUSTOM EXTENSIONS.
-
-Currently there are three types of supported extensions. 
-
-String extensions are simple strings where the value is placed directly in the
-extensions, and the string returned is printed out.
-
-Multi value extensions are passed a STACK_OF(CONF_VALUE) name and value pairs
-or return a STACK_OF(CONF_VALUE).
-
-Raw extensions are just passed a BIO or a value and it is the extensions
-responsiblity to handle all the necessary printing.
-
-There are two ways to add an extension. One is simply as an alias to an already
-existing extension. An alias is an extension that is identical in ASN1 structure
-to an existing extension but has a different OBJECT IDENTIFIER. This can be
-done by calling:
-
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-
-'nid_to' is the new extension NID and 'nid_from' is the already existing
-extension NID.
-
-Alternatively an extension can be written from scratch. This involves writing
-the ASN1 code to encode and decode the extension and functions to print out and
-generate the extension from strings. The relevant functions are then placed in
-a X509V3_EXT_METHOD structure and int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-called.
-
-The X509V3_EXT_METHOD structure is described below.
-
-strut {
-int ext_nid;
-int ext_flags;
-X509V3_EXT_NEW ext_new;
-X509V3_EXT_FREE ext_free;
-X509V3_EXT_D2I d2i;
-X509V3_EXT_I2D i2d;
-X509V3_EXT_I2S i2s;
-X509V3_EXT_S2I s2i;
-X509V3_EXT_I2V i2v;
-X509V3_EXT_V2I v2i;
-X509V3_EXT_R2I r2i;
-X509V3_EXT_I2R i2r;
-
-void *usr_data;
-};
-
-The elements have the following meanings.
-
-ext_nid         is the NID of the object identifier of the extension.
-
-ext_flags       is set of flags. Currently the only external flag is
-                X509V3_EXT_MULTILINE which means a multi valued extensions
-                should be printed on separate lines.
-
-usr_data        is an extension specific pointer to any relevant data. This
-                allows extensions to share identical code but have different
-                uses. An example of this is the bit string extension which uses
-                usr_data to contain a list of the bit names.
-
-All the remaining elements are function pointers.
-
-ext_new         is a pointer to a function that allocates memory for the
-                extension ASN1 structure: for example ASN1_OBJECT_new().
-
-ext_free        is a pointer to a function that free up memory of the extension
-                ASN1 structure: for example ASN1_OBJECT_free().
-
-d2i             is the standard ASN1 function that converts a DER buffer into
-                the internal ASN1 structure: for example d2i_ASN1_IA5STRING().
-
-i2d             is the standard ASN1 function that converts the internal
-                structure into the DER representation: for example
-                i2d_ASN1_IA5STRING().
-
-The remaining functions are depend on the type of extension. One i2X and
-one X2i should be set and the rest set to NULL. The types set do not need
-to match up, for example the extension could be set using the multi valued
-v2i function and printed out using the raw i2r.
-
-All functions have the X509V3_EXT_METHOD passed to them in the 'method'
-parameter and an X509V3_CTX structure. Extension code can then access the
-parent structure via the 'method' parameter to for example make use of the value
-of usr_data. If the code needs to use detail relating to the request it can
-use the 'ctx' parameter.
-
-A note should be given here about the 'flags' member of the 'ctx' parameter.
-If it has the value CTX_TEST then the configuration syntax is being checked
-and no actual certificate or CRL exists. Therefore any attempt in the config
-file to access such information should silently succeed. If the syntax is OK
-then it should simply return a (possibly bogus) extension, otherwise it
-should return NULL.
-
-char *i2s(struct v3_ext_method *method, void *ext);
-
-This function takes the internal structure in the ext parameter and returns
-a Malloc'ed string representing its value.
-
-void * s2i(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str);
-
-This function takes the string representation in the ext parameter and returns
-an allocated internal structure: ext_free() will be used on this internal
-structure after use.
-
-i2v and v2i handle a STACK_OF(CONF_VALUE):
-
-typedef struct
-{
-        char *section;
-        char *name;
-        char *value;
-} CONF_VALUE;
-
-Only the name and value members are currently used.
-
-STACK_OF(CONF_VALUE) * i2v(struct v3_ext_method *method, void *ext);
-
-This function is passed the internal structure in the ext parameter and
-returns a STACK of CONF_VALUE structures. The values of name, value,
-section and the structure itself will be freed up with Free after use.
-Several helper functions are available to add values to this STACK.
-
-void * v2i(struct v3_ext_method *method, struct v3_ext_ctx *ctx,
-                                                STACK_OF(CONF_VALUE) *values);
-
-This function takes a STACK_OF(CONF_VALUE) structures and should set the
-values of the external structure. This typically uses the name element to
-determine which structure element to set and the value element to determine
-what to set it to. Several helper functions are available for this
-purpose (see above).
-
-int i2r(struct v3_ext_method *method, void *ext, BIO *out, int indent);
-
-This function is passed the internal extension structure in the ext parameter
-and sends out a human readable version of the extension to out. The 'indent'
-paremeter should be noted to determine the necessary amount of indentation
-needed on the output.
-
-void * r2i(struct v3_ext_method *method, struct v3_ext_ctx *ctx, char *str);
-
-This is just passed the string representation of the extension. It is intended
-to be used for more elaborate extensions where the standard single and multi
-valued options are insufficient. They can use the 'ctx' parameter to parse the
-configuration database themselves. See the context functions section for details
-of how to do this.
-
-Note: although this type takes the same parameters as the "r2s" function there
-is a subtle difference. Whereas an "r2i" function can access a configuration
-database an "s2i" function MUST NOT. This is so the internal code can safely
-assume that an "s2i" function will work without a configuration database.
-
-==============================================================================
-                            PKCS#12 Library
-==============================================================================
-
-This section describes the internal PKCS#12 support. There are very few
-differences between the old external library and the new internal code at
-present. This may well change because the external library will not be updated
-much in future.
-
-This version now includes a couple of high level PKCS#12 functions which
-generally "do the right thing" and should make it much easier to handle PKCS#12
-structures.
-
-HIGH LEVEL FUNCTIONS.
-
-For most applications you only need concern yourself with the high level
-functions. They can parse and generate simple PKCS#12 files as produced by
-Netscape and MSIE or indeed any compliant PKCS#12 file containing a single
-private key and certificate pair.
-
-1. Initialisation and cleanup.
-
-No special initialisation is needed for the internal PKCS#12 library: the 
-standard SSLeay_add_all_algorithms() is sufficient. If you do not wish to
-add all algorithms (you should at least add SHA1 though) then you can manually
-initialise the PKCS#12 library with:
-
-PKCS12_PBE_add();
-
-The memory allocated by the PKCS#12 library is freed up when EVP_cleanup() is
-called or it can be directly freed with:
-
-EVP_PBE_cleanup();
-
-after this call (or EVP_cleanup() ) no more PKCS#12 library functions should
-be called.
-
-2. I/O functions.
-
-i2d_PKCS12_bio(bp, p12)
-
-This writes out a PKCS12 structure to a BIO.
-
-i2d_PKCS12_fp(fp, p12)
-
-This is the same but for a FILE pointer.
-
-d2i_PKCS12_bio(bp, p12)
-
-This reads in a PKCS12 structure from a BIO.
-
-d2i_PKCS12_fp(fp, p12)
-
-This is the same but for a FILE pointer.
-
-3. Parsing and creation functions.
-
-3.1 Parsing with PKCS12_parse().
-
-int PKCS12_parse(PKCS12 *p12, char *pass, EVP_PKEY **pkey, X509 **cert,
-                                                                 STACK **ca);
-
-This function takes a PKCS12 structure and a password (ASCII, null terminated)
-and returns the private key, the corresponding certificate and any CA
-certificates. If any of these is not required it can be passed as a NULL.
-The 'ca' parameter should be either NULL, a pointer to NULL or a valid STACK
-structure. Typically to read in a PKCS#12 file you might do:
-
-p12 = d2i_PKCS12_fp(fp, NULL);
-PKCS12_parse(p12, password, &pkey, &cert, NULL);        /* CAs not wanted */
-PKCS12_free(p12);
-
-3.2 PKCS#12 creation with PKCS12_create().
-
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-                        STACK *ca, int nid_key, int nid_cert, int iter,
-                                                 int mac_iter, int keytype);
-
-This function will create a PKCS12 structure from a given password, name,
-private key, certificate and optional STACK of CA certificates. The remaining
-5 parameters can be set to 0 and sensible defaults will be used.
-
-The parameters nid_key and nid_cert are the key and certificate encryption
-algorithms, iter is the encryption iteration count, mac_iter is the MAC
-iteration count and keytype is the type of private key. If you really want
-to know what these last 5 parameters do then read the low level section.
-
-Typically to create a PKCS#12 file the following could be used:
-
-p12 = PKCS12_create(pass, "My Certificate", pkey, cert, NULL, 0,0,0,0,0);
-i2d_PKCS12_fp(fp, p12);
-PKCS12_free(p12);
-
-LOW LEVEL FUNCTIONS.
-
-In some cases the high level functions do not provide the necessary
-functionality. For example if you want to generate or parse more complex
-PKCS#12 files. The sample pkcs12 application uses the low level functions
-to display details about the internal structure of a PKCS#12 file.
-
-Introduction.
-
-This is a brief description of how a PKCS#12 file is represented internally:
-some knowledge of PKCS#12 is assumed.
-
-A PKCS#12 object contains several levels.
-
-At the lowest level is a PKCS12_SAFEBAG. This can contain a certificate, a
-CRL, a private key, encrypted or unencrypted, a set of safebags (so the
-structure can be nested) or other secrets (not documented at present). 
-A safebag can optionally have attributes, currently these are: a unicode
-friendlyName (a Unicode string) or a localKeyID (a string of bytes).
-
-At the next level is an authSafe which is a set of safebags collected into
-a PKCS#7 ContentInfo. This can be just plain data, or encrypted itself.
-
-At the top level is the PKCS12 structure itself which contains a set of
-authSafes in an embedded PKCS#7 Contentinfo of type data. In addition it
-contains a MAC which is a kind of password protected digest to preserve
-integrity (so any unencrypted stuff below can't be tampered with).
-
-The reason for these levels is so various objects can be encrypted in various
-ways. For example you might want to encrypt a set of private keys with
-triple-DES and then include the related certificates either unencrypted or
-with lower encryption. Yes it's the dreaded crypto laws at work again which
-allow strong encryption on private keys and only weak encryption on other
-stuff.
-
-To build one of these things you turn all certificates and keys into safebags
-(with optional attributes). You collect the safebags into (one or more) STACKS
-and convert these into authsafes (encrypted or unencrypted).  The authsafes
-are collected into a STACK and added to a PKCS12 structure.  Finally a MAC
-inserted.
-
-Pulling one apart is basically the reverse process. The MAC is verified against
-the given password. The authsafes are extracted and each authsafe split into
-a set of safebags (possibly involving decryption). Finally the safebags are
-decomposed into the original keys and certificates and the attributes used to
-match up private key and certificate pairs.
-
-Anyway here are the functions that do the dirty work.
-
-1. Construction functions.
-
-1.1 Safebag functions.
-
-M_PKCS12_x5092certbag(x509)
-
-This macro takes an X509 structure and returns a certificate bag. The
-X509 structure can be freed up after calling this function.
-
-M_PKCS12_x509crl2certbag(crl)
-
-As above but for a CRL.
-
-PKCS8_PRIV_KEY_INFO *PKEY2PKCS8(EVP_PKEY *pkey)
-
-Take a private key and convert it into a PKCS#8 PrivateKeyInfo structure.
-Works for both RSA and DSA private keys. NB since the PKCS#8 PrivateKeyInfo
-structure contains a private key data in plain text form it should be free'd
-up as soon as it has been encrypted for security reasons (freeing up the
-structure zeros out the sensitive data). This can be done with
-PKCS8_PRIV_KEY_INFO_free().
-
-PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage)
-
-This sets the key type when a key is imported into MSIE or Outlook 98. Two
-values are currently supported: KEY_EX and KEY_SIG. KEY_EX is an exchange type
-key that can also be used for signing but its size is limited in the export
-versions of MS software to 512 bits, it is also the default. KEY_SIG is a
-signing only key but the keysize is unlimited (well 16K is supposed to work).
-If you are using the domestic version of MSIE then you can ignore this because
-KEY_EX is not limited and can be used for both.
-
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8)
-
-Convert a PKCS8 private key structure into a keybag. This routine embeds the
-p8 structure in the keybag so p8 should not be freed up or used after it is
-called.  The p8 structure will be freed up when the safebag is freed.
-
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8)
-
-Convert a PKCS#8 structure into a shrouded key bag (encrypted). p8 is not
-embedded and can be freed up after use.
-
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen)
-int PKCS12_add_friendlyname(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen)
-
-Add a local key id or a friendlyname to a safebag.
-
-1.2 Authsafe functions.
-
-PKCS7 *PKCS12_pack_p7data(STACK *sk)
-Take a stack of safebags and convert them into an unencrypted authsafe. The
-stack of safebags can be freed up after calling this function.
-
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, STACK *bags);
-
-As above but encrypted.
-
-1.3 PKCS12 functions.
-
-PKCS12 *PKCS12_init(int mode)
-
-Initialise a PKCS12 structure (currently mode should be NID_pkcs7_data).
-
-M_PKCS12_pack_authsafes(p12, safes)
-
-This macro takes a STACK of authsafes and adds them to a PKCS#12 structure.
-
-int PKCS12_set_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_MD *md_type);
-
-Add a MAC to a PKCS12 structure. If EVP_MD is NULL use SHA-1, the spec suggests
-that SHA-1 should be used.
-
-2. Extraction Functions.
-
-2.1 Safebags.
-
-M_PKCS12_bag_type(bag)
-
-Return the type of "bag". Returns one of the following
-
-NID_keyBag
-NID_pkcs8ShroudedKeyBag                 7
-NID_certBag                             8
-NID_crlBag                              9
-NID_secretBag                           10
-NID_safeContentsBag                     11
-
-M_PKCS12_cert_bag_type(bag)
-
-Returns type of certificate bag, following are understood.
-
-NID_x509Certificate                     14
-NID_sdsiCertificate                     15
-
-M_PKCS12_crl_bag_type(bag)
-
-Returns crl bag type, currently only NID_crlBag is recognised.
-
-M_PKCS12_certbag2x509(bag)
-
-This macro extracts an X509 certificate from a certificate bag.
-
-M_PKCS12_certbag2x509crl(bag)
-
-As above but for a CRL.
-
-EVP_PKEY * PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8)
-
-Extract a private key from a PKCS8 private key info structure.
-
-M_PKCS12_decrypt_skey(bag, pass, passlen) 
-
-Decrypt a shrouded key bag and return a PKCS8 private key info structure.
-Works with both RSA and DSA keys
-
-char *PKCS12_get_friendlyname(bag)
-
-Returns the friendlyName of a bag if present or NULL if none. The returned
-string is a null terminated ASCII string allocated with Malloc(). It should 
-thus be freed up with Free() after use.
-
-2.2 AuthSafe functions.
-
-M_PKCS12_unpack_p7data(p7)
-
-Extract a STACK of safe bags from a PKCS#7 data ContentInfo.
-
-#define M_PKCS12_unpack_p7encdata(p7, pass, passlen)
-
-As above but for an encrypted content info.
-
-2.3 PKCS12 functions.
-
-M_PKCS12_unpack_authsafes(p12)
-
-Extract a STACK of authsafes from a PKCS12 structure.
-
-M_PKCS12_mac_present(p12)
-
-Check to see if a MAC is present.
-
-int PKCS12_verify_mac(PKCS12 *p12, unsigned char *pass, int passlen)
-
-Verify a MAC on a PKCS12 structure. Returns an error if MAC not present.
-
-
-Notes.
-
-1. All the function return 0 or NULL on error.
-2. Encryption based functions take a common set of parameters. These are
-described below.
-
-pass, passlen
-ASCII password and length. The password on the MAC is called the "integrity
-password" the encryption password is called the "privacy password" in the
-PKCS#12 documentation. The passwords do not have to be the same. If -1 is
-passed for the length it is worked out by the function itself (currently
-this is sometimes done whatever is passed as the length but that may change).
-
-salt, saltlen
-A 'salt' if salt is NULL a random salt is used. If saltlen is also zero a
-default length is used.
-
-iter
-Iteration count. This is a measure of how many times an internal function is
-called to encrypt the data. The larger this value is the longer it takes, it
-makes dictionary attacks on passwords harder. NOTE: Some implementations do
-not support an iteration count on the MAC. If the password for the MAC and
-encryption is the same then there is no point in having a high iteration
-count for encryption if the MAC has no count. The MAC could be attacked
-and the password used for the main decryption.
-
-pbe_nid
-This is the NID of the password based encryption method used. The following are
-supported.
-NID_pbe_WithSHA1And128BitRC4
-NID_pbe_WithSHA1And40BitRC4
-NID_pbe_WithSHA1And3_Key_TripleDES_CBC
-NID_pbe_WithSHA1And2_Key_TripleDES_CBC
-NID_pbe_WithSHA1And128BitRC2_CBC
-NID_pbe_WithSHA1And40BitRC2_CBC
-
-Which you use depends on the implementation you are exporting to. "Export
-grade" (i.e. cryptographically challenged) products cannot support all
-algorithms. Typically you may be able to use any encryption on shrouded key
-bags but they must then be placed in an unencrypted authsafe. Other authsafes
-may only support 40bit encryption. Of course if you are using SSLeay
-throughout you can strongly encrypt everything and have high iteration counts
-on everything.
-
-3. For decryption routines only the password and length are needed.
-
-4. Unlike the external version the nid's of objects are the values of the
-constants: that is NID_certBag is the real nid, therefore there is no 
-PKCS12_obj_offset() function.  Note the object constants are not the same as
-those of the external version. If you use these constants then you will need
-to recompile your code.
-
-5. With the exception of PKCS12_MAKE_KEYBAG(), after calling any function or 
-macro of the form PKCS12_MAKE_SOMETHING(other) the "other" structure can be
-reused or freed up safely.
-
diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c
deleted file mode 100644
index 299d2ae5d2..0000000000
--- a/src/lib/libssl/s23_clnt.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/* ssl/s23_clnt.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *ssl23_get_client_method(int ver);
-static int ssl23_client_hello(SSL *s);
-static int ssl23_get_server_hello(SSL *s);
-static SSL_METHOD *ssl23_get_client_method(int ver)
-        {
-        if (ver == SSL2_VERSION)
-                return(SSLv2_client_method());
-        if (ver == SSL3_VERSION)
-                return(SSLv3_client_method());
-        else if (ver == TLS1_VERSION)
-                return(TLSv1_client_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *SSLv23_client_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD SSLv23_client_data;
-
-        if (init)
-                {
-                memcpy((char *)&SSLv23_client_data,
-                        (char *)sslv23_base_method(),sizeof(SSL_METHOD));
-                SSLv23_client_data.ssl_connect=ssl23_connect;
-                SSLv23_client_data.get_ssl_method=ssl23_get_client_method;
-                init=0;
-                }
-        return(&SSLv23_client_data);
-        }
-
-int ssl23_connect(SSL *s)
-        {
-        BUF_MEM *buf;
-        unsigned long Time=time(NULL);
-        void (*cb)()=NULL;
-        int ret= -1;
-        int new_state,state;
-
-        RAND_seed(&Time,sizeof(Time));
-        ERR_clear_error();
-        clear_sys_error();
-
-        if (s->info_callback != NULL)
-                cb=s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-        
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
-        s->in_handshake++;
-
-        for (;;)
-                {
-                state=s->state;
-
-                switch(s->state)
-                        {
-                case SSL_ST_BEFORE:
-                case SSL_ST_CONNECT:
-                case SSL_ST_BEFORE|SSL_ST_CONNECT:
-                case SSL_ST_OK|SSL_ST_CONNECT:
-
-                        if (s->session != NULL)
-                                {
-                                SSLerr(SSL_F_SSL23_CONNECT,SSL_R_SSL23_DOING_SESSION_ID_REUSE);
-                                ret= -1;
-                                goto end;
-                                }
-                        s->server=0;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
-
-                        /* s->version=TLS1_VERSION; */
-                        s->type=SSL_ST_CONNECT;
-
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                s->init_buf=buf;
-                                }
-
-                        if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
-
-                        ssl3_init_finished_mac(s);
-
-                        s->state=SSL23_ST_CW_CLNT_HELLO_A;
-                        s->ctx->stats.sess_connect++;
-                        s->init_num=0;
-                        break;
-
-                case SSL23_ST_CW_CLNT_HELLO_A:
-                case SSL23_ST_CW_CLNT_HELLO_B:
-
-                        s->shutdown=0;
-                        ret=ssl23_client_hello(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL23_ST_CR_SRVR_HELLO_A;
-                        s->init_num=0;
-
-                        break;
-
-                case SSL23_ST_CR_SRVR_HELLO_A:
-                case SSL23_ST_CR_SRVR_HELLO_B:
-                        ret=ssl23_get_server_hello(s);
-                        if (ret >= 0) cb=NULL;
-                        goto end;
-                        /* break; */
-
-                default:
-                        SSLerr(SSL_F_SSL23_CONNECT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
-                        goto end;
-                        /* break; */
-                        }
-
-                if (s->debug) { (void)BIO_flush(s->wbio); }
-
-                if ((cb != NULL) && (s->state != state))
-                        {
-                        new_state=s->state;
-                        s->state=state;
-                        cb(s,SSL_CB_CONNECT_LOOP,1);
-                        s->state=new_state;
-                        }
-                }
-end:
-        s->in_handshake--;
-        if (cb != NULL)
-                cb(s,SSL_CB_CONNECT_EXIT,ret);
-        return(ret);
-        }
-
-
-static int ssl23_client_hello(SSL *s)
-        {
-        unsigned char *buf;
-        unsigned char *p,*d;
-        int i,ch_len;
-
-        buf=(unsigned char *)s->init_buf->data;
-        if (s->state == SSL23_ST_CW_CLNT_HELLO_A)
-                {
-#if 0
-                /* don't reuse session-id's */
-                if (!ssl_get_new_session(s,0))
-                        {
-                        return(-1);
-                        }
-#endif
-
-                p=s->s3->client_random;
-                RAND_bytes(p,SSL3_RANDOM_SIZE);
-
-                /* Do the message type and length last */
-                d= &(buf[2]);
-                p=d+9;
-
-                *(d++)=SSL2_MT_CLIENT_HELLO;
-                if (!(s->options & SSL_OP_NO_TLSv1))
-                        {
-                        *(d++)=TLS1_VERSION_MAJOR;
-                        *(d++)=TLS1_VERSION_MINOR;
-                        s->client_version=TLS1_VERSION;
-                        }
-                else if (!(s->options & SSL_OP_NO_SSLv3))
-                        {
-                        *(d++)=SSL3_VERSION_MAJOR;
-                        *(d++)=SSL3_VERSION_MINOR;
-                        s->client_version=SSL3_VERSION;
-                        }
-                else if (!(s->options & SSL_OP_NO_SSLv2))
-                        {
-                        *(d++)=SSL2_VERSION_MAJOR;
-                        *(d++)=SSL2_VERSION_MINOR;
-                        s->client_version=SSL2_VERSION;
-                        }
-                else
-                        {
-                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_PROTOCOLS_AVAILABLE);
-                        return(-1);
-                        }
-
-                /* Ciphers supported */
-                i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),p);
-                if (i == 0)
-                        {
-                        /* no ciphers */
-                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
-                        return(-1);
-                        }
-                s2n(i,d);
-                p+=i;
-
-                /* put in the session-id, zero since there is no
-                 * reuse. */
-#if 0
-                s->session->session_id_length=0;
-#endif
-                s2n(0,d);
-
-                if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
-                        ch_len=SSL2_CHALLENGE_LENGTH;
-                else
-                        ch_len=SSL2_MAX_CHALLENGE_LENGTH;
-
-                /* write out sslv2 challenge */
-                if (SSL3_RANDOM_SIZE < ch_len)
-                        i=SSL3_RANDOM_SIZE;
-                else
-                        i=ch_len;
-                s2n(i,d);
-                memset(&(s->s3->client_random[0]),0,SSL3_RANDOM_SIZE);
-                RAND_bytes(&(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i);
-                memcpy(p,&(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i);
-                p+=i;
-
-                i= p- &(buf[2]);
-                buf[0]=((i>>8)&0xff)|0x80;
-                buf[1]=(i&0xff);
-
-                s->state=SSL23_ST_CW_CLNT_HELLO_B;
-                /* number of bytes to write */
-                s->init_num=i+2;
-                s->init_off=0;
-
-                ssl3_finish_mac(s,&(buf[2]),i);
-                }
-
-        /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl23_write_bytes(s));
-        }
-
-static int ssl23_get_server_hello(SSL *s)
-        {
-        char buf[8];
-        unsigned char *p;
-        int i,ch_len;
-        int n;
-
-        n=ssl23_read_bytes(s,7);
-
-        if (n != 7) return(n);
-        p=s->packet;
-
-        memcpy(buf,p,n);
-
-        if ((p[0] & 0x80) && (p[2] == SSL2_MT_SERVER_HELLO) &&
-                (p[5] == 0x00) && (p[6] == 0x02))
-                {
-                /* we are talking sslv2 */
-                /* we need to clean up the SSLv3 setup and put in the
-                 * sslv2 stuff. */
-
-                if (s->options & SSL_OP_NO_SSLv2)
-                        {
-                        SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
-                        goto err;
-                        }
-                if (s->s2 == NULL)
-                        {
-                        if (!ssl2_new(s))
-                                goto err;
-                        }
-                else
-                        ssl2_clear(s);
-
-                if (s->options & SSL_OP_NETSCAPE_CHALLENGE_BUG)
-                        ch_len=SSL2_CHALLENGE_LENGTH;
-                else
-                        ch_len=SSL2_MAX_CHALLENGE_LENGTH;
-
-                /* write out sslv2 challenge */
-                i=(SSL3_RANDOM_SIZE < ch_len)
-                        ?SSL3_RANDOM_SIZE:ch_len;
-                s->s2->challenge_length=i;
-                memcpy(s->s2->challenge,
-                        &(s->s3->client_random[SSL3_RANDOM_SIZE-i]),i);
-
-                if (s->s3 != NULL) ssl3_free(s);
-
-                if (!BUF_MEM_grow(s->init_buf,
-                        SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER))
-                        {
-                        SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,ERR_R_BUF_LIB);
-                        goto err;
-                        }
-
-                s->state=SSL2_ST_GET_SERVER_HELLO_A;
-                s->s2->ssl2_rollback=1;
-
-                /* setup the 5 bytes we have read so we get them from
-                 * the sslv2 buffer */
-                s->rstate=SSL_ST_READ_HEADER;
-                s->packet_length=n;
-                s->packet= &(s->s2->rbuf[0]);
-                memcpy(s->packet,buf,n);
-                s->s2->rbuf_left=n;
-                s->s2->rbuf_offs=0;
-
-                /* we have already written one */
-                s->s2->write_sequence=1;
-
-                s->method=SSLv2_client_method();
-                s->handshake_func=s->method->ssl_connect;
-                }
-        else if ((p[0] == SSL3_RT_HANDSHAKE) &&
-                 (p[1] == SSL3_VERSION_MAJOR) &&
-                 ((p[2] == SSL3_VERSION_MINOR) ||
-                  (p[2] == TLS1_VERSION_MINOR)) &&
-                 (p[5] == SSL3_MT_SERVER_HELLO))
-                {
-                /* we have sslv3 or tls1 */
-
-                if (!ssl_init_wbio_buffer(s,1)) goto err;
-
-                /* we are in this state */
-                s->state=SSL3_ST_CR_SRVR_HELLO_A;
-
-                /* put the 5 bytes we have read into the input buffer
-                 * for SSLv3 */
-                s->rstate=SSL_ST_READ_HEADER;
-                s->packet_length=n;
-                s->packet= &(s->s3->rbuf.buf[0]);
-                memcpy(s->packet,buf,n);
-                s->s3->rbuf.left=n;
-                s->s3->rbuf.offset=0;
-
-                if ((p[2] == SSL3_VERSION_MINOR) &&
-                        !(s->options & SSL_OP_NO_SSLv3))
-                        {
-                        s->version=SSL3_VERSION;
-                        s->method=SSLv3_client_method();
-                        }
-                else if ((p[2] == TLS1_VERSION_MINOR) &&
-                        !(s->options & SSL_OP_NO_TLSv1))
-                        {
-                        s->version=TLS1_VERSION;
-                        s->method=TLSv1_client_method();
-                        }
-                else
-                        {
-                        SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
-                        goto err;
-                        }
-                        
-                s->handshake_func=s->method->ssl_connect;
-                }
-        else if ((p[0] == SSL3_RT_ALERT) &&
-                 (p[1] == SSL3_VERSION_MAJOR) &&
-                 ((p[2] == SSL3_VERSION_MINOR) ||
-                  (p[2] == TLS1_VERSION_MINOR)) &&
-                 (p[3] == 0) &&
-                 (p[4] == 2))
-                {
-                void (*cb)()=NULL;
-                int j;
-
-                /* An alert */
-                if (s->info_callback != NULL)
-                        cb=s->info_callback;
-                else if (s->ctx->info_callback != NULL)
-                        cb=s->ctx->info_callback;
- 
-                i=p[5];
-                if (cb != NULL)
-                        {
-                        j=(i<<8)|p[6];
-                        cb(s,SSL_CB_READ_ALERT,j);
-                        }
-
-                s->rwstate=SSL_NOTHING;
-                SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_AD_REASON_OFFSET+p[6]);
-                goto err;
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNKNOWN_PROTOCOL);
-                goto err;
-                }
-        s->init_num=0;
-
-        /* Since, if we are sending a ssl23 client hello, we are not
-         * reusing a session-id */
-        if (!ssl_get_new_session(s,0))
-                goto err;
-
-        s->first_packet=1;
-        return(SSL_connect(s));
-err:
-        return(-1);
-        }
-
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
deleted file mode 100644
index 822a395837..0000000000
--- a/src/lib/libssl/s23_lib.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ssl/s23_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 <openssl/objects.h>
-#include "ssl_locl.h"
-
-static int ssl23_num_ciphers(void );
-static SSL_CIPHER *ssl23_get_cipher(unsigned int u);
-static int ssl23_read(SSL *s, void *buf, int len);
-static int ssl23_write(SSL *s, const void *buf, int len);
-static long ssl23_default_timeout(void );
-static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
-static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p);
-char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT;
-
-static SSL_METHOD SSLv23_data= {
-        TLS1_VERSION,
-        tls1_new,
-        tls1_clear,
-        tls1_free,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl23_read,
-        (int (*)(struct ssl_st *, char *, int))ssl_undefined_function,
-        ssl23_write,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_ok,
-        ssl3_ctrl,
-        ssl3_ctx_ctrl,
-        ssl23_get_cipher_by_char,
-        ssl23_put_cipher_by_char,
-        ssl_undefined_function,
-        ssl23_num_ciphers,
-        ssl23_get_cipher,
-        ssl_bad_method,
-        ssl23_default_timeout,
-        &ssl3_undef_enc_method,
-        };
-
-static long ssl23_default_timeout(void)
-        {
-        return(300);
-        }
-
-SSL_METHOD *sslv23_base_method(void)
-        {
-        return(&SSLv23_data);
-        }
-
-static int ssl23_num_ciphers(void)
-        {
-        return(ssl3_num_ciphers()+ssl2_num_ciphers());
-        }
-
-static SSL_CIPHER *ssl23_get_cipher(unsigned int u)
-        {
-        unsigned int uu=ssl3_num_ciphers();
-
-        if (u < uu)
-                return(ssl3_get_cipher(u));
-        else
-                return(ssl2_get_cipher(u-uu));
-        }
-
-/* This function needs to check if the ciphers required are actually
- * available */
-static SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
-        {
-        SSL_CIPHER c,*cp;
-        unsigned long id;
-        int n;
-
-        n=ssl3_num_ciphers();
-        id=0x03000000|((unsigned long)p[0]<<16L)|
-                ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
-        c.id=id;
-        cp=ssl3_get_cipher_by_char(p);
-        if (cp == NULL)
-                cp=ssl2_get_cipher_by_char(p);
-        return(cp);
-        }
-
-static int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
-        {
-        long l;
-
-        /* We can write SSLv2 and SSLv3 ciphers */
-        if (p != NULL)
-                {
-                l=c->id;
-                p[0]=((unsigned char)(l>>16L))&0xFF;
-                p[1]=((unsigned char)(l>> 8L))&0xFF;
-                p[2]=((unsigned char)(l     ))&0xFF;
-                }
-        return(3);
-        }
-
-static int ssl23_read(SSL *s, void *buf, int len)
-        {
-        int n;
-
-#if 0
-        if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
-                {
-                s->rwstate=SSL_NOTHING;
-                return(0);
-                }
-#endif
-        clear_sys_error();
-        if (SSL_in_init(s) && (!s->in_handshake))
-                {
-                n=s->handshake_func(s);
-                if (n < 0) return(n);
-                if (n == 0)
-                        {
-                        SSLerr(SSL_F_SSL23_READ,SSL_R_SSL_HANDSHAKE_FAILURE);
-                        return(-1);
-                        }
-                return(SSL_read(s,buf,len));
-                }
-        else
-                {
-                ssl_undefined_function(s);
-                return(-1);
-                }
-        }
-
-static int ssl23_write(SSL *s, const void *buf, int len)
-        {
-        int n;
-
-#if 0
-        if (s->shutdown & SSL_SENT_SHUTDOWN)
-                {
-                s->rwstate=SSL_NOTHING;
-                return(0);
-                }
-#endif
-        clear_sys_error();
-        if (SSL_in_init(s) && (!s->in_handshake))
-                {
-                n=s->handshake_func(s);
-                if (n < 0) return(n);
-                if (n == 0)
-                        {
-                        SSLerr(SSL_F_SSL23_WRITE,SSL_R_SSL_HANDSHAKE_FAILURE);
-                        return(-1);
-                        }
-                return(SSL_write(s,buf,len));
-                }
-        else
-                {
-                ssl_undefined_function(s);
-                return(-1);
-                }
-        }
diff --git a/src/lib/libssl/s23_pkt.c b/src/lib/libssl/s23_pkt.c
deleted file mode 100644
index 8370ea508c..0000000000
--- a/src/lib/libssl/s23_pkt.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ssl/s23_pkt.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>
-#define USE_SOCKETS
-#include <openssl/evp.h>
-#include <openssl/buffer.h>
-#include "ssl_locl.h"
-
-int ssl23_write_bytes(SSL *s)
-        {
-        int i,num,tot;
-        char *buf;
-
-        buf=s->init_buf->data;
-        tot=s->init_off;
-        num=s->init_num;
-        for (;;)
-                {
-                s->rwstate=SSL_WRITING;
-                i=BIO_write(s->wbio,&(buf[tot]),num);
-                if (i <= 0)
-                        {
-                        s->init_off=tot;
-                        s->init_num=num;
-                        return(i);
-                        }
-                s->rwstate=SSL_NOTHING;
-                if (i == num) return(tot+i);
-
-                num-=i;
-                tot+=i;
-                }
-        }
-
-/* only return when we have read 'n' bytes */
-int ssl23_read_bytes(SSL *s, int n)
-        {
-        unsigned char *p;
-        int j;
-
-        if (s->packet_length < (unsigned int)n)
-                {
-                p=s->packet;
-
-                for (;;)
-                        {
-                        s->rwstate=SSL_READING;
-                        j=BIO_read(s->rbio,(char *)&(p[s->packet_length]),
-                                n-s->packet_length);
-                        if (j <= 0)
-                                return(j);
-                        s->rwstate=SSL_NOTHING;
-                        s->packet_length+=j;
-                        if (s->packet_length >= (unsigned int)n)
-                                return(s->packet_length);
-                        }
-                }
-        return(n);
-        }
-
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
deleted file mode 100644
index e4122f2d78..0000000000
--- a/src/lib/libssl/s23_srvr.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/* ssl/s23_srvr.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *ssl23_get_server_method(int ver);
-int ssl23_get_client_hello(SSL *s);
-static SSL_METHOD *ssl23_get_server_method(int ver)
-        {
-        if (ver == SSL2_VERSION)
-                return(SSLv2_server_method());
-        if (ver == SSL3_VERSION)
-                return(SSLv3_server_method());
-        else if (ver == TLS1_VERSION)
-                return(TLSv1_server_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *SSLv23_server_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD SSLv23_server_data;
-
-        if (init)
-                {
-                memcpy((char *)&SSLv23_server_data,
-                        (char *)sslv23_base_method(),sizeof(SSL_METHOD));
-                SSLv23_server_data.ssl_accept=ssl23_accept;
-                SSLv23_server_data.get_ssl_method=ssl23_get_server_method;
-                init=0;
-                }
-        return(&SSLv23_server_data);
-        }
-
-int ssl23_accept(SSL *s)
-        {
-        BUF_MEM *buf;
-        unsigned long Time=time(NULL);
-        void (*cb)()=NULL;
-        int ret= -1;
-        int new_state,state;
-
-        RAND_seed(&Time,sizeof(Time));
-        ERR_clear_error();
-        clear_sys_error();
-
-        if (s->info_callback != NULL)
-                cb=s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-        
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
-        s->in_handshake++;
-
-        for (;;)
-                {
-                state=s->state;
-
-                switch(s->state)
-                        {
-                case SSL_ST_BEFORE:
-                case SSL_ST_ACCEPT:
-                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
-                case SSL_ST_OK|SSL_ST_ACCEPT:
-
-                        s->server=1;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
-
-                        /* s->version=SSL3_VERSION; */
-                        s->type=SSL_ST_ACCEPT;
-
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                s->init_buf=buf;
-                                }
-
-                        ssl3_init_finished_mac(s);
-
-                        s->state=SSL23_ST_SR_CLNT_HELLO_A;
-                        s->ctx->stats.sess_accept++;
-                        s->init_num=0;
-                        break;
-
-                case SSL23_ST_SR_CLNT_HELLO_A:
-                case SSL23_ST_SR_CLNT_HELLO_B:
-
-                        s->shutdown=0;
-                        ret=ssl23_get_client_hello(s);
-                        if (ret >= 0) cb=NULL;
-                        goto end;
-                        /* break; */
-
-                default:
-                        SSLerr(SSL_F_SSL23_ACCEPT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
-                        goto end;
-                        /* break; */
-                        }
-
-                if ((cb != NULL) && (s->state != state))
-                        {
-                        new_state=s->state;
-                        s->state=state;
-                        cb(s,SSL_CB_ACCEPT_LOOP,1);
-                        s->state=new_state;
-                        }
-                }
-end:
-        if (cb != NULL)
-                cb(s,SSL_CB_ACCEPT_EXIT,ret);
-        s->in_handshake--;
-        return(ret);
-        }
-
-
-int ssl23_get_client_hello(SSL *s)
-        {
-        char buf_space[8];
-        char *buf= &(buf_space[0]);
-        unsigned char *p,*d,*dd;
-        unsigned int i;
-        unsigned int csl,sil,cl;
-        int n=0,j,tls1=0;
-        int type=0,use_sslv2_strong=0;
-        int v[2];
-
-        /* read the initial header */
-        v[0]=v[1]=0;
-        if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
-                {
-                if (!ssl3_setup_buffers(s)) goto err;
-
-                n=ssl23_read_bytes(s,7);
-                if (n != 7) return(n); /* n == -1 || n == 0 */
-
-                p=s->packet;
-
-                memcpy(buf,p,n);
-
-                if ((p[0] & 0x80) && (p[2] == SSL2_MT_CLIENT_HELLO))
-                        {
-                        /* SSLv2 header */
-                        if ((p[3] == 0x00) && (p[4] == 0x02))
-                                {
-                                v[0]=p[3]; v[1]=p[4];
-                                /* SSLv2 */
-                                if (!(s->options & SSL_OP_NO_SSLv2))
-                                        type=1;
-                                }
-                        else if (p[3] == SSL3_VERSION_MAJOR)
-                                {
-                                v[0]=p[3]; v[1]=p[4];
-                                /* SSLv3/TLSv1 */
-                                if (p[4] >= TLS1_VERSION_MINOR)
-                                        {
-                                        if (!(s->options & SSL_OP_NO_TLSv1))
-                                                {
-                                                tls1=1;
-                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
-                                                }
-                                        else if (!(s->options & SSL_OP_NO_SSLv3))
-                                                {
-                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
-                                                }
-                                        else if (!(s->options & SSL_OP_NO_SSLv2))
-                                                {
-                                                type=1;
-                                                }
-                                        }
-                                else if (!(s->options & SSL_OP_NO_SSLv3))
-                                        s->state=SSL23_ST_SR_CLNT_HELLO_B;
-                                else if (!(s->options & SSL_OP_NO_SSLv2))
-                                        type=1;
-
-                                if (s->options & SSL_OP_NON_EXPORT_FIRST)
-                                        {
-                                        STACK_OF(SSL_CIPHER) *sk;
-                                        SSL_CIPHER *c;
-                                        int ne2,ne3;
-
-                                        j=((p[0]&0x7f)<<8)|p[1];
-                                        if (j > (1024*4))
-                                                {
-                                                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_LARGE);
-                                                goto err;
-                                                }
-
-                                        n=ssl23_read_bytes(s,j+2);
-                                        if (n <= 0) return(n);
-                                        p=s->packet;
-
-                                        if ((buf=Malloc(n)) == NULL)
-                                                {
-                                                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,ERR_R_MALLOC_FAILURE);
-                                                goto err;
-                                                }
-                                        memcpy(buf,p,n);
-
-                                        p+=5;
-                                        n2s(p,csl);
-                                        p+=4;
-
-                                        sk=ssl_bytes_to_cipher_list(
-                                                s,p,csl,NULL);
-                                        if (sk != NULL)
-                                                {
-                                                ne2=ne3=0;
-                                                for (j=0; j<sk_SSL_CIPHER_num(sk); j++)
-                                                        {
-                                                        c=sk_SSL_CIPHER_value(sk,j);
-                                                        if (!SSL_C_IS_EXPORT(c))
-                                                                {
-                                                                if ((c->id>>24L) == 2L)
-                                                                        ne2=1;
-                                                                else
-                                                                        ne3=1;
-                                                                }
-                                                        }
-                                                if (ne2 && !ne3)
-                                                        {
-                                                        type=1;
-                                                        use_sslv2_strong=1;
-                                                        goto next_bit;
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                else if ((p[0] == SSL3_RT_HANDSHAKE) &&
-                         (p[1] == SSL3_VERSION_MAJOR) &&
-                         (p[5] == SSL3_MT_CLIENT_HELLO))
-                        {
-                        v[0]=p[1]; v[1]=p[2];
-                        /* true SSLv3 or tls1 */
-                        if (p[2] >= TLS1_VERSION_MINOR)
-                                {
-                                if (!(s->options & SSL_OP_NO_TLSv1))
-                                        {
-                                        type=3;
-                                        tls1=1;
-                                        }
-                                else if (!(s->options & SSL_OP_NO_SSLv3))
-                                        type=3;
-                                }
-                        else if (!(s->options & SSL_OP_NO_SSLv3))
-                                type=3;
-                        }
-                else if ((strncmp("GET ", (char *)p,4) == 0) ||
-                         (strncmp("POST ",(char *)p,5) == 0) ||
-                         (strncmp("HEAD ",(char *)p,5) == 0) ||
-                         (strncmp("PUT ", (char *)p,4) == 0))
-                        {
-                        SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_HTTP_REQUEST);
-                        goto err;
-                        }
-                else if (strncmp("CONNECT",(char *)p,7) == 0)
-                        {
-                        SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_HTTPS_PROXY_REQUEST);
-                        goto err;
-                        }
-                }
-
-next_bit:
-        if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
-                {
-                /* we have a SSLv3/TLSv1 in a SSLv2 header */
-                type=2;
-                p=s->packet;
-                n=((p[0]&0x7f)<<8)|p[1];
-                if (n > (1024*4))
-                        {
-                        SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_LARGE);
-                        goto err;
-                        }
-
-                j=ssl23_read_bytes(s,n+2);
-                if (j <= 0) return(j);
-
-                ssl3_finish_mac(s,&(s->packet[2]),s->packet_length-2);
-
-                p=s->packet;
-                p+=5;
-                n2s(p,csl);
-                n2s(p,sil);
-                n2s(p,cl);
-                d=(unsigned char *)s->init_buf->data;
-                if ((csl+sil+cl+11) != s->packet_length)
-                        {
-                        SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_LENGTH_MISMATCH);
-                        goto err;
-                        }
-
-                *(d++)=SSL3_VERSION_MAJOR;
-                if (tls1)
-                        *(d++)=TLS1_VERSION_MINOR;
-                else
-                        *(d++)=SSL3_VERSION_MINOR;
-
-                /* lets populate the random area */
-                /* get the chalenge_length */
-                i=(cl > SSL3_RANDOM_SIZE)?SSL3_RANDOM_SIZE:cl;
-                memset(d,0,SSL3_RANDOM_SIZE);
-                memcpy(&(d[SSL3_RANDOM_SIZE-i]),&(p[csl+sil]),i);
-                d+=SSL3_RANDOM_SIZE;
-
-                /* no session-id reuse */
-                *(d++)=0;
-
-                /* ciphers */
-                j=0;
-                dd=d;
-                d+=2;
-                for (i=0; i<csl; i+=3)
-                        {
-                        if (p[i] != 0) continue;
-                        *(d++)=p[i+1];
-                        *(d++)=p[i+2];
-                        j+=2;
-                        }
-                s2n(j,dd);
-
-                /* COMPRESSION */
-                *(d++)=1;
-                *(d++)=0;
-                
-                i=(d-(unsigned char *)s->init_buf->data);
-
-                /* get the data reused from the init_buf */
-                s->s3->tmp.reuse_message=1;
-                s->s3->tmp.message_type=SSL3_MT_CLIENT_HELLO;
-                s->s3->tmp.message_size=i;
-                }
-
-        if (type == 1)
-                {
-                /* we are talking sslv2 */
-                /* we need to clean up the SSLv3/TLSv1 setup and put in the
-                 * sslv2 stuff. */
-
-                if (s->s2 == NULL)
-                        {
-                        if (!ssl2_new(s))
-                                goto err;
-                        }
-                else
-                        ssl2_clear(s);
-
-                if (s->s3 != NULL) ssl3_free(s);
-
-                if (!BUF_MEM_grow(s->init_buf,
-                        SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER))
-                        {
-                        goto err;
-                        }
-
-                s->state=SSL2_ST_GET_CLIENT_HELLO_A;
-                if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
-                        use_sslv2_strong)
-                        s->s2->ssl2_rollback=0;
-                else
-                        s->s2->ssl2_rollback=1;
-
-                /* setup the 5 bytes we have read so we get them from
-                 * the sslv2 buffer */
-                s->rstate=SSL_ST_READ_HEADER;
-                s->packet_length=n;
-                s->packet= &(s->s2->rbuf[0]);
-                memcpy(s->packet,buf,n);
-                s->s2->rbuf_left=n;
-                s->s2->rbuf_offs=0;
-
-                s->method=SSLv2_server_method();
-                s->handshake_func=s->method->ssl_accept;
-                }
-
-        if ((type == 2) || (type == 3))
-                {
-                /* we have SSLv3/TLSv1 */
-
-                if (!ssl_init_wbio_buffer(s,1)) goto err;
-
-                /* we are in this state */
-                s->state=SSL3_ST_SR_CLNT_HELLO_A;
-
-                if (type == 3)
-                        {
-                        /* put the 'n' bytes we have read into the input buffer
-                         * for SSLv3 */
-                        s->rstate=SSL_ST_READ_HEADER;
-                        s->packet_length=n;
-                        s->packet= &(s->s3->rbuf.buf[0]);
-                        memcpy(s->packet,buf,n);
-                        s->s3->rbuf.left=n;
-                        s->s3->rbuf.offset=0;
-                        }
-                else
-                        {
-                        s->packet_length=0;
-                        s->s3->rbuf.left=0;
-                        s->s3->rbuf.offset=0;
-                        }
-
-                if (tls1)
-                        {
-                        s->version=TLS1_VERSION;
-                        s->method=TLSv1_server_method();
-                        }
-                else
-                        {
-                        s->version=SSL3_VERSION;
-                        s->method=SSLv3_server_method();
-                        }
-                s->client_version=(v[0]<<8)|v[1];
-                s->handshake_func=s->method->ssl_accept;
-                }
-        
-        if ((type < 1) || (type > 3))
-                {
-                /* bad, very bad */
-                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNKNOWN_PROTOCOL);
-                goto err;
-                }
-        s->init_num=0;
-
-        if (buf != buf_space) Free(buf);
-        s->first_packet=1;
-        return(SSL_accept(s));
-err:
-        if (buf != buf_space) Free(buf);
-        return(-1);
-        }
-
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c
deleted file mode 100644
index f3f27715d5..0000000000
--- a/src/lib/libssl/s3_both.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/* ssl/s3_both.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include "ssl_locl.h"
-
-int ssl3_send_finished(SSL *s, int a, int b, unsigned char *sender,
-             int slen)
-        {
-        unsigned char *p,*d;
-        int i;
-        unsigned long l;
-
-        if (s->state == a)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-
-                i=s->method->ssl3_enc->final_finish_mac(s,
-                        &(s->s3->finish_dgst1),
-                        &(s->s3->finish_dgst2),
-                        sender,slen,p);
-                p+=i;
-                l=i;
-
-#ifdef WIN16
-                /* MSVC 1.5 does not clear the top bytes of the word unless
-                 * I do this.
-                 */
-                l&=0xffff;
-#endif
-
-                *(d++)=SSL3_MT_FINISHED;
-                l2n3(l,d);
-                s->init_num=(int)l+4;
-                s->init_off=0;
-
-                s->state=b;
-                }
-
-        /* SSL3_ST_SEND_xxxxxx_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
-
-int ssl3_get_finished(SSL *s, int a, int b)
-        {
-        int al,i,ok;
-        long n;
-        unsigned char *p;
-
-        /* the mac has already been generated when we received the
-         * change cipher spec message and is in s->s3->tmp.in_dgst[12]
-         */ 
-
-        n=ssl3_get_message(s,
-                a,
-                b,
-                SSL3_MT_FINISHED,
-                64, /* should actually be 36+4 :-) */
-                &ok);
-
-        if (!ok) return((int)n);
-
-        /* If this occurs if we has missed a message */
-        if (!s->s3->change_cipher_spec)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_FINISHED,SSL_R_GOT_A_FIN_BEFORE_A_CCS);
-                goto f_err;
-                }
-        s->s3->change_cipher_spec=0;
-
-        p=(unsigned char *)s->init_buf->data;
-
-        i=s->method->ssl3_enc->finish_mac_length;
-
-        if (i != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_FINISHED,SSL_R_BAD_DIGEST_LENGTH);
-                goto f_err;
-                }
-
-        if (memcmp(  p,    (char *)&(s->s3->tmp.finish_md[0]),i) != 0)
-                {
-                al=SSL_AD_DECRYPT_ERROR;
-                SSLerr(SSL_F_SSL3_GET_FINISHED,SSL_R_DIGEST_CHECK_FAILED);
-                goto f_err;
-                }
-
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-        return(0);
-        }
-
-/* for these 2 messages, we need to
- * ssl->enc_read_ctx                    re-init
- * ssl->s3->read_sequence               zero
- * ssl->s3->read_mac_secret             re-init
- * ssl->session->read_sym_enc           assign
- * ssl->session->read_compression       assign
- * ssl->session->read_hash              assign
- */
-int ssl3_send_change_cipher_spec(SSL *s, int a, int b)
-        { 
-        unsigned char *p;
-
-        if (s->state == a)
-                {
-                p=(unsigned char *)s->init_buf->data;
-                *p=SSL3_MT_CCS;
-                s->init_num=1;
-                s->init_off=0;
-
-                s->state=b;
-                }
-
-        /* SSL3_ST_CW_CHANGE_B */
-        return(ssl3_do_write(s,SSL3_RT_CHANGE_CIPHER_SPEC));
-        }
-
-unsigned long ssl3_output_cert_chain(SSL *s, X509 *x)
-        {
-        unsigned char *p;
-        int n,i;
-        unsigned long l=7;
-        BUF_MEM *buf;
-        X509_STORE_CTX xs_ctx;
-        X509_OBJECT obj;
-
-        /* TLSv1 sends a chain with nothing in it, instead of an alert */
-        buf=s->init_buf;
-        if (!BUF_MEM_grow(buf,(int)(10)))
-                {
-                SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
-                return(0);
-                }
-        if (x != NULL)
-                {
-                X509_STORE_CTX_init(&xs_ctx,s->ctx->cert_store,NULL,NULL);
-
-                for (;;)
-                        {
-                        n=i2d_X509(x,NULL);
-                        if (!BUF_MEM_grow(buf,(int)(n+l+3)))
-                                {
-                                SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
-                                return(0);
-                                }
-                        p=(unsigned char *)&(buf->data[l]);
-                        l2n3(n,p);
-                        i2d_X509(x,&p);
-                        l+=n+3;
-                        if (X509_NAME_cmp(X509_get_subject_name(x),
-                                X509_get_issuer_name(x)) == 0) break;
-
-                        i=X509_STORE_get_by_subject(&xs_ctx,X509_LU_X509,
-                                X509_get_issuer_name(x),&obj);
-                        if (i <= 0) break;
-                        x=obj.data.x509;
-                        /* Count is one too high since the X509_STORE_get uped the
-                         * ref count */
-                        X509_free(x);
-                        }
-
-                X509_STORE_CTX_cleanup(&xs_ctx);
-                }
-
-        /* Thawte special :-) */
-        if (s->ctx->extra_certs != NULL)
-        for (i=0; i<sk_X509_num(s->ctx->extra_certs); i++)
-                {
-                x=sk_X509_value(s->ctx->extra_certs,i);
-                n=i2d_X509(x,NULL);
-                if (!BUF_MEM_grow(buf,(int)(n+l+3)))
-                        {
-                        SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
-                        return(0);
-                        }
-                p=(unsigned char *)&(buf->data[l]);
-                l2n3(n,p);
-                i2d_X509(x,&p);
-                l+=n+3;
-                }
-
-        l-=7;
-        p=(unsigned char *)&(buf->data[4]);
-        l2n3(l,p);
-        l+=3;
-        p=(unsigned char *)&(buf->data[0]);
-        *(p++)=SSL3_MT_CERTIFICATE;
-        l2n3(l,p);
-        l+=4;
-        return(l);
-        }
-
-long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
-        {
-        unsigned char *p;
-        unsigned long l;
-        long n;
-        int i,al;
-
-        if (s->s3->tmp.reuse_message)
-                {
-                s->s3->tmp.reuse_message=0;
-                if ((mt >= 0) && (s->s3->tmp.message_type != mt))
-                        {
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_GET_MESSAGE,SSL_R_UNEXPECTED_MESSAGE);
-                        goto f_err;
-                        }
-                *ok=1;
-                return((int)s->s3->tmp.message_size);
-                }
-
-        p=(unsigned char *)s->init_buf->data;
-
-        if (s->state == st1)
-                {
-                i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
-                                  4-s->init_num);
-                if (i < (4-s->init_num))
-                        {
-                        *ok=0;
-                        return(ssl3_part_read(s,i));
-                        }
-
-                if ((mt >= 0) && (*p != mt))
-                        {
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_GET_MESSAGE,SSL_R_UNEXPECTED_MESSAGE);
-                        goto f_err;
-                        }
-                s->s3->tmp.message_type= *(p++);
-
-                n2l3(p,l);
-                if (l > (unsigned long)max)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_MESSAGE,SSL_R_EXCESSIVE_MESSAGE_SIZE);
-                        goto f_err;
-                        }
-                if (l && !BUF_MEM_grow(s->init_buf,(int)l))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_MESSAGE,ERR_R_BUF_LIB);
-                        goto err;
-                        }
-                s->s3->tmp.message_size=l;
-                s->state=stn;
-
-                s->init_num=0;
-                }
-
-        /* next state (stn) */
-        p=(unsigned char *)s->init_buf->data;
-        n=s->s3->tmp.message_size;
-        if (n > 0)
-                {
-                i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],n);
-                if (i != (int)n)
-                        {
-                        *ok=0;
-                        return(ssl3_part_read(s,i));
-                        }
-                }
-        *ok=1;
-        return(n);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        *ok=0;
-        return(-1);
-        }
-
-int ssl_cert_type(X509 *x, EVP_PKEY *pkey)
-        {
-        EVP_PKEY *pk;
-        int ret= -1,i,j;
-
-        if (pkey == NULL)
-                pk=X509_get_pubkey(x);
-        else
-                pk=pkey;
-        if (pk == NULL) goto err;
-
-        i=pk->type;
-        if (i == EVP_PKEY_RSA)
-                {
-                ret=SSL_PKEY_RSA_ENC;
-                if (x != NULL)
-                        {
-                        j=X509_get_ext_count(x);
-                        /* check to see if this is a signing only certificate */
-                        /* EAY EAY EAY EAY */
-                        }
-                }
-        else if (i == EVP_PKEY_DSA)
-                {
-                ret=SSL_PKEY_DSA_SIGN;
-                }
-        else if (i == EVP_PKEY_DH)
-                {
-                /* if we just have a key, we needs to be guess */
-
-                if (x == NULL)
-                        ret=SSL_PKEY_DH_DSA;
-                else
-                        {
-                        j=X509_get_signature_type(x);
-                        if (j == EVP_PKEY_RSA)
-                                ret=SSL_PKEY_DH_RSA;
-                        else if (j== EVP_PKEY_DSA)
-                                ret=SSL_PKEY_DH_DSA;
-                        else ret= -1;
-                        }
-                }
-        else
-                ret= -1;
-
-err:
-        if(!pkey) EVP_PKEY_free(pk);
-        return(ret);
-        }
-
-int ssl_verify_alarm_type(long type)
-        {
-        int al;
-
-        switch(type)
-                {
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-        case X509_V_ERR_UNABLE_TO_GET_CRL:
-                al=SSL_AD_UNKNOWN_CA;
-                break;
-        case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
-        case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
-        case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-        case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
-        case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
-        case X509_V_ERR_CERT_NOT_YET_VALID:
-        case X509_V_ERR_CRL_NOT_YET_VALID:
-                al=SSL_AD_BAD_CERTIFICATE;
-                break;
-        case X509_V_ERR_CERT_SIGNATURE_FAILURE:
-        case X509_V_ERR_CRL_SIGNATURE_FAILURE:
-                al=SSL_AD_DECRYPT_ERROR;
-                break;
-        case X509_V_ERR_CERT_HAS_EXPIRED:
-        case X509_V_ERR_CRL_HAS_EXPIRED:
-                al=SSL_AD_CERTIFICATE_EXPIRED;
-                break;
-        case X509_V_ERR_CERT_REVOKED:
-                al=SSL_AD_CERTIFICATE_REVOKED;
-                break;
-        case X509_V_ERR_OUT_OF_MEM:
-                al=SSL_AD_INTERNAL_ERROR;
-                break;
-        case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-        case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
-        case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
-        case X509_V_ERR_CERT_CHAIN_TOO_LONG:
-                al=SSL_AD_UNKNOWN_CA;
-                break;
-        case X509_V_ERR_APPLICATION_VERIFICATION:
-                al=SSL_AD_HANDSHAKE_FAILURE;
-                break;
-        default:
-                al=SSL_AD_CERTIFICATE_UNKNOWN;
-                break;
-                }
-        return(al);
-        }
-
-int ssl3_setup_buffers(SSL *s)
-        {
-        unsigned char *p;
-        unsigned int extra;
-
-        if (s->s3->rbuf.buf == NULL)
-                {
-                if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)
-                        extra=SSL3_RT_MAX_EXTRA;
-                else
-                        extra=0;
-                if ((p=(unsigned char *)Malloc(SSL3_RT_MAX_PACKET_SIZE+extra))
-                        == NULL)
-                        goto err;
-                s->s3->rbuf.buf=p;
-                }
-
-        if (s->s3->wbuf.buf == NULL)
-                {
-                if ((p=(unsigned char *)Malloc(SSL3_RT_MAX_PACKET_SIZE))
-                        == NULL)
-                        goto err;
-                s->s3->wbuf.buf=p;
-                }
-        s->packet= &(s->s3->rbuf.buf[0]);
-        return(1);
-err:
-        SSLerr(SSL_F_SSL3_SETUP_BUFFERS,ERR_R_MALLOC_FAILURE);
-        return(0);
-        }
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
deleted file mode 100644
index d3e6b4d1e5..0000000000
--- a/src/lib/libssl/s3_clnt.c
+++ /dev/null
@@ -1,1729 +0,0 @@
-/* ssl/s3_clnt.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *ssl3_get_client_method(int ver);
-static int ssl3_client_hello(SSL *s);
-static int ssl3_get_server_hello(SSL *s);
-static int ssl3_get_certificate_request(SSL *s);
-static int ca_dn_cmp(X509_NAME **a,X509_NAME **b);
-static int ssl3_get_server_done(SSL *s);
-static int ssl3_send_client_verify(SSL *s);
-static int ssl3_send_client_certificate(SSL *s);
-static int ssl3_send_client_key_exchange(SSL *s);
-static int ssl3_get_key_exchange(SSL *s);
-static int ssl3_get_server_certificate(SSL *s);
-static int ssl3_check_cert_and_algorithm(SSL *s);
-static SSL_METHOD *ssl3_get_client_method(int ver)
-        {
-        if (ver == SSL3_VERSION)
-                return(SSLv3_client_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *SSLv3_client_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD SSLv3_client_data;
-
-        if (init)
-                {
-                init=0;
-                memcpy((char *)&SSLv3_client_data,(char *)sslv3_base_method(),
-                        sizeof(SSL_METHOD));
-                SSLv3_client_data.ssl_connect=ssl3_connect;
-                SSLv3_client_data.get_ssl_method=ssl3_get_client_method;
-                }
-        return(&SSLv3_client_data);
-        }
-
-int ssl3_connect(SSL *s)
-        {
-        BUF_MEM *buf;
-        unsigned long Time=time(NULL),l;
-        long num1;
-        void (*cb)()=NULL;
-        int ret= -1;
-        int new_state,state,skip=0;;
-
-        RAND_seed(&Time,sizeof(Time));
-        ERR_clear_error();
-        clear_sys_error();
-
-        if (s->info_callback != NULL)
-                cb=s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-        
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
-        s->in_handshake++;
-
-        for (;;)
-                {
-                state=s->state;
-
-                switch(s->state)
-                        {
-                case SSL_ST_RENEGOTIATE:
-                        s->new_session=1;
-                        s->state=SSL_ST_CONNECT;
-                        s->ctx->stats.sess_connect_renegotiate++;
-                        /* break */
-                case SSL_ST_BEFORE:
-                case SSL_ST_CONNECT:
-                case SSL_ST_BEFORE|SSL_ST_CONNECT:
-                case SSL_ST_OK|SSL_ST_CONNECT:
-
-                        s->server=0;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
-
-                        if ((s->version & 0xff00 ) != 0x0300)
-                                abort();
-                        /* s->version=SSL3_VERSION; */
-                        s->type=SSL_ST_CONNECT;
-
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                s->init_buf=buf;
-                                }
-
-                        if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
-
-                        /* setup buffing BIO */
-                        if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
-
-                        /* don't push the buffering BIO quite yet */
-
-                        ssl3_init_finished_mac(s);
-
-                        s->state=SSL3_ST_CW_CLNT_HELLO_A;
-                        s->ctx->stats.sess_connect++;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CW_CLNT_HELLO_A:
-                case SSL3_ST_CW_CLNT_HELLO_B:
-
-                        s->shutdown=0;
-                        ret=ssl3_client_hello(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_HELLO_A;
-                        s->init_num=0;
-
-                        /* turn on buffering for the next lot of output */
-                        if (s->bbio != s->wbio)
-                                s->wbio=BIO_push(s->bbio,s->wbio);
-
-                        break;
-
-                case SSL3_ST_CR_SRVR_HELLO_A:
-                case SSL3_ST_CR_SRVR_HELLO_B:
-                        ret=ssl3_get_server_hello(s);
-                        if (ret <= 0) goto end;
-                        if (s->hit)
-                                s->state=SSL3_ST_CR_FINISHED_A;
-                        else
-                                s->state=SSL3_ST_CR_CERT_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CR_CERT_A:
-                case SSL3_ST_CR_CERT_B:
-                        /* Check if it is anon DH */
-                        if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
-                                {
-                                ret=ssl3_get_server_certificate(s);
-                                if (ret <= 0) goto end;
-                                }
-                        else
-                                skip=1;
-                        s->state=SSL3_ST_CR_KEY_EXCH_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CR_KEY_EXCH_A:
-                case SSL3_ST_CR_KEY_EXCH_B:
-                        ret=ssl3_get_key_exchange(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_CERT_REQ_A;
-                        s->init_num=0;
-
-                        /* at this point we check that we have the
-                         * required stuff from the server */
-                        if (!ssl3_check_cert_and_algorithm(s))
-                                {
-                                ret= -1;
-                                goto end;
-                                }
-                        break;
-
-                case SSL3_ST_CR_CERT_REQ_A:
-                case SSL3_ST_CR_CERT_REQ_B:
-                        ret=ssl3_get_certificate_request(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_DONE_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CR_SRVR_DONE_A:
-                case SSL3_ST_CR_SRVR_DONE_B:
-                        ret=ssl3_get_server_done(s);
-                        if (ret <= 0) goto end;
-                        if (s->s3->tmp.cert_req)
-                                s->state=SSL3_ST_CW_CERT_A;
-                        else
-                                s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
-
-                        break;
-
-                case SSL3_ST_CW_CERT_A:
-                case SSL3_ST_CW_CERT_B:
-                case SSL3_ST_CW_CERT_C:
-                case SSL3_ST_CW_CERT_D:
-                        ret=ssl3_send_client_certificate(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CW_KEY_EXCH_A:
-                case SSL3_ST_CW_KEY_EXCH_B:
-                        ret=ssl3_send_client_key_exchange(s);
-                        if (ret <= 0) goto end;
-                        l=s->s3->tmp.new_cipher->algorithms;
-                        /* EAY EAY EAY need to check for DH fix cert
-                         * sent back */
-                        /* For TLS, cert_req is set to 2, so a cert chain
-                         * of nothing is sent, but no verify packet is sent */
-                        if (s->s3->tmp.cert_req == 1)
-                                {
-                                s->state=SSL3_ST_CW_CERT_VRFY_A;
-                                }
-                        else
-                                {
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                                s->s3->change_cipher_spec=0;
-                                }
-
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CW_CERT_VRFY_A:
-                case SSL3_ST_CW_CERT_VRFY_B:
-                        ret=ssl3_send_client_verify(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_CHANGE_A;
-                        s->init_num=0;
-                        s->s3->change_cipher_spec=0;
-                        break;
-
-                case SSL3_ST_CW_CHANGE_A:
-                case SSL3_ST_CW_CHANGE_B:
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FINISHED_A;
-                        s->init_num=0;
-
-                        s->session->cipher=s->s3->tmp.new_cipher;
-                        if (s->s3->tmp.new_compression == NULL)
-                                s->session->compress_meth=0;
-                        else
-                                s->session->compress_meth=
-                                        s->s3->tmp.new_compression->id;
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                {
-                                ret= -1;
-                                goto end;
-                                }
-
-                        if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_CLIENT_WRITE))
-                                {
-                                ret= -1;
-                                goto end;
-                                }
-
-                        break;
-
-                case SSL3_ST_CW_FINISHED_A:
-                case SSL3_ST_CW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
-                                s->method->ssl3_enc->client_finished,
-                                s->method->ssl3_enc->client_finished_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FLUSH;
-
-                        /* clear flags */
-                        s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
-                        if (s->hit)
-                                {
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
-                                        {
-                                        s->state=SSL_ST_OK;
-                                        s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
-                                        s->s3->delay_buf_pop_ret=0;
-                                        }
-                                }
-                        else
-                                {
-                                s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
-                                }
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CR_FINISHED_A:
-                case SSL3_ST_CR_FINISHED_B:
-
-                        ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
-                                SSL3_ST_CR_FINISHED_B);
-                        if (ret <= 0) goto end;
-
-                        if (s->hit)
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                        else
-                                s->state=SSL_ST_OK;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_CW_FLUSH:
-                        /* number of bytes to be flushed */
-                        num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
-                        if (num1 > 0)
-                                {
-                                s->rwstate=SSL_WRITING;
-                                num1=BIO_flush(s->wbio);
-                                if (num1 <= 0) { ret= -1; goto end; }
-                                s->rwstate=SSL_NOTHING;
-                                }
-
-                        s->state=s->s3->tmp.next_state;
-                        break;
-
-                case SSL_ST_OK:
-                        /* clean a few things up */
-                        ssl3_cleanup_key_block(s);
-
-                        if (s->init_buf != NULL)
-                                {
-                                BUF_MEM_free(s->init_buf);
-                                s->init_buf=NULL;
-                                }
-
-                        /* If we are not 'joining' the last two packets,
-                         * remove the buffering now */
-                        if (!(s->s3->flags & SSL3_FLAGS_POP_BUFFER))
-                                ssl_free_wbio_buffer(s);
-                        /* else do it later in ssl3_write */
-
-                        s->init_num=0;
-                        s->new_session=0;
-
-                        ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
-                        if (s->hit) s->ctx->stats.sess_hit++;
-
-                        ret=1;
-                        /* s->server=0; */
-                        s->handshake_func=ssl3_connect;
-                        s->ctx->stats.sess_connect_good++;
-
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
-
-                        goto end;
-                        /* break; */
-                        
-                default:
-                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
-                        goto end;
-                        /* break; */
-                        }
-
-                /* did we do anything */
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
-                                        goto end;
-                                }
-
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_CONNECT_LOOP,1);
-                                s->state=new_state;
-                                }
-                        }
-                skip=0;
-                }
-end:
-        if (cb != NULL)
-                cb(s,SSL_CB_CONNECT_EXIT,ret);
-        s->in_handshake--;
-        return(ret);
-        }
-
-
-static int ssl3_client_hello(SSL *s)
-        {
-        unsigned char *buf;
-        unsigned char *p,*d;
-        int i,j;
-        unsigned long Time,l;
-        SSL_COMP *comp;
-
-        buf=(unsigned char *)s->init_buf->data;
-        if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
-                {
-                if ((s->session == NULL) ||
-                        (s->session->ssl_version != s->version) ||
-                        (s->session->not_resumable))
-                        {
-                        if (!ssl_get_new_session(s,0))
-                                goto err;
-                        }
-                /* else use the pre-loaded session */
-
-                p=s->s3->client_random;
-                Time=time(NULL);                        /* Time */
-                l2n(Time,p);
-                RAND_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
-
-                /* Do the message type and length last */
-                d=p= &(buf[4]);
-
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
-                s->client_version=s->version;
-
-                /* Random stuff */
-                memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
-
-                /* Session ID */
-                if (s->new_session)
-                        i=0;
-                else
-                        i=s->session->session_id_length;
-                *(p++)=i;
-                if (i != 0)
-                        {
-                        memcpy(p,s->session->session_id,i);
-                        p+=i;
-                        }
-                
-                /* Ciphers supported */
-                i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]));
-                if (i == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
-                        goto err;
-                        }
-                s2n(i,p);
-                p+=i;
-
-                /* COMPRESSION */
-                if (s->ctx->comp_methods == NULL)
-                        j=0;
-                else
-                        j=sk_SSL_COMP_num(s->ctx->comp_methods);
-                *(p++)=1+j;
-                for (i=0; i<j; i++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
-                        *(p++)=comp->id;
-                        }
-                *(p++)=0; /* Add the NULL method */
-                
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_CLIENT_HELLO;
-                l2n3(l,d);
-
-                s->state=SSL3_ST_CW_CLNT_HELLO_B;
-                /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-err:
-        return(-1);
-        }
-
-static int ssl3_get_server_hello(SSL *s)
-        {
-        STACK_OF(SSL_CIPHER) *sk;
-        SSL_CIPHER *c;
-        unsigned char *p,*d;
-        int i,al,ok;
-        unsigned int j;
-        long n;
-        SSL_COMP *comp;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_CR_SRVR_HELLO_A,
-                SSL3_ST_CR_SRVR_HELLO_B,
-                SSL3_MT_SERVER_HELLO,
-                300, /* ?? */
-                &ok);
-
-        if (!ok) return((int)n);
-        d=p=(unsigned char *)s->init_buf->data;
-
-        if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
-                s->version=(s->version&0xff00)|p[1];
-                al=SSL_AD_PROTOCOL_VERSION;
-                goto f_err;
-                }
-        p+=2;
-
-        /* load the server hello data */
-        /* load the server random */
-        memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
-
-        /* get the session-id */
-        j= *(p++);
-
-        if ((j != 0) && (j != SSL3_SESSION_ID_SIZE))
-                {
-                /* SSLref returns 16 :-( */
-                if (j < SSL2_SSL_SESSION_ID_LENGTH)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_SHORT);
-                        goto f_err;
-                        }
-                }
-        if (j != 0 && j == s->session->session_id_length
-            && memcmp(p,s->session->session_id,j) == 0)
-            {
-            if(s->sid_ctx_length != s->session->sid_ctx_length
-               || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
-                goto f_err;
-                }
-            s->hit=1;
-            }
-        else    /* a miss or crap from the other end */
-                {
-                /* If we were trying for session-id reuse, make a new
-                 * SSL_SESSION so we don't stuff up other people */
-                s->hit=0;
-                if (s->session->session_id_length > 0)
-                        {
-                        if (!ssl_get_new_session(s,0))
-                                {
-                                al=SSL_AD_INTERNAL_ERROR;
-                                goto f_err;
-                                }
-                        }
-                s->session->session_id_length=j;
-                memcpy(s->session->session_id,p,j); /* j could be 0 */
-                }
-        p+=j;
-        c=ssl_get_cipher_by_char(s,p);
-        if (c == NULL)
-                {
-                /* unknown cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
-                goto f_err;
-                }
-        p+=ssl_put_cipher_by_char(s,NULL,NULL);
-
-        sk=ssl_get_ciphers_by_id(s);
-        i=sk_SSL_CIPHER_find(sk,c);
-        if (i < 0)
-                {
-                /* we did not say we would use this cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
-                goto f_err;
-                }
-
-        if (s->hit && (s->session->cipher != c))
-                {
-                if (!(s->options &
-                        SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
-                        goto f_err;
-                        }
-                }
-        s->s3->tmp.new_cipher=c;
-
-        /* lets get the compression algorithm */
-        /* COMPRESSION */
-        j= *(p++);
-        if (j == 0)
-                comp=NULL;
-        else
-                comp=ssl3_comp_find(s->ctx->comp_methods,j);
-        
-        if ((j != 0) && (comp == NULL))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
-                goto f_err;
-                }
-        else
-                {
-                s->s3->tmp.new_compression=comp;
-                }
-
-        if (p != (d+n))
-                {
-                /* wrong packet length */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
-                goto err;
-                }
-
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        return(-1);
-        }
-
-static int ssl3_get_server_certificate(SSL *s)
-        {
-        int al,i,ok,ret= -1;
-        unsigned long n,nc,llen,l;
-        X509 *x=NULL;
-        unsigned char *p,*d,*q;
-        STACK_OF(X509) *sk=NULL;
-        SESS_CERT *sc;
-        EVP_PKEY *pkey=NULL;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_CR_CERT_A,
-                SSL3_ST_CR_CERT_B,
-                -1,
-#if defined(MSDOS) && !defined(WIN32)
-                1024*30, /* 30k max cert list :-) */
-#else
-                1024*100, /* 100k max cert list :-) */
-#endif
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if (s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE)
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
-                goto f_err;
-                }
-        d=p=(unsigned char *)s->init_buf->data;
-
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
-                goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
-                        goto f_err;
-                        }
-
-                q=p;
-                x=d2i_X509(NULL,&q,l);
-                if (x == NULL)
-                        {
-                        al=SSL_AD_BAD_CERTIFICATE;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
-                        goto f_err;
-                        }
-                if (q != (p+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
-                        goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
-                p=q;
-                }
-
-        i=ssl_verify_cert_chain(s,sk);
-        if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
-                {
-                al=ssl_verify_alarm_type(s->verify_result);
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
-                goto f_err; 
-                }
-
-        sc=ssl_sess_cert_new();
-        if (sc == NULL) goto err;
-
-        if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
-        s->session->sess_cert=sc;
-
-        sc->cert_chain=sk;
-        x=sk_X509_value(sk,0);
-        sk=NULL;
-
-        pkey=X509_get_pubkey(x);
-
-        if ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey))
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
-                goto f_err;
-                }
-
-        i=ssl_cert_type(x,pkey);
-        if (i < 0)
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
-                goto f_err;
-                }
-
-        sc->peer_cert_type=i;
-        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-        if (sc->peer_pkeys[i].x509 != NULL) /* Why would this ever happen?
-                                                                                 * We just created sc a couple of
-                                                                                 * lines ago. */
-                X509_free(sc->peer_pkeys[i].x509);
-        sc->peer_pkeys[i].x509=x;
-        sc->peer_key= &(sc->peer_pkeys[i]);
-
-        if (s->session->peer != NULL)
-                X509_free(s->session->peer);
-        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-        s->session->peer=x;
-
-        x=NULL;
-        ret=1;
-
-        if (0)
-                {
-f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        EVP_PKEY_free(pkey);
-        X509_free(x);
-        sk_X509_pop_free(sk,X509_free);
-        return(ret);
-        }
-
-static int ssl3_get_key_exchange(SSL *s)
-        {
-#ifndef NO_RSA
-        unsigned char *q,md_buf[EVP_MAX_MD_SIZE*2];
-#endif
-        EVP_MD_CTX md_ctx;
-        unsigned char *param,*p;
-        int al,i,j,param_len,ok;
-        long n,alg;
-        EVP_PKEY *pkey=NULL;
-#ifndef NO_RSA
-        RSA *rsa=NULL;
-#endif
-#ifndef NO_DH
-        DH *dh=NULL;
-#endif
-
-        n=ssl3_get_message(s,
-                SSL3_ST_CR_KEY_EXCH_A,
-                SSL3_ST_CR_KEY_EXCH_B,
-                -1,
-                1024*8, /* ?? */
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE)
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-
-        param=p=(unsigned char *)s->init_buf->data;
-
-        if (s->session->sess_cert != NULL)
-                {
-#ifndef NO_RSA
-                if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                        {
-                        RSA_free(s->session->sess_cert->peer_rsa_tmp);
-                        s->session->sess_cert->peer_rsa_tmp=NULL;
-                        }
-#endif
-#ifndef NO_DH
-                if (s->session->sess_cert->peer_dh_tmp)
-                        {
-                        DH_free(s->session->sess_cert->peer_dh_tmp);
-                        s->session->sess_cert->peer_dh_tmp=NULL;
-                        }
-#endif
-                }
-        else
-                {
-                s->session->sess_cert=ssl_sess_cert_new();
-                }
-
-        param_len=0;
-        alg=s->s3->tmp.new_cipher->algorithms;
-
-#ifndef NO_RSA
-        if (alg & SSL_kRSA)
-                {
-                if ((rsa=RSA_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_MODULUS_LENGTH);
-                        goto f_err;
-                        }
-                if (!(rsa->n=BN_bin2bn(p,i,rsa->n)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
-                        goto err;
-                        }
-                p+=i;
-
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_E_LENGTH);
-                        goto f_err;
-                        }
-                if (!(rsa->e=BN_bin2bn(p,i,rsa->e)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
-                        goto err;
-                        }
-                p+=i;
-                n-=param_len;
-
-                /* this should be because we are using an export cipher */
-                if (alg & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
-                else
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                s->session->sess_cert->peer_rsa_tmp=rsa;
-                rsa=NULL;
-                }
-        else
-#endif
-#ifndef NO_DH
-                if (alg & SSL_kEDH)
-                {
-                if ((dh=DH_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_DH_LIB);
-                        goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_P_LENGTH);
-                        goto f_err;
-                        }
-                if (!(dh->p=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
-                        goto err;
-                        }
-                p+=i;
-
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_G_LENGTH);
-                        goto f_err;
-                        }
-                if (!(dh->g=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
-                        goto err;
-                        }
-                p+=i;
-
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_PUB_KEY_LENGTH);
-                        goto f_err;
-                        }
-                if (!(dh->pub_key=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
-                        goto err;
-                        }
-                p+=i;
-                n-=param_len;
-
-#ifndef NO_RSA
-                if (alg & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
-                else
-#endif
-#ifndef NO_DSA
-                if (alg & SSL_aDSS)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
-#endif
-                /* else anonymous DH, so no certificate or pkey. */
-
-                s->session->sess_cert->peer_dh_tmp=dh;
-                dh=NULL;
-                }
-        else if ((alg & SSL_kDHr) || (alg & SSL_kDHd))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
-                goto f_err;
-                }
-#endif
-        if (alg & SSL_aFZA)
-                {
-                al=SSL_AD_HANDSHAKE_FAILURE;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
-                goto f_err;
-                }
-
-
-        /* p points to the next byte, there are 'n' bytes left */
-
-
-        /* if it was signed, check the signature */
-        if (pkey != NULL)
-                {
-                n2s(p,i);
-                n-=2;
-                j=EVP_PKEY_size(pkey);
-
-                if ((i != n) || (n > j) || (n <= 0))
-                        {
-                        /* wrong packet length */
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
-                        goto f_err;
-                        }
-
-#ifndef NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
-                        {
-                        int num;
-
-                        j=0;
-                        q=md_buf;
-                        for (num=2; num > 0; num--)
-                                {
-                                EVP_DigestInit(&md_ctx,(num == 2)
-                                        ?s->ctx->md5:s->ctx->sha1);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,param,param_len);
-                                EVP_DigestFinal(&md_ctx,q,(unsigned int *)&i);
-                                q+=i;
-                                j+=i;
-                                }
-                        i=RSA_public_decrypt((int)n,p,p,pkey->pkey.rsa,
-                                RSA_PKCS1_PADDING);
-                        if (i <= 0)
-                                {
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
-                                goto f_err;
-                                }
-                        if ((j != i) || (memcmp(p,md_buf,i) != 0))
-                                {
-                                /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
-                                goto f_err;
-                                }
-                        }
-                else
-#endif
-#ifndef NO_DSA
-                        if (pkey->type == EVP_PKEY_DSA)
-                        {
-                        /* lets do DSS */
-                        EVP_VerifyInit(&md_ctx,EVP_dss1());
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,param,param_len);
-                        if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
-                                {
-                                /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
-                                goto f_err;
-                                }
-                        }
-                else
-#endif
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        else
-                {
-                /* still data left over */
-                if (!(alg & SSL_aNULL))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                if (n != 0)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
-                        goto f_err;
-                        }
-                }
-        EVP_PKEY_free(pkey);
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        EVP_PKEY_free(pkey);
-#ifndef NO_RSA
-        if (rsa != NULL)
-                RSA_free(rsa);
-#endif
-#ifndef NO_DH
-        if (dh != NULL)
-                DH_free(dh);
-#endif
-        return(-1);
-        }
-
-static int ssl3_get_certificate_request(SSL *s)
-        {
-        int ok,ret=0;
-        unsigned long n,nc,l;
-        unsigned int llen,ctype_num,i;
-        X509_NAME *xn=NULL;
-        unsigned char *p,*d,*q;
-        STACK_OF(X509_NAME) *ca_sk=NULL;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_CR_CERT_REQ_A,
-                SSL3_ST_CR_CERT_REQ_B,
-                -1,
-#if defined(MSDOS) && !defined(WIN32)
-                1024*30,  /* 30k max cert list :-) */
-#else
-                1024*100, /* 100k max cert list :-) */
-#endif
-                &ok);
-
-        if (!ok) return((int)n);
-
-        s->s3->tmp.cert_req=0;
-
-        if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
-                goto err;
-                }
-
-        /* TLS does not like anon-DH with client cert */
-        if (s->version > SSL3_VERSION)
-                {
-                l=s->s3->tmp.new_cipher->algorithms;
-                if (l & SSL_aNULL)
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
-                        goto err;
-                        }
-                }
-
-        d=p=(unsigned char *)s->init_buf->data;
-
-        if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* get the certificate types */
-        ctype_num= *(p++);
-        if (ctype_num > SSL3_CT_NUMBER)
-                ctype_num=SSL3_CT_NUMBER;
-        for (i=0; i<ctype_num; i++)
-                s->s3->tmp.ctype[i]= p[i];
-        p+=ctype_num;
-
-        /* get the CA RDNs */
-        n2s(p,llen);
-#if 0
-{
-FILE *out;
-out=fopen("/tmp/vsign.der","w");
-fwrite(p,1,llen,out);
-fclose(out);
-}
-#endif
-
-        if ((llen+ctype_num+2+1) != n)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_LENGTH_MISMATCH);
-                goto err;
-                }
-
-        for (nc=0; nc<llen; )
-                {
-                n2s(p,l);
-                if ((l+nc+2) > llen)
-                        {
-                        if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
-                                goto cont; /* netscape bugs */
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_TOO_LONG);
-                        goto err;
-                        }
-
-                q=p;
-
-                if ((xn=d2i_X509_NAME(NULL,&q,l)) == NULL)
-                        {
-                        /* If netscape tollerance is on, ignore errors */
-                        if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
-                                goto cont;
-                        else
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
-                                goto err;
-                                }
-                        }
-
-                if (q != (p+l))
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
-                        goto err;
-                        }
-                if (!sk_X509_NAME_push(ca_sk,xn))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-
-                p+=l;
-                nc+=l+2;
-                }
-
-        if (0)
-                {
-cont:
-                ERR_clear_error();
-                }
-
-        /* we should setup a certficate to return.... */
-        s->s3->tmp.cert_req=1;
-        s->s3->tmp.ctype_num=ctype_num;
-        if (s->s3->tmp.ca_names != NULL)
-                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-        s->s3->tmp.ca_names=ca_sk;
-        ca_sk=NULL;
-
-        ret=1;
-err:
-        if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
-        return(ret);
-        }
-
-static int ca_dn_cmp(X509_NAME **a, X509_NAME **b)
-        {
-        return(X509_NAME_cmp(*a,*b));
-        }
-
-static int ssl3_get_server_done(SSL *s)
-        {
-        int ok,ret=0;
-        long n;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_CR_SRVR_DONE_A,
-                SSL3_ST_CR_SRVR_DONE_B,
-                SSL3_MT_SERVER_DONE,
-                30, /* should be very small, like 0 :-) */
-                &ok);
-
-        if (!ok) return((int)n);
-        if (n > 0)
-                {
-                /* should contain no data */
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
-                }
-        ret=1;
-        return(ret);
-        }
-
-static int ssl3_send_client_key_exchange(SSL *s)
-        {
-        unsigned char *p,*d;
-        int n;
-        unsigned long l;
-#ifndef NO_RSA
-        unsigned char *q;
-        EVP_PKEY *pkey=NULL;
-#endif
-
-        if (s->state == SSL3_ST_CW_KEY_EXCH_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-
-                l=s->s3->tmp.new_cipher->algorithms;
-
-#ifndef NO_RSA
-                if (l & SSL_kRSA)
-                        {
-                        RSA *rsa;
-                        unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
-
-                        if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                                rsa=s->session->sess_cert->peer_rsa_tmp;
-                        else
-                                {
-                                pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
-                                if ((pkey == NULL) ||
-                                        (pkey->type != EVP_PKEY_RSA) ||
-                                        (pkey->pkey.rsa == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
-                                        goto err;
-                                        }
-                                rsa=pkey->pkey.rsa;
-                                EVP_PKEY_free(pkey);
-                                }
-                                
-                        tmp_buf[0]=s->client_version>>8;
-                        tmp_buf[1]=s->client_version&0xff;
-                        RAND_bytes(&(tmp_buf[2]),SSL_MAX_MASTER_KEY_LENGTH-2);
-
-                        s->session->master_key_length=SSL_MAX_MASTER_KEY_LENGTH;
-
-                        q=p;
-                        /* Fix buf for TLS and beyond */
-                        if (s->version > SSL3_VERSION)
-                                p+=2;
-                        n=RSA_public_encrypt(SSL_MAX_MASTER_KEY_LENGTH,
-                                tmp_buf,p,rsa,RSA_PKCS1_PADDING);
-#ifdef PKCS1_CHECK
-                        if (s->options & SSL_OP_PKCS1_CHECK_1) p[1]++;
-                        if (s->options & SSL_OP_PKCS1_CHECK_2) tmp_buf[0]=0x70;
-#endif
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
-                                goto err;
-                                }
-
-                        /* Fix buf for TLS and beyond */
-                        if (s->version > SSL3_VERSION)
-                                {
-                                s2n(n,q);
-                                n+=2;
-                                }
-
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        tmp_buf,SSL_MAX_MASTER_KEY_LENGTH);
-                        memset(tmp_buf,0,SSL_MAX_MASTER_KEY_LENGTH);
-                        }
-                else
-#endif
-#ifndef NO_DH
-                if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                        {
-                        DH *dh_srvr,*dh_clnt;
-
-                        if (s->session->sess_cert->peer_dh_tmp != NULL)
-                                dh_srvr=s->session->sess_cert->peer_dh_tmp;
-                        else
-                                {
-                                /* we get them from the cert */
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
-                                goto err;
-                                }
-                        
-                        /* generate a new random key */
-                        if ((dh_clnt=DHparams_dup(dh_srvr)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
-                                goto err;
-                                }
-                        if (!DH_generate_key(dh_clnt))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
-                                goto err;
-                                }
-
-                        /* use the 'p' output buffer for the DH key, but
-                         * make sure to clear it out afterwards */
-
-                        n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
-
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
-                                goto err;
-                                }
-
-                        /* generate master key from the result */
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,p,n);
-                        /* clean up */
-                        memset(p,0,n);
-
-                        /* send off the data */
-                        n=BN_num_bytes(dh_clnt->pub_key);
-                        s2n(n,p);
-                        BN_bn2bin(dh_clnt->pub_key,p);
-                        n+=2;
-
-                        DH_free(dh_clnt);
-
-                        /* perhaps clean things up a bit EAY EAY EAY EAY*/
-                        }
-                else
-#endif
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                
-                *(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
-                l2n3(n,d);
-
-                s->state=SSL3_ST_CW_KEY_EXCH_B;
-                /* number of bytes to write */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_CW_KEY_EXCH_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-err:
-        return(-1);
-        }
-
-static int ssl3_send_client_verify(SSL *s)
-        {
-        unsigned char *p,*d;
-        unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
-        EVP_PKEY *pkey;
-#ifndef NO_RSA
-        int i=0;
-#endif
-        unsigned long n;
-#ifndef NO_DSA
-        int j;
-#endif
-
-        if (s->state == SSL3_ST_CW_CERT_VRFY_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-                pkey=s->cert->key->privatekey;
-
-                s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
-                        &(data[MD5_DIGEST_LENGTH]));
-
-#ifndef NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
-                        {
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                &(s->s3->finish_dgst1),&(data[0]));
-                        i=RSA_private_encrypt(
-                                MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
-                                data,&(p[2]),pkey->pkey.rsa,
-                                RSA_PKCS1_PADDING);
-                        if (i <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
-                                goto err;
-                                }
-                        s2n(i,p);
-                        n=i+2;
-                        }
-                else
-#endif
-#ifndef NO_DSA
-                        if (pkey->type == EVP_PKEY_DSA)
-                        {
-                        if (!DSA_sign(pkey->save_type,
-                                &(data[MD5_DIGEST_LENGTH]),
-                                SHA_DIGEST_LENGTH,&(p[2]),
-                                (unsigned int *)&j,pkey->pkey.dsa))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB);
-                                goto err;
-                                }
-                        s2n(j,p);
-                        n=j+2;
-                        }
-                else
-#endif
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,SSL_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                *(d++)=SSL3_MT_CERTIFICATE_VERIFY;
-                l2n3(n,d);
-
-                s->init_num=(int)n+4;
-                s->init_off=0;
-                }
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-err:
-        return(-1);
-        }
-
-static int ssl3_send_client_certificate(SSL *s)
-        {
-        X509 *x509=NULL;
-        EVP_PKEY *pkey=NULL;
-        int i;
-        unsigned long l;
-
-        if (s->state == SSL3_ST_CW_CERT_A)
-                {
-                if ((s->cert == NULL) ||
-                        (s->cert->key->x509 == NULL) ||
-                        (s->cert->key->privatekey == NULL))
-                        s->state=SSL3_ST_CW_CERT_B;
-                else
-                        s->state=SSL3_ST_CW_CERT_C;
-                }
-
-        /* We need to get a client cert */
-        if (s->state == SSL3_ST_CW_CERT_B)
-                {
-                /* If we get an error, we need to
-                 * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
-                 * We then get retied later */
-                i=0;
-                if (s->ctx->client_cert_cb != NULL)
-                        i=s->ctx->client_cert_cb(s,&(x509),&(pkey));
-                if (i < 0)
-                        {
-                        s->rwstate=SSL_X509_LOOKUP;
-                        return(-1);
-                        }
-                s->rwstate=SSL_NOTHING;
-                if ((i == 1) && (pkey != NULL) && (x509 != NULL))
-                        {
-                        s->state=SSL3_ST_CW_CERT_B;
-                        if (    !SSL_use_certificate(s,x509) ||
-                                !SSL_use_PrivateKey(s,pkey))
-                                i=0;
-                        }
-                else if (i == 1)
-                        {
-                        i=0;
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
-                        }
-
-                if (x509 != NULL) X509_free(x509);
-                if (pkey != NULL) EVP_PKEY_free(pkey);
-                if (i == 0)
-                        {
-                        if (s->version == SSL3_VERSION)
-                                {
-                                s->s3->tmp.cert_req=0;
-                                ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE);
-                                return(1);
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_req=2;
-                                }
-                        }
-
-                /* Ok, we have a cert */
-                s->state=SSL3_ST_CW_CERT_C;
-                }
-
-        if (s->state == SSL3_ST_CW_CERT_C)
-                {
-                s->state=SSL3_ST_CW_CERT_D;
-                l=ssl3_output_cert_chain(s,
-                        (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
-                s->init_num=(int)l;
-                s->init_off=0;
-                }
-        /* SSL3_ST_CW_CERT_D */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
-
-#define has_bits(i,m)   (((i)&(m)) == (m))
-
-static int ssl3_check_cert_and_algorithm(SSL *s)
-        {
-        int i,idx;
-        long algs;
-        EVP_PKEY *pkey=NULL;
-        SESS_CERT *sc;
-#ifndef NO_RSA
-        RSA *rsa;
-#endif
-#ifndef NO_DH
-        DH *dh;
-#endif
-
-        sc=s->session->sess_cert;
-
-        if (sc == NULL)
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_INTERNAL_ERROR);
-                goto err;
-                }
-
-        algs=s->s3->tmp.new_cipher->algorithms;
-
-        /* we don't have a certificate */
-        if (algs & (SSL_aDH|SSL_aNULL))
-                return(1);
-
-#ifndef NO_RSA
-        rsa=s->session->sess_cert->peer_rsa_tmp;
-#endif
-#ifndef NO_DH
-        dh=s->session->sess_cert->peer_dh_tmp;
-#endif
-
-        /* This is the passed certificate */
-
-        idx=sc->peer_cert_type;
-        pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
-        i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
-        EVP_PKEY_free(pkey);
-
-        
-        /* Check that we have a certificate if we require one */
-        if ((algs & SSL_aRSA) && !has_bits(i,EVP_PK_RSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_SIGNING_CERT);
-                goto f_err;
-                }
-#ifndef NO_DSA
-        else if ((algs & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DSA_SIGNING_CERT);
-                goto f_err;
-                }
-#endif
-#ifndef NO_RSA
-        if ((algs & SSL_kRSA) &&
-                !(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_ENCRYPTING_CERT);
-                goto f_err;
-                }
-#endif
-#ifndef NO_DH
-        if ((algs & SSL_kEDH) &&
-                !(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_KEY);
-                goto f_err;
-                }
-        else if ((algs & SSL_kDHr) && !has_bits(i,EVP_PK_DH|EVP_PKS_RSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
-                goto f_err;
-                }
-#ifndef NO_DSA
-        else if ((algs & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_DSA_CERT);
-                goto f_err;
-                }
-#endif
-#endif
-
-        if (SSL_IS_EXPORT(algs) && !has_bits(i,EVP_PKT_EXP))
-                {
-#ifndef NO_RSA
-                if (algs & SSL_kRSA)
-                        {
-                        if (rsa == NULL
-                            || RSA_size(rsa) > SSL_EXPORT_PKEYLENGTH(algs))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
-                                goto f_err;
-                                }
-                        }
-                else
-#endif
-#ifndef NO_DH
-                        if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                            {
-                            if (dh == NULL
-                                || DH_size(dh) > SSL_EXPORT_PKEYLENGTH(algs))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY);
-                                goto f_err;
-                                }
-                        }
-                else
-#endif
-                        {
-                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
-                        goto f_err;
-                        }
-                }
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-err:
-        return(0);
-        }
-
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
deleted file mode 100644
index aeff6b5c5b..0000000000
--- a/src/lib/libssl/s3_lib.c
+++ /dev/null
@@ -1,1107 +0,0 @@
-/* ssl/s3_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 <openssl/md5.h>
-#include <openssl/sha.h>
-#include <openssl/objects.h>
-#include "ssl_locl.h"
-
-const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
-
-#define SSL3_NUM_CIPHERS        (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))
-
-static long ssl3_default_timeout(void );
-
-OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
-/* The RSA ciphers */
-/* Cipher 01 */
-        {
-        1,
-        SSL3_TXT_RSA_NULL_MD5,
-        SSL3_CK_RSA_NULL_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 02 */
-        {
-        1,
-        SSL3_TXT_RSA_NULL_SHA,
-        SSL3_CK_RSA_NULL_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* anon DH */
-/* Cipher 17 */
-        {
-        1,
-        SSL3_TXT_ADH_RC4_40_MD5,
-        SSL3_CK_ADH_RC4_40_MD5,
-        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 18 */
-        {
-        1,
-        SSL3_TXT_ADH_RC4_128_MD5,
-        SSL3_CK_ADH_RC4_128_MD5,
-        SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 19 */
-        {
-        1,
-        SSL3_TXT_ADH_DES_40_CBC_SHA,
-        SSL3_CK_ADH_DES_40_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 1A */
-        {
-        1,
-        SSL3_TXT_ADH_DES_64_CBC_SHA,
-        SSL3_CK_ADH_DES_64_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 1B */
-        {
-        1,
-        SSL3_TXT_ADH_DES_192_CBC_SHA,
-        SSL3_CK_ADH_DES_192_CBC_SHA,
-        SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* RSA again */
-/* Cipher 03 */
-        {
-        1,
-        SSL3_TXT_RSA_RC4_40_MD5,
-        SSL3_CK_RSA_RC4_40_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5 |SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 04 */
-        {
-        1,
-        SSL3_TXT_RSA_RC4_128_MD5,
-        SSL3_CK_RSA_RC4_128_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 05 */
-        {
-        1,
-        SSL3_TXT_RSA_RC4_128_SHA,
-        SSL3_CK_RSA_RC4_128_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 06 */
-        {
-        1,
-        SSL3_TXT_RSA_RC2_40_MD5,
-        SSL3_CK_RSA_RC2_40_MD5,
-        SSL_kRSA|SSL_aRSA|SSL_RC2  |SSL_MD5 |SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 07 */
-        {
-        1,
-        SSL3_TXT_RSA_IDEA_128_SHA,
-        SSL3_CK_RSA_IDEA_128_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_MEDIUM,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 08 */
-        {
-        1,
-        SSL3_TXT_RSA_DES_40_CBC_SHA,
-        SSL3_CK_RSA_DES_40_CBC_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 09 */
-        {
-        1,
-        SSL3_TXT_RSA_DES_64_CBC_SHA,
-        SSL3_CK_RSA_DES_64_CBC_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 0A */
-        {
-        1,
-        SSL3_TXT_RSA_DES_192_CBC3_SHA,
-        SSL3_CK_RSA_DES_192_CBC3_SHA,
-        SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/*  The DH ciphers */
-/* Cipher 0B */
-        {
-        0,
-        SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
-        SSL3_CK_DH_DSS_DES_40_CBC_SHA,
-        SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 0C */
-        {
-        0,
-        SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
-        SSL3_CK_DH_DSS_DES_64_CBC_SHA,
-        SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 0D */
-        {
-        0,
-        SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
-        SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
-        SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 0E */
-        {
-        0,
-        SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
-        SSL3_CK_DH_RSA_DES_40_CBC_SHA,
-        SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 0F */
-        {
-        0,
-        SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
-        SSL3_CK_DH_RSA_DES_64_CBC_SHA,
-        SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 10 */
-        {
-        0,
-        SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
-        SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
-        SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* The Ephemeral DH ciphers */
-/* Cipher 11 */
-        {
-        1,
-        SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
-        SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 12 */
-        {
-        1,
-        SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
-        SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 13 */
-        {
-        1,
-        SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
-        SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
-        SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 14 */
-        {
-        1,
-        SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
-        SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_EXP40|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 15 */
-        {
-        1,
-        SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
-        SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_LOW,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-/* Cipher 16 */
-        {
-        1,
-        SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
-        SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
-        SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3|SSL_HIGH,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* Fortezza */
-/* Cipher 1C */
-        {
-        0,
-        SSL3_TXT_FZA_DMS_NULL_SHA,
-        SSL3_CK_FZA_DMS_NULL_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* Cipher 1D */
-        {
-        0,
-        SSL3_TXT_FZA_DMS_FZA_SHA,
-        SSL3_CK_FZA_DMS_FZA_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-/* Cipher 1E */
-        {
-        0,
-        SSL3_TXT_FZA_DMS_RC4_SHA,
-        SSL3_CK_FZA_DMS_RC4_SHA,
-        SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|SSL_NOT_EXP|SSL_SSLV3,
-        0,
-        SSL_ALL_CIPHERS,
-        },
-
-#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
-        /* New TLS Export CipherSuites */
-        /* Cipher 60 */
-            {
-            1,
-            TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
-            TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
-            SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 61 */
-            {
-            1,
-            TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
-            TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
-            SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 62 */
-            {
-            1,
-            TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-            TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
-            SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 63 */
-            {
-            1,
-            TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
-            TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
-            SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 64 */
-            {
-            1,
-            TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
-            TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
-            SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 65 */
-            {
-            1,
-            TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
-            TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
-            SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_EXP56|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-        /* Cipher 66 */
-            {
-            1,
-            TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
-            TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
-            SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
-            0,
-            SSL_ALL_CIPHERS
-            },
-#endif
-
-/* end of list */
-        };
-
-static SSL3_ENC_METHOD SSLv3_enc_data={
-        ssl3_enc,
-        ssl3_mac,
-        ssl3_setup_key_block,
-        ssl3_generate_master_secret,
-        ssl3_change_cipher_state,
-        ssl3_final_finish_mac,
-        MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
-        ssl3_cert_verify_mac,
-        SSL3_MD_CLIENT_FINISHED_CONST,4,
-        SSL3_MD_SERVER_FINISHED_CONST,4,
-        ssl3_alert_code,
-        };
-
-static SSL_METHOD SSLv3_data= {
-        SSL3_VERSION,
-        ssl3_new,
-        ssl3_clear,
-        ssl3_free,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl3_read,
-        ssl3_peek,
-        ssl3_write,
-        ssl3_shutdown,
-        ssl3_renegotiate,
-        ssl3_renegotiate_check,
-        ssl3_ctrl,
-        ssl3_ctx_ctrl,
-        ssl3_get_cipher_by_char,
-        ssl3_put_cipher_by_char,
-        ssl3_pending,
-        ssl3_num_ciphers,
-        ssl3_get_cipher,
-        ssl_bad_method,
-        ssl3_default_timeout,
-        &SSLv3_enc_data,
-        };
-
-static long ssl3_default_timeout(void)
-        {
-        /* 2 hours, the 24 hours mentioned in the SSLv3 spec
-         * is way too long for http, the cache would over fill */
-        return(60*60*2);
-        }
-
-SSL_METHOD *sslv3_base_method(void)
-        {
-        return(&SSLv3_data);
-        }
-
-int ssl3_num_ciphers(void)
-        {
-        return(SSL3_NUM_CIPHERS);
-        }
-
-SSL_CIPHER *ssl3_get_cipher(unsigned int u)
-        {
-        if (u < SSL3_NUM_CIPHERS)
-                return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
-        else
-                return(NULL);
-        }
-
-/* The problem is that it may not be the correct record type */
-int ssl3_pending(SSL *s)
-        {
-        return(s->s3->rrec.length);
-        }
-
-int ssl3_new(SSL *s)
-        {
-        SSL3_CTX *s3;
-
-        if ((s3=(SSL3_CTX *)Malloc(sizeof(SSL3_CTX))) == NULL) goto err;
-        memset(s3,0,sizeof(SSL3_CTX));
-
-        s->s3=s3;
-        /*
-        s->s3->tmp.ca_names=NULL;
-        s->s3->tmp.key_block=NULL;
-        s->s3->tmp.key_block_length=0;
-        s->s3->rbuf.buf=NULL;
-        s->s3->wbuf.buf=NULL;
-        */
-
-        s->method->ssl_clear(s);
-        return(1);
-err:
-        return(0);
-        }
-
-void ssl3_free(SSL *s)
-        {
-        if(s == NULL)
-            return;
-
-        ssl3_cleanup_key_block(s);
-        if (s->s3->rbuf.buf != NULL)
-                Free(s->s3->rbuf.buf);
-        if (s->s3->wbuf.buf != NULL)
-                Free(s->s3->wbuf.buf);
-        if (s->s3->rrec.comp != NULL)
-                Free(s->s3->rrec.comp);
-#ifndef NO_DH
-        if (s->s3->tmp.dh != NULL)
-                DH_free(s->s3->tmp.dh);
-#endif
-        if (s->s3->tmp.ca_names != NULL)
-                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-        memset(s->s3,0,sizeof(SSL3_CTX));
-        Free(s->s3);
-        s->s3=NULL;
-        }
-
-void ssl3_clear(SSL *s)
-        {
-        unsigned char *rp,*wp;
-
-        ssl3_cleanup_key_block(s);
-        if (s->s3->tmp.ca_names != NULL)
-                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-
-        if (s->s3->rrec.comp != NULL)
-                {
-                Free(s->s3->rrec.comp);
-                s->s3->rrec.comp=NULL;
-                }
-
-        rp=s->s3->rbuf.buf;
-        wp=s->s3->wbuf.buf;
-
-        memset(s->s3,0,sizeof(SSL3_CTX));
-        if (rp != NULL) s->s3->rbuf.buf=rp;
-        if (wp != NULL) s->s3->wbuf.buf=wp;
-
-        ssl_free_wbio_buffer(s);
-
-        s->packet_length=0;
-        s->s3->renegotiate=0;
-        s->s3->total_renegotiations=0;
-        s->s3->num_renegotiations=0;
-        s->s3->in_read_app_data=0;
-        s->version=SSL3_VERSION;
-        }
-
-long ssl3_ctrl(SSL *s, int cmd, long larg, char *parg)
-        {
-        int ret=0;
-
-#if !defined(NO_DSA) || !defined(NO_RSA)
-        if (
-#ifndef NO_RSA
-            cmd == SSL_CTRL_SET_TMP_RSA ||
-            cmd == SSL_CTRL_SET_TMP_RSA_CB ||
-#endif
-#ifndef NO_DSA
-            cmd == SSL_CTRL_SET_TMP_DH ||
-            cmd == SSL_CTRL_SET_TMP_DH_CB ||
-#endif
-                0)
-                {
-                if (!ssl_cert_inst(&s->cert))
-                        {
-                        SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
-                        return(0);
-                        }
-                }
-#endif
-
-        switch (cmd)
-                {
-        case SSL_CTRL_GET_SESSION_REUSED:
-                ret=s->hit;
-                break;
-        case SSL_CTRL_GET_CLIENT_CERT_REQUEST:
-                break;
-        case SSL_CTRL_GET_NUM_RENEGOTIATIONS:
-                ret=s->s3->num_renegotiations;
-                break;
-        case SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS:
-                ret=s->s3->num_renegotiations;
-                s->s3->num_renegotiations=0;
-                break;
-        case SSL_CTRL_GET_TOTAL_RENEGOTIATIONS:
-                ret=s->s3->total_renegotiations;
-                break;
-        case SSL_CTRL_GET_FLAGS:
-                ret=(int)(s->s3->flags);
-                break;
-#ifndef NO_RSA
-        case SSL_CTRL_NEED_TMP_RSA:
-                if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) &&
-                    ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
-                     (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) > (512/8))))
-                        ret = 1;
-                break;
-        case SSL_CTRL_SET_TMP_RSA:
-                {
-                        RSA *rsa = (RSA *)parg;
-                        if (rsa == NULL) {
-                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
-                                return(ret);
-                        }
-                        if ((rsa = RSAPrivateKey_dup(rsa)) == NULL) {
-                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB);
-                                return(ret);
-                        }
-                        if (s->cert->rsa_tmp != NULL)
-                                RSA_free(s->cert->rsa_tmp);
-                        s->cert->rsa_tmp = rsa;
-                        ret = 1;
-                }
-                break;
-        case SSL_CTRL_SET_TMP_RSA_CB:
-                s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))parg;
-                break;
-#endif
-#ifndef NO_DH
-        case SSL_CTRL_SET_TMP_DH:
-                {
-                        DH *dh = (DH *)parg;
-                        if (dh == NULL) {
-                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
-                                return(ret);
-                        }
-                        if ((dh = DHparams_dup(dh)) == NULL) {
-                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
-                                return(ret);
-                        }
-                        if (!DH_generate_key(dh)) {
-                                DH_free(dh);
-                                SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
-                                return(ret);
-                        }
-                        if (s->cert->dh_tmp != NULL)
-                                DH_free(s->cert->dh_tmp);
-                        s->cert->dh_tmp = dh;
-                        ret = 1;
-                }
-                break;
-        case SSL_CTRL_SET_TMP_DH_CB:
-                s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))parg;
-                break;
-#endif
-        default:
-                break;
-                }
-        return(ret);
-        }
-
-long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, char *parg)
-        {
-        CERT *cert;
-
-        cert=ctx->cert;
-
-        switch (cmd)
-                {
-#ifndef NO_RSA
-        case SSL_CTRL_NEED_TMP_RSA:
-                if (    (cert->rsa_tmp == NULL) &&
-                        ((cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
-                         (EVP_PKEY_size(cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) > (512/8)))
-                        )
-                        return(1);
-                else
-                        return(0);
-                /* break; */
-        case SSL_CTRL_SET_TMP_RSA:
-                {
-                RSA *rsa;
-                int i;
-
-                rsa=(RSA *)parg;
-                i=1;
-                if (rsa == NULL)
-                        i=0;
-                else
-                        {
-                        if ((rsa=RSAPrivateKey_dup(rsa)) == NULL)
-                                i=0;
-                        }
-                if (!i)
-                        {
-                        SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_RSA_LIB);
-                        return(0);
-                        }
-                else
-                        {
-                        if (cert->rsa_tmp != NULL)
-                                RSA_free(cert->rsa_tmp);
-                        cert->rsa_tmp=rsa;
-                        return(1);
-                        }
-                }
-                /* break; */
-        case SSL_CTRL_SET_TMP_RSA_CB:
-                cert->rsa_tmp_cb=(RSA *(*)(SSL *, int, int))parg;
-                break;
-#endif
-#ifndef NO_DH
-        case SSL_CTRL_SET_TMP_DH:
-                {
-                DH *new=NULL,*dh;
-                int rret=0;
-
-                dh=(DH *)parg;
-                if (    ((new=DHparams_dup(dh)) == NULL) ||
-                        (!DH_generate_key(new)))
-                        {
-                        SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
-                        if (new != NULL) DH_free(new);
-                        }
-                else
-                        {
-                        if (cert->dh_tmp != NULL)
-                                DH_free(cert->dh_tmp);
-                        cert->dh_tmp=new;
-                        rret=1;
-                        }
-                return(rret);
-                }
-                /*break; */
-        case SSL_CTRL_SET_TMP_DH_CB:
-                cert->dh_tmp_cb=(DH *(*)(SSL *, int, int))parg;
-                break;
-#endif
-        /* A Thawte special :-) */
-        case SSL_CTRL_EXTRA_CHAIN_CERT:
-                if (ctx->extra_certs == NULL)
-                        {
-                        if ((ctx->extra_certs=sk_X509_new_null()) == NULL)
-                                return(0);
-                        }
-                sk_X509_push(ctx->extra_certs,(X509 *)parg);
-                break;
-
-        default:
-                return(0);
-                }
-        return(1);
-        }
-
-/* This function needs to check if the ciphers required are actually
- * available */
-SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
-        {
-        static int init=1;
-        static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
-        SSL_CIPHER c,*cp= &c,**cpp;
-        unsigned long id;
-        int i;
-
-        if (init)
-                {
-                CRYPTO_w_lock(CRYPTO_LOCK_SSL);
-
-                for (i=0; i<SSL3_NUM_CIPHERS; i++)
-                        sorted[i]= &(ssl3_ciphers[i]);
-
-                qsort(  (char *)sorted,
-                        SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
-                        FP_ICC ssl_cipher_ptr_id_cmp);
-
-                CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
-
-                init=0;
-                }
-
-        id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
-        c.id=id;
-        cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
-                (char *)sorted,
-                SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
-                (int (*)())ssl_cipher_ptr_id_cmp);
-        if ((cpp == NULL) || !(*cpp)->valid)
-                return(NULL);
-        else
-                return(*cpp);
-        }
-
-int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
-        {
-        long l;
-
-        if (p != NULL)
-                {
-                l=c->id;
-                if ((l & 0xff000000) != 0x03000000) return(0);
-                p[0]=((unsigned char)(l>> 8L))&0xFF;
-                p[1]=((unsigned char)(l     ))&0xFF;
-                }
-        return(2);
-        }
-
-int ssl3_part_read(SSL *s, int i)
-        {
-        s->rwstate=SSL_READING;
-
-        if (i < 0)
-                {
-                return(i);
-                }
-        else
-                {
-                s->init_num+=i;
-                return(0);
-                }
-        }
-
-SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *have,
-             STACK_OF(SSL_CIPHER) *pref)
-        {
-        SSL_CIPHER *c,*ret=NULL;
-        int i,j,ok;
-        CERT *cert;
-        unsigned long alg,mask,emask;
-
-        /* Let's see which ciphers we can support */
-        cert=s->cert;
-
-        sk_SSL_CIPHER_set_cmp_func(pref,ssl_cipher_ptr_id_cmp);
-
-#ifdef CIPHER_DEBUG
-        printf("Have:\n");
-        for(i=0 ; i < sk_num(pref) ; ++i)
-            {
-            c=(SSL_CIPHER *)sk_value(pref,i);
-            printf("%p:%s\n",c,c->name);
-            }
-#endif
-
-        for (i=0; i<sk_SSL_CIPHER_num(have); i++)
-                {
-                c=sk_SSL_CIPHER_value(have,i);
-
-                ssl_set_cert_masks(cert,c);
-                mask=cert->mask;
-                emask=cert->export_mask;
-                        
-                alg=c->algorithms&(SSL_MKEY_MASK|SSL_AUTH_MASK);
-                if (SSL_IS_EXPORT(c->algorithms))
-                        {
-                        ok=((alg & emask) == alg)?1:0;
-#ifdef CIPHER_DEBUG
-                        printf("%d:[%08lX:%08lX]%p:%s (export)\n",ok,alg,emask,
-                               c,c->name);
-#endif
-                        }
-                else
-                        {
-                        ok=((alg & mask) == alg)?1:0;
-#ifdef CIPHER_DEBUG
-                        printf("%d:[%08lX:%08lX]%p:%s\n",ok,alg,mask,c,
-                               c->name);
-#endif
-                        }
-
-                if (!ok) continue;
-        
-                j=sk_SSL_CIPHER_find(pref,c);
-                if (j >= 0)
-                        {
-                        ret=sk_SSL_CIPHER_value(pref,j);
-                        break;
-                        }
-                }
-        return(ret);
-        }
-
-int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
-        {
-        int ret=0;
-        unsigned long alg;
-
-        alg=s->s3->tmp.new_cipher->algorithms;
-
-#ifndef NO_DH
-        if (alg & (SSL_kDHr|SSL_kEDH))
-                {
-#  ifndef NO_RSA
-                p[ret++]=SSL3_CT_RSA_FIXED_DH;
-#  endif
-#  ifndef NO_DSA
-                p[ret++]=SSL3_CT_DSS_FIXED_DH;
-#  endif
-                }
-        if ((s->version == SSL3_VERSION) &&
-                (alg & (SSL_kEDH|SSL_kDHd|SSL_kDHr)))
-                {
-#  ifndef NO_RSA
-                p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH;
-#  endif
-#  ifndef NO_DSA
-                p[ret++]=SSL3_CT_DSS_EPHEMERAL_DH;
-#  endif
-                }
-#endif /* !NO_DH */
-#ifndef NO_RSA
-        p[ret++]=SSL3_CT_RSA_SIGN;
-#endif
-#ifndef NO_DSA
-        p[ret++]=SSL3_CT_DSS_SIGN;
-#endif
-        return(ret);
-        }
-
-int ssl3_shutdown(SSL *s)
-        {
-
-        /* Don't do anything much if we have not done the handshake or
-         * we don't want to send messages :-) */
-        if ((s->quiet_shutdown) || (s->state == SSL_ST_BEFORE))
-                {
-                s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
-                return(1);
-                }
-
-        if (!(s->shutdown & SSL_SENT_SHUTDOWN))
-                {
-                s->shutdown|=SSL_SENT_SHUTDOWN;
-#if 1
-                ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_CLOSE_NOTIFY);
-#endif
-                /* our shutdown alert has been sent now, and if it still needs
-                 * to be written, s->s3->alert_dispatch will be true */
-                }
-        else if (s->s3->alert_dispatch)
-                {
-                /* resend it if not sent */
-#if 1
-                ssl3_dispatch_alert(s);
-#endif
-                }
-        else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
-                {
-                /* If we are waiting for a close from our peer, we are closed */
-                ssl3_read_bytes(s,0,NULL,0);
-                }
-
-        if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) &&
-                !s->s3->alert_dispatch)
-                return(1);
-        else
-                return(0);
-        }
-
-int ssl3_write(SSL *s, const void *buf, int len)
-        {
-        int ret,n;
-
-#if 0
-        if (s->shutdown & SSL_SEND_SHUTDOWN)
-                {
-                s->rwstate=SSL_NOTHING;
-                return(0);
-                }
-#endif
-        clear_sys_error();
-        if (s->s3->renegotiate) ssl3_renegotiate_check(s);
-
-        /* This is an experimental flag that sends the
-         * last handshake message in the same packet as the first
-         * use data - used to see if it helps the TCP protocol during
-         * session-id reuse */
-        /* The second test is because the buffer may have been removed */
-        if ((s->s3->flags & SSL3_FLAGS_POP_BUFFER) && (s->wbio == s->bbio))
-                {
-                /* First time through, we write into the buffer */
-                if (s->s3->delay_buf_pop_ret == 0)
-                        {
-                        ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-                                             buf,len);
-                        if (ret <= 0) return(ret);
-
-                        s->s3->delay_buf_pop_ret=ret;
-                        }
-
-                s->rwstate=SSL_WRITING;
-                n=BIO_flush(s->wbio);
-                if (n <= 0) return(n);
-                s->rwstate=SSL_NOTHING;
-
-                /* We have flushed the buffer, so remove it */
-                ssl_free_wbio_buffer(s);
-                s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
-
-                ret=s->s3->delay_buf_pop_ret;
-                s->s3->delay_buf_pop_ret=0;
-                }
-        else
-                {
-                ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
-                                     buf,len);
-                if (ret <= 0) return(ret);
-                }
-
-        return(ret);
-        }
-
-int ssl3_read(SSL *s, void *buf, int len)
-        {
-        int ret;
-        
-        clear_sys_error();
-        if (s->s3->renegotiate) ssl3_renegotiate_check(s);
-        s->s3->in_read_app_data=1;
-        ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len);
-        if ((ret == -1) && (s->s3->in_read_app_data == 0))
-                {
-                ERR_get_error(); /* clear the error */
-                s->s3->in_read_app_data=0;
-                s->in_handshake++;
-                ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len);
-                s->in_handshake--;
-                }
-        else
-                s->s3->in_read_app_data=0;
-
-        return(ret);
-        }
-
-int ssl3_peek(SSL *s, char *buf, int len)
-        {
-        SSL3_RECORD *rr;
-        int n;
-
-        rr= &(s->s3->rrec);
-        if ((rr->length == 0) || (rr->type != SSL3_RT_APPLICATION_DATA))
-                {
-                n=ssl3_read(s,buf,1);
-                if (n <= 0) return(n);
-                rr->length++;
-                rr->off--;
-                }
-
-        if ((unsigned int)len > rr->length)
-                n=rr->length;
-        else
-                n=len;
-        memcpy(buf,&(rr->data[rr->off]),(unsigned int)n);
-        return(n);
-        }
-
-int ssl3_renegotiate(SSL *s)
-        {
-        if (s->handshake_func == NULL)
-                return(1);
-
-        if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
-                return(0);
-
-        s->s3->renegotiate=1;
-        return(1);
-        }
-
-int ssl3_renegotiate_check(SSL *s)
-        {
-        int ret=0;
-
-        if (s->s3->renegotiate)
-                {
-                if (    (s->s3->rbuf.left == 0) &&
-                        (s->s3->wbuf.left == 0) &&
-                        !SSL_in_init(s))
-                        {
-/*
-if we are the server, and we have sent a 'RENEGOTIATE' message, we
-need to go to SSL_ST_ACCEPT.
-*/
-                        /* SSL_ST_ACCEPT */
-                        s->state=SSL_ST_RENEGOTIATE;
-                        s->s3->renegotiate=0;
-                        s->s3->num_renegotiations++;
-                        s->s3->total_renegotiations++;
-                        ret=1;
-                        }
-                }
-        return(ret);
-        }
-
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
deleted file mode 100644
index 7893d03123..0000000000
--- a/src/lib/libssl/s3_pkt.c
+++ /dev/null
@@ -1,1041 +0,0 @@
-/* ssl/s3_pkt.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>
-#define USE_SOCKETS
-#include <openssl/evp.h>
-#include <openssl/buffer.h>
-#include "ssl_locl.h"
-
-static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
-                         unsigned int len);
-static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
-                              unsigned int len);
-static int ssl3_get_record(SSL *s);
-static int do_compress(SSL *ssl);
-static int do_uncompress(SSL *ssl);
-static int do_change_cipher_spec(SSL *ssl);
-static int ssl3_read_n(SSL *s, int n, int max, int extend)
-        {
-        int i,off,newb;
-
-        /* if there is stuff still in the buffer from a previous read,
-         * and there is more than we want, take some. */
-        if (s->s3->rbuf.left >= (int)n)
-                {
-                if (extend)
-                        s->packet_length+=n;
-                else
-                        {
-                        s->packet= &(s->s3->rbuf.buf[s->s3->rbuf.offset]);
-                        s->packet_length=n;
-                        }
-                s->s3->rbuf.left-=n;
-                s->s3->rbuf.offset+=n;
-                return(n);
-                }
-
-        /* else we need to read more data */
-        if (!s->read_ahead) max=n;
-        if (max > SSL3_RT_MAX_PACKET_SIZE)
-                max=SSL3_RT_MAX_PACKET_SIZE;
-
-        /* First check if there is some left or we want to extend */
-        off=0;
-        if (    (s->s3->rbuf.left != 0) ||
-                ((s->packet_length != 0) && extend))
-                {
-                newb=s->s3->rbuf.left;
-                if (extend)
-                        {
-                        /* Copy bytes back to the front of the buffer 
-                         * Take the bytes already pointed to by 'packet'
-                         * and take the extra ones on the end. */
-                        off=s->packet_length;
-                        if (s->packet != s->s3->rbuf.buf)
-                                memcpy(s->s3->rbuf.buf,s->packet,newb+off);
-                        }
-                else if (s->s3->rbuf.offset != 0)
-                        { /* so the data is not at the start of the buffer */
-                        memcpy(s->s3->rbuf.buf,
-                                &(s->s3->rbuf.buf[s->s3->rbuf.offset]),newb);
-                        s->s3->rbuf.offset=0;
-                        }
-
-                s->s3->rbuf.left=0;
-                }
-        else
-                newb=0;
-
-        /* So we now have 'newb' bytes at the front of 
-         * s->s3->rbuf.buf and need to read some more in on the end
-         * We start reading into the buffer at 's->s3->rbuf.offset'
-         */
-        s->packet=s->s3->rbuf.buf;
-
-        while (newb < n)
-                {
-                clear_sys_error();
-                if (s->rbio != NULL)
-                        {
-                        s->rwstate=SSL_READING;
-                        i=BIO_read(s->rbio,
-                                (char *)&(s->s3->rbuf.buf[off+newb]),
-                                max-newb);
-                        }
-                else
-                        {
-                        SSLerr(SSL_F_SSL3_READ_N,SSL_R_READ_BIO_NOT_SET);
-                        i= -1;
-                        }
-
-                if (i <= 0)
-                        {
-                        s->s3->rbuf.left+=newb;
-                        return(i);
-                        }
-                newb+=i;
-                }
-
-        /* record used data read */
-        if (newb > n)
-                {
-                s->s3->rbuf.offset=n+off;
-                s->s3->rbuf.left=newb-n;
-                }
-        else
-                {
-                s->s3->rbuf.offset=0;
-                s->s3->rbuf.left=0;
-                }
-
-        if (extend)
-                s->packet_length+=n;
-        else
-                s->packet_length+=n;
-        return(n);
-        }
-
-/* Call this to get a new input record.
- * It will return <= 0 if more data is needed, normally due to an error
- * or non-blocking IO.
- * When it finishes, one packet has been decoded and can be found in
- * ssl->s3->rrec.type   - is the type of record
- * ssl->s3->rrec.data,  - data
- * ssl->s3->rrec.length, - number of bytes
- */
-static int ssl3_get_record(SSL *s)
-        {
-        int ssl_major,ssl_minor,al;
-        int n,i,ret= -1;
-        SSL3_BUFFER *rb;
-        SSL3_RECORD *rr;
-        SSL_SESSION *sess;
-        unsigned char *p;
-        unsigned char md[EVP_MAX_MD_SIZE];
-        short version;
-        unsigned int mac_size;
-        int clear=0,extra;
-
-        rr= &(s->s3->rrec);
-        rb= &(s->s3->rbuf);
-        sess=s->session;
-
-        if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER)
-                extra=SSL3_RT_MAX_EXTRA;
-        else
-                extra=0;
-
-again:
-        /* check if we have the header */
-        if (    (s->rstate != SSL_ST_READ_BODY) ||
-                (s->packet_length < SSL3_RT_HEADER_LENGTH)) 
-                {
-                n=ssl3_read_n(s,SSL3_RT_HEADER_LENGTH,
-                        SSL3_RT_MAX_PACKET_SIZE,0);
-                if (n <= 0) return(n); /* error or non-blocking */
-                s->rstate=SSL_ST_READ_BODY;
-
-                p=s->packet;
-
-                /* Pull apart the header into the SSL3_RECORD */
-                rr->type= *(p++);
-                ssl_major= *(p++);
-                ssl_minor= *(p++);
-                version=(ssl_major<<8)|ssl_minor;
-                n2s(p,rr->length);
-
-                /* Lets check version */
-                if (s->first_packet)
-                        {
-                        s->first_packet=0;
-                        }
-                else
-                        {
-                        if (version != s->version)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
-                                /* Send back error using their
-                                 * version number :-) */
-                                s->version=version;
-                                al=SSL_AD_PROTOCOL_VERSION;
-                                goto f_err;
-                                }
-                        }
-
-                if ((version>>8) != SSL3_VERSION_MAJOR)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
-                        goto err;
-                        }
-
-                if (rr->length > 
-                        (unsigned int)SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
-                        {
-                        al=SSL_AD_RECORD_OVERFLOW;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PACKET_LENGTH_TOO_LONG);
-                        goto f_err;
-                        }
-
-                s->rstate=SSL_ST_READ_BODY;
-                }
-
-        /* get and decode the data */
-        if (s->rstate == SSL_ST_READ_BODY)
-                {
-                if (rr->length > (s->packet_length-SSL3_RT_HEADER_LENGTH))
-                        {
-                        i=rr->length;
-                        /*-(s->packet_length-SSL3_RT_HEADER_LENGTH); */
-                        n=ssl3_read_n(s,i,i,1);
-                        if (n <= 0) return(n); /* error or non-blocking io */
-                        }
-                s->rstate=SSL_ST_READ_HEADER;
-                }
-
-        /* At this point, we have the data in s->packet and there should be
-         * s->packet_length bytes, we must not 'overrun' this buffer :-)
-         * One of the following functions will copy the data from the
-         * s->packet buffer */
-
-        rr->input= &(s->packet[SSL3_RT_HEADER_LENGTH]);
-
-        /* ok, we can now read from 's->packet' data into 'rr'
-         * rr->input points at rr->length bytes, which
-         * need to be copied into rr->data by either
-         * the decryption or by the decompression
-         * When the data is 'copied' into the rr->data buffer,
-         * rr->input will be pointed at the new buffer */ 
-
-        /* Set the state for the following operations */
-        s->rstate=SSL_ST_READ_HEADER;
-
-        /* We now have - encrypted [ MAC [ compressed [ plain ] ] ]
-         * rr->length bytes of encrypted compressed stuff. */
-
-        /* check is not needed I belive */
-        if (rr->length > (unsigned int)SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
-                {
-                al=SSL_AD_RECORD_OVERFLOW;
-                SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
-                goto f_err;
-                }
-
-        /* decrypt in place in 'rr->input' */
-        rr->data=rr->input;
-
-        if (!s->method->ssl3_enc->enc(s,0))
-                {
-                al=SSL_AD_DECRYPT_ERROR;
-                goto f_err;
-                }
-#ifdef TLS_DEBUG
-printf("dec %d\n",rr->length);
-{ unsigned int z; for (z=0; z<rr->length; z++) printf("%02X%c",rr->data[z],((z+1)%16)?' ':'\n'); }
-printf("\n");
-#endif
-        /* r->length is now the compressed data plus mac */
-        if (    (sess == NULL) ||
-                (s->enc_read_ctx == NULL) ||
-                (s->read_hash == NULL))
-                clear=1;
-
-        if (!clear)
-                {
-                mac_size=EVP_MD_size(s->read_hash);
-
-                if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+extra+mac_size)
-                        {
-                        al=SSL_AD_RECORD_OVERFLOW;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PRE_MAC_LENGTH_TOO_LONG);
-                        goto f_err;
-                        }
-                /* check MAC for rr->input' */
-                if (rr->length < mac_size)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_LENGTH_TOO_SHORT);
-                        goto f_err;
-                        }
-                rr->length-=mac_size;
-                i=s->method->ssl3_enc->mac(s,md,0);
-                if (memcmp(md,&(rr->data[rr->length]),mac_size) != 0)
-                        {
-                        al=SSL_AD_BAD_RECORD_MAC;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_BAD_MAC_DECODE);
-                        ret= -1;
-                        goto f_err;
-                        }
-                }
-
-        /* r->length is now just compressed */
-        if (s->expand != NULL)
-                {
-                if (rr->length > 
-                        (unsigned int)SSL3_RT_MAX_COMPRESSED_LENGTH+extra)
-                        {
-                        al=SSL_AD_RECORD_OVERFLOW;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_COMPRESSED_LENGTH_TOO_LONG);
-                        goto f_err;
-                        }
-                if (!do_uncompress(s))
-                        {
-                        al=SSL_AD_DECOMPRESSION_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_BAD_DECOMPRESSION);
-                        goto f_err;
-                        }
-                }
-
-        if (rr->length > (unsigned int)SSL3_RT_MAX_PLAIN_LENGTH+extra)
-                {
-                al=SSL_AD_RECORD_OVERFLOW;
-                SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_DATA_LENGTH_TOO_LONG);
-                goto f_err;
-                }
-
-        rr->off=0;
-        /* So at this point the following is true
-         * ssl->s3->rrec.type   is the type of record
-         * ssl->s3->rrec.length == number of bytes in record
-         * ssl->s3->rrec.off    == offset to first valid byte
-         * ssl->s3->rrec.data   == where to take bytes from, increment
-         *                         after use :-).
-         */
-
-        /* we have pulled in a full packet so zero things */
-        s->packet_length=0;
-
-        /* just read a 0 length packet */
-        if (rr->length == 0) goto again;
-
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        return(ret);
-        }
-
-static int do_uncompress(SSL *ssl)
-        {
-        int i;
-        SSL3_RECORD *rr;
-
-        rr= &(ssl->s3->rrec);
-        i=COMP_expand_block(ssl->expand,rr->comp,
-                SSL3_RT_MAX_PLAIN_LENGTH,rr->data,(int)rr->length);
-        if (i < 0)
-                return(0);
-        else
-                rr->length=i;
-        rr->data=rr->comp;
-
-        return(1);
-        }
-
-static int do_compress(SSL *ssl)
-        {
-        int i;
-        SSL3_RECORD *wr;
-
-        wr= &(ssl->s3->wrec);
-        i=COMP_compress_block(ssl->compress,wr->data,
-                SSL3_RT_MAX_COMPRESSED_LENGTH,
-                wr->input,(int)wr->length);
-        if (i < 0)
-                return(0);
-        else
-                wr->length=i;
-
-        wr->input=wr->data;
-        return(1);
-        }
-
-/* Call this to write data
- * It will return <= 0 if not all data has been sent or non-blocking IO.
- */
-int ssl3_write_bytes(SSL *s, int type, const void *_buf, int len)
-        {
-        const unsigned char *buf=_buf;
-        unsigned int tot,n,nw;
-        int i;
-
-        s->rwstate=SSL_NOTHING;
-        tot=s->s3->wnum;
-        s->s3->wnum=0;
-
-        if (SSL_in_init(s) && !s->in_handshake)
-                {
-                i=s->handshake_func(s);
-                if (i < 0) return(i);
-                if (i == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_WRITE_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
-                        return(-1);
-                        }
-                }
-
-        n=(len-tot);
-        for (;;)
-                {
-                if (n > SSL3_RT_MAX_PLAIN_LENGTH)
-                        nw=SSL3_RT_MAX_PLAIN_LENGTH;
-                else
-                        nw=n;
-                        
-                i=do_ssl3_write(s,type,&(buf[tot]),nw);
-                if (i <= 0)
-                        {
-                        s->s3->wnum=tot;
-                        return(i);
-                        }
-
-                if (type == SSL3_RT_HANDSHAKE)
-                        ssl3_finish_mac(s,&(buf[tot]),i);
-
-                if ((i == (int)n) ||
-                        (type == SSL3_RT_APPLICATION_DATA &&
-                         (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE)))
-                        {
-                        return(tot+i);
-                        }
-
-                n-=i;
-                tot+=i;
-                }
-        }
-
-static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
-                         unsigned int len)
-        {
-        unsigned char *p,*plen;
-        int i,mac_size,clear=0;
-        SSL3_RECORD *wr;
-        SSL3_BUFFER *wb;
-        SSL_SESSION *sess;
-
-        /* first check is there is a SSL3_RECORD still being written
-         * out.  This will happen with non blocking IO */
-        if (s->s3->wbuf.left != 0)
-                return(ssl3_write_pending(s,type,buf,len));
-
-        /* If we have an alert to send, lets send it */
-        if (s->s3->alert_dispatch)
-                {
-                i=ssl3_dispatch_alert(s);
-                if (i <= 0)
-                        return(i);
-                /* if it went, fall through and send more stuff */
-                }
-
-        if (len <= 0) return(len);
-        
-        wr= &(s->s3->wrec);
-        wb= &(s->s3->wbuf);
-        sess=s->session;
-
-        if (    (sess == NULL) ||
-                (s->enc_write_ctx == NULL) ||
-                (s->write_hash == NULL))
-                clear=1;
-
-        if (clear)
-                mac_size=0;
-        else
-                mac_size=EVP_MD_size(s->write_hash);
-
-        p=wb->buf;
-
-        /* write the header */
-        *(p++)=type&0xff;
-        wr->type=type;
-
-        *(p++)=(s->version>>8);
-        *(p++)=s->version&0xff;
-        
-        /* record where we are to write out packet length */
-        plen=p; 
-        p+=2;
-        
-        /* lets setup the record stuff. */
-        wr->data=p;
-        wr->length=(int)len;
-        wr->input=(unsigned char *)buf;
-
-        /* we now 'read' from wr->input, wr->length bytes into
-         * wr->data */
-
-        /* first we compress */
-        if (s->compress != NULL)
-                {
-                if (!do_compress(s))
-                        {
-                        SSLerr(SSL_F_DO_SSL3_WRITE,SSL_R_COMPRESSION_FAILURE);
-                        goto err;
-                        }
-                }
-        else
-                {
-                memcpy(wr->data,wr->input,wr->length);
-                wr->input=wr->data;
-                }
-
-        /* we should still have the output to wr->data and the input
-         * from wr->input.  Length should be wr->length.
-         * wr->data still points in the wb->buf */
-
-        if (mac_size != 0)
-                {
-                s->method->ssl3_enc->mac(s,&(p[wr->length]),1);
-                wr->length+=mac_size;
-                wr->input=p;
-                wr->data=p;
-                }
-
-        /* ssl3_enc can only have an error on read */
-        s->method->ssl3_enc->enc(s,1);
-
-        /* record length after mac and block padding */
-        s2n(wr->length,plen);
-
-        /* we should now have
-         * wr->data pointing to the encrypted data, which is
-         * wr->length long */
-        wr->type=type; /* not needed but helps for debugging */
-        wr->length+=SSL3_RT_HEADER_LENGTH;
-
-        /* Now lets setup wb */
-        wb->left=wr->length;
-        wb->offset=0;
-
-        s->s3->wpend_tot=len;
-        s->s3->wpend_buf=buf;
-        s->s3->wpend_type=type;
-        s->s3->wpend_ret=len;
-
-        /* we now just need to write the buffer */
-        return(ssl3_write_pending(s,type,buf,len));
-err:
-        return(-1);
-        }
-
-/* if s->s3->wbuf.left != 0, we need to call this */
-static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
-                              unsigned int len)
-        {
-        int i;
-
-/* XXXX */
-        if ((s->s3->wpend_tot > (int)len)
-                || ((s->s3->wpend_buf != buf) &&
-                        !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER))
-                || (s->s3->wpend_type != type))
-                {
-                SSLerr(SSL_F_SSL3_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
-                return(-1);
-                }
-
-        for (;;)
-                {
-                clear_sys_error();
-                if (s->wbio != NULL)
-                        {
-                        s->rwstate=SSL_WRITING;
-                        i=BIO_write(s->wbio,
-                                (char *)&(s->s3->wbuf.buf[s->s3->wbuf.offset]),
-                                (unsigned int)s->s3->wbuf.left);
-                        }
-                else
-                        {
-                        SSLerr(SSL_F_SSL3_WRITE_PENDING,SSL_R_BIO_NOT_SET);
-                        i= -1;
-                        }
-                if (i == s->s3->wbuf.left)
-                        {
-                        s->s3->wbuf.left=0;
-                        s->rwstate=SSL_NOTHING;
-                        return(s->s3->wpend_ret);
-                        }
-                else if (i <= 0)
-                        return(i);
-                s->s3->wbuf.offset+=i;
-                s->s3->wbuf.left-=i;
-                }
-        }
-
-int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
-        {
-        int al,i,j,n,ret;
-        SSL3_RECORD *rr;
-        void (*cb)()=NULL;
-        BIO *bio;
-
-        if (s->s3->rbuf.buf == NULL) /* Not initialize yet */
-                if (!ssl3_setup_buffers(s))
-                        return(-1);
-
-        if (!s->in_handshake && SSL_in_init(s))
-                {
-                i=s->handshake_func(s);
-                if (i < 0) return(i);
-                if (i == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
-                        return(-1);
-                        }
-                }
-start:
-        s->rwstate=SSL_NOTHING;
-
-        /* s->s3->rrec.type     - is the type of record
-         * s->s3->rrec.data,    - data
-         * s->s3->rrec.off,     - ofset into 'data' for next read
-         * s->s3->rrec.length,  - number of bytes. */
-        rr= &(s->s3->rrec);
-
-        /* get new packet */
-        if ((rr->length == 0) || (s->rstate == SSL_ST_READ_BODY))
-                {
-                ret=ssl3_get_record(s);
-                if (ret <= 0) return(ret);
-                }
-
-        /* we now have a packet which can be read and processed */
-
-        if (s->s3->change_cipher_spec && (rr->type != SSL3_RT_HANDSHAKE))
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
-                goto err;
-                }
-
-        /* If the other end has shutdown, throw anything we read away */
-        if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
-                {
-                rr->length=0;
-                s->rwstate=SSL_NOTHING;
-                return(0);
-                }
-
-        /* Check for an incoming 'Client Request' message */
-        if ((rr->type == SSL3_RT_HANDSHAKE) && (rr->length == 4) &&
-                (rr->data[0] == SSL3_MT_CLIENT_REQUEST) &&
-                (s->session != NULL) && (s->session->cipher != NULL))
-                {
-                if ((rr->data[1] != 0) || (rr->data[2] != 0) ||
-                        (rr->data[3] != 0))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_CLIENT_REQUEST);
-                        goto err;
-                        }
-
-                if (SSL_is_init_finished(s) &&
-                        !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
-                        !s->s3->renegotiate)
-                        {
-                        ssl3_renegotiate(s);
-                        if (ssl3_renegotiate_check(s))
-                                {
-                                n=s->handshake_func(s);
-                                if (n < 0) return(n);
-                                if (n == 0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
-                                        return(-1);
-                                        }
-                                }
-                        }
-                rr->length=0;
-/* ZZZ */       goto start;
-                }
-
-        /* if it is not the type we want, or we have shutdown and want
-         * the peer shutdown */
-        if ((rr->type != type) || (s->shutdown & SSL_SENT_SHUTDOWN))
-                {
-                if (rr->type == SSL3_RT_ALERT)
-                        {
-                        if ((rr->length != 2) || (rr->off != 0))
-                                {
-                                al=SSL_AD_DECODE_ERROR;
-                                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_ALERT_RECORD);
-                                goto f_err;
-                                }
-
-                        i=rr->data[0];
-                        n=rr->data[1];
-
-                        /* clear from buffer */
-                        rr->length=0;
-
-                        if (s->info_callback != NULL)
-                                cb=s->info_callback;
-                        else if (s->ctx->info_callback != NULL)
-                                cb=s->ctx->info_callback;
-
-                        if (cb != NULL)
-                                {
-                                j=(i<<8)|n;
-                                cb(s,SSL_CB_READ_ALERT,j);
-                                }
-
-                        if (i == 1)
-                                {
-                                s->s3->warn_alert=n;
-                                if (n == SSL_AD_CLOSE_NOTIFY)
-                                        {
-                                        s->shutdown|=SSL_RECEIVED_SHUTDOWN;
-                                        return(0);
-                                        }
-                                }
-                        else if (i == 2)
-                                {
-                                char tmp[16];
-
-                                s->rwstate=SSL_NOTHING;
-                                s->s3->fatal_alert=n;
-                                SSLerr(SSL_F_SSL3_READ_BYTES,
-                                        SSL_AD_REASON_OFFSET+n);
-                                sprintf(tmp,"%d",n);
-                                ERR_add_error_data(2,"SSL alert number ",tmp);
-                                s->shutdown|=SSL_RECEIVED_SHUTDOWN;
-                                SSL_CTX_remove_session(s->ctx,s->session);
-                                return(0);
-                                }
-                        else
-                                {
-                                al=SSL_AD_ILLEGAL_PARAMETER;
-                                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_UNKNOWN_ALERT_TYPE);
-                                goto f_err;
-                                }
-
-                        rr->length=0;
-                        goto start;
-                        }
-
-                if (s->shutdown & SSL_SENT_SHUTDOWN)
-                        {
-                        s->rwstate=SSL_NOTHING;
-                        rr->length=0;
-                        return(0);
-                        }
-
-                if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
-                        {
-                        if (    (rr->length != 1) || (rr->off != 0) ||
-                                (rr->data[0] != SSL3_MT_CCS))
-                                {
-                                i=SSL_AD_ILLEGAL_PARAMETER;
-                                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
-                                goto err;
-                                }
-
-                        rr->length=0;
-                        s->s3->change_cipher_spec=1;
-                        if (!do_change_cipher_spec(s))
-                                goto err;
-                        else
-                                goto start;
-                        }
-
-                /* else we have a handshake */
-                if ((rr->type == SSL3_RT_HANDSHAKE) &&
-                        !s->in_handshake)
-                        {
-                        if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&
-                                !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))
-                                {
-                                s->state=SSL_ST_BEFORE|(s->server)
-                                                ?SSL_ST_ACCEPT
-                                                :SSL_ST_CONNECT;
-                                s->new_session=1;
-                                }
-                        n=s->handshake_func(s);
-                        if (n < 0) return(n);
-                        if (n == 0)
-                                {
-                                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
-                                return(-1);
-                                }
-
-                        /* In the case where we try to read application data
-                         * the first time, but we trigger an SSL handshake, we
-                         * return -1 with the retry option set.  I do this
-                         * otherwise renegotiation can cause nasty problems 
-                         * in the non-blocking world */
-
-                        s->rwstate=SSL_READING;
-                        bio=SSL_get_rbio(s);
-                        BIO_clear_retry_flags(bio);
-                        BIO_set_retry_read(bio);
-                        return(-1);
-                        }
-
-                switch (rr->type)
-                        {
-                default:
-#ifndef NO_TLS
-                        /* TLS just ignores unknown message types */
-                        if (s->version == TLS1_VERSION)
-                                {
-                                goto start;
-                                }
-#endif
-                case SSL3_RT_CHANGE_CIPHER_SPEC:
-                case SSL3_RT_ALERT:
-                case SSL3_RT_HANDSHAKE:
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
-                        goto f_err;
-                case SSL3_RT_APPLICATION_DATA:
-                        /* At this point, we were expecting something else,
-                         * but have application data.  What we do is set the
-                         * error, and return -1.  On the way out, if the
-                         * library was running inside ssl3_read() and it makes
-                         * sense to read application data at this point, we
-                         * will indulge it.  This will mostly happen during
-                         * session renegotiation.
-                         */
-                        if (s->s3->in_read_app_data &&
-                                (s->s3->total_renegotiations != 0) &&
-                                ((
-                                  (s->state & SSL_ST_CONNECT) &&
-                                  (s->state >= SSL3_ST_CW_CLNT_HELLO_A) &&
-                                  (s->state <= SSL3_ST_CR_SRVR_HELLO_A)
-                                 ) || (
-                                  (s->state & SSL_ST_ACCEPT) &&
-                                  (s->state <= SSL3_ST_SW_HELLO_REQ_A) &&
-                                  (s->state >= SSL3_ST_SR_CLNT_HELLO_A)
-                                 )
-                                ))
-                                {
-                                s->s3->in_read_app_data=0;
-                                return(-1);
-                                }
-                        else
-                                {
-                                al=SSL_AD_UNEXPECTED_MESSAGE;
-                                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
-                                goto f_err;
-                                }
-                        }
-                }
-
-        /* make sure that we are not getting application data when we
-         * are doing a handshake for the first time */
-        if (SSL_in_init(s) && (type == SSL3_RT_APPLICATION_DATA) &&
-                (s->enc_read_ctx == NULL))
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_APP_DATA_IN_HANDSHAKE);
-                goto f_err;
-                }
-
-        if (len <= 0) return(len);
-
-        if ((unsigned int)len > rr->length)
-                n=rr->length;
-        else
-                n=len;
-
-        memcpy(buf,&(rr->data[rr->off]),(unsigned int)n);
-        rr->length-=n;
-        rr->off+=n;
-        if (rr->length <= 0)
-                {
-                s->rstate=SSL_ST_READ_HEADER;
-                rr->off=0;
-                }
-
-        if (type == SSL3_RT_HANDSHAKE)
-                ssl3_finish_mac(s,buf,n);
-        return(n);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        return(-1);
-        }
-
-static int do_change_cipher_spec(SSL *s)
-        {
-        int i;
-        unsigned char *sender;
-        int slen;
-
-        if (s->state & SSL_ST_ACCEPT)
-                i=SSL3_CHANGE_CIPHER_SERVER_READ;
-        else
-                i=SSL3_CHANGE_CIPHER_CLIENT_READ;
-
-        if (s->s3->tmp.key_block == NULL)
-                {
-                s->session->cipher=s->s3->tmp.new_cipher;
-                if (!s->method->ssl3_enc->setup_key_block(s)) return(0);
-                }
-
-        if (!s->method->ssl3_enc->change_cipher_state(s,i))
-                return(0);
-
-        /* we have to record the message digest at
-         * this point so we can get it before we read
-         * the finished message */
-        if (s->state & SSL_ST_CONNECT)
-                {
-                sender=s->method->ssl3_enc->server_finished;
-                slen=s->method->ssl3_enc->server_finished_len;
-                }
-        else
-                {
-                sender=s->method->ssl3_enc->client_finished;
-                slen=s->method->ssl3_enc->client_finished_len;
-                }
-
-        s->method->ssl3_enc->final_finish_mac(s,
-                &(s->s3->finish_dgst1),
-                &(s->s3->finish_dgst2),
-                sender,slen,&(s->s3->tmp.finish_md[0]));
-
-        return(1);
-        }
-
-int ssl3_do_write(SSL *s, int type)
-        {
-        int ret;
-
-        ret=ssl3_write_bytes(s,type,&s->init_buf->data[s->init_off],
-                             s->init_num);
-        if (ret == s->init_num)
-                return(1);
-        if (ret < 0) return(-1);
-        s->init_off+=ret;
-        s->init_num-=ret;
-        return(0);
-        }
-
-void ssl3_send_alert(SSL *s, int level, int desc)
-        {
-        /* Map tls/ssl alert value to correct one */
-        desc=s->method->ssl3_enc->alert_value(desc);
-        if (desc < 0) return;
-        /* If a fatal one, remove from cache */
-        if ((level == 2) && (s->session != NULL))
-                SSL_CTX_remove_session(s->ctx,s->session);
-
-        s->s3->alert_dispatch=1;
-        s->s3->send_alert[0]=level;
-        s->s3->send_alert[1]=desc;
-        if (s->s3->wbuf.left == 0) /* data still being written out */
-                ssl3_dispatch_alert(s);
-        /* else data is still being written out, we will get written
-         * some time in the future */
-        }
-
-int ssl3_dispatch_alert(SSL *s)
-        {
-        int i,j;
-        void (*cb)()=NULL;
-
-        s->s3->alert_dispatch=0;
-        i=do_ssl3_write(s,SSL3_RT_ALERT,&s->s3->send_alert[0],2);
-        if (i <= 0)
-                {
-                s->s3->alert_dispatch=1;
-                }
-        else
-                {
-                /* If it is important, send it now.  If the message
-                 * does not get sent due to non-blocking IO, we will
-                 * not worry too much. */
-                if (s->s3->send_alert[0] == SSL3_AL_FATAL)
-                        (void)BIO_flush(s->wbio);
-
-                if (s->info_callback != NULL)
-                        cb=s->info_callback;
-                else if (s->ctx->info_callback != NULL)
-                        cb=s->ctx->info_callback;
-                
-                if (cb != NULL)
-                        {
-                        j=(s->s3->send_alert[0]<<8)|s->s3->send_alert[1];
-                        cb(s,SSL_CB_WRITE_ALERT,j);
-                        }
-                }
-        return(i);
-        }
-
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
deleted file mode 100644
index e003d88357..0000000000
--- a/src/lib/libssl/s3_srvr.c
+++ /dev/null
@@ -1,1683 +0,0 @@
-/* ssl/s3_srvr.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.]
- */
-
-#define REUSE_CIPHER_BUG
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *ssl3_get_server_method(int ver);
-static int ssl3_get_client_hello(SSL *s);
-static int ssl3_send_server_hello(SSL *s);
-static int ssl3_send_server_key_exchange(SSL *s);
-static int ssl3_send_certificate_request(SSL *s);
-static int ssl3_send_server_done(SSL *s);
-static int ssl3_get_cert_verify(SSL *s);
-static int ssl3_get_client_key_exchange(SSL *s);
-static int ssl3_get_client_certificate(SSL *s);
-static int ssl3_send_hello_request(SSL *s);
-
-static SSL_METHOD *ssl3_get_server_method(int ver)
-        {
-        if (ver == SSL3_VERSION)
-                return(SSLv3_server_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *SSLv3_server_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD SSLv3_server_data;
-
-        if (init)
-                {
-                memcpy((char *)&SSLv3_server_data,(char *)sslv3_base_method(),
-                        sizeof(SSL_METHOD));
-                SSLv3_server_data.ssl_accept=ssl3_accept;
-                SSLv3_server_data.get_ssl_method=ssl3_get_server_method;
-                init=0;
-                }
-        return(&SSLv3_server_data);
-        }
-
-int ssl3_accept(SSL *s)
-        {
-        BUF_MEM *buf;
-        unsigned long l,Time=time(NULL);
-        void (*cb)()=NULL;
-        long num1;
-        int ret= -1;
-        int new_state,state,skip=0;
-
-        RAND_seed(&Time,sizeof(Time));
-        ERR_clear_error();
-        clear_sys_error();
-
-        if (s->info_callback != NULL)
-                cb=s->info_callback;
-        else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-
-        /* init things to blank */
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
-        s->in_handshake++;
-
-        if (s->cert == NULL)
-                {
-                SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
-                return(-1);
-                }
-
-        for (;;)
-                {
-                state=s->state;
-
-                switch (s->state)
-                        {
-                case SSL_ST_RENEGOTIATE:
-                        s->new_session=1;
-                        /* s->state=SSL_ST_ACCEPT; */
-
-                case SSL_ST_BEFORE:
-                case SSL_ST_ACCEPT:
-                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
-                case SSL_ST_OK|SSL_ST_ACCEPT:
-
-                        s->server=1;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
-
-                        if ((s->version>>8) != 3)
-                                abort();
-                        /* s->version=SSL3_VERSION; */
-                        s->type=SSL_ST_ACCEPT;
-
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
-                                        goto end;
-                                        }
-                                s->init_buf=buf;
-                                }
-
-                        if (!ssl3_setup_buffers(s))
-                                {
-                                ret= -1;
-                                goto end;
-                                }
-
-                        /* Ok, we now need to push on a buffering BIO so that
-                         * the output is sent in a way that TCP likes :-)
-                         */
-                        if (!ssl_init_wbio_buffer(s,1)) { ret= -1; goto end; }
-
-                        s->init_num=0;
-
-                        if (s->state != SSL_ST_RENEGOTIATE)
-                                {
-                                s->state=SSL3_ST_SR_CLNT_HELLO_A;
-                                ssl3_init_finished_mac(s);
-                                s->ctx->stats.sess_accept++;
-                                }
-                        else
-                                {
-                                s->ctx->stats.sess_accept_renegotiate++;
-                                s->state=SSL3_ST_SW_HELLO_REQ_A;
-                                }
-                        break;
-
-                case SSL3_ST_SW_HELLO_REQ_A:
-                case SSL3_ST_SW_HELLO_REQ_B:
-
-                        s->shutdown=0;
-                        ret=ssl3_send_hello_request(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
-
-                        ssl3_init_finished_mac(s);
-                        break;
-
-                case SSL3_ST_SW_HELLO_REQ_C:
-                        s->state=SSL_ST_OK;
-                        ret=1;
-                        goto end;
-                        /* break; */
-
-                case SSL3_ST_SR_CLNT_HELLO_A:
-                case SSL3_ST_SR_CLNT_HELLO_B:
-                case SSL3_ST_SR_CLNT_HELLO_C:
-
-                        s->shutdown=0;
-                        ret=ssl3_get_client_hello(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_SRVR_HELLO_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SW_SRVR_HELLO_A:
-                case SSL3_ST_SW_SRVR_HELLO_B:
-                        ret=ssl3_send_server_hello(s);
-                        if (ret <= 0) goto end;
-
-                        if (s->hit)
-                                s->state=SSL3_ST_SW_CHANGE_A;
-                        else
-                                s->state=SSL3_ST_SW_CERT_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SW_CERT_A:
-                case SSL3_ST_SW_CERT_B:
-                        /* Check if it is anon DH */
-                        if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
-                                {
-                                ret=ssl3_send_server_certificate(s);
-                                if (ret <= 0) goto end;
-                                }
-                        else
-                                skip=1;
-                        s->state=SSL3_ST_SW_KEY_EXCH_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SW_KEY_EXCH_A:
-                case SSL3_ST_SW_KEY_EXCH_B:
-                        l=s->s3->tmp.new_cipher->algorithms;
-
-                        /* clear this, it may get reset by
-                         * send_server_key_exchange */
-                        if (s->options & SSL_OP_EPHEMERAL_RSA)
-                                s->s3->tmp.use_rsa_tmp=1;
-                        else
-                                s->s3->tmp.use_rsa_tmp=0;
-
-                        /* only send if a DH key exchange, fortezza or
-                         * RSA but we have a sign only certificate */
-                        if (s->s3->tmp.use_rsa_tmp
-                            || (l & (SSL_DH|SSL_kFZA))
-                            || ((l & SSL_kRSA)
-                                && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
-                                    || (SSL_IS_EXPORT(l)
-                                        && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_EXPORT_PKEYLENGTH(l)
-                                        )
-                                    )
-                                )
-                            )
-                                {
-                                ret=ssl3_send_server_key_exchange(s);
-                                if (ret <= 0) goto end;
-                                }
-                        else
-                                skip=1;
-
-                        s->state=SSL3_ST_SW_CERT_REQ_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SW_CERT_REQ_A:
-                case SSL3_ST_SW_CERT_REQ_B:
-                        if (!(s->verify_mode & SSL_VERIFY_PEER) ||
-                                ((s->session->peer != NULL) &&
-                                 (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)))
-                                {
-                                /* no cert request */
-                                skip=1;
-                                s->s3->tmp.cert_request=0;
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_request=1;
-                                ret=ssl3_send_certificate_request(s);
-                                if (ret <= 0) goto end;
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
-                                s->init_num=0;
-                                }
-                        break;
-
-                case SSL3_ST_SW_SRVR_DONE_A:
-                case SSL3_ST_SW_SRVR_DONE_B:
-                        ret=ssl3_send_server_done(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
-                        break;
-                
-                case SSL3_ST_SW_FLUSH:
-                        /* number of bytes to be flushed */
-                        num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
-                        if (num1 > 0)
-                                {
-                                s->rwstate=SSL_WRITING;
-                                num1=BIO_flush(s->wbio);
-                                if (num1 <= 0) { ret= -1; goto end; }
-                                s->rwstate=SSL_NOTHING;
-                                }
-
-                        s->state=s->s3->tmp.next_state;
-                        break;
-
-                case SSL3_ST_SR_CERT_A:
-                case SSL3_ST_SR_CERT_B:
-                        /* could be sent for a DH cert, even if we
-                         * have not asked for it :-) */
-                        ret=ssl3_get_client_certificate(s);
-                        if (ret <= 0) goto end;
-                        s->init_num=0;
-                        s->state=SSL3_ST_SR_KEY_EXCH_A;
-                        break;
-
-                case SSL3_ST_SR_KEY_EXCH_A:
-                case SSL3_ST_SR_KEY_EXCH_B:
-                        ret=ssl3_get_client_key_exchange(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SR_CERT_VRFY_A;
-                        s->init_num=0;
-
-                        /* We need to get hashes here so if there is
-                         * a client cert, it can be verified */ 
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                &(s->s3->finish_dgst1),
-                                &(s->s3->tmp.finish_md[0]));
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                &(s->s3->finish_dgst2),
-                                &(s->s3->tmp.finish_md[MD5_DIGEST_LENGTH]));
-
-                        break;
-
-                case SSL3_ST_SR_CERT_VRFY_A:
-                case SSL3_ST_SR_CERT_VRFY_B:
-
-                        /* we should decide if we expected this one */
-                        ret=ssl3_get_cert_verify(s);
-                        if (ret <= 0) goto end;
-
-                        s->state=SSL3_ST_SR_FINISHED_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SR_FINISHED_A:
-                case SSL3_ST_SR_FINISHED_B:
-                        ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
-                                SSL3_ST_SR_FINISHED_B);
-                        if (ret <= 0) goto end;
-                        if (s->hit)
-                                s->state=SSL_ST_OK;
-                        else
-                                s->state=SSL3_ST_SW_CHANGE_A;
-                        s->init_num=0;
-                        break;
-
-                case SSL3_ST_SW_CHANGE_A:
-                case SSL3_ST_SW_CHANGE_B:
-
-                        s->session->cipher=s->s3->tmp.new_cipher;
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                { ret= -1; goto end; }
-
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_SW_CHANGE_A,SSL3_ST_SW_CHANGE_B);
-
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FINISHED_A;
-                        s->init_num=0;
-
-                        if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_SERVER_WRITE))
-                                {
-                                ret= -1;
-                                goto end;
-                                }
-
-                        break;
-
-                case SSL3_ST_SW_FINISHED_A:
-                case SSL3_ST_SW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_SW_FINISHED_A,SSL3_ST_SW_FINISHED_B,
-                                s->method->ssl3_enc->server_finished,
-                                s->method->ssl3_enc->server_finished_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        if (s->hit)
-                                s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
-                        else
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                        s->init_num=0;
-                        break;
-
-                case SSL_ST_OK:
-                        /* clean a few things up */
-                        ssl3_cleanup_key_block(s);
-
-                        BUF_MEM_free(s->init_buf);
-                        s->init_buf=NULL;
-
-                        /* remove buffering on output */
-                        ssl_free_wbio_buffer(s);
-
-                        s->new_session=0;
-                        s->init_num=0;
-
-                        ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
-
-                        s->ctx->stats.sess_accept_good++;
-                        /* s->server=1; */
-                        s->handshake_func=ssl3_accept;
-                        ret=1;
-
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
-
-                        goto end;
-                        /* break; */
-
-                default:
-                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
-                        goto end;
-                        /* break; */
-                        }
-                
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
-                                        goto end;
-                                }
-
-
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_ACCEPT_LOOP,1);
-                                s->state=new_state;
-                                }
-                        }
-                skip=0;
-                }
-end:
-        /* BIO_flush(s->wbio); */
-
-        if (cb != NULL)
-                cb(s,SSL_CB_ACCEPT_EXIT,ret);
-        s->in_handshake--;
-        return(ret);
-        }
-
-static int ssl3_send_hello_request(SSL *s)
-        {
-        unsigned char *p;
-
-        if (s->state == SSL3_ST_SW_HELLO_REQ_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
-                *(p++)=SSL3_MT_CLIENT_REQUEST;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
-
-                s->state=SSL3_ST_SW_HELLO_REQ_B;
-                /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_SW_HELLO_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
-
-static int ssl3_get_client_hello(SSL *s)
-        {
-        int i,j,ok,al,ret= -1;
-        long n;
-        unsigned long id;
-        unsigned char *p,*d,*q;
-        SSL_CIPHER *c;
-        SSL_COMP *comp=NULL;
-        STACK_OF(SSL_CIPHER) *ciphers=NULL;
-
-        /* We do this so that we will respond with our native type.
-         * If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
-         * This down switching should be handled by a different method.
-         * If we are SSLv3, we will respond with SSLv3, even if prompted with
-         * TLSv1.
-         */
-        if (s->state == SSL3_ST_SR_CLNT_HELLO_A)
-                {
-                s->first_packet=1;
-                s->state=SSL3_ST_SR_CLNT_HELLO_B;
-                }
-        n=ssl3_get_message(s,
-                SSL3_ST_SR_CLNT_HELLO_B,
-                SSL3_ST_SR_CLNT_HELLO_C,
-                SSL3_MT_CLIENT_HELLO,
-                SSL3_RT_MAX_PLAIN_LENGTH,
-                &ok);
-
-        if (!ok) return((int)n);
-        d=p=(unsigned char *)s->init_buf->data;
-
-        /* The version number has already been checked in ssl3_get_message.
-         * I a native TLSv1/SSLv3 method, the match must be correct except
-         * perhaps for the first message */
-/*      s->client_version=(((int)p[0])<<8)|(int)p[1]; */
-        p+=2;
-
-        /* load the client random */
-        memcpy(s->s3->client_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
-
-        /* get the session-id */
-        j= *(p++);
-
-        s->hit=0;
-        if (j == 0)
-                {
-                if (!ssl_get_new_session(s,1))
-                        goto err;
-                }
-        else
-                {
-                i=ssl_get_prev_session(s,p,j);
-                if (i == 1)
-                        { /* previous session */
-                        s->hit=1;
-                        }
-                else if (i == -1)
-                        goto err;
-                else /* i == 0 */
-                        {
-                        if (!ssl_get_new_session(s,1))
-                                goto err;
-                        }
-                }
-
-        p+=j;
-        n2s(p,i);
-        if ((i == 0) && (j != 0))
-                {
-                /* we need a cipher if we are not resuming a session */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_SPECIFIED);
-                goto f_err;
-                }
-        if ((i+p) > (d+n))
-                {
-                /* not enough data */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
-                goto f_err;
-                }
-        if ((i > 0) && (ssl_bytes_to_cipher_list(s,p,i,&(ciphers))
-                == NULL))
-                {
-                goto err;
-                }
-        p+=i;
-
-        /* If it is a hit, check that the cipher is in the list */
-        if ((s->hit) && (i > 0))
-                {
-                j=0;
-                id=s->session->cipher->id;
-
-#ifdef CIPHER_DEBUG
-                printf("client sent %d ciphers\n",sk_num(ciphers));
-#endif
-                for (i=0; i<sk_SSL_CIPHER_num(ciphers); i++)
-                        {
-                        c=sk_SSL_CIPHER_value(ciphers,i);
-#ifdef CIPHER_DEBUG
-                        printf("client [%2d of %2d]:%s\n",
-                                i,sk_num(ciphers),SSL_CIPHER_get_name(c));
-#endif
-                        if (c->id == id)
-                                {
-                                j=1;
-                                break;
-                                }
-                        }
-                if (j == 0)
-                        {
-                        if ((s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
-                                {
-                                /* Very bad for multi-threading.... */
-                                s->session->cipher=sk_SSL_CIPHER_value(ciphers,
-                                                                       0);
-                                }
-                        else
-                                {
-                                /* we need to have the cipher in the cipher
-                                 * list if we are asked to reuse it */
-                                al=SSL_AD_ILLEGAL_PARAMETER;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING);
-                                goto f_err;
-                                }
-                        }
-                }
-
-        /* compression */
-        i= *(p++);
-        q=p;
-        for (j=0; j<i; j++)
-                {
-                if (p[j] == 0) break;
-                }
-
-        p+=i;
-        if (j >= i)
-                {
-                /* no compress */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_COMPRESSION_SPECIFIED);
-                goto f_err;
-                }
-
-        /* Worst case, we will use the NULL compression, but if we have other
-         * options, we will now look for them.  We have i-1 compression
-         * algorithms from the client, starting at q. */
-        s->s3->tmp.new_compression=NULL;
-        if (s->ctx->comp_methods != NULL)
-                { /* See if we have a match */
-                int m,nn,o,v,done=0;
-
-                nn=sk_SSL_COMP_num(s->ctx->comp_methods);
-                for (m=0; m<nn; m++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,m);
-                        v=comp->id;
-                        for (o=0; o<i; o++)
-                                {
-                                if (v == q[o])
-                                        {
-                                        done=1;
-                                        break;
-                                        }
-                                }
-                        if (done) break;
-                        }
-                if (done)
-                        s->s3->tmp.new_compression=comp;
-                else
-                        comp=NULL;
-                }
-
-        /* TLS does not mind if there is extra stuff */
-        if (s->version == SSL3_VERSION)
-                {
-                if (p > (d+n))
-                        {
-                        /* wrong number of bytes,
-                         * there could be more to follow */
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
-                        goto f_err;
-                        }
-                }
-
-        /* Given s->session->ciphers and ssl_get_ciphers_by_id(s), we must
-         * pick a cipher */
-
-        if (!s->hit)
-                {
-                s->session->compress_meth=(comp == NULL)?0:comp->id;
-                if (s->session->ciphers != NULL)
-                        sk_SSL_CIPHER_free(s->session->ciphers);
-                s->session->ciphers=ciphers;
-                if (ciphers == NULL)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
-                        goto f_err;
-                        }
-                ciphers=NULL;
-                c=ssl3_choose_cipher(s,s->session->ciphers,
-                                     ssl_get_ciphers_by_id(s));
-
-                if (c == NULL)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
-                        goto f_err;
-                        }
-                s->s3->tmp.new_cipher=c;
-                }
-        else
-                {
-                /* Session-id reuse */
-#ifdef REUSE_CIPHER_BUG
-                STACK_OF(SSL_CIPHER) *sk;
-                SSL_CIPHER *nc=NULL;
-                SSL_CIPHER *ec=NULL;
-
-                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG)
-                        {
-                        sk=s->session->ciphers;
-                        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-                                {
-                                c=sk_SSL_CIPHER_value(sk,i);
-                                if (c->algorithms & SSL_eNULL)
-                                        nc=c;
-                                if (SSL_C_IS_EXPORT(c))
-                                        ec=c;
-                                }
-                        if (nc != NULL)
-                                s->s3->tmp.new_cipher=nc;
-                        else if (ec != NULL)
-                                s->s3->tmp.new_cipher=ec;
-                        else
-                                s->s3->tmp.new_cipher=s->session->cipher;
-                        }
-                else
-#endif
-                s->s3->tmp.new_cipher=s->session->cipher;
-                }
-        
-        /* we now have the following setup. 
-         * client_random
-         * cipher_list          - our prefered list of ciphers
-         * ciphers              - the clients prefered list of ciphers
-         * compression          - basically ignored right now
-         * ssl version is set   - sslv3
-         * s->session           - The ssl session has been setup.
-         * s->hit               - sesson reuse flag
-         * s->tmp.new_cipher    - the new cipher to use.
-         */
-
-        ret=1;
-        if (0)
-                {
-f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (ciphers != NULL) sk_SSL_CIPHER_free(ciphers);
-        return(ret);
-        }
-
-static int ssl3_send_server_hello(SSL *s)
-        {
-        unsigned char *buf;
-        unsigned char *p,*d;
-        int i,sl;
-        unsigned long l,Time;
-
-        if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
-                {
-                buf=(unsigned char *)s->init_buf->data;
-                p=s->s3->server_random;
-                Time=time(NULL);                        /* Time */
-                l2n(Time,p);
-                RAND_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
-                /* Do the message type and length last */
-                d=p= &(buf[4]);
-
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
-
-                /* Random stuff */
-                memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
-
-                /* now in theory we have 3 options to sending back the
-                 * session id.  If it is a re-use, we send back the
-                 * old session-id, if it is a new session, we send
-                 * back the new session-id or we send back a 0 length
-                 * session-id if we want it to be single use.
-                 * Currently I will not implement the '0' length session-id
-                 * 12-Jan-98 - I'll now support the '0' length stuff.
-                 */
-                if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER))
-                        s->session->session_id_length=0;
-
-                sl=s->session->session_id_length;
-                *(p++)=sl;
-                memcpy(p,s->session->session_id,sl);
-                p+=sl;
-
-                /* put the cipher */
-                i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p);
-                p+=i;
-
-                /* put the compression method */
-                if (s->s3->tmp.new_compression == NULL)
-                        *(p++)=0;
-                else
-                        *(p++)=s->s3->tmp.new_compression->id;
-
-                /* do the header */
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_SERVER_HELLO;
-                l2n3(l,d);
-
-                s->state=SSL3_ST_CW_CLNT_HELLO_B;
-                /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
-
-static int ssl3_send_server_done(SSL *s)
-        {
-        unsigned char *p;
-
-        if (s->state == SSL3_ST_SW_SRVR_DONE_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
-
-                /* do the header */
-                *(p++)=SSL3_MT_SERVER_DONE;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
-
-                s->state=SSL3_ST_SW_SRVR_DONE_B;
-                /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
-
-static int ssl3_send_server_key_exchange(SSL *s)
-        {
-#ifndef NO_RSA
-        unsigned char *q;
-        int j,num;
-        RSA *rsa;
-        unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
-#endif
-#ifndef NO_DH
-        DH *dh,*dhp;
-#endif
-        EVP_PKEY *pkey;
-        unsigned char *p,*d;
-        int al,i;
-        unsigned long type;
-        int n;
-        CERT *cert;
-        BIGNUM *r[4];
-        int nr[4],kn;
-        BUF_MEM *buf;
-        EVP_MD_CTX md_ctx;
-
-        if (s->state == SSL3_ST_SW_KEY_EXCH_A)
-                {
-                type=s->s3->tmp.new_cipher->algorithms & SSL_MKEY_MASK;
-                cert=s->cert;
-
-                buf=s->init_buf;
-
-                r[0]=r[1]=r[2]=r[3]=NULL;
-                n=0;
-#ifndef NO_RSA
-                if (type & SSL_kRSA)
-                        {
-                        rsa=cert->rsa_tmp;
-                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL))
-                                {
-                                rsa=s->cert->rsa_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                                CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
-                                cert->rsa_tmp=rsa;
-                                }
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
-                                goto f_err;
-                                }
-                        r[0]=rsa->n;
-                        r[1]=rsa->e;
-                        s->s3->tmp.use_rsa_tmp=1;
-                        }
-                else
-#endif
-#ifndef NO_DH
-                        if (type & SSL_kEDH)
-                        {
-                        dhp=cert->dh_tmp;
-                        if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL))
-                                dhp=s->cert->dh_tmp_cb(s,
-                                      !SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                        if (dhp == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
-                                goto f_err;
-                                }
-                        if ((dh=DHparams_dup(dhp)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
-                                goto err;
-                                }
-
-                        s->s3->tmp.dh=dh;
-                        if ((dhp->pub_key == NULL ||
-                             dhp->priv_key == NULL ||
-                             (s->options & SSL_OP_SINGLE_DH_USE)))
-                                {
-                                if(!DH_generate_key(dh))
-                                    {
-                                    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
-                                           ERR_R_DH_LIB);
-                                    goto err;
-                                    }
-                                }
-                        else
-                                {
-                                dh->pub_key=BN_dup(dhp->pub_key);
-                                dh->priv_key=BN_dup(dhp->priv_key);
-                                if ((dh->pub_key == NULL) ||
-                                        (dh->priv_key == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
-                                        goto err;
-                                        }
-                                }
-                        r[0]=dh->p;
-                        r[1]=dh->g;
-                        r[2]=dh->pub_key;
-                        }
-                else 
-#endif
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
-                        goto f_err;
-                        }
-                for (i=0; r[i] != NULL; i++)
-                        {
-                        nr[i]=BN_num_bytes(r[i]);
-                        n+=2+nr[i];
-                        }
-
-                if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
-                        {
-                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher))
-                                == NULL)
-                                {
-                                al=SSL_AD_DECODE_ERROR;
-                                goto f_err;
-                                }
-                        kn=EVP_PKEY_size(pkey);
-                        }
-                else
-                        {
-                        pkey=NULL;
-                        kn=0;
-                        }
-
-                if (!BUF_MEM_grow(buf,n+4+kn))
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
-                        goto err;
-                        }
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-
-                for (i=0; r[i] != NULL; i++)
-                        {
-                        s2n(nr[i],p);
-                        BN_bn2bin(r[i],p);
-                        p+=nr[i];
-                        }
-
-                /* not anonymous */
-                if (pkey != NULL)
-                        {
-                        /* n is the length of the params, they start at &(d[4])
-                         * and p points to the space at the end. */
-#ifndef NO_RSA
-                        if (pkey->type == EVP_PKEY_RSA)
-                                {
-                                q=md_buf;
-                                j=0;
-                                for (num=2; num > 0; num--)
-                                        {
-                                        EVP_DigestInit(&md_ctx,(num == 2)
-                                                ?s->ctx->md5:s->ctx->sha1);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(d[4]),n);
-                                        EVP_DigestFinal(&md_ctx,q,
-                                                (unsigned int *)&i);
-                                        q+=i;
-                                        j+=i;
-                                        }
-                                i=RSA_private_encrypt(j,md_buf,&(p[2]),
-                                        pkey->pkey.rsa,RSA_PKCS1_PADDING);
-                                if (i <= 0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
-                                        goto err;
-                                        }
-                                s2n(i,p);
-                                n+=i+2;
-                                }
-                        else
-#endif
-#if !defined(NO_DSA)
-                                if (pkey->type == EVP_PKEY_DSA)
-                                {
-                                /* lets do DSS */
-                                EVP_SignInit(&md_ctx,EVP_dss1());
-                                EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(d[4]),n);
-                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
-                                        (unsigned int *)&i,pkey))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
-                                        goto err;
-                                        }
-                                s2n(i,p);
-                                n+=i+2;
-                                }
-                        else
-#endif
-                                {
-                                /* Is this error check actually needed? */
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
-                                goto f_err;
-                                }
-                        }
-
-                *(d++)=SSL3_MT_SERVER_KEY_EXCHANGE;
-                l2n3(n,d);
-
-                /* we should now have things packed up, so lets send
-                 * it off */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_SW_KEY_EXCH_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-err:
-        return(-1);
-        }
-
-static int ssl3_send_certificate_request(SSL *s)
-        {
-        unsigned char *p,*d;
-        int i,j,nl,off,n;
-        STACK_OF(X509_NAME) *sk=NULL;
-        X509_NAME *name;
-        BUF_MEM *buf;
-
-        if (s->state == SSL3_ST_SW_CERT_REQ_A)
-                {
-                buf=s->init_buf;
-
-                d=p=(unsigned char *)&(buf->data[4]);
-
-                /* get the list of acceptable cert types */
-                p++;
-                n=ssl3_get_req_cert_type(s,p);
-                d[0]=n;
-                p+=n;
-                n++;
-
-                off=n;
-                p+=2;
-                n+=2;
-
-                sk=SSL_get_client_CA_list(s);
-                nl=0;
-                if (sk != NULL)
-                        {
-                        for (i=0; i<sk_X509_NAME_num(sk); i++)
-                                {
-                                name=sk_X509_NAME_value(sk,i);
-                                j=i2d_X509_NAME(name,NULL);
-                                if (!BUF_MEM_grow(buf,4+n+j+2))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
-                                        goto err;
-                                        }
-                                p=(unsigned char *)&(buf->data[4+n]);
-                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
-                                        {
-                                        s2n(j,p);
-                                        i2d_X509_NAME(name,&p);
-                                        n+=2+j;
-                                        nl+=2+j;
-                                        }
-                                else
-                                        {
-                                        d=p;
-                                        i2d_X509_NAME(name,&p);
-                                        j-=2; s2n(j,d); j+=2;
-                                        n+=j;
-                                        nl+=j;
-                                        }
-                                }
-                        }
-                /* else no CA names */
-                p=(unsigned char *)&(buf->data[4+off]);
-                s2n(nl,p);
-
-                d=(unsigned char *)buf->data;
-                *(d++)=SSL3_MT_CERTIFICATE_REQUEST;
-                l2n3(n,d);
-
-                /* we should now have things packed up, so lets send
-                 * it off */
-
-                s->init_num=n+4;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_SW_CERT_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-err:
-        return(-1);
-        }
-
-static int ssl3_get_client_key_exchange(SSL *s)
-        {
-        int i,al,ok;
-        long n;
-        unsigned long l;
-        unsigned char *p;
-#ifndef NO_RSA
-        RSA *rsa=NULL;
-        EVP_PKEY *pkey=NULL;
-#endif
-#ifndef NO_DH
-        BIGNUM *pub=NULL;
-        DH *dh_srvr;
-#endif
-
-        n=ssl3_get_message(s,
-                SSL3_ST_SR_KEY_EXCH_A,
-                SSL3_ST_SR_KEY_EXCH_B,
-                SSL3_MT_CLIENT_KEY_EXCHANGE,
-                400, /* ???? */
-                &ok);
-
-        if (!ok) return((int)n);
-        p=(unsigned char *)s->init_buf->data;
-
-        l=s->s3->tmp.new_cipher->algorithms;
-
-#ifndef NO_RSA
-        if (l & SSL_kRSA)
-                {
-                /* FIX THIS UP EAY EAY EAY EAY */
-                if (s->s3->tmp.use_rsa_tmp)
-                        {
-                        if ((s->cert != NULL) && (s->cert->rsa_tmp != NULL))
-                                rsa=s->cert->rsa_tmp;
-                        /* Don't do a callback because rsa_tmp should
-                         * be sent already */
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_PKEY);
-                                goto f_err;
-
-                                }
-                        }
-                else
-                        {
-                        pkey=s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey;
-                        if (    (pkey == NULL) ||
-                                (pkey->type != EVP_PKEY_RSA) ||
-                                (pkey->pkey.rsa == NULL))
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_RSA_CERTIFICATE);
-                                goto f_err;
-                                }
-                        rsa=pkey->pkey.rsa;
-                        }
-
-                /* TLS */
-                if (s->version > SSL3_VERSION)
-                        {
-                        n2s(p,i);
-                        if (n != i+2)
-                                {
-                                if (!(s->options & SSL_OP_TLS_D5_BUG))
-                                        {
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
-                                        goto err;
-                                        }
-                                else
-                                        p-=2;
-                                }
-                        else
-                                n=i;
-                        }
-
-                i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING);
-
-#if 1
-                /* If a bad decrypt, use a random master key */
-                if ((i != SSL_MAX_MASTER_KEY_LENGTH) ||
-                        ((p[0] != (s->client_version>>8)) ||
-                         (p[1] != (s->client_version & 0xff))))
-                        {
-                        int bad=1;
-
-                        if ((i == SSL_MAX_MASTER_KEY_LENGTH) &&
-                                (p[0] == (s->version>>8)) &&
-                                (p[1] == 0))
-                                {
-                                if (s->options & SSL_OP_TLS_ROLLBACK_BUG)
-                                        bad=0;
-                                }
-                        if (bad)
-                                {
-                                p[0]=(s->version>>8);
-                                p[1]=(s->version & 0xff);
-                                RAND_bytes(&(p[2]),SSL_MAX_MASTER_KEY_LENGTH-2);
-                                i=SSL_MAX_MASTER_KEY_LENGTH;
-                                }
-                        /* else, an SSLeay bug, ssl only server, tls client */
-                        }
-#else
-                if (i != SSL_MAX_MASTER_KEY_LENGTH)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
-                        goto f_err;
-                        }
-
-                if ((p[0] != (s->version>>8)) || (p[1] != (s->version & 0xff)))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
-                        goto f_err;
-                        }
-#endif
-
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,
-                                p,i);
-                memset(p,0,i);
-                }
-        else
-#endif
-#ifndef NO_DH
-                if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                {
-                n2s(p,i);
-                if (n != i+2)
-                        {
-                        if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG))
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
-                                goto err;
-                                }
-                        else
-                                {
-                                p-=2;
-                                i=(int)n;
-                                }
-                        }
-
-                if (n == 0L) /* the parameters are in the cert */
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_DECODE_DH_CERTS);
-                        goto f_err;
-                        }
-                else
-                        {
-                        if (s->s3->tmp.dh == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
-                                goto f_err;
-                                }
-                        else
-                                dh_srvr=s->s3->tmp.dh;
-                        }
-
-                pub=BN_bin2bn(p,i,NULL);
-                if (pub == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BN_LIB);
-                        goto err;
-                        }
-
-                i=DH_compute_key(p,pub,dh_srvr);
-
-                if (i <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
-                        goto err;
-                        }
-
-                DH_free(s->s3->tmp.dh);
-                s->s3->tmp.dh=NULL;
-
-                BN_clear_free(pub);
-                pub=NULL;
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,p,i);
-                }
-        else
-#endif
-                {
-                al=SSL_AD_HANDSHAKE_FAILURE;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_UNKNOWN_CIPHER_TYPE);
-                goto f_err;
-                }
-
-        return(1);
-f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-#if !defined(NO_DH) || !defined(NO_RSA)
-err:
-#endif
-        return(-1);
-        }
-
-static int ssl3_get_cert_verify(SSL *s)
-        {
-        EVP_PKEY *pkey=NULL;
-        unsigned char *p;
-        int al,ok,ret=0;
-        long n;
-        int type=0,i,j;
-        X509 *peer;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_SR_CERT_VRFY_A,
-                SSL3_ST_SR_CERT_VRFY_B,
-                -1,
-                512, /* 512? */
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if (s->session->peer != NULL)
-                {
-                peer=s->session->peer;
-                pkey=X509_get_pubkey(peer);
-                type=X509_certificate_type(peer,pkey);
-                }
-        else
-                {
-                peer=NULL;
-                pkey=NULL;
-                }
-
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY)
-                {
-                s->s3->tmp.reuse_message=1;
-                if ((peer != NULL) && (type | EVP_PKT_SIGN))
-                        {
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE);
-                        goto f_err;
-                        }
-                ret=1;
-                goto end;
-                }
-
-        if (peer == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_NO_CLIENT_CERT_RECEIVED);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                goto f_err;
-                }
-
-        if (!(type & EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                goto f_err;
-                }
-
-        if (s->s3->change_cipher_spec)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                goto f_err;
-                }
-
-        /* we now have a signature that we need to verify */
-        p=(unsigned char *)s->init_buf->data;
-        n2s(p,i);
-        n-=2;
-        if (i > n)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_LENGTH_MISMATCH);
-                al=SSL_AD_DECODE_ERROR;
-                goto f_err;
-                }
-
-        j=EVP_PKEY_size(pkey);
-        if ((i > j) || (n > j) || (n <= 0))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_SIZE);
-                al=SSL_AD_DECODE_ERROR;
-                goto f_err;
-                }
-
-#ifndef NO_RSA 
-        if (pkey->type == EVP_PKEY_RSA)
-                {
-                i=RSA_public_decrypt(i,p,p,pkey->pkey.rsa,RSA_PKCS1_PADDING);
-                if (i < 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_DECRYPT);
-                        goto f_err;
-                        }
-                if ((i != (MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH)) ||
-                        memcmp(&(s->s3->tmp.finish_md[0]),p,
-                                MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH))
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_SIGNATURE);
-                        goto f_err;
-                        }
-                }
-        else
-#endif
-#ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                {
-                j=DSA_verify(pkey->save_type,
-                        &(s->s3->tmp.finish_md[MD5_DIGEST_LENGTH]),
-                        SHA_DIGEST_LENGTH,p,i,pkey->pkey.dsa);
-                if (j <= 0)
-                        {
-                        /* bad signature */
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_DSA_SIGNATURE);
-                        goto f_err;
-                        }
-                }
-        else
-#endif
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_INTERNAL_ERROR);
-                al=SSL_AD_UNSUPPORTED_CERTIFICATE;
-                goto f_err;
-                }
-
-
-        ret=1;
-        if (0)
-                {
-f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-end:
-        EVP_PKEY_free(pkey);
-        return(ret);
-        }
-
-static int ssl3_get_client_certificate(SSL *s)
-        {
-        int i,ok,al,ret= -1;
-        X509 *x=NULL;
-        unsigned long l,nc,llen,n;
-        unsigned char *p,*d,*q;
-        STACK_OF(X509) *sk=NULL;
-
-        n=ssl3_get_message(s,
-                SSL3_ST_SR_CERT_A,
-                SSL3_ST_SR_CERT_B,
-                -1,
-#if defined(MSDOS) && !defined(WIN32)
-                1024*30, /* 30k max cert list :-) */
-#else
-                1024*100, /* 100k max cert list :-) */
-#endif
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if      (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE)
-                {
-                if (    (s->verify_mode & SSL_VERIFY_PEER) &&
-                        (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        goto f_err;
-                        }
-                /* If tls asked for a client cert we must return a 0 list */
-                if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST);
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        goto f_err;
-                        }
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_WRONG_MESSAGE_TYPE);
-                goto f_err;
-                }
-        d=p=(unsigned char *)s->init_buf->data;
-
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
-                goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
-                        goto f_err;
-                        }
-
-                q=p;
-                x=d2i_X509(NULL,&p,l);
-                if (x == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_ASN1_LIB);
-                        goto err;
-                        }
-                if (p != (q+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
-                        goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
-                }
-
-        if (sk_X509_num(sk) <= 0)
-                {
-                /* TLS does not mind 0 certs returned */
-                if (s->version == SSL3_VERSION)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATES_RETURNED);
-                        goto f_err;
-                        }
-                /* Fail for TLS only if we required a certificate */
-                else if ((s->verify_mode & SSL_VERIFY_PEER) &&
-                         (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        goto f_err;
-                        }
-                }
-        else
-                {
-                i=ssl_verify_cert_chain(s,sk);
-                if (!i)
-                        {
-                        al=ssl_verify_alarm_type(s->verify_result);
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
-                        goto f_err;
-                        }
-                }
-
-        if (s->session->peer != NULL) /* This should not be needed */
-                X509_free(s->session->peer);
-        s->session->peer=sk_X509_shift(sk);
-
-        /* With the current implementation, sess_cert will always be NULL
-         * when we arrive here. */
-        if (s->session->sess_cert == NULL)
-                {
-                s->session->sess_cert = ssl_sess_cert_new();
-                if (s->session->sess_cert == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                }
-        if (s->session->sess_cert->cert_chain != NULL)
-                sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free);
-        s->session->sess_cert->cert_chain=sk;
-
-        sk=NULL;
-
-        ret=1;
-        if (0)
-                {
-f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (x != NULL) X509_free(x);
-        if (sk != NULL) sk_X509_pop_free(sk,X509_free);
-        return(ret);
-        }
-
-int ssl3_send_server_certificate(SSL *s)
-        {
-        unsigned long l;
-        X509 *x;
-
-        if (s->state == SSL3_ST_SW_CERT_A)
-                {
-                x=ssl_get_server_send_cert(s);
-                if (x == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,SSL_R_INTERNAL_ERROR);
-                        return(0);
-                        }
-
-                l=ssl3_output_cert_chain(s,x);
-                s->state=SSL3_ST_SW_CERT_B;
-                s->init_num=(int)l;
-                s->init_off=0;
-                }
-
-        /* SSL3_ST_SW_CERT_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version
deleted file mode 100644
index b52599a164..0000000000
--- a/src/lib/libssl/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=2
-minor=0
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
deleted file mode 100644
index fbe4f667fa..0000000000
--- a/src/lib/libssl/ssl.h
+++ /dev/null
@@ -1,1484 +0,0 @@
-/* ssl/ssl.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_SSL_H 
-#define HEADER_SSL_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <openssl/safestack.h>
-
-/* SSLeay version number for ASN.1 encoding of the session information */
-/* Version 0 - initial version
- * Version 1 - added the optional peer certificate
- */
-#define SSL_SESSION_ASN1_VERSION 0x0001
-
-/* text strings for the ciphers */
-#define SSL_TXT_NULL_WITH_MD5           SSL2_TXT_NULL_WITH_MD5                  
-#define SSL_TXT_RC4_128_WITH_MD5        SSL2_TXT_RC4_128_WITH_MD5               
-#define SSL_TXT_RC4_128_EXPORT40_WITH_MD5 SSL2_TXT_RC4_128_EXPORT40_WITH_MD5    
-#define SSL_TXT_RC2_128_CBC_WITH_MD5    SSL2_TXT_RC2_128_CBC_WITH_MD5           
-#define SSL_TXT_RC2_128_CBC_EXPORT40_WITH_MD5 SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5    
-#define SSL_TXT_IDEA_128_CBC_WITH_MD5   SSL2_TXT_IDEA_128_CBC_WITH_MD5          
-#define SSL_TXT_DES_64_CBC_WITH_MD5     SSL2_TXT_DES_64_CBC_WITH_MD5            
-#define SSL_TXT_DES_64_CBC_WITH_SHA     SSL2_TXT_DES_64_CBC_WITH_SHA            
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_MD5 SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5    
-#define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA    
-
-#define SSL_MAX_SSL_SESSION_ID_LENGTH           32
-#define SSL_MAX_SID_CTX_LENGTH                  32
-
-#define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
-#define SSL_MAX_KEY_ARG_LENGTH                  8
-#define SSL_MAX_MASTER_KEY_LENGTH               48
-
-/* These are used to specify which ciphers to use and not to use */
-#define SSL_TXT_LOW             "LOW"
-#define SSL_TXT_MEDIUM          "MEDIUM"
-#define SSL_TXT_HIGH            "HIGH"
-#define SSL_TXT_kFZA            "kFZA"
-#define SSL_TXT_aFZA            "aFZA"
-#define SSL_TXT_eFZA            "eFZA"
-#define SSL_TXT_FZA             "FZA"
-
-#define SSL_TXT_aNULL           "aNULL"
-#define SSL_TXT_eNULL           "eNULL"
-#define SSL_TXT_NULL            "NULL"
-
-#define SSL_TXT_kRSA            "kRSA"
-#define SSL_TXT_kDHr            "kDHr"
-#define SSL_TXT_kDHd            "kDHd"
-#define SSL_TXT_kEDH            "kEDH"
-#define SSL_TXT_aRSA            "aRSA"
-#define SSL_TXT_aDSS            "aDSS"
-#define SSL_TXT_aDH             "aDH"
-#define SSL_TXT_DSS             "DSS"
-#define SSL_TXT_DH              "DH"
-#define SSL_TXT_EDH             "EDH"
-#define SSL_TXT_ADH             "ADH"
-#define SSL_TXT_RSA             "RSA"
-#define SSL_TXT_DES             "DES"
-#define SSL_TXT_3DES            "3DES"
-#define SSL_TXT_RC4             "RC4"
-#define SSL_TXT_RC2             "RC2"
-#define SSL_TXT_IDEA            "IDEA"
-#define SSL_TXT_MD5             "MD5"
-#define SSL_TXT_SHA1            "SHA1"
-#define SSL_TXT_SHA             "SHA"
-#define SSL_TXT_EXP40           "EXP"
-#define SSL_TXT_EXPORT          "EXPORT"
-#define SSL_TXT_EXP56           "EXPORT56"
-#define SSL_TXT_SSLV2           "SSLv2"
-#define SSL_TXT_SSLV3           "SSLv3"
-#define SSL_TXT_TLSV1           "TLSv1"
-#define SSL_TXT_ALL             "ALL"
-
-/* 'DEFAULT' at the start of the cipher list insert the following string
- * in addition to this being the default cipher string */
-#ifndef NO_RSA
-#define SSL_DEFAULT_CIPHER_LIST "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
-#else
-#define SSL_ALLOW_ADH
-#define SSL_DEFAULT_CIPHER_LIST "HIGH:MEDIUM:LOW:ADH+3DES:ADH+RC4:ADH+DES:+EXP"
-#endif
-
-/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-#define SSL_SENT_SHUTDOWN       1
-#define SSL_RECEIVED_SHUTDOWN   2
-
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/bio.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-
-#define SSL_FILETYPE_ASN1       X509_FILETYPE_ASN1
-#define SSL_FILETYPE_PEM        X509_FILETYPE_PEM
-
-/* This is needed to stop compilers complaining about the
- * 'struct ssl_st *' function parameters used to prototype callbacks
- * in SSL_CTX. */
-typedef struct ssl_st *ssl_crock_st;
-
-/* used to hold info on the particular ciphers used */
-typedef struct ssl_cipher_st
-        {
-        int valid;
-        const char *name;               /* text name */
-        unsigned long id;               /* id, 4 bytes, first is version */
-        unsigned long algorithms;       /* what ciphers are used */
-        unsigned long algorithm2;       /* Extra flags */
-        unsigned long mask;             /* used for matching */
-        } SSL_CIPHER;
-
-DECLARE_STACK_OF(SSL_CIPHER)
-
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-typedef struct ssl_method_st
-        {
-        int version;
-        int (*ssl_new)(SSL *s);
-        void (*ssl_clear)(SSL *s);
-        void (*ssl_free)(SSL *s);
-        int (*ssl_accept)(SSL *s);
-        int (*ssl_connect)(SSL *s);
-        int (*ssl_read)(SSL *s,void *buf,int len);
-        int (*ssl_peek)(SSL *s,char *buf,int len);
-        int (*ssl_write)(SSL *s,const void *buf,int len);
-        int (*ssl_shutdown)(SSL *s);
-        int (*ssl_renegotiate)(SSL *s);
-        int (*ssl_renegotiate_check)(SSL *s);
-        long (*ssl_ctrl)(SSL *s,int cmd,long larg,char *parg);
-        long (*ssl_ctx_ctrl)(SSL_CTX *ctx,int cmd,long larg,char *parg);
-        SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr);
-        int (*put_cipher_by_char)(const SSL_CIPHER *cipher,unsigned char *ptr);
-        int (*ssl_pending)(SSL *s);
-        int (*num_ciphers)(void);
-        SSL_CIPHER *(*get_cipher)(unsigned ncipher);
-        struct ssl_method_st *(*get_ssl_method)(int version);
-        long (*get_timeout)(void);
-        struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-        int (*ssl_version)();
-        } SSL_METHOD;
-
-/* Lets make this into an ASN.1 type structure as follows
- * SSL_SESSION_ID ::= SEQUENCE {
- *      version                 INTEGER,        -- structure version number
- *      SSLversion              INTEGER,        -- SSL version number
- *      Cipher                  OCTET_STRING,   -- the 3 byte cipher ID
- *      Session_ID              OCTET_STRING,   -- the Session ID
- *      Master_key              OCTET_STRING,   -- the master key
- *      Key_Arg [ 0 ] IMPLICIT  OCTET_STRING,   -- the optional Key argument
- *      Time [ 1 ] EXPLICIT     INTEGER,        -- optional Start Time
- *      Timeout [ 2 ] EXPLICIT  INTEGER,        -- optional Timeout ins seconds
- *      Peer [ 3 ] EXPLICIT     X509,           -- optional Peer Certificate
- *      Session_ID_context [ 4 ] EXPLICIT OCTET_STRING,   -- the Session ID context
- *      Compression [5] IMPLICIT ASN1_OBJECT    -- compression OID XXXXX
- *      }
- * Look in ssl/ssl_asn1.c for more details
- * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
- */
-typedef struct ssl_session_st
-        {
-        int ssl_version;        /* what ssl version session info is
-                                 * being kept in here? */
-
-        /* only really used in SSLv2 */
-        unsigned int key_arg_length;
-        unsigned char key_arg[SSL_MAX_KEY_ARG_LENGTH];
-        int master_key_length;
-        unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH];
-        /* session_id - valid? */
-        unsigned int session_id_length;
-        unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
-        /* this is used to determine whether the session is being reused in
-         * the appropriate context. It is up to the application to set this,
-         * via SSL_new */
-        unsigned int sid_ctx_length;
-        unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-        int not_resumable;
-
-        /* The cert is the certificate used to establish this connection */
-        struct sess_cert_st /* SESS_CERT */ *sess_cert;
-
-        /* This is the cert for the other end.
-         * On clients, it will be the same as sess_cert->peer_key->x509
-         * (the latter is not enough as sess_cert is not retained
-         * in the external representation of sessions, see ssl_asn1.c). */
-        X509 *peer;
-
-        int references;
-        long timeout;
-        long time;
-
-        int compress_meth;              /* Need to lookup the method */
-
-        SSL_CIPHER *cipher;
-        unsigned long cipher_id;        /* when ASN.1 loaded, this
-                                         * needs to be used to load
-                                         * the 'cipher' structure */
-
-        STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */
-
-        CRYPTO_EX_DATA ex_data; /* application specific data */
-
-        /* These are used to make removal of session-ids more
-         * efficient and to implement a maximum cache size. */
-        struct ssl_session_st *prev,*next;
-        } SSL_SESSION;
-
-#define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x00000001L
-#define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x00000002L
-#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x00000008L
-#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG              0x00000010L
-#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x00000020L
-#define SSL_OP_MSIE_SSLV2_RSA_PADDING                   0x00000040L
-#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG                 0x00000080L
-#define SSL_OP_TLS_D5_BUG                               0x00000100L
-#define SSL_OP_TLS_BLOCK_PADDING_BUG                    0x00000200L
-#define SSL_OP_TLS_ROLLBACK_BUG                         0x00000400L
-
-/* If set, always create a new key when using tmp_dh parameters */
-#define SSL_OP_SINGLE_DH_USE                            0x00100000L
-/* Set to also use the tmp_rsa key when doing RSA operations. */
-#define SSL_OP_EPHEMERAL_RSA                            0x00200000L
-
-/* The next flag deliberately changes the ciphertest, this is a check
- * for the PKCS#1 attack */
-#define SSL_OP_PKCS1_CHECK_1                            0x08000000L
-#define SSL_OP_PKCS1_CHECK_2                            0x10000000L
-#define SSL_OP_NETSCAPE_CA_DN_BUG                       0x20000000L
-#define SSL_OP_NON_EXPORT_FIRST                         0x40000000L
-#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x80000000L
-#define SSL_OP_ALL                                      0x000FFFFFL
-
-#define SSL_OP_NO_SSLv2                                 0x01000000L
-#define SSL_OP_NO_SSLv3                                 0x02000000L
-#define SSL_OP_NO_TLSv1                                 0x04000000L
-
-/* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
- * when just a single record has been written): */
-#define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001L
-/* Make it possible to retry SSL_write() with changed buffer location
- * (buffer contents must stay the same!); this is not the default to avoid
- * the misconception that non-blocking SSL_write() behaves like
- * non-blocking write(): */
-#define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002L
-
-/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
- * they cannot be used to clear bits. */
-
-#define SSL_CTX_set_options(ctx,op) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_OPTIONS,op,NULL)
-#define SSL_CTX_get_options(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_OPTIONS,0,NULL)
-#define SSL_set_options(ssl,op) \
-        SSL_ctrl(ssl,SSL_CTRL_OPTIONS,op,NULL)
-#define SSL_get_options(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_OPTIONS,0,NULL)
-
-#define SSL_CTX_set_mode(ctx,op) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_MODE,op,NULL)
-#define SSL_CTX_get_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_MODE,0,NULL)
-#define SSL_set_mode(ssl,op) \
-        SSL_ctrl(ssl,SSL_CTRL_MODE,op,NULL)
-#define SSL_get_mode(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_MODE,0,NULL)
-
-#define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
-
-typedef struct ssl_comp_st
-{
-    int id;
-    char *name;
-#ifdef HEADER_COMP_H
-    COMP_METHOD *method;
-#else
-    char *method;
-#endif
-} SSL_COMP;
-
-DECLARE_STACK_OF(SSL_COMP)
-
-struct ssl_ctx_st
-        {
-        SSL_METHOD *method;
-        unsigned long options;
-        unsigned long mode;
-
-        STACK_OF(SSL_CIPHER) *cipher_list;
-        /* same as above but sorted for lookup */
-        STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-        struct x509_store_st /* X509_STORE */ *cert_store;
-        struct lhash_st /* LHASH */ *sessions;  /* a set of SSL_SESSION's */
-        /* Most session-ids that will be cached, default is
-         * SSL_SESSION_CACHE_SIZE_DEFAULT. 0 is unlimited. */
-        unsigned long session_cache_size;
-        struct ssl_session_st *session_cache_head;
-        struct ssl_session_st *session_cache_tail;
-
-        /* This can have one of 2 values, ored together,
-         * SSL_SESS_CACHE_CLIENT,
-         * SSL_SESS_CACHE_SERVER,
-         * Default is SSL_SESSION_CACHE_SERVER, which means only
-         * SSL_accept which cache SSL_SESSIONS. */
-        int session_cache_mode;
-
-        /* If timeout is not 0, it is the default timeout value set
-         * when SSL_new() is called.  This has been put in to make
-         * life easier to set things up */
-        long session_timeout;
-
-        /* If this callback is not null, it will be called each
-         * time a session id is added to the cache.  If this function
-         * returns 1, it means that the callback will do a
-         * SSL_SESSION_free() when it has finished using it.  Otherwise,
-         * on 0, it means the callback has finished with it.
-         * If remove_session_cb is not null, it will be called when
-         * a session-id is removed from the cache.  Again, a return
-         * of 0 mens that SSLeay should not SSL_SESSION_free() since
-         * the application is doing something with it. */
-        int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess);
-        void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess);
-        SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl,
-                unsigned char *data,int len,int *copy);
-        struct
-                {
-                int sess_connect;       /* SSL new conn - started */
-                int sess_connect_renegotiate;/* SSL reneg - requested */
-                int sess_connect_good;  /* SSL new conne/reneg - finished */
-                int sess_accept;        /* SSL new accept - started */
-                int sess_accept_renegotiate;/* SSL reneg - requested */
-                int sess_accept_good;   /* SSL accept/reneg - finished */
-                int sess_miss;          /* session lookup misses  */
-                int sess_timeout;       /* reuse attempt on timeouted session */
-                int sess_cache_full;    /* session removed due to full cache */
-                int sess_hit;           /* session reuse actually done */
-                int sess_cb_hit;        /* session-id that was not
-                                         * in the cache was
-                                         * passed back via the callback.  This
-                                         * indicates that the application is
-                                         * supplying session-id's from other
-                                         * processes - spooky :-) */
-                } stats;
-
-        int references;
-
-/**/    void (*info_callback)();
-
-        /* if defined, these override the X509_verify_cert() calls */
-/**/    int (*app_verify_callback)();
-/**/    char *app_verify_arg; /* never used; should be void * */
-
-        /* default values to use in SSL structures */
-/**/    struct cert_st /* CERT */ *cert;
-/**/    int read_ahead;
-/**/    int verify_mode;
-/**/    int verify_depth;
-/**/    unsigned int sid_ctx_length;
-/**/    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-/**/    int (*default_verify_callback)(int ok,X509_STORE_CTX *ctx);
-
-        /* Default password callback. */
-/**/    pem_password_cb *default_passwd_callback;
-
-        /* Default password callback user data. */
-/**/    void *default_passwd_callback_userdata;
-
-        /* get client cert callback */
-/**/    int (*client_cert_cb)(/* SSL *ssl, X509 **x509, EVP_PKEY **pkey */);
-
-        /* what we put in client requests */
-        STACK_OF(X509_NAME) *client_CA;
-
-/**/    int quiet_shutdown;
-
-        CRYPTO_EX_DATA ex_data;
-
-        const EVP_MD *rsa_md5;/* For SSLv2 - name is 'ssl2-md5' */
-        const EVP_MD *md5;      /* For SSLv3/TLSv1 'ssl3-md5' */
-        const EVP_MD *sha1;   /* For SSLv3/TLSv1 'ssl3->sha1' */
-
-        STACK_OF(X509) *extra_certs;
-        STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
-        };
-
-#define SSL_SESS_CACHE_OFF                      0x0000
-#define SSL_SESS_CACHE_CLIENT                   0x0001
-#define SSL_SESS_CACHE_SERVER                   0x0002
-#define SSL_SESS_CACHE_BOTH     (SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-#define SSL_SESS_CACHE_NO_AUTO_CLEAR            0x0080
-/* This one, when set, makes the server session-id lookup not look
- * in the cache.  If there is an application get_session callback
- * defined, this will still get called. */
-#define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP       0x0100
-
-#define SSL_CTX_sess_number(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-#define SSL_CTX_sess_connect(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-#define SSL_CTX_sess_connect_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-#define SSL_CTX_sess_connect_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-#define SSL_CTX_sess_accept(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-#define SSL_CTX_sess_accept_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-#define SSL_CTX_sess_accept_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-#define SSL_CTX_sess_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-#define SSL_CTX_sess_cb_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-#define SSL_CTX_sess_misses(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-#define SSL_CTX_sess_timeouts(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-#define SSL_CTX_sess_cache_full(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
-#define SSL_CTX_sess_set_new_cb(ctx,cb) ((ctx)->new_session_cb=(cb))
-#define SSL_CTX_sess_get_new_cb(ctx)    ((ctx)->new_session_cb)
-#define SSL_CTX_sess_set_remove_cb(ctx,cb)      ((ctx)->remove_session_cb=(cb))
-#define SSL_CTX_sess_get_remove_cb(ctx) ((ctx)->remove_session_cb)
-#define SSL_CTX_sess_set_get_cb(ctx,cb) ((ctx)->get_session_cb=(cb))
-#define SSL_CTX_sess_get_get_cb(ctx)    ((ctx)->get_session_cb)
-#define SSL_CTX_set_info_callback(ctx,cb)       ((ctx)->info_callback=(cb))
-#define SSL_CTX_get_info_callback(ctx)          ((ctx)->info_callback)
-#define SSL_CTX_set_client_cert_cb(ctx,cb)      ((ctx)->client_cert_cb=(cb))
-#define SSL_CTX_get_client_cert_cb(ctx)         ((ctx)->client_cert_cb)
-
-#define SSL_NOTHING     1
-#define SSL_WRITING     2
-#define SSL_READING     3
-#define SSL_X509_LOOKUP 4
-
-/* These will only be used when doing non-blocking IO */
-#define SSL_want_nothing(s)     (SSL_want(s) == SSL_NOTHING)
-#define SSL_want_read(s)        (SSL_want(s) == SSL_READING)
-#define SSL_want_write(s)       (SSL_want(s) == SSL_WRITING)
-#define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP)
-
-struct ssl_st
-        {
-        /* protocol version
-         * (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION)
-         */
-        int version;
-        int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
-
-        SSL_METHOD *method; /* SSLv3 */
-
-        /* There are 2 BIO's even though they are normally both the
-         * same.  This is so data can be read and written to different
-         * handlers */
-
-#ifdef HEADER_BIO_H
-        BIO *rbio; /* used by SSL_read */
-        BIO *wbio; /* used by SSL_write */
-        BIO *bbio; /* used during session-id reuse to concatinate
-                    * messages */
-#else
-        char *rbio; /* used by SSL_read */
-        char *wbio; /* used by SSL_write */
-        char *bbio;
-#endif
-        /* This holds a variable that indicates what we were doing
-         * when a 0 or -1 is returned.  This is needed for
-         * non-blocking IO so we know what request needs re-doing when
-         * in SSL_accept or SSL_connect */
-        int rwstate;
-
-        /* true when we are actually in SSL_accept() or SSL_connect() */
-        int in_handshake;
-        int (*handshake_func)();
-
-        /* Imagine that here's a boolean member "init" that is
-         * switched as soon as SSL_set_{accept/connect}_state
-         * is called for the first time, so that "state" and
-         * "handshake_func" are properly initialized.  But as
-         * handshake_func is == 0 until then, we use this
-         * test instead of an "init" member.
-         */
-
-        int server;     /* are we the server side? - mostly used by SSL_clear*/
-
-        int new_session;/* 1 if we are to use a new session */
-        int quiet_shutdown;/* don't send shutdown packets */
-        int shutdown;   /* we have shut things down, 0x01 sent, 0x02
-                         * for received */
-        int state;      /* where we are */
-        int rstate;     /* where we are when reading */
-
-        BUF_MEM *init_buf;      /* buffer used during init */
-        int init_num;           /* amount read/written */
-        int init_off;           /* amount read/written */
-
-        /* used internally to point at a raw packet */
-        unsigned char *packet;
-        unsigned int packet_length;
-
-        struct ssl2_ctx_st *s2; /* SSLv2 variables */
-        struct ssl3_ctx_st *s3; /* SSLv3 variables */
-
-        int read_ahead;         /* Read as many input bytes as possible */
-        int hit;                /* reusing a previous session */
-
-        /* crypto */
-        STACK_OF(SSL_CIPHER) *cipher_list;
-        STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-
-        /* These are the ones being used, the ones is SSL_SESSION are
-         * the ones to be 'copied' into these ones */
-
-        EVP_CIPHER_CTX *enc_read_ctx;           /* cryptographic state */
-        const EVP_MD *read_hash;                /* used for mac generation */
-#ifdef HEADER_COMP_H
-        COMP_CTX *expand;                       /* uncompress */
-#else
-        char *expand;
-#endif
-
-        EVP_CIPHER_CTX *enc_write_ctx;          /* cryptographic state */
-        const EVP_MD *write_hash;               /* used for mac generation */
-#ifdef HEADER_COMP_H
-        COMP_CTX *compress;                     /* compression */
-#else
-        char *compress; 
-#endif
-
-        /* session info */
-
-        /* client cert? */
-        /* This is used to hold the server certificate used */
-        struct cert_st /* CERT */ *cert;
-
-        /* the session_id_context is used to ensure sessions are only reused
-         * in the appropriate context */
-        unsigned int sid_ctx_length;
-        unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-
-        /* This can also be in the session once a session is established */
-        SSL_SESSION *session;
-
-        /* Used in SSL2 and SSL3 */
-        int verify_mode;        /* 0 don't care about verify failure.
-                                 * 1 fail if verify fails */
-        int verify_depth;
-        int (*verify_callback)(int ok,X509_STORE_CTX *ctx); /* fail if callback returns 0 */
-        void (*info_callback)(); /* optional informational callback */
-
-        int error;              /* error bytes to be written */
-        int error_code;         /* actual code */
-
-        SSL_CTX *ctx;
-        /* set this flag to 1 and a sleep(1) is put into all SSL_read()
-         * and SSL_write() calls, good for nbio debuging :-) */
-        int debug;      
-
-        /* extra application data */
-        long verify_result;
-        CRYPTO_EX_DATA ex_data;
-
-        /* for server side, keep the list of CA_dn we can use */
-        STACK_OF(X509_NAME) *client_CA;
-
-        int references;
-        unsigned long options; /* protocol behaviour */
-        unsigned long mode; /* API behaviour */
-        int first_packet;
-        int client_version;     /* what was passed, used for
-                                 * SSLv3/TLS rolback check */
-        };
-
-#include <openssl/ssl2.h>
-#include <openssl/ssl3.h>
-#include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */
-#include <openssl/ssl23.h>
-
-/* compatablity */
-#define SSL_set_app_data(s,arg)         (SSL_set_ex_data(s,0,(char *)arg))
-#define SSL_get_app_data(s)             (SSL_get_ex_data(s,0))
-#define SSL_SESSION_set_app_data(s,a)   (SSL_SESSION_set_ex_data(s,0,(char *)a))
-#define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
-#define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
-#define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0,(char *)arg))
-
-/* The following are the possible values for ssl->state are are
- * used to indicate where we are upto in the SSL connection establishment.
- * The macros that follow are about the only things you should need to use
- * and even then, only when using non-blocking IO.
- * It can also be useful to work out where you were when the connection
- * failed */
-
-#define SSL_ST_CONNECT                  0x1000
-#define SSL_ST_ACCEPT                   0x2000
-#define SSL_ST_MASK                     0x0FFF
-#define SSL_ST_INIT                     (SSL_ST_CONNECT|SSL_ST_ACCEPT)
-#define SSL_ST_BEFORE                   0x4000
-#define SSL_ST_OK                       0x03
-#define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-
-#define SSL_CB_LOOP                     0x01
-#define SSL_CB_EXIT                     0x02
-#define SSL_CB_READ                     0x04
-#define SSL_CB_WRITE                    0x08
-#define SSL_CB_ALERT                    0x4000 /* used in callback */
-#define SSL_CB_READ_ALERT               (SSL_CB_ALERT|SSL_CB_READ)
-#define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT|SSL_CB_WRITE)
-#define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT|SSL_CB_LOOP)
-#define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT|SSL_CB_EXIT)
-#define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT|SSL_CB_LOOP)
-#define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT|SSL_CB_EXIT)
-#define SSL_CB_HANDSHAKE_START          0x10
-#define SSL_CB_HANDSHAKE_DONE           0x20
-
-/* Is the SSL_connection established? */
-#define SSL_get_state(a)                SSL_state(a)
-#define SSL_is_init_finished(a)         (SSL_state(a) == SSL_ST_OK)
-#define SSL_in_init(a)                  (SSL_state(a)&SSL_ST_INIT)
-#define SSL_in_before(a)                (SSL_state(a)&SSL_ST_BEFORE)
-#define SSL_in_connect_init(a)          (SSL_state(a)&SSL_ST_CONNECT)
-#define SSL_in_accept_init(a)           (SSL_state(a)&SSL_ST_ACCEPT)
-
-/* The following 2 states are kept in ssl->rstate when reads fail,
- * you should not need these */
-#define SSL_ST_READ_HEADER                      0xF0
-#define SSL_ST_READ_BODY                        0xF1
-#define SSL_ST_READ_DONE                        0xF2
-
-/* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
- * are 'ored' with SSL_VERIFY_PEER if they are desired */
-#define SSL_VERIFY_NONE                 0x00
-#define SSL_VERIFY_PEER                 0x01
-#define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
-#define SSL_VERIFY_CLIENT_ONCE          0x04
-
-#define SSLeay_add_ssl_algorithms()     SSL_library_init()
-
-/* this is for backward compatablility */
-#if 0 /* NEW_SSLEAY */
-#define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-#define SSL_set_pref_cipher(c,n)        SSL_set_cipher_list(c,n)
-#define SSL_add_session(a,b)            SSL_CTX_add_session((a),(b))
-#define SSL_remove_session(a,b)         SSL_CTX_remove_session((a),(b))
-#define SSL_flush_sessions(a,b)         SSL_CTX_flush_sessions((a),(b))
-#endif
-/* More backward compatablity */
-#define SSL_get_cipher(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-#define SSL_get_cipher_bits(s,np) \
-                SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-#define SSL_get_cipher_version(s) \
-                SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-#define SSL_get_cipher_name(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-#define SSL_get_time(a)         SSL_SESSION_get_time(a)
-#define SSL_set_time(a,b)       SSL_SESSION_set_time((a),(b))
-#define SSL_get_timeout(a)      SSL_SESSION_get_timeout(a)
-#define SSL_set_timeout(a,b)    SSL_SESSION_set_timeout((a),(b))
-
-#if 1 /*SSLEAY_MACROS*/
-#define d2i_SSL_SESSION_bio(bp,s_id) (SSL_SESSION *)ASN1_d2i_bio( \
-        (char *(*)())SSL_SESSION_new,(char *(*)())d2i_SSL_SESSION, \
-        (bp),(unsigned char **)(s_id))
-#define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio(i2d_SSL_SESSION, \
-        bp,(unsigned char *)s_id)
-#define PEM_read_SSL_SESSION(fp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read( \
-        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,fp,(char **)x,cb,u)
-#define PEM_read_bio_SSL_SESSION(bp,x,cb,u) (SSL_SESSION *)PEM_ASN1_read_bio( \
-        (char *(*)())d2i_SSL_SESSION,PEM_STRING_SSL_SESSION,bp,(char **)x,cb,u)
-#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,NULL)
-#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,NULL)
-#endif
-
-#define SSL_AD_REASON_OFFSET            1000
-/* These alert types are for SSLv3 and TLSv1 */
-#define SSL_AD_CLOSE_NOTIFY             SSL3_AD_CLOSE_NOTIFY
-#define SSL_AD_UNEXPECTED_MESSAGE       SSL3_AD_UNEXPECTED_MESSAGE /* fatal */
-#define SSL_AD_BAD_RECORD_MAC           SSL3_AD_BAD_RECORD_MAC     /* fatal */
-#define SSL_AD_DECRYPTION_FAILED        TLS1_AD_DECRYPTION_FAILED
-#define SSL_AD_RECORD_OVERFLOW          TLS1_AD_RECORD_OVERFLOW
-#define SSL_AD_DECOMPRESSION_FAILURE    SSL3_AD_DECOMPRESSION_FAILURE/* fatal */
-#define SSL_AD_HANDSHAKE_FAILURE        SSL3_AD_HANDSHAKE_FAILURE/* fatal */
-#define SSL_AD_NO_CERTIFICATE           SSL3_AD_NO_CERTIFICATE /* Not for TLS */
-#define SSL_AD_BAD_CERTIFICATE          SSL3_AD_BAD_CERTIFICATE
-#define SSL_AD_UNSUPPORTED_CERTIFICATE  SSL3_AD_UNSUPPORTED_CERTIFICATE
-#define SSL_AD_CERTIFICATE_REVOKED      SSL3_AD_CERTIFICATE_REVOKED
-#define SSL_AD_CERTIFICATE_EXPIRED      SSL3_AD_CERTIFICATE_EXPIRED
-#define SSL_AD_CERTIFICATE_UNKNOWN      SSL3_AD_CERTIFICATE_UNKNOWN
-#define SSL_AD_ILLEGAL_PARAMETER        SSL3_AD_ILLEGAL_PARAMETER   /* fatal */
-#define SSL_AD_UNKNOWN_CA               TLS1_AD_UNKNOWN_CA      /* fatal */
-#define SSL_AD_ACCESS_DENIED            TLS1_AD_ACCESS_DENIED   /* fatal */
-#define SSL_AD_DECODE_ERROR             TLS1_AD_DECODE_ERROR    /* fatal */
-#define SSL_AD_DECRYPT_ERROR            TLS1_AD_DECRYPT_ERROR
-#define SSL_AD_EXPORT_RESTRICION        TLS1_AD_EXPORT_RESTRICION/* fatal */
-#define SSL_AD_PROTOCOL_VERSION         TLS1_AD_PROTOCOL_VERSION /* fatal */
-#define SSL_AD_INSUFFICIENT_SECURITY    TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
-#define SSL_AD_INTERNAL_ERROR           TLS1_AD_INTERNAL_ERROR  /* fatal */
-#define SSL_AD_USER_CANCLED             TLS1_AD_USER_CANCLED
-#define SSL_AD_NO_RENEGOTIATION         TLS1_AD_NO_RENEGOTIATION
-
-#define SSL_ERROR_NONE                  0
-#define SSL_ERROR_SSL                   1
-#define SSL_ERROR_WANT_READ             2
-#define SSL_ERROR_WANT_WRITE            3
-#define SSL_ERROR_WANT_X509_LOOKUP      4
-#define SSL_ERROR_SYSCALL               5 /* look at error stack/return value/errno */
-#define SSL_ERROR_ZERO_RETURN           6
-#define SSL_ERROR_WANT_CONNECT          7
-
-#define SSL_CTRL_NEED_TMP_RSA                   1
-#define SSL_CTRL_SET_TMP_RSA                    2
-#define SSL_CTRL_SET_TMP_DH                     3
-#define SSL_CTRL_SET_TMP_RSA_CB                 4
-#define SSL_CTRL_SET_TMP_DH_CB                  5
-/* Add these ones */
-#define SSL_CTRL_GET_SESSION_REUSED             6
-#define SSL_CTRL_GET_CLIENT_CERT_REQUEST        7
-#define SSL_CTRL_GET_NUM_RENEGOTIATIONS         8
-#define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS       9
-#define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS       10
-#define SSL_CTRL_GET_FLAGS                      11
-#define SSL_CTRL_EXTRA_CHAIN_CERT               12
-
-/* Stats */
-#define SSL_CTRL_SESS_NUMBER                    20
-#define SSL_CTRL_SESS_CONNECT                   21
-#define SSL_CTRL_SESS_CONNECT_GOOD              22
-#define SSL_CTRL_SESS_CONNECT_RENEGOTIATE       23
-#define SSL_CTRL_SESS_ACCEPT                    24
-#define SSL_CTRL_SESS_ACCEPT_GOOD               25
-#define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE        26
-#define SSL_CTRL_SESS_HIT                       27
-#define SSL_CTRL_SESS_CB_HIT                    28
-#define SSL_CTRL_SESS_MISSES                    29
-#define SSL_CTRL_SESS_TIMEOUTS                  30
-#define SSL_CTRL_SESS_CACHE_FULL                31
-#define SSL_CTRL_OPTIONS                        32
-#define SSL_CTRL_MODE                   33
-
-#define SSL_CTRL_GET_READ_AHEAD                 40
-#define SSL_CTRL_SET_READ_AHEAD                 41
-#define SSL_CTRL_SET_SESS_CACHE_SIZE            42
-#define SSL_CTRL_GET_SESS_CACHE_SIZE            43
-#define SSL_CTRL_SET_SESS_CACHE_MODE            44
-#define SSL_CTRL_GET_SESS_CACHE_MODE            45
-
-#define SSL_session_reused(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
-#define SSL_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-#define SSL_clear_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-#define SSL_total_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-
-#define SSL_CTX_need_tmp_RSA(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_CTX_set_tmp_rsa(ctx,rsa) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#define SSL_CTX_set_tmp_dh(ctx,dh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-
-#define SSL_need_tmp_RSA(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-#define SSL_set_tmp_rsa(ssl,rsa) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-#define SSL_set_tmp_dh(ssl,dh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-
-#define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-
-/* VMS uses only 31 characters for symbols. */
-#ifdef VMS
-#undef SSL_CTX_set_cert_verify_callback
-#define SSL_CTX_set_cert_verify_callback SSL_CTX_set_cert_verify_cb
-#undef SSL_CTX_use_certificate_chain_file
-#define SSL_CTX_use_certificate_chain_file SSL_CTX_use_cert_chain_file
-#undef SSL_CTX_set_default_verify_paths
-#define SSL_CTX_set_default_verify_paths SSL_CTX_set_def_verify_paths
-#undef SSL_get_ex_data_X509_STORE_CTX_idx
-#define SSL_get_ex_data_X509_STORE_CTX_idx SSL_get_ex_data_X509_STOR_CTX_i
-#undef SSL_add_file_cert_subjects_to_stack
-#define SSL_add_file_cert_subjects_to_stack SSL_add_file_cert_sub_to_stack
-#undef SSL_add_dir_cert_subjects_to_stack
-#define SSL_add_dir_cert_subjects_to_stack SSL_add_dir_cert_sub_to_stack
-#endif
-
-#ifdef HEADER_BIO_H
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx,int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to,BIO *from);
-void BIO_ssl_shutdown(BIO *ssl_bio);
-
-#endif
-
-int     SSL_CTX_set_cipher_list(SSL_CTX *,char *str);
-SSL_CTX *SSL_CTX_new(SSL_METHOD *meth);
-void    SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx,long t);
-long SSL_CTX_get_timeout(SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *,X509_STORE *);
-int SSL_want(SSL *s);
-int     SSL_clear(SSL *s);
-
-void    SSL_CTX_flush_sessions(SSL_CTX *ctx,long tm);
-
-SSL_CIPHER *SSL_get_current_cipher(SSL *s);
-int     SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
-char *  SSL_CIPHER_get_version(SSL_CIPHER *c);
-const char *    SSL_CIPHER_get_name(SSL_CIPHER *c);
-
-int     SSL_get_fd(SSL *s);
-const char  * SSL_get_cipher_list(SSL *s,int n);
-char *  SSL_get_shared_ciphers(SSL *s, char *buf, int len);
-int     SSL_get_read_ahead(SSL * s);
-int     SSL_pending(SSL *s);
-#ifndef NO_SOCK
-int     SSL_set_fd(SSL *s, int fd);
-int     SSL_set_rfd(SSL *s, int fd);
-int     SSL_set_wfd(SSL *s, int fd);
-#endif
-#ifdef HEADER_BIO_H
-void    SSL_set_bio(SSL *s, BIO *rbio,BIO *wbio);
-BIO *   SSL_get_rbio(SSL *s);
-BIO *   SSL_get_wbio(SSL *s);
-#endif
-int     SSL_set_cipher_list(SSL *s, char *str);
-void    SSL_set_read_ahead(SSL *s, int yes);
-int     SSL_get_verify_mode(SSL *s);
-int     SSL_get_verify_depth(SSL *s);
-int     (*SSL_get_verify_callback(SSL *s))(int,X509_STORE_CTX *);
-void    SSL_set_verify(SSL *s, int mode,
-                       int (*callback)(int ok,X509_STORE_CTX *ctx));
-void    SSL_set_verify_depth(SSL *s, int depth);
-#ifndef NO_RSA
-int     SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-#endif
-int     SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
-int     SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int     SSL_use_PrivateKey_ASN1(int pk,SSL *ssl, unsigned char *d, long len);
-int     SSL_use_certificate(SSL *ssl, X509 *x);
-int     SSL_use_certificate_ASN1(SSL *ssl, unsigned char *d, int len);
-
-#ifndef NO_STDIO
-int     SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int     SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int     SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int     SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int     SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int     SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-int     SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int     SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                            const char *file);
-int     SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                           const char *dir);
-#endif
-
-void    ERR_load_SSL_strings(void );
-void    SSL_load_error_strings(void );
-char *  SSL_state_string(SSL *s);
-char *  SSL_rstate_string(SSL *s);
-char *  SSL_state_string_long(SSL *s);
-char *  SSL_rstate_string_long(SSL *s);
-long    SSL_SESSION_get_time(SSL_SESSION *s);
-long    SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long    SSL_SESSION_get_timeout(SSL_SESSION *s);
-long    SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-void    SSL_copy_session_id(SSL *to,SSL *from);
-
-SSL_SESSION *SSL_SESSION_new(void);
-unsigned long SSL_SESSION_hash(SSL_SESSION *a);
-int     SSL_SESSION_cmp(SSL_SESSION *a,SSL_SESSION *b);
-#ifndef NO_FP_API
-int     SSL_SESSION_print_fp(FILE *fp,SSL_SESSION *ses);
-#endif
-#ifdef HEADER_BIO_H
-int     SSL_SESSION_print(BIO *fp,SSL_SESSION *ses);
-#endif
-void    SSL_SESSION_free(SSL_SESSION *ses);
-int     i2d_SSL_SESSION(SSL_SESSION *in,unsigned char **pp);
-int     SSL_set_session(SSL *to, SSL_SESSION *session);
-int     SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int     SSL_CTX_remove_session(SSL_CTX *,SSL_SESSION *c);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a,unsigned char **pp,long length);
-
-#ifdef HEADER_X509_H
-X509 *  SSL_get_peer_certificate(SSL *s);
-#endif
-
-STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s);
-
-#ifdef VMS
-#define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud
-#endif
-
-int SSL_CTX_get_verify_mode(SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int,X509_STORE_CTX *);
-void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,
-                        int (*callback)(int, X509_STORE_CTX *));
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth);
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx, int (*cb)(),char *arg);
-#ifndef NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
-#endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk,SSL_CTX *ctx,
-        unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, unsigned char *d);
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
-
-int SSL_CTX_check_private_key(SSL_CTX *ctx);
-int SSL_check_private_key(SSL *ctx);
-
-int     SSL_CTX_set_session_id_context(SSL_CTX *ctx,const unsigned char *sid_ctx,
-                                       unsigned int sid_ctx_len);
-
-SSL *   SSL_new(SSL_CTX *ctx);
-int     SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len);
-void    SSL_free(SSL *ssl);
-int     SSL_accept(SSL *ssl);
-int     SSL_connect(SSL *ssl);
-int     SSL_read(SSL *ssl,char *buf,int num);
-int     SSL_peek(SSL *ssl,char *buf,int num);
-int     SSL_write(SSL *ssl,const char *buf,int num);
-long    SSL_ctrl(SSL *ssl,int cmd, long larg, char *parg);
-long    SSL_CTX_ctrl(SSL_CTX *ctx,int cmd, long larg, char *parg);
-
-int     SSL_get_error(SSL *s,int ret_code);
-char *  SSL_get_version(SSL *s);
-
-/* This sets the 'default' SSL version that SSL_new() will create */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx,SSL_METHOD *meth);
-
-SSL_METHOD *SSLv2_method(void);         /* SSLv2 */
-SSL_METHOD *SSLv2_server_method(void);  /* SSLv2 */
-SSL_METHOD *SSLv2_client_method(void);  /* SSLv2 */
-
-SSL_METHOD *SSLv3_method(void);         /* SSLv3 */
-SSL_METHOD *SSLv3_server_method(void);  /* SSLv3 */
-SSL_METHOD *SSLv3_client_method(void);  /* SSLv3 */
-
-SSL_METHOD *SSLv23_method(void);        /* SSLv3 but can rollback to v2 */
-SSL_METHOD *SSLv23_server_method(void); /* SSLv3 but can rollback to v2 */
-SSL_METHOD *SSLv23_client_method(void); /* SSLv3 but can rollback to v2 */
-
-SSL_METHOD *TLSv1_method(void);         /* TLSv1.0 */
-SSL_METHOD *TLSv1_server_method(void);  /* TLSv1.0 */
-SSL_METHOD *TLSv1_client_method(void);  /* TLSv1.0 */
-
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s);
-
-int SSL_do_handshake(SSL *s);
-int SSL_renegotiate(SSL *s);
-int SSL_shutdown(SSL *s);
-
-SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s,SSL_METHOD *method);
-char *SSL_alert_type_string_long(int value);
-char *SSL_alert_type_string(int value);
-char *SSL_alert_desc_string_long(int value);
-char *SSL_alert_desc_string(int value);
-
-void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *list);
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *list);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl,X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x);
-
-void SSL_set_connect_state(SSL *s);
-void SSL_set_accept_state(SSL *s);
-
-long SSL_get_default_timeout(SSL *s);
-
-int SSL_library_init(void );
-
-char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
-
-SSL *SSL_dup(SSL *ssl);
-
-X509 *SSL_get_certificate(SSL *ssl);
-/* EVP_PKEY */ struct evp_pkey_st *SSL_get_privatekey(SSL *ssl);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode);
-int SSL_CTX_get_quiet_shutdown(SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl,int mode);
-int SSL_get_quiet_shutdown(SSL *ssl);
-void SSL_set_shutdown(SSL *ssl,int mode);
-int SSL_get_shutdown(SSL *ssl);
-int SSL_version(SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-        const char *CApath);
-SSL_SESSION *SSL_get_session(SSL *ssl);
-SSL_CTX *SSL_get_SSL_CTX(SSL *ssl);
-void SSL_set_info_callback(SSL *ssl,void (*cb)());
-void (*SSL_get_info_callback(SSL *ssl))();
-int SSL_state(SSL *ssl);
-
-void SSL_set_verify_result(SSL *ssl,long v);
-long SSL_get_verify_result(SSL *ssl);
-
-int SSL_set_ex_data(SSL *ssl,int idx,void *data);
-void *SSL_get_ex_data(SSL *ssl,int idx);
-int SSL_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-
-int SSL_SESSION_set_ex_data(SSL_SESSION *ss,int idx,void *data);
-void *SSL_SESSION_get_ex_data(SSL_SESSION *ss,int idx);
-int SSL_SESSION_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-
-int SSL_CTX_set_ex_data(SSL_CTX *ssl,int idx,void *data);
-void *SSL_CTX_get_ex_data(SSL_CTX *ssl,int idx);
-int SSL_CTX_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-        int (*dup_func)(), void (*free_func)());
-
-int SSL_get_ex_data_X509_STORE_CTX_idx(void );
-
-#define SSL_CTX_sess_set_cache_size(ctx,t) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-#define SSL_CTX_sess_get_cache_size(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-#define SSL_CTX_set_session_cache_mode(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-#define SSL_CTX_get_session_cache_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
-
-#define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-#define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-#define SSL_CTX_get_read_ahead(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-#define SSL_CTX_set_read_ahead(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,0,NULL)
-
-     /* NB: the keylength is only applicable when is_export is true */
-#ifndef NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
-                                  RSA *(*cb)(SSL *ssl,int is_export,
-                                             int keylength));
-
-void SSL_set_tmp_rsa_callback(SSL *ssl,
-                                  RSA *(*cb)(SSL *ssl,int is_export,
-                                             int keylength));
-#endif
-#ifndef NO_DH
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-                                 DH *(*dh)(SSL *ssl,int is_export,
-                                           int keylength));
-void SSL_set_tmp_dh_callback(SSL *ssl,
-                                 DH *(*dh)(SSL *ssl,int is_export,
-                                           int keylength));
-#endif
-
-#ifdef HEADER_COMP_H
-int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
-#else
-int SSL_COMP_add_compression_method(int id,char *cm);
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-/* 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_CTRL                                  213
-#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_ADD_DIR_CERT_SUBJECTS_TO_STACK         215
-#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        216
-#define SSL_F_SSL_BAD_METHOD                             160
-#define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
-#define SSL_F_SSL_CERT_DUP                               221
-#define SSL_F_SSL_CERT_INST                              222
-#define SSL_F_SSL_CERT_INSTANTIATE                       214
-#define SSL_F_SSL_CERT_NEW                               162
-#define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
-#define SSL_F_SSL_CLEAR                                  164
-#define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD            165
-#define SSL_F_SSL_CREATE_CIPHER_LIST                     166
-#define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168
-#define SSL_F_SSL_CTX_NEW                                169
-#define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             219
-#define SSL_F_SSL_CTX_SET_SSL_VERSION                    170
-#define SSL_F_SSL_CTX_USE_CERTIFICATE                    171
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               172
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE         220
-#define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               173
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY                     174
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                175
-#define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                176
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  177
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             178
-#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             179
-#define SSL_F_SSL_DO_HANDSHAKE                           180
-#define SSL_F_SSL_GET_NEW_SESSION                        181
-#define SSL_F_SSL_GET_PREV_SESSION                       217
-#define SSL_F_SSL_GET_SERVER_SEND_CERT                   182
-#define SSL_F_SSL_GET_SIGN_PKEY                          183
-#define SSL_F_SSL_INIT_WBIO_BUFFER                       184
-#define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    185
-#define SSL_F_SSL_NEW                                    186
-#define SSL_F_SSL_READ                                   223
-#define SSL_F_SSL_RSA_PRIVATE_DECRYPT                    187
-#define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     188
-#define SSL_F_SSL_SESSION_NEW                            189
-#define SSL_F_SSL_SESSION_PRINT_FP                       190
-#define SSL_F_SSL_SESS_CERT_NEW                          225
-#define SSL_F_SSL_SET_CERT                               191
-#define SSL_F_SSL_SET_FD                                 192
-#define SSL_F_SSL_SET_PKEY                               193
-#define SSL_F_SSL_SET_RFD                                194
-#define SSL_F_SSL_SET_SESSION                            195
-#define SSL_F_SSL_SET_SESSION_ID_CONTEXT                 218
-#define SSL_F_SSL_SET_WFD                                196
-#define SSL_F_SSL_SHUTDOWN                               224
-#define SSL_F_SSL_UNDEFINED_FUNCTION                     197
-#define SSL_F_SSL_USE_CERTIFICATE                        198
-#define SSL_F_SSL_USE_CERTIFICATE_ASN1                   199
-#define SSL_F_SSL_USE_CERTIFICATE_FILE                   200
-#define SSL_F_SSL_USE_PRIVATEKEY                         201
-#define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    202
-#define SSL_F_SSL_USE_PRIVATEKEY_FILE                    203
-#define SSL_F_SSL_USE_RSAPRIVATEKEY                      204
-#define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 205
-#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 206
-#define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
-#define SSL_F_SSL_WRITE                                  208
-#define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
-#define SSL_F_TLS1_ENC                                   210
-#define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
-#define SSL_F_WRITE_PENDING                              212
-
-/* Reason codes. */
-#define SSL_R_APP_DATA_IN_HANDSHAKE                      100
-#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-#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_LENGTH                                 271
-#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_COMPRESSION_LIBRARY_ERROR                  142
-#define SSL_R_CONNECTION_ID_IS_DIFFERENT                 143
-#define SSL_R_CONNECTION_TYPE_NOT_SET                    144
-#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              145
-#define SSL_R_DATA_LENGTH_TOO_LONG                       146
-#define SSL_R_DECRYPTION_FAILED                          147
-#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148
-#define SSL_R_DIGEST_CHECK_FAILED                        149
-#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
-#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
-#define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
-#define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
-#define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
-#define SSL_R_HTTPS_PROXY_REQUEST                        155
-#define SSL_R_HTTP_REQUEST                               156
-#define SSL_R_INTERNAL_ERROR                             157
-#define SSL_R_INVALID_CHALLENGE_LENGTH                   158
-#define SSL_R_LENGTH_MISMATCH                            159
-#define SSL_R_LENGTH_TOO_SHORT                           160
-#define SSL_R_LIBRARY_BUG                                274
-#define SSL_R_LIBRARY_HAS_NO_CIPHERS                     161
-#define SSL_R_MISSING_DH_DSA_CERT                        162
-#define SSL_R_MISSING_DH_KEY                             163
-#define SSL_R_MISSING_DH_RSA_CERT                        164
-#define SSL_R_MISSING_DSA_SIGNING_CERT                   165
-#define SSL_R_MISSING_EXPORT_TMP_DH_KEY                  166
-#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY                 167
-#define SSL_R_MISSING_RSA_CERTIFICATE                    168
-#define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
-#define SSL_R_MISSING_RSA_SIGNING_CERT                   170
-#define SSL_R_MISSING_TMP_DH_KEY                         171
-#define SSL_R_MISSING_TMP_RSA_KEY                        172
-#define SSL_R_MISSING_TMP_RSA_PKEY                       173
-#define SSL_R_MISSING_VERIFY_MESSAGE                     174
-#define SSL_R_NON_SSLV2_INITIAL_PACKET                   175
-#define SSL_R_NO_CERTIFICATES_RETURNED                   176
-#define SSL_R_NO_CERTIFICATE_ASSIGNED                    177
-#define SSL_R_NO_CERTIFICATE_RETURNED                    178
-#define SSL_R_NO_CERTIFICATE_SET                         179
-#define SSL_R_NO_CERTIFICATE_SPECIFIED                   180
-#define SSL_R_NO_CIPHERS_AVAILABLE                       181
-#define SSL_R_NO_CIPHERS_PASSED                          182
-#define SSL_R_NO_CIPHERS_SPECIFIED                       183
-#define SSL_R_NO_CIPHER_LIST                             184
-#define SSL_R_NO_CIPHER_MATCH                            185
-#define SSL_R_NO_CLIENT_CERT_RECEIVED                    186
-#define SSL_R_NO_COMPRESSION_SPECIFIED                   187
-#define SSL_R_NO_METHOD_SPECIFIED                        188
-#define SSL_R_NO_PRIVATEKEY                              189
-#define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    190
-#define SSL_R_NO_PROTOCOLS_AVAILABLE                     191
-#define SSL_R_NO_PUBLICKEY                               192
-#define SSL_R_NO_SHARED_CIPHER                           193
-#define SSL_R_NO_VERIFY_CALLBACK                         194
-#define SSL_R_NULL_SSL_CTX                               195
-#define SSL_R_NULL_SSL_METHOD_PASSED                     196
-#define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
-#define SSL_R_PACKET_LENGTH_TOO_LONG                     198
-#define SSL_R_PATH_TOO_LONG                              270
-#define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          199
-#define SSL_R_PEER_ERROR                                 200
-#define SSL_R_PEER_ERROR_CERTIFICATE                     201
-#define SSL_R_PEER_ERROR_NO_CERTIFICATE                  202
-#define SSL_R_PEER_ERROR_NO_CIPHER                       203
-#define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE    204
-#define SSL_R_PRE_MAC_LENGTH_TOO_LONG                    205
-#define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS          206
-#define SSL_R_PROTOCOL_IS_SHUTDOWN                       207
-#define SSL_R_PUBLIC_KEY_ENCRYPT_ERROR                   208
-#define SSL_R_PUBLIC_KEY_IS_NOT_RSA                      209
-#define SSL_R_PUBLIC_KEY_NOT_RSA                         210
-#define SSL_R_READ_BIO_NOT_SET                           211
-#define SSL_R_READ_WRONG_PACKET_TYPE                     212
-#define SSL_R_RECORD_LENGTH_MISMATCH                     213
-#define SSL_R_RECORD_TOO_LARGE                           214
-#define SSL_R_REQUIRED_CIPHER_MISSING                    215
-#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO                 216
-#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO                   217
-#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO                 218
-#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
-#define SSL_R_SHORT_READ                                 219
-#define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
-#define SSL_R_SSL23_DOING_SESSION_ID_REUSE               221
-#define SSL_R_SSL3_SESSION_ID_TOO_SHORT                  222
-#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         223
-#define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CERTIFICATE      224
-#define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CIPHER           225
-#define SSL_R_SSLV3_ALERT_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE 226
-#define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
-#define SSL_R_SSLV3_ALERT_UNKNOWN_REMOTE_ERROR_TYPE      227
-#define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
-#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228
-#define SSL_R_SSL_HANDSHAKE_FAILURE                      229
-#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230
-#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
-#define SSL_R_SSL_SESSION_ID_IS_DIFFERENT                231
-#define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
-#define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
-#define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021
-#define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051
-#define SSL_R_TLSV1_ALERT_EXPORT_RESTRICION              1060
-#define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071
-#define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
-#define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               1100
-#define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION               1070
-#define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW                1022
-#define SSL_R_TLSV1_ALERT_UNKNOWN_CA                     1048
-#define SSL_R_TLSV1_ALERT_USER_CANCLED                   1090
-#define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER       232
-#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
-#define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
-#define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235
-#define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236
-#define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY               237
-#define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS               238
-#define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
-#define SSL_R_UNABLE_TO_FIND_SSL_METHOD                  240
-#define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES           241
-#define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
-#define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
-#define SSL_R_UNEXPECTED_MESSAGE                         244
-#define SSL_R_UNEXPECTED_RECORD                          245
-#define SSL_R_UNINITIALIZED                              276
-#define SSL_R_UNKNOWN_ALERT_TYPE                         246
-#define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
-#define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
-#define SSL_R_UNKNOWN_CIPHER_TYPE                        249
-#define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
-#define SSL_R_UNKNOWN_PKEY_TYPE                          251
-#define SSL_R_UNKNOWN_PROTOCOL                           252
-#define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE                  253
-#define SSL_R_UNKNOWN_SSL_VERSION                        254
-#define SSL_R_UNKNOWN_STATE                              255
-#define SSL_R_UNSUPPORTED_CIPHER                         256
-#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          257
-#define SSL_R_UNSUPPORTED_PROTOCOL                       258
-#define SSL_R_UNSUPPORTED_SSL_VERSION                    259
-#define SSL_R_WRITE_BIO_NOT_SET                          260
-#define SSL_R_WRONG_CIPHER_RETURNED                      261
-#define SSL_R_WRONG_MESSAGE_TYPE                         262
-#define SSL_R_WRONG_NUMBER_OF_KEY_BITS                   263
-#define SSL_R_WRONG_SIGNATURE_LENGTH                     264
-#define SSL_R_WRONG_SIGNATURE_SIZE                       265
-#define SSL_R_WRONG_SSL_VERSION                          266
-#define SSL_R_WRONG_VERSION_NUMBER                       267
-#define SSL_R_X509_LIB                                   268
-#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libssl/ssl2.h b/src/lib/libssl/ssl2.h
deleted file mode 100644
index d7f24ac1b4..0000000000
--- a/src/lib/libssl/ssl2.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ssl/ssl2.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_SSL2_H 
-#define HEADER_SSL2_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Protocol Version Codes */
-#define SSL2_VERSION            0x0002
-#define SSL2_VERSION_MAJOR      0x00
-#define SSL2_VERSION_MINOR      0x02
-/* #define SSL2_CLIENT_VERSION  0x0002 */
-/* #define SSL2_SERVER_VERSION  0x0002 */
-
-/* Protocol Message Codes */
-#define SSL2_MT_ERROR                   0
-#define SSL2_MT_CLIENT_HELLO            1
-#define SSL2_MT_CLIENT_MASTER_KEY       2
-#define SSL2_MT_CLIENT_FINISHED         3
-#define SSL2_MT_SERVER_HELLO            4
-#define SSL2_MT_SERVER_VERIFY           5
-#define SSL2_MT_SERVER_FINISHED         6
-#define SSL2_MT_REQUEST_CERTIFICATE     7
-#define SSL2_MT_CLIENT_CERTIFICATE      8
-
-/* Error Message Codes */
-#define SSL2_PE_UNDEFINED_ERROR         0x0000
-#define SSL2_PE_NO_CIPHER               0x0001
-#define SSL2_PE_NO_CERTIFICATE          0x0002
-#define SSL2_PE_BAD_CERTIFICATE         0x0004
-#define SSL2_PE_UNSUPPORTED_CERTIFICATE_TYPE 0x0006
-
-/* Cipher Kind Values */
-#define SSL2_CK_NULL_WITH_MD5                   0x02000000 /* v3 */
-#define SSL2_CK_RC4_128_WITH_MD5                0x02010080
-#define SSL2_CK_RC4_128_EXPORT40_WITH_MD5       0x02020080
-#define SSL2_CK_RC2_128_CBC_WITH_MD5            0x02030080
-#define SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5   0x02040080
-#define SSL2_CK_IDEA_128_CBC_WITH_MD5           0x02050080
-#define SSL2_CK_DES_64_CBC_WITH_MD5             0x02060040
-#define SSL2_CK_DES_64_CBC_WITH_SHA             0x02060140 /* v3 */
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5       0x020700c0
-#define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA       0x020701c0 /* v3 */
-#define SSL2_CK_RC4_64_WITH_MD5                 0x02080080 /* MS hack */
- 
-#define SSL2_CK_DES_64_CFB64_WITH_MD5_1         0x02ff0800 /* SSLeay */
-#define SSL2_CK_NULL                            0x02ff0810 /* SSLeay */
-
-#define SSL2_TXT_DES_64_CFB64_WITH_MD5_1        "DES-CFB-M1"
-#define SSL2_TXT_NULL_WITH_MD5                  "NULL-MD5"
-#define SSL2_TXT_RC4_128_WITH_MD5               "RC4-MD5"
-#define SSL2_TXT_RC4_128_EXPORT40_WITH_MD5      "EXP-RC4-MD5"
-#define SSL2_TXT_RC2_128_CBC_WITH_MD5           "RC2-CBC-MD5"
-#define SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5  "EXP-RC2-CBC-MD5"
-#define SSL2_TXT_IDEA_128_CBC_WITH_MD5          "IDEA-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_MD5            "DES-CBC-MD5"
-#define SSL2_TXT_DES_64_CBC_WITH_SHA            "DES-CBC-SHA"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5      "DES-CBC3-MD5"
-#define SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA      "DES-CBC3-SHA"
-#define SSL2_TXT_RC4_64_WITH_MD5                "RC4-64-MD5"
-
-#define SSL2_TXT_NULL                           "NULL"
-
-/* Flags for the SSL_CIPHER.algorithm2 field */
-#define SSL2_CF_5_BYTE_ENC                      0x01
-#define SSL2_CF_8_BYTE_ENC                      0x02
-
-/* Certificate Type Codes */
-#define SSL2_CT_X509_CERTIFICATE                0x01
-
-/* Authentication Type Code */
-#define SSL2_AT_MD5_WITH_RSA_ENCRYPTION         0x01
-
-#define SSL2_MAX_SSL_SESSION_ID_LENGTH          32
-
-/* Upper/Lower Bounds */
-#define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS      256
-#define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    (unsigned int)32767 
-#define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER    16383 /**/
-
-#define SSL2_CHALLENGE_LENGTH   16
-/*#define SSL2_CHALLENGE_LENGTH 32 */
-#define SSL2_MIN_CHALLENGE_LENGTH       16
-#define SSL2_MAX_CHALLENGE_LENGTH       32
-#define SSL2_CONNECTION_ID_LENGTH       16
-#define SSL2_MAX_CONNECTION_ID_LENGTH   16
-#define SSL2_SSL_SESSION_ID_LENGTH      16
-#define SSL2_MAX_CERT_CHALLENGE_LENGTH  32
-#define SSL2_MIN_CERT_CHALLENGE_LENGTH  16
-#define SSL2_MAX_KEY_MATERIAL_LENGTH    24
-
-#ifndef HEADER_SSL_LOCL_H
-#define  CERT           char
-#endif
-
-typedef struct ssl2_ctx_st
-        {
-        int three_byte_header;
-        int clear_text;         /* clear text */
-        int escape;             /* not used in SSLv2 */
-        int ssl2_rollback;      /* used if SSLv23 rolled back to SSLv2 */
-
-        /* non-blocking io info, used to make sure the same
-         * args were passwd */
-        unsigned int wnum;      /* number of bytes sent so far */
-        int wpend_tot;
-        const unsigned char *wpend_buf;
-
-        int wpend_off;  /* offset to data to write */
-        int wpend_len;  /* number of bytes passwd to write */
-        int wpend_ret;  /* number of bytes to return to caller */
-
-        /* buffer raw data */
-        int rbuf_left;
-        int rbuf_offs;
-        unsigned char *rbuf;
-        unsigned char *wbuf;
-
-        unsigned char *write_ptr;/* used to point to the start due to
-                                  * 2/3 byte header. */
-
-        unsigned int padding;
-        unsigned int rlength; /* passed to ssl2_enc */
-        int ract_data_length; /* Set when things are encrypted. */
-        unsigned int wlength; /* passed to ssl2_enc */
-        int wact_data_length; /* Set when things are decrypted. */
-        unsigned char *ract_data;
-        unsigned char *wact_data;
-        unsigned char *mac_data;
-        unsigned char *pad_data;
-
-        unsigned char *read_key;
-        unsigned char *write_key;
-
-                /* Stuff specifically to do with this SSL session */
-        unsigned int challenge_length;
-        unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-        unsigned int conn_id_length;
-        unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-        unsigned int key_material_length;
-        unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH*2];
-
-        unsigned long read_sequence;
-        unsigned long write_sequence;
-
-        struct  {
-                unsigned int conn_id_length;
-                unsigned int cert_type; 
-                unsigned int cert_length;
-                int csl; 
-                int clear;
-                unsigned int enc; 
-                unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-                int cipher_spec_length;
-                unsigned int session_id_length;
-                unsigned int clen;
-                unsigned int rlen;
-                } tmp;
-        } SSL2_CTX;
-
-/* SSLv2 */
-/* client */
-#define SSL2_ST_SEND_CLIENT_HELLO_A             (0x10|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_HELLO_B             (0x11|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_A              (0x20|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_HELLO_B              (0x21|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_A        (0x30|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_MASTER_KEY_B        (0x31|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_A          (0x40|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_FINISHED_B          (0x41|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_A       (0x50|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_B       (0x51|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_C       (0x52|SSL_ST_CONNECT)
-#define SSL2_ST_SEND_CLIENT_CERTIFICATE_D       (0x53|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_A             (0x60|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_VERIFY_B             (0x61|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_A           (0x70|SSL_ST_CONNECT)
-#define SSL2_ST_GET_SERVER_FINISHED_B           (0x71|SSL_ST_CONNECT)
-#define SSL2_ST_CLIENT_START_ENCRYPTION         (0x80|SSL_ST_CONNECT)
-#define SSL2_ST_X509_GET_CLIENT_CERTIFICATE     (0x90|SSL_ST_CONNECT)
-/* server */
-#define SSL2_ST_GET_CLIENT_HELLO_A              (0x10|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_B              (0x11|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_HELLO_C              (0x12|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_A             (0x20|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_HELLO_B             (0x21|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_A         (0x30|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_MASTER_KEY_B         (0x31|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_A            (0x40|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_B            (0x41|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_VERIFY_C            (0x42|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_A           (0x50|SSL_ST_ACCEPT)
-#define SSL2_ST_GET_CLIENT_FINISHED_B           (0x51|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_A          (0x60|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_SERVER_FINISHED_B          (0x61|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_A      (0x70|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_B      (0x71|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_C      (0x72|SSL_ST_ACCEPT)
-#define SSL2_ST_SEND_REQUEST_CERTIFICATE_D      (0x73|SSL_ST_ACCEPT)
-#define SSL2_ST_SERVER_START_ENCRYPTION         (0x80|SSL_ST_ACCEPT)
-#define SSL2_ST_X509_GET_SERVER_CERTIFICATE     (0x90|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libssl/ssl23.h b/src/lib/libssl/ssl23.h
deleted file mode 100644
index d3228983c7..0000000000
--- a/src/lib/libssl/ssl23.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ssl/ssl23.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_SSL23_H 
-#define HEADER_SSL23_H 
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*client */
-/* write to server */
-#define SSL23_ST_CW_CLNT_HELLO_A        (0x210|SSL_ST_CONNECT)
-#define SSL23_ST_CW_CLNT_HELLO_B        (0x211|SSL_ST_CONNECT)
-/* read from server */
-#define SSL23_ST_CR_SRVR_HELLO_A        (0x220|SSL_ST_CONNECT)
-#define SSL23_ST_CR_SRVR_HELLO_B        (0x221|SSL_ST_CONNECT)
-
-/* server */
-/* read from client */
-#define SSL23_ST_SR_CLNT_HELLO_A        (0x210|SSL_ST_ACCEPT)
-#define SSL23_ST_SR_CLNT_HELLO_B        (0x211|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h
deleted file mode 100644
index 2a9714fc19..0000000000
--- a/src/lib/libssl/ssl3.h
+++ /dev/null
@@ -1,459 +0,0 @@
-/* ssl/ssl3.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_SSL3_H 
-#define HEADER_SSL3_H 
-
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define SSL3_CK_RSA_NULL_MD5                    0x03000001
-#define SSL3_CK_RSA_NULL_SHA                    0x03000002
-#define SSL3_CK_RSA_RC4_40_MD5                  0x03000003
-#define SSL3_CK_RSA_RC4_128_MD5                 0x03000004
-#define SSL3_CK_RSA_RC4_128_SHA                 0x03000005
-#define SSL3_CK_RSA_RC2_40_MD5                  0x03000006
-#define SSL3_CK_RSA_IDEA_128_SHA                0x03000007
-#define SSL3_CK_RSA_DES_40_CBC_SHA              0x03000008
-#define SSL3_CK_RSA_DES_64_CBC_SHA              0x03000009
-#define SSL3_CK_RSA_DES_192_CBC3_SHA            0x0300000A
-
-#define SSL3_CK_DH_DSS_DES_40_CBC_SHA           0x0300000B
-#define SSL3_CK_DH_DSS_DES_64_CBC_SHA           0x0300000C
-#define SSL3_CK_DH_DSS_DES_192_CBC3_SHA         0x0300000D
-#define SSL3_CK_DH_RSA_DES_40_CBC_SHA           0x0300000E
-#define SSL3_CK_DH_RSA_DES_64_CBC_SHA           0x0300000F
-#define SSL3_CK_DH_RSA_DES_192_CBC3_SHA         0x03000010
-
-#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          0x03000011
-#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA          0x03000012
-#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA        0x03000013
-#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA          0x03000014
-#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA          0x03000015
-#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA        0x03000016
-
-#define SSL3_CK_ADH_RC4_40_MD5                  0x03000017
-#define SSL3_CK_ADH_RC4_128_MD5                 0x03000018
-#define SSL3_CK_ADH_DES_40_CBC_SHA              0x03000019
-#define SSL3_CK_ADH_DES_64_CBC_SHA              0x0300001A
-#define SSL3_CK_ADH_DES_192_CBC_SHA             0x0300001B
-
-#define SSL3_CK_FZA_DMS_NULL_SHA                0x0300001C
-#define SSL3_CK_FZA_DMS_FZA_SHA                 0x0300001D
-#define SSL3_CK_FZA_DMS_RC4_SHA                 0x0300001E
-
-#define SSL3_TXT_RSA_NULL_MD5                   "NULL-MD5"
-#define SSL3_TXT_RSA_NULL_SHA                   "NULL-SHA"
-#define SSL3_TXT_RSA_RC4_40_MD5                 "EXP-RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_MD5                "RC4-MD5"
-#define SSL3_TXT_RSA_RC4_128_SHA                "RC4-SHA"
-#define SSL3_TXT_RSA_RC2_40_MD5                 "EXP-RC2-CBC-MD5"
-#define SSL3_TXT_RSA_IDEA_128_SHA               "IDEA-CBC-SHA"
-#define SSL3_TXT_RSA_DES_40_CBC_SHA             "EXP-DES-CBC-SHA"
-#define SSL3_TXT_RSA_DES_64_CBC_SHA             "DES-CBC-SHA"
-#define SSL3_TXT_RSA_DES_192_CBC3_SHA           "DES-CBC3-SHA"
-
-#define SSL3_TXT_DH_DSS_DES_40_CBC_SHA          "EXP-DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_64_CBC_SHA          "DH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA        "DH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_DH_RSA_DES_40_CBC_SHA          "EXP-DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_64_CBC_SHA          "DH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA        "DH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA         "EXP-EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA         "EDH-DSS-DES-CBC-SHA"
-#define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA       "EDH-DSS-DES-CBC3-SHA"
-#define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA         "EXP-EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA         "EDH-RSA-DES-CBC-SHA"
-#define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA       "EDH-RSA-DES-CBC3-SHA"
-
-#define SSL3_TXT_ADH_RC4_40_MD5                 "EXP-ADH-RC4-MD5"
-#define SSL3_TXT_ADH_RC4_128_MD5                "ADH-RC4-MD5"
-#define SSL3_TXT_ADH_DES_40_CBC_SHA             "EXP-ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_64_CBC_SHA             "ADH-DES-CBC-SHA"
-#define SSL3_TXT_ADH_DES_192_CBC_SHA            "ADH-DES-CBC3-SHA"
-
-#define SSL3_TXT_FZA_DMS_NULL_SHA               "FZA-NULL-SHA"
-#define SSL3_TXT_FZA_DMS_FZA_SHA                "FZA-FZA-CBC-SHA"
-#define SSL3_TXT_FZA_DMS_RC4_SHA                "FZA-RC4-SHA"
-
-#define SSL3_SSL_SESSION_ID_LENGTH              32
-#define SSL3_MAX_SSL_SESSION_ID_LENGTH          32
-
-#define SSL3_MASTER_SECRET_SIZE                 48
-#define SSL3_RANDOM_SIZE                        32
-#define SSL3_SESSION_ID_SIZE                    32
-#define SSL3_RT_HEADER_LENGTH                   5
-
-/* Due to MS stuffing up, this can change.... */
-#if defined(WIN16) || (defined(MSDOS) && !defined(WIN32))
-#define SSL3_RT_MAX_EXTRA                       (14000)
-#else
-#define SSL3_RT_MAX_EXTRA                       (16384)
-#endif
-
-#define SSL3_RT_MAX_PLAIN_LENGTH                16384
-#define SSL3_RT_MAX_COMPRESSED_LENGTH   (1024+SSL3_RT_MAX_PLAIN_LENGTH)
-#define SSL3_RT_MAX_ENCRYPTED_LENGTH    (1024+SSL3_RT_MAX_COMPRESSED_LENGTH)
-#define SSL3_RT_MAX_PACKET_SIZE         (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
-#define SSL3_RT_MAX_DATA_SIZE                   (1024*1024)
-
-/* the states that a SSL3_RECORD can be in
- * For SSL_read it goes
- * rbuf->ENCODED        -> read 
- * ENCODED              -> we need to decode everything - call decode_record
- */
- 
-#define SSL3_RS_BLANK                   1
-#define SSL3_RS_DATA
-
-#define SSL3_RS_ENCODED                 2
-#define SSL3_RS_READ_MORE               3
-#define SSL3_RS_WRITE_MORE
-#define SSL3_RS_PLAIN                   3
-#define SSL3_RS_PART_READ               4
-#define SSL3_RS_PART_WRITE              5
-
-#define SSL3_MD_CLIENT_FINISHED_CONST   {0x43,0x4C,0x4E,0x54}
-#define SSL3_MD_SERVER_FINISHED_CONST   {0x53,0x52,0x56,0x52}
-
-#define SSL3_VERSION                    0x0300
-#define SSL3_VERSION_MAJOR              0x03
-#define SSL3_VERSION_MINOR              0x00
-
-#define SSL3_RT_CHANGE_CIPHER_SPEC      20
-#define SSL3_RT_ALERT                   21
-#define SSL3_RT_HANDSHAKE               22
-#define SSL3_RT_APPLICATION_DATA        23
-
-#define SSL3_AL_WARNING                 1
-#define SSL3_AL_FATAL                   2
-
-#define SSL3_AD_CLOSE_NOTIFY             0
-#define SSL3_AD_UNEXPECTED_MESSAGE      10      /* fatal */
-#define SSL3_AD_BAD_RECORD_MAC          20      /* fatal */
-#define SSL3_AD_DECOMPRESSION_FAILURE   30      /* fatal */
-#define SSL3_AD_HANDSHAKE_FAILURE       40      /* fatal */
-#define SSL3_AD_NO_CERTIFICATE          41
-#define SSL3_AD_BAD_CERTIFICATE         42
-#define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
-#define SSL3_AD_CERTIFICATE_REVOKED     44
-#define SSL3_AD_CERTIFICATE_EXPIRED     45
-#define SSL3_AD_CERTIFICATE_UNKNOWN     46
-#define SSL3_AD_ILLEGAL_PARAMETER       47      /* fatal */
-
-typedef struct ssl3_record_st
-        {
-/*r */  int type;               /* type of record */
-/*  */  /*int state;*/          /* any data in it? */
-/*rw*/  unsigned int length;    /* How many bytes available */
-/*r */  unsigned int off;       /* read/write offset into 'buf' */
-/*rw*/  unsigned char *data;    /* pointer to the record data */
-/*rw*/  unsigned char *input;   /* where the decode bytes are */
-/*r */  unsigned char *comp;    /* only used with decompression - malloc()ed */
-        } SSL3_RECORD;
-
-typedef struct ssl3_buffer_st
-        {
-/*r */  int total;              /* used in non-blocking writes */
-/*r */  int wanted;             /* how many more bytes we need */
-/*rw*/  int left;               /* how many bytes left */
-/*rw*/  int offset;             /* where to 'copy from' */
-/*rw*/  unsigned char *buf;     /* SSL3_RT_MAX_PACKET_SIZE bytes */
-        } SSL3_BUFFER;
-
-#define SSL3_CT_RSA_SIGN                        1
-#define SSL3_CT_DSS_SIGN                        2
-#define SSL3_CT_RSA_FIXED_DH                    3
-#define SSL3_CT_DSS_FIXED_DH                    4
-#define SSL3_CT_RSA_EPHEMERAL_DH                5
-#define SSL3_CT_DSS_EPHEMERAL_DH                6
-#define SSL3_CT_FORTEZZA_DMS                    20
-#define SSL3_CT_NUMBER                          7
-
-#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001
-#define SSL3_FLAGS_DELAY_CLIENT_FINISHED        0x0002
-#define SSL3_FLAGS_POP_BUFFER                   0x0004
-#define TLS1_FLAGS_TLS_PADDING_BUG              0x0008
-
-#if 0
-#define AD_CLOSE_NOTIFY                 0
-#define AD_UNEXPECTED_MESSAGE           1
-#define AD_BAD_RECORD_MAC               2
-#define AD_DECRYPTION_FAILED            3
-#define AD_RECORD_OVERFLOW              4
-#define AD_DECOMPRESSION_FAILURE        5       /* fatal */
-#define AD_HANDSHAKE_FAILURE            6       /* fatal */
-#define AD_NO_CERTIFICATE               7       /* Not under TLS */
-#define AD_BAD_CERTIFICATE              8
-#define AD_UNSUPPORTED_CERTIFICATE      9
-#define AD_CERTIFICATE_REVOKED          10      
-#define AD_CERTIFICATE_EXPIRED          11
-#define AD_CERTIFICATE_UNKNOWN          12
-#define AD_ILLEGAL_PARAMETER            13      /* fatal */
-#define AD_UNKNOWN_CA                   14      /* fatal */
-#define AD_ACCESS_DENIED                15      /* fatal */
-#define AD_DECODE_ERROR                 16      /* fatal */
-#define AD_DECRYPT_ERROR                17
-#define AD_EXPORT_RESTRICION            18      /* fatal */
-#define AD_PROTOCOL_VERSION             19      /* fatal */
-#define AD_INSUFFICIENT_SECURITY        20      /* fatal */
-#define AD_INTERNAL_ERROR               21      /* fatal */
-#define AD_USER_CANCLED                 22
-#define AD_NO_RENEGOTIATION             23
-#endif
-
-typedef struct ssl3_ctx_st
-        {
-        long flags;
-        int delay_buf_pop_ret;
-
-        unsigned char read_sequence[8];
-        unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-        unsigned char write_sequence[8];
-        unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
-
-        unsigned char server_random[SSL3_RANDOM_SIZE];
-        unsigned char client_random[SSL3_RANDOM_SIZE];
-
-        SSL3_BUFFER rbuf;       /* read IO goes into here */
-        SSL3_BUFFER wbuf;       /* write IO goes into here */
-        SSL3_RECORD rrec;       /* each decoded record goes in here */
-        SSL3_RECORD wrec;       /* goes out from here */
-                                /* Used by ssl3_read_n to point
-                                 * to input data packet */
-
-        /* partial write - check the numbers match */
-        unsigned int wnum;      /* number of bytes sent so far */
-        int wpend_tot;          /* number bytes written */
-        int wpend_type;
-        int wpend_ret;          /* number of bytes submitted */
-        const unsigned char *wpend_buf;
-
-        /* used during startup, digest all incoming/outgoing packets */
-        EVP_MD_CTX finish_dgst1;
-        EVP_MD_CTX finish_dgst2;
-
-        /* this is set whenerver we see a change_cipher_spec message
-         * come in when we are not looking for one */
-        int change_cipher_spec;
-
-        int warn_alert;
-        int fatal_alert;
-        /* we alow one fatal and one warning alert to be outstanding,
-         * send close alert via the warning alert */
-        int alert_dispatch;
-        unsigned char send_alert[2];
-
-        /* This flag is set when we should renegotiate ASAP, basically when
-         * there is no more data in the read or write buffers */
-        int renegotiate;
-        int total_renegotiations;
-        int num_renegotiations;
-
-        int in_read_app_data;
-
-        struct  {
-                /* Actually only needs to be 16+20 for SSLv3 and 12 for TLS */
-                unsigned char finish_md[EVP_MAX_MD_SIZE*2];
-                
-                unsigned long message_size;
-                int message_type;
-
-                /* used to hold the new cipher we are going to use */
-                SSL_CIPHER *new_cipher;
-#ifndef NO_DH
-                DH *dh;
-#endif
-                /* used when SSL_ST_FLUSH_DATA is entered */
-                int next_state;                 
-
-                int reuse_message;
-
-                /* used for certificate requests */
-                int cert_req;
-                int ctype_num;
-                char ctype[SSL3_CT_NUMBER];
-                STACK_OF(X509_NAME) *ca_names;
-
-                int use_rsa_tmp;
-
-                int key_block_length;
-                unsigned char *key_block;
-
-                const EVP_CIPHER *new_sym_enc;
-                const EVP_MD *new_hash;
-#ifdef HEADER_COMP_H
-                const SSL_COMP *new_compression;
-#else
-                char *new_compression;
-#endif
-                int cert_request;
-                } tmp;
-
-        } SSL3_CTX;
-
-/* SSLv3 */
-/*client */
-/* extra state */
-#define SSL3_ST_CW_FLUSH                (0x100|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CLNT_HELLO_A         (0x110|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CLNT_HELLO_B         (0x111|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_SRVR_HELLO_A         (0x120|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_HELLO_B         (0x121|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_A               (0x130|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_B               (0x131|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_A           (0x140|SSL_ST_CONNECT)
-#define SSL3_ST_CR_KEY_EXCH_B           (0x141|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_A           (0x150|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CERT_REQ_B           (0x151|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_A          (0x160|SSL_ST_CONNECT)
-#define SSL3_ST_CR_SRVR_DONE_B          (0x161|SSL_ST_CONNECT)
-/* write to server */
-#define SSL3_ST_CW_CERT_A               (0x170|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_B               (0x171|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_C               (0x172|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_D               (0x173|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_A           (0x180|SSL_ST_CONNECT)
-#define SSL3_ST_CW_KEY_EXCH_B           (0x181|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_A          (0x190|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CERT_VRFY_B          (0x191|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_A             (0x1A0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_CHANGE_B             (0x1A1|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_A           (0x1B0|SSL_ST_CONNECT)
-#define SSL3_ST_CW_FINISHED_B           (0x1B1|SSL_ST_CONNECT)
-/* read from server */
-#define SSL3_ST_CR_CHANGE_A             (0x1C0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_CHANGE_B             (0x1C1|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_A           (0x1D0|SSL_ST_CONNECT)
-#define SSL3_ST_CR_FINISHED_B           (0x1D1|SSL_ST_CONNECT)
-
-/* server */
-/* extra state */
-#define SSL3_ST_SW_FLUSH                (0x100|SSL_ST_ACCEPT)
-/* read from client */
-/* Do not change the number values, they do matter */
-#define SSL3_ST_SR_CLNT_HELLO_A         (0x110|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_B         (0x111|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CLNT_HELLO_C         (0x112|SSL_ST_ACCEPT)
-/* write to client */
-#define SSL3_ST_SW_HELLO_REQ_A          (0x120|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_B          (0x121|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_HELLO_REQ_C          (0x122|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_A         (0x130|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_HELLO_B         (0x131|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_A               (0x140|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_B               (0x141|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_A           (0x150|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_KEY_EXCH_B           (0x151|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_A           (0x160|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CERT_REQ_B           (0x161|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_A          (0x170|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_SRVR_DONE_B          (0x171|SSL_ST_ACCEPT)
-/* read from client */
-#define SSL3_ST_SR_CERT_A               (0x180|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_B               (0x181|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_A           (0x190|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_KEY_EXCH_B           (0x191|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_A          (0x1A0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CERT_VRFY_B          (0x1A1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_A             (0x1B0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_CHANGE_B             (0x1B1|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_A           (0x1C0|SSL_ST_ACCEPT)
-#define SSL3_ST_SR_FINISHED_B           (0x1C1|SSL_ST_ACCEPT)
-/* write to client */
-#define SSL3_ST_SW_CHANGE_A             (0x1D0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_CHANGE_B             (0x1D1|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_A           (0x1E0|SSL_ST_ACCEPT)
-#define SSL3_ST_SW_FINISHED_B           (0x1E1|SSL_ST_ACCEPT)
-
-#define SSL3_MT_CLIENT_REQUEST                  0
-#define SSL3_MT_CLIENT_HELLO                    1
-#define SSL3_MT_SERVER_HELLO                    2
-#define SSL3_MT_CERTIFICATE                     11
-#define SSL3_MT_SERVER_KEY_EXCHANGE             12
-#define SSL3_MT_CERTIFICATE_REQUEST             13
-#define SSL3_MT_SERVER_DONE                     14
-#define SSL3_MT_CERTIFICATE_VERIFY              15
-#define SSL3_MT_CLIENT_KEY_EXCHANGE             16
-#define SSL3_MT_FINISHED                        20
-
-#define SSL3_MT_CCS                             1
-
-/* These are used when changing over to a new cipher */
-#define SSL3_CC_READ            0x01
-#define SSL3_CC_WRITE           0x02
-#define SSL3_CC_CLIENT          0x10
-#define SSL3_CC_SERVER          0x20
-#define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)  
-#define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)
-#define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)
-#define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c
deleted file mode 100644
index a91ee6d22e..0000000000
--- a/src/lib/libssl/ssl_algs.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ssl/ssl_algs.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/objects.h>
-#include <openssl/lhash.h>
-#include "ssl_locl.h"
-
-int SSL_library_init(void)
-        {
-#ifndef NO_DES
-        EVP_add_cipher(EVP_des_cbc());
-        EVP_add_cipher(EVP_des_ede3_cbc());
-#endif
-#ifndef NO_IDEA
-        EVP_add_cipher(EVP_idea_cbc());
-#endif
-#ifndef NO_RC4
-        EVP_add_cipher(EVP_rc4());
-#endif  
-#ifndef NO_RC2
-        EVP_add_cipher(EVP_rc2_cbc());
-#endif  
-
-#ifndef NO_MD2
-        EVP_add_digest(EVP_md2());
-#endif
-#ifndef NO_MD5
-        EVP_add_digest(EVP_md5());
-        EVP_add_digest_alias(SN_md5,"ssl2-md5");
-        EVP_add_digest_alias(SN_md5,"ssl3-md5");
-#endif
-#ifndef NO_SHA
-        EVP_add_digest(EVP_sha1()); /* RSA with sha1 */
-        EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
-#endif
-#if !defined(NO_SHA) && !defined(NO_DSA)
-        EVP_add_digest(EVP_dss1()); /* DSA with sha1 */
-#endif
-
-        /* If you want support for phased out ciphers, add the following */
-#if 0
-        EVP_add_digest(EVP_sha());
-        EVP_add_digest(EVP_dss());
-#endif
-        return(1);
-        }
-
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
deleted file mode 100644
index 0f6a0884e4..0000000000
--- a/src/lib/libssl/ssl_asn1.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* ssl/ssl_asn1.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 <openssl/asn1_mac.h>
-#include <openssl/objects.h>
-#include "ssl_locl.h"
-
-typedef struct ssl_session_asn1_st
-        {
-        ASN1_INTEGER version;
-        ASN1_INTEGER ssl_version;
-        ASN1_OCTET_STRING cipher;
-        ASN1_OCTET_STRING master_key;
-        ASN1_OCTET_STRING session_id;
-        ASN1_OCTET_STRING session_id_context;
-        ASN1_OCTET_STRING key_arg;
-        ASN1_INTEGER time;
-        ASN1_INTEGER timeout;
-        } SSL_SESSION_ASN1;
-
-int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
-        {
-#define LSIZE2 (sizeof(long)*2)
-        int v1=0,v2=0,v3=0,v4=0;
-        unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2];
-        unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2];
-        long l;
-        SSL_SESSION_ASN1 a;
-        M_ASN1_I2D_vars(in);
-
-        if ((in == NULL) || ((in->cipher == NULL) && (in->cipher_id == 0)))
-                return(0);
-
-        /* Note that I cheat in the following 2 assignments.  I know
-         * that if the ASN1_INTERGER passed to ASN1_INTEGER_set
-         * is > sizeof(long)+1, the buffer will not be re-Malloc()ed.
-         * This is a bit evil but makes things simple, no dynamic allocation
-         * to clean up :-) */
-        a.version.length=LSIZE2;
-        a.version.type=V_ASN1_INTEGER;
-        a.version.data=ibuf1;
-        ASN1_INTEGER_set(&(a.version),SSL_SESSION_ASN1_VERSION);
-
-        a.ssl_version.length=LSIZE2;
-        a.ssl_version.type=V_ASN1_INTEGER;
-        a.ssl_version.data=ibuf2;
-        ASN1_INTEGER_set(&(a.ssl_version),in->ssl_version);
-
-        a.cipher.type=V_ASN1_OCTET_STRING;
-        a.cipher.data=buf;
-
-        if (in->cipher == NULL)
-                l=in->cipher_id;
-        else
-                l=in->cipher->id;
-        if (in->ssl_version == SSL2_VERSION)
-                {
-                a.cipher.length=3;
-                buf[0]=((unsigned char)(l>>16L))&0xff;
-                buf[1]=((unsigned char)(l>> 8L))&0xff;
-                buf[2]=((unsigned char)(l     ))&0xff;
-                }
-        else
-                {
-                a.cipher.length=2;
-                buf[0]=((unsigned char)(l>>8L))&0xff;
-                buf[1]=((unsigned char)(l    ))&0xff;
-                }
-
-        a.master_key.length=in->master_key_length;
-        a.master_key.type=V_ASN1_OCTET_STRING;
-        a.master_key.data=in->master_key;
-
-        a.session_id.length=in->session_id_length;
-        a.session_id.type=V_ASN1_OCTET_STRING;
-        a.session_id.data=in->session_id;
-
-        a.session_id_context.length=in->sid_ctx_length;
-        a.session_id_context.type=V_ASN1_OCTET_STRING;
-        a.session_id_context.data=in->sid_ctx;
-
-        a.key_arg.length=in->key_arg_length;
-        a.key_arg.type=V_ASN1_OCTET_STRING;
-        a.key_arg.data=in->key_arg;
-
-        if (in->time != 0L)
-                {
-                a.time.length=LSIZE2;
-                a.time.type=V_ASN1_INTEGER;
-                a.time.data=ibuf3;
-                ASN1_INTEGER_set(&(a.time),in->time);
-                }
-
-        if (in->timeout != 0L)
-                {
-                a.timeout.length=LSIZE2;
-                a.timeout.type=V_ASN1_INTEGER;
-                a.timeout.data=ibuf4;
-                ASN1_INTEGER_set(&(a.timeout),in->timeout);
-                }
-
-        M_ASN1_I2D_len(&(a.version),            i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len(&(a.ssl_version),        i2d_ASN1_INTEGER);
-        M_ASN1_I2D_len(&(a.cipher),             i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len(&(a.session_id),         i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len(&(a.master_key),         i2d_ASN1_OCTET_STRING);
-        if (in->key_arg_length > 0)
-                M_ASN1_I2D_len_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING);
-        if (in->time != 0L)
-                M_ASN1_I2D_len_EXP_opt(&(a.time),i2d_ASN1_INTEGER,1,v1);
-        if (in->timeout != 0L)
-                M_ASN1_I2D_len_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
-        if (in->peer != NULL)
-                M_ASN1_I2D_len_EXP_opt(in->peer,i2d_X509,3,v3);
-        M_ASN1_I2D_len_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,v4);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(&(a.version),            i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put(&(a.ssl_version),        i2d_ASN1_INTEGER);
-        M_ASN1_I2D_put(&(a.cipher),             i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_put(&(a.session_id),         i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_put(&(a.master_key),         i2d_ASN1_OCTET_STRING);
-        if (in->key_arg_length > 0)
-                M_ASN1_I2D_put_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING,0);
-        if (in->time != 0L)
-                M_ASN1_I2D_put_EXP_opt(&(a.time),i2d_ASN1_INTEGER,1,v1);
-        if (in->timeout != 0L)
-                M_ASN1_I2D_put_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
-        if (in->peer != NULL)
-                M_ASN1_I2D_put_EXP_opt(in->peer,i2d_X509,3,v3);
-        M_ASN1_I2D_put_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,
-                               v4);
-
-        M_ASN1_I2D_finish();
-        }
-
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp,
-             long length)
-        {
-        int version,ssl_version=0,i;
-        long id;
-        ASN1_INTEGER ai,*aip;
-        ASN1_OCTET_STRING os,*osp;
-        M_ASN1_D2I_vars(a,SSL_SESSION *,SSL_SESSION_new);
-
-        aip= &ai;
-        osp= &os;
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-
-        ai.data=NULL; ai.length=0;
-        M_ASN1_D2I_get(aip,d2i_ASN1_INTEGER);
-        version=(int)ASN1_INTEGER_get(aip);
-        if (ai.data != NULL) { Free(ai.data); ai.data=NULL; ai.length=0; }
-
-        /* we don't care about the version right now :-) */
-        M_ASN1_D2I_get(aip,d2i_ASN1_INTEGER);
-        ssl_version=(int)ASN1_INTEGER_get(aip);
-        ret->ssl_version=ssl_version;
-        if (ai.data != NULL) { Free(ai.data); ai.data=NULL; ai.length=0; }
-
-        os.data=NULL; os.length=0;
-        M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
-        if (ssl_version == SSL2_VERSION)
-                {
-                if (os.length != 3)
-                        {
-                        c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH;
-                        goto err;
-                        }
-                id=0x02000000L|
-                        ((unsigned long)os.data[0]<<16L)|
-                        ((unsigned long)os.data[1]<< 8L)|
-                         (unsigned long)os.data[2];
-                }
-        else if ((ssl_version>>8) == 3)
-                {
-                if (os.length != 2)
-                        {
-                        c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH;
-                        goto err;
-                        }
-                id=0x03000000L|
-                        ((unsigned long)os.data[0]<<8L)|
-                         (unsigned long)os.data[1];
-                }
-        else
-                {
-                SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION);
-                return(NULL);
-                }
-        
-        ret->cipher=NULL;
-        ret->cipher_id=id;
-
-        M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
-        if ((ssl_version>>8) == SSL3_VERSION)
-                i=SSL3_MAX_SSL_SESSION_ID_LENGTH;
-        else /* if (ssl_version == SSL2_VERSION) */
-                i=SSL2_MAX_SSL_SESSION_ID_LENGTH;
-
-        if (os.length > i)
-                os.length=i;
-
-        ret->session_id_length=os.length;
-        memcpy(ret->session_id,os.data,os.length);
-
-        M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
-        if (ret->master_key_length > SSL_MAX_MASTER_KEY_LENGTH)
-                ret->master_key_length=SSL_MAX_MASTER_KEY_LENGTH;
-        else
-                ret->master_key_length=os.length;
-        memcpy(ret->master_key,os.data,ret->master_key_length);
-
-        os.length=0;
-        M_ASN1_D2I_get_IMP_opt(osp,d2i_ASN1_OCTET_STRING,0,V_ASN1_OCTET_STRING);
-        if (os.length > SSL_MAX_KEY_ARG_LENGTH)
-                ret->key_arg_length=SSL_MAX_KEY_ARG_LENGTH;
-        else
-                ret->key_arg_length=os.length;
-        memcpy(ret->key_arg,os.data,ret->key_arg_length);
-        if (os.data != NULL) Free(os.data);
-
-        ai.length=0;
-        M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,1);
-        if (ai.data != NULL)
-                {
-                ret->time=ASN1_INTEGER_get(aip);
-                Free(ai.data); ai.data=NULL; ai.length=0;
-                }
-        else
-                ret->time=time(NULL);
-
-        ai.length=0;
-        M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2);
-        if (ai.data != NULL)
-                {
-                ret->timeout=ASN1_INTEGER_get(aip);
-                Free(ai.data); ai.data=NULL; ai.length=0;
-                }
-        else
-                ret->timeout=3;
-
-        if (ret->peer != NULL)
-                {
-                X509_free(ret->peer);
-                ret->peer=NULL;
-                }
-        M_ASN1_D2I_get_EXP_opt(ret->peer,d2i_X509,3);
-
-        os.length=0;
-        os.data=NULL;
-        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,4);
-
-        if(os.data != NULL)
-            {
-            if (os.length > SSL_MAX_SID_CTX_LENGTH)
-                SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
-            ret->sid_ctx_length=os.length;
-            memcpy(ret->sid_ctx,os.data,os.length);
-            Free(os.data); os.data=NULL; os.length=0;
-            }
-        else
-            ret->sid_ctx_length=0;
-
-        M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
-        }
-
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
deleted file mode 100644
index 6d2511f76c..0000000000
--- a/src/lib/libssl/ssl_cert.c
+++ /dev/null
@@ -1,716 +0,0 @@
-/*! \file ssl/ssl_cert.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) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#if !defined(WIN32) && !defined(VSM) && !defined(NeXT)
-#include <dirent.h>
-#endif
-#ifdef NeXT
-#include <sys/dir.h>
-#define dirent direct
-#endif
-#include <openssl/objects.h>
-#include <openssl/bio.h>
-#include <openssl/pem.h>
-#include "ssl_locl.h"
-
-int SSL_get_ex_data_X509_STORE_CTX_idx(void)
-        {
-        static int ssl_x509_store_ctx_idx= -1;
-
-        if (ssl_x509_store_ctx_idx < 0)
-                {
-                ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index(
-                        0,"SSL for verify callback",NULL,NULL,NULL);
-                }
-        return(ssl_x509_store_ctx_idx);
-        }
-
-CERT *ssl_cert_new(void)
-        {
-        CERT *ret;
-
-        ret=(CERT *)Malloc(sizeof(CERT));
-        if (ret == NULL)
-                {
-                SSLerr(SSL_F_SSL_CERT_NEW,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        memset(ret,0,sizeof(CERT));
-
-        ret->key= &(ret->pkeys[SSL_PKEY_RSA_ENC]);
-        ret->references=1;
-
-        return(ret);
-        }
-
-CERT *ssl_cert_dup(CERT *cert)
-        {
-        CERT *ret;
-        int i;
-
-        ret = (CERT *)Malloc(sizeof(CERT));
-        if (ret == NULL)
-                {
-                SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-
-        memset(ret, 0, sizeof(CERT));
-
-        ret->key = &ret->pkeys[cert->key - &cert->pkeys[0]];
-        /* or ret->key = ret->pkeys + (cert->key - cert->pkeys),
-         * if you find that more readable */
-
-        ret->valid = cert->valid;
-        ret->mask = cert->mask;
-        ret->export_mask = cert->export_mask;
-
-#ifndef NO_RSA
-        if (cert->rsa_tmp != NULL)
-                {
-                ret->rsa_tmp = cert->rsa_tmp;
-                CRYPTO_add(&ret->rsa_tmp->references, 1, CRYPTO_LOCK_RSA);
-                }
-        ret->rsa_tmp_cb = cert->rsa_tmp_cb;
-#endif
-
-#ifndef NO_DH
-        if (cert->dh_tmp != NULL)
-                {
-                /* DH parameters don't have a reference count (and cannot
-                 * reasonably be shared anyway, as the secret exponent may
-                 * be created just when it is needed -- earlier library
-                 * versions did not pay attention to this) */
-                ret->dh_tmp = DHparams_dup(cert->dh_tmp);
-                if (ret->dh_tmp == NULL)
-                        {
-                        SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_DH_LIB);
-                        goto err;
-                        }
-                }
-        ret->dh_tmp_cb = cert->dh_tmp_cb;
-#endif
-
-        for (i = 0; i < SSL_PKEY_NUM; i++)
-                {
-                if (cert->pkeys[i].x509 != NULL)
-                        {
-                        ret->pkeys[i].x509 = cert->pkeys[i].x509;
-                        CRYPTO_add(&ret->pkeys[i].x509->references, 1,
-                                CRYPTO_LOCK_X509);
-                        }
-                
-                if (cert->pkeys[i].privatekey != NULL)
-                        {
-                        ret->pkeys[i].privatekey = cert->pkeys[i].privatekey;
-                        CRYPTO_add(&ret->pkeys[i].privatekey->references, 1,
-                                CRYPTO_LOCK_EVP_PKEY);
-
-                        switch(i) 
-                                {
-                                /* If there was anything special to do for
-                                 * certain types of keys, we'd do it here.
-                                 * (Nothing at the moment, I think.) */
-
-                        case SSL_PKEY_RSA_ENC:
-                        case SSL_PKEY_RSA_SIGN:
-                                /* We have an RSA key. */
-                                break;
-                                
-                        case SSL_PKEY_DSA_SIGN:
-                                /* We have a DSA key. */
-                                break;
-                                
-                        case SSL_PKEY_DH_RSA:
-                        case SSL_PKEY_DH_DSA:
-                                /* We have a DH key. */
-                                break;
-                                
-                        default:
-                                /* Can't happen. */
-                                SSLerr(SSL_F_SSL_CERT_DUP, SSL_R_LIBRARY_BUG);
-                                }
-                        }
-                }
-        
-        /* ret->extra_certs *should* exist, but currently the own certificate
-         * chain is held inside SSL_CTX */
-
-        ret->references=1;
-
-        return(ret);
-        
-err:
-#ifndef NO_RSA
-        if (ret->rsa_tmp != NULL)
-                RSA_free(ret->rsa_tmp);
-#endif
-#ifndef NO_DH
-        if (ret->dh_tmp != NULL)
-                DH_free(ret->dh_tmp);
-#endif
-
-        for (i = 0; i < SSL_PKEY_NUM; i++)
-                {
-                if (ret->pkeys[i].x509 != NULL)
-                        X509_free(ret->pkeys[i].x509);
-                if (ret->pkeys[i].privatekey != NULL)
-                        EVP_PKEY_free(ret->pkeys[i].privatekey);
-                }
-
-        return NULL;
-        }
-
-
-void ssl_cert_free(CERT *c)
-        {
-        int i;
-
-        if(c == NULL)
-            return;
-
-        i=CRYPTO_add(&c->references,-1,CRYPTO_LOCK_SSL_CERT);
-#ifdef REF_PRINT
-        REF_PRINT("CERT",c);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"ssl_cert_free, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-
-#ifndef NO_RSA
-        if (c->rsa_tmp) RSA_free(c->rsa_tmp);
-#endif
-#ifndef NO_DH
-        if (c->dh_tmp) DH_free(c->dh_tmp);
-#endif
-
-        for (i=0; i<SSL_PKEY_NUM; i++)
-                {
-                if (c->pkeys[i].x509 != NULL)
-                        X509_free(c->pkeys[i].x509);
-                if (c->pkeys[i].privatekey != NULL)
-                        EVP_PKEY_free(c->pkeys[i].privatekey);
-#if 0
-                if (c->pkeys[i].publickey != NULL)
-                        EVP_PKEY_free(c->pkeys[i].publickey);
-#endif
-                }
-        Free(c);
-        }
-
-int ssl_cert_inst(CERT **o)
-        {
-        /* Create a CERT if there isn't already one
-         * (which cannot really happen, as it is initially created in
-         * SSL_CTX_new; but the earlier code usually allows for that one
-         * being non-existant, so we follow that behaviour, as it might
-         * turn out that there actually is a reason for it -- but I'm
-         * not sure that *all* of the existing code could cope with
-         * s->cert being NULL, otherwise we could do without the
-         * initialization in SSL_CTX_new).
-         */
-        
-        if (o == NULL) 
-                {
-                SSLerr(SSL_F_SSL_CERT_INST, ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (*o == NULL)
-                {
-                if ((*o = ssl_cert_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL_CERT_INST, ERR_R_MALLOC_FAILURE);
-                        return(0);
-                        }
-                }
-        return(1);
-        }
-
-
-SESS_CERT *ssl_sess_cert_new(void)
-        {
-        SESS_CERT *ret;
-
-        ret = Malloc(sizeof *ret);
-        if (ret == NULL)
-                {
-                SSLerr(SSL_F_SSL_SESS_CERT_NEW, ERR_R_MALLOC_FAILURE);
-                return NULL;
-                }
-
-        memset(ret, 0 ,sizeof *ret);
-        ret->peer_key = &(ret->peer_pkeys[SSL_PKEY_RSA_ENC]);
-        ret->references = 1;
-
-        return ret;
-        }
-
-void ssl_sess_cert_free(SESS_CERT *sc)
-        {
-        int i;
-
-        if (sc == NULL)
-                return;
-
-        i = CRYPTO_add(&sc->references, -1, CRYPTO_LOCK_SSL_SESS_CERT);
-#ifdef REF_PRINT
-        REF_PRINT("SESS_CERT", sc);
-#endif
-        if (i > 0)
-                return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"ssl_sess_cert_free, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-
-        /* i == 0 */
-        if (sc->cert_chain != NULL)
-                sk_X509_pop_free(sc->cert_chain, X509_free);
-        for (i = 0; i < SSL_PKEY_NUM; i++)
-                {
-                if (sc->peer_pkeys[i].x509 != NULL)
-                        X509_free(sc->peer_pkeys[i].x509);
-#if 0 /* We don't have the peer's private key.  These lines are just
-           * here as a reminder that we're still using a not-quite-appropriate
-           * data structure. */
-                if (sc->peer_pkeys[i].privatekey != NULL)
-                        EVP_PKEY_free(sc->peer_pkeys[i].privatekey);
-#endif
-                }
-
-#ifndef NO_RSA
-        if (sc->peer_rsa_tmp != NULL)
-                RSA_free(sc->peer_rsa_tmp);
-#endif
-#ifndef NO_DH
-        if (sc->peer_dh_tmp != NULL)
-                DH_free(sc->peer_dh_tmp);
-#endif
-
-        Free(sc);
-        }
-
-int ssl_set_peer_cert_type(SESS_CERT *sc,int type)
-        {
-        sc->peer_cert_type = type;
-        return(1);
-        }
-
-int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk)
-        {
-        X509 *x;
-        int i;
-        X509_STORE_CTX ctx;
-
-        if ((sk == NULL) || (sk_X509_num(sk) == 0))
-                return(0);
-
-        x=sk_X509_value(sk,0);
-        X509_STORE_CTX_init(&ctx,s->ctx->cert_store,x,sk);
-        if (SSL_get_verify_depth(s) >= 0)
-                X509_STORE_CTX_set_depth(&ctx, SSL_get_verify_depth(s));
-        X509_STORE_CTX_set_ex_data(&ctx,SSL_get_ex_data_X509_STORE_CTX_idx(),
-                (char *)s);
-
-        if (s->ctx->app_verify_callback != NULL)
-                i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */
-        else
-                {
-#ifndef NO_X509_VERIFY
-                i=X509_verify_cert(&ctx);
-#else
-                i=0;
-                ctx.error=X509_V_ERR_APPLICATION_VERIFICATION;
-                SSLerr(SSL_F_SSL_VERIFY_CERT_CHAIN,SSL_R_NO_VERIFY_CALLBACK);
-#endif
-                }
-
-        s->verify_result=ctx.error;
-        X509_STORE_CTX_cleanup(&ctx);
-
-        return(i);
-        }
-
-static void set_client_CA_list(STACK_OF(X509_NAME) **ca_list,STACK_OF(X509_NAME) *list)
-        {
-        if (*ca_list != NULL)
-                sk_X509_NAME_pop_free(*ca_list,X509_NAME_free);
-
-        *ca_list=list;
-        }
-
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk)
-        {
-        int i;
-        STACK_OF(X509_NAME) *ret;
-        X509_NAME *name;
-
-        ret=sk_X509_NAME_new_null();
-        for (i=0; i<sk_X509_NAME_num(sk); i++)
-                {
-                name=X509_NAME_dup(sk_X509_NAME_value(sk,i));
-                if ((name == NULL) || !sk_X509_NAME_push(ret,name))
-                        {
-                        sk_X509_NAME_pop_free(ret,X509_NAME_free);
-                        return(NULL);
-                        }
-                }
-        return(ret);
-        }
-
-void SSL_set_client_CA_list(SSL *s,STACK_OF(X509_NAME) *list)
-        {
-        set_client_CA_list(&(s->client_CA),list);
-        }
-
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx,STACK_OF(X509_NAME) *list)
-        {
-        set_client_CA_list(&(ctx->client_CA),list);
-        }
-
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(SSL_CTX *ctx)
-        {
-        return(ctx->client_CA);
-        }
-
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(SSL *s)
-        {
-        if (s->type == SSL_ST_CONNECT)
-                { /* we are in the client */
-                if (((s->version>>8) == SSL3_VERSION_MAJOR) &&
-                        (s->s3 != NULL))
-                        return(s->s3->tmp.ca_names);
-                else
-                        return(NULL);
-                }
-        else
-                {
-                if (s->client_CA != NULL)
-                        return(s->client_CA);
-                else
-                        return(s->ctx->client_CA);
-                }
-        }
-
-static int add_client_CA(STACK_OF(X509_NAME) **sk,X509 *x)
-        {
-        X509_NAME *name;
-
-        if (x == NULL) return(0);
-        if ((*sk == NULL) && ((*sk=sk_X509_NAME_new_null()) == NULL))
-                return(0);
-                
-        if ((name=X509_NAME_dup(X509_get_subject_name(x))) == NULL)
-                return(0);
-
-        if (!sk_X509_NAME_push(*sk,name))
-                {
-                X509_NAME_free(name);
-                return(0);
-                }
-        return(1);
-        }
-
-int SSL_add_client_CA(SSL *ssl,X509 *x)
-        {
-        return(add_client_CA(&(ssl->client_CA),x));
-        }
-
-int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x)
-        {
-        return(add_client_CA(&(ctx->client_CA),x));
-        }
-
-static int name_cmp(X509_NAME **a,X509_NAME **b)
-        {
-        return(X509_NAME_cmp(*a,*b));
-        }
-
-#ifndef NO_STDIO
-/*!
- * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
- * it doesn't really have anything to do with clients (except that a common use
- * for a stack of CAs is to send it to the client). Actually, it doesn't have
- * much to do with CAs, either, since it will load any old cert.
- * \param file the file containing one or more certs.
- * \return a ::STACK containing the certs.
- */
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
-        {
-        BIO *in;
-        X509 *x=NULL;
-        X509_NAME *xn=NULL;
-        STACK_OF(X509_NAME) *ret,*sk;
-
-        ret=sk_X509_NAME_new(NULL);
-        sk=sk_X509_NAME_new(name_cmp);
-
-        in=BIO_new(BIO_s_file_internal());
-
-        if ((ret == NULL) || (sk == NULL) || (in == NULL))
-                {
-                SSLerr(SSL_F_SSL_LOAD_CLIENT_CA_FILE,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        
-        if (!BIO_read_filename(in,file))
-                goto err;
-
-        for (;;)
-                {
-                if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
-                        break;
-                if ((xn=X509_get_subject_name(x)) == NULL) goto err;
-                /* check for duplicates */
-                xn=X509_NAME_dup(xn);
-                if (xn == NULL) goto err;
-                if (sk_X509_NAME_find(sk,xn) >= 0)
-                        X509_NAME_free(xn);
-                else
-                        {
-                        sk_X509_NAME_push(sk,xn);
-                        sk_X509_NAME_push(ret,xn);
-                        }
-                }
-
-        if (0)
-                {
-err:
-                if (ret != NULL) sk_X509_NAME_pop_free(ret,X509_NAME_free);
-                ret=NULL;
-                }
-        if (sk != NULL) sk_X509_NAME_free(sk);
-        if (in != NULL) BIO_free(in);
-        if (x != NULL) X509_free(x);
-        return(ret);
-        }
-#endif
-
-/*!
- * Add a file of certs to a stack.
- * \param stack the stack to add to.
- * \param file the file to add from. All certs in this file that are not
- * already in the stack will be added.
- * \return 1 for success, 0 for failure. Note that in the case of failure some
- * certs may have been added to \c stack.
- */
-
-int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                        const char *file)
-    {
-    BIO *in;
-    X509 *x=NULL;
-    X509_NAME *xn=NULL;
-    int ret=1;
-    int (*oldcmp)(X509_NAME **a, X509_NAME **b);
-
-    oldcmp=sk_X509_NAME_set_cmp_func(stack,name_cmp);
-
-    in=BIO_new(BIO_s_file_internal());
-
-    if (in == NULL)
-        {
-        SSLerr(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK,ERR_R_MALLOC_FAILURE);
-        goto err;
-        }
-        
-    if (!BIO_read_filename(in,file))
-        goto err;
-
-    for (;;)
-        {
-        if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
-            break;
-        if ((xn=X509_get_subject_name(x)) == NULL) goto err;
-        xn=X509_NAME_dup(xn);
-        if (xn == NULL) goto err;
-        if (sk_X509_NAME_find(stack,xn) >= 0)
-            X509_NAME_free(xn);
-        else
-            sk_X509_NAME_push(stack,xn);
-        }
-
-    if (0)
-        {
-err:
-        ret=0;
-        }
-    if(in != NULL)
-        BIO_free(in);
-    if(x != NULL)
-        X509_free(x);
-
-    sk_X509_NAME_set_cmp_func(stack,oldcmp);
-
-    return ret;
-    }
-
-/*!
- * Add a directory of certs to a stack.
- * \param stack the stack to append to.
- * \param dir the directory to append from. All files in this directory will be
- * examined as potential certs. Any that are acceptable to
- * SSL_add_dir_cert_subjects_to_stack() that are not already in the stack will be
- * included.
- * \return 1 for success, 0 for failure. Note that in the case of failure some
- * certs may have been added to \c stack.
- */
-
-#ifndef WIN32
-#ifndef VMS                     /* XXXX This may be fixed in the future */
-
-int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                       const char *dir)
-    {
-    DIR *d;
-    struct dirent *dstruct;
-    int ret = 0;
-
-    CRYPTO_w_lock(CRYPTO_LOCK_READDIR);
-    d = opendir(dir);
-
-    /* Note that a side effect is that the CAs will be sorted by name */
-    if(!d)
-        {
-        SYSerr(SYS_F_OPENDIR, get_last_sys_error());
-        ERR_add_error_data(3, "opendir('", dir, "')");
-        SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
-        goto err;
-        }
-
-    while((dstruct=readdir(d)))
-        {
-        char buf[1024];
-
-        if(strlen(dir)+strlen(dstruct->d_name)+2 > sizeof buf)
-            {
-            SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK,SSL_R_PATH_TOO_LONG);
-            goto err;
-            }
-        
-        sprintf(buf,"%s/%s",dir,dstruct->d_name);
-        if(!SSL_add_file_cert_subjects_to_stack(stack,buf))
-            goto err;
-        }
-    ret = 1;
-
-err:    
-    CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
-    return ret;
-    }
-
-#endif
-#endif
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
deleted file mode 100644
index 4c2989c47a..0000000000
--- a/src/lib/libssl/ssl_ciph.c
+++ /dev/null
@@ -1,835 +0,0 @@
-/* ssl/ssl_ciph.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/objects.h>
-#include <openssl/comp.h>
-#include "ssl_locl.h"
-
-#define SSL_ENC_DES_IDX         0
-#define SSL_ENC_3DES_IDX        1
-#define SSL_ENC_RC4_IDX         2
-#define SSL_ENC_RC2_IDX         3
-#define SSL_ENC_IDEA_IDX        4
-#define SSL_ENC_eFZA_IDX        5
-#define SSL_ENC_NULL_IDX        6
-#define SSL_ENC_NUM_IDX         7
-
-static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={
-        NULL,NULL,NULL,NULL,NULL,NULL,
-        };
-
-static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL;
-
-#define SSL_MD_MD5_IDX  0
-#define SSL_MD_SHA1_IDX 1
-#define SSL_MD_NUM_IDX  2
-static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX]={
-        NULL,NULL,
-        };
-
-typedef struct cipher_sort_st
-        {
-        SSL_CIPHER *cipher;
-        int pref;
-        } CIPHER_SORT;
-
-#define CIPHER_ADD      1
-#define CIPHER_KILL     2
-#define CIPHER_DEL      3
-#define CIPHER_ORD      4
-
-typedef struct cipher_choice_st
-        {
-        int type;
-        unsigned long algorithms;
-        unsigned long mask;
-        long top;
-        } CIPHER_CHOICE;
-
-typedef struct cipher_order_st
-        {
-        SSL_CIPHER *cipher;
-        int active;
-        int dead;
-        struct cipher_order_st *next,*prev;
-        } CIPHER_ORDER;
-
-static SSL_CIPHER cipher_aliases[]={
-        /* Don't include eNULL unless specifically enabled */
-        {0,SSL_TXT_ALL, 0,SSL_ALL & ~SSL_eNULL, 0,SSL_ALL}, /* must be first */
-        {0,SSL_TXT_kRSA,0,SSL_kRSA,  0,SSL_MKEY_MASK},
-        {0,SSL_TXT_kDHr,0,SSL_kDHr,  0,SSL_MKEY_MASK},
-        {0,SSL_TXT_kDHd,0,SSL_kDHd,  0,SSL_MKEY_MASK},
-        {0,SSL_TXT_kEDH,0,SSL_kEDH,  0,SSL_MKEY_MASK},
-        {0,SSL_TXT_kFZA,0,SSL_kFZA,  0,SSL_MKEY_MASK},
-        {0,SSL_TXT_DH,  0,SSL_DH,    0,SSL_MKEY_MASK},
-        {0,SSL_TXT_EDH, 0,SSL_EDH,   0,SSL_MKEY_MASK|SSL_AUTH_MASK},
-
-        {0,SSL_TXT_aRSA,0,SSL_aRSA,  0,SSL_AUTH_MASK},
-        {0,SSL_TXT_aDSS,0,SSL_aDSS,  0,SSL_AUTH_MASK},
-        {0,SSL_TXT_aFZA,0,SSL_aFZA,  0,SSL_AUTH_MASK},
-        {0,SSL_TXT_aNULL,0,SSL_aNULL,0,SSL_AUTH_MASK},
-        {0,SSL_TXT_aDH, 0,SSL_aDH,   0,SSL_AUTH_MASK},
-        {0,SSL_TXT_DSS, 0,SSL_DSS,   0,SSL_AUTH_MASK},
-
-        {0,SSL_TXT_DES, 0,SSL_DES,   0,SSL_ENC_MASK},
-        {0,SSL_TXT_3DES,0,SSL_3DES,  0,SSL_ENC_MASK},
-        {0,SSL_TXT_RC4, 0,SSL_RC4,   0,SSL_ENC_MASK},
-        {0,SSL_TXT_RC2, 0,SSL_RC2,   0,SSL_ENC_MASK},
-        {0,SSL_TXT_IDEA,0,SSL_IDEA,  0,SSL_ENC_MASK},
-        {0,SSL_TXT_eNULL,0,SSL_eNULL,0,SSL_ENC_MASK},
-        {0,SSL_TXT_eFZA,0,SSL_eFZA,  0,SSL_ENC_MASK},
-
-        {0,SSL_TXT_MD5, 0,SSL_MD5,   0,SSL_MAC_MASK},
-        {0,SSL_TXT_SHA1,0,SSL_SHA1,  0,SSL_MAC_MASK},
-        {0,SSL_TXT_SHA, 0,SSL_SHA,   0,SSL_MAC_MASK},
-
-        {0,SSL_TXT_NULL,0,SSL_NULL,  0,SSL_ENC_MASK},
-        {0,SSL_TXT_RSA, 0,SSL_RSA,   0,SSL_AUTH_MASK|SSL_MKEY_MASK},
-        {0,SSL_TXT_ADH, 0,SSL_ADH,   0,SSL_AUTH_MASK|SSL_MKEY_MASK},
-        {0,SSL_TXT_FZA, 0,SSL_FZA,   0,SSL_AUTH_MASK|SSL_MKEY_MASK|SSL_ENC_MASK},
-
-        {0,SSL_TXT_EXP40, 0,SSL_EXP40, 0,SSL_EXP_MASK},
-        {0,SSL_TXT_EXPORT,0,SSL_EXP40, 0,SSL_EXP_MASK},
-        {0,SSL_TXT_EXP56, 0,SSL_EXP56, 0,SSL_EXP_MASK},
-        {0,SSL_TXT_SSLV2, 0,SSL_SSLV2, 0,SSL_SSL_MASK},
-        {0,SSL_TXT_SSLV3, 0,SSL_SSLV3, 0,SSL_SSL_MASK},
-        {0,SSL_TXT_TLSV1, 0,SSL_TLSV1, 0,SSL_SSL_MASK},
-        {0,SSL_TXT_LOW,   0,SSL_LOW,   0,SSL_STRONG_MASK},
-        {0,SSL_TXT_MEDIUM,0,SSL_MEDIUM,0,SSL_STRONG_MASK},
-        {0,SSL_TXT_HIGH,  0,SSL_HIGH,  0,SSL_STRONG_MASK},
-        };
-
-static int init_ciphers=1;
-static void load_ciphers();
-
-static int cmp_by_name(SSL_CIPHER **a, SSL_CIPHER **b)
-        {
-        return(strcmp((*a)->name,(*b)->name));
-        }
-
-static void load_ciphers(void)
-        {
-        init_ciphers=0;
-        ssl_cipher_methods[SSL_ENC_DES_IDX]= 
-                EVP_get_cipherbyname(SN_des_cbc);
-        ssl_cipher_methods[SSL_ENC_3DES_IDX]=
-                EVP_get_cipherbyname(SN_des_ede3_cbc);
-        ssl_cipher_methods[SSL_ENC_RC4_IDX]=
-                EVP_get_cipherbyname(SN_rc4);
-        ssl_cipher_methods[SSL_ENC_RC2_IDX]= 
-                EVP_get_cipherbyname(SN_rc2_cbc);
-        ssl_cipher_methods[SSL_ENC_IDEA_IDX]= 
-                EVP_get_cipherbyname(SN_idea_cbc);
-
-        ssl_digest_methods[SSL_MD_MD5_IDX]=
-                EVP_get_digestbyname(SN_md5);
-        ssl_digest_methods[SSL_MD_SHA1_IDX]=
-                EVP_get_digestbyname(SN_sha1);
-        }
-
-int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc,
-             const EVP_MD **md, SSL_COMP **comp)
-        {
-        int i;
-        SSL_CIPHER *c;
-
-        c=s->cipher;
-        if (c == NULL) return(0);
-        if (comp != NULL)
-                {
-                SSL_COMP ctmp;
-
-                if (s->compress_meth == 0)
-                        *comp=NULL;
-                else if (ssl_comp_methods == NULL)
-                        {
-                        /* bad */
-                        *comp=NULL;
-                        }
-                else
-                        {
-
-                        ctmp.id=s->compress_meth;
-                        i=sk_SSL_COMP_find(ssl_comp_methods,&ctmp);
-                        if (i >= 0)
-                                *comp=sk_SSL_COMP_value(ssl_comp_methods,i);
-                        else
-                                *comp=NULL;
-                        }
-                }
-
-        if ((enc == NULL) || (md == NULL)) return(0);
-
-        switch (c->algorithms & SSL_ENC_MASK)
-                {
-        case SSL_DES:
-                i=SSL_ENC_DES_IDX;
-                break;
-        case SSL_3DES:
-                i=SSL_ENC_3DES_IDX;
-                break;
-        case SSL_RC4:
-                i=SSL_ENC_RC4_IDX;
-                break;
-        case SSL_RC2:
-                i=SSL_ENC_RC2_IDX;
-                break;
-        case SSL_IDEA:
-                i=SSL_ENC_IDEA_IDX;
-                break;
-        case SSL_eNULL:
-                i=SSL_ENC_NULL_IDX;
-                break;
-        default:
-                i= -1;
-                break;
-                }
-
-        if ((i < 0) || (i > SSL_ENC_NUM_IDX))
-                *enc=NULL;
-        else
-                {
-                if (i == SSL_ENC_NULL_IDX)
-                        *enc=EVP_enc_null();
-                else
-                        *enc=ssl_cipher_methods[i];
-                }
-
-        switch (c->algorithms & SSL_MAC_MASK)
-                {
-        case SSL_MD5:
-                i=SSL_MD_MD5_IDX;
-                break;
-        case SSL_SHA1:
-                i=SSL_MD_SHA1_IDX;
-                break;
-        default:
-                i= -1;
-                break;
-                }
-        if ((i < 0) || (i > SSL_MD_NUM_IDX))
-                *md=NULL;
-        else
-                *md=ssl_digest_methods[i];
-
-        if ((*enc != NULL) && (*md != NULL))
-                return(1);
-        else
-                return(0);
-        }
-
-#define ITEM_SEP(a) \
-        (((a) == ':') || ((a) == ' ') || ((a) == ';') || ((a) == ','))
-
-static void ll_append_tail(CIPHER_ORDER **head, CIPHER_ORDER *curr,
-             CIPHER_ORDER **tail)
-        {
-        if (curr == *tail) return;
-        if (curr == *head)
-                *head=curr->next;
-        if (curr->prev != NULL)
-                curr->prev->next=curr->next;
-        if (curr->next != NULL) /* should always be true */
-                curr->next->prev=curr->prev;
-        (*tail)->next=curr;
-        curr->prev= *tail;
-        curr->next=NULL;
-        *tail=curr;
-        }
-
-STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_METHOD *ssl_method,
-                STACK_OF(SSL_CIPHER) **cipher_list,
-                STACK_OF(SSL_CIPHER) **cipher_list_by_id,
-                char *str)
-        {
-        SSL_CIPHER *c;
-        char *l;
-        STACK_OF(SSL_CIPHER) *ret=NULL,*ok=NULL;
-#define CL_BUF  40
-        char buf[CL_BUF];
-        char *tmp_str=NULL;
-        unsigned long mask,algorithms,ma;
-        char *start;
-        int i,j,k,num=0,ch,multi;
-        unsigned long al;
-        STACK *ca_list=NULL;
-        int current_x,num_x;
-        CIPHER_CHOICE *ops=NULL;
-        CIPHER_ORDER *list=NULL,*head=NULL,*tail=NULL,*curr,*tail2,*curr2;
-        int list_num;
-        int type;
-        SSL_CIPHER c_tmp,*cp;
-
-        if (str == NULL) return(NULL);
-
-        if (strncmp(str,"DEFAULT",7) == 0)
-                {
-                i=strlen(str)+2+strlen(SSL_DEFAULT_CIPHER_LIST);
-                if ((tmp_str=Malloc(i)) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                        }
-                strcpy(tmp_str,SSL_DEFAULT_CIPHER_LIST);
-                strcat(tmp_str,":");
-                strcat(tmp_str,&(str[7]));
-                str=tmp_str;
-                }
-        if (init_ciphers) load_ciphers();
-
-        num=ssl_method->num_ciphers();
-
-        if ((ret=sk_SSL_CIPHER_new(NULL)) == NULL) goto err;
-        if ((ca_list=(STACK *)sk_new(cmp_by_name)) == NULL) goto err;
-
-        mask =SSL_kFZA;
-#ifdef NO_RSA
-        mask|=SSL_aRSA|SSL_kRSA;
-#endif
-#ifdef NO_DSA
-        mask|=SSL_aDSS;
-#endif
-#ifdef NO_DH
-        mask|=SSL_kDHr|SSL_kDHd|SSL_kEDH|SSL_aDH;
-#endif
-
-#ifdef SSL_FORBID_ENULL
-        mask|=SSL_eNULL;
-#endif
-
-        mask|=(ssl_cipher_methods[SSL_ENC_DES_IDX ] == NULL)?SSL_DES :0;
-        mask|=(ssl_cipher_methods[SSL_ENC_3DES_IDX] == NULL)?SSL_3DES:0;
-        mask|=(ssl_cipher_methods[SSL_ENC_RC4_IDX ] == NULL)?SSL_RC4 :0;
-        mask|=(ssl_cipher_methods[SSL_ENC_RC2_IDX ] == NULL)?SSL_RC2 :0;
-        mask|=(ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL)?SSL_IDEA:0;
-        mask|=(ssl_cipher_methods[SSL_ENC_eFZA_IDX] == NULL)?SSL_eFZA:0;
-
-        mask|=(ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL)?SSL_MD5 :0;
-        mask|=(ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL)?SSL_SHA1:0;
-
-        if ((list=(CIPHER_ORDER *)Malloc(sizeof(CIPHER_ORDER)*num)) == NULL)
-                goto err;
-
-        /* Get the initial list of ciphers */
-        list_num=0;
-        for (i=0; i<num; i++)
-                {
-                c=ssl_method->get_cipher((unsigned int)i);
-                /* drop those that use any of that is not available */
-                if ((c != NULL) && c->valid && !(c->algorithms & mask))
-                        {
-                        list[list_num].cipher=c;
-                        list[list_num].next=NULL;
-                        list[list_num].prev=NULL;
-                        list[list_num].active=0;
-                        list_num++;
-                        if (!sk_push(ca_list,(char *)c)) goto err;
-                        }
-                }
-        
-        for (i=1; i<list_num-1; i++)
-                {
-                list[i].prev= &(list[i-1]);
-                list[i].next= &(list[i+1]);
-                }
-        if (list_num > 0)
-                {
-                head= &(list[0]);
-                head->prev=NULL;
-                head->next= &(list[1]);
-                tail= &(list[list_num-1]);
-                tail->prev= &(list[list_num-2]);
-                tail->next=NULL;
-                }
-
-        /* special case */
-        cipher_aliases[0].algorithms &= ~mask;
-
-        /* get the aliases */
-        k=sizeof(cipher_aliases)/sizeof(SSL_CIPHER);
-        for (j=0; j<k; j++)
-                {
-                al=cipher_aliases[j].algorithms;
-                /* Drop those that are not relevent */
-                if ((al & mask) == al) continue;
-                if (!sk_push(ca_list,(char *)&(cipher_aliases[j]))) goto err;
-                }
-
-        /* ca_list now holds a 'stack' of SSL_CIPHERS, some real, some
-         * 'aliases' */
-
-        /* how many parameters are there? */
-        num=1;
-        for (l=str; *l; l++)
-                if (ITEM_SEP(*l))
-                        num++;
-        ops=(CIPHER_CHOICE *)Malloc(sizeof(CIPHER_CHOICE)*num);
-        if (ops == NULL) goto err;
-        memset(ops,0,sizeof(CIPHER_CHOICE)*num);
-
-        /* we now parse the input string and create our operations */
-        l=str;
-        i=0;
-        current_x=0;
-
-        for (;;)
-                {
-                ch= *l;
-
-                if (ch == '\0') break;
-
-                if (ch == '-')
-                        { j=CIPHER_DEL; l++; }
-                else if (ch == '+')
-                        { j=CIPHER_ORD; l++; }
-                else if (ch == '!')
-                        { j=CIPHER_KILL; l++; }
-                else    
-                        { j=CIPHER_ADD; }
-
-                if (ITEM_SEP(ch))
-                        {
-                        l++;
-                        continue;
-                        }
-                ops[current_x].type=j;
-                ops[current_x].algorithms=0;
-                ops[current_x].mask=0;
-
-                start=l;
-                for (;;)
-                        {
-                        ch= *l;
-                        i=0;
-#ifndef CHARSET_EBCDIC
-                        while ( ((ch >= 'A') && (ch <= 'Z')) ||
-                                ((ch >= '0') && (ch <= '9')) ||
-                                ((ch >= 'a') && (ch <= 'z')) ||
-                                 (ch == '-'))
-#else
-                        while ( isalnum(ch) || (ch == '-'))
-#endif
-                                 {
-                                 buf[i]=ch;
-                                 ch= *(++l);
-                                 i++;
-                                 if (i >= (CL_BUF-2)) break;
-                                 }
-                        buf[i]='\0';
-
-                        /* check for multi-part specification */
-                        if (ch == '+')
-                                {
-                                multi=1;
-                                l++;
-                                }
-                        else
-                                multi=0;
-
-                        c_tmp.name=buf;
-                        j=sk_find(ca_list,(char *)&c_tmp);
-                        if (j < 0)
-                                goto end_loop;
-
-                        cp=(SSL_CIPHER *)sk_value(ca_list,j);
-                        ops[current_x].algorithms|=cp->algorithms;
-                        /* We add the SSL_SSL_MASK so we can match the
-                         * SSLv2 and SSLv3 versions of RC4-MD5 */
-                        ops[current_x].mask|=cp->mask;
-                        if (!multi) break;
-                        }
-                current_x++;
-                if (ch == '\0') break;
-end_loop:
-                /* Make sure we scan until the next valid start point */
-                while ((*l != '\0') && ITEM_SEP(*l))
-                        l++;
-                }
-
-        num_x=current_x;
-        current_x=0;
-
-        /* We will now process the list of ciphers, once for each category, to
-         * decide what we should do with it. */
-        for (j=0; j<num_x; j++)
-                {
-                algorithms=ops[j].algorithms;
-                type=ops[j].type;
-                mask=ops[j].mask;
-
-                curr=head;
-                curr2=head;
-                tail2=tail;
-                for (;;)
-                        {
-                        if ((curr == NULL) || (curr == tail2)) break;
-                        curr=curr2;
-                        curr2=curr->next;
-
-                        cp=curr->cipher;
-                        ma=mask & cp->algorithms;
-                        if ((ma == 0) || ((ma & algorithms) != ma))
-                                {
-                                /* does not apply */
-                                continue;
-                                }
-
-                        /* add the cipher if it has not been added yet. */
-                        if (type == CIPHER_ADD)
-                                {
-                                if (!curr->active)
-                                        {
-                                        ll_append_tail(&head,curr,&tail);
-                                        curr->active=1;
-                                        }
-                                }
-                        /* Move the added cipher to this location */
-                        else if (type == CIPHER_ORD)
-                                {
-                                if (curr->active)
-                                        {
-                                        ll_append_tail(&head,curr,&tail);
-                                        }
-                                }
-                        else if (type == CIPHER_DEL)
-                                curr->active=0;
-                        if (type == CIPHER_KILL)
-                                {
-                                if (head == curr)
-                                        head=curr->next;
-                                else
-                                        curr->prev->next=curr->next;
-                                if (tail == curr)
-                                        tail=curr->prev;
-                                curr->active=0;
-                                if (curr->next != NULL)
-                                        curr->next->prev=curr->prev;
-                                if (curr->prev != NULL)
-                                        curr->prev->next=curr->next;
-                                curr->next=NULL;
-                                curr->prev=NULL;
-                                }
-                        }
-                }
-
-        for (curr=head; curr != NULL; curr=curr->next)
-                {
-                if (curr->active)
-                        {
-                        sk_SSL_CIPHER_push(ret,curr->cipher);
-#ifdef CIPHER_DEBUG
-                        printf("<%s>\n",curr->cipher->name);
-#endif
-                        }
-                }
-
-        if (cipher_list != NULL)
-                {
-                if (*cipher_list != NULL)
-                        sk_SSL_CIPHER_free(*cipher_list);
-                *cipher_list=ret;
-                }
-
-        if (cipher_list_by_id != NULL)
-                {
-                if (*cipher_list_by_id != NULL)
-                        sk_SSL_CIPHER_free(*cipher_list_by_id);
-                *cipher_list_by_id=sk_SSL_CIPHER_dup(ret);
-                }
-
-        if (    (cipher_list_by_id == NULL) ||
-                (*cipher_list_by_id == NULL) ||
-                (cipher_list == NULL) ||
-                (*cipher_list == NULL))
-                goto err;
-        sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp);
-
-        ok=ret;
-        ret=NULL;
-err:
-        if (tmp_str) Free(tmp_str);
-        if (ops != NULL) Free(ops);
-        if (ret != NULL) sk_SSL_CIPHER_free(ret);
-        if (ca_list != NULL) sk_free(ca_list);
-        if (list != NULL) Free(list);
-        return(ok);
-        }
-
-char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
-        {
-        int is_export,pkl,kl;
-        char *ver,*exp;
-        char *kx,*au,*enc,*mac;
-        unsigned long alg,alg2;
-        static char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s\n";
-        
-        alg=cipher->algorithms;
-        alg2=cipher->algorithm2;
-
-        is_export=SSL_IS_EXPORT(alg);
-        pkl=SSL_EXPORT_PKEYLENGTH(alg);
-        kl=SSL_EXPORT_KEYLENGTH(alg);
-        exp=is_export?" export":"";
-
-        if (alg & SSL_SSLV2)
-                ver="SSLv2";
-        else if (alg & SSL_SSLV3)
-                ver="SSLv3";
-        else
-                ver="unknown";
-
-        switch (alg&SSL_MKEY_MASK)
-                {
-        case SSL_kRSA:
-                kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA";
-                break;
-        case SSL_kDHr:
-                kx="DH/RSA";
-                break;
-        case SSL_kDHd:
-                kx="DH/DSS";
-                break;
-        case SSL_kFZA:
-                kx="Fortezza";
-                break;
-        case SSL_kEDH:
-                kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH";
-                break;
-        default:
-                kx="unknown";
-                }
-
-        switch (alg&SSL_AUTH_MASK)
-                {
-        case SSL_aRSA:
-                au="RSA";
-                break;
-        case SSL_aDSS:
-                au="DSS";
-                break;
-        case SSL_aDH:
-                au="DH";
-                break;
-        case SSL_aFZA:
-        case SSL_aNULL:
-                au="None";
-                break;
-        default:
-                au="unknown";
-                break;
-                }
-
-        switch (alg&SSL_ENC_MASK)
-                {
-        case SSL_DES:
-                enc=(is_export && kl == 5)?"DES(40)":"DES(56)";
-                break;
-        case SSL_3DES:
-                enc="3DES(168)";
-                break;
-        case SSL_RC4:
-                enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)")
-                  :((alg2&SSL2_CF_8_BYTE_ENC)?"RC4(64)":"RC4(128)");
-                break;
-        case SSL_RC2:
-                enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)";
-                break;
-        case SSL_IDEA:
-                enc="IDEA(128)";
-                break;
-        case SSL_eFZA:
-                enc="Fortezza";
-                break;
-        case SSL_eNULL:
-                enc="None";
-                break;
-        default:
-                enc="unknown";
-                break;
-                }
-
-        switch (alg&SSL_MAC_MASK)
-                {
-        case SSL_MD5:
-                mac="MD5";
-                break;
-        case SSL_SHA1:
-                mac="SHA1";
-                break;
-        default:
-                mac="unknown";
-                break;
-                }
-
-        if (buf == NULL)
-                {
-                buf=Malloc(128);
-                if (buf == NULL) return("Malloc Error");
-                }
-        else if (len < 128)
-                return("Buffer too small");
-
-        sprintf(buf,format,cipher->name,ver,kx,au,enc,mac,exp);
-        return(buf);
-        }
-
-char *SSL_CIPHER_get_version(SSL_CIPHER *c)
-        {
-        int i;
-
-        if (c == NULL) return("(NONE)");
-        i=(int)(c->id>>24L);
-        if (i == 3)
-                return("TLSv1/SSLv3");
-        else if (i == 2)
-                return("SSLv2");
-        else
-                return("unknown");
-        }
-
-/* return the actual cipher being used */
-const char *SSL_CIPHER_get_name(SSL_CIPHER *c)
-        {
-        if (c != NULL)
-                return(c->name);
-        return("(NONE)");
-        }
-
-/* number of bits for symetric cipher */
-int SSL_CIPHER_get_bits(SSL_CIPHER *c, int *alg_bits)
-        {
-        int ret=0,a=0;
-        const EVP_CIPHER *enc;
-        const EVP_MD *md;
-        SSL_SESSION ss;
-
-        if (c != NULL)
-                {
-                ss.cipher=c;
-                if (!ssl_cipher_get_evp(&ss,&enc,&md,NULL))
-                        return(0);
-
-                a=EVP_CIPHER_key_length(enc)*8;
-
-                if (SSL_C_IS_EXPORT(c))
-                        {
-                        ret=SSL_C_EXPORT_KEYLENGTH(c)*8;
-                        }
-                else
-                        {
-                        if (c->algorithm2 & SSL2_CF_8_BYTE_ENC)
-                                ret=64;
-                        else
-                                ret=a;
-                        }
-                }
-
-        if (alg_bits != NULL) *alg_bits=a;
-        
-        return(ret);
-        }
-
-SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n)
-        {
-        SSL_COMP *ctmp;
-        int i,nn;
-
-        if ((n == 0) || (sk == NULL)) return(NULL);
-        nn=sk_SSL_COMP_num(sk);
-        for (i=0; i<nn; i++)
-                {
-                ctmp=sk_SSL_COMP_value(sk,i);
-                if (ctmp->id == n)
-                        return(ctmp);
-                }
-        return(NULL);
-        }
-
-static int sk_comp_cmp(SSL_COMP **a,SSL_COMP **b)
-        {
-        return((*a)->id-(*b)->id);
-        }
-
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
-        {
-        return(ssl_comp_methods);
-        }
-
-int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
-        {
-        SSL_COMP *comp;
-        STACK_OF(SSL_COMP) *sk;
-
-        comp=(SSL_COMP *)Malloc(sizeof(SSL_COMP));
-        comp->id=id;
-        comp->method=cm;
-        if (ssl_comp_methods == NULL)
-                sk=ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
-        else
-                sk=ssl_comp_methods;
-        if ((sk == NULL) || !sk_SSL_COMP_push(sk,comp))
-                {
-                SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        else
-                return(1);
-        }
-
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
deleted file mode 100644
index 3ddc805b53..0000000000
--- a/src/lib/libssl/ssl_err.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/* ssl/ssl_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-/* BEGIN ERROR CODES */
-#ifndef NO_ERR
-static ERR_STRING_DATA SSL_str_functs[]=
-        {
-{ERR_PACK(0,SSL_F_CLIENT_CERTIFICATE,0),        "CLIENT_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_CLIENT_HELLO,0),      "CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_CLIENT_MASTER_KEY,0), "CLIENT_MASTER_KEY"},
-{ERR_PACK(0,SSL_F_D2I_SSL_SESSION,0),   "d2i_SSL_SESSION"},
-{ERR_PACK(0,SSL_F_DO_SSL3_WRITE,0),     "DO_SSL3_WRITE"},
-{ERR_PACK(0,SSL_F_GET_CLIENT_FINISHED,0),       "GET_CLIENT_FINISHED"},
-{ERR_PACK(0,SSL_F_GET_CLIENT_HELLO,0),  "GET_CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_GET_CLIENT_MASTER_KEY,0),     "GET_CLIENT_MASTER_KEY"},
-{ERR_PACK(0,SSL_F_GET_SERVER_FINISHED,0),       "GET_SERVER_FINISHED"},
-{ERR_PACK(0,SSL_F_GET_SERVER_HELLO,0),  "GET_SERVER_HELLO"},
-{ERR_PACK(0,SSL_F_GET_SERVER_VERIFY,0), "GET_SERVER_VERIFY"},
-{ERR_PACK(0,SSL_F_I2D_SSL_SESSION,0),   "i2d_SSL_SESSION"},
-{ERR_PACK(0,SSL_F_READ_N,0),    "READ_N"},
-{ERR_PACK(0,SSL_F_REQUEST_CERTIFICATE,0),       "REQUEST_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SERVER_HELLO,0),      "SERVER_HELLO"},
-{ERR_PACK(0,SSL_F_SSL23_ACCEPT,0),      "SSL23_ACCEPT"},
-{ERR_PACK(0,SSL_F_SSL23_CLIENT_HELLO,0),        "SSL23_CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_SSL23_CONNECT,0),     "SSL23_CONNECT"},
-{ERR_PACK(0,SSL_F_SSL23_GET_CLIENT_HELLO,0),    "SSL23_GET_CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_SSL23_GET_SERVER_HELLO,0),    "SSL23_GET_SERVER_HELLO"},
-{ERR_PACK(0,SSL_F_SSL23_READ,0),        "SSL23_READ"},
-{ERR_PACK(0,SSL_F_SSL23_WRITE,0),       "SSL23_WRITE"},
-{ERR_PACK(0,SSL_F_SSL2_ACCEPT,0),       "SSL2_ACCEPT"},
-{ERR_PACK(0,SSL_F_SSL2_CONNECT,0),      "SSL2_CONNECT"},
-{ERR_PACK(0,SSL_F_SSL2_ENC_INIT,0),     "SSL2_ENC_INIT"},
-{ERR_PACK(0,SSL_F_SSL2_READ,0), "SSL2_READ"},
-{ERR_PACK(0,SSL_F_SSL2_SET_CERTIFICATE,0),      "SSL2_SET_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SSL2_WRITE,0),        "SSL2_WRITE"},
-{ERR_PACK(0,SSL_F_SSL3_ACCEPT,0),       "SSL3_ACCEPT"},
-{ERR_PACK(0,SSL_F_SSL3_CHANGE_CIPHER_STATE,0),  "SSL3_CHANGE_CIPHER_STATE"},
-{ERR_PACK(0,SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,0),     "SSL3_CHECK_CERT_AND_ALGORITHM"},
-{ERR_PACK(0,SSL_F_SSL3_CLIENT_HELLO,0), "SSL3_CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_SSL3_CONNECT,0),      "SSL3_CONNECT"},
-{ERR_PACK(0,SSL_F_SSL3_CTRL,0), "SSL3_CTRL"},
-{ERR_PACK(0,SSL_F_SSL3_CTX_CTRL,0),     "SSL3_CTX_CTRL"},
-{ERR_PACK(0,SSL_F_SSL3_ENC,0),  "SSL3_ENC"},
-{ERR_PACK(0,SSL_F_SSL3_GET_CERTIFICATE_REQUEST,0),      "SSL3_GET_CERTIFICATE_REQUEST"},
-{ERR_PACK(0,SSL_F_SSL3_GET_CERT_VERIFY,0),      "SSL3_GET_CERT_VERIFY"},
-{ERR_PACK(0,SSL_F_SSL3_GET_CLIENT_CERTIFICATE,0),       "SSL3_GET_CLIENT_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_CLIENT_HELLO,0),     "SSL3_GET_CLIENT_HELLO"},
-{ERR_PACK(0,SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,0),      "SSL3_GET_CLIENT_KEY_EXCHANGE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_FINISHED,0), "SSL3_GET_FINISHED"},
-{ERR_PACK(0,SSL_F_SSL3_GET_KEY_EXCHANGE,0),     "SSL3_GET_KEY_EXCHANGE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_MESSAGE,0),  "SSL3_GET_MESSAGE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_RECORD,0),   "SSL3_GET_RECORD"},
-{ERR_PACK(0,SSL_F_SSL3_GET_SERVER_CERTIFICATE,0),       "SSL3_GET_SERVER_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_SERVER_DONE,0),      "SSL3_GET_SERVER_DONE"},
-{ERR_PACK(0,SSL_F_SSL3_GET_SERVER_HELLO,0),     "SSL3_GET_SERVER_HELLO"},
-{ERR_PACK(0,SSL_F_SSL3_OUTPUT_CERT_CHAIN,0),    "SSL3_OUTPUT_CERT_CHAIN"},
-{ERR_PACK(0,SSL_F_SSL3_READ_BYTES,0),   "SSL3_READ_BYTES"},
-{ERR_PACK(0,SSL_F_SSL3_READ_N,0),       "SSL3_READ_N"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,0),     "SSL3_SEND_CERTIFICATE_REQUEST"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,0),      "SSL3_SEND_CLIENT_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,0),     "SSL3_SEND_CLIENT_KEY_EXCHANGE"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_CLIENT_VERIFY,0),   "SSL3_SEND_CLIENT_VERIFY"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_SERVER_CERTIFICATE,0),      "SSL3_SEND_SERVER_CERTIFICATE"},
-{ERR_PACK(0,SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,0),     "SSL3_SEND_SERVER_KEY_EXCHANGE"},
-{ERR_PACK(0,SSL_F_SSL3_SETUP_BUFFERS,0),        "SSL3_SETUP_BUFFERS"},
-{ERR_PACK(0,SSL_F_SSL3_SETUP_KEY_BLOCK,0),      "SSL3_SETUP_KEY_BLOCK"},
-{ERR_PACK(0,SSL_F_SSL3_WRITE_BYTES,0),  "SSL3_WRITE_BYTES"},
-{ERR_PACK(0,SSL_F_SSL3_WRITE_PENDING,0),        "SSL3_WRITE_PENDING"},
-{ERR_PACK(0,SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK,0),        "SSL_add_dir_cert_subjects_to_stack"},
-{ERR_PACK(0,SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK,0),       "SSL_add_file_cert_subjects_to_stack"},
-{ERR_PACK(0,SSL_F_SSL_BAD_METHOD,0),    "SSL_BAD_METHOD"},
-{ERR_PACK(0,SSL_F_SSL_BYTES_TO_CIPHER_LIST,0),  "SSL_BYTES_TO_CIPHER_LIST"},
-{ERR_PACK(0,SSL_F_SSL_CERT_DUP,0),      "SSL_CERT_DUP"},
-{ERR_PACK(0,SSL_F_SSL_CERT_INST,0),     "SSL_CERT_INST"},
-{ERR_PACK(0,SSL_F_SSL_CERT_INSTANTIATE,0),      "SSL_CERT_INSTANTIATE"},
-{ERR_PACK(0,SSL_F_SSL_CERT_NEW,0),      "SSL_CERT_NEW"},
-{ERR_PACK(0,SSL_F_SSL_CHECK_PRIVATE_KEY,0),     "SSL_check_private_key"},
-{ERR_PACK(0,SSL_F_SSL_CLEAR,0), "SSL_clear"},
-{ERR_PACK(0,SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,0),   "SSL_COMP_add_compression_method"},
-{ERR_PACK(0,SSL_F_SSL_CREATE_CIPHER_LIST,0),    "SSL_CREATE_CIPHER_LIST"},
-{ERR_PACK(0,SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,0), "SSL_CTX_check_private_key"},
-{ERR_PACK(0,SSL_F_SSL_CTX_NEW,0),       "SSL_CTX_new"},
-{ERR_PACK(0,SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT,0),    "SSL_CTX_set_session_id_context"},
-{ERR_PACK(0,SSL_F_SSL_CTX_SET_SSL_VERSION,0),   "SSL_CTX_set_ssl_version"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_CERTIFICATE,0),   "SSL_CTX_use_certificate"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1,0),      "SSL_CTX_use_certificate_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,0),        "SSL_CTX_use_certificate_chain_file"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,0),      "SSL_CTX_use_certificate_file"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_PRIVATEKEY,0),    "SSL_CTX_use_PrivateKey"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1,0),       "SSL_CTX_use_PrivateKey_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,0),       "SSL_CTX_use_PrivateKey_file"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,0), "SSL_CTX_use_RSAPrivateKey"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1,0),    "SSL_CTX_use_RSAPrivateKey_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,0),    "SSL_CTX_use_RSAPrivateKey_file"},
-{ERR_PACK(0,SSL_F_SSL_DO_HANDSHAKE,0),  "SSL_do_handshake"},
-{ERR_PACK(0,SSL_F_SSL_GET_NEW_SESSION,0),       "SSL_GET_NEW_SESSION"},
-{ERR_PACK(0,SSL_F_SSL_GET_PREV_SESSION,0),      "SSL_GET_PREV_SESSION"},
-{ERR_PACK(0,SSL_F_SSL_GET_SERVER_SEND_CERT,0),  "SSL_GET_SERVER_SEND_CERT"},
-{ERR_PACK(0,SSL_F_SSL_GET_SIGN_PKEY,0), "SSL_GET_SIGN_PKEY"},
-{ERR_PACK(0,SSL_F_SSL_INIT_WBIO_BUFFER,0),      "SSL_INIT_WBIO_BUFFER"},
-{ERR_PACK(0,SSL_F_SSL_LOAD_CLIENT_CA_FILE,0),   "SSL_load_client_CA_file"},
-{ERR_PACK(0,SSL_F_SSL_NEW,0),   "SSL_new"},
-{ERR_PACK(0,SSL_F_SSL_READ,0),  "SSL_read"},
-{ERR_PACK(0,SSL_F_SSL_RSA_PRIVATE_DECRYPT,0),   "SSL_RSA_PRIVATE_DECRYPT"},
-{ERR_PACK(0,SSL_F_SSL_RSA_PUBLIC_ENCRYPT,0),    "SSL_RSA_PUBLIC_ENCRYPT"},
-{ERR_PACK(0,SSL_F_SSL_SESSION_NEW,0),   "SSL_SESSION_new"},
-{ERR_PACK(0,SSL_F_SSL_SESSION_PRINT_FP,0),      "SSL_SESSION_print_fp"},
-{ERR_PACK(0,SSL_F_SSL_SESS_CERT_NEW,0), "SSL_SESS_CERT_NEW"},
-{ERR_PACK(0,SSL_F_SSL_SET_CERT,0),      "SSL_SET_CERT"},
-{ERR_PACK(0,SSL_F_SSL_SET_FD,0),        "SSL_set_fd"},
-{ERR_PACK(0,SSL_F_SSL_SET_PKEY,0),      "SSL_SET_PKEY"},
-{ERR_PACK(0,SSL_F_SSL_SET_RFD,0),       "SSL_set_rfd"},
-{ERR_PACK(0,SSL_F_SSL_SET_SESSION,0),   "SSL_set_session"},
-{ERR_PACK(0,SSL_F_SSL_SET_SESSION_ID_CONTEXT,0),        "SSL_set_session_id_context"},
-{ERR_PACK(0,SSL_F_SSL_SET_WFD,0),       "SSL_set_wfd"},
-{ERR_PACK(0,SSL_F_SSL_SHUTDOWN,0),      "SSL_shutdown"},
-{ERR_PACK(0,SSL_F_SSL_UNDEFINED_FUNCTION,0),    "SSL_UNDEFINED_FUNCTION"},
-{ERR_PACK(0,SSL_F_SSL_USE_CERTIFICATE,0),       "SSL_use_certificate"},
-{ERR_PACK(0,SSL_F_SSL_USE_CERTIFICATE_ASN1,0),  "SSL_use_certificate_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_USE_CERTIFICATE_FILE,0),  "SSL_use_certificate_file"},
-{ERR_PACK(0,SSL_F_SSL_USE_PRIVATEKEY,0),        "SSL_use_PrivateKey"},
-{ERR_PACK(0,SSL_F_SSL_USE_PRIVATEKEY_ASN1,0),   "SSL_use_PrivateKey_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_USE_PRIVATEKEY_FILE,0),   "SSL_use_PrivateKey_file"},
-{ERR_PACK(0,SSL_F_SSL_USE_RSAPRIVATEKEY,0),     "SSL_use_RSAPrivateKey"},
-{ERR_PACK(0,SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1,0),        "SSL_use_RSAPrivateKey_ASN1"},
-{ERR_PACK(0,SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,0),        "SSL_use_RSAPrivateKey_file"},
-{ERR_PACK(0,SSL_F_SSL_VERIFY_CERT_CHAIN,0),     "SSL_VERIFY_CERT_CHAIN"},
-{ERR_PACK(0,SSL_F_SSL_WRITE,0), "SSL_write"},
-{ERR_PACK(0,SSL_F_TLS1_CHANGE_CIPHER_STATE,0),  "TLS1_CHANGE_CIPHER_STATE"},
-{ERR_PACK(0,SSL_F_TLS1_ENC,0),  "TLS1_ENC"},
-{ERR_PACK(0,SSL_F_TLS1_SETUP_KEY_BLOCK,0),      "TLS1_SETUP_KEY_BLOCK"},
-{ERR_PACK(0,SSL_F_WRITE_PENDING,0),     "WRITE_PENDING"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA SSL_str_reasons[]=
-        {
-{SSL_R_APP_DATA_IN_HANDSHAKE             ,"app data in handshake"},
-{SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT,"attempt to reuse session in different context"},
-{SSL_R_BAD_ALERT_RECORD                  ,"bad alert record"},
-{SSL_R_BAD_AUTHENTICATION_TYPE           ,"bad authentication type"},
-{SSL_R_BAD_CHANGE_CIPHER_SPEC            ,"bad change cipher spec"},
-{SSL_R_BAD_CHECKSUM                      ,"bad checksum"},
-{SSL_R_BAD_CLIENT_REQUEST                ,"bad client request"},
-{SSL_R_BAD_DATA_RETURNED_BY_CALLBACK     ,"bad data returned by callback"},
-{SSL_R_BAD_DECOMPRESSION                 ,"bad decompression"},
-{SSL_R_BAD_DH_G_LENGTH                   ,"bad dh g length"},
-{SSL_R_BAD_DH_PUB_KEY_LENGTH             ,"bad dh pub key length"},
-{SSL_R_BAD_DH_P_LENGTH                   ,"bad dh p length"},
-{SSL_R_BAD_DIGEST_LENGTH                 ,"bad digest length"},
-{SSL_R_BAD_DSA_SIGNATURE                 ,"bad dsa signature"},
-{SSL_R_BAD_LENGTH                        ,"bad length"},
-{SSL_R_BAD_MAC_DECODE                    ,"bad mac decode"},
-{SSL_R_BAD_MESSAGE_TYPE                  ,"bad message type"},
-{SSL_R_BAD_PACKET_LENGTH                 ,"bad packet length"},
-{SSL_R_BAD_PROTOCOL_VERSION_NUMBER       ,"bad protocol version number"},
-{SSL_R_BAD_RESPONSE_ARGUMENT             ,"bad response argument"},
-{SSL_R_BAD_RSA_DECRYPT                   ,"bad rsa decrypt"},
-{SSL_R_BAD_RSA_ENCRYPT                   ,"bad rsa encrypt"},
-{SSL_R_BAD_RSA_E_LENGTH                  ,"bad rsa e length"},
-{SSL_R_BAD_RSA_MODULUS_LENGTH            ,"bad rsa modulus length"},
-{SSL_R_BAD_RSA_SIGNATURE                 ,"bad rsa signature"},
-{SSL_R_BAD_SIGNATURE                     ,"bad signature"},
-{SSL_R_BAD_SSL_FILETYPE                  ,"bad ssl filetype"},
-{SSL_R_BAD_SSL_SESSION_ID_LENGTH         ,"bad ssl session id length"},
-{SSL_R_BAD_STATE                         ,"bad state"},
-{SSL_R_BAD_WRITE_RETRY                   ,"bad write retry"},
-{SSL_R_BIO_NOT_SET                       ,"bio not set"},
-{SSL_R_BLOCK_CIPHER_PAD_IS_WRONG         ,"block cipher pad is wrong"},
-{SSL_R_BN_LIB                            ,"bn lib"},
-{SSL_R_CA_DN_LENGTH_MISMATCH             ,"ca dn length mismatch"},
-{SSL_R_CA_DN_TOO_LONG                    ,"ca dn too long"},
-{SSL_R_CCS_RECEIVED_EARLY                ,"ccs received early"},
-{SSL_R_CERTIFICATE_VERIFY_FAILED         ,"certificate verify failed"},
-{SSL_R_CERT_LENGTH_MISMATCH              ,"cert length mismatch"},
-{SSL_R_CHALLENGE_IS_DIFFERENT            ,"challenge is different"},
-{SSL_R_CIPHER_CODE_WRONG_LENGTH          ,"cipher code wrong length"},
-{SSL_R_CIPHER_OR_HASH_UNAVAILABLE        ,"cipher or hash unavailable"},
-{SSL_R_CIPHER_TABLE_SRC_ERROR            ,"cipher table src error"},
-{SSL_R_COMPRESSED_LENGTH_TOO_LONG        ,"compressed length too long"},
-{SSL_R_COMPRESSION_FAILURE               ,"compression failure"},
-{SSL_R_COMPRESSION_LIBRARY_ERROR         ,"compression library error"},
-{SSL_R_CONNECTION_ID_IS_DIFFERENT        ,"connection id is different"},
-{SSL_R_CONNECTION_TYPE_NOT_SET           ,"connection type not set"},
-{SSL_R_DATA_BETWEEN_CCS_AND_FINISHED     ,"data between ccs and finished"},
-{SSL_R_DATA_LENGTH_TOO_LONG              ,"data length too long"},
-{SSL_R_DECRYPTION_FAILED                 ,"decryption failed"},
-{SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG   ,"dh public value length is wrong"},
-{SSL_R_DIGEST_CHECK_FAILED               ,"digest check failed"},
-{SSL_R_ENCRYPTED_LENGTH_TOO_LONG         ,"encrypted length too long"},
-{SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST     ,"error in received cipher list"},
-{SSL_R_EXCESSIVE_MESSAGE_SIZE            ,"excessive message size"},
-{SSL_R_EXTRA_DATA_IN_MESSAGE             ,"extra data in message"},
-{SSL_R_GOT_A_FIN_BEFORE_A_CCS            ,"got a fin before a ccs"},
-{SSL_R_HTTPS_PROXY_REQUEST               ,"https proxy request"},
-{SSL_R_HTTP_REQUEST                      ,"http request"},
-{SSL_R_INTERNAL_ERROR                    ,"internal error"},
-{SSL_R_INVALID_CHALLENGE_LENGTH          ,"invalid challenge length"},
-{SSL_R_LENGTH_MISMATCH                   ,"length mismatch"},
-{SSL_R_LENGTH_TOO_SHORT                  ,"length too short"},
-{SSL_R_LIBRARY_BUG                       ,"library bug"},
-{SSL_R_LIBRARY_HAS_NO_CIPHERS            ,"library has no ciphers"},
-{SSL_R_MISSING_DH_DSA_CERT               ,"missing dh dsa cert"},
-{SSL_R_MISSING_DH_KEY                    ,"missing dh key"},
-{SSL_R_MISSING_DH_RSA_CERT               ,"missing dh rsa cert"},
-{SSL_R_MISSING_DSA_SIGNING_CERT          ,"missing dsa signing cert"},
-{SSL_R_MISSING_EXPORT_TMP_DH_KEY         ,"missing export tmp dh key"},
-{SSL_R_MISSING_EXPORT_TMP_RSA_KEY        ,"missing export tmp rsa key"},
-{SSL_R_MISSING_RSA_CERTIFICATE           ,"missing rsa certificate"},
-{SSL_R_MISSING_RSA_ENCRYPTING_CERT       ,"missing rsa encrypting cert"},
-{SSL_R_MISSING_RSA_SIGNING_CERT          ,"missing rsa signing cert"},
-{SSL_R_MISSING_TMP_DH_KEY                ,"missing tmp dh key"},
-{SSL_R_MISSING_TMP_RSA_KEY               ,"missing tmp rsa key"},
-{SSL_R_MISSING_TMP_RSA_PKEY              ,"missing tmp rsa pkey"},
-{SSL_R_MISSING_VERIFY_MESSAGE            ,"missing verify message"},
-{SSL_R_NON_SSLV2_INITIAL_PACKET          ,"non sslv2 initial packet"},
-{SSL_R_NO_CERTIFICATES_RETURNED          ,"no certificates returned"},
-{SSL_R_NO_CERTIFICATE_ASSIGNED           ,"no certificate assigned"},
-{SSL_R_NO_CERTIFICATE_RETURNED           ,"no certificate returned"},
-{SSL_R_NO_CERTIFICATE_SET                ,"no certificate set"},
-{SSL_R_NO_CERTIFICATE_SPECIFIED          ,"no certificate specified"},
-{SSL_R_NO_CIPHERS_AVAILABLE              ,"no ciphers available"},
-{SSL_R_NO_CIPHERS_PASSED                 ,"no ciphers passed"},
-{SSL_R_NO_CIPHERS_SPECIFIED              ,"no ciphers specified"},
-{SSL_R_NO_CIPHER_LIST                    ,"no cipher list"},
-{SSL_R_NO_CIPHER_MATCH                   ,"no cipher match"},
-{SSL_R_NO_CLIENT_CERT_RECEIVED           ,"no client cert received"},
-{SSL_R_NO_COMPRESSION_SPECIFIED          ,"no compression specified"},
-{SSL_R_NO_METHOD_SPECIFIED               ,"no method specified"},
-{SSL_R_NO_PRIVATEKEY                     ,"no privatekey"},
-{SSL_R_NO_PRIVATE_KEY_ASSIGNED           ,"no private key assigned"},
-{SSL_R_NO_PROTOCOLS_AVAILABLE            ,"no protocols available"},
-{SSL_R_NO_PUBLICKEY                      ,"no publickey"},
-{SSL_R_NO_SHARED_CIPHER                  ,"no shared cipher"},
-{SSL_R_NO_VERIFY_CALLBACK                ,"no verify callback"},
-{SSL_R_NULL_SSL_CTX                      ,"null ssl ctx"},
-{SSL_R_NULL_SSL_METHOD_PASSED            ,"null ssl method passed"},
-{SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED   ,"old session cipher not returned"},
-{SSL_R_PACKET_LENGTH_TOO_LONG            ,"packet length too long"},
-{SSL_R_PATH_TOO_LONG                     ,"path too long"},
-{SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE ,"peer did not return a certificate"},
-{SSL_R_PEER_ERROR                        ,"peer error"},
-{SSL_R_PEER_ERROR_CERTIFICATE            ,"peer error certificate"},
-{SSL_R_PEER_ERROR_NO_CERTIFICATE         ,"peer error no certificate"},
-{SSL_R_PEER_ERROR_NO_CIPHER              ,"peer error no cipher"},
-{SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE,"peer error unsupported certificate type"},
-{SSL_R_PRE_MAC_LENGTH_TOO_LONG           ,"pre mac length too long"},
-{SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS ,"problems mapping cipher functions"},
-{SSL_R_PROTOCOL_IS_SHUTDOWN              ,"protocol is shutdown"},
-{SSL_R_PUBLIC_KEY_ENCRYPT_ERROR          ,"public key encrypt error"},
-{SSL_R_PUBLIC_KEY_IS_NOT_RSA             ,"public key is not rsa"},
-{SSL_R_PUBLIC_KEY_NOT_RSA                ,"public key not rsa"},
-{SSL_R_READ_BIO_NOT_SET                  ,"read bio not set"},
-{SSL_R_READ_WRONG_PACKET_TYPE            ,"read wrong packet type"},
-{SSL_R_RECORD_LENGTH_MISMATCH            ,"record length mismatch"},
-{SSL_R_RECORD_TOO_LARGE                  ,"record too large"},
-{SSL_R_REQUIRED_CIPHER_MISSING           ,"required cipher missing"},
-{SSL_R_REUSE_CERT_LENGTH_NOT_ZERO        ,"reuse cert length not zero"},
-{SSL_R_REUSE_CERT_TYPE_NOT_ZERO          ,"reuse cert type not zero"},
-{SSL_R_REUSE_CIPHER_LIST_NOT_ZERO        ,"reuse cipher list not zero"},
-{SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED  ,"session id context uninitialized"},
-{SSL_R_SHORT_READ                        ,"short read"},
-{SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE,"signature for non signing certificate"},
-{SSL_R_SSL23_DOING_SESSION_ID_REUSE      ,"ssl23 doing session id reuse"},
-{SSL_R_SSL3_SESSION_ID_TOO_SHORT         ,"ssl3 session id too short"},
-{SSL_R_SSLV3_ALERT_BAD_CERTIFICATE       ,"sslv3 alert bad certificate"},
-{SSL_R_SSLV3_ALERT_BAD_RECORD_MAC        ,"sslv3 alert bad record mac"},
-{SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED   ,"sslv3 alert certificate expired"},
-{SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED   ,"sslv3 alert certificate revoked"},
-{SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN   ,"sslv3 alert certificate unknown"},
-{SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE ,"sslv3 alert decompression failure"},
-{SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE     ,"sslv3 alert handshake failure"},
-{SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER     ,"sslv3 alert illegal parameter"},
-{SSL_R_SSLV3_ALERT_NO_CERTIFICATE        ,"sslv3 alert no certificate"},
-{SSL_R_SSLV3_ALERT_PEER_ERROR_CERTIFICATE,"sslv3 alert peer error certificate"},
-{SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CERTIFICATE,"sslv3 alert peer error no certificate"},
-{SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CIPHER  ,"sslv3 alert peer error no cipher"},
-{SSL_R_SSLV3_ALERT_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE,"sslv3 alert peer error unsupported certificate type"},
-{SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE    ,"sslv3 alert unexpected message"},
-{SSL_R_SSLV3_ALERT_UNKNOWN_REMOTE_ERROR_TYPE,"sslv3 alert unknown remote error type"},
-{SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE,"sslv3 alert unsupported certificate"},
-{SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION,"ssl ctx has no default ssl version"},
-{SSL_R_SSL_HANDSHAKE_FAILURE             ,"ssl handshake failure"},
-{SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS        ,"ssl library has no ciphers"},
-{SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG   ,"ssl session id context too long"},
-{SSL_R_SSL_SESSION_ID_IS_DIFFERENT       ,"ssl session id is different"},
-{SSL_R_TLSV1_ALERT_ACCESS_DENIED         ,"tlsv1 alert access denied"},
-{SSL_R_TLSV1_ALERT_DECODE_ERROR          ,"tlsv1 alert decode error"},
-{SSL_R_TLSV1_ALERT_DECRYPTION_FAILED     ,"tlsv1 alert decryption failed"},
-{SSL_R_TLSV1_ALERT_DECRYPT_ERROR         ,"tlsv1 alert decrypt error"},
-{SSL_R_TLSV1_ALERT_EXPORT_RESTRICION     ,"tlsv1 alert export restricion"},
-{SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY ,"tlsv1 alert insufficient security"},
-{SSL_R_TLSV1_ALERT_INTERNAL_ERROR        ,"tlsv1 alert internal error"},
-{SSL_R_TLSV1_ALERT_NO_RENEGOTIATION      ,"tlsv1 alert no renegotiation"},
-{SSL_R_TLSV1_ALERT_PROTOCOL_VERSION      ,"tlsv1 alert protocol version"},
-{SSL_R_TLSV1_ALERT_RECORD_OVERFLOW       ,"tlsv1 alert record overflow"},
-{SSL_R_TLSV1_ALERT_UNKNOWN_CA            ,"tlsv1 alert unknown ca"},
-{SSL_R_TLSV1_ALERT_USER_CANCLED          ,"tlsv1 alert user cancled"},
-{SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER,"tls client cert req with anon cipher"},
-{SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST,"tls peer did not respond with certificate list"},
-{SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG,"tls rsa encrypted value length is wrong"},
-{SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER   ,"tried to use unsupported cipher"},
-{SSL_R_UNABLE_TO_DECODE_DH_CERTS         ,"unable to decode dh certs"},
-{SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY      ,"unable to extract public key"},
-{SSL_R_UNABLE_TO_FIND_DH_PARAMETERS      ,"unable to find dh parameters"},
-{SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS,"unable to find public key parameters"},
-{SSL_R_UNABLE_TO_FIND_SSL_METHOD         ,"unable to find ssl method"},
-{SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES  ,"unable to load ssl2 md5 routines"},
-{SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES  ,"unable to load ssl3 md5 routines"},
-{SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES ,"unable to load ssl3 sha1 routines"},
-{SSL_R_UNEXPECTED_MESSAGE                ,"unexpected message"},
-{SSL_R_UNEXPECTED_RECORD                 ,"unexpected record"},
-{SSL_R_UNINITIALIZED                     ,"uninitialized"},
-{SSL_R_UNKNOWN_ALERT_TYPE                ,"unknown alert type"},
-{SSL_R_UNKNOWN_CERTIFICATE_TYPE          ,"unknown certificate type"},
-{SSL_R_UNKNOWN_CIPHER_RETURNED           ,"unknown cipher returned"},
-{SSL_R_UNKNOWN_CIPHER_TYPE               ,"unknown cipher type"},
-{SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE         ,"unknown key exchange type"},
-{SSL_R_UNKNOWN_PKEY_TYPE                 ,"unknown pkey type"},
-{SSL_R_UNKNOWN_PROTOCOL                  ,"unknown protocol"},
-{SSL_R_UNKNOWN_REMOTE_ERROR_TYPE         ,"unknown remote error type"},
-{SSL_R_UNKNOWN_SSL_VERSION               ,"unknown ssl version"},
-{SSL_R_UNKNOWN_STATE                     ,"unknown state"},
-{SSL_R_UNSUPPORTED_CIPHER                ,"unsupported cipher"},
-{SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM ,"unsupported compression algorithm"},
-{SSL_R_UNSUPPORTED_PROTOCOL              ,"unsupported protocol"},
-{SSL_R_UNSUPPORTED_SSL_VERSION           ,"unsupported ssl version"},
-{SSL_R_WRITE_BIO_NOT_SET                 ,"write bio not set"},
-{SSL_R_WRONG_CIPHER_RETURNED             ,"wrong cipher returned"},
-{SSL_R_WRONG_MESSAGE_TYPE                ,"wrong message type"},
-{SSL_R_WRONG_NUMBER_OF_KEY_BITS          ,"wrong number of key bits"},
-{SSL_R_WRONG_SIGNATURE_LENGTH            ,"wrong signature length"},
-{SSL_R_WRONG_SIGNATURE_SIZE              ,"wrong signature size"},
-{SSL_R_WRONG_SSL_VERSION                 ,"wrong ssl version"},
-{SSL_R_WRONG_VERSION_NUMBER              ,"wrong version number"},
-{SSL_R_X509_LIB                          ,"x509 lib"},
-{SSL_R_X509_VERIFICATION_SETUP_PROBLEMS  ,"x509 verification setup problems"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_SSL_strings(void)
-        {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
-#ifndef NO_ERR
-                ERR_load_strings(ERR_LIB_SSL,SSL_str_functs);
-                ERR_load_strings(ERR_LIB_SSL,SSL_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libssl/ssl_err2.c b/src/lib/libssl/ssl_err2.c
deleted file mode 100644
index cc089a612b..0000000000
--- a/src/lib/libssl/ssl_err2.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ssl/ssl_err2.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-void SSL_load_error_strings(void)
-        {
-#ifndef NO_ERR
-        ERR_load_crypto_strings();
-        ERR_load_SSL_strings();
-#endif
-        }
-
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
deleted file mode 100644
index e192fc4cac..0000000000
--- a/src/lib/libssl/ssl_lib.c
+++ /dev/null
@@ -1,1947 +0,0 @@
-/*! \file ssl/ssl_lib.c
- *  \brief Version independent SSL functions.
- */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/objects.h>
-#include <openssl/lhash.h>
-#include "ssl_locl.h"
-
-char *SSL_version_str=OPENSSL_VERSION_TEXT;
-
-static STACK *ssl_meth=NULL;
-static STACK *ssl_ctx_meth=NULL;
-static int ssl_meth_num=0;
-static int ssl_ctx_meth_num=0;
-
-OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        };
-
-int SSL_clear(SSL *s)
-        {
-        int state;
-
-        if (s->method == NULL)
-                {
-                SSLerr(SSL_F_SSL_CLEAR,SSL_R_NO_METHOD_SPECIFIED);
-                return(0);
-                }
-
-        s->error=0;
-        s->hit=0;
-        s->shutdown=0;
-
-#if 0
-        /* This is set if we are doing dynamic renegotiation so keep
-         * the old cipher.  It is sort of a SSL_clear_lite :-) */
-        if (s->new_session) return(1);
-#endif
-
-        state=s->state; /* Keep to check if we throw away the session-id */
-        s->type=0;
-
-        s->state=SSL_ST_BEFORE|((s->server)?SSL_ST_ACCEPT:SSL_ST_CONNECT);
-
-        s->version=s->method->version;
-        s->client_version=s->version;
-        s->rwstate=SSL_NOTHING;
-        s->rstate=SSL_ST_READ_HEADER;
-        s->read_ahead=s->ctx->read_ahead;
-
-        if (s->init_buf != NULL)
-                {
-                BUF_MEM_free(s->init_buf);
-                s->init_buf=NULL;
-                }
-
-        ssl_clear_cipher_ctx(s);
-
-        if (ssl_clear_bad_session(s))
-                {
-                SSL_SESSION_free(s->session);
-                s->session=NULL;
-                }
-
-        s->first_packet=0;
-
-#if 1
-        /* Check to see if we were changed into a different method, if
-         * so, revert back if we are not doing session-id reuse. */
-        if ((s->session == NULL) && (s->method != s->ctx->method))
-                {
-                s->method->ssl_free(s);
-                s->method=s->ctx->method;
-                if (!s->method->ssl_new(s))
-                        return(0);
-                }
-        else
-#endif
-                s->method->ssl_clear(s);
-        return(1);
-        }
-
-/** Used to change an SSL_CTXs default SSL method type */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx,SSL_METHOD *meth)
-        {
-        STACK_OF(SSL_CIPHER) *sk;
-
-        ctx->method=meth;
-
-        sk=ssl_create_cipher_list(ctx->method,&(ctx->cipher_list),
-                &(ctx->cipher_list_by_id),SSL_DEFAULT_CIPHER_LIST);
-        if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0))
-                {
-                SSLerr(SSL_F_SSL_CTX_SET_SSL_VERSION,SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
-                return(0);
-                }
-        return(1);
-        }
-
-SSL *SSL_new(SSL_CTX *ctx)
-        {
-        SSL *s;
-
-        if (ctx == NULL)
-                {
-                SSLerr(SSL_F_SSL_NEW,SSL_R_NULL_SSL_CTX);
-                return(NULL);
-                }
-        if (ctx->method == NULL)
-                {
-                SSLerr(SSL_F_SSL_NEW,SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION);
-                return(NULL);
-                }
-
-        s=(SSL *)Malloc(sizeof(SSL));
-        if (s == NULL) goto err;
-        memset(s,0,sizeof(SSL));
-
-        if (ctx->cert != NULL)
-                {
-                /* Earlier library versions used to copy the pointer to
-                 * the CERT, not its contents; only when setting new
-                 * parameters for the per-SSL copy, ssl_cert_new would be
-                 * called (and the direct reference to the per-SSL_CTX
-                 * settings would be lost, but those still were indirectly
-                 * accessed for various purposes, and for that reason they
-                 * used to be known as s->ctx->default_cert).
-                 * Now we don't look at the SSL_CTX's CERT after having
-                 * duplicated it once. */
-
-                s->cert = ssl_cert_dup(ctx->cert);
-                if (s->cert == NULL)
-                        goto err;
-                }
-        else
-                s->cert=NULL; /* Cannot really happen (see SSL_CTX_new) */
-        s->sid_ctx_length=ctx->sid_ctx_length;
-        memcpy(&s->sid_ctx,&ctx->sid_ctx,sizeof(s->sid_ctx));
-        s->verify_mode=ctx->verify_mode;
-        s->verify_depth=ctx->verify_depth;
-        s->verify_callback=ctx->default_verify_callback;
-        CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX);
-        s->ctx=ctx;
-
-        s->verify_result=X509_V_OK;
-
-        s->method=ctx->method;
-
-        if (!s->method->ssl_new(s))
-                goto err;
-
-        s->quiet_shutdown=ctx->quiet_shutdown;
-        s->references=1;
-        s->server=(ctx->method->ssl_accept == ssl_undefined_function)?0:1;
-        s->options=ctx->options;
-        s->mode=ctx->mode;
-        SSL_clear(s);
-
-        CRYPTO_new_ex_data(ssl_meth,(char *)s,&s->ex_data);
-
-        return(s);
-err:
-        if (s != NULL)
-                {
-                if (s->cert != NULL)
-                        ssl_cert_free(s->cert);
-                if (s->ctx != NULL)
-                        SSL_CTX_free(s->ctx); /* decrement reference count */
-                Free(s);
-                }
-        SSLerr(SSL_F_SSL_NEW,ERR_R_MALLOC_FAILURE);
-        return(NULL);
-        }
-
-int SSL_CTX_set_session_id_context(SSL_CTX *ctx,const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len)
-    {
-    if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
-        {
-        SSLerr(SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
-        return 0;
-        }
-    ctx->sid_ctx_length=sid_ctx_len;
-    memcpy(ctx->sid_ctx,sid_ctx,sid_ctx_len);
-
-    return 1;
-    }
-
-int SSL_set_session_id_context(SSL *ssl,const unsigned char *sid_ctx,
-                               unsigned int sid_ctx_len)
-    {
-    if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
-        {
-        SSLerr(SSL_F_SSL_SET_SESSION_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
-        return 0;
-        }
-    ssl->sid_ctx_length=sid_ctx_len;
-    memcpy(ssl->sid_ctx,sid_ctx,sid_ctx_len);
-
-    return 1;
-    }
-
-void SSL_free(SSL *s)
-        {
-        int i;
-
-        if(s == NULL)
-            return;
-
-        i=CRYPTO_add(&s->references,-1,CRYPTO_LOCK_SSL);
-#ifdef REF_PRINT
-        REF_PRINT("SSL",s);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"SSL_free, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-
-        CRYPTO_free_ex_data(ssl_meth,(char *)s,&s->ex_data);
-
-        if (s->bbio != NULL)
-                {
-                /* If the buffering BIO is in place, pop it off */
-                if (s->bbio == s->wbio)
-                        {
-                        s->wbio=BIO_pop(s->wbio);
-                        }
-                BIO_free(s->bbio);
-                s->bbio=NULL;
-                }
-        if (s->rbio != NULL)
-                BIO_free_all(s->rbio);
-        if ((s->wbio != NULL) && (s->wbio != s->rbio))
-                BIO_free_all(s->wbio);
-
-        if (s->init_buf != NULL) BUF_MEM_free(s->init_buf);
-
-        /* add extra stuff */
-        if (s->cipher_list != NULL) sk_SSL_CIPHER_free(s->cipher_list);
-        if (s->cipher_list_by_id != NULL) sk_SSL_CIPHER_free(s->cipher_list_by_id);
-
-        /* Make the next call work :-) */
-        if (s->session != NULL)
-                {
-                ssl_clear_bad_session(s);
-                SSL_SESSION_free(s->session);
-                }
-
-        ssl_clear_cipher_ctx(s);
-
-        if (s->cert != NULL) ssl_cert_free(s->cert);
-        /* Free up if allocated */
-
-        if (s->ctx) SSL_CTX_free(s->ctx);
-
-        if (s->client_CA != NULL)
-                sk_X509_NAME_pop_free(s->client_CA,X509_NAME_free);
-
-        if (s->method != NULL) s->method->ssl_free(s);
-
-        Free((char *)s);
-        }
-
-void SSL_set_bio(SSL *s,BIO *rbio,BIO *wbio)
-        {
-        /* If the output buffering BIO is still in place, remove it
-         */
-        if (s->bbio != NULL)
-                {
-                if (s->wbio == s->bbio)
-                        {
-                        s->wbio=s->wbio->next_bio;
-                        s->bbio->next_bio=NULL;
-                        }
-                }
-        if ((s->rbio != NULL) && (s->rbio != rbio))
-                BIO_free_all(s->rbio);
-        if ((s->wbio != NULL) && (s->wbio != wbio) && (s->rbio != s->wbio))
-                BIO_free_all(s->wbio);
-        s->rbio=rbio;
-        s->wbio=wbio;
-        }
-
-BIO *SSL_get_rbio(SSL *s)
-        { return(s->rbio); }
-
-BIO *SSL_get_wbio(SSL *s)
-        { return(s->wbio); }
-
-int SSL_get_fd(SSL *s)
-        {
-        int ret= -1;
-        BIO *b,*r;
-
-        b=SSL_get_rbio(s);
-        r=BIO_find_type(b,BIO_TYPE_DESCRIPTOR);
-        if (r != NULL)
-                BIO_get_fd(r,&ret);
-        return(ret);
-        }
-
-#ifndef NO_SOCK
-int SSL_set_fd(SSL *s,int fd)
-        {
-        int ret=0;
-        BIO *bio=NULL;
-
-        bio=BIO_new(BIO_s_socket());
-
-        if (bio == NULL)
-                {
-                SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB);
-                goto err;
-                }
-        BIO_set_fd(bio,fd,BIO_NOCLOSE);
-        SSL_set_bio(s,bio,bio);
-        ret=1;
-err:
-        return(ret);
-        }
-
-int SSL_set_wfd(SSL *s,int fd)
-        {
-        int ret=0;
-        BIO *bio=NULL;
-
-        if ((s->rbio == NULL) || (BIO_method_type(s->rbio) != BIO_TYPE_SOCKET)
-                || ((int)BIO_get_fd(s->rbio,NULL) != fd))
-                {
-                bio=BIO_new(BIO_s_socket());
-
-                if (bio == NULL)
-                        { SSLerr(SSL_F_SSL_SET_WFD,ERR_R_BUF_LIB); goto err; }
-                BIO_set_fd(bio,fd,BIO_NOCLOSE);
-                SSL_set_bio(s,SSL_get_rbio(s),bio);
-                }
-        else
-                SSL_set_bio(s,SSL_get_rbio(s),SSL_get_rbio(s));
-        ret=1;
-err:
-        return(ret);
-        }
-
-int SSL_set_rfd(SSL *s,int fd)
-        {
-        int ret=0;
-        BIO *bio=NULL;
-
-        if ((s->wbio == NULL) || (BIO_method_type(s->wbio) != BIO_TYPE_SOCKET)
-                || ((int)BIO_get_fd(s->wbio,NULL) != fd))
-                {
-                bio=BIO_new(BIO_s_socket());
-
-                if (bio == NULL)
-                        {
-                        SSLerr(SSL_F_SSL_SET_RFD,ERR_R_BUF_LIB);
-                        goto err;
-                        }
-                BIO_set_fd(bio,fd,BIO_NOCLOSE);
-                SSL_set_bio(s,bio,SSL_get_wbio(s));
-                }
-        else
-                SSL_set_bio(s,SSL_get_wbio(s),SSL_get_wbio(s));
-        ret=1;
-err:
-        return(ret);
-        }
-#endif
-
-int SSL_get_verify_mode(SSL *s)
-        {
-        return(s->verify_mode);
-        }
-
-int SSL_get_verify_depth(SSL *s)
-        {
-        return(s->verify_depth);
-        }
-
-int (*SSL_get_verify_callback(SSL *s))(int,X509_STORE_CTX *)
-        {
-        return(s->verify_callback);
-        }
-
-int SSL_CTX_get_verify_mode(SSL_CTX *ctx)
-        {
-        return(ctx->verify_mode);
-        }
-
-int SSL_CTX_get_verify_depth(SSL_CTX *ctx)
-        {
-        return(ctx->verify_depth);
-        }
-
-int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int,X509_STORE_CTX *)
-        {
-        return(ctx->default_verify_callback);
-        }
-
-void SSL_set_verify(SSL *s,int mode,
-                    int (*callback)(int ok,X509_STORE_CTX *ctx))
-        {
-        s->verify_mode=mode;
-        if (callback != NULL)
-                s->verify_callback=callback;
-        }
-
-void SSL_set_verify_depth(SSL *s,int depth)
-        {
-        s->verify_depth=depth;
-        }
-
-void SSL_set_read_ahead(SSL *s,int yes)
-        {
-        s->read_ahead=yes;
-        }
-
-int SSL_get_read_ahead(SSL *s)
-        {
-        return(s->read_ahead);
-        }
-
-int SSL_pending(SSL *s)
-        {
-        return(s->method->ssl_pending(s));
-        }
-
-X509 *SSL_get_peer_certificate(SSL *s)
-        {
-        X509 *r;
-        
-        if ((s == NULL) || (s->session == NULL))
-                r=NULL;
-        else
-                r=s->session->peer;
-
-        if (r == NULL) return(r);
-
-        CRYPTO_add(&r->references,1,CRYPTO_LOCK_X509);
-
-        return(r);
-        }
-
-STACK_OF(X509) *SSL_get_peer_cert_chain(SSL *s)
-        {
-        STACK_OF(X509) *r;
-        
-        if ((s == NULL) || (s->session == NULL) || (s->session->sess_cert == NULL))
-                r=NULL;
-        else
-                r=s->session->sess_cert->cert_chain;
-
-        return(r);
-        }
-
-/* Now in theory, since the calling process own 't' it should be safe to
- * modify.  We need to be able to read f without being hassled */
-void SSL_copy_session_id(SSL *t,SSL *f)
-        {
-        CERT *tmp;
-
-        /* Do we need to to SSL locking? */
-        SSL_set_session(t,SSL_get_session(f));
-
-        /* what if we are setup as SSLv2 but want to talk SSLv3 or
-         * vice-versa */
-        if (t->method != f->method)
-                {
-                t->method->ssl_free(t); /* cleanup current */
-                t->method=f->method;    /* change method */
-                t->method->ssl_new(t);  /* setup new */
-                }
-
-        tmp=t->cert;
-        if (f->cert != NULL)
-                {
-                CRYPTO_add(&f->cert->references,1,CRYPTO_LOCK_SSL_CERT);
-                t->cert=f->cert;
-                }
-        else
-                t->cert=NULL;
-        if (tmp != NULL) ssl_cert_free(tmp);
-        SSL_set_session_id_context(t,f->sid_ctx,f->sid_ctx_length);
-        }
-
-/* Fix this so it checks all the valid key/cert options */
-int SSL_CTX_check_private_key(SSL_CTX *ctx)
-        {
-        if (    (ctx == NULL) ||
-                (ctx->cert == NULL) ||
-                (ctx->cert->key->x509 == NULL))
-                {
-                SSLerr(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
-                return(0);
-                }
-        if      (ctx->cert->key->privatekey == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY,SSL_R_NO_PRIVATE_KEY_ASSIGNED);
-                return(0);
-                }
-        return(X509_check_private_key(ctx->cert->key->x509, ctx->cert->key->privatekey));
-        }
-
-/* Fix this function so that it takes an optional type parameter */
-int SSL_check_private_key(SSL *ssl)
-        {
-        if (ssl == NULL)
-                {
-                SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (ssl->cert == NULL)
-                {
-                SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
-                return 0;
-                }
-        if (ssl->cert->key->x509 == NULL)
-                {
-                SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,SSL_R_NO_CERTIFICATE_ASSIGNED);
-                return(0);
-                }
-        if (ssl->cert->key->privatekey == NULL)
-                {
-                SSLerr(SSL_F_SSL_CHECK_PRIVATE_KEY,SSL_R_NO_PRIVATE_KEY_ASSIGNED);
-                return(0);
-                }
-        return(X509_check_private_key(ssl->cert->key->x509,
-                ssl->cert->key->privatekey));
-        }
-
-int SSL_accept(SSL *s)
-        {
-        if (s->handshake_func == 0)
-                /* Not properly initialized yet */
-                SSL_set_accept_state(s);
-
-        return(s->method->ssl_accept(s));
-        }
-
-int SSL_connect(SSL *s)
-        {
-        if (s->handshake_func == 0)
-                /* Not properly initialized yet */
-                SSL_set_connect_state(s);
-
-        return(s->method->ssl_connect(s));
-        }
-
-long SSL_get_default_timeout(SSL *s)
-        {
-        return(s->method->get_timeout());
-        }
-
-int SSL_read(SSL *s,char *buf,int num)
-        {
-        if (s->handshake_func == 0)
-                {
-                SSLerr(SSL_F_SSL_READ, SSL_R_UNINITIALIZED);
-                return -1;
-                }
-
-        if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
-                {
-                s->rwstate=SSL_NOTHING;
-                return(0);
-                }
-        return(s->method->ssl_read(s,buf,num));
-        }
-
-int SSL_peek(SSL *s,char *buf,int num)
-        {
-        if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
-                {
-                return(0);
-                }
-        return(s->method->ssl_peek(s,buf,num));
-        }
-
-int SSL_write(SSL *s,const char *buf,int num)
-        {
-        if (s->handshake_func == 0)
-                {
-                SSLerr(SSL_F_SSL_WRITE, SSL_R_UNINITIALIZED);
-                return -1;
-                }
-
-        if (s->shutdown & SSL_SENT_SHUTDOWN)
-                {
-                s->rwstate=SSL_NOTHING;
-                SSLerr(SSL_F_SSL_WRITE,SSL_R_PROTOCOL_IS_SHUTDOWN);
-                return(-1);
-                }
-        return(s->method->ssl_write(s,buf,num));
-        }
-
-int SSL_shutdown(SSL *s)
-        {
-        /* Note that this function behaves differently from what one might
-         * expect.  Return values are 0 for no success (yet),
-         * 1 for success; but calling it once is usually not enough,
-         * even if blocking I/O is used (see ssl3_shutdown).
-         */
-
-        if (s->handshake_func == 0)
-                {
-                SSLerr(SSL_F_SSL_SHUTDOWN, SSL_R_UNINITIALIZED);
-                return -1;
-                }
-
-        if ((s != NULL) && !SSL_in_init(s))
-                return(s->method->ssl_shutdown(s));
-        else
-                return(1);
-        }
-
-int SSL_renegotiate(SSL *s)
-        {
-        s->new_session=1;
-        return(s->method->ssl_renegotiate(s));
-        }
-
-long SSL_ctrl(SSL *s,int cmd,long larg,char *parg)
-        {
-        long l;
-
-        switch (cmd)
-                {
-        case SSL_CTRL_GET_READ_AHEAD:
-                return(s->read_ahead);
-        case SSL_CTRL_SET_READ_AHEAD:
-                l=s->read_ahead;
-                s->read_ahead=larg;
-                return(l);
-        case SSL_CTRL_OPTIONS:
-                return(s->options|=larg);
-        case SSL_CTRL_MODE:
-                return(s->mode|=larg);
-        default:
-                return(s->method->ssl_ctrl(s,cmd,larg,parg));
-                }
-        }
-
-long SSL_CTX_ctrl(SSL_CTX *ctx,int cmd,long larg,char *parg)
-        {
-        long l;
-
-        switch (cmd)
-                {
-        case SSL_CTRL_GET_READ_AHEAD:
-                return(ctx->read_ahead);
-        case SSL_CTRL_SET_READ_AHEAD:
-                l=ctx->read_ahead;
-                ctx->read_ahead=larg;
-                return(l);
-
-        case SSL_CTRL_SET_SESS_CACHE_SIZE:
-                l=ctx->session_cache_size;
-                ctx->session_cache_size=larg;
-                return(l);
-        case SSL_CTRL_GET_SESS_CACHE_SIZE:
-                return(ctx->session_cache_size);
-        case SSL_CTRL_SET_SESS_CACHE_MODE:
-                l=ctx->session_cache_mode;
-                ctx->session_cache_mode=larg;
-                return(l);
-        case SSL_CTRL_GET_SESS_CACHE_MODE:
-                return(ctx->session_cache_mode);
-
-        case SSL_CTRL_SESS_NUMBER:
-                return(ctx->sessions->num_items);
-        case SSL_CTRL_SESS_CONNECT:
-                return(ctx->stats.sess_connect);
-        case SSL_CTRL_SESS_CONNECT_GOOD:
-                return(ctx->stats.sess_connect_good);
-        case SSL_CTRL_SESS_CONNECT_RENEGOTIATE:
-                return(ctx->stats.sess_connect_renegotiate);
-        case SSL_CTRL_SESS_ACCEPT:
-                return(ctx->stats.sess_accept);
-        case SSL_CTRL_SESS_ACCEPT_GOOD:
-                return(ctx->stats.sess_accept_good);
-        case SSL_CTRL_SESS_ACCEPT_RENEGOTIATE:
-                return(ctx->stats.sess_accept_renegotiate);
-        case SSL_CTRL_SESS_HIT:
-                return(ctx->stats.sess_hit);
-        case SSL_CTRL_SESS_CB_HIT:
-                return(ctx->stats.sess_cb_hit);
-        case SSL_CTRL_SESS_MISSES:
-                return(ctx->stats.sess_miss);
-        case SSL_CTRL_SESS_TIMEOUTS:
-                return(ctx->stats.sess_timeout);
-        case SSL_CTRL_SESS_CACHE_FULL:
-                return(ctx->stats.sess_cache_full);
-        case SSL_CTRL_OPTIONS:
-                return(ctx->options|=larg);
-        case SSL_CTRL_MODE:
-                return(ctx->mode|=larg);
-        default:
-                return(ctx->method->ssl_ctx_ctrl(ctx,cmd,larg,parg));
-                }
-        }
-
-int ssl_cipher_id_cmp(SSL_CIPHER *a,SSL_CIPHER *b)
-        {
-        long l;
-
-        l=a->id-b->id;
-        if (l == 0L)
-                return(0);
-        else
-                return((l > 0)?1:-1);
-        }
-
-int ssl_cipher_ptr_id_cmp(SSL_CIPHER **ap,SSL_CIPHER **bp)
-        {
-        long l;
-
-        l=(*ap)->id-(*bp)->id;
-        if (l == 0L)
-                return(0);
-        else
-                return((l > 0)?1:-1);
-        }
-
-/** return a STACK of the ciphers available for the SSL and in order of
- * preference */
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s)
-        {
-        if ((s != NULL) && (s->cipher_list != NULL))
-                {
-                return(s->cipher_list);
-                }
-        else if ((s->ctx != NULL) &&
-                (s->ctx->cipher_list != NULL))
-                {
-                return(s->ctx->cipher_list);
-                }
-        return(NULL);
-        }
-
-/** return a STACK of the ciphers available for the SSL and in order of
- * algorithm id */
-STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s)
-        {
-        if ((s != NULL) && (s->cipher_list_by_id != NULL))
-                {
-                return(s->cipher_list_by_id);
-                }
-        else if ((s != NULL) && (s->ctx != NULL) &&
-                (s->ctx->cipher_list_by_id != NULL))
-                {
-                return(s->ctx->cipher_list_by_id);
-                }
-        return(NULL);
-        }
-
-/** The old interface to get the same thing as SSL_get_ciphers() */
-const char *SSL_get_cipher_list(SSL *s,int n)
-        {
-        SSL_CIPHER *c;
-        STACK_OF(SSL_CIPHER) *sk;
-
-        if (s == NULL) return(NULL);
-        sk=SSL_get_ciphers(s);
-        if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= n))
-                return(NULL);
-        c=sk_SSL_CIPHER_value(sk,n);
-        if (c == NULL) return(NULL);
-        return(c->name);
-        }
-
-/** specify the ciphers to be used by defaut by the SSL_CTX */
-int SSL_CTX_set_cipher_list(SSL_CTX *ctx,char *str)
-        {
-        STACK_OF(SSL_CIPHER) *sk;
-        
-        sk=ssl_create_cipher_list(ctx->method,&ctx->cipher_list,
-                &ctx->cipher_list_by_id,str);
-/* XXXX */
-        return((sk == NULL)?0:1);
-        }
-
-/** specify the ciphers to be used by the SSL */
-int SSL_set_cipher_list(SSL *s,char *str)
-        {
-        STACK_OF(SSL_CIPHER) *sk;
-        
-        sk=ssl_create_cipher_list(s->ctx->method,&s->cipher_list,
-                &s->cipher_list_by_id,str);
-/* XXXX */
-        return((sk == NULL)?0:1);
-        }
-
-/* works well for SSLv2, not so good for SSLv3 */
-char *SSL_get_shared_ciphers(SSL *s,char *buf,int len)
-        {
-        char *p;
-        const char *cp;
-        STACK_OF(SSL_CIPHER) *sk;
-        SSL_CIPHER *c;
-        int i;
-
-        if ((s->session == NULL) || (s->session->ciphers == NULL) ||
-                (len < 2))
-                return(NULL);
-
-        p=buf;
-        sk=s->session->ciphers;
-        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-                {
-                /* Decrement for either the ':' or a '\0' */
-                len--;
-                c=sk_SSL_CIPHER_value(sk,i);
-                for (cp=c->name; *cp; )
-                        {
-                        if (len-- == 0)
-                                {
-                                *p='\0';
-                                return(buf);
-                                }
-                        else
-                                *(p++)= *(cp++);
-                        }
-                *(p++)=':';
-                }
-        p[-1]='\0';
-        return(buf);
-        }
-
-int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p)
-        {
-        int i,j=0;
-        SSL_CIPHER *c;
-        unsigned char *q;
-
-        if (sk == NULL) return(0);
-        q=p;
-
-        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-                {
-                c=sk_SSL_CIPHER_value(sk,i);
-                j=ssl_put_cipher_by_char(s,c,p);
-                p+=j;
-                }
-        return(p-q);
-        }
-
-STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num,
-                                               STACK_OF(SSL_CIPHER) **skp)
-        {
-        SSL_CIPHER *c;
-        STACK_OF(SSL_CIPHER) *sk;
-        int i,n;
-
-        n=ssl_put_cipher_by_char(s,NULL,NULL);
-        if ((num%n) != 0)
-                {
-                SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
-                return(NULL);
-                }
-        if ((skp == NULL) || (*skp == NULL))
-                sk=sk_SSL_CIPHER_new(NULL); /* change perhaps later */
-        else
-                {
-                sk= *skp;
-                sk_SSL_CIPHER_zero(sk);
-                }
-
-        for (i=0; i<num; i+=n)
-                {
-                c=ssl_get_cipher_by_char(s,p);
-                p+=n;
-                if (c != NULL)
-                        {
-                        if (!sk_SSL_CIPHER_push(sk,c))
-                                {
-                                SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
-                        }
-                }
-
-        if (skp != NULL)
-                *skp=sk;
-        return(sk);
-err:
-        if ((skp == NULL) || (*skp == NULL))
-                sk_SSL_CIPHER_free(sk);
-        return(NULL);
-        }
-
-unsigned long SSL_SESSION_hash(SSL_SESSION *a)
-        {
-        unsigned long l;
-
-        l=(unsigned long)
-                ((unsigned int) a->session_id[0]     )|
-                ((unsigned int) a->session_id[1]<< 8L)|
-                ((unsigned long)a->session_id[2]<<16L)|
-                ((unsigned long)a->session_id[3]<<24L);
-        return(l);
-        }
-
-int SSL_SESSION_cmp(SSL_SESSION *a,SSL_SESSION *b)
-        {
-        if (a->ssl_version != b->ssl_version)
-                return(1);
-        if (a->session_id_length != b->session_id_length)
-                return(1);
-        return(memcmp(a->session_id,b->session_id,a->session_id_length));
-        }
-
-SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
-        {
-        SSL_CTX *ret=NULL;
-        
-        if (meth == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_NULL_SSL_METHOD_PASSED);
-                return(NULL);
-                }
-
-        if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
-                goto err;
-                }
-        ret=(SSL_CTX *)Malloc(sizeof(SSL_CTX));
-        if (ret == NULL)
-                goto err;
-
-        memset(ret,0,sizeof(SSL_CTX));
-
-        ret->method=meth;
-
-        ret->cert_store=NULL;
-        ret->session_cache_mode=SSL_SESS_CACHE_SERVER;
-        ret->session_cache_size=SSL_SESSION_CACHE_MAX_SIZE_DEFAULT;
-        ret->session_cache_head=NULL;
-        ret->session_cache_tail=NULL;
-
-        /* We take the system default */
-        ret->session_timeout=meth->get_timeout();
-
-        ret->new_session_cb=NULL;
-        ret->remove_session_cb=NULL;
-        ret->get_session_cb=NULL;
-
-        memset((char *)&ret->stats,0,sizeof(ret->stats));
-
-        ret->references=1;
-        ret->quiet_shutdown=0;
-
-/*      ret->cipher=NULL;*/
-/*      ret->s2->challenge=NULL;
-        ret->master_key=NULL;
-        ret->key_arg=NULL;
-        ret->s2->conn_id=NULL; */
-
-        ret->info_callback=NULL;
-
-        ret->app_verify_callback=NULL;
-        ret->app_verify_arg=NULL;
-
-        ret->read_ahead=0;
-        ret->verify_mode=SSL_VERIFY_NONE;
-        ret->verify_depth=-1; /* Don't impose a limit (but x509_lu.c does) */
-        ret->default_verify_callback=NULL;
-        if ((ret->cert=ssl_cert_new()) == NULL)
-                goto err;
-
-        ret->default_passwd_callback=NULL;
-        ret->default_passwd_callback_userdata=NULL;
-        ret->client_cert_cb=NULL;
-
-        ret->sessions=lh_new(SSL_SESSION_hash,SSL_SESSION_cmp);
-        if (ret->sessions == NULL) goto err;
-        ret->cert_store=X509_STORE_new();
-        if (ret->cert_store == NULL) goto err;
-
-        ssl_create_cipher_list(ret->method,
-                &ret->cipher_list,&ret->cipher_list_by_id,
-                SSL_DEFAULT_CIPHER_LIST);
-        if (ret->cipher_list == NULL
-            || sk_SSL_CIPHER_num(ret->cipher_list) <= 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_LIBRARY_HAS_NO_CIPHERS);
-                goto err2;
-                }
-
-        if ((ret->rsa_md5=EVP_get_digestbyname("ssl2-md5")) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES);
-                goto err2;
-                }
-        if ((ret->md5=EVP_get_digestbyname("ssl3-md5")) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES);
-                goto err2;
-                }
-        if ((ret->sha1=EVP_get_digestbyname("ssl3-sha1")) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES);
-                goto err2;
-                }
-
-        if ((ret->client_CA=sk_X509_NAME_new_null()) == NULL)
-                goto err;
-
-        CRYPTO_new_ex_data(ssl_ctx_meth,(char *)ret,&ret->ex_data);
-
-        ret->extra_certs=NULL;
-        ret->comp_methods=SSL_COMP_get_compression_methods();
-
-        return(ret);
-err:
-        SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE);
-err2:
-        if (ret != NULL) SSL_CTX_free(ret);
-        return(NULL);
-        }
-
-static void SSL_COMP_free(SSL_COMP *comp)
-    { Free(comp); }
-
-void SSL_CTX_free(SSL_CTX *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-
-        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_SSL_CTX);
-#ifdef REF_PRINT
-        REF_PRINT("SSL_CTX",a);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"SSL_CTX_free, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-        CRYPTO_free_ex_data(ssl_ctx_meth,(char *)a,&a->ex_data);
-
-        if (a->sessions != NULL)
-                {
-                SSL_CTX_flush_sessions(a,0);
-                lh_free(a->sessions);
-                }
-        if (a->cert_store != NULL)
-                X509_STORE_free(a->cert_store);
-        if (a->cipher_list != NULL)
-                sk_SSL_CIPHER_free(a->cipher_list);
-        if (a->cipher_list_by_id != NULL)
-                sk_SSL_CIPHER_free(a->cipher_list_by_id);
-        if (a->cert != NULL)
-                ssl_cert_free(a->cert);
-        if (a->client_CA != NULL)
-                sk_X509_NAME_pop_free(a->client_CA,X509_NAME_free);
-        if (a->extra_certs != NULL)
-                sk_X509_pop_free(a->extra_certs,X509_free);
-        if (a->comp_methods != NULL)
-                sk_SSL_COMP_pop_free(a->comp_methods,SSL_COMP_free);
-        Free((char *)a);
-        }
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb)
-        {
-        ctx->default_passwd_callback=cb;
-        }
-
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx,void *u)
-        {
-        ctx->default_passwd_callback_userdata=u;
-        }
-
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,int (*cb)(),char *arg)
-        {
-        /* now
-         *     int (*cb)(X509_STORE_CTX *),
-         * but should be
-         *     int (*cb)(X509_STORE_CTX *, void *arg)
-         */
-        ctx->app_verify_callback=cb;
-        ctx->app_verify_arg=arg; /* never used */
-        }
-
-void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*cb)(int, X509_STORE_CTX *))
-        {
-        ctx->verify_mode=mode;
-        ctx->default_verify_callback=cb;
-        /* This needs cleaning up EAY EAY EAY */
-        X509_STORE_set_verify_cb_func(ctx->cert_store,cb);
-        }
-
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx,int depth)
-        {
-        ctx->verify_depth=depth;
-        }
-
-void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher)
-        {
-        CERT_PKEY *cpk;
-        int rsa_enc,rsa_tmp,rsa_sign,dh_tmp,dh_rsa,dh_dsa,dsa_sign;
-        int rsa_enc_export,dh_rsa_export,dh_dsa_export;
-        int rsa_tmp_export,dh_tmp_export,kl;
-        unsigned long mask,emask;
-
-        if (c == NULL) return;
-
-        kl=SSL_C_EXPORT_PKEYLENGTH(cipher);
-
-#ifndef NO_RSA
-        rsa_tmp=(c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL);
-        rsa_tmp_export=(c->rsa_tmp_cb != NULL ||
-                (rsa_tmp && RSA_size(c->rsa_tmp)*8 <= kl));
-#else
-        rsa_tmp=rsa_tmp_export=0;
-#endif
-#ifndef NO_DH
-        dh_tmp=(c->dh_tmp != NULL || c->dh_tmp_cb != NULL);
-        dh_tmp_export=(c->dh_tmp_cb != NULL ||
-                (dh_tmp && DH_size(c->dh_tmp)*8 <= kl));
-#else
-        dh_tmp=dh_tmp_export=0;
-#endif
-
-        cpk= &(c->pkeys[SSL_PKEY_RSA_ENC]);
-        rsa_enc= (cpk->x509 != NULL && cpk->privatekey != NULL);
-        rsa_enc_export=(rsa_enc && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
-        cpk= &(c->pkeys[SSL_PKEY_RSA_SIGN]);
-        rsa_sign=(cpk->x509 != NULL && cpk->privatekey != NULL);
-        cpk= &(c->pkeys[SSL_PKEY_DSA_SIGN]);
-        dsa_sign=(cpk->x509 != NULL && cpk->privatekey != NULL);
-        cpk= &(c->pkeys[SSL_PKEY_DH_RSA]);
-        dh_rsa=  (cpk->x509 != NULL && cpk->privatekey != NULL);
-        dh_rsa_export=(dh_rsa && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
-        cpk= &(c->pkeys[SSL_PKEY_DH_DSA]);
-/* FIX THIS EAY EAY EAY */
-        dh_dsa=  (cpk->x509 != NULL && cpk->privatekey != NULL);
-        dh_dsa_export=(dh_dsa && EVP_PKEY_size(cpk->privatekey)*8 <= kl);
-
-        mask=0;
-        emask=0;
-
-#ifdef CIPHER_DEBUG
-        printf("rt=%d rte=%d dht=%d re=%d ree=%d rs=%d ds=%d dhr=%d dhd=%d\n",
-                rsa_tmp,rsa_tmp_export,dh_tmp,
-                rsa_enc,rsa_enc_export,rsa_sign,dsa_sign,dh_rsa,dh_dsa);
-#endif
-
-        if (rsa_enc || (rsa_tmp && rsa_sign))
-                mask|=SSL_kRSA;
-        if (rsa_enc_export || (rsa_tmp_export && (rsa_sign || rsa_enc)))
-                emask|=SSL_kRSA;
-
-#if 0
-        /* The match needs to be both kEDH and aRSA or aDSA, so don't worry */
-        if (    (dh_tmp || dh_rsa || dh_dsa) && 
-                (rsa_enc || rsa_sign || dsa_sign))
-                mask|=SSL_kEDH;
-        if ((dh_tmp_export || dh_rsa_export || dh_dsa_export) &&
-                (rsa_enc || rsa_sign || dsa_sign))
-                emask|=SSL_kEDH;
-#endif
-
-        if (dh_tmp_export) 
-                emask|=SSL_kEDH;
-
-        if (dh_tmp)
-                mask|=SSL_kEDH;
-
-        if (dh_rsa) mask|=SSL_kDHr;
-        if (dh_rsa_export) emask|=SSL_kDHr;
-
-        if (dh_dsa) mask|=SSL_kDHd;
-        if (dh_dsa_export) emask|=SSL_kDHd;
-
-        if (rsa_enc || rsa_sign)
-                {
-                mask|=SSL_aRSA;
-                emask|=SSL_aRSA;
-                }
-
-        if (dsa_sign)
-                {
-                mask|=SSL_aDSS;
-                emask|=SSL_aDSS;
-                }
-
-#ifdef SSL_ALLOW_ADH
-        mask|=SSL_aNULL;
-        emask|=SSL_aNULL;
-#endif
-
-        c->mask=mask;
-        c->export_mask=emask;
-        c->valid=1;
-        }
-
-/* THIS NEEDS CLEANING UP */
-X509 *ssl_get_server_send_cert(SSL *s)
-        {
-        unsigned long alg,mask,kalg;
-        CERT *c;
-        int i,is_export;
-
-        c=s->cert;
-        ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
-        alg=s->s3->tmp.new_cipher->algorithms;
-        is_export=SSL_IS_EXPORT(alg);
-        mask=is_export?c->export_mask:c->mask;
-        kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);
-
-        if      (kalg & SSL_kDHr)
-                i=SSL_PKEY_DH_RSA;
-        else if (kalg & SSL_kDHd)
-                i=SSL_PKEY_DH_DSA;
-        else if (kalg & SSL_aDSS)
-                i=SSL_PKEY_DSA_SIGN;
-        else if (kalg & SSL_aRSA)
-                {
-                if (c->pkeys[SSL_PKEY_RSA_ENC].x509 == NULL)
-                        i=SSL_PKEY_RSA_SIGN;
-                else
-                        i=SSL_PKEY_RSA_ENC;
-                }
-        else /* if (kalg & SSL_aNULL) */
-                {
-                SSLerr(SSL_F_SSL_GET_SERVER_SEND_CERT,SSL_R_INTERNAL_ERROR);
-                return(NULL);
-                }
-        if (c->pkeys[i].x509 == NULL) return(NULL);
-        return(c->pkeys[i].x509);
-        }
-
-EVP_PKEY *ssl_get_sign_pkey(SSL *s,SSL_CIPHER *cipher)
-        {
-        unsigned long alg;
-        CERT *c;
-
-        alg=cipher->algorithms;
-        c=s->cert;
-
-        if ((alg & SSL_aDSS) &&
-                (c->pkeys[SSL_PKEY_DSA_SIGN].privatekey != NULL))
-                return(c->pkeys[SSL_PKEY_DSA_SIGN].privatekey);
-        else if (alg & SSL_aRSA)
-                {
-                if (c->pkeys[SSL_PKEY_RSA_SIGN].privatekey != NULL)
-                        return(c->pkeys[SSL_PKEY_RSA_SIGN].privatekey);
-                else if (c->pkeys[SSL_PKEY_RSA_ENC].privatekey != NULL)
-                        return(c->pkeys[SSL_PKEY_RSA_ENC].privatekey);
-                else
-                        return(NULL);
-                }
-        else /* if (alg & SSL_aNULL) */
-                {
-                SSLerr(SSL_F_SSL_GET_SIGN_PKEY,SSL_R_INTERNAL_ERROR);
-                return(NULL);
-                }
-        }
-
-void ssl_update_cache(SSL *s,int mode)
-        {
-        int i;
-
-        /* If the session_id_length is 0, we are not supposed to cache it,
-         * and it would be rather hard to do anyway :-) */
-        if (s->session->session_id_length == 0) return;
-
-        if ((s->ctx->session_cache_mode & mode)
-                && (!s->hit)
-                && SSL_CTX_add_session(s->ctx,s->session)
-                && (s->ctx->new_session_cb != NULL))
-                {
-                CRYPTO_add(&s->session->references,1,CRYPTO_LOCK_SSL_SESSION);
-                if (!s->ctx->new_session_cb(s,s->session))
-                        SSL_SESSION_free(s->session);
-                }
-
-        /* auto flush every 255 connections */
-        i=s->ctx->session_cache_mode;
-        if ((!(i & SSL_SESS_CACHE_NO_AUTO_CLEAR)) &&
-                ((i & mode) == mode))
-                {
-                if (  (((mode & SSL_SESS_CACHE_CLIENT)
-                        ?s->ctx->stats.sess_connect_good
-                        :s->ctx->stats.sess_accept_good) & 0xff) == 0xff)
-                        {
-                        SSL_CTX_flush_sessions(s->ctx,time(NULL));
-                        }
-                }
-        }
-
-SSL_METHOD *SSL_get_ssl_method(SSL *s)
-        {
-        return(s->method);
-        }
-
-int SSL_set_ssl_method(SSL *s,SSL_METHOD *meth)
-        {
-        int conn= -1;
-        int ret=1;
-
-        if (s->method != meth)
-                {
-                if (s->handshake_func != NULL)
-                        conn=(s->handshake_func == s->method->ssl_connect);
-
-                if (s->method->version == meth->version)
-                        s->method=meth;
-                else
-                        {
-                        s->method->ssl_free(s);
-                        s->method=meth;
-                        ret=s->method->ssl_new(s);
-                        }
-
-                if (conn == 1)
-                        s->handshake_func=meth->ssl_connect;
-                else if (conn == 0)
-                        s->handshake_func=meth->ssl_accept;
-                }
-        return(ret);
-        }
-
-int SSL_get_error(SSL *s,int i)
-        {
-        int reason;
-        unsigned long l;
-        BIO *bio;
-
-        if (i > 0) return(SSL_ERROR_NONE);
-
-        /* Make things return SSL_ERROR_SYSCALL when doing SSL_do_handshake
-         * etc, where we do encode the error */
-        if ((l=ERR_peek_error()) != 0)
-                {
-                if (ERR_GET_LIB(l) == ERR_LIB_SYS)
-                        return(SSL_ERROR_SYSCALL);
-                else
-                        return(SSL_ERROR_SSL);
-                }
-
-        if ((i < 0) && SSL_want_read(s))
-                {
-                bio=SSL_get_rbio(s);
-                if (BIO_should_read(bio))
-                        return(SSL_ERROR_WANT_READ);
-                else if (BIO_should_write(bio))
-                        /* This one doesn't make too much sense ... We never try
-                         * to write to the rbio, and an application program where
-                         * rbio and wbio are separate couldn't even know what it
-                         * should wait for.
-                         * However if we ever set s->rwstate incorrectly
-                         * (so that we have SSL_want_read(s) instead of
-                         * SSL_want_write(s)) and rbio and wbio *are* the same,
-                         * this test works around that bug; so it might be safer
-                         * to keep it. */
-                        return(SSL_ERROR_WANT_WRITE);
-                else if (BIO_should_io_special(bio))
-                        {
-                        reason=BIO_get_retry_reason(bio);
-                        if (reason == BIO_RR_CONNECT)
-                                return(SSL_ERROR_WANT_CONNECT);
-                        else
-                                return(SSL_ERROR_SYSCALL); /* unknown */
-                        }
-                }
-
-        if ((i < 0) && SSL_want_write(s))
-                {
-                bio=SSL_get_wbio(s);
-                if (BIO_should_write(bio))
-                        return(SSL_ERROR_WANT_WRITE);
-                else if (BIO_should_read(bio))
-                        /* See above (SSL_want_read(s) with BIO_should_write(bio)) */
-                        return(SSL_ERROR_WANT_READ);
-                else if (BIO_should_io_special(bio))
-                        {
-                        reason=BIO_get_retry_reason(bio);
-                        if (reason == BIO_RR_CONNECT)
-                                return(SSL_ERROR_WANT_CONNECT);
-                        else
-                                return(SSL_ERROR_SYSCALL);
-                        }
-                }
-        if ((i < 0) && SSL_want_x509_lookup(s))
-                {
-                return(SSL_ERROR_WANT_X509_LOOKUP);
-                }
-
-        if (i == 0)
-                {
-                if (s->version == SSL2_VERSION)
-                        {
-                        /* assume it is the socket being closed */
-                        return(SSL_ERROR_ZERO_RETURN);
-                        }
-                else
-                        {
-                        if ((s->shutdown & SSL_RECEIVED_SHUTDOWN) &&
-                                (s->s3->warn_alert == SSL_AD_CLOSE_NOTIFY))
-                                return(SSL_ERROR_ZERO_RETURN);
-                        }
-                }
-        return(SSL_ERROR_SYSCALL);
-        }
-
-int SSL_do_handshake(SSL *s)
-        {
-        int ret=1;
-
-        if (s->handshake_func == NULL)
-                {
-                SSLerr(SSL_F_SSL_DO_HANDSHAKE,SSL_R_CONNECTION_TYPE_NOT_SET);
-                return(-1);
-                }
-
-        s->method->ssl_renegotiate_check(s);
-
-        if (SSL_in_init(s) || SSL_in_before(s))
-                {
-                ret=s->handshake_func(s);
-                }
-        return(ret);
-        }
-
-/* For the next 2 functions, SSL_clear() sets shutdown and so
- * one of these calls will reset it */
-void SSL_set_accept_state(SSL *s)
-        {
-        s->server=1;
-        s->shutdown=0;
-        s->state=SSL_ST_ACCEPT|SSL_ST_BEFORE;
-        s->handshake_func=s->method->ssl_accept;
-        /* clear the current cipher */
-        ssl_clear_cipher_ctx(s);
-        }
-
-void SSL_set_connect_state(SSL *s)
-        {
-        s->server=0;
-        s->shutdown=0;
-        s->state=SSL_ST_CONNECT|SSL_ST_BEFORE;
-        s->handshake_func=s->method->ssl_connect;
-        /* clear the current cipher */
-        ssl_clear_cipher_ctx(s);
-        }
-
-int ssl_undefined_function(SSL *s)
-        {
-        SSLerr(SSL_F_SSL_UNDEFINED_FUNCTION,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return(0);
-        }
-
-SSL_METHOD *ssl_bad_method(int ver)
-        {
-        SSLerr(SSL_F_SSL_BAD_METHOD,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-        return(NULL);
-        }
-
-char *SSL_get_version(SSL *s)
-        {
-        if (s->version == TLS1_VERSION)
-                return("TLSv1");
-        else if (s->version == SSL3_VERSION)
-                return("SSLv3");
-        else if (s->version == SSL2_VERSION)
-                return("SSLv2");
-        else
-                return("unknown");
-        }
-
-SSL *SSL_dup(SSL *s)
-        {
-        STACK_OF(X509_NAME) *sk;
-        X509_NAME *xn;
-        SSL *ret;
-        int i;
-                 
-        if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL)
-            return(NULL);
-                          
-        if (s->session != NULL)
-                {
-                /* This copies session-id, SSL_METHOD, sid_ctx, and 'cert' */
-                SSL_copy_session_id(ret,s);
-                }
-        else
-                {
-                /* No session has been established yet, so we have to expect
-                 * that s->cert or ret->cert will be changed later --
-                 * they should not both point to the same object,
-                 * and thus we can't use SSL_copy_session_id. */
-
-                ret->method = s->method;
-                ret->method->ssl_new(ret);
-
-                if (s->cert != NULL)
-                        {
-                        ret->cert = ssl_cert_dup(s->cert);
-                        if (ret->cert == NULL)
-                                goto err;
-                        }
-                                
-                SSL_set_session_id_context(ret,
-                        s->sid_ctx, s->sid_ctx_length);
-                }
-
-        SSL_set_read_ahead(ret,SSL_get_read_ahead(s));
-        SSL_set_verify(ret,SSL_get_verify_mode(s),
-                SSL_get_verify_callback(s));
-        SSL_set_verify_depth(ret,SSL_get_verify_depth(s));
-
-        SSL_set_info_callback(ret,SSL_get_info_callback(s));
-        
-        ret->debug=s->debug;
-        ret->options=s->options;
-
-        /* copy app data, a little dangerous perhaps */
-        if (!CRYPTO_dup_ex_data(ssl_meth,&ret->ex_data,&s->ex_data))
-                goto err;
-
-        /* setup rbio, and wbio */
-        if (s->rbio != NULL)
-                {
-                if (!BIO_dup_state(s->rbio,(char *)&ret->rbio))
-                        goto err;
-                }
-        if (s->wbio != NULL)
-                {
-                if (s->wbio != s->rbio)
-                        {
-                        if (!BIO_dup_state(s->wbio,(char *)&ret->wbio))
-                                goto err;
-                        }
-                else
-                        ret->wbio=ret->rbio;
-                }
-
-        /* dup the cipher_list and cipher_list_by_id stacks */
-        if (s->cipher_list != NULL)
-                {
-                if ((ret->cipher_list=sk_SSL_CIPHER_dup(s->cipher_list)) == NULL)
-                        goto err;
-                }
-        if (s->cipher_list_by_id != NULL)
-                if ((ret->cipher_list_by_id=sk_SSL_CIPHER_dup(s->cipher_list_by_id))
-                        == NULL)
-                        goto err;
-
-        /* Dup the client_CA list */
-        if (s->client_CA != NULL)
-                {
-                if ((sk=sk_X509_NAME_dup(s->client_CA)) == NULL) goto err;
-                ret->client_CA=sk;
-                for (i=0; i<sk_X509_NAME_num(sk); i++)
-                        {
-                        xn=sk_X509_NAME_value(sk,i);
-                        if (sk_X509_NAME_set(sk,i,X509_NAME_dup(xn)) == NULL)
-                                {
-                                X509_NAME_free(xn);
-                                goto err;
-                                }
-                        }
-                }
-
-        ret->shutdown=s->shutdown;
-        ret->state=s->state;
-        ret->handshake_func=s->handshake_func;
-        ret->server=s->server;
-
-        if (0)
-                {
-err:
-                if (ret != NULL) SSL_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
-void ssl_clear_cipher_ctx(SSL *s)
-        {
-        if (s->enc_read_ctx != NULL)
-                {
-                EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
-                Free(s->enc_read_ctx);
-                s->enc_read_ctx=NULL;
-                }
-        if (s->enc_write_ctx != NULL)
-                {
-                EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
-                Free(s->enc_write_ctx);
-                s->enc_write_ctx=NULL;
-                }
-        if (s->expand != NULL)
-                {
-                COMP_CTX_free(s->expand);
-                s->expand=NULL;
-                }
-        if (s->compress != NULL)
-                {
-                COMP_CTX_free(s->compress);
-                s->compress=NULL;
-                }
-        }
-
-/* Fix this function so that it takes an optional type parameter */
-X509 *SSL_get_certificate(SSL *s)
-        {
-        if (s->cert != NULL)
-                return(s->cert->key->x509);
-        else
-                return(NULL);
-        }
-
-/* Fix this function so that it takes an optional type parameter */
-EVP_PKEY *SSL_get_privatekey(SSL *s)
-        {
-        if (s->cert != NULL)
-                return(s->cert->key->privatekey);
-        else
-                return(NULL);
-        }
-
-SSL_CIPHER *SSL_get_current_cipher(SSL *s)
-        {
-        if ((s->session != NULL) && (s->session->cipher != NULL))
-                return(s->session->cipher);
-        return(NULL);
-        }
-
-int ssl_init_wbio_buffer(SSL *s,int push)
-        {
-        BIO *bbio;
-
-        if (s->bbio == NULL)
-                {
-                bbio=BIO_new(BIO_f_buffer());
-                if (bbio == NULL) return(0);
-                s->bbio=bbio;
-                }
-        else
-                {
-                bbio=s->bbio;
-                if (s->bbio == s->wbio)
-                        s->wbio=BIO_pop(s->wbio);
-                }
-        (void)BIO_reset(bbio);
-/*      if (!BIO_set_write_buffer_size(bbio,16*1024)) */
-        if (!BIO_set_read_buffer_size(bbio,1))
-                {
-                SSLerr(SSL_F_SSL_INIT_WBIO_BUFFER,ERR_R_BUF_LIB);
-                return(0);
-                }
-        if (push)
-                {
-                if (s->wbio != bbio)
-                        s->wbio=BIO_push(bbio,s->wbio);
-                }
-        else
-                {
-                if (s->wbio == bbio)
-                        s->wbio=BIO_pop(bbio);
-                }
-        return(1);
-        }
-
-void ssl_free_wbio_buffer(SSL *s)
-        {
-        BIO *under;
-
-        if (s->bbio == NULL) return;
-
-        if (s->bbio == s->wbio)
-                {
-                /* remove buffering */
-                under=BIO_pop(s->wbio);
-                if (under != NULL)
-                        s->wbio=under;
-                else
-                        abort(); /* ok */
-                }
-        BIO_free(s->bbio);
-        s->bbio=NULL;
-        }
-        
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx,int mode)
-        {
-        ctx->quiet_shutdown=mode;
-        }
-
-int SSL_CTX_get_quiet_shutdown(SSL_CTX *ctx)
-        {
-        return(ctx->quiet_shutdown);
-        }
-
-void SSL_set_quiet_shutdown(SSL *s,int mode)
-        {
-        s->quiet_shutdown=mode;
-        }
-
-int SSL_get_quiet_shutdown(SSL *s)
-        {
-        return(s->quiet_shutdown);
-        }
-
-void SSL_set_shutdown(SSL *s,int mode)
-        {
-        s->shutdown=mode;
-        }
-
-int SSL_get_shutdown(SSL *s)
-        {
-        return(s->shutdown);
-        }
-
-int SSL_version(SSL *s)
-        {
-        return(s->version);
-        }
-
-SSL_CTX *SSL_get_SSL_CTX(SSL *ssl)
-        {
-        return(ssl->ctx);
-        }
-
-#ifndef NO_STDIO
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
-        {
-        return(X509_STORE_set_default_paths(ctx->cert_store));
-        }
-
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-                const char *CApath)
-        {
-        return(X509_STORE_load_locations(ctx->cert_store,CAfile,CApath));
-        }
-#endif
-
-void SSL_set_info_callback(SSL *ssl,void (*cb)())
-        {
-        ssl->info_callback=cb;
-        }
-
-void (*SSL_get_info_callback(SSL *ssl))(void)
-        {
-        return((void (*)())ssl->info_callback);
-        }
-
-int SSL_state(SSL *ssl)
-        {
-        return(ssl->state);
-        }
-
-void SSL_set_verify_result(SSL *ssl,long arg)
-        {
-        ssl->verify_result=arg;
-        }
-
-long SSL_get_verify_result(SSL *ssl)
-        {
-        return(ssl->verify_result);
-        }
-
-int SSL_get_ex_new_index(long argl,char *argp,int (*new_func)(),
-                         int (*dup_func)(),void (*free_func)())
-        {
-        ssl_meth_num++;
-        return(CRYPTO_get_ex_new_index(ssl_meth_num-1,
-                &ssl_meth,argl,argp,new_func,dup_func,free_func));
-        }
-
-int SSL_set_ex_data(SSL *s,int idx,void *arg)
-        {
-        return(CRYPTO_set_ex_data(&s->ex_data,idx,arg));
-        }
-
-void *SSL_get_ex_data(SSL *s,int idx)
-        {
-        return(CRYPTO_get_ex_data(&s->ex_data,idx));
-        }
-
-int SSL_CTX_get_ex_new_index(long argl,char *argp,int (*new_func)(),
-                             int (*dup_func)(),void (*free_func)())
-        {
-        ssl_ctx_meth_num++;
-        return(CRYPTO_get_ex_new_index(ssl_ctx_meth_num-1,
-                &ssl_ctx_meth,argl,argp,new_func,dup_func,free_func));
-        }
-
-int SSL_CTX_set_ex_data(SSL_CTX *s,int idx,void *arg)
-        {
-        return(CRYPTO_set_ex_data(&s->ex_data,idx,arg));
-        }
-
-void *SSL_CTX_get_ex_data(SSL_CTX *s,int idx)
-        {
-        return(CRYPTO_get_ex_data(&s->ex_data,idx));
-        }
-
-int ssl_ok(SSL *s)
-        {
-        return(1);
-        }
-
-X509_STORE *SSL_CTX_get_cert_store(SSL_CTX *ctx)
-        {
-        return(ctx->cert_store);
-        }
-
-void SSL_CTX_set_cert_store(SSL_CTX *ctx,X509_STORE *store)
-        {
-        if (ctx->cert_store != NULL)
-                X509_STORE_free(ctx->cert_store);
-        ctx->cert_store=store;
-        }
-
-int SSL_want(SSL *s)
-        {
-        return(s->rwstate);
-        }
-
-/*!
- * \brief Set the callback for generating temporary RSA keys.
- * \param ctx the SSL context.
- * \param cb the callback
- */
-
-#ifndef NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,
-                                                          int is_export,
-                                                          int keylength))
-    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
-#endif
-
-#ifndef NO_RSA
-void SSL_set_tmp_rsa_callback(SSL *ssl,RSA *(*cb)(SSL *ssl,int is_export,
-                                                          int keylength))
-    { SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
-#endif
-
-#ifdef DOXYGEN
-/*!
- * \brief The RSA temporary key callback function.
- * \param ssl the SSL session.
- * \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
- * \param keylength if \c is_export is \c TRUE, then \c keylength is the size
- * of the required key in bits.
- * \return the temporary RSA key.
- * \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback
- */
-
-RSA *cb(SSL *ssl,int is_export,int keylength)
-    {}
-#endif
-
-/*!
- * \brief Set the callback for generating temporary DH keys.
- * \param ctx the SSL context.
- * \param dh the callback
- */
-
-#ifndef NO_DH
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int is_export,
-                                                        int keylength))
-    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
-
-void SSL_set_tmp_dh_callback(SSL *ssl,DH *(*dh)(SSL *ssl,int is_export,
-                                                        int keylength))
-    { SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
-#endif
-
-#if defined(_WINDLL) && defined(WIN16)
-#include "../crypto/bio/bss_file.c"
-#endif
-
-IMPLEMENT_STACK_OF(SSL_CIPHER)
-IMPLEMENT_STACK_OF(SSL_COMP)
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
deleted file mode 100644
index 0bfd57db32..0000000000
--- a/src/lib/libssl/ssl_locl.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* ssl/ssl_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL_LOCL_H
-#define HEADER_SSL_LOCL_H
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <errno.h>
-
-#include "openssl/e_os.h"
-
-#include <openssl/buffer.h>
-#include <openssl/comp.h>
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
-#include <openssl/stack.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#define PKCS1_CHECK
-
-#define c2l(c,l)        (l = ((unsigned long)(*((c)++)))     , \
-                         l|=(((unsigned long)(*((c)++)))<< 8), \
-                         l|=(((unsigned long)(*((c)++)))<<16), \
-                         l|=(((unsigned long)(*((c)++)))<<24))
-
-/* NOTE - c is not incremented as per c2l */
-#define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24; \
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16; \
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        case 5: l2|=((unsigned long)(*(--(c))));     \
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24; \
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16; \
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        case 1: l1|=((unsigned long)(*(--(c))));     \
-                                } \
-                        }
-
-#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))
-
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24, \
-                         l|=((unsigned long)(*((c)++)))<<16, \
-                         l|=((unsigned long)(*((c)++)))<< 8, \
-                         l|=((unsigned long)(*((c)++))))
-
-#define l2n(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))
-
-/* NOTE - c is not incremented as per l2c */
-#define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        case 5: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        case 1: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                                } \
-                        }
-
-#define n2s(c,s)        ((s=(((unsigned int)(c[0]))<< 8)| \
-                            (((unsigned int)(c[1]))    )),c+=2)
-#define s2n(s,c)        ((c[0]=(unsigned char)(((s)>> 8)&0xff), \
-                          c[1]=(unsigned char)(((s)    )&0xff)),c+=2)
-
-#define n2l3(c,l)       ((l =(((unsigned long)(c[0]))<<16)| \
-                             (((unsigned long)(c[1]))<< 8)| \
-                             (((unsigned long)(c[2]))    )),c+=3)
-
-#define l2n3(l,c)       ((c[0]=(unsigned char)(((l)>>16)&0xff), \
-                          c[1]=(unsigned char)(((l)>> 8)&0xff), \
-                          c[2]=(unsigned char)(((l)    )&0xff)),c+=3)
-
-/* LOCAL STUFF */
-
-#define SSL_DECRYPT     0
-#define SSL_ENCRYPT     1
-
-#define TWO_BYTE_BIT    0x80
-#define SEC_ESC_BIT     0x40
-#define TWO_BYTE_MASK   0x7fff
-#define THREE_BYTE_MASK 0x3fff
-
-#define INC32(a)        ((a)=((a)+1)&0xffffffffL)
-#define DEC32(a)        ((a)=((a)-1)&0xffffffffL)
-#define MAX_MAC_SIZE    20 /* up from 16 for SSLv3 */
-
-#define SSL_MKEY_MASK           0x0000001FL
-#define SSL_kRSA                0x00000001L /* RSA key exchange */
-#define SSL_kDHr                0x00000002L /* DH cert RSA CA cert */
-#define SSL_kDHd                0x00000004L /* DH cert DSA CA cert */
-#define SSL_kFZA                0x00000008L
-#define SSL_kEDH                0x00000010L /* tmp DH key no DH cert */
-#define SSL_EDH                 (SSL_kEDH|(SSL_AUTH_MASK^SSL_aNULL))
-
-#define SSL_AUTH_MASK           0x000003e0L
-#define SSL_aRSA                0x00000020L /* Authenticate with RSA */
-#define SSL_aDSS                0x00000040L /* Authenticate with DSS */
-#define SSL_DSS                 SSL_aDSS
-#define SSL_aFZA                0x00000080L
-#define SSL_aNULL               0x00000100L /* no Authenticate, ADH */
-#define SSL_aDH                 0x00000200L /* no Authenticate, ADH */
-
-#define SSL_NULL                (SSL_eNULL)
-#define SSL_ADH                 (SSL_kEDH|SSL_aNULL)
-#define SSL_RSA                 (SSL_kRSA|SSL_aRSA)
-#define SSL_DH                  (SSL_kDHr|SSL_kDHd|SSL_kEDH)
-#define SSL_FZA                 (SSL_aFZA|SSL_kFZA|SSL_eFZA)
-
-#define SSL_ENC_MASK            0x0001Fc00L
-#define SSL_DES                 0x00000400L
-#define SSL_3DES                0x00000800L
-#define SSL_RC4                 0x00001000L
-#define SSL_RC2                 0x00002000L
-#define SSL_IDEA                0x00004000L
-#define SSL_eFZA                0x00008000L
-#define SSL_eNULL               0x00010000L
-
-#define SSL_MAC_MASK            0x00060000L
-#define SSL_MD5                 0x00020000L
-#define SSL_SHA1                0x00040000L
-#define SSL_SHA                 (SSL_SHA1)
-
-#define SSL_EXP_MASK            0x00300000L
-#define SSL_EXP40               0x00100000L
-#define SSL_NOT_EXP             0x00200000L
-#define SSL_EXP56               0x00300000L
-#define SSL_IS_EXPORT(a)        ((a)&SSL_EXP40)
-#define SSL_IS_EXPORT56(a)      (((a)&SSL_EXP_MASK) == SSL_EXP56)
-#define SSL_IS_EXPORT40(a)      (((a)&SSL_EXP_MASK) == SSL_EXP40)
-#define SSL_C_IS_EXPORT(c)      SSL_IS_EXPORT((c)->algorithms)
-#define SSL_C_IS_EXPORT56(c)    SSL_IS_EXPORT56((c)->algorithms)
-#define SSL_C_IS_EXPORT40(c)    SSL_IS_EXPORT40((c)->algorithms)
-#define SSL_EXPORT_KEYLENGTH(a) (SSL_IS_EXPORT40(a) ? 5 : \
-                                 ((a)&SSL_ENC_MASK) == SSL_DES ? 8 : 7)
-#define SSL_EXPORT_PKEYLENGTH(a) (SSL_IS_EXPORT40(a) ? 512 : 1024)
-#define SSL_C_EXPORT_KEYLENGTH(c)       SSL_EXPORT_KEYLENGTH((c)->algorithms)
-#define SSL_C_EXPORT_PKEYLENGTH(c)      SSL_EXPORT_PKEYLENGTH((c)->algorithms)
-
-#define SSL_SSL_MASK            0x00c00000L
-#define SSL_SSLV2               0x00400000L
-#define SSL_SSLV3               0x00800000L
-#define SSL_TLSV1               SSL_SSLV3       /* for now */
-
-#define SSL_STRONG_MASK         0x07000000L
-#define SSL_LOW                 0x01000000L
-#define SSL_MEDIUM              0x02000000L
-#define SSL_HIGH                0x04000000L
-
-/* we have used 0fffffff - 4 bits left to go */
-#define SSL_ALL                 0xffffffffL
-#define SSL_ALL_CIPHERS         (SSL_MKEY_MASK|SSL_AUTH_MASK|SSL_ENC_MASK|\
-                                SSL_MAC_MASK|SSL_EXP_MASK)
-
-/* Mostly for SSLv3 */
-#define SSL_PKEY_RSA_ENC        0
-#define SSL_PKEY_RSA_SIGN       1
-#define SSL_PKEY_DSA_SIGN       2
-#define SSL_PKEY_DH_RSA         3
-#define SSL_PKEY_DH_DSA         4
-#define SSL_PKEY_NUM            5
-
-/* SSL_kRSA <- RSA_ENC | (RSA_TMP & RSA_SIGN) |
- *          <- (EXPORT & (RSA_ENC | RSA_TMP) & RSA_SIGN)
- * SSL_kDH  <- DH_ENC & (RSA_ENC | RSA_SIGN | DSA_SIGN)
- * SSL_kEDH <- RSA_ENC | RSA_SIGN | DSA_SIGN
- * SSL_aRSA <- RSA_ENC | RSA_SIGN
- * SSL_aDSS <- DSA_SIGN
- */
-
-/*
-#define CERT_INVALID            0
-#define CERT_PUBLIC_KEY         1
-#define CERT_PRIVATE_KEY        2
-*/
-
-typedef struct cert_pkey_st
-        {
-        X509 *x509;
-        EVP_PKEY *privatekey;
-        } CERT_PKEY;
-
-typedef struct cert_st
-        {
-        /* Current active set */
-        CERT_PKEY *key; /* ALWAYS points to an element of the pkeys array
-                                         * Probably it would make more sense to store
-                                         * an index, not a pointer. */
-
-        /* The following masks are for the key and auth
-         * algorithms that are supported by the certs below */
-        int valid;
-        unsigned long mask;
-        unsigned long export_mask;
-#ifndef NO_RSA
-        RSA *rsa_tmp;
-        RSA *(*rsa_tmp_cb)(SSL *ssl,int is_export,int keysize);
-#endif
-#ifndef NO_DH
-        DH *dh_tmp;
-        DH *(*dh_tmp_cb)(SSL *ssl,int is_export,int keysize);
-#endif
-
-        CERT_PKEY pkeys[SSL_PKEY_NUM];
-
-        int references; /* >1 only if SSL_copy_session_id is used */
-        } CERT;
-
-
-typedef struct sess_cert_st
-        {
-        STACK_OF(X509) *cert_chain; /* as received from peer (not for SSL2) */
-
-        /* The 'peer_...' members are used only by clients. */
-        int peer_cert_type;
-
-        CERT_PKEY *peer_key; /* points to an element of peer_pkeys (never NULL!) */
-        CERT_PKEY peer_pkeys[SSL_PKEY_NUM];
-        /* Obviously we don't have the private keys of these,
-         * so maybe we shouldn't even use the CERT_PKEY type here. */
-
-#ifndef NO_RSA
-        RSA *peer_rsa_tmp; /* not used for SSL 2 */
-#endif
-#ifndef NO_DH
-        DH *peer_dh_tmp; /* not used for SSL 2 */
-#endif
-
-        int references; /* actually always 1 at the moment */
-        } SESS_CERT;
-
-
-/*#define MAC_DEBUG     */
-
-/*#define ERR_DEBUG     */
-/*#define ABORT_DEBUG   */
-/*#define PKT_DEBUG 1   */
-/*#define DES_DEBUG     */
-/*#define DES_OFB_DEBUG */
-/*#define SSL_DEBUG     */
-/*#define RSA_DEBUG     */ 
-/*#define IDEA_DEBUG    */ 
-
-#define FP_ICC  (int (*)(const void *,const void *))
-#define ssl_put_cipher_by_char(ssl,ciph,ptr) \
-                ((ssl)->method->put_cipher_by_char((ciph),(ptr)))
-#define ssl_get_cipher_by_char(ssl,ptr) \
-                ((ssl)->method->get_cipher_by_char(ptr))
-
-/* This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff
- * It is a bit of a mess of functions, but hell, think of it as
- * an opaque strucute :-) */
-typedef struct ssl3_enc_method
-        {
-        int (*enc)();
-        int (*mac)();
-        int (*setup_key_block)();
-        int (*generate_master_secret)();
-        int (*change_cipher_state)();
-        int (*final_finish_mac)();
-        int finish_mac_length;
-        int (*cert_verify_mac)();
-        unsigned char client_finished[20];
-        int client_finished_len;
-        unsigned char server_finished[20];
-        int server_finished_len;
-        int (*alert_value)();
-        } SSL3_ENC_METHOD;
-
-/* Used for holding the relevant compression methods loaded into SSL_CTX */
-typedef struct ssl3_comp_st
-        {
-        int comp_id;    /* The identifer byte for this compression type */
-        char *name;     /* Text name used for the compression type */
-        COMP_METHOD *method; /* The method :-) */
-        } SSL3_COMP;
-
-OPENSSL_EXTERN SSL3_ENC_METHOD ssl3_undef_enc_method;
-OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[];
-OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[];
-
-#ifdef VMS
-#undef SSL_COMP_get_compression_methods
-#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods
-#endif
-
-
-SSL_METHOD *ssl_bad_method(int ver);
-SSL_METHOD *sslv2_base_method(void);
-SSL_METHOD *sslv23_base_method(void);
-SSL_METHOD *sslv3_base_method(void);
-
-void ssl_clear_cipher_ctx(SSL *s);
-int ssl_clear_bad_session(SSL *s);
-CERT *ssl_cert_new(void);
-CERT *ssl_cert_dup(CERT *cert);
-int ssl_cert_inst(CERT **o);
-void ssl_cert_free(CERT *c);
-SESS_CERT *ssl_sess_cert_new(void);
-void ssl_sess_cert_free(SESS_CERT *sc);
-int ssl_set_peer_cert_type(SESS_CERT *c, int type);
-int ssl_get_new_session(SSL *s, int session);
-int ssl_get_prev_session(SSL *s, unsigned char *session,int len);
-int ssl_cipher_id_cmp(SSL_CIPHER *a,SSL_CIPHER *b);
-int ssl_cipher_ptr_id_cmp(SSL_CIPHER **ap,SSL_CIPHER **bp);
-STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num,
-                                               STACK_OF(SSL_CIPHER) **skp);
-int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p);
-STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_METHOD *meth,
-                                             STACK_OF(SSL_CIPHER) **pref,
-                                             STACK_OF(SSL_CIPHER) **sorted,
-                                             char *str);
-void ssl_update_cache(SSL *s, int mode);
-int ssl_cipher_get_evp(SSL_SESSION *s,const EVP_CIPHER **enc,const EVP_MD **md,
-                       SSL_COMP **comp);
-int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk);
-int ssl_undefined_function(SSL *s);
-X509 *ssl_get_server_send_cert(SSL *);
-EVP_PKEY *ssl_get_sign_pkey(SSL *,SSL_CIPHER *);
-int ssl_cert_type(X509 *x,EVP_PKEY *pkey);
-void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher);
-STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
-int ssl_verify_alarm_type(long type);
-
-int ssl2_enc_init(SSL *s, int client);
-void ssl2_generate_key_material(SSL *s);
-void ssl2_enc(SSL *s,int send_data);
-void ssl2_mac(SSL *s,unsigned char *mac,int send_data);
-SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p);
-int ssl2_put_cipher_by_char(const SSL_CIPHER *c,unsigned char *p);
-int ssl2_part_read(SSL *s, unsigned long f, int i);
-int ssl2_do_write(SSL *s);
-int ssl2_set_certificate(SSL *s, int type, int len, unsigned char *data);
-void ssl2_return_error(SSL *s,int reason);
-void ssl2_write_error(SSL *s);
-int ssl2_num_ciphers(void);
-SSL_CIPHER *ssl2_get_cipher(unsigned int u);
-int     ssl2_new(SSL *s);
-void    ssl2_free(SSL *s);
-int     ssl2_accept(SSL *s);
-int     ssl2_connect(SSL *s);
-int     ssl2_read(SSL *s, void *buf, int len);
-int     ssl2_peek(SSL *s, char *buf, int len);
-int     ssl2_write(SSL *s, const void *buf, int len);
-int     ssl2_shutdown(SSL *s);
-void    ssl2_clear(SSL *s);
-long    ssl2_ctrl(SSL *s,int cmd, long larg, char *parg);
-long    ssl2_ctx_ctrl(SSL_CTX *s,int cmd, long larg, char *parg);
-int     ssl2_pending(SSL *s);
-
-SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
-int ssl3_put_cipher_by_char(const SSL_CIPHER *c,unsigned char *p);
-void ssl3_init_finished_mac(SSL *s);
-int ssl3_send_server_certificate(SSL *s);
-int ssl3_get_finished(SSL *s,int state_a,int state_b);
-int ssl3_setup_key_block(SSL *s);
-int ssl3_send_change_cipher_spec(SSL *s,int state_a,int state_b);
-int ssl3_change_cipher_state(SSL *s,int which);
-void ssl3_cleanup_key_block(SSL *s);
-int ssl3_do_write(SSL *s,int type);
-void ssl3_send_alert(SSL *s,int level, int desc);
-int ssl3_generate_master_secret(SSL *s, unsigned char *out,
-        unsigned char *p, int len);
-int ssl3_get_req_cert_type(SSL *s,unsigned char *p);
-long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
-int ssl3_send_finished(SSL *s, int a, int b, unsigned char *sender,int slen);
-int ssl3_num_ciphers(void);
-SSL_CIPHER *ssl3_get_cipher(unsigned int u);
-int ssl3_renegotiate(SSL *ssl); 
-int ssl3_renegotiate_check(SSL *ssl); 
-int ssl3_dispatch_alert(SSL *s);
-int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len);
-int ssl3_part_read(SSL *s, int i);
-int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
-int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1,EVP_MD_CTX *ctx2,
-        unsigned char *sender, int slen,unsigned char *p);
-int ssl3_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p);
-void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
-int ssl3_enc(SSL *s, int send_data);
-int ssl3_mac(SSL *ssl, unsigned char *md, int send_data);
-unsigned long ssl3_output_cert_chain(SSL *s, X509 *x);
-SSL_CIPHER *ssl3_choose_cipher(SSL *ssl,STACK_OF(SSL_CIPHER) *have,
-                               STACK_OF(SSL_CIPHER) *pref);
-int     ssl3_setup_buffers(SSL *s);
-int     ssl3_new(SSL *s);
-void    ssl3_free(SSL *s);
-int     ssl3_accept(SSL *s);
-int     ssl3_connect(SSL *s);
-int     ssl3_read(SSL *s, void *buf, int len);
-int     ssl3_peek(SSL *s,char *buf, int len);
-int     ssl3_write(SSL *s, const void *buf, int len);
-int     ssl3_shutdown(SSL *s);
-void    ssl3_clear(SSL *s);
-long    ssl3_ctrl(SSL *s,int cmd, long larg, char *parg);
-long    ssl3_ctx_ctrl(SSL_CTX *s,int cmd, long larg, char *parg);
-int     ssl3_pending(SSL *s);
-
-int ssl23_accept(SSL *s);
-int ssl23_connect(SSL *s);
-int ssl23_read_bytes(SSL *s, int n);
-int ssl23_write_bytes(SSL *s);
-
-int tls1_new(SSL *s);
-void tls1_free(SSL *s);
-void tls1_clear(SSL *s);
-long tls1_ctrl(SSL *s,int cmd, long larg, char *parg);
-SSL_METHOD *tlsv1_base_method(void );
-
-int ssl_init_wbio_buffer(SSL *s, int push);
-void ssl_free_wbio_buffer(SSL *s);
-
-int tls1_change_cipher_state(SSL *s, int which);
-int tls1_setup_key_block(SSL *s);
-int tls1_enc(SSL *s, int snd);
-int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
-        unsigned char *str, int slen, unsigned char *p);
-int tls1_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p);
-int tls1_mac(SSL *ssl, unsigned char *md, int snd);
-int tls1_generate_master_secret(SSL *s, unsigned char *out,
-        unsigned char *p, int len);
-int tls1_alert_code(int code);
-int ssl3_alert_code(int code);
-int ssl_ok(SSL *s);
-
-SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n);
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-
-
-#endif
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
deleted file mode 100644
index 6ec7a5cdb1..0000000000
--- a/src/lib/libssl/ssl_rsa.c
+++ /dev/null
@@ -1,815 +0,0 @@
-/* ssl/ssl_rsa.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/bio.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include "ssl_locl.h"
-
-static int ssl_set_cert(CERT *c, X509 *x509);
-static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey);
-int SSL_use_certificate(SSL *ssl, X509 *x)
-        {
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ssl->cert))
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        return(ssl_set_cert(ssl->cert,x));
-        }
-
-#ifndef NO_STDIO
-int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
-        {
-        int j;
-        BIO *in;
-        int ret=0;
-        X509 *x=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if (type == SSL_FILETYPE_ASN1)
-                {
-                j=ERR_R_ASN1_LIB;
-                x=d2i_X509_bio(in,NULL);
-                }
-        else if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                x=PEM_read_bio_X509(in,NULL,ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,j);
-                goto end;
-                }
-
-        ret=SSL_use_certificate(ssl,x);
-end:
-        if (x != NULL) X509_free(x);
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_use_certificate_ASN1(SSL *ssl, unsigned char *d, int len)
-        {
-        X509 *x;
-        int ret;
-
-        x=d2i_X509(NULL,&d,(long)len);
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_CERTIFICATE_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_use_certificate(ssl,x);
-        X509_free(x);
-        return(ret);
-        }
-
-#ifndef NO_RSA
-int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
-        {
-        EVP_PKEY *pkey;
-        int ret;
-
-        if (rsa == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ssl->cert))
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        if ((pkey=EVP_PKEY_new()) == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY,ERR_R_EVP_LIB);
-                return(0);
-                }
-
-        CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
-        EVP_PKEY_assign_RSA(pkey,rsa);
-
-        ret=ssl_set_pkey(ssl->cert,pkey);
-        EVP_PKEY_free(pkey);
-        return(ret);
-        }
-#endif
-
-static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
-        {
-        int i,ok=0,bad=0;
-
-        i=ssl_cert_type(NULL,pkey);
-        if (i < 0)
-                {
-                SSLerr(SSL_F_SSL_SET_PKEY,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
-                return(0);
-                }
-
-        if (c->pkeys[i].x509 != NULL)
-                {
-                EVP_PKEY *pktmp;
-                pktmp = X509_get_pubkey(c->pkeys[i].x509);
-                EVP_PKEY_copy_parameters(pktmp,pkey);
-                EVP_PKEY_free(pktmp);
-                ERR_clear_error();
-
-#ifndef NO_RSA
-                /* Don't check the public/private key, this is mostly
-                 * for smart cards. */
-                if ((pkey->type == EVP_PKEY_RSA) &&
-                        (RSA_flags(pkey->pkey.rsa) &
-                         RSA_METHOD_FLAG_NO_CHECK))
-                         ok=1;
-                else
-#endif
-                        if (!X509_check_private_key(c->pkeys[i].x509,pkey))
-                        {
-                        if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
-                                {
-                                i=(i == SSL_PKEY_DH_RSA)?
-                                        SSL_PKEY_DH_DSA:SSL_PKEY_DH_RSA;
-
-                                if (c->pkeys[i].x509 == NULL)
-                                        ok=1;
-                                else
-                                        {
-                                        if (!X509_check_private_key(
-                                                c->pkeys[i].x509,pkey))
-                                                bad=1;
-                                        else
-                                                ok=1;
-                                        }
-                                }
-                        else
-                                bad=1;
-                        }
-                else
-                        ok=1;
-                }
-        else
-                ok=1;
-
-        if (bad)
-                {
-                X509_free(c->pkeys[i].x509);
-                c->pkeys[i].x509=NULL;
-                return(0);
-                }
-
-        if (c->pkeys[i].privatekey != NULL)
-                EVP_PKEY_free(c->pkeys[i].privatekey);
-        CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
-        c->pkeys[i].privatekey=pkey;
-        c->key= &(c->pkeys[i]);
-
-        c->valid=0;
-        return(1);
-        }
-
-#ifndef NO_RSA
-#ifndef NO_STDIO
-int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
-        {
-        int j,ret=0;
-        BIO *in;
-        RSA *rsa=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if      (type == SSL_FILETYPE_ASN1)
-                {
-                j=ERR_R_ASN1_LIB;
-                rsa=d2i_RSAPrivateKey_bio(in,NULL);
-                }
-        else if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                rsa=PEM_read_bio_RSAPrivateKey(in,NULL,
-                        ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-        if (rsa == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,j);
-                goto end;
-                }
-        ret=SSL_use_RSAPrivateKey(ssl,rsa);
-        RSA_free(rsa);
-end:
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len)
-        {
-        int ret;
-        unsigned char *p;
-        RSA *rsa;
-
-        p=d;
-        if ((rsa=d2i_RSAPrivateKey(NULL,&p,(long)len)) == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_use_RSAPrivateKey(ssl,rsa);
-        RSA_free(rsa);
-        return(ret);
-        }
-#endif /* !NO_RSA */
-
-int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
-        {
-        int ret;
-
-        if (pkey == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ssl->cert))
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        ret=ssl_set_pkey(ssl->cert,pkey);
-        return(ret);
-        }
-
-#ifndef NO_STDIO
-int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
-        {
-        int j,ret=0;
-        BIO *in;
-        EVP_PKEY *pkey=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                pkey=PEM_read_bio_PrivateKey(in,NULL,
-                        ssl->ctx->default_passwd_callback,ssl->ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-        if (pkey == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,j);
-                goto end;
-                }
-        ret=SSL_use_PrivateKey(ssl,pkey);
-        EVP_PKEY_free(pkey);
-end:
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, unsigned char *d, long len)
-        {
-        int ret;
-        unsigned char *p;
-        EVP_PKEY *pkey;
-
-        p=d;
-        if ((pkey=d2i_PrivateKey(type,NULL,&p,(long)len)) == NULL)
-                {
-                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_use_PrivateKey(ssl,pkey);
-        EVP_PKEY_free(pkey);
-        return(ret);
-        }
-
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x)
-        {
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ctx->cert))
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        return(ssl_set_cert(ctx->cert, x));
-        }
-
-static int ssl_set_cert(CERT *c, X509 *x)
-        {
-        EVP_PKEY *pkey;
-        int i,ok=0,bad=0;
-
-        pkey=X509_get_pubkey(x);
-        if (pkey == NULL)
-                {
-                SSLerr(SSL_F_SSL_SET_CERT,SSL_R_X509_LIB);
-                return(0);
-                }
-
-        i=ssl_cert_type(x,pkey);
-        if (i < 0)
-                {
-                SSLerr(SSL_F_SSL_SET_CERT,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
-                EVP_PKEY_free(pkey);
-                return(0);
-                }
-
-        if (c->pkeys[i].privatekey != NULL)
-                {
-                EVP_PKEY_copy_parameters(pkey,c->pkeys[i].privatekey);
-                ERR_clear_error();
-
-#ifndef NO_RSA
-                /* Don't check the public/private key, this is mostly
-                 * for smart cards. */
-                if ((c->pkeys[i].privatekey->type == EVP_PKEY_RSA) &&
-                        (RSA_flags(c->pkeys[i].privatekey->pkey.rsa) &
-                         RSA_METHOD_FLAG_NO_CHECK))
-                         ok=1;
-                else
-#endif
-                {
-                if (!X509_check_private_key(x,c->pkeys[i].privatekey))
-                        {
-                        if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
-                                {
-                                i=(i == SSL_PKEY_DH_RSA)?
-                                        SSL_PKEY_DH_DSA:SSL_PKEY_DH_RSA;
-
-                                if (c->pkeys[i].privatekey == NULL)
-                                        ok=1;
-                                else
-                                        {
-                                        if (!X509_check_private_key(x,
-                                                c->pkeys[i].privatekey))
-                                                bad=1;
-                                        else
-                                                ok=1;
-                                        }
-                                }
-                        else
-                                bad=1;
-                        }
-                else
-                        ok=1;
-                } /* NO_RSA */
-                }
-        else
-                ok=1;
-
-        EVP_PKEY_free(pkey);
-        if (bad)
-                {
-                EVP_PKEY_free(c->pkeys[i].privatekey);
-                c->pkeys[i].privatekey=NULL;
-                }
-
-        if (c->pkeys[i].x509 != NULL)
-                X509_free(c->pkeys[i].x509);
-        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-        c->pkeys[i].x509=x;
-        c->key= &(c->pkeys[i]);
-
-        c->valid=0;
-        return(1);
-        }
-
-#ifndef NO_STDIO
-int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
-        {
-        int j;
-        BIO *in;
-        int ret=0;
-        X509 *x=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if (type == SSL_FILETYPE_ASN1)
-                {
-                j=ERR_R_ASN1_LIB;
-                x=d2i_X509_bio(in,NULL);
-                }
-        else if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                x=PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,j);
-                goto end;
-                }
-
-        ret=SSL_CTX_use_certificate(ctx,x);
-end:
-        if (x != NULL) X509_free(x);
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, unsigned char *d)
-        {
-        X509 *x;
-        int ret;
-
-        x=d2i_X509(NULL,&d,(long)len);
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_CTX_use_certificate(ctx,x);
-        X509_free(x);
-        return(ret);
-        }
-
-#ifndef NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
-        {
-        int ret;
-        EVP_PKEY *pkey;
-
-        if (rsa == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ctx->cert))
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        if ((pkey=EVP_PKEY_new()) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY,ERR_R_EVP_LIB);
-                return(0);
-                }
-
-        CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
-        EVP_PKEY_assign_RSA(pkey,rsa);
-
-        ret=ssl_set_pkey(ctx->cert, pkey);
-        EVP_PKEY_free(pkey);
-        return(ret);
-        }
-
-#ifndef NO_STDIO
-int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
-        {
-        int j,ret=0;
-        BIO *in;
-        RSA *rsa=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if      (type == SSL_FILETYPE_ASN1)
-                {
-                j=ERR_R_ASN1_LIB;
-                rsa=d2i_RSAPrivateKey_bio(in,NULL);
-                }
-        else if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                rsa=PEM_read_bio_RSAPrivateKey(in,NULL,
-                        ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-        if (rsa == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,j);
-                goto end;
-                }
-        ret=SSL_CTX_use_RSAPrivateKey(ctx,rsa);
-        RSA_free(rsa);
-end:
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len)
-        {
-        int ret;
-        unsigned char *p;
-        RSA *rsa;
-
-        p=d;
-        if ((rsa=d2i_RSAPrivateKey(NULL,&p,(long)len)) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_CTX_use_RSAPrivateKey(ctx,rsa);
-        RSA_free(rsa);
-        return(ret);
-        }
-#endif /* !NO_RSA */
-
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
-        {
-        if (pkey == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if (!ssl_cert_inst(&ctx->cert))
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        return(ssl_set_pkey(ctx->cert,pkey));
-        }
-
-#ifndef NO_STDIO
-int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
-        {
-        int j,ret=0;
-        BIO *in;
-        EVP_PKEY *pkey=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-        if (type == SSL_FILETYPE_PEM)
-                {
-                j=ERR_R_PEM_LIB;
-                pkey=PEM_read_bio_PrivateKey(in,NULL,
-                        ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
-                }
-        else
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,SSL_R_BAD_SSL_FILETYPE);
-                goto end;
-                }
-        if (pkey == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,j);
-                goto end;
-                }
-        ret=SSL_CTX_use_PrivateKey(ctx,pkey);
-        EVP_PKEY_free(pkey);
-end:
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
-
-int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, unsigned char *d,
-             long len)
-        {
-        int ret;
-        unsigned char *p;
-        EVP_PKEY *pkey;
-
-        p=d;
-        if ((pkey=d2i_PrivateKey(type,NULL,&p,(long)len)) == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1,ERR_R_ASN1_LIB);
-                return(0);
-                }
-
-        ret=SSL_CTX_use_PrivateKey(ctx,pkey);
-        EVP_PKEY_free(pkey);
-        return(ret);
-        }
-
-
-#ifndef NO_STDIO
-/* Read a file that contains our certificate in "PEM" format,
- * possibly followed by a sequence of CA certificates that should be
- * sent to the peer in the Certificate message.
- */
-int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
-        {
-        BIO *in;
-        int ret=0;
-        X509 *x=NULL;
-
-        in=BIO_new(BIO_s_file_internal());
-        if (in == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_BUF_LIB);
-                goto end;
-                }
-
-        if (BIO_read_filename(in,file) <= 0)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_SYS_LIB);
-                goto end;
-                }
-
-        x=PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata);
-        if (x == NULL)
-                {
-                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE,ERR_R_PEM_LIB);
-                goto end;
-                }
-
-        ret=SSL_CTX_use_certificate(ctx,x);
-        if (ERR_peek_error() != 0)
-                ret = 0;  /* Key/certificate mismatch doesn't imply ret==0 ... */
-        if (ret)
-                {
-                /* If we could set up our certificate, now proceed to
-                 * the CA certificates.
-                 */
-                X509 *ca;
-                int r;
-                unsigned long err;
-                
-                if (ctx->extra_certs != NULL) 
-                        {
-                        sk_X509_pop_free(ctx->extra_certs, X509_free);
-                        ctx->extra_certs = NULL;
-                        }
-
-                while ((ca = PEM_read_bio_X509(in,NULL,ctx->default_passwd_callback,ctx->default_passwd_callback_userdata))
-                        != NULL)
-                        {
-                        r = SSL_CTX_add_extra_chain_cert(ctx, ca);
-                        if (!r) 
-                                {
-                                X509_free(ca);
-                                ret = 0;
-                                goto end;
-                                }
-                        /* Note that we must not free r if it was successfully
-                         * added to the chain (while we must free the main
-                         * certificate, since its reference count is increased
-                         * by SSL_CTX_use_certificate). */
-                        }
-                /* When the while loop ends, it's usually just EOF. */
-                err = ERR_peek_error();
-                if (ERR_GET_LIB(err) == ERR_LIB_PEM && ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
-                        (void) ERR_get_error();
-                else 
-                        ret = 0; /* some real error */
-                }
-
-end:
-        if (x != NULL) X509_free(x);
-        if (in != NULL) BIO_free(in);
-        return(ret);
-        }
-#endif
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
deleted file mode 100644
index 681499f08a..0000000000
--- a/src/lib/libssl/ssl_sess.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/* ssl/ssl_sess.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/lhash.h>
-#include <openssl/rand.h>
-#include "ssl_locl.h"
-
-static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
-static void SSL_SESSION_list_add(SSL_CTX *ctx,SSL_SESSION *s);
-static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);
-static int ssl_session_num=0;
-static STACK *ssl_session_meth=NULL;
-
-SSL_SESSION *SSL_get_session(SSL *ssl)
-        {
-        return(ssl->session);
-        }
-
-int SSL_SESSION_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-             int (*dup_func)(), void (*free_func)())
-        {
-        ssl_session_num++;
-        return(CRYPTO_get_ex_new_index(ssl_session_num-1,
-                &ssl_session_meth,
-                argl,argp,new_func,dup_func,free_func));
-        }
-
-int SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg)
-        {
-        return(CRYPTO_set_ex_data(&s->ex_data,idx,arg));
-        }
-
-void *SSL_SESSION_get_ex_data(SSL_SESSION *s, int idx)
-        {
-        return(CRYPTO_get_ex_data(&s->ex_data,idx));
-        }
-
-SSL_SESSION *SSL_SESSION_new(void)
-        {
-        SSL_SESSION *ss;
-
-        ss=(SSL_SESSION *)Malloc(sizeof(SSL_SESSION));
-        if (ss == NULL)
-                {
-                SSLerr(SSL_F_SSL_SESSION_NEW,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        memset(ss,0,sizeof(SSL_SESSION));
-
-        ss->references=1;
-        ss->timeout=60*5+4; /* 5 minute timeout by default */
-        ss->time=time(NULL);
-        ss->prev=NULL;
-        ss->next=NULL;
-        ss->compress_meth=0;
-        CRYPTO_new_ex_data(ssl_session_meth,(char *)ss,&ss->ex_data);
-        return(ss);
-        }
-
-int ssl_get_new_session(SSL *s, int session)
-        {
-        /* This gets used by clients and servers. */
-
-        SSL_SESSION *ss=NULL;
-
-        if ((ss=SSL_SESSION_new()) == NULL) return(0);
-
-        /* If the context has a default timeout, use it */
-        if (s->ctx->session_timeout == 0)
-                ss->timeout=SSL_get_default_timeout(s);
-        else
-                ss->timeout=s->ctx->session_timeout;
-
-        if (s->session != NULL)
-                {
-                SSL_SESSION_free(s->session);
-                s->session=NULL;
-                }
-
-        if (session)
-                {
-                if (s->version == SSL2_VERSION)
-                        {
-                        ss->ssl_version=SSL2_VERSION;
-                        ss->session_id_length=SSL2_SSL_SESSION_ID_LENGTH;
-                        }
-                else if (s->version == SSL3_VERSION)
-                        {
-                        ss->ssl_version=SSL3_VERSION;
-                        ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
-                        }
-                else if (s->version == TLS1_VERSION)
-                        {
-                        ss->ssl_version=TLS1_VERSION;
-                        ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
-                        }
-                else
-                        {
-                        SSLerr(SSL_F_SSL_GET_NEW_SESSION,SSL_R_UNSUPPORTED_SSL_VERSION);
-                        SSL_SESSION_free(ss);
-                        return(0);
-                        }
-
-                for (;;)
-                        {
-                        SSL_SESSION *r;
-
-                        RAND_bytes(ss->session_id,ss->session_id_length);
-                        CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
-                        r=(SSL_SESSION *)lh_retrieve(s->ctx->sessions,
-                                (char *)ss);
-                        CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
-                        if (r == NULL) break;
-                        /* else - woops a session_id match */
-                        /* XXX should also check external cache!
-                         * (But the probability of a collision is negligible, anyway...) */
-                        }
-                }
-        else
-                {
-                ss->session_id_length=0;
-                }
-
-        memcpy(ss->sid_ctx,s->sid_ctx,s->sid_ctx_length);
-        ss->sid_ctx_length=s->sid_ctx_length;
-        s->session=ss;
-        ss->ssl_version=s->version;
-
-        return(1);
-        }
-
-int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len)
-        {
-        /* This is used only by servers. */
-
-        SSL_SESSION *ret=NULL,data;
-        int fatal = 0;
-
-        /* conn_init();*/
-        data.ssl_version=s->version;
-        data.session_id_length=len;
-        if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
-                goto err;
-        memcpy(data.session_id,session_id,len);
-
-        if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
-                {
-                CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
-                ret=(SSL_SESSION *)lh_retrieve(s->ctx->sessions,(char *)&data);
-                if (ret != NULL)
-                    /* don't allow other threads to steal it: */
-                    CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
-                CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
-                }
-
-        if (ret == NULL)
-                {
-                int copy=1;
-        
-                s->ctx->stats.sess_miss++;
-                ret=NULL;
-                if (s->ctx->get_session_cb != NULL
-                    && (ret=s->ctx->get_session_cb(s,session_id,len,&copy))
-                       != NULL)
-                        {
-                        s->ctx->stats.sess_cb_hit++;
-
-                        /* Increment reference count now if the session callback
-                         * asks us to do so (note that if the session structures
-                         * returned by the callback are shared between threads,
-                         * it must handle the reference count itself [i.e. copy == 0],
-                         * or things won't be thread-safe). */
-                        if (copy)
-                                CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
-
-                        /* The following should not return 1, otherwise,
-                         * things are very strange */
-                        SSL_CTX_add_session(s->ctx,ret);
-                        }
-                if (ret == NULL)
-                        goto err;
-                }
-
-        /* Now ret is non-NULL, and we own one of its reference counts. */
-
-        if((s->verify_mode&SSL_VERIFY_PEER)
-           && (!s->sid_ctx_length || ret->sid_ctx_length != s->sid_ctx_length
-               || memcmp(ret->sid_ctx,s->sid_ctx,ret->sid_ctx_length)))
-            {
-                /* We've found the session named by the client, but we don't
-                 * want to use it in this context. */
-                
-                if (s->sid_ctx_length == 0)
-                        {
-                        /* application should have used SSL[_CTX]_set_session_id_context
-                         * -- we could tolerate this and just pretend we never heard
-                         * of this session, but then applications could effectively
-                         * disable the session cache by accident without anyone noticing */
-
-                        SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
-                        fatal = 1;
-                        goto err;
-                        }
-                else
-                        {
-#if 0 /* The client cannot always know when a session is not appropriate,
-           * so we shouldn't generate an error message. */
-
-                        SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
-#endif
-                        goto err; /* treat like cache miss */
-                        }
-                }
-
-        if (ret->cipher == NULL)
-                {
-                unsigned char buf[5],*p;
-                unsigned long l;
-
-                p=buf;
-                l=ret->cipher_id;
-                l2n(l,p);
-                if ((ret->ssl_version>>8) == SSL3_VERSION_MAJOR)
-                        ret->cipher=ssl_get_cipher_by_char(s,&(buf[2]));
-                else 
-                        ret->cipher=ssl_get_cipher_by_char(s,&(buf[1]));
-                if (ret->cipher == NULL)
-                        goto err;
-                }
-
-
-#if 0 /* This is way too late. */
-
-        /* If a thread got the session, then 'swaped', and another got
-         * it and then due to a time-out decided to 'Free' it we could
-         * be in trouble.  So I'll increment it now, then double decrement
-         * later - am I speaking rubbish?. */
-        CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
-#endif
-
-        if ((long)(ret->time+ret->timeout) < (long)time(NULL)) /* timeout */
-                {
-                s->ctx->stats.sess_timeout++;
-                /* remove it from the cache */
-                SSL_CTX_remove_session(s->ctx,ret);
-                goto err;
-                }
-
-        s->ctx->stats.sess_hit++;
-
-        /* ret->time=time(NULL); */ /* rezero timeout? */
-        /* again, just leave the session 
-         * if it is the same session, we have just incremented and
-         * then decremented the reference count :-) */
-        if (s->session != NULL)
-                SSL_SESSION_free(s->session);
-        s->session=ret;
-        return(1);
-
- err:
-        if (ret != NULL)
-                SSL_SESSION_free(ret);
-        if (fatal)
-                return -1;
-        else
-                return 0;
-        }
-
-int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c)
-        {
-        int ret=0;
-        SSL_SESSION *s;
-
-        /* conn_init(); */
-        CRYPTO_add(&c->references,1,CRYPTO_LOCK_SSL_SESSION);
-
-        CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
-        s=(SSL_SESSION *)lh_insert(ctx->sessions,(char *)c);
-        
-        /* Put on the end of the queue unless it is already in the cache */
-        if (s == NULL)
-                SSL_SESSION_list_add(ctx,c);
-
-        /* If the same session if is being 're-added', Free the old
-         * one when the last person stops using it.
-         * This will also work if it is alread in the cache.
-         * The references will go up and then down :-) */
-        if (s != NULL)
-                {
-                SSL_SESSION_free(s);
-                ret=0;
-                }
-        else
-                {
-                ret=1;
-
-                if (SSL_CTX_sess_get_cache_size(ctx) > 0)
-                        {
-                        while (SSL_CTX_sess_number(ctx) >
-                                SSL_CTX_sess_get_cache_size(ctx))
-                                {
-                                if (!remove_session_lock(ctx,
-                                        ctx->session_cache_tail, 0))
-                                        break;
-                                else
-                                        ctx->stats.sess_cache_full++;
-                                }
-                        }
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
-        return(ret);
-        }
-
-int SSL_CTX_remove_session(SSL_CTX *ctx, SSL_SESSION *c)
-{
-        return remove_session_lock(ctx, c, 1);
-}
-
-static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck)
-        {
-        SSL_SESSION *r;
-        int ret=0;
-
-        if ((c != NULL) && (c->session_id_length != 0))
-                {
-                if(lck) CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
-                r=(SSL_SESSION *)lh_delete(ctx->sessions,(char *)c);
-                if (r != NULL)
-                        {
-                        ret=1;
-                        SSL_SESSION_list_remove(ctx,c);
-                        }
-
-                if(lck) CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
-
-                if (ret)
-                        {
-                        r->not_resumable=1;
-                        if (ctx->remove_session_cb != NULL)
-                                ctx->remove_session_cb(ctx,r);
-                        SSL_SESSION_free(r);
-                        }
-                }
-        else
-                ret=0;
-        return(ret);
-        }
-
-void SSL_SESSION_free(SSL_SESSION *ss)
-        {
-        int i;
-
-        if(ss == NULL)
-            return;
-
-        i=CRYPTO_add(&ss->references,-1,CRYPTO_LOCK_SSL_SESSION);
-#ifdef REF_PRINT
-        REF_PRINT("SSL_SESSION",ss);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"SSL_SESSION_free, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-
-        CRYPTO_free_ex_data(ssl_session_meth,(char *)ss,&ss->ex_data);
-
-        memset(ss->key_arg,0,SSL_MAX_KEY_ARG_LENGTH);
-        memset(ss->master_key,0,SSL_MAX_MASTER_KEY_LENGTH);
-        memset(ss->session_id,0,SSL_MAX_SSL_SESSION_ID_LENGTH);
-        if (ss->sess_cert != NULL) ssl_sess_cert_free(ss->sess_cert);
-        if (ss->peer != NULL) X509_free(ss->peer);
-        if (ss->ciphers != NULL) sk_SSL_CIPHER_free(ss->ciphers);
-        memset(ss,0,sizeof(*ss));
-        Free(ss);
-        }
-
-int SSL_set_session(SSL *s, SSL_SESSION *session)
-        {
-        int ret=0;
-        SSL_METHOD *meth;
-
-        if (session != NULL)
-                {
-                meth=s->ctx->method->get_ssl_method(session->ssl_version);
-                if (meth == NULL)
-                        meth=s->method->get_ssl_method(session->ssl_version);
-                if (meth == NULL)
-                        {
-                        SSLerr(SSL_F_SSL_SET_SESSION,SSL_R_UNABLE_TO_FIND_SSL_METHOD);
-                        return(0);
-                        }
-
-                if (meth != s->method)
-                        {
-                        if (!SSL_set_ssl_method(s,meth))
-                                return(0);
-                        if (s->ctx->session_timeout == 0)
-                                session->timeout=SSL_get_default_timeout(s);
-                        else
-                                session->timeout=s->ctx->session_timeout;
-                        }
-
-                /* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/
-                CRYPTO_add(&session->references,1,CRYPTO_LOCK_SSL_SESSION);
-                if (s->session != NULL)
-                        SSL_SESSION_free(s->session);
-                s->session=session;
-                /* CRYPTO_w_unlock(CRYPTO_LOCK_SSL);*/
-                ret=1;
-                }
-        else
-                {
-                if (s->session != NULL)
-                        {
-                        SSL_SESSION_free(s->session);
-                        s->session=NULL;
-                        }
-
-                meth=s->ctx->method;
-                if (meth != s->method)
-                        {
-                        if (!SSL_set_ssl_method(s,meth))
-                                return(0);
-                        }
-                ret=1;
-                }
-        return(ret);
-        }
-
-long SSL_SESSION_set_timeout(SSL_SESSION *s, long t)
-        {
-        if (s == NULL) return(0);
-        s->timeout=t;
-        return(1);
-        }
-
-long SSL_SESSION_get_timeout(SSL_SESSION *s)
-        {
-        if (s == NULL) return(0);
-        return(s->timeout);
-        }
-
-long SSL_SESSION_get_time(SSL_SESSION *s)
-        {
-        if (s == NULL) return(0);
-        return(s->time);
-        }
-
-long SSL_SESSION_set_time(SSL_SESSION *s, long t)
-        {
-        if (s == NULL) return(0);
-        s->time=t;
-        return(t);
-        }
-
-long SSL_CTX_set_timeout(SSL_CTX *s, long t)
-        {
-        long l;
-        if (s == NULL) return(0);
-        l=s->session_timeout;
-        s->session_timeout=t;
-        return(l);
-        }
-
-long SSL_CTX_get_timeout(SSL_CTX *s)
-        {
-        if (s == NULL) return(0);
-        return(s->session_timeout);
-        }
-
-typedef struct timeout_param_st
-        {
-        SSL_CTX *ctx;
-        long time;
-        LHASH *cache;
-        } TIMEOUT_PARAM;
-
-static void timeout(SSL_SESSION *s, TIMEOUT_PARAM *p)
-        {
-        if ((p->time == 0) || (p->time > (s->time+s->timeout))) /* timeout */
-                {
-                /* The reason we don't call SSL_CTX_remove_session() is to
-                 * save on locking overhead */
-                lh_delete(p->cache,(char *)s);
-                SSL_SESSION_list_remove(p->ctx,s);
-                s->not_resumable=1;
-                if (p->ctx->remove_session_cb != NULL)
-                        p->ctx->remove_session_cb(p->ctx,s);
-                SSL_SESSION_free(s);
-                }
-        }
-
-void SSL_CTX_flush_sessions(SSL_CTX *s, long t)
-        {
-        unsigned long i;
-        TIMEOUT_PARAM tp;
-
-        tp.ctx=s;
-        tp.cache=s->sessions;
-        if (tp.cache == NULL) return;
-        tp.time=t;
-        CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
-        i=tp.cache->down_load;
-        tp.cache->down_load=0;
-        lh_doall_arg(tp.cache,(void (*)())timeout,(char *)&tp);
-        tp.cache->down_load=i;
-        CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
-        }
-
-int ssl_clear_bad_session(SSL *s)
-        {
-        if (    (s->session != NULL) &&
-                !(s->shutdown & SSL_SENT_SHUTDOWN) &&
-                !(SSL_in_init(s) || SSL_in_before(s)))
-                {
-                SSL_CTX_remove_session(s->ctx,s->session);
-                return(1);
-                }
-        else
-                return(0);
-        }
-
-/* locked by SSL_CTX in the calling function */
-static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s)
-        {
-        if ((s->next == NULL) || (s->prev == NULL)) return;
-
-        if (s->next == (SSL_SESSION *)&(ctx->session_cache_tail))
-                { /* last element in list */
-                if (s->prev == (SSL_SESSION *)&(ctx->session_cache_head))
-                        { /* only one element in list */
-                        ctx->session_cache_head=NULL;
-                        ctx->session_cache_tail=NULL;
-                        }
-                else
-                        {
-                        ctx->session_cache_tail=s->prev;
-                        s->prev->next=(SSL_SESSION *)&(ctx->session_cache_tail);
-                        }
-                }
-        else
-                {
-                if (s->prev == (SSL_SESSION *)&(ctx->session_cache_head))
-                        { /* first element in list */
-                        ctx->session_cache_head=s->next;
-                        s->next->prev=(SSL_SESSION *)&(ctx->session_cache_head);
-                        }
-                else
-                        { /* middle of list */
-                        s->next->prev=s->prev;
-                        s->prev->next=s->next;
-                        }
-                }
-        s->prev=s->next=NULL;
-        }
-
-static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s)
-        {
-        if ((s->next != NULL) && (s->prev != NULL))
-                SSL_SESSION_list_remove(ctx,s);
-
-        if (ctx->session_cache_head == NULL)
-                {
-                ctx->session_cache_head=s;
-                ctx->session_cache_tail=s;
-                s->prev=(SSL_SESSION *)&(ctx->session_cache_head);
-                s->next=(SSL_SESSION *)&(ctx->session_cache_tail);
-                }
-        else
-                {
-                s->next=ctx->session_cache_head;
-                s->next->prev=s;
-                s->prev=(SSL_SESSION *)&(ctx->session_cache_head);
-                ctx->session_cache_head=s;
-                }
-        }
-
diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c
deleted file mode 100644
index 3eca4ee601..0000000000
--- a/src/lib/libssl/ssl_stat.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/* ssl/ssl_stat.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 "ssl_locl.h"
-
-char *SSL_state_string_long(SSL *s)
-        {
-        char *str;
-
-        switch (s->state)
-                {
-case SSL_ST_BEFORE: str="before SSL initialization"; break;
-case SSL_ST_ACCEPT: str="before accept initialization"; break;
-case SSL_ST_CONNECT: str="before connect initialization"; break;
-case SSL_ST_OK: str="SSL negotiation finished successfully"; break;
-case SSL_ST_RENEGOTIATE:        str="SSL renegotiate ciphers"; break;
-case SSL_ST_BEFORE|SSL_ST_CONNECT: str="before/connect initialization"; break;
-case SSL_ST_OK|SSL_ST_CONNECT: str="ok/connect SSL initialization"; break;
-case SSL_ST_BEFORE|SSL_ST_ACCEPT: str="before/accept initialization"; break;
-case SSL_ST_OK|SSL_ST_ACCEPT: str="ok/accept SSL initialization"; break;
-#ifndef NO_SSL2
-case SSL2_ST_CLIENT_START_ENCRYPTION: str="SSLv2 client start encryption"; break;
-case SSL2_ST_SERVER_START_ENCRYPTION: str="SSLv2 server start encryption"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_A: str="SSLv2 write client hello A"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_B: str="SSLv2 write client hello B"; break;
-case SSL2_ST_GET_SERVER_HELLO_A: str="SSLv2 read server hello A"; break;
-case SSL2_ST_GET_SERVER_HELLO_B: str="SSLv2 read server hello B"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_A: str="SSLv2 write client master key A"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_B: str="SSLv2 write client master key B"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_A: str="SSLv2 write client finished A"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_B: str="SSLv2 write client finished B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_A: str="SSLv2 write client certificate A"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_B: str="SSLv2 write client certificate B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_C: str="SSLv2 write client certificate C"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_D: str="SSLv2 write client certificate D"; break;
-case SSL2_ST_GET_SERVER_VERIFY_A: str="SSLv2 read server verify A"; break;
-case SSL2_ST_GET_SERVER_VERIFY_B: str="SSLv2 read server verify B"; break;
-case SSL2_ST_GET_SERVER_FINISHED_A: str="SSLv2 read server finished A"; break;
-case SSL2_ST_GET_SERVER_FINISHED_B: str="SSLv2 read server finished B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_A: str="SSLv2 read client hello A"; break;
-case SSL2_ST_GET_CLIENT_HELLO_B: str="SSLv2 read client hello B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_C: str="SSLv2 read client hello C"; break;
-case SSL2_ST_SEND_SERVER_HELLO_A: str="SSLv2 write server hello A"; break;
-case SSL2_ST_SEND_SERVER_HELLO_B: str="SSLv2 write server hello B"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_A: str="SSLv2 read client master key A"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_B: str="SSLv2 read client master key B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_A: str="SSLv2 write server verify A"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_B: str="SSLv2 write server verify B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_C: str="SSLv2 write server verify C"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_A: str="SSLv2 read client finished A"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_B: str="SSLv2 read client finished B"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_A: str="SSLv2 write server finished A"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_B: str="SSLv2 write server finished B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_A: str="SSLv2 write request certificate A"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_B: str="SSLv2 write request certificate B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_C: str="SSLv2 write request certificate C"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_D: str="SSLv2 write request certificate D"; break;
-case SSL2_ST_X509_GET_SERVER_CERTIFICATE: str="SSLv2 X509 read server certificate"; break;
-case SSL2_ST_X509_GET_CLIENT_CERTIFICATE: str="SSLv2 X509 read client certificate"; break;
-#endif
-
-#ifndef NO_SSL3
-/* SSLv3 additions */
-case SSL3_ST_CW_CLNT_HELLO_A:   str="SSLv3 write client hello A"; break;
-case SSL3_ST_CW_CLNT_HELLO_B:   str="SSLv3 write client hello B"; break;
-case SSL3_ST_CR_SRVR_HELLO_A:   str="SSLv3 read server hello A"; break;
-case SSL3_ST_CR_SRVR_HELLO_B:   str="SSLv3 read server hello B"; break;
-case SSL3_ST_CR_CERT_A:         str="SSLv3 read server certificate A"; break;
-case SSL3_ST_CR_CERT_B:         str="SSLv3 read server certificate B"; break;
-case SSL3_ST_CR_KEY_EXCH_A:     str="SSLv3 read server key exchange A"; break;
-case SSL3_ST_CR_KEY_EXCH_B:     str="SSLv3 read server key exchange B"; break;
-case SSL3_ST_CR_CERT_REQ_A:     str="SSLv3 read server certificate request A"; break;
-case SSL3_ST_CR_CERT_REQ_B:     str="SSLv3 read server certificate request B"; break;
-case SSL3_ST_CR_SRVR_DONE_A:    str="SSLv3 read server done A"; break;
-case SSL3_ST_CR_SRVR_DONE_B:    str="SSLv3 read server done B"; break;
-case SSL3_ST_CW_CERT_A:         str="SSLv3 write client certificate A"; break;
-case SSL3_ST_CW_CERT_B:         str="SSLv3 write client certificate B"; break;
-case SSL3_ST_CW_CERT_C:         str="SSLv3 write client certificate C"; break;
-case SSL3_ST_CW_CERT_D:         str="SSLv3 write client certificate D"; break;
-case SSL3_ST_CW_KEY_EXCH_A:     str="SSLv3 write client key exchange A"; break;
-case SSL3_ST_CW_KEY_EXCH_B:     str="SSLv3 write client key exchange B"; break;
-case SSL3_ST_CW_CERT_VRFY_A:    str="SSLv3 write certificate verify A"; break;
-case SSL3_ST_CW_CERT_VRFY_B:    str="SSLv3 write certificate verify A"; break;
-
-case SSL3_ST_CW_CHANGE_A:
-case SSL3_ST_SW_CHANGE_A:       str="SSLv3 write change cipher spec A"; break;
-case SSL3_ST_CW_CHANGE_B:       
-case SSL3_ST_SW_CHANGE_B:       str="SSLv3 write change cipher spec B"; break;
-case SSL3_ST_CW_FINISHED_A:     
-case SSL3_ST_SW_FINISHED_A:     str="SSLv3 write finished A"; break;
-case SSL3_ST_CW_FINISHED_B:     
-case SSL3_ST_SW_FINISHED_B:     str="SSLv3 write finished A"; break;
-case SSL3_ST_CR_CHANGE_A:       
-case SSL3_ST_SR_CHANGE_A:       str="SSLv3 read change cipher spec A"; break;
-case SSL3_ST_CR_CHANGE_B:       
-case SSL3_ST_SR_CHANGE_B:       str="SSLv3 read change cipher spec B"; break;
-case SSL3_ST_CR_FINISHED_A:     
-case SSL3_ST_SR_FINISHED_A:     str="SSLv3 read finished A"; break;
-case SSL3_ST_CR_FINISHED_B:     
-case SSL3_ST_SR_FINISHED_B:     str="SSLv3 read finished B"; break;
-
-case SSL3_ST_CW_FLUSH:
-case SSL3_ST_SW_FLUSH:          str="SSLv3 flush data"; break;
-
-case SSL3_ST_SR_CLNT_HELLO_A:   str="SSLv3 read client hello A"; break;
-case SSL3_ST_SR_CLNT_HELLO_B:   str="SSLv3 read client hello B"; break;
-case SSL3_ST_SR_CLNT_HELLO_C:   str="SSLv3 read client hello C"; break;
-case SSL3_ST_SW_HELLO_REQ_A:    str="SSLv3 write hello request A"; break;
-case SSL3_ST_SW_HELLO_REQ_B:    str="SSLv3 write hello request B"; break;
-case SSL3_ST_SW_HELLO_REQ_C:    str="SSLv3 write hello request C"; break;
-case SSL3_ST_SW_SRVR_HELLO_A:   str="SSLv3 write server hello A"; break;
-case SSL3_ST_SW_SRVR_HELLO_B:   str="SSLv3 write server hello B"; break;
-case SSL3_ST_SW_CERT_A:         str="SSLv3 write certificate A"; break;
-case SSL3_ST_SW_CERT_B:         str="SSLv3 write certificate B"; break;
-case SSL3_ST_SW_KEY_EXCH_A:     str="SSLv3 write key exchange A"; break;
-case SSL3_ST_SW_KEY_EXCH_B:     str="SSLv3 write key exchange B"; break;
-case SSL3_ST_SW_CERT_REQ_A:     str="SSLv3 write certificate request A"; break;
-case SSL3_ST_SW_CERT_REQ_B:     str="SSLv3 write certificate request B"; break;
-case SSL3_ST_SW_SRVR_DONE_A:    str="SSLv3 write server done A"; break;
-case SSL3_ST_SW_SRVR_DONE_B:    str="SSLv3 write server done B"; break;
-case SSL3_ST_SR_CERT_A:         str="SSLv3 read client certificate A"; break;
-case SSL3_ST_SR_CERT_B:         str="SSLv3 read client certificate B"; break;
-case SSL3_ST_SR_KEY_EXCH_A:     str="SSLv3 read client key exchange A"; break;
-case SSL3_ST_SR_KEY_EXCH_B:     str="SSLv3 read client key exchange B"; break;
-case SSL3_ST_SR_CERT_VRFY_A:    str="SSLv3 read certificate verify A"; break;
-case SSL3_ST_SR_CERT_VRFY_B:    str="SSLv3 read certificate verify B"; break;
-#endif
-
-#if !defined(NO_SSL2) && !defined(NO_SSL3)
-/* SSLv2/v3 compatablitity states */
-/* client */
-case SSL23_ST_CW_CLNT_HELLO_A:  str="SSLv2/v3 write client hello A"; break;
-case SSL23_ST_CW_CLNT_HELLO_B:  str="SSLv2/v3 write client hello B"; break;
-case SSL23_ST_CR_SRVR_HELLO_A:  str="SSLv2/v3 read server hello A"; break;
-case SSL23_ST_CR_SRVR_HELLO_B:  str="SSLv2/v3 read server hello B"; break;
-/* server */
-case SSL23_ST_SR_CLNT_HELLO_A:  str="SSLv2/v3 read client hello A"; break;
-case SSL23_ST_SR_CLNT_HELLO_B:  str="SSLv2/v3 read client hello B"; break;
-#endif
-
-default:        str="unknown state"; break;
-                }
-        return(str);
-        }
-
-char *SSL_rstate_string_long(SSL *s)
-        {
-        char *str;
-
-        switch (s->rstate)
-                {
-        case SSL_ST_READ_HEADER: str="read header"; break;
-        case SSL_ST_READ_BODY: str="read body"; break;
-        case SSL_ST_READ_DONE: str="read done"; break;
-        default: str="unknown"; break;
-                }
-        return(str);
-        }
-
-char *SSL_state_string(SSL *s)
-        {
-        char *str;
-
-        switch (s->state)
-                {
-case SSL_ST_BEFORE:                             str="PINIT "; break;
-case SSL_ST_ACCEPT:                             str="AINIT "; break;
-case SSL_ST_CONNECT:                            str="CINIT "; break;
-case SSL_ST_OK:                                 str="SSLOK "; break;
-#ifndef NO_SSL2
-case SSL2_ST_CLIENT_START_ENCRYPTION:           str="2CSENC"; break;
-case SSL2_ST_SERVER_START_ENCRYPTION:           str="2SSENC"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_A:               str="2SCH_A"; break;
-case SSL2_ST_SEND_CLIENT_HELLO_B:               str="2SCH_B"; break;
-case SSL2_ST_GET_SERVER_HELLO_A:                str="2GSH_A"; break;
-case SSL2_ST_GET_SERVER_HELLO_B:                str="2GSH_B"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_A:          str="2SCMKA"; break;
-case SSL2_ST_SEND_CLIENT_MASTER_KEY_B:          str="2SCMKB"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_A:            str="2SCF_A"; break;
-case SSL2_ST_SEND_CLIENT_FINISHED_B:            str="2SCF_B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_A:         str="2SCC_A"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_B:         str="2SCC_B"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_C:         str="2SCC_C"; break;
-case SSL2_ST_SEND_CLIENT_CERTIFICATE_D:         str="2SCC_D"; break;
-case SSL2_ST_GET_SERVER_VERIFY_A:               str="2GSV_A"; break;
-case SSL2_ST_GET_SERVER_VERIFY_B:               str="2GSV_B"; break;
-case SSL2_ST_GET_SERVER_FINISHED_A:             str="2GSF_A"; break;
-case SSL2_ST_GET_SERVER_FINISHED_B:             str="2GSF_B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_A:                str="2GCH_A"; break;
-case SSL2_ST_GET_CLIENT_HELLO_B:                str="2GCH_B"; break;
-case SSL2_ST_GET_CLIENT_HELLO_C:                str="2GCH_C"; break;
-case SSL2_ST_SEND_SERVER_HELLO_A:               str="2SSH_A"; break;
-case SSL2_ST_SEND_SERVER_HELLO_B:               str="2SSH_B"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_A:           str="2GCMKA"; break;
-case SSL2_ST_GET_CLIENT_MASTER_KEY_B:           str="2GCMKA"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_A:              str="2SSV_A"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_B:              str="2SSV_B"; break;
-case SSL2_ST_SEND_SERVER_VERIFY_C:              str="2SSV_C"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_A:             str="2GCF_A"; break;
-case SSL2_ST_GET_CLIENT_FINISHED_B:             str="2GCF_B"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_A:            str="2SSF_A"; break;
-case SSL2_ST_SEND_SERVER_FINISHED_B:            str="2SSF_B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_A:        str="2SRC_A"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_B:        str="2SRC_B"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_C:        str="2SRC_C"; break;
-case SSL2_ST_SEND_REQUEST_CERTIFICATE_D:        str="2SRC_D"; break;
-case SSL2_ST_X509_GET_SERVER_CERTIFICATE:       str="2X9GSC"; break;
-case SSL2_ST_X509_GET_CLIENT_CERTIFICATE:       str="2X9GCC"; break;
-#endif
-
-#ifndef NO_SSL3
-/* SSLv3 additions */
-case SSL3_ST_SW_FLUSH:
-case SSL3_ST_CW_FLUSH:                          str="3FLUSH"; break;
-case SSL3_ST_CW_CLNT_HELLO_A:                   str="3WCH_A"; break;
-case SSL3_ST_CW_CLNT_HELLO_B:                   str="3WCH_B"; break;
-case SSL3_ST_CR_SRVR_HELLO_A:                   str="3RSH_A"; break;
-case SSL3_ST_CR_SRVR_HELLO_B:                   str="3RSH_B"; break;
-case SSL3_ST_CR_CERT_A:                         str="3RSC_A"; break;
-case SSL3_ST_CR_CERT_B:                         str="3RSC_B"; break;
-case SSL3_ST_CR_KEY_EXCH_A:                     str="3RSKEA"; break;
-case SSL3_ST_CR_KEY_EXCH_B:                     str="3RSKEB"; break;
-case SSL3_ST_CR_CERT_REQ_A:                     str="3RCR_A"; break;
-case SSL3_ST_CR_CERT_REQ_B:                     str="3RCR_B"; break;
-case SSL3_ST_CR_SRVR_DONE_A:                    str="3RSD_A"; break;
-case SSL3_ST_CR_SRVR_DONE_B:                    str="3RSD_B"; break;
-case SSL3_ST_CW_CERT_A:                         str="3WCC_A"; break;
-case SSL3_ST_CW_CERT_B:                         str="3WCC_B"; break;
-case SSL3_ST_CW_CERT_C:                         str="3WCC_C"; break;
-case SSL3_ST_CW_CERT_D:                         str="3WCC_D"; break;
-case SSL3_ST_CW_KEY_EXCH_A:                     str="3WCKEA"; break;
-case SSL3_ST_CW_KEY_EXCH_B:                     str="3WCKEB"; break;
-case SSL3_ST_CW_CERT_VRFY_A:                    str="3WCV_A"; break;
-case SSL3_ST_CW_CERT_VRFY_B:                    str="3WCV_B"; break;
-
-case SSL3_ST_SW_CHANGE_A:
-case SSL3_ST_CW_CHANGE_A:                       str="3WCCSA"; break;
-case SSL3_ST_SW_CHANGE_B:
-case SSL3_ST_CW_CHANGE_B:                       str="3WCCSB"; break;
-case SSL3_ST_SW_FINISHED_A:
-case SSL3_ST_CW_FINISHED_A:                     str="3WFINA"; break;
-case SSL3_ST_SW_FINISHED_B:
-case SSL3_ST_CW_FINISHED_B:                     str="3WFINB"; break;
-case SSL3_ST_SR_CHANGE_A:
-case SSL3_ST_CR_CHANGE_A:                       str="3RCCSA"; break;
-case SSL3_ST_SR_CHANGE_B:
-case SSL3_ST_CR_CHANGE_B:                       str="3RCCSB"; break;
-case SSL3_ST_SR_FINISHED_A:
-case SSL3_ST_CR_FINISHED_A:                     str="3RFINA"; break;
-case SSL3_ST_SR_FINISHED_B:
-case SSL3_ST_CR_FINISHED_B:                     str="3RFINB"; break;
-
-case SSL3_ST_SW_HELLO_REQ_A:                    str="3WHR_A"; break;
-case SSL3_ST_SW_HELLO_REQ_B:                    str="3WHR_B"; break;
-case SSL3_ST_SW_HELLO_REQ_C:                    str="3WHR_C"; break;
-case SSL3_ST_SR_CLNT_HELLO_A:                   str="3RCH_A"; break;
-case SSL3_ST_SR_CLNT_HELLO_B:                   str="3RCH_B"; break;
-case SSL3_ST_SR_CLNT_HELLO_C:                   str="3RCH_C"; break;
-case SSL3_ST_SW_SRVR_HELLO_A:                   str="3WSH_A"; break;
-case SSL3_ST_SW_SRVR_HELLO_B:                   str="3WSH_B"; break;
-case SSL3_ST_SW_CERT_A:                         str="3WSC_A"; break;
-case SSL3_ST_SW_CERT_B:                         str="3WSC_B"; break;
-case SSL3_ST_SW_KEY_EXCH_A:                     str="3WSKEA"; break;
-case SSL3_ST_SW_KEY_EXCH_B:                     str="3WSKEB"; break;
-case SSL3_ST_SW_CERT_REQ_A:                     str="3WCR_A"; break;
-case SSL3_ST_SW_CERT_REQ_B:                     str="3WCR_B"; break;
-case SSL3_ST_SW_SRVR_DONE_A:                    str="3WSD_A"; break;
-case SSL3_ST_SW_SRVR_DONE_B:                    str="3WSD_B"; break;
-case SSL3_ST_SR_CERT_A:                         str="3RCC_A"; break;
-case SSL3_ST_SR_CERT_B:                         str="3RCC_B"; break;
-case SSL3_ST_SR_KEY_EXCH_A:                     str="3RCKEA"; break;
-case SSL3_ST_SR_KEY_EXCH_B:                     str="3RCKEB"; break;
-case SSL3_ST_SR_CERT_VRFY_A:                    str="3RCV_A"; break;
-case SSL3_ST_SR_CERT_VRFY_B:                    str="3RCV_B"; break;
-#endif
-
-#if !defined(NO_SSL2) && !defined(NO_SSL3)
-/* SSLv2/v3 compatablitity states */
-/* client */
-case SSL23_ST_CW_CLNT_HELLO_A:                  str="23WCHA"; break;
-case SSL23_ST_CW_CLNT_HELLO_B:                  str="23WCHB"; break;
-case SSL23_ST_CR_SRVR_HELLO_A:                  str="23RSHA"; break;
-case SSL23_ST_CR_SRVR_HELLO_B:                  str="23RSHA"; break;
-/* server */
-case SSL23_ST_SR_CLNT_HELLO_A:                  str="23RCHA"; break;
-case SSL23_ST_SR_CLNT_HELLO_B:                  str="23RCHB"; break;
-#endif
-
-default:                                        str="UNKWN "; break;
-                }
-        return(str);
-        }
-
-char *SSL_alert_type_string_long(int value)
-        {
-        value>>=8;
-        if (value == SSL3_AL_WARNING)
-                return("warning");
-        else if (value == SSL3_AL_FATAL)
-                return("fatal");
-        else
-                return("unknown");
-        }
-
-char *SSL_alert_type_string(int value)
-        {
-        value>>=8;
-        if (value == SSL3_AL_WARNING)
-                return("W");
-        else if (value == SSL3_AL_FATAL)
-                return("F");
-        else
-                return("U");
-        }
-
-char *SSL_alert_desc_string(int value)
-        {
-        char *str;
-
-        switch (value & 0xff)
-                {
-        case SSL3_AD_CLOSE_NOTIFY:              str="CN"; break;
-        case SSL3_AD_UNEXPECTED_MESSAGE:        str="UM"; break;
-        case SSL3_AD_BAD_RECORD_MAC:            str="BM"; break;
-        case SSL3_AD_DECOMPRESSION_FAILURE:     str="DF"; break;
-        case SSL3_AD_HANDSHAKE_FAILURE:         str="HF"; break;
-        case SSL3_AD_NO_CERTIFICATE:            str="NC"; break;
-        case SSL3_AD_BAD_CERTIFICATE:           str="BC"; break;
-        case SSL3_AD_UNSUPPORTED_CERTIFICATE:   str="UC"; break;
-        case SSL3_AD_CERTIFICATE_REVOKED:       str="CR"; break;
-        case SSL3_AD_CERTIFICATE_EXPIRED:       str="CE"; break;
-        case SSL3_AD_CERTIFICATE_UNKNOWN:       str="CU"; break;
-        case SSL3_AD_ILLEGAL_PARAMETER:         str="IP"; break;
-        default:                                str="UK"; break;
-                }
-        return(str);
-        }
-
-char *SSL_alert_desc_string_long(int value)
-        {
-        char *str;
-
-        switch (value & 0xff)
-                {
-        case SSL3_AD_CLOSE_NOTIFY:
-                str="close notify";
-                break;
-        case SSL3_AD_UNEXPECTED_MESSAGE:
-                str="unexected_message";
-                break;
-        case SSL3_AD_BAD_RECORD_MAC:
-                str="bad record mac";
-                break;
-        case SSL3_AD_DECOMPRESSION_FAILURE:
-                str="decompression failure";
-                break;
-        case SSL3_AD_HANDSHAKE_FAILURE:
-                str="handshake failure";
-                break;
-        case SSL3_AD_NO_CERTIFICATE:
-                str="no certificate";
-                break;
-        case SSL3_AD_BAD_CERTIFICATE:
-                str="bad certificate";
-                break;
-        case SSL3_AD_UNSUPPORTED_CERTIFICATE:
-                str="unsupported certificate";
-                break;
-        case SSL3_AD_CERTIFICATE_REVOKED:
-                str="certificate revoked";
-                break;
-        case SSL3_AD_CERTIFICATE_EXPIRED:
-                str="certificate expired";
-                break;
-        case SSL3_AD_CERTIFICATE_UNKNOWN:
-                str="certifcate unknown";
-                break;
-        case SSL3_AD_ILLEGAL_PARAMETER:
-                str="illegal parameter";
-                break;
-        default: str="unknown"; break;
-                }
-        return(str);
-        }
-
-char *SSL_rstate_string(SSL *s)
-        {
-        char *str;
-
-        switch (s->rstate)
-                {
-        case SSL_ST_READ_HEADER:str="RH"; break;
-        case SSL_ST_READ_BODY:  str="RB"; break;
-        case SSL_ST_READ_DONE:  str="RD"; break;
-        default: str="unknown"; break;
-                }
-        return(str);
-        }
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
deleted file mode 100644
index ca67a98d89..0000000000
--- a/src/lib/libssl/ssl_txt.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ssl/ssl_txt.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include "ssl_locl.h"
-
-#ifndef NO_FP_API
-int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
-        {
-        BIO *b;
-        int ret;
-
-        if ((b=BIO_new(BIO_s_file_internal())) == NULL)
-                {
-                SSLerr(SSL_F_SSL_SESSION_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
-                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=SSL_SESSION_print(b,x);
-        BIO_free(b);
-        return(ret);
-        }
-#endif
-
-int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
-        {
-        unsigned int i;
-        char str[128],*s;
-
-        if (x == NULL) goto err;
-        if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
-        if (x->ssl_version == SSL2_VERSION)
-                s="SSLv2";
-        else if (x->ssl_version == SSL3_VERSION)
-                s="SSLv3";
-        else if (x->ssl_version == TLS1_VERSION)
-                s="TLSv1";
-        else
-                s="unknown";
-        sprintf(str,"    Protocol  : %s\n",s);
-        if (BIO_puts(bp,str) <= 0) goto err;
-
-        if (x->cipher == NULL)
-                {
-                if (((x->cipher_id) & 0xff000000) == 0x02000000)
-                        sprintf(str,"    Cipher    : %06lX\n",x->cipher_id&0xffffff);
-                else
-                        sprintf(str,"    Cipher    : %04lX\n",x->cipher_id&0xffff);
-                }
-        else
-                sprintf(str,"    Cipher    : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
-        if (BIO_puts(bp,str) <= 0) goto err;
-        if (BIO_puts(bp,"    Session-ID: ") <= 0) goto err;
-        for (i=0; i<x->session_id_length; i++)
-                {
-                sprintf(str,"%02X",x->session_id[i]);
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
-        for (i=0; i<x->sid_ctx_length; i++)
-                {
-                sprintf(str,"%02X",x->sid_ctx[i]);
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (BIO_puts(bp,"\n    Master-Key: ") <= 0) goto err;
-        for (i=0; i<(unsigned int)x->master_key_length; i++)
-                {
-                sprintf(str,"%02X",x->master_key[i]);
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (BIO_puts(bp,"\n    Key-Arg   : ") <= 0) goto err;
-        if (x->key_arg_length == 0)
-                {
-                if (BIO_puts(bp,"None") <= 0) goto err;
-                }
-        else
-                for (i=0; i<x->key_arg_length; i++)
-                        {
-                        sprintf(str,"%02X",x->key_arg[i]);
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
-        if (x->compress_meth != 0)
-                {
-                SSL_COMP *comp;
-
-                ssl_cipher_get_evp(x,NULL,NULL,&comp);
-                if (comp == NULL)
-                        {
-                        sprintf(str,"\n   Compression: %d",x->compress_meth);
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
-                else
-                        {
-                        sprintf(str,"\n   Compression: %d (%s)",
-                                comp->id,comp->method->name);
-                        if (BIO_puts(bp,str) <= 0) goto err;
-                        }
-                }       
-        if (x->time != 0L)
-                {
-                sprintf(str,"\n    Start Time: %ld",x->time);
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (x->timeout != 0L)
-                {
-                sprintf(str,"\n    Timeout   : %ld (sec)",x->timeout);
-                if (BIO_puts(bp,str) <= 0) goto err;
-                }
-        if (BIO_puts(bp,"\n") <= 0) goto err;
-                
-        return(1);
-err:
-        return(0);
-        }
-
diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c
deleted file mode 100644
index 9745630a00..0000000000
--- a/src/lib/libssl/t1_clnt.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* ssl/t1_clnt.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *tls1_get_client_method(int ver);
-static SSL_METHOD *tls1_get_client_method(int ver)
-        {
-        if (ver == TLS1_VERSION)
-                return(TLSv1_client_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *TLSv1_client_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD TLSv1_client_data;
-
-        if (init)
-                {
-                memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(),
-                        sizeof(SSL_METHOD));
-                TLSv1_client_data.ssl_connect=ssl3_connect;
-                TLSv1_client_data.get_ssl_method=tls1_get_client_method;
-                init=0;
-                }
-        return(&TLSv1_client_data);
-        }
-
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
deleted file mode 100644
index 914b743498..0000000000
--- a/src/lib/libssl/t1_enc.c
+++ /dev/null
@@ -1,633 +0,0 @@
-/* ssl/t1_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 <openssl/comp.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include "ssl_locl.h"
-
-static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
-                        int sec_len, unsigned char *seed, int seed_len,
-                        unsigned char *out, int olen)
-        {
-        int chunk,n;
-        unsigned int j;
-        HMAC_CTX ctx;
-        HMAC_CTX ctx_tmp;
-        unsigned char A1[HMAC_MAX_MD_CBLOCK];
-        unsigned int A1_len;
-        
-        chunk=EVP_MD_size(md);
-
-        HMAC_Init(&ctx,sec,sec_len,md);
-        HMAC_Update(&ctx,seed,seed_len);
-        HMAC_Final(&ctx,A1,&A1_len);
-
-        n=0;
-        for (;;)
-                {
-                HMAC_Init(&ctx,NULL,0,NULL); /* re-init */
-                HMAC_Update(&ctx,A1,A1_len);
-                memcpy(&ctx_tmp,&ctx,sizeof(ctx)); /* Copy for A2 */ /* not needed for last one */
-                HMAC_Update(&ctx,seed,seed_len);
-
-                if (olen > chunk)
-                        {
-                        HMAC_Final(&ctx,out,&j);
-                        out+=j;
-                        olen-=j;
-                        HMAC_Final(&ctx_tmp,A1,&A1_len); /* calc the next A1 value */
-                        }
-                else    /* last one */
-                        {
-                        HMAC_Final(&ctx,A1,&A1_len);
-                        memcpy(out,A1,olen);
-                        break;
-                        }
-                }
-        HMAC_cleanup(&ctx);
-        HMAC_cleanup(&ctx_tmp);
-        memset(A1,0,sizeof(A1));
-        }
-
-static void tls1_PRF(const EVP_MD *md5, const EVP_MD *sha1,
-                     unsigned char *label, int label_len,
-                     const unsigned char *sec, int slen, unsigned char *out1,
-                     unsigned char *out2, int olen)
-        {
-        int len,i;
-        const unsigned char *S1,*S2;
-
-        len=slen/2;
-        S1=sec;
-        S2= &(sec[len]);
-        len+=(slen&1); /* add for odd, make longer */
-
-        
-        tls1_P_hash(md5 ,S1,len,label,label_len,out1,olen);
-        tls1_P_hash(sha1,S2,len,label,label_len,out2,olen);
-
-        for (i=0; i<olen; i++)
-                out1[i]^=out2[i];
-        }
-
-static void tls1_generate_key_block(SSL *s, unsigned char *km,
-             unsigned char *tmp, int num)
-        {
-        unsigned char *p;
-        unsigned char buf[SSL3_RANDOM_SIZE*2+
-                TLS_MD_MAX_CONST_SIZE];
-        p=buf;
-
-        memcpy(p,TLS_MD_KEY_EXPANSION_CONST,
-                TLS_MD_KEY_EXPANSION_CONST_SIZE);
-        p+=TLS_MD_KEY_EXPANSION_CONST_SIZE;
-        memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
-        memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
-
-        tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,(int)(p-buf),
-                 s->session->master_key,s->session->master_key_length,
-                 km,tmp,num);
-        }
-
-int tls1_change_cipher_state(SSL *s, int which)
-        {
-        static const unsigned char empty[]="";
-        unsigned char *p,*key_block,*mac_secret;
-        unsigned char *exp_label,buf[TLS_MD_MAX_CONST_SIZE+
-                SSL3_RANDOM_SIZE*2];
-        unsigned char tmp1[EVP_MAX_KEY_LENGTH];
-        unsigned char tmp2[EVP_MAX_KEY_LENGTH];
-        unsigned char iv1[EVP_MAX_IV_LENGTH*2];
-        unsigned char iv2[EVP_MAX_IV_LENGTH*2];
-        unsigned char *ms,*key,*iv,*er1,*er2;
-        int client_write;
-        EVP_CIPHER_CTX *dd;
-        const EVP_CIPHER *c;
-        const SSL_COMP *comp;
-        const EVP_MD *m;
-        int _exp,n,i,j,k,exp_label_len,cl;
-
-        _exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
-        c=s->s3->tmp.new_sym_enc;
-        m=s->s3->tmp.new_hash;
-        comp=s->s3->tmp.new_compression;
-        key_block=s->s3->tmp.key_block;
-
-        if (which & SSL3_CC_READ)
-                {
-                if ((s->enc_read_ctx == NULL) &&
-                        ((s->enc_read_ctx=(EVP_CIPHER_CTX *)
-                        Malloc(sizeof(EVP_CIPHER_CTX))) == NULL))
-                        goto err;
-                dd= s->enc_read_ctx;
-                s->read_hash=m;
-                if (s->expand != NULL)
-                        {
-                        COMP_CTX_free(s->expand);
-                        s->expand=NULL;
-                        }
-                if (comp != NULL)
-                        {
-                        s->expand=COMP_CTX_new(comp->method);
-                        if (s->expand == NULL)
-                                {
-                                SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE,SSL_R_COMPRESSION_LIBRARY_ERROR);
-                                goto err2;
-                                }
-                        if (s->s3->rrec.comp == NULL)
-                                s->s3->rrec.comp=(unsigned char *)
-                                        Malloc(SSL3_RT_MAX_ENCRYPTED_LENGTH);
-                        if (s->s3->rrec.comp == NULL)
-                                goto err;
-                        }
-                memset(&(s->s3->read_sequence[0]),0,8);
-                mac_secret= &(s->s3->read_mac_secret[0]);
-                }
-        else
-                {
-                if ((s->enc_write_ctx == NULL) &&
-                        ((s->enc_write_ctx=(EVP_CIPHER_CTX *)
-                        Malloc(sizeof(EVP_CIPHER_CTX))) == NULL))
-                        goto err;
-                dd= s->enc_write_ctx;
-                s->write_hash=m;
-                if (s->compress != NULL)
-                        {
-                        COMP_CTX_free(s->compress);
-                        s->compress=NULL;
-                        }
-                if (comp != NULL)
-                        {
-                        s->compress=COMP_CTX_new(comp->method);
-                        if (s->compress == NULL)
-                                {
-                                SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE,SSL_R_COMPRESSION_LIBRARY_ERROR);
-                                goto err2;
-                                }
-                        }
-                memset(&(s->s3->write_sequence[0]),0,8);
-                mac_secret= &(s->s3->write_mac_secret[0]);
-                }
-
-        EVP_CIPHER_CTX_init(dd);
-
-        p=s->s3->tmp.key_block;
-        i=EVP_MD_size(m);
-        cl=EVP_CIPHER_key_length(c);
-        j=_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?
-                  cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;
-        /* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
-        k=EVP_CIPHER_iv_length(c);
-        er1= &(s->s3->client_random[0]);
-        er2= &(s->s3->server_random[0]);
-        if (    (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
-                (which == SSL3_CHANGE_CIPHER_SERVER_READ))
-                {
-                ms=  &(p[ 0]); n=i+i;
-                key= &(p[ n]); n+=j+j;
-                iv=  &(p[ n]); n+=k+k;
-                exp_label=(unsigned char *)TLS_MD_CLIENT_WRITE_KEY_CONST;
-                exp_label_len=TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE;
-                client_write=1;
-                }
-        else
-                {
-                n=i;
-                ms=  &(p[ n]); n+=i+j;
-                key= &(p[ n]); n+=j+k;
-                iv=  &(p[ n]); n+=k;
-                exp_label=(unsigned char *)TLS_MD_SERVER_WRITE_KEY_CONST;
-                exp_label_len=TLS_MD_SERVER_WRITE_KEY_CONST_SIZE;
-                client_write=0;
-                }
-
-        if (n > s->s3->tmp.key_block_length)
-                {
-                SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE,SSL_R_INTERNAL_ERROR);
-                goto err2;
-                }
-
-        memcpy(mac_secret,ms,i);
-#ifdef TLS_DEBUG
-printf("which = %04X\nmac key=",which);
-{ int z; for (z=0; z<i; z++) printf("%02X%c",ms[z],((z+1)%16)?' ':'\n'); }
-#endif
-        if (_exp)
-                {
-                /* In here I set both the read and write key/iv to the
-                 * same value since only the correct one will be used :-).
-                 */
-                p=buf;
-                memcpy(p,exp_label,exp_label_len);
-                p+=exp_label_len;
-                memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
-                memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
-                tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,(int)(p-buf),key,j,
-                         tmp1,tmp2,EVP_CIPHER_key_length(c));
-                key=tmp1;
-
-                if (k > 0)
-                        {
-                        p=buf;
-                        memcpy(p,TLS_MD_IV_BLOCK_CONST,
-                                TLS_MD_IV_BLOCK_CONST_SIZE);
-                        p+=TLS_MD_IV_BLOCK_CONST_SIZE;
-                        memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-                        p+=SSL3_RANDOM_SIZE;
-                        memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-                        p+=SSL3_RANDOM_SIZE;
-                        tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,p-buf,empty,0,
-                                 iv1,iv2,k*2);
-                        if (client_write)
-                                iv=iv1;
-                        else
-                                iv= &(iv1[k]);
-                        }
-                }
-
-        s->session->key_arg_length=0;
-
-        EVP_CipherInit(dd,c,key,iv,(which & SSL3_CC_WRITE));
-#ifdef TLS_DEBUG
-printf("which = %04X\nkey=",which);
-{ int z; for (z=0; z<EVP_CIPHER_key_length(c); z++) printf("%02X%c",key[z],((z+1)%16)?' ':'\n'); }
-printf("\niv=");
-{ int z; for (z=0; z<k; z++) printf("%02X%c",iv[z],((z+1)%16)?' ':'\n'); }
-printf("\n");
-#endif
-
-        memset(tmp1,0,sizeof(tmp1));
-        memset(tmp2,0,sizeof(tmp1));
-        memset(iv1,0,sizeof(iv1));
-        memset(iv2,0,sizeof(iv2));
-        return(1);
-err:
-        SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE,ERR_R_MALLOC_FAILURE);
-err2:
-        return(0);
-        }
-
-int tls1_setup_key_block(SSL *s)
-        {
-        unsigned char *p1,*p2;
-        const EVP_CIPHER *c;
-        const EVP_MD *hash;
-        int num;
-        SSL_COMP *comp;
-
-        if (s->s3->tmp.key_block_length != 0)
-                return(1);
-
-        if (!ssl_cipher_get_evp(s->session,&c,&hash,&comp))
-                {
-                SSLerr(SSL_F_TLS1_SETUP_KEY_BLOCK,SSL_R_CIPHER_OR_HASH_UNAVAILABLE);
-                return(0);
-                }
-
-        s->s3->tmp.new_sym_enc=c;
-        s->s3->tmp.new_hash=hash;
-
-        num=EVP_CIPHER_key_length(c)+EVP_MD_size(hash)+EVP_CIPHER_iv_length(c);
-        num*=2;
-
-        ssl3_cleanup_key_block(s);
-
-        if ((p1=(unsigned char *)Malloc(num)) == NULL)
-                goto err;
-        if ((p2=(unsigned char *)Malloc(num)) == NULL)
-                goto err;
-
-        s->s3->tmp.key_block_length=num;
-        s->s3->tmp.key_block=p1;
-
-
-#ifdef TLS_DEBUG
-printf("client random\n");
-{ int z; for (z=0; z<SSL3_RANDOM_SIZE; z++) printf("%02X%c",s->s3->client_random[z],((z+1)%16)?' ':'\n'); }
-printf("server random\n");
-{ int z; for (z=0; z<SSL3_RANDOM_SIZE; z++) printf("%02X%c",s->s3->server_random[z],((z+1)%16)?' ':'\n'); }
-printf("pre-master\n");
-{ int z; for (z=0; z<s->session->master_key_length; z++) printf("%02X%c",s->session->master_key[z],((z+1)%16)?' ':'\n'); }
-#endif
-        tls1_generate_key_block(s,p1,p2,num);
-        memset(p2,0,num);
-        Free(p2);
-#ifdef TLS_DEBUG
-printf("\nkey block\n");
-{ int z; for (z=0; z<num; z++) printf("%02X%c",p1[z],((z+1)%16)?' ':'\n'); }
-#endif
-
-        return(1);
-err:
-        SSLerr(SSL_F_TLS1_SETUP_KEY_BLOCK,ERR_R_MALLOC_FAILURE);
-        return(0);
-        }
-
-int tls1_enc(SSL *s, int send)
-        {
-        SSL3_RECORD *rec;
-        EVP_CIPHER_CTX *ds;
-        unsigned long l;
-        int bs,i,ii,j,k,n=0;
-        const EVP_CIPHER *enc;
-
-        if (send)
-                {
-                if (s->write_hash != NULL)
-                        n=EVP_MD_size(s->write_hash);
-                ds=s->enc_write_ctx;
-                rec= &(s->s3->wrec);
-                if (s->enc_write_ctx == NULL)
-                        enc=NULL;
-                else
-                        enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
-                }
-        else
-                {
-                if (s->read_hash != NULL)
-                        n=EVP_MD_size(s->read_hash);
-                ds=s->enc_read_ctx;
-                rec= &(s->s3->rrec);
-                if (s->enc_read_ctx == NULL)
-                        enc=NULL;
-                else
-                        enc=EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
-                }
-
-        if ((s->session == NULL) || (ds == NULL) ||
-                (enc == NULL))
-                {
-                memcpy(rec->data,rec->input,rec->length);
-                rec->input=rec->data;
-                }
-        else
-                {
-                l=rec->length;
-                bs=EVP_CIPHER_block_size(ds->cipher);
-
-                if ((bs != 1) && send)
-                        {
-                        i=bs-((int)l%bs);
-
-                        /* Add weird padding of upto 256 bytes */
-
-                        /* we need to add 'i' padding bytes of value j */
-                        j=i-1;
-                        if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG)
-                                {
-                                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
-                                        j++;
-                                }
-                        for (k=(int)l; k<(int)(l+i); k++)
-                                rec->input[k]=j;
-                        l+=i;
-                        rec->length+=i;
-                        }
-
-                EVP_Cipher(ds,rec->data,rec->input,l);
-
-                if ((bs != 1) && !send)
-                        {
-                        ii=i=rec->data[l-1];
-                        i++;
-                        if (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG)
-                                {
-                                /* First packet is even in size, so check */
-                                if ((memcmp(s->s3->read_sequence,
-                                        "\0\0\0\0\0\0\0\0",8) == 0) && !(ii & 1))
-                                        s->s3->flags|=TLS1_FLAGS_TLS_PADDING_BUG;
-                                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
-                                        i--;
-                                }
-                        if (i > (int)rec->length)
-                                {
-                                SSLerr(SSL_F_TLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
-                                return(0);
-                                }
-                        for (j=(int)(l-i); j<(int)l; j++)
-                                {
-                                if (rec->data[j] != ii)
-                                        {
-                                        SSLerr(SSL_F_TLS1_ENC,SSL_R_DECRYPTION_FAILED);
-                                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
-                                        return(0);
-                                        }
-                                }
-                        rec->length-=i;
-                        }
-                }
-        return(1);
-        }
-
-int tls1_cert_verify_mac(SSL *s, EVP_MD_CTX *in_ctx, unsigned char *out)
-        {
-        unsigned int ret;
-        EVP_MD_CTX ctx;
-
-        EVP_MD_CTX_copy(&ctx,in_ctx);
-        EVP_DigestFinal(&ctx,out,&ret);
-        return((int)ret);
-        }
-
-int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
-             unsigned char *str, int slen, unsigned char *out)
-        {
-        unsigned int i;
-        EVP_MD_CTX ctx;
-        unsigned char buf[TLS_MD_MAX_CONST_SIZE+MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
-        unsigned char *q,buf2[12];
-
-        q=buf;
-        memcpy(q,str,slen);
-        q+=slen;
-
-        EVP_MD_CTX_copy(&ctx,in1_ctx);
-        EVP_DigestFinal(&ctx,q,&i);
-        q+=i;
-        EVP_MD_CTX_copy(&ctx,in2_ctx);
-        EVP_DigestFinal(&ctx,q,&i);
-        q+=i;
-
-        tls1_PRF(s->ctx->md5,s->ctx->sha1,buf,(int)(q-buf),
-                s->session->master_key,s->session->master_key_length,
-                out,buf2,12);
-        memset(&ctx,0,sizeof(EVP_MD_CTX));
-
-        return((int)12);
-        }
-
-int tls1_mac(SSL *ssl, unsigned char *md, int send)
-        {
-        SSL3_RECORD *rec;
-        unsigned char *mac_sec,*seq;
-        const EVP_MD *hash;
-        unsigned int md_size;
-        int i;
-        HMAC_CTX hmac;
-        unsigned char buf[5]; 
-
-        if (send)
-                {
-                rec= &(ssl->s3->wrec);
-                mac_sec= &(ssl->s3->write_mac_secret[0]);
-                seq= &(ssl->s3->write_sequence[0]);
-                hash=ssl->write_hash;
-                }
-        else
-                {
-                rec= &(ssl->s3->rrec);
-                mac_sec= &(ssl->s3->read_mac_secret[0]);
-                seq= &(ssl->s3->read_sequence[0]);
-                hash=ssl->read_hash;
-                }
-
-        md_size=EVP_MD_size(hash);
-
-        buf[0]=rec->type;
-        buf[1]=TLS1_VERSION_MAJOR;
-        buf[2]=TLS1_VERSION_MINOR;
-        buf[3]=rec->length>>8;
-        buf[4]=rec->length&0xff;
-
-        /* I should fix this up TLS TLS TLS TLS TLS XXXXXXXX */
-        HMAC_Init(&hmac,mac_sec,EVP_MD_size(hash),hash);
-        HMAC_Update(&hmac,seq,8);
-        HMAC_Update(&hmac,buf,5);
-        HMAC_Update(&hmac,rec->input,rec->length);
-        HMAC_Final(&hmac,md,&md_size);
-
-#ifdef TLS_DEBUG
-printf("sec=");
-{unsigned int z; for (z=0; z<md_size; z++) printf("%02X ",mac_sec[z]); printf("\n"); }
-printf("seq=");
-{int z; for (z=0; z<8; z++) printf("%02X ",seq[z]); printf("\n"); }
-printf("buf=");
-{int z; for (z=0; z<5; z++) printf("%02X ",buf[z]); printf("\n"); }
-printf("rec=");
-{unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); }
-#endif
-
-        for (i=7; i>=0; i--)
-                if (++seq[i]) break; 
-
-#ifdef TLS_DEBUG
-{unsigned int z; for (z=0; z<md_size; z++) printf("%02X ",md[z]); printf("\n"); }
-#endif
-        return(md_size);
-        }
-
-int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
-             int len)
-        {
-        unsigned char buf[SSL3_RANDOM_SIZE*2+TLS_MD_MASTER_SECRET_CONST_SIZE];
-        unsigned char buff[SSL_MAX_MASTER_KEY_LENGTH];
-
-        /* Setup the stuff to munge */
-        memcpy(buf,TLS_MD_MASTER_SECRET_CONST,
-                TLS_MD_MASTER_SECRET_CONST_SIZE);
-        memcpy(&(buf[TLS_MD_MASTER_SECRET_CONST_SIZE]),
-                s->s3->client_random,SSL3_RANDOM_SIZE);
-        memcpy(&(buf[SSL3_RANDOM_SIZE+TLS_MD_MASTER_SECRET_CONST_SIZE]),
-                s->s3->server_random,SSL3_RANDOM_SIZE);
-        tls1_PRF(s->ctx->md5,s->ctx->sha1,
-                buf,TLS_MD_MASTER_SECRET_CONST_SIZE+SSL3_RANDOM_SIZE*2,p,len,
-                s->session->master_key,buff,SSL3_MASTER_SECRET_SIZE);
-        return(SSL3_MASTER_SECRET_SIZE);
-        }
-
-int tls1_alert_code(int code)
-        {
-        switch (code)
-                {
-        case SSL_AD_CLOSE_NOTIFY:       return(SSL3_AD_CLOSE_NOTIFY);
-        case SSL_AD_UNEXPECTED_MESSAGE: return(SSL3_AD_UNEXPECTED_MESSAGE);
-        case SSL_AD_BAD_RECORD_MAC:     return(SSL3_AD_BAD_RECORD_MAC);
-        case SSL_AD_DECRYPTION_FAILED:  return(TLS1_AD_DECRYPTION_FAILED);
-        case SSL_AD_RECORD_OVERFLOW:    return(TLS1_AD_RECORD_OVERFLOW);
-        case SSL_AD_DECOMPRESSION_FAILURE:return(SSL3_AD_DECOMPRESSION_FAILURE);
-        case SSL_AD_HANDSHAKE_FAILURE:  return(SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_NO_CERTIFICATE:     return(-1);
-        case SSL_AD_BAD_CERTIFICATE:    return(SSL3_AD_BAD_CERTIFICATE);
-        case SSL_AD_UNSUPPORTED_CERTIFICATE:return(SSL3_AD_UNSUPPORTED_CERTIFICATE);
-        case SSL_AD_CERTIFICATE_REVOKED:return(SSL3_AD_CERTIFICATE_REVOKED);
-        case SSL_AD_CERTIFICATE_EXPIRED:return(SSL3_AD_CERTIFICATE_EXPIRED);
-        case SSL_AD_CERTIFICATE_UNKNOWN:return(SSL3_AD_CERTIFICATE_UNKNOWN);
-        case SSL_AD_ILLEGAL_PARAMETER:  return(SSL3_AD_ILLEGAL_PARAMETER);
-        case SSL_AD_UNKNOWN_CA:         return(TLS1_AD_UNKNOWN_CA);
-        case SSL_AD_ACCESS_DENIED:      return(TLS1_AD_ACCESS_DENIED);
-        case SSL_AD_DECODE_ERROR:       return(TLS1_AD_DECODE_ERROR);
-        case SSL_AD_DECRYPT_ERROR:      return(TLS1_AD_DECRYPT_ERROR);
-        case SSL_AD_EXPORT_RESTRICION:  return(TLS1_AD_EXPORT_RESTRICION);
-        case SSL_AD_PROTOCOL_VERSION:   return(TLS1_AD_PROTOCOL_VERSION);
-        case SSL_AD_INSUFFICIENT_SECURITY:return(TLS1_AD_INSUFFICIENT_SECURITY);
-        case SSL_AD_INTERNAL_ERROR:     return(TLS1_AD_INTERNAL_ERROR);
-        case SSL_AD_USER_CANCLED:       return(TLS1_AD_USER_CANCLED);
-        case SSL_AD_NO_RENEGOTIATION:   return(TLS1_AD_NO_RENEGOTIATION);
-        default:                        return(-1);
-                }
-        }
-
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
deleted file mode 100644
index ddf5c15799..0000000000
--- a/src/lib/libssl/t1_lib.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ssl/t1_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 <openssl/objects.h>
-#include "ssl_locl.h"
-
-char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT;
-
-#ifndef NO_PROTO
-static long tls1_default_timeout(void);
-#else
-static long tls1_default_timeout();
-#endif
-
-static SSL3_ENC_METHOD TLSv1_enc_data={
-        tls1_enc,
-        tls1_mac,
-        tls1_setup_key_block,
-        tls1_generate_master_secret,
-        tls1_change_cipher_state,
-        tls1_final_finish_mac,
-        TLS1_FINISH_MAC_LENGTH,
-        tls1_cert_verify_mac,
-        TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
-        TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
-        tls1_alert_code,
-        };
-
-static SSL_METHOD TLSv1_data= {
-        TLS1_VERSION,
-        tls1_new,
-        tls1_clear,
-        tls1_free,
-        ssl_undefined_function,
-        ssl_undefined_function,
-        ssl3_read,
-        ssl3_peek,
-        ssl3_write,
-        ssl3_shutdown,
-        ssl3_renegotiate,
-        ssl3_renegotiate_check,
-        ssl3_ctrl,
-        ssl3_ctx_ctrl,
-        ssl3_get_cipher_by_char,
-        ssl3_put_cipher_by_char,
-        ssl3_pending,
-        ssl3_num_ciphers,
-        ssl3_get_cipher,
-        ssl_bad_method,
-        tls1_default_timeout,
-        &TLSv1_enc_data,
-        };
-
-static long tls1_default_timeout(void)
-        {
-        /* 2 hours, the 24 hours mentioned in the TLSv1 spec
-         * is way too long for http, the cache would over fill */
-        return(60*60*2);
-        }
-
-SSL_METHOD *tlsv1_base_method(void)
-        {
-        return(&TLSv1_data);
-        }
-
-int tls1_new(SSL *s)
-        {
-        if (!ssl3_new(s)) return(0);
-        s->method->ssl_clear(s);
-        return(1);
-        }
-
-void tls1_free(SSL *s)
-        {
-        ssl3_free(s);
-        }
-
-void tls1_clear(SSL *s)
-        {
-        ssl3_clear(s);
-        s->version=TLS1_VERSION;
-        }
-
-#if 0
-long tls1_ctrl(SSL *s, int cmd, long larg, char *parg)
-        {
-        return(0);
-        }
-#endif
diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c
deleted file mode 100644
index 9bb36a7d1c..0000000000
--- a/src/lib/libssl/t1_meth.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ssl/t1_meth.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/objects.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *tls1_get_method(int ver);
-static SSL_METHOD *tls1_get_method(int ver)
-        {
-        if (ver == TLS1_VERSION)
-                return(TLSv1_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *TLSv1_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD TLSv1_data;
-
-        if (init)
-                {
-                memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(),
-                        sizeof(SSL_METHOD));
-                TLSv1_data.ssl_connect=ssl3_connect;
-                TLSv1_data.ssl_accept=ssl3_accept;
-                TLSv1_data.get_ssl_method=tls1_get_method;
-                init=0;
-                }
-        return(&TLSv1_data);
-        }
-
diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c
deleted file mode 100644
index 996b7ca8e2..0000000000
--- a/src/lib/libssl/t1_srvr.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ssl/t1_srvr.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/buffer.h>
-#include <openssl/rand.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include "ssl_locl.h"
-
-static SSL_METHOD *tls1_get_server_method(int ver);
-static SSL_METHOD *tls1_get_server_method(int ver)
-        {
-        if (ver == TLS1_VERSION)
-                return(TLSv1_server_method());
-        else
-                return(NULL);
-        }
-
-SSL_METHOD *TLSv1_server_method(void)
-        {
-        static int init=1;
-        static SSL_METHOD TLSv1_server_data;
-
-        if (init)
-                {
-                memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
-                        sizeof(SSL_METHOD));
-                TLSv1_server_data.ssl_accept=ssl3_accept;
-                TLSv1_server_data.get_ssl_method=tls1_get_server_method;
-                init=0;
-                }
-        return(&TLSv1_server_data);
-        }
-
diff --git a/src/lib/libssl/test/CAss.cnf b/src/lib/libssl/test/CAss.cnf
deleted file mode 100644
index b941b7ae15..0000000000
--- a/src/lib/libssl/test/CAss.cnf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = ./.rnd
-
-####################################################################
-[ req ]
-default_bits            = 512
-default_keyfile         = keySS.pem
-distinguished_name      = req_distinguished_name
-encrypt_rsa_key         = no
-default_md              = sha1
-
-[ req_distinguished_name ]
-countryName                     = Country Name (2 letter code)
-countryName_default             = AU
-countryName_value               = AU
-
-organizationName                = Organization Name (eg, company)
-organizationName_value          = Dodgy Brothers
-
-commonName                      = Common Name (eg, YOUR name)
-commonName_value                = Dodgy CA
diff --git a/src/lib/libssl/test/CAssdh.cnf b/src/lib/libssl/test/CAssdh.cnf
deleted file mode 100644
index 4e0a908679..0000000000
--- a/src/lib/libssl/test/CAssdh.cnf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# hacked by iang to do DH certs - CA
-
-RANDFILE              = ./.rnd
-
-####################################################################
-[ req ]
-distinguished_name    = req_distinguished_name
-encrypt_rsa_key               = no
-
-[ req_distinguished_name ]
-countryName                   = Country Name (2 letter code)
-countryName_default           = CU
-countryName_value             = CU
-
-organizationName              = Organization Name (eg, company)
-organizationName_value                = La Junta de la Revolucion
-
-commonName                    = Common Name (eg, YOUR name)
-commonName_value              = Junta
-
diff --git a/src/lib/libssl/test/CAssdsa.cnf b/src/lib/libssl/test/CAssdsa.cnf
deleted file mode 100644
index a6b4d1810c..0000000000
--- a/src/lib/libssl/test/CAssdsa.cnf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# hacked by iang to do DSA certs - CA
-
-RANDFILE              = ./.rnd
-
-####################################################################
-[ req ]
-distinguished_name    = req_distinguished_name
-encrypt_rsa_key               = no
-
-[ req_distinguished_name ]
-countryName                   = Country Name (2 letter code)
-countryName_default           = ES
-countryName_value             = ES
-
-organizationName              = Organization Name (eg, company)
-organizationName_value                = Hermanos Locos
-
-commonName                    = Common Name (eg, YOUR name)
-commonName_value              = Hermanos Locos CA
diff --git a/src/lib/libssl/test/CAssrsa.cnf b/src/lib/libssl/test/CAssrsa.cnf
deleted file mode 100644
index eb24a6dfc0..0000000000
--- a/src/lib/libssl/test/CAssrsa.cnf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# create RSA certs - CA
-
-RANDFILE              = ./.rnd
-
-####################################################################
-[ req ]
-distinguished_name    = req_distinguished_name
-encrypt_key           = no
-
-[ req_distinguished_name ]
-countryName                   = Country Name (2 letter code)
-countryName_default           = ES
-countryName_value             = ES
-
-organizationName              = Organization Name (eg, company)
-organizationName_value                = Hermanos Locos
-
-commonName                    = Common Name (eg, YOUR name)
-commonName_value              = Hermanos Locos CA
-
diff --git a/src/lib/libssl/test/Sssdsa.cnf b/src/lib/libssl/test/Sssdsa.cnf
deleted file mode 100644
index 8e170a28ef..0000000000
--- a/src/lib/libssl/test/Sssdsa.cnf
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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           = ES
-countryName_value             = ES
-
-organizationName                = Organization Name (eg, company)
-organizationName_value          = Tortilleras S.A.
-
-0.commonName                  = Common Name (eg, YOUR name)
-0.commonName_value            = Torti
-
-1.commonName                  = Common Name (eg, YOUR name)
-1.commonName_value            = Gordita
-
diff --git a/src/lib/libssl/test/Sssrsa.cnf b/src/lib/libssl/test/Sssrsa.cnf
deleted file mode 100644
index 8c79a03fca..0000000000
--- a/src/lib/libssl/test/Sssrsa.cnf
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-# create RSA certs - Server
-
-RANDFILE              = ./.rnd
-
-####################################################################
-[ req ]
-distinguished_name    = req_distinguished_name
-encrypt_key           = no
-
-[ req_distinguished_name ]
-countryName                   = Country Name (2 letter code)
-countryName_default           = ES
-countryName_value             = ES
-
-organizationName                = Organization Name (eg, company)
-organizationName_value          = Tortilleras S.A.
-
-0.commonName                  = Common Name (eg, YOUR name)
-0.commonName_value            = Torti
-
-1.commonName                  = Common Name (eg, YOUR name)
-1.commonName_value            = Gordita
diff --git a/src/lib/libssl/test/Uss.cnf b/src/lib/libssl/test/Uss.cnf
deleted file mode 100644
index c89692d519..0000000000
--- a/src/lib/libssl/test/Uss.cnf
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = ./.rnd
-
-####################################################################
-[ req ]
-default_bits            = 512
-default_keyfile         = keySS.pem
-distinguished_name      = req_distinguished_name
-encrypt_rsa_key         = no
-default_md              = md2
-
-[ req_distinguished_name ]
-countryName                     = Country Name (2 letter code)
-countryName_default             = AU
-countryName_value               = AU
-
-organizationName                = Organization Name (eg, company)
-organizationName_value          = Dodgy Brothers
-
-0.commonName                    = Common Name (eg, YOUR name)
-0.commonName_value              = Brother 1
-
-1.commonName                    = Common Name (eg, YOUR name)
-1.commonName_value              = Brother 2
diff --git a/src/lib/libssl/test/VMSca-response.1 b/src/lib/libssl/test/VMSca-response.1
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/lib/libssl/test/VMSca-response.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/lib/libssl/test/VMSca-response.2 b/src/lib/libssl/test/VMSca-response.2
deleted file mode 100644
index 9b48ee4cf9..0000000000
--- a/src/lib/libssl/test/VMSca-response.2
+++ /dev/null
@@ -1,2 +0,0 @@
-y
-y
diff --git a/src/lib/libssl/test/methtest.c b/src/lib/libssl/test/methtest.c
deleted file mode 100644
index 06ccb3b310..0000000000
--- a/src/lib/libssl/test/methtest.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* test/methtest.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 <openssl/rsa.h>
-#include <openssl/x509.h>
-#include "meth.h"
-#include <openssl/err.h>
-
-int main(argc,argv)
-int argc;
-char *argv[];
-        {
-        METHOD_CTX *top,*tmp1,*tmp2;
-
-        top=METH_new(x509_lookup()); /* get a top level context */
-        if (top == NULL) goto err;
-
-        tmp1=METH_new(x509_by_file());
-        if (top == NULL) goto err;
-        METH_arg(tmp1,METH_TYPE_FILE,"cafile1");
-        METH_arg(tmp1,METH_TYPE_FILE,"cafile2");
-        METH_push(top,METH_X509_CA_BY_SUBJECT,tmp1);
-
-        tmp2=METH_new(x509_by_dir());
-        METH_arg(tmp2,METH_TYPE_DIR,"/home/eay/.CAcerts");
-        METH_arg(tmp2,METH_TYPE_DIR,"/home/eay/SSLeay/certs");
-        METH_arg(tmp2,METH_TYPE_DIR,"/usr/local/ssl/certs");
-        METH_push(top,METH_X509_CA_BY_SUBJECT,tmp2);
-
-/*      tmp=METH_new(x509_by_issuer_dir);
-        METH_arg(tmp,METH_TYPE_DIR,"/home/eay/.mycerts");
-        METH_push(top,METH_X509_BY_ISSUER,tmp);
-
-        tmp=METH_new(x509_by_issuer_primary);
-        METH_arg(tmp,METH_TYPE_FILE,"/home/eay/.mycerts/primary.pem");
-        METH_push(top,METH_X509_BY_ISSUER,tmp);
-*/
-
-        METH_init(top);
-        METH_control(tmp1,METH_CONTROL_DUMP,stdout);
-        METH_control(tmp2,METH_CONTROL_DUMP,stdout);
-        exit(0);
-err:
-        ERR_load_crypto_strings();
-        ERR_print_errors_fp(stderr);
-        exit(1);
-        return(0);
-        }
diff --git a/src/lib/libssl/test/pkcs7-1.pem b/src/lib/libssl/test/pkcs7-1.pem
deleted file mode 100644
index c47b27af88..0000000000
--- a/src/lib/libssl/test/pkcs7-1.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PKCS7-----
-MIICUAYJKoZIhvcNAQcCoIICQTCCAj0CAQExDjAMBggqhkiG9w0CAgUAMCgGCSqG
-SIb3DQEHAaAbBBlFdmVyeW9uZSBnZXRzIEZyaWRheSBvZmYuoIIBXjCCAVowggEE
-AgQUAAApMA0GCSqGSIb3DQEBAgUAMCwxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRF
-eGFtcGxlIE9yZ2FuaXphdGlvbjAeFw05MjA5MDkyMjE4MDZaFw05NDA5MDkyMjE4
-MDVaMEIxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRFeGFtcGxlIE9yZ2FuaXphdGlv
-bjEUMBIGA1UEAxMLVGVzdCBVc2VyIDEwWzANBgkqhkiG9w0BAQEFAANKADBHAkAK
-ZnkdxpiBaN56t3QZu3+wwAHGJxAnAHUUKULhmo2MUdBTs+N4Kh3l3Fr06+mUaBcB
-FKHf5nzcmpr1XWVWILurAgMBAAEwDQYJKoZIhvcNAQECBQADQQBFGqHhqncgSl/N
-9XYGnQL3MsJvNnsNV4puZPOakR9Hld8JlDQFEaDR30ogsmp3TMrvdfxpLlTCoZN8
-BxEmnZsWMYGbMIGYAgEBMDQwLDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFEV4YW1w
-bGUgT3JnYW5pemF0aW9uAgQUAAApMAwGCCqGSIb3DQICBQAwDQYJKoZIhvcNAQEB
-BQAEQAX6aoEvx9+L9PJUJQngPoRuEbnGIL4gCe+0QO+8xmkhaZSsBPNBtX0FIC1C
-j7Kie1x339mxW/w9VZNTUDQQweHh
------END PKCS7-----
diff --git a/src/lib/libssl/test/pkcs7.pem b/src/lib/libssl/test/pkcs7.pem
deleted file mode 100644
index d55c60b94e..0000000000
--- a/src/lib/libssl/test/pkcs7.pem
+++ /dev/null
@@ -1,54 +0,0 @@
-     MIAGCSqGSIb3DQEHAqCAMIACAQExADCABgkqhkiG9w0BBwEAAKCAMIIE+DCCBGGg
-     AwIBAgIQaGSF/JpbS1C223+yrc+N1DANBgkqhkiG9w0BAQQFADBiMREwDwYDVQQH
-     EwhJbnRlcm5ldDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNDAyBgNVBAsTK1Zl
-     cmlTaWduIENsYXNzIDEgQ0EgLSBJbmRpdmlkdWFsIFN1YnNjcmliZXIwHhcNOTYw
-     ODEyMDAwMDAwWhcNOTYwODE3MjM1OTU5WjCCASAxETAPBgNVBAcTCEludGVybmV0
-     MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xh
-     c3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlcjE3MDUGA1UECxMuRGlnaXRh
-     bCBJRCBDbGFzcyAxIC0gU01JTUUgVmVyaVNpZ24sIEluYy4gVEVTVDFGMEQGA1UE
-     CxM9d3d3LnZlcmlzaWduLmNvbS9yZXBvc2l0b3J5L0NQUyBJbmNvcnAuIGJ5IFJl
-     Zi4sTElBQi5MVEQoYyk5NjEZMBcGA1UEAxMQQWxleGFuZHJlIERlYWNvbjEgMB4G
-     CSqGSIb3DQEJARYRYWxleEB2ZXJpc2lnbi5jb20wWzANBgkqhkiG9w0BAQEFAANK
-     ADBHAkAOy7xxCAIkOfuIA2LyRpxgKlDORl8htdXYhF5iBGUx1GYaK6KF+bK/CCI0
-     l4j2OfWGFBUrwGoWqxTNcWgTfMzRAgMBAAGjggIyMIICLjAJBgNVHRMEAjAAMIIC
-     HwYDVR0DBIICFjCCAhIwggIOMIICCgYLYIZIAYb4RQEHAQEwggH5FoIBp1RoaXMg
-     Y2VydGlmaWNhdGUgaW5jb3Jwb3JhdGVzIGJ5IHJlZmVyZW5jZSwgYW5kIGl0cyB1
-     c2UgaXMgc3RyaWN0bHkgc3ViamVjdCB0bywgdGhlIFZlcmlTaWduIENlcnRpZmlj
-     YXRpb24gUHJhY3RpY2UgU3RhdGVtZW50IChDUFMpLCBhdmFpbGFibGUgYXQ6IGh0
-     dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9DUFM7IGJ5IEUtbWFpbCBhdCBDUFMtcmVx
-     dWVzdHNAdmVyaXNpZ24uY29tOyBvciBieSBtYWlsIGF0IFZlcmlTaWduLCBJbmMu
-     LCAyNTkzIENvYXN0IEF2ZS4sIE1vdW50YWluIFZpZXcsIENBIDk0MDQzIFVTQSBU
-     ZWwuICsxICg0MTUpIDk2MS04ODMwIENvcHlyaWdodCAoYykgMTk5NiBWZXJpU2ln
-     biwgSW5jLiAgQWxsIFJpZ2h0cyBSZXNlcnZlZC4gQ0VSVEFJTiBXQVJSQU5USUVT
-     IERJU0NMQUlNRUQgYW5kIExJQUJJTElUWSBMSU1JVEVELqAOBgxghkgBhvhFAQcB
-     AQGhDgYMYIZIAYb4RQEHAQECMCwwKhYoaHR0cHM6Ly93d3cudmVyaXNpZ24uY29t
-     L3JlcG9zaXRvcnkvQ1BTIDANBgkqhkiG9w0BAQQFAAOBgQAimWMGQwwwxk+b3KAL
-     HlSWXtU7LWHe29CEG8XeVNTvrqs6SBqT7OoENOkGxpfdpVgZ3Qw2SKjxDvbvpfSF
-     slsqcxWSgB/hWuaVuZCkvTw/dYGGOxkTJGxvDCfl1PZjX4dKbatslsi9Z9HpGWT7
-     ttItRwKqcBKgmCJvKi1pGWED0zCCAnkwggHioAMCAQICEDURpVKQb+fQKaRAGdQR
-     /D4wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlT
-     aWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRp
-     ZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDYyNzAwMDAwMFoXDTk3MDYyNzIzNTk1
-     OVowYjERMA8GA1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMu
-     MTQwMgYDVQQLEytWZXJpU2lnbiBDbGFzcyAxIENBIC0gSW5kaXZpZHVhbCBTdWJz
-     Y3JpYmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2FKbPTdAFDdjKI9Bv
-     qrQpkmOOLPhvltcunXZLEbE2jVfJw/0cxrr+Hgi6M8qV6r7jW80GqLd5HUQq7XPy
-     sVKDaBBwZJHXPmv5912dFEObbpdFmIFH0S3L3bty10w/cariQPJUObwW7s987Lrb
-     P2wqsxaxhhKdrpM01bjV0Pc+qQIDAQABozMwMTAPBgNVHRMECDAGAQH/AgEBMAsG
-     A1UdDwQEAwIBBjARBglghkgBhvhCAQEEBAMCAgQwDQYJKoZIhvcNAQECBQADgYEA
-     KeXHoBmnbxRCgk0jM9e9mDppdxpsipIna/J8DOHEUuD4nONAr4+xOg73SBl026n7
-     Bk55A2wvAMGo7+kKTZ+rHaFDDcmq4O+rzFri2RIOeGAncj1IcGptAQhvXoIhFMG4
-     Jlzg1KlHZHqy7D3jex78zcSU7kKOu8f5tAX1jC3+sToAAKGAMIIBJzCBkTANBgkq
-     hkiG9w0BAQIFADBiMREwDwYDVQQHEwhJbnRlcm5ldDEXMBUGA1UEChMOVmVyaVNp
-     Z24sIEluYy4xNDAyBgNVBAsTK1ZlcmlTaWduIENsYXNzIDEgQ0EgLSBJbmRpdmlk
-     dWFsIFN1YnNjcmliZXIXDTk2MDcwMTE3MzA0MFoXDTk3MDcwMTAwMDAwMFowDQYJ
-     KoZIhvcNAQECBQADgYEAGLuQ6PX8A7AiqBEtWzYtl6lZNSDI0bR5YUo+D2Jzkw30
-     dxQnJSbKXEc6XYuzAW5HvrzATXu5c19WWPT4cRDwmjH71i9QcDysWwf/wE0qGTiW
-     I3tQT0I5VGh7jIJD07nlBw3R4Xl8dH9kr85JsWinqDH5YKpIo9o8knY5n7+qjOow
-     ggEkMIGOMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5W
-     ZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJpbWFyeSBD
-     ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eRcNOTYwNzE2MjMxMTI5WhcNOTYwODE1MDAw
-     MDAwWjANBgkqhkiG9w0BAQIFAAOBgQAXsLE4vnsY6sY67QrmWec7iaU2ehzxanEK
-     /9wKHZNuhlNzk+qGZZw2evxfUe2OaRbYpl8zuZvhK9BHD3ad14OSe9/zx5hOPgP/
-     DQXt6R4R8Q/1JheBrolrgbavjvI2wKS8/Psp2prBrkF4T48+AKRmS8Zzh1guxgvP
-     b+xSu/jH0gAAMYAAAAAAAAAAAA==
diff --git a/src/lib/libssl/test/r160test.c b/src/lib/libssl/test/r160test.c
deleted file mode 100644
index a172e393ca..0000000000
--- a/src/lib/libssl/test/r160test.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* test/r160test.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.]
- */
diff --git a/src/lib/libssl/test/tcrl b/src/lib/libssl/test/tcrl
deleted file mode 100644
index acaf8f3c47..0000000000
--- a/src/lib/libssl/test/tcrl
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl crl'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testcrl.pem
-fi
-
-echo testing crl conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in fff.p -inform p -outform t >f.t
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in f.t -inform t -outform d >ff.d2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in f.d -inform d -outform t >ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in f.t -inform t -outform t >ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in f.p -inform p -outform t >ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in f.t -inform t -outform p >ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp f.t ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/test.cnf b/src/lib/libssl/test/test.cnf
deleted file mode 100644
index faad3914a8..0000000000
--- a/src/lib/libssl/test/test.cnf
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# SSLeay example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-RANDFILE                = ./.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/new_certs        # 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
-
-default_days    = 365                   # how long to certify for
-default_crl_days= 30                    # how long before next CRL
-default_md      = md5                   # which md to use.
-
-# 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            = 512
-default_keyfile         = testkey.pem
-distinguished_name      = req_distinguished_name
-encrypt_rsa_key         = no
-
-[ req_distinguished_name ]
-countryName                     = Country Name (2 letter code)
-countryName_default             = AU
-countryName_value               = AU
-
-stateOrProvinceName             = State or Province Name (full name)
-stateOrProvinceName_default     = Queensland
-stateOrProvinceName_value       =
-
-localityName                    = Locality Name (eg, city)
-localityName_value              = Brisbane
-
-organizationName                = Organization Name (eg, company)
-organizationName_default        = 
-organizationName_value          = CryptSoft Pty Ltd
-
-organizationalUnitName          = Organizational Unit Name (eg, section)
-organizationalUnitName_default  =
-organizationalUnitName_value    = .
-
-commonName                      = Common Name (eg, YOUR name)
-commonName_value                = Eric Young
-
-emailAddress                    = Email Address
-emailAddress_value              = eay@mincom.oz.au
diff --git a/src/lib/libssl/test/testca b/src/lib/libssl/test/testca
deleted file mode 100644
index 88c186b6ab..0000000000
--- a/src/lib/libssl/test/testca
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-SH="/bin/sh"
-PATH=../apps:$PATH
-export SH PATH
-
-SSLEAY_CONFIG="-config CAss.cnf"
-export SSLEAY_CONFIG
-
-/bin/rm -fr demoCA
-$SH ../apps/CA.sh -newca <<EOF
-EOF
-
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-SSLEAY_CONFIG="-config Uss.cnf"
-export SSLEAY_CONFIG
-$SH ../apps/CA.sh -newreq
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-SSLEAY_CONFIG="-config ../apps/openssl.cnf"
-export SSLEAY_CONFIG
-$SH ../apps/CA.sh -sign  <<EOF
-y
-y
-EOF
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-
-$SH ../apps/CA.sh -verify newcert.pem
-if [ $? != 0 ]; then
-        exit 1;
-fi
-
-/bin/rm -fr demoCA newcert.pem newreq.pem
-#usage: CA -newcert|-newreq|-newca|-sign|-verify
-
diff --git a/src/lib/libssl/test/testcrl.pem b/src/lib/libssl/test/testcrl.pem
deleted file mode 100644
index 0989788354..0000000000
--- a/src/lib/libssl/test/testcrl.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN X509 CRL-----
-MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT
-F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw
-MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw
-MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw
-MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw
-MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw
-MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw
-MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw
-NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw
-NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF
-AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ
-wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt
-JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v
------END X509 CRL-----
diff --git a/src/lib/libssl/test/testenc b/src/lib/libssl/test/testenc
deleted file mode 100644
index 0656c7f525..0000000000
--- a/src/lib/libssl/test/testenc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-testsrc=Makefile.ssl
-test=./p
-cmd=../apps/openssl
-
-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 `$cmd list-cipher-commands`
-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/lib/libssl/test/testgen b/src/lib/libssl/test/testgen
deleted file mode 100644
index 3534f5821f..0000000000
--- a/src/lib/libssl/test/testgen
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-T=testcert
-KEY=512
-CA=../certs/testca.pem
-
-/bin/rm -f $T.1 $T.2 $T.key
-
-PATH=../apps:$PATH;
-export PATH
-
-echo "generating certificate request"
-
-echo "There should be a 2 sequences of .'s and some +'s."
-echo "There should not be more that at most 80 per line"
-echo "This could take some time."
-
-../apps/openssl req -config test.cnf -new -out testreq.pem
-if [ $? != 0 ]; then
-echo problems creating request
-exit 1
-fi
-
-../apps/openssl req -config test.cnf -verify -in testreq.pem -noout
-if [ $? != 0 ]; then
-echo signature on req is wrong
-exit 1
-fi
-
-exit 0
diff --git a/src/lib/libssl/test/testp7.pem b/src/lib/libssl/test/testp7.pem
deleted file mode 100644
index 6bba16f137..0000000000
--- a/src/lib/libssl/test/testp7.pem
+++ /dev/null
@@ -1,46 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHAqCAMIIIBwIBATEAMIAGCSqGSIb3DQEHAQAAoIIGPDCCBHIw
-ggQcoAMCAQICEHkvjiX1iVGQMenF9HgIjI8wDQYJKoZIhvcNAQEEBQAwYjERMA8G
-A1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQL
-EytWZXJpU2lnbiBDbGFzcyAxIENBIC0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyMB4X
-DTk2MDcxOTAwMDAwMFoXDTk3MDMzMDIzNTk1OVowgdUxETAPBgNVBAcTCEludGVy
-bmV0MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24g
-Q2xhc3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlcjEoMCYGA1UECxMfRGln
-aXRhbCBJRCBDbGFzcyAxIC0gU01JTUUgVGVzdDFHMEUGA1UECxM+d3d3LnZlcmlz
-aWduLmNvbS9yZXBvc2l0b3J5L0NQUy0xLjAgSW5jLiBieSBSZWYuLExJQUIuTFRE
-KGMpOTYwWzANBgkqhkiG9w0BAQEFAANKADBHAkAOy7xxCAIkOfuIA2LyRpxgKlDO
-Rl8htdXYhF5iBGUx1GYaK6KF+bK/CCI0l4j2OfWGFBUrwGoWqxTNcWgTfMzRAgMB
-AAGjggI5MIICNTAJBgNVHRMEAjAAMIICJgYDVR0DBIICHTCCAhkwggIVMIICEQYL
-YIZIAYb4RQEHAQEwggIAFoIBq1RoaXMgY2VydGlmaWNhdGUgaW5jb3Jwb3JhdGVz
-IGJ5IHJlZmVyZW5jZSwgYW5kIGl0cyB1c2UgaXMgc3RyaWN0bHkgc3ViamVjdCB0
-bywgdGhlIFZlcmlTaWduIENlcnRpZmljYXRpb24gUHJhY3RpY2UgU3RhdGVtZW50
-IChDUFMpLCBhdmFpbGFibGUgYXQ6IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9D
-UFMtMS4wOyBieSBFLW1haWwgYXQgQ1BTLXJlcXVlc3RzQHZlcmlzaWduLmNvbTsg
-b3IgYnkgbWFpbCBhdCBWZXJpU2lnbiwgSW5jLiwgMjU5MyBDb2FzdCBBdmUuLCBN
-b3VudGFpbiBWaWV3LCBDQSA5NDA0MyBVU0EgVGVsLiArMSAoNDE1KSA5NjEtODgz
-MCBDb3B5cmlnaHQgKGMpIDE5OTYgVmVyaVNpZ24sIEluYy4gIEFsbCBSaWdodHMg
-UmVzZXJ2ZWQuIENFUlRBSU4gV0FSUkFOVElFUyBESVNDTEFJTUVEIGFuZCBMSUFC
-SUxJVFkgTElNSVRFRC6gDgYMYIZIAYb4RQEHAQEBoQ4GDGCGSAGG+EUBBwEBAjAv
-MC0WK2h0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9yZXBvc2l0b3J5L0NQUy0xLgMw
-DQYJKoZIhvcNAQEEBQADQQDAmA7km/3iJWEsWN9Z2WU2gmZAknx45WnDKHxMa3Bf
-gNsh6BLk/ngkJKjNKTDR13XVHqEPUY1flbjATZputw1GMIIBwjCCAWygAwIBAgIQ
-fAmE6tW5ERSQWDneu3KfSTANBgkqhkiG9w0BAQIFADA+MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xFjAUBgNVBAsTDVRFU1QgUm9vdCBQQ0Ew
-HhcNOTYwNzE3MDAwMDAwWhcNOTcwNzE3MjM1OTU5WjBiMREwDwYDVQQHEwhJbnRl
-cm5ldDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNDAyBgNVBAsTK1ZlcmlTaWdu
-IENsYXNzIDEgQ0EgLSBJbmRpdmlkdWFsIFN1YnNjcmliZXIwXDANBgkqhkiG9w0B
-AQEFAANLADBIAkEA7Fc6zYJw4WwCWa1ni3fYNbzGSQNluuw990024GusjLfhEk1h
-MsIUukTT/n8yxoO7rYp4x+LS+tHF2tBtuxg7CwIDAQABoyIwIDALBgNVHQ8EBAMC
-AQYwEQYJYIZIAYb4QgEBBAQDAgIEMA0GCSqGSIb3DQEBAgUAA0EAFKem0cJGg9nd
-TAbP5o1HIEyNn11ZlvLU5v1Hejs1MKQt72IMm4jjgOH+pjguXW8lB6yzrK4oVOO2
-UNCaNQ1H26GCAa0wgcEwbTANBgkqhkiG9w0BAQIFADA+MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xFjAUBgNVBAsTDVRFU1QgUm9vdCBQQ0EX
-DTk2MDcxNzE3NDQwOVoXDTk4MDcxNzAwMDAwMFowDQYJKoZIhvcNAQECBQADQQB4
-rQNP8QLpAox83odQDE/5dqAuvDfshW/miTxwQTMXOoBtjGiowTcG+YXF1JZTJRMT
-jQN47tdH+6MCKt7N8MddMIHmMIGRMA0GCSqGSIb3DQEBAgUAMGIxETAPBgNVBAcT
-CEludGVybmV0MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVy
-aVNpZ24gQ2xhc3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlchcNOTYwNzE3
-MTc1OTI5WhcNOTcwNzE4MDAwMDAwWjANBgkqhkiG9w0BAQIFAANBALm1VmE7FrEJ
-rLXvX/lIDMPAZIw5TNuX8EC6wn5ppy8Y3sHstdJEkTsqVGiS2/q+KEQC3NHxvV32
-bGooiIKLUB4xAAAAAAA=
------END PKCS7-----
diff --git a/src/lib/libssl/test/testreq2.pem b/src/lib/libssl/test/testreq2.pem
deleted file mode 100644
index c3cdcffcbc..0000000000
--- a/src/lib/libssl/test/testreq2.pem
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIHaMIGFAgEAMA4xDDAKBgNVBAMTA2NuNDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQCQsnkyUGDY2R3mYoeTprFJKgWuJ3f1jUjlIuW5+wfAUoeMt35c4vcFZ2mIBpEG
-DtzkNQN1kr2O9ldm9zYnYhyhAgMBAAGgEjAQBgorBgEEAYI3AgEOMQIwADANBgkq
-hkiG9w0BAQQFAANBAAb2szZgVIxg3vK6kYLjGSBISyuzcXJ6IvuPW6M+yzi1Qgoi
-gQhazHTJp91T8ItZEzUJGZSZl2e5iXlnffWB+/U=
------END CERTIFICATE REQUEST-----
diff --git a/src/lib/libssl/test/testrsa.pem b/src/lib/libssl/test/testrsa.pem
deleted file mode 100644
index aad21067a8..0000000000
--- a/src/lib/libssl/test/testrsa.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAKrbeqkuRk8VcRmWFmtP+LviMB3+6dizWW3DwaffznyHGAFwUJ/I
-Tv0XtbsCyl3QoyKGhrOAy3RvPK5M38iuXT0CAwEAAQJAZ3cnzaHXM/bxGaR5CR1R
-rD1qFBAVfoQFiOH9uPJgMaoAuoQEisPHVcZDKcOv4wEg6/TInAIXBnEigtqvRzuy
-oQIhAPcgZzUq3yVooAaoov8UbXPxqHlwo6GBMqnv20xzkf6ZAiEAsP4BnIaQTM8S
-mvcpHZwQJdmdHHkGKAs37Dfxi67HbkUCIQCeZGliHXFa071Fp06ZeWlR2ADonTZz
-rJBhdTe0v5pCeQIhAIZfkiGgGBX4cIuuckzEm43g9WMUjxP/0GlK39vIyihxAiEA
-mymehFRT0MvqW5xAKAx7Pgkt8HVKwVhc2LwGKHE0DZM=
------END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/test/testsid.pem b/src/lib/libssl/test/testsid.pem
deleted file mode 100644
index 7ffd008f66..0000000000
--- a/src/lib/libssl/test/testsid.pem
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN SSL SESSION PARAMETERS-----
-MIIB1gIBAQIBAgQDAQCABBCi11xa5qkOP8xrr02K/NQCBBBkIYQZM0Bt95W0EHNV
-bA58oQYCBDIBr7WiBAICASyjggGGMIIBgjCCASwCAQMwDQYJKoZIhvcNAQEEBQAw
-ODELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3Jz
-YSB0ZXN0IENBMB4XDTk1MTAwOTIzMzEzNFoXDTk4MDcwNTIzMzEzNFowYDELMAkG
-A1UEBhMCQVUxDDAKBgNVBAgTA1FMRDEZMBcGA1UEChMQTWluY29tIFB0eS4gTHRk
-LjELMAkGA1UECxMCQ1MxGzAZBgNVBAMTElNTTGVheSBkZW1vIGNsaWVudDBcMA0G
-CSqGSIb3DQEBAQUAA0sAMEgCQQC4pcXEL1lgVA+B5Q3TcuW/O3LZHoA73IYm8oFD
-TezgCDhL2RTMn+seKWF36UtJKRIOBU9jZHCVVd0Me5ls6BEjAgMBAAEwDQYJKoZI
-hvcNAQEEBQADQQBoIpOcwUY1qlVF7j3ROSGvUsbvByOBFmYWkIBgsCqR+9qo1A7L
-CrWF5i8LWt/vLwAHaxWNx2YuBJMFyuK81fTvpA0EC3Rlc3Rjb250ZXh0
------END SSL SESSION PARAMETERS-----
diff --git a/src/lib/libssl/test/testss b/src/lib/libssl/test/testss
deleted file mode 100644
index da62997a5f..0000000000
--- a/src/lib/libssl/test/testss
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-digest='-mdc2'
-reqcmd="../apps/openssl req"
-x509cmd="../apps/openssl x509 $digest"
-verifycmd="../apps/openssl verify"
-dummycnf="../apps/openssl.cnf"
-
-CAkey="keyCA.ss"
-CAcert="certCA.ss"
-CAreq="reqCA.ss"
-CAconf="CAss.cnf"
-CAreq2="req2CA.ss"      # temp
-
-Uconf="Uss.cnf"
-Ukey="keyU.ss"
-Ureq="reqU.ss"
-Ucert="certU.ss"
-
-echo
-echo "make a certificate request using 'req'"
-$reqcmd -config $CAconf -out $CAreq -keyout $CAkey -new #>err.ss
-if [ $? != 0 ]; then
-        echo "error using 'req' to generate a certificate request"
-        exit 1
-fi
-echo
-echo "convert the certificate request into a self signed certificate using 'x509'"
-$x509cmd -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey >err.ss
-if [ $? != 0 ]; then
-        echo "error using 'x509' to self sign a certificate request"
-        exit 1
-fi
-
-echo
-echo "convert a certificate into a certificate request using 'x509'"
-$x509cmd -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 >err.ss
-if [ $? != 0 ]; then
-        echo "error using 'x509' convert a certificate to a certificate request"
-        exit 1
-fi
-
-$reqcmd -config $dummycnf -verify -in $CAreq -noout
-if [ $? != 0 ]; then
-        echo first generated request is invalid
-        exit 1
-fi
-
-$reqcmd -config $dummycnf -verify -in $CAreq2 -noout
-if [ $? != 0 ]; then
-        echo second generated request is invalid
-        exit 1
-fi
-
-$verifycmd -CAfile $CAcert $CAcert
-if [ $? != 0 ]; then
-        echo first generated cert is invalid
-        exit 1
-fi
-
-echo
-echo "make another certificate request using 'req'"
-$reqcmd -config $Uconf -out $Ureq -keyout $Ukey -new >err.ss
-if [ $? != 0 ]; then
-        echo "error using 'req' to generate a certificate request"
-        exit 1
-fi
-
-echo
-echo "sign certificate request with the just created CA via 'x509'"
-$x509cmd -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey >err.ss
-if [ $? != 0 ]; then
-        echo "error using 'x509' to sign a certificate request"
-        exit 1
-fi
-
-$verifycmd -CAfile $CAcert $Ucert
-echo
-echo "Certificate details"
-$x509cmd -subject -issuer -startdate -enddate -noout -in $Ucert
-
-echo
-echo The generated CA certificate is $CAcert
-echo The generated CA private key is $CAkey
-
-echo The generated user certificate is $Ucert
-echo The generated user private key is $Ukey
-
-/bin/rm err.ss
-exit 0
diff --git a/src/lib/libssl/test/testssl b/src/lib/libssl/test/testssl
deleted file mode 100644
index 255ae5e976..0000000000
--- a/src/lib/libssl/test/testssl
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-echo test sslv2
-./ssltest -ssl2 || exit 1
-
-echo test sslv2 with server authentication
-./ssltest -ssl2 -server_auth -CApath ../certs || exit 1
-
-echo test sslv2 with client authentication
-./ssltest -ssl2 -client_auth -CApath ../certs || exit 1
-
-echo test sslv2 with both client and server authentication
-./ssltest -ssl2 -server_auth -client_auth -CApath ../certs || exit 1
-
-echo test sslv3
-./ssltest -ssl3 || exit 1
-
-echo test sslv3 with server authentication
-./ssltest -ssl3 -server_auth -CApath ../certs || exit 1
-
-echo test sslv3 with client authentication
-./ssltest -ssl3 -client_auth -CApath ../certs || exit 1
-
-echo test sslv3 with both client and server authentication
-./ssltest -ssl3 -server_auth -client_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3
-./ssltest || exit 1
-
-echo test sslv2/sslv3 with server authentication
-./ssltest -server_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3 with client authentication
-./ssltest -client_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication
-./ssltest -server_auth -client_auth -CApath ../certs || exit 1
-
-echo test sslv2 via BIO pair
-./ssltest -bio_pair -ssl2 || exit 1
-
-echo test sslv2 with server authentication via BIO pair
-./ssltest -bio_pair -ssl2 -server_auth -CApath ../certs || exit 1
-
-echo test sslv2 with client authentication via BIO pair
-./ssltest -bio_pair -ssl2 -client_auth -CApath ../certs || exit 1
-
-echo test sslv2 with both client and server authentication via BIO pair
-./ssltest -bio_pair -ssl2 -server_auth -client_auth -CApath ../certs || exit 1
-
-echo test sslv3 via BIO pair
-./ssltest -bio_pair -ssl3 || exit 1
-
-echo test sslv3 with server authentication via BIO pair
-./ssltest -bio_pair -ssl3 -server_auth -CApath ../certs || exit 1
-
-echo test sslv3 with client authentication via BIO pair
-./ssltest -bio_pair -ssl3 -client_auth -CApath ../certs || exit 1
-
-echo test sslv3 with both client and server authentication via BIO pair
-./ssltest -bio_pair -ssl3 -server_auth -client_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3 via BIO pair
-./ssltest || exit 1
-
-echo test sslv2/sslv3 with server authentication
-./ssltest -bio_pair -server_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3 with client authentication via BIO pair
-./ssltest -bio_pair -client_auth -CApath ../certs || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair
-./ssltest -bio_pair -server_auth -client_auth -CApath ../certs || exit 1
-
-exit 0
diff --git a/src/lib/libssl/test/testx509.pem b/src/lib/libssl/test/testx509.pem
deleted file mode 100644
index 8a85d14964..0000000000
--- a/src/lib/libssl/test/testx509.pem
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV
-BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz
-MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM
-RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF
-AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO
-/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE
-Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ
-zl9HYIMxATFyqSiD9jsx
------END CERTIFICATE-----
diff --git a/src/lib/libssl/test/times b/src/lib/libssl/test/times
deleted file mode 100644
index 49aeebf216..0000000000
--- a/src/lib/libssl/test/times
+++ /dev/null
@@ -1,113 +0,0 @@
-
-More number for the questions about SSL overheads....
-
-The following numbers were generated on a pentium pro 200, running linux.
-They give an indication of the SSL protocol and encryption overheads.
-
-The program that generated them is an unreleased version of ssl/ssltest.c
-which is the SSLeay ssl protocol testing program.  It is a single process that
-talks both sides of the SSL protocol via a non-blocking memory buffer
-interface.
-
-How do I read this?  The protocol and cipher are reasonable obvious.
-The next number is the number of connections being made.  The next is the
-number of bytes exchanged bewteen the client and server side of the protocol.
-This is the number of bytes that the client sends to the server, and then
-the server sends back.  Because this is all happening in one process,
-the data is being encrypted, decrypted, encrypted and then decrypted again.
-It is a round trip of that many bytes.  Because the one process performs
-both the client and server sides of the protocol and it sends this many bytes
-each direction, multiply this number by 4 to generate the number
-of bytes encrypted/decrypted/MACed.  The first time value is how many seconds
-elapsed doing a full SSL handshake, the second is the cost of one
-full handshake and the rest being session-id reuse.
-
-SSLv2 RC4-MD5      1000 x      1   12.83s   0.70s
-SSLv3 NULL-MD5     1000 x      1   14.35s   1.47s
-SSLv3 RC4-MD5      1000 x      1   14.46s   1.56s
-SSLv3 RC4-MD5      1000 x      1   51.93s   1.62s 1024bit RSA
-SSLv3 RC4-SHA      1000 x      1   14.61s   1.83s
-SSLv3 DES-CBC-SHA  1000 x      1   14.70s   1.89s
-SSLv3 DES-CBC3-SHA 1000 x      1   15.16s   2.16s
-
-SSLv2 RC4-MD5      1000 x   1024   13.72s   1.27s
-SSLv3 NULL-MD5     1000 x   1024   14.79s   1.92s
-SSLv3 RC4-MD5      1000 x   1024   52.58s   2.29s 1024bit RSA
-SSLv3 RC4-SHA      1000 x   1024   15.39s   2.67s
-SSLv3 DES-CBC-SHA  1000 x   1024   16.45s   3.55s
-SSLv3 DES-CBC3-SHA 1000 x   1024   18.21s   5.38s
-
-SSLv2 RC4-MD5      1000 x  10240   18.97s   6.52s
-SSLv3 NULL-MD5     1000 x  10240   17.79s   5.11s
-SSLv3 RC4-MD5      1000 x  10240   20.25s   7.90s
-SSLv3 RC4-MD5      1000 x  10240   58.26s   8.08s 1024bit RSA
-SSLv3 RC4-SHA      1000 x  10240   22.96s  11.44s
-SSLv3 DES-CBC-SHA  1000 x  10240   30.65s  18.41s
-SSLv3 DES-CBC3-SHA 1000 x  10240   47.04s  34.53s
-
-SSLv2 RC4-MD5      1000 x 102400   70.22s  57.74s
-SSLv3 NULL-MD5     1000 x 102400   43.73s  31.03s
-SSLv3 RC4-MD5      1000 x 102400   71.32s  58.83s
-SSLv3 RC4-MD5      1000 x 102400  109.66s  59.20s 1024bit RSA
-SSLv3 RC4-SHA      1000 x 102400   95.88s  82.21s
-SSLv3 DES-CBC-SHA  1000 x 102400  173.22s 160.55s
-SSLv3 DES-CBC3-SHA 1000 x 102400  336.61s 323.82s
-
-What does this all mean?  Well for a server, with no session-id reuse, with
-a transfer size of 10240 bytes, using RC4-MD5 and a 512bit server key,
-a pentium pro 200 running linux can handle the SSLv3 protocol overheads of
-about 49 connections a second.  Reality will be quite different :-).
-
-Remeber the first number is 1000 full ssl handshakes, the second is
-1 full and 999 with session-id reuse.  The RSA overheads for each exchange
-would be one public and one private operation, but the protocol/MAC/cipher
-cost would be quite similar in both the client and server.
-
-eric (adding numbers to speculation)
-
---- Appendix ---
-- The time measured is user time but these number a very rough.
-- Remember this is the cost of both client and server sides of the protocol.
-- The TCP/kernal overhead of connection establishment is normally the
-  killer in SSL.  Often delays in the TCP protocol will make session-id
-  reuse look slower that new sessions, but this would not be the case on
-  a loaded server.
-- The TCP round trip latencies, while slowing indervidual connections,
-  would have minimal impact on throughput.
-- Instead of sending one 102400 byte buffer, one 8k buffer is sent until
-- the required number of bytes are processed.
-- The SSLv3 connections were actually SSLv2 compatable SSLv3 headers.
-- A 512bit server key was being used except where noted.
-- No server key verification was being performed on the client side of the
-  protocol.  This would slow things down very little.
-- The library being used is SSLeay 0.8.x.
-- The normal mesauring system was commands of the form
-  time ./ssltest -num 1000 -bytes 102400 -cipher DES-CBC-SHA -reuse
-  This modified version of ssltest should be in the next public release of
-  SSLeay.
-
-The general cipher performace number for this platform are
-
-SSLeay 0.8.2a 04-Sep-1997
-built on Fri Sep  5 17:37:05 EST 1997
-options:bn(64,32) md2(int) rc4(idx,int) des(ptr,risc1,16,long) idea(int) blowfish(ptr2)
-C flags:gcc -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized 
-The 'numbers' are in 1000s of bytes per second processed.
-type              8 bytes     64 bytes    256 bytes   1024 bytes   8192 bytes
-md2               131.02k      368.41k      500.57k      549.21k      566.09k
-mdc2              535.60k      589.10k      595.88k      595.97k      594.54k
-md5              1801.53k     9674.77k    17484.03k    21849.43k    23592.96k
-sha              1261.63k     5533.25k     9285.63k    11187.88k    11913.90k
-sha1             1103.13k     4782.53k     7933.78k     9472.34k    10070.70k
-rc4             10722.53k    14443.93k    15215.79k    15299.24k    15219.59k
-des cbc          3286.57k     3827.73k     3913.39k     3931.82k     3926.70k
-des ede3         1443.50k     1549.08k     1561.17k     1566.38k     1564.67k
-idea cbc         2203.64k     2508.16k     2538.33k     2543.62k     2547.71k
-rc2 cbc          1430.94k     1511.59k     1524.82k     1527.13k     1523.33k
-blowfish cbc     4716.07k     5965.82k     6190.17k     6243.67k     6234.11k
-                  sign    verify
-rsa  512 bits   0.0100s   0.0011s
-rsa 1024 bits   0.0451s   0.0012s
-rsa 2048 bits   0.2605s   0.0086s
-rsa 4096 bits   1.6883s   0.0302s
-
diff --git a/src/lib/libssl/test/tpkcs7 b/src/lib/libssl/test/tpkcs7
deleted file mode 100644
index 15bbba42c0..0000000000
--- a/src/lib/libssl/test/tpkcs7
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl pkcs7'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testp7.pem
-fi
-
-echo testing pkcs7 conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/tpkcs7d b/src/lib/libssl/test/tpkcs7d
deleted file mode 100644
index 46e5aa2bd6..0000000000
--- a/src/lib/libssl/test/tpkcs7d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl pkcs7'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=pkcs7-1.pem
-fi
-
-echo "testing pkcs7 conversions (2)"
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/treq b/src/lib/libssl/test/treq
deleted file mode 100644
index 0464c9d902..0000000000
--- a/src/lib/libssl/test/treq
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl req -config ../apps/openssl.cnf'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testreq.pem
-fi
-
-echo testing req conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in fff.p -inform p -outform t >f.t
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -verify -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in f.t -inform t -outform d >ff.d2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -verify -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in f.d -inform d -outform t >ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in f.t -inform t -outform t >ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in f.p -inform p -outform t >ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in f.t -inform t -outform p >ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp f.t ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/trsa b/src/lib/libssl/test/trsa
deleted file mode 100644
index d6a4dd826d..0000000000
--- a/src/lib/libssl/test/trsa
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl rsa'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testrsa.pem
-fi
-
-echo testing rsa conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in fff.p -inform p -outform t >f.t
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in f.t -inform t -outform d >ff.d2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in f.d -inform d -outform t >ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in f.t -inform t -outform t >ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in f.p -inform p -outform t >ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in f.t -inform t -outform p >ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp f.t ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/tsid b/src/lib/libssl/test/tsid
deleted file mode 100644
index 9e0854516c..0000000000
--- a/src/lib/libssl/test/tsid
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl sess_id'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testsid.pem
-fi
-
-echo testing session-id conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in fff.p -inform p -outform t >f.t
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in f.t -inform t -outform d >ff.d2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-#echo "d -> t"
-#$cmd -in f.d -inform d -outform t >ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in f.t -inform t -outform t >ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in f.p -inform p -outform t >ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in f.t -inform t -outform p >ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp fff.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-#cmp f.t ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp f.t ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-#cmp f.p ff.p2
-#if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/tx509 b/src/lib/libssl/test/tx509
deleted file mode 100644
index 35169f3a43..0000000000
--- a/src/lib/libssl/test/tx509
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-PATH=../apps:$PATH
-export PATH
-
-cmd='../apps/openssl x509'
-
-if [ "$1"x != "x" ]; then
-        t=$1
-else
-        t=testx509.pem
-fi
-
-echo testing X509 conversions
-cp $t fff.p
-
-echo "p -> d"
-$cmd -in fff.p -inform p -outform d >f.d
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> n"
-$cmd -in fff.p -inform p -outform n >f.n
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in fff.p -inform p -outform p >f.p
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> d"
-$cmd -in f.d -inform d -outform d >ff.d1
-if [ $? != 0 ]; then exit 1; fi
-echo "n -> d"
-$cmd -in f.n -inform n -outform d >ff.d2
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> d"
-$cmd -in f.p -inform p -outform d >ff.d3
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> n"
-$cmd -in f.d -inform d -outform n >ff.n1
-if [ $? != 0 ]; then exit 1; fi
-echo "n -> n"
-$cmd -in f.n -inform n -outform n >ff.n2
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> n"
-$cmd -in f.p -inform p -outform n >ff.n3
-if [ $? != 0 ]; then exit 1; fi
-
-echo "d -> p"
-$cmd -in f.d -inform d -outform p >ff.p1
-if [ $? != 0 ]; then exit 1; fi
-echo "n -> p"
-$cmd -in f.n -inform n -outform p >ff.p2
-if [ $? != 0 ]; then exit 1; fi
-echo "p -> p"
-$cmd -in f.p -inform p -outform p >ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp fff.p f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p2
-if [ $? != 0 ]; then exit 1; fi
-cmp fff.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp f.n ff.n1
-if [ $? != 0 ]; then exit 1; fi
-cmp f.n ff.n2
-if [ $? != 0 ]; then exit 1; fi
-cmp f.n ff.n3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp f.p ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p2
-if [ $? != 0 ]; then exit 1; fi
-cmp f.p ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-/bin/rm -f f.* ff.* fff.*
-exit 0
diff --git a/src/lib/libssl/test/v3-cert1.pem b/src/lib/libssl/test/v3-cert1.pem
deleted file mode 100644
index 0da253d5c3..0000000000
--- a/src/lib/libssl/test/v3-cert1.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICjTCCAfigAwIBAgIEMaYgRzALBgkqhkiG9w0BAQQwRTELMAkGA1UEBhMCVVMx
-NjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlz
-dHJhdGlvbjAmFxE5NjA1MjgxMzQ5MDUrMDgwMBcROTgwNTI4MTM0OTA1KzA4MDAw
-ZzELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu
-ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEgMAkGA1UEBRMCMTYwEwYDVQQDEwxTdGV2
-ZSBTY2hvY2gwWDALBgkqhkiG9w0BAQEDSQAwRgJBALrAwyYdgxmzNP/ts0Uyf6Bp
-miJYktU/w4NG67ULaN4B5CnEz7k57s9o3YY3LecETgQ5iQHmkwlYDTL2fTgVfw0C
-AQOjgaswgagwZAYDVR0ZAQH/BFowWDBWMFQxCzAJBgNVBAYTAlVTMTYwNAYDVQQK
-Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x
-DTALBgNVBAMTBENSTDEwFwYDVR0BAQH/BA0wC4AJODMyOTcwODEwMBgGA1UdAgQR
-MA8ECTgzMjk3MDgyM4ACBSAwDQYDVR0KBAYwBAMCBkAwCwYJKoZIhvcNAQEEA4GB
-AH2y1VCEw/A4zaXzSYZJTTUi3uawbbFiS2yxHvgf28+8Js0OHXk1H1w2d6qOHH21
-X82tZXd/0JtG0g1T9usFFBDvYK8O0ebgz/P5ELJnBL2+atObEuJy1ZZ0pBDWINR3
-WkDNLCGiTkCKp0F5EWIrVDwh54NNevkCQRZita+z4IBO
------END CERTIFICATE-----
diff --git a/src/lib/libssl/test/v3-cert2.pem b/src/lib/libssl/test/v3-cert2.pem
deleted file mode 100644
index de0723ff8d..0000000000
--- a/src/lib/libssl/test/v3-cert2.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICiTCCAfKgAwIBAgIEMeZfHzANBgkqhkiG9w0BAQQFADB9MQswCQYDVQQGEwJD
-YTEPMA0GA1UEBxMGTmVwZWFuMR4wHAYDVQQLExVObyBMaWFiaWxpdHkgQWNjZXB0
-ZWQxHzAdBgNVBAoTFkZvciBEZW1vIFB1cnBvc2VzIE9ubHkxHDAaBgNVBAMTE0Vu
-dHJ1c3QgRGVtbyBXZWIgQ0EwHhcNOTYwNzEyMTQyMDE1WhcNOTYxMDEyMTQyMDE1
-WjB0MSQwIgYJKoZIhvcNAQkBExVjb29rZUBpc3NsLmF0bC5ocC5jb20xCzAJBgNV
-BAYTAlVTMScwJQYDVQQLEx5IZXdsZXR0IFBhY2thcmQgQ29tcGFueSAoSVNTTCkx
-FjAUBgNVBAMTDVBhdWwgQS4gQ29va2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA
-6ceSq9a9AU6g+zBwaL/yVmW1/9EE8s5you1mgjHnj0wAILuoB3L6rm6jmFRy7QZT
-G43IhVZdDua4e+5/n1ZslwIDAQABo2MwYTARBglghkgBhvhCAQEEBAMCB4AwTAYJ
-YIZIAYb4QgENBD8WPVRoaXMgY2VydGlmaWNhdGUgaXMgb25seSBpbnRlbmRlZCBm
-b3IgZGVtb25zdHJhdGlvbiBwdXJwb3Nlcy4wDQYJKoZIhvcNAQEEBQADgYEAi8qc
-F3zfFqy1sV8NhjwLVwOKuSfhR/Z8mbIEUeSTlnH3QbYt3HWZQ+vXI8mvtZoBc2Fz
-lexKeIkAZXCesqGbs6z6nCt16P6tmdfbZF3I3AWzLquPcOXjPf4HgstkyvVBn0Ap
-jAFN418KF/Cx4qyHB4cjdvLrRjjQLnb2+ibo7QU=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
deleted file mode 100644
index a931efa936..0000000000
--- a/src/lib/libssl/tls1.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ssl/tls1.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_TLS1_H 
-#define HEADER_TLS1_H 
-
-#include <openssl/buffer.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES    0
-
-#define TLS1_VERSION                    0x0301
-#define TLS1_VERSION_MAJOR              0x03
-#define TLS1_VERSION_MINOR              0x01
-
-#define TLS1_AD_DECRYPTION_FAILED       21
-#define TLS1_AD_RECORD_OVERFLOW         22
-#define TLS1_AD_UNKNOWN_CA              48      /* fatal */
-#define TLS1_AD_ACCESS_DENIED           49      /* fatal */
-#define TLS1_AD_DECODE_ERROR            50      /* fatal */
-#define TLS1_AD_DECRYPT_ERROR           51
-#define TLS1_AD_EXPORT_RESTRICION       60      /* fatal */
-#define TLS1_AD_PROTOCOL_VERSION        70      /* fatal */
-#define TLS1_AD_INSUFFICIENT_SECURITY   71      /* fatal */
-#define TLS1_AD_INTERNAL_ERROR          80      /* fatal */
-#define TLS1_AD_USER_CANCLED            90
-#define TLS1_AD_NO_RENEGOTIATION        100
-
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5          0x03000060
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5      0x03000061
-#define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA         0x03000062
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA     0x03000063
-#define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA          0x03000064
-#define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA      0x03000065
-#define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
-
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5         "EXP1024-RC4-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5     "EXP1024-RC2-CBC-MD5"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA        "EXP1024-DES-CBC-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA    "EXP1024-DHE-DSS-DES-CBC-SHA"
-#define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA         "EXP1024-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA     "EXP1024-DHE-DSS-RC4-SHA"
-#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA               "DHE-DSS-RC4-SHA"
-
-
-#define TLS_CT_RSA_SIGN                 1
-#define TLS_CT_DSS_SIGN                 2
-#define TLS_CT_RSA_FIXED_DH             3
-#define TLS_CT_DSS_FIXED_DH             4
-#define TLS_CT_NUMBER                   4
-
-#define TLS1_FINISH_MAC_LENGTH          12
-
-#define TLS_MD_MAX_CONST_SIZE                   20
-#define TLS_MD_CLIENT_FINISH_CONST              "client finished"
-#define TLS_MD_CLIENT_FINISH_CONST_SIZE         15
-#define TLS_MD_SERVER_FINISH_CONST              "server finished"
-#define TLS_MD_SERVER_FINISH_CONST_SIZE         15
-#define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-#define TLS_MD_KEY_EXPANSION_CONST              "key expansion"
-#define TLS_MD_KEY_EXPANSION_CONST_SIZE         13
-#define TLS_MD_CLIENT_WRITE_KEY_CONST           "client write key"
-#define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE      16
-#define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-#define TLS_MD_IV_BLOCK_CONST                   "IV block"
-#define TLS_MD_IV_BLOCK_CONST_SIZE              8
-#define TLS_MD_MASTER_SECRET_CONST              "master secret"
-#define TLS_MD_MASTER_SECRET_CONST_SIZE         13
-
-#ifdef CHARSET_EBCDIC
-#undef TLS_MD_CLIENT_FINISH_CONST
-#define TLS_MD_CLIENT_FINISH_CONST    "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"  /*client finished*/
-#undef TLS_MD_SERVER_FINISH_CONST
-#define TLS_MD_SERVER_FINISH_CONST    "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"  /*server finished*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*server write key*/
-#undef TLS_MD_KEY_EXPANSION_CONST
-#define TLS_MD_KEY_EXPANSION_CONST    "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"  /*key expansion*/
-#undef TLS_MD_CLIENT_WRITE_KEY_CONST
-#define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*client write key*/
-#undef TLS_MD_SERVER_WRITE_KEY_CONST
-#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"  /*server write key*/
-#undef TLS_MD_IV_BLOCK_CONST
-#define TLS_MD_IV_BLOCK_CONST         "\x49\x56\x20\x62\x6c\x6f\x63\x6b"  /*IV block*/
-#undef TLS_MD_MASTER_SECRET_CONST
-#define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"  /*master secret*/
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-