Add missing variable length cipher flag for Blowfish.

[oweals/openssl.git] / crypto / engine / engine_openssl.c

diff --git a/crypto/engine/engine_openssl.c b/crypto/engine/engine_openssl.c
index a6292a0af212841f51207735d943b0fb2d8b5ed7..cd885c04091135d9006069e65383d4d6cb0c64b6 100644 (file)
--- a/crypto/engine/engine_openssl.c
+++ b/crypto/engine/engine_openssl.c
@@ -60,14 +60,8 @@
 #include <stdio.h>
 #include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "engine_int.h"
 #include <openssl/engine.h>
 #include <openssl/dso.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
-#include <openssl/rand.h>
-#include <openssl/bn.h>
 
 /* This is the only function we need to implement as OpenSSL
  * doesn't have a native CRT mod_exp. Perhaps this should be
@@ -76,39 +70,36 @@ static int openssl_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1,
                const BIGNUM *iqmp, BN_CTX *ctx);
 
-/* The ENGINE structure that can be pointed to. */
-static ENGINE engine_openssl =
-        {
-       "openssl",
-       "Software default engine support",
-       NULL,
-       NULL,
-       NULL, /* these methods are "stolen" in ENGINE_openssl() */
-       NULL,
-       NULL,
-       openssl_mod_exp_crt,
-       NULL, /* no init() */
-       NULL, /* no finish() */
-       NULL, /* no ctrl() */
-       NULL, /* no load_privkey() */
-       NULL, /* no load_pubkey() */
-       0, /* no flags */
-       0, 0, /* no references. */
-       NULL, NULL /* unlinked */
-        };
+/* The constants used when creating the ENGINE */
+static const char *engine_openssl_id = "openssl";
+static const char *engine_openssl_name = "Software default engine support";
 
 /* As this is only ever called once, there's no need for locking
  * (indeed - the lock will already be held by our caller!!!) */
 ENGINE *ENGINE_openssl()
        {
-       /* We need to populate our structure with the software pointers
-        * that we want to steal. */
-       engine_openssl.rsa_meth = RSA_get_default_openssl_method();
-       engine_openssl.dsa_meth = DSA_get_default_openssl_method();
-       engine_openssl.dh_meth = DH_get_default_openssl_method();
-       engine_openssl.rand_meth = RAND_SSLeay();
-       engine_openssl.bn_mod_exp = BN_mod_exp;
-       return &engine_openssl;
+       ENGINE *ret = ENGINE_new();
+       if(!ret)
+               return NULL;
+       if(!ENGINE_set_id(ret, engine_openssl_id) ||
+                       !ENGINE_set_name(ret, engine_openssl_name) ||
+#ifndef OPENSSL_NO_RSA
+                       !ENGINE_set_RSA(ret, RSA_get_default_openssl_method()) ||
+#endif
+#ifndef OPENSSL_NO_DSA
+                       !ENGINE_set_DSA(ret, DSA_get_default_openssl_method()) ||
+#endif
+#ifndef OPENSSL_NO_DH
+                       !ENGINE_set_DH(ret, DH_get_default_openssl_method()) ||
+#endif
+                       !ENGINE_set_RAND(ret, RAND_SSLeay()) ||
+                       !ENGINE_set_BN_mod_exp(ret, BN_mod_exp) ||
+                       !ENGINE_set_BN_mod_exp_crt(ret, openssl_mod_exp_crt))
+               {
+               ENGINE_free(ret);
+               return NULL;
+               }
+       return ret;
        }
 
 /* Chinese Remainder Theorem, taken and adapted from rsa_eay.c */
@@ -129,15 +120,16 @@ static int openssl_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
        BN_init(&r1);
        /* BN_mul() cannot accept const BIGNUMs so I use the BN_CTX
         * to duplicate what I need. <sigh> */
+       BN_CTX_start(bn_ctx);
        if ((temp_bn = BN_CTX_get(bn_ctx)) == NULL) goto err;
        if (!BN_copy(temp_bn, iqmp)) goto err;
  
        if (!BN_mod(&r1, a, q, bn_ctx)) goto err;
-       if (!engine_openssl.bn_mod_exp(&m1, &r1, dmq1, q, bn_ctx))
+       if (!BN_mod_exp(&m1, &r1, dmq1, q, bn_ctx))
                goto err;
  
        if (!BN_mod(&r1, a, p, bn_ctx)) goto err;
-       if (!engine_openssl.bn_mod_exp(r, &r1, dmp1, p, bn_ctx))
+       if (!BN_mod_exp(r, &r1, dmp1, p, bn_ctx))
                goto err;
 
        if (!BN_sub(r, r, &m1)) goto err;
@@ -166,8 +158,7 @@ static int openssl_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 err:
        BN_clear_free(&m1);
        BN_clear_free(&r1);
-       if (temp_bn)
-               bn_ctx->tos--;
+       BN_CTX_end(ctx);
        if (!ctx)
                BN_CTX_free(bn_ctx);
        return(ret);