Return an error in ASN1_TYPE_unpack_sequence if argument is NULL

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

diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index 3eb319e2a8523a220e27373c55edfab3aae4ae28..7220d074d88873f83a2b11b85f8dc8c9683c6745 100644 (file)
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -7,7 +7,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
@@ -53,7 +53,6 @@
  *
  */
 
-
 /* This file contains deprecated functions as wrappers to the new ones */
 
 #include <stdio.h>
@@ -61,19 +60,31 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+static void *dummy = &dummy;
+
+#ifndef OPENSSL_NO_DEPRECATED
 DH *DH_generate_parameters(int prime_len, int generator,
-            void (*callback)(int,int,void *), void *cb_arg)
-       {
-       BN_GENCB cb;
-       DH *ret=NULL;
+                           void (*callback) (int, int, void *), void *cb_arg)
+{
+    BN_GENCB *cb;
+    DH *ret = NULL;
 
-       if((ret=DH_new()) == NULL)
-               return NULL;
+    if ((ret = DH_new()) == NULL)
+        return NULL;
+    cb = BN_GENCB_new();
+    if (!cb) {
+        DH_free(ret);
+        return NULL;
+    }
 
-       BN_GENCB_set_old(&cb, callback, cb_arg);
+    BN_GENCB_set_old(cb, callback, cb_arg);
 
-       if(DH_generate_parameters_ex(ret, prime_len, generator, &cb))
-               return ret;
-       DH_free(ret);
-       return NULL;
-       }
+    if (DH_generate_parameters_ex(ret, prime_len, generator, cb)) {
+        BN_GENCB_free(cb);
+        return ret;
+    }
+    BN_GENCB_free(cb);
+    DH_free(ret);
+    return NULL;
+}
+#endif