This commit is contained in:
Zhi Guan
2015-08-15 15:02:15 +08:00
parent 06df2fab54
commit 3bdc0ea895
2536 changed files with 417052 additions and 271997 deletions

View File

@@ -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,23 +60,23 @@
#include <openssl/bn.h>
#include <openssl/dh.h>
static void *dummy=&dummy;
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;
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))
return ret;
DH_free(ret);
return NULL;
}
#endif