wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When OPENSSL_NO_DEPRECATED is defined, deprecated functions are (or should

Browse source 
be) precompiled out in the API headers. This change is to ensure that if
it is defined when compiling openssl, the deprecated functions aren't
implemented either.
This commit is contained in:
Geoff Thorpe 2003-10-29 04:06:50 +00:00
parent 6145b0b183
commit 9d473aa2e4
5 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -4,6 +4,10 @@
Changes between 0.9.7c and 0.9.8 [xx XXX xxxx]
*) Ensure that deprecated functions do not get compiled when
OPENSSL_NO_DEPRECATED is defined.
[Geoff Thorpe]
*) Reorganise PKCS#7 code to separate the digest location functionality
into PKCS7_find_digest(), digest addtion into PKCS7_bio_add_digest().
New function PKCS7_set_digest() to set the digest type for PKCS#7

6
crypto/bn/bn_depr.c
View file

@ -62,6 +62,9 @@
#include "bn_lcl.h"
#include <openssl/rand.h>
static void *dummy=&dummy;
#ifndef OPENSSL_NO_DEPRECATED
BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
const BIGNUM *add, const BIGNUM *rem,
void (*callback)(int,int,void *), void *cb_arg)
@ -78,6 +81,7 @@ BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
}
else
rnd=ret;
bn_verify(rnd);
if(!BN_generate_prime_ex(rnd, bits, safe, add, rem, &cb))
goto err;
@ -85,6 +89,7 @@ BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
found = 1;
err:
if (!found && (ret == NULL) && (rnd != NULL)) BN_free(rnd);
if(found) bn_verify(rnd);
return(found ? rnd : NULL);
}
@ -106,3 +111,4 @@ int BN_is_prime_fasttest(const BIGNUM *a, int checks,
return BN_is_prime_fasttest_ex(a, checks, ctx_passed,
do_trial_division, &cb);
}
#endif

4
crypto/dh/dh_depr.c
View file

@ -61,6 +61,9 @@
#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)
{
@ -77,3 +80,4 @@ DH *DH_generate_parameters(int prime_len, int generator,
DH_free(ret);
return NULL;
}
#endif

4
crypto/dsa/dsa_depr.c
View file

@ -69,6 +69,8 @@
#define HASH EVP_sha1()
#endif
static void *dummy=&dummy;
#ifndef OPENSSL_NO_SHA
#include <stdio.h>
@ -80,6 +82,7 @@
#include <openssl/rand.h>
#include <openssl/sha.h>
#ifndef OPENSSL_NO_DEPRECATED
DSA *DSA_generate_parameters(int bits,
unsigned char *seed_in, int seed_len,
int *counter_ret, unsigned long *h_ret,
@ -100,3 +103,4 @@ DSA *DSA_generate_parameters(int bits,
return NULL;
}
#endif
#endif

5
crypto/rsa/rsa_depr.c
View file

@ -62,6 +62,9 @@
#include <openssl/bn.h>
#include <openssl/rsa.h>
static void *dummy=&dummy;
#ifndef OPENSSL_NO_DEPRECATED
RSA *RSA_generate_key(int bits, unsigned long e_value,
void (*callback)(int,int,void *), void *cb_arg)
{
@ -78,4 +81,4 @@ RSA *RSA_generate_key(int bits, unsigned long e_value,
RSA_free(rsa);
return 0;
}
#endif