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

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 3ce12907728e175fcb3f5c6765d1321f2477f7d0..80c9cb69db2bf4e461b7f29af255ffec2e147ebb 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -109,7 +109,7 @@
  * o ...                                       (for OpenSSL)
  */
 
  * o ...                                       (for OpenSSL)
  */
 

-#if HAVE_LONG_DOUBLE
+#ifdef HAVE_LONG_DOUBLE

 #define LDOUBLE long double
 #else
 #define LDOUBLE double
 #define LDOUBLE long double
 #else
 #define LDOUBLE double

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 683916e71b010de076820c7bec701ce3a3e52893..143008ed9c50098d753e89f09a48b6d504348b7e 100644 (file)
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -342,7 +342,7 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
        register DES_LONG *k;
        register int i;
 
        register DES_LONG *k;
        register int i;
 

-#if OPENBSD_DEV_CRYPTO
+#ifdef OPENBSD_DEV_CRYPTO

        memcpy(schedule->key,key,sizeof schedule->key);
        schedule->session=NULL;
 #endif
        memcpy(schedule->key,key,sizeof schedule->key);
        schedule->session=NULL;
 #endif

diff --git a/crypto/engine/hw_ubsec.c b/crypto/engine/hw_ubsec.c
index 63397f868c5b46c704f7917e4fa4ee3b9cc946bb..ed8401ec162655ed0948b1caa4ae1efa08fe4a50 100644 (file)
--- a/crypto/engine/hw_ubsec.c
+++ b/crypto/engine/hw_ubsec.c
@@ -93,7 +93,7 @@ static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
 static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 #ifndef OPENSSL_NO_DSA
 static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 #ifndef OPENSSL_NO_DSA

-#if NOT_USED
+#ifdef NOT_USED

 static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
                BN_CTX *ctx, BN_MONT_CTX *in_mont);
 static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
                BN_CTX *ctx, BN_MONT_CTX *in_mont);


@@ -113,7 +113,7 @@ static int ubsec_dh_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh)
 static int ubsec_dh_generate_key(DH *dh);
 #endif
 
 static int ubsec_dh_generate_key(DH *dh);
 #endif
 

-#if NOT_USED
+#ifdef NOT_USED

 static int ubsec_rand_bytes(unsigned char *buf, int num);
 static int ubsec_rand_status(void);
 #endif
 static int ubsec_rand_bytes(unsigned char *buf, int num);
 static int ubsec_rand_status(void);
 #endif


@@ -663,7 +663,7 @@ static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 }
 
 #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,
                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
                BN_CTX *ctx, BN_MONT_CTX *in_mont)
 static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
                BN_CTX *ctx, BN_MONT_CTX *in_mont)


@@ -987,7 +987,7 @@ err:
         }
 #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)
         {