Add ASYNC_JOB pools

[openssl.git] / crypto / dh / dh_rfc5114.c

diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 0d04a6a00fb8638cce04bbf09e7397c6081da496..da998f574f2161cc425e3bb36dfa37caf8eaaf16 100644 (file)
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c
@@ -1,5 +1,6 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2011.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2011.
  */
 /* ====================================================================
  * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -9,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,44 +57,34 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/dh.h>
 #include <openssl/bn.h>
+#include "internal/bn_dh.h"
 
-#define make_dh_bn(x) \
-       const extern BIGNUM _bignum_dh##x##_p;\
-       const extern BIGNUM _bignum_dh##x##_g;\
-       const extern BIGNUM _bignum_dh##x##_q;
-
-/* Macro to make a DH structure from BIGNUM data. NB: although just copying
- * the BIGNUM static pointers would be more efficient we can't as they get
- * wiped using BN_clear_free() when DH_free() is called.
+/*
+ * Macro to make a DH structure from BIGNUM data. NB: although just copying
+ * the BIGNUM static pointers would be more efficient, we can't do that
+ * because they get wiped using BN_clear_free() when DH_free() is called.
  */
 
 #define make_dh(x) \
-DH * DH_get_##x(void) \
-       { \
-       DH *dh; \
-       dh = DH_new(); \
-       if (!dh) \
-               return NULL; \
-       dh->p = BN_dup(&_bignum_dh##x##_p); \
-       dh->g = BN_dup(&_bignum_dh##x##_g); \
-       dh->q = BN_dup(&_bignum_dh##x##_q); \
-       if (!dh->p || !dh->q || !dh->g) \
-               { \
-               DH_free(dh); \
-               return NULL; \
-               } \
-       return dh; \
-       }
-
-make_dh_bn(1024_160)
-make_dh_bn(2048_224)
-make_dh_bn(2048_256)
+DH *DH_get_##x(void) \
+{ \
+    DH *dh = DH_new(); \
+\
+    if (dh == NULL) \
+        return NULL; \
+    dh->p = BN_dup(&_bignum_dh##x##_p); \
+    dh->g = BN_dup(&_bignum_dh##x##_g); \
+    dh->q = BN_dup(&_bignum_dh##x##_q); \
+    if (dh->p == NULL || dh->q == NULL || dh->g == NULL) {\
+        DH_free(dh); \
+        return NULL; \
+    } \
+    return dh; \
+}
 
 make_dh(1024_160)
 make_dh(2048_224)
 make_dh(2048_256)
-
-