summaryrefslogtreecommitdiff
path: root/openbsd-compat/openssl-compat.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-12-04 23:20:50 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-12-04 23:20:50 +1100
commitebdef76b5df3c33b05128b4fb2cc484427f99ca6 (patch)
treef85300cb02af52a48ee1de7726e6382688504add /openbsd-compat/openssl-compat.c
parentd89745b9e7e2048c13b0173eadc2d41e23b6a79d (diff)
- (dtucker) [configure.ac moduli.c openbsd-compat/openssl-compat.{c,h}] Add
shims for the new, non-deprecated OpenSSL key generation functions for platforms that don't have the new interfaces.
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
-rw-r--r--openbsd-compat/openssl-compat.c64
1 files changed, 63 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index c9bb7cb5..e2d090cf 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.c,v 1.10 2010/11/22 06:59:00 dtucker Exp $ */
+/* $Id: openssl-compat.c,v 1.11 2010/12/04 12:20:50 dtucker Exp $ */
/*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -18,11 +18,16 @@
#include "includes.h"
+#include <stdarg.h>
+#include <string.h>
+
#ifdef USE_OPENSSL_ENGINE
# include <openssl/engine.h>
# include <openssl/conf.h>
#endif
+#include "log.h"
+
#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "openssl-compat.h"
@@ -59,6 +64,63 @@ ssh_EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, unsigned int cnt)
}
#endif
+#ifndef HAVE_BN_IS_PRIME_EX
+int
+BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, void *cb)
+{
+ if (cb != NULL)
+ fatal("%s: callback args not supported", __func__);
+ return BN_is_prime(p, nchecks, NULL, ctx, NULL);
+}
+#endif
+
+#ifndef HAVE_RSA_GENERATE_KEY_EX
+int
+RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *bn_e, void *cb)
+{
+ RSA *new_rsa, tmp_rsa;
+ unsigned long e;
+
+ sleep(1);
+ if (cb != NULL)
+ fatal("%s: callback args not supported", __func__);
+ e = BN_get_word(bn_e);
+ if (e == 0xffffffffL)
+ fatal("%s: value of e too large", __func__);
+ new_rsa = RSA_generate_key(bits, e, NULL, NULL);
+ if (new_rsa == NULL)
+ return 0;
+ /* swap rsa/new_rsa then free new_rsa */
+ tmp_rsa = *rsa;
+ *rsa = *new_rsa;
+ *new_rsa = tmp_rsa;
+ RSA_free(new_rsa);
+ return 1;
+}
+#endif
+
+#ifndef HAVE_DSA_GENERATE_PARAMETERS_EX
+int
+DSA_generate_parameters_ex(DSA *dsa, int bits, const unsigned char *seed,
+ int seed_len, int *counter_ret, unsigned long *h_ret, void *cb)
+{
+ DSA *new_dsa, tmp_dsa;
+
+ if (cb != NULL)
+ fatal("%s: callback args not supported", __func__);
+ new_dsa = DSA_generate_parameters(bits, (unsigned char *)seed, seed_len,
+ counter_ret, h_ret, NULL, NULL);
+ if (new_dsa == NULL)
+ return 0;
+ /* swap dsa/new_dsa then free new_dsa */
+ tmp_dsa = *dsa;
+ *dsa = *new_dsa;
+ *new_dsa = tmp_dsa;
+ DSA_free(new_dsa);
+ return 1;
+}
+#endif
+
#ifdef USE_OPENSSL_ENGINE
void
ssh_SSLeay_add_all_algorithms(void)