Commit 89918b5c authored by Richard Levitte's avatar Richard Levitte
Browse files

Certain flag macros were tested with #if instead if #ifdef...

parent 46859bf4

crypto/bio/b_print.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ 
 * o ...                                       (for OpenSSL)

 * o ...                                       (for OpenSSL)

 */

 */





#if HAVE_LONG_DOUBLE

#ifdef HAVE_LONG_DOUBLE

#define LDOUBLE long double

#define LDOUBLE long double

#else

#else

#define LDOUBLE double

#define LDOUBLE double

crypto/cryptlib.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,6 @@ extern "C" { 
#define HEX_SIZE(type)         ((sizeof(type)*2)

#define HEX_SIZE(type)         ((sizeof(type)*2)





/* die if we have to */

/* die if we have to */

void OpenSSLDie(const char *file,int line,const char *assertion);

#define die(e)	((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e))

#define die(e)	((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e))





#ifdef  __cplusplus

#ifdef  __cplusplus

crypto/crypto.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -382,6 +382,9 @@ void CRYPTO_mem_leaks(struct bio_st *bio); 
/* unsigned long order, char *file, int line, int num_bytes, char *addr */

/* unsigned long order, char *file, int line, int num_bytes, char *addr */

void CRYPTO_mem_leaks_cb(void (*cb)(unsigned long, const char *, int, int, void *));

void CRYPTO_mem_leaks_cb(void (*cb)(unsigned long, const char *, int, int, void *));





/* A helper routine to use when something went really bad.  */

void OpenSSLDie(const char *file,int line,const char *assertion);



/* BEGIN ERROR CODES */

/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

 * made after this point may be overwritten when the script is next run.

crypto/engine/hw_ubsec.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ static int ubsec_rsa_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa); 
static int ubsec_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,

static int ubsec_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,

		const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);

		const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);

#ifndef OPENSSL_NO_DSA

#ifndef OPENSSL_NO_DSA

#if NOT_USED

#ifdef NOT_USED

static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,

static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,

		BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,

		BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,

		BN_CTX *ctx, BN_MONT_CTX *in_mont);

		BN_CTX *ctx, BN_MONT_CTX *in_mont);
@@ -112,7 +112,7 @@ static int ubsec_dh_compute_key(unsigned char *key,BIGNUM *pub_key,DH *dh); 
static int ubsec_dh_generate_key(DH *dh);

static int ubsec_dh_generate_key(DH *dh);

#endif

#endif





#if NOT_USED

#ifdef NOT_USED

static int ubsec_rand_bytes(unsigned char *buf, int num);

static int ubsec_rand_bytes(unsigned char *buf, int num);

static int ubsec_rand_status(void);

static int ubsec_rand_status(void);

#endif

#endif
@@ -657,7 +657,7 @@ err: 
#endif

#endif





#ifndef OPENSSL_NO_DSA

#ifndef OPENSSL_NO_DSA

#if NOT_USED

#ifdef NOT_USED

static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,

static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,

		BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,

		BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,

		BN_CTX *ctx, BN_MONT_CTX *in_mont)

		BN_CTX *ctx, BN_MONT_CTX *in_mont)