make update

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

diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index 3eb319e2a8523a220e27373c55edfab3aae4ae28..bff3b59f88cc4120afed08cc8297bd50c230e827 100644 (file)
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -61,19 +61,33 @@
 #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;
+       BN_GENCB *cb;
        DH *ret=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))
+       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