Remove the GMP engine: It was an experimental engine using libgmp as

an alternative backend for BIGNUM calculations.  It is PoC code that
is not enabled in OpenSSL and probably not used by anymore.

ok deraadt@

11 files changed, 4 insertions, 744 deletions

diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index 200e687e90..4648af7543 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -23,9 +23,6 @@ engine - ENGINE cryptographic module support
 
  void ENGINE_load_openssl(void);
  void ENGINE_load_dynamic(void);
- #ifndef OPENSSL_NO_STATIC_ENGINE
- void ENGINE_load_gmp(void);
- #endif
  void ENGINE_load_cryptodev(void);
  void ENGINE_load_builtin_engines(void);
 
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index cf7d81d9ad..2fbfc448fd 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -89,9 +89,6 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_GOST
         ENGINE_load_gost();
 #endif
-#ifndef OPENSSL_NO_GMP
-        ENGINE_load_gmp();
-#endif
 #endif
         ENGINE_register_all_complete();
         }
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 9f05b6d8f4..425720e988 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -317,9 +317,6 @@ void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 void ENGINE_load_padlock(void);
-#ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#endif
 #ifndef OPENSSL_NO_GOST
 void ENGINE_load_gost(void);
 #endif
diff --git a/src/lib/libssl/src/crypto/engine/eng_all.c b/src/lib/libssl/src/crypto/engine/eng_all.c
index cf7d81d9ad..2fbfc448fd 100644
--- a/src/lib/libssl/src/crypto/engine/eng_all.c
+++ b/src/lib/libssl/src/crypto/engine/eng_all.c
@@ -89,9 +89,6 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_GOST
         ENGINE_load_gost();
 #endif
-#ifndef OPENSSL_NO_GMP
-        ENGINE_load_gmp();
-#endif
 #endif
         ENGINE_register_all_complete();
         }
diff --git a/src/lib/libssl/src/crypto/engine/engine.h b/src/lib/libssl/src/crypto/engine/engine.h
index 9f05b6d8f4..425720e988 100644
--- a/src/lib/libssl/src/crypto/engine/engine.h
+++ b/src/lib/libssl/src/crypto/engine/engine.h
@@ -317,9 +317,6 @@ void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 void ENGINE_load_padlock(void);
-#ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#endif
 #ifndef OPENSSL_NO_GOST
 void ENGINE_load_gost(void);
 #endif
diff --git a/src/lib/libssl/src/doc/crypto/engine.pod b/src/lib/libssl/src/doc/crypto/engine.pod
index 200e687e90..4648af7543 100644
--- a/src/lib/libssl/src/doc/crypto/engine.pod
+++ b/src/lib/libssl/src/doc/crypto/engine.pod
@@ -23,9 +23,6 @@ engine - ENGINE cryptographic module support
 
  void ENGINE_load_openssl(void);
  void ENGINE_load_dynamic(void);
- #ifndef OPENSSL_NO_STATIC_ENGINE
- void ENGINE_load_gmp(void);
- #endif
  void ENGINE_load_cryptodev(void);
  void ENGINE_load_builtin_engines(void);
 
diff --git a/src/lib/libssl/src/engines/Makefile b/src/lib/libssl/src/engines/Makefile
index 05e35869fc..283b3bbceb 100644
--- a/src/lib/libssl/src/engines/Makefile
+++ b/src/lib/libssl/src/engines/Makefile
@@ -26,17 +26,15 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBNAMES= gmp padlock
+LIBNAMES= padlock
 
-LIBSRC= e_gmp.c \
-        e_padlock.c
-LIBOBJ= e_gmp.o \
-        e_padlock.o
+LIBSRC= e_padlock.c
+LIBOBJ= e_padlock.o
 
 SRC= $(LIBSRC)
 
 EXHEADER= 
-HEADER= e_gmp_err.c e_gmp_err.h
+HEADER= 
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -137,19 +135,6 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-e_gmp.o: ../include/openssl/asn1.h ../include/openssl/bio.h
-e_gmp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-e_gmp.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-e_gmp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-e_gmp.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-e_gmp.o: ../include/openssl/evp.h ../include/openssl/lhash.h
-e_gmp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-e_gmp.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-e_gmp.o: ../include/openssl/sha.h ../include/openssl/stack.h
-e_gmp.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
-e_gmp.o: ../include/openssl/x509_vfy.h e_gmp.c
 e_padlock.o: ../include/openssl/aes.h ../include/openssl/asn1.h
 e_padlock.o: ../include/openssl/bio.h ../include/openssl/buffer.h
 e_padlock.o: ../include/openssl/crypto.h ../include/openssl/dso.h
diff --git a/src/lib/libssl/src/engines/e_gmp.c b/src/lib/libssl/src/engines/e_gmp.c
deleted file mode 100644
index a3d47151ea..0000000000
--- a/src/lib/libssl/src/engines/e_gmp.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/* crypto/engine/e_gmp.c */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2003.
- */
-/* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* This engine is not (currently) compiled in by default. Do enable it,
- * reconfigure OpenSSL with "enable-gmp -lgmp". The GMP libraries and
- * headers must reside in one of the paths searched by the compiler/linker,
- * otherwise paths must be specified - eg. try configuring with
- * "enable-gmp -I<includepath> -L<libpath> -lgmp". YMMV. */
-
-/* As for what this does - it's a largely unoptimised implementation of an
- * ENGINE that uses the GMP library to perform RSA private key operations. To
- * obtain more information about what "unoptimised" means, see my original mail
- * on the subject (though ignore the build instructions which have since
- * changed);
- *
- *    http://www.mail-archive.com/openssl-dev@openssl.org/msg12227.html
- *
- * On my athlon system at least, it appears the builtin OpenSSL code is now
- * slightly faster, which is to say that the RSA-related MPI performance
- * between OpenSSL's BIGNUM and GMP's mpz implementations is probably pretty
- * balanced for this chip, and so the performance degradation in this ENGINE by
- * having to convert to/from GMP formats (and not being able to cache
- * montgomery forms) is probably the difference. However, if some unconfirmed
- * reports from users is anything to go by, the situation on some other
- * chipsets might be a good deal more favourable to the GMP version (eg. PPC).
- * Feedback welcome. */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/buffer.h>
-#include <openssl/engine.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-#include <openssl/bn.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_GMP
-
-#include <gmp.h>
-
-#define E_GMP_LIB_NAME "gmp engine"
-#include "e_gmp_err.c"
-
-static int e_gmp_destroy(ENGINE *e);
-static int e_gmp_init(ENGINE *e);
-static int e_gmp_finish(ENGINE *e);
-static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 
-
-#ifndef OPENSSL_NO_RSA
-/* RSA stuff */
-static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
-static int e_gmp_rsa_finish(RSA *r);
-#endif
-
-/* The definitions for control commands specific to this engine */
-/* #define E_GMP_CMD_SO_PATH            ENGINE_CMD_BASE */
-static const ENGINE_CMD_DEFN e_gmp_cmd_defns[] = {
-#if 0
-        {E_GMP_CMD_SO_PATH,
-                "SO_PATH",
-                "Specifies the path to the 'e_gmp' shared library",
-                ENGINE_CMD_FLAG_STRING},
-#endif
-        {0, NULL, NULL, 0}
-        };
-
-#ifndef OPENSSL_NO_RSA
-/* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD e_gmp_rsa =
-        {
-        "GMP RSA method",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        e_gmp_rsa_mod_exp,
-        NULL,
-        NULL,
-        e_gmp_rsa_finish,
-        /* These flags initialise montgomery crud that GMP ignores, however it
-         * makes sure the public key ops (which are done in openssl) don't seem
-         * *slower* than usual :-) */
-        RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE,
-        NULL,
-        NULL,
-        NULL
-        };
-#endif
-
-/* Constants used when creating the ENGINE */
-static const char *engine_e_gmp_id = "gmp";
-static const char *engine_e_gmp_name = "GMP engine support";
-
-/* This internal function is used by ENGINE_gmp() and possibly by the
- * "dynamic" ENGINE support too */
-static int bind_helper(ENGINE *e)
-        {
-#ifndef OPENSSL_NO_RSA
-        const RSA_METHOD *meth1;
-#endif
-        if(!ENGINE_set_id(e, engine_e_gmp_id) ||
-                        !ENGINE_set_name(e, engine_e_gmp_name) ||
-#ifndef OPENSSL_NO_RSA
-                        !ENGINE_set_RSA(e, &e_gmp_rsa) ||
-#endif
-                        !ENGINE_set_destroy_function(e, e_gmp_destroy) ||
-                        !ENGINE_set_init_function(e, e_gmp_init) ||
-                        !ENGINE_set_finish_function(e, e_gmp_finish) ||
-                        !ENGINE_set_ctrl_function(e, e_gmp_ctrl) ||
-                        !ENGINE_set_cmd_defns(e, e_gmp_cmd_defns))
-                return 0;
-
-#ifndef OPENSSL_NO_RSA
-        meth1 = RSA_PKCS1_SSLeay();
-        e_gmp_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
-        e_gmp_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
-        e_gmp_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
-        e_gmp_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
-        e_gmp_rsa.bn_mod_exp = meth1->bn_mod_exp;
-#endif
-
-        /* Ensure the e_gmp error handling is set up */
-        ERR_load_GMP_strings();
-        return 1;
-        }
-
-static ENGINE *engine_gmp(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_helper(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_gmp(void)
-        {
-        /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_gmp();
-        if(!toadd) return;
-        ENGINE_add(toadd);
-        ENGINE_free(toadd);
-        ERR_clear_error();
-        }
-
-#ifndef OPENSSL_NO_RSA
-/* Used to attach our own key-data to an RSA structure */
-static int hndidx_rsa = -1;
-#endif
-
-static int e_gmp_destroy(ENGINE *e)
-        {
-        ERR_unload_GMP_strings();
-        return 1;
-        }
-
-/* (de)initialisation functions. */
-static int e_gmp_init(ENGINE *e)
-        {
-#ifndef OPENSSL_NO_RSA
-        if (hndidx_rsa == -1)
-                hndidx_rsa = RSA_get_ex_new_index(0,
-                        "GMP-based RSA key handle",
-                        NULL, NULL, NULL);
-#endif
-        if (hndidx_rsa == -1)
-                return 0;
-        return 1;
-        }
-
-static int e_gmp_finish(ENGINE *e)
-        {
-        return 1;
-        }
-
-static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
-        {
-        int to_return = 1;
-
-        switch(cmd)
-                {
-#if 0
-        case E_GMP_CMD_SO_PATH:
-                /* ... */
-#endif
-        /* The command isn't understood by this engine */
-        default:
-                GMPerr(GMP_F_E_GMP_CTRL,
-                        GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-                to_return = 0;
-                break;
-                }
-
-        return to_return;
-        }
-
-
-/* Most often limb sizes will be the same. If not, we use hex conversion
- * which is neat, but extremely inefficient. */
-static int bn2gmp(const BIGNUM *bn, mpz_t g)
-        {
-        bn_check_top(bn);
-        if(((sizeof(bn->d[0]) * 8) == GMP_NUMB_BITS) &&
-                        (BN_BITS2 == GMP_NUMB_BITS)) 
-                {
-                /* The common case */
-                if(!_mpz_realloc (g, bn->top))
-                        return 0;
-                memcpy(&g->_mp_d[0], &bn->d[0], bn->top * sizeof(bn->d[0]));
-                g->_mp_size = bn->top;
-                if(bn->neg)
-                        g->_mp_size = -g->_mp_size;
-                return 1;
-                }
-        else
-                {
-                int toret;
-                char *tmpchar = BN_bn2hex(bn);
-                if(!tmpchar) return 0;
-                toret = (mpz_set_str(g, tmpchar, 16) == 0 ? 1 : 0);
-                OPENSSL_free(tmpchar);
-                return toret;
-                }
-        }
-
-static int gmp2bn(mpz_t g, BIGNUM *bn)
-        {
-        if(((sizeof(bn->d[0]) * 8) == GMP_NUMB_BITS) &&
-                        (BN_BITS2 == GMP_NUMB_BITS))
-                {
-                /* The common case */
-                int s = (g->_mp_size >= 0) ? g->_mp_size : -g->_mp_size;
-                BN_zero(bn);
-                if(bn_expand2 (bn, s) == NULL)
-                        return 0;
-                bn->top = s;
-                memcpy(&bn->d[0], &g->_mp_d[0], s * sizeof(bn->d[0]));
-                bn_correct_top(bn);
-                bn->neg = g->_mp_size >= 0 ? 0 : 1;
-                return 1;
-                }
-        else
-                {
-                int toret;
-                char *tmpchar = OPENSSL_malloc(mpz_sizeinbase(g, 16) + 10);
-                if(!tmpchar) return 0;
-                mpz_get_str(tmpchar, 16, g);
-                toret = BN_hex2bn(&bn, tmpchar);
-                OPENSSL_free(tmpchar);
-                return toret;
-                }
-        }
-
-#ifndef OPENSSL_NO_RSA 
-typedef struct st_e_gmp_rsa_ctx
-        {
-        int public_only;
-        mpz_t n;
-        mpz_t d;
-        mpz_t e;
-        mpz_t p;
-        mpz_t q;
-        mpz_t dmp1;
-        mpz_t dmq1;
-        mpz_t iqmp;
-        mpz_t r0, r1, I0, m1;
-        } E_GMP_RSA_CTX;
-
-static E_GMP_RSA_CTX *e_gmp_get_rsa(RSA *rsa)
-        {
-        E_GMP_RSA_CTX *hptr = RSA_get_ex_data(rsa, hndidx_rsa);
-        if(hptr) return hptr;
-        hptr = OPENSSL_malloc(sizeof(E_GMP_RSA_CTX));
-        if(!hptr) return NULL;
-        /* These inits could probably be replaced by more intelligent
-         * mpz_init2() versions, to reduce malloc-thrashing. */
-        mpz_init(hptr->n);
-        mpz_init(hptr->d);
-        mpz_init(hptr->e);
-        mpz_init(hptr->p);
-        mpz_init(hptr->q);
-        mpz_init(hptr->dmp1);
-        mpz_init(hptr->dmq1);
-        mpz_init(hptr->iqmp);
-        mpz_init(hptr->r0);
-        mpz_init(hptr->r1);
-        mpz_init(hptr->I0);
-        mpz_init(hptr->m1);
-        if(!bn2gmp(rsa->n, hptr->n) || !bn2gmp(rsa->e, hptr->e))
-                goto err;
-        if(!rsa->p || !rsa->q || !rsa->d || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
-                {
-                hptr->public_only = 1;
-                return hptr;
-                }
-        if(!bn2gmp(rsa->d, hptr->d) || !bn2gmp(rsa->p, hptr->p) ||
-                        !bn2gmp(rsa->q, hptr->q) || !bn2gmp(rsa->dmp1, hptr->dmp1) ||
-                        !bn2gmp(rsa->dmq1, hptr->dmq1) || !bn2gmp(rsa->iqmp, hptr->iqmp))
-                goto err;
-        hptr->public_only = 0;
-        RSA_set_ex_data(rsa, hndidx_rsa, hptr);
-        return hptr;
-err:
-        mpz_clear(hptr->n);
-        mpz_clear(hptr->d);
-        mpz_clear(hptr->e);
-        mpz_clear(hptr->p);
-        mpz_clear(hptr->q);
-        mpz_clear(hptr->dmp1);
-        mpz_clear(hptr->dmq1);
-        mpz_clear(hptr->iqmp);
-        mpz_clear(hptr->r0);
-        mpz_clear(hptr->r1);
-        mpz_clear(hptr->I0);
-        mpz_clear(hptr->m1);
-        OPENSSL_free(hptr);
-        return NULL;
-        }
-
-static int e_gmp_rsa_finish(RSA *rsa)
-        {
-        E_GMP_RSA_CTX *hptr = RSA_get_ex_data(rsa, hndidx_rsa);
-        if(!hptr) return 0;
-        mpz_clear(hptr->n);
-        mpz_clear(hptr->d);
-        mpz_clear(hptr->e);
-        mpz_clear(hptr->p);
-        mpz_clear(hptr->q);
-        mpz_clear(hptr->dmp1);
-        mpz_clear(hptr->dmq1);
-        mpz_clear(hptr->iqmp);
-        mpz_clear(hptr->r0);
-        mpz_clear(hptr->r1);
-        mpz_clear(hptr->I0);
-        mpz_clear(hptr->m1);
-        OPENSSL_free(hptr);
-        RSA_set_ex_data(rsa, hndidx_rsa, NULL);
-        return 1;
-        }
-
-static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
-        {
-        E_GMP_RSA_CTX *hptr;
-        int to_return = 0;
-
-        hptr = e_gmp_get_rsa(rsa);
-        if(!hptr)
-                {
-                GMPerr(GMP_F_E_GMP_RSA_MOD_EXP,
-                                GMP_R_KEY_CONTEXT_ERROR);
-                return 0;
-                }
-        if(hptr->public_only)
-                {
-                GMPerr(GMP_F_E_GMP_RSA_MOD_EXP,
-                                GMP_R_MISSING_KEY_COMPONENTS);
-                return 0;
-                }
-
-        /* ugh!!! */
-        if(!bn2gmp(I, hptr->I0))
-                return 0;
-
-        /* This is basically the CRT logic in crypto/rsa/rsa_eay.c reworded into
-         * GMP-speak. It may be that GMP's API facilitates cleaner formulations
-         * of this stuff, eg. better handling of negatives, or functions that
-         * combine operations. */
-
-        mpz_mod(hptr->r1, hptr->I0, hptr->q);
-        mpz_powm(hptr->m1, hptr->r1, hptr->dmq1, hptr->q);
-
-        mpz_mod(hptr->r1, hptr->I0, hptr->p);
-        mpz_powm(hptr->r0, hptr->r1, hptr->dmp1, hptr->p);
-
-        mpz_sub(hptr->r0, hptr->r0, hptr->m1);
-
-        if(mpz_sgn(hptr->r0) < 0)
-                mpz_add(hptr->r0, hptr->r0, hptr->p);
-        mpz_mul(hptr->r1, hptr->r0, hptr->iqmp);
-        mpz_mod(hptr->r0, hptr->r1, hptr->p);
-
-        if(mpz_sgn(hptr->r0) < 0)
-                mpz_add(hptr->r0, hptr->r0, hptr->p);
-        mpz_mul(hptr->r1, hptr->r0, hptr->q);
-        mpz_add(hptr->r0, hptr->r1, hptr->m1);
-
-        /* ugh!!! */
-        if(gmp2bn(hptr->r0, r))
-                to_return = 1;
-
-        return 1;
-        }
-#endif
-
-#endif /* !OPENSSL_NO_GMP */
-
-/* This stuff is needed if this ENGINE is being compiled into a self-contained
- * shared-library. */      
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-IMPLEMENT_DYNAMIC_CHECK_FN()
-#ifndef OPENSSL_NO_GMP
-static int bind_fn(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_e_gmp_id) != 0))
-                return 0;
-        if(!bind_helper(e))
-                return 0;
-        return 1;
-        }       
-IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#else
-OPENSSL_EXPORT
-int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
-OPENSSL_EXPORT
-int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { return 0; }
-#endif
-#endif /* !OPENSSL_NO_DYNAMIC_ENGINE */
-
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_gmp.ec b/src/lib/libssl/src/engines/e_gmp.ec
deleted file mode 100644
index 72ec447fb7..0000000000
--- a/src/lib/libssl/src/engines/e_gmp.ec
+++ /dev/null
@@ -1 +0,0 @@
-L GMP           e_gmp_err.h                     e_gmp_err.c
diff --git a/src/lib/libssl/src/engines/e_gmp_err.c b/src/lib/libssl/src/engines/e_gmp_err.c
deleted file mode 100644
index 61db956796..0000000000
--- a/src/lib/libssl/src/engines/e_gmp_err.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* e_gmp_err.c */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include "e_gmp_err.h"
-
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-
-#define ERR_FUNC(func) ERR_PACK(0,func,0)
-#define ERR_REASON(reason) ERR_PACK(0,0,reason)
-
-static ERR_STRING_DATA GMP_str_functs[]=
-        {
-{ERR_FUNC(GMP_F_E_GMP_CTRL),    "E_GMP_CTRL"},
-{ERR_FUNC(GMP_F_E_GMP_RSA_MOD_EXP),     "E_GMP_RSA_MOD_EXP"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA GMP_str_reasons[]=
-        {
-{ERR_REASON(GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
-{ERR_REASON(GMP_R_KEY_CONTEXT_ERROR)     ,"key context error"},
-{ERR_REASON(GMP_R_MISSING_KEY_COMPONENTS),"missing key components"},
-{0,NULL}
-        };
-
-#endif
-
-#ifdef GMP_LIB_NAME
-static ERR_STRING_DATA GMP_lib_name[]=
-        {
-{0      ,GMP_LIB_NAME},
-{0,NULL}
-        };
-#endif
-
-
-static int GMP_lib_error_code=0;
-static int GMP_error_init=1;
-
-static void ERR_load_GMP_strings(void)
-        {
-        if (GMP_lib_error_code == 0)
-                GMP_lib_error_code=ERR_get_next_error_library();
-
-        if (GMP_error_init)
-                {
-                GMP_error_init=0;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(GMP_lib_error_code,GMP_str_functs);
-                ERR_load_strings(GMP_lib_error_code,GMP_str_reasons);
-#endif
-
-#ifdef GMP_LIB_NAME
-                GMP_lib_name->error = ERR_PACK(GMP_lib_error_code,0,0);
-                ERR_load_strings(0,GMP_lib_name);
-#endif
-                }
-        }
-
-static void ERR_unload_GMP_strings(void)
-        {
-        if (GMP_error_init == 0)
-                {
-#ifndef OPENSSL_NO_ERR
-                ERR_unload_strings(GMP_lib_error_code,GMP_str_functs);
-                ERR_unload_strings(GMP_lib_error_code,GMP_str_reasons);
-#endif
-
-#ifdef GMP_LIB_NAME
-                ERR_unload_strings(0,GMP_lib_name);
-#endif
-                GMP_error_init=1;
-                }
-        }
-
-static void ERR_GMP_error(int function, int reason, char *file, int line)
-        {
-        if (GMP_lib_error_code == 0)
-                GMP_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(GMP_lib_error_code,function,reason,file,line);
-        }
diff --git a/src/lib/libssl/src/engines/e_gmp_err.h b/src/lib/libssl/src/engines/e_gmp_err.h
deleted file mode 100644
index dd05dfd800..0000000000
--- a/src/lib/libssl/src/engines/e_gmp_err.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001-2002 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_GMP_ERR_H
-#define HEADER_GMP_ERR_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_GMP_strings(void);
-static void ERR_unload_GMP_strings(void);
-static void ERR_GMP_error(int function, int reason, char *file, int line);
-#define GMPerr(f,r) ERR_GMP_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the GMP functions. */
-
-/* Function codes. */
-#define GMP_F_E_GMP_CTRL                                 100
-#define GMP_F_E_GMP_RSA_MOD_EXP                          101
-
-/* Reason codes. */
-#define GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED               100
-#define GMP_R_KEY_CONTEXT_ERROR                          101
-#define GMP_R_MISSING_KEY_COMPONENTS                     102
-
-#ifdef  __cplusplus
-}
-#endif
-#endif