From 290e17874fa8a78eccf5a38eb2ff7c1a07e06ddd Mon Sep 17 00:00:00 2001 From: jsing Date: Thu, 15 May 2014 11:25:59 +0000 Subject: [PATCH] Stop being a dummy... presumably these are left overs from pedantic mode that were not wrapped with #if PEDANTIC. ok miod@ --- lib/libcrypto/bn/bn_depr.c | 2 -- lib/libcrypto/dh/dh_depr.c | 2 -- lib/libcrypto/dsa/dsa_depr.c | 2 -- lib/libcrypto/ec/ecp_nistp224.c | 2 -- lib/libcrypto/ec/ecp_nistp256.c | 2 -- lib/libcrypto/ec/ecp_nistp521.c | 2 -- lib/libcrypto/ec/ecp_nistputil.c | 2 -- lib/libcrypto/evp/e_old.c | 4 +--- lib/libcrypto/rsa/rsa_depr.c | 6 +----- lib/libssl/src/crypto/bn/bn_depr.c | 2 -- lib/libssl/src/crypto/dh/dh_depr.c | 2 -- lib/libssl/src/crypto/dsa/dsa_depr.c | 2 -- lib/libssl/src/crypto/ec/ecp_nistp224.c | 2 -- lib/libssl/src/crypto/ec/ecp_nistp256.c | 2 -- lib/libssl/src/crypto/ec/ecp_nistp521.c | 2 -- lib/libssl/src/crypto/ec/ecp_nistputil.c | 2 -- lib/libssl/src/crypto/evp/e_old.c | 4 +--- lib/libssl/src/crypto/rsa/rsa_depr.c | 6 +----- 18 files changed, 4 insertions(+), 44 deletions(-) diff --git a/lib/libcrypto/bn/bn_depr.c b/lib/libcrypto/bn/bn_depr.c index e4d7f33967b..6da0d7cb223 100644 --- a/lib/libcrypto/bn/bn_depr.c +++ b/lib/libcrypto/bn/bn_depr.c @@ -62,8 +62,6 @@ #include "bn_lcl.h" #include -static void *dummy = &dummy; - #ifndef OPENSSL_NO_DEPRECATED BIGNUM * BN_generate_prime(BIGNUM *ret, int bits, int safe, const BIGNUM *add, diff --git a/lib/libcrypto/dh/dh_depr.c b/lib/libcrypto/dh/dh_depr.c index acc05f252c1..15fcca72d82 100644 --- a/lib/libcrypto/dh/dh_depr.c +++ b/lib/libcrypto/dh/dh_depr.c @@ -61,8 +61,6 @@ #include #include -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) diff --git a/lib/libcrypto/dsa/dsa_depr.c b/lib/libcrypto/dsa/dsa_depr.c index f2da680eb46..3c9958fe3b9 100644 --- a/lib/libcrypto/dsa/dsa_depr.c +++ b/lib/libcrypto/dsa/dsa_depr.c @@ -69,8 +69,6 @@ #define HASH EVP_sha1() #endif -static void *dummy=&dummy; - #ifndef OPENSSL_NO_SHA #include diff --git a/lib/libcrypto/ec/ecp_nistp224.c b/lib/libcrypto/ec/ecp_nistp224.c index 29ff2fc1f15..bd8f65b0973 100644 --- a/lib/libcrypto/ec/ecp_nistp224.c +++ b/lib/libcrypto/ec/ecp_nistp224.c @@ -1697,6 +1697,4 @@ ec_GFp_nistp224_have_precompute_mult(const EC_GROUP * group) return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libcrypto/ec/ecp_nistp256.c b/lib/libcrypto/ec/ecp_nistp256.c index 85f370caddd..558c29c5ba2 100644 --- a/lib/libcrypto/ec/ecp_nistp256.c +++ b/lib/libcrypto/ec/ecp_nistp256.c @@ -2243,6 +2243,4 @@ ec_GFp_nistp256_have_precompute_mult(const EC_GROUP * group) else return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libcrypto/ec/ecp_nistp521.c b/lib/libcrypto/ec/ecp_nistp521.c index fab22243451..0c40f083462 100644 --- a/lib/libcrypto/ec/ecp_nistp521.c +++ b/lib/libcrypto/ec/ecp_nistp521.c @@ -2117,6 +2117,4 @@ ec_GFp_nistp521_have_precompute_mult(const EC_GROUP * group) return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libcrypto/ec/ecp_nistputil.c b/lib/libcrypto/ec/ecp_nistputil.c index 28fecf8b6e5..efd6f368c1d 100644 --- a/lib/libcrypto/ec/ecp_nistputil.c +++ b/lib/libcrypto/ec/ecp_nistputil.c @@ -204,6 +204,4 @@ ec_GFp_nistp_recode_scalar_bits(unsigned char *sign, unsigned char *digit, unsig *sign = s & 1; *digit = d; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libcrypto/evp/e_old.c b/lib/libcrypto/evp/e_old.c index 6d63ea4269e..c84bc29bf6f 100644 --- a/lib/libcrypto/evp/e_old.c +++ b/lib/libcrypto/evp/e_old.c @@ -56,9 +56,7 @@ * */ -#ifdef OPENSSL_NO_DEPRECATED -static void *dummy = &dummy; -#else +#ifndef OPENSSL_NO_DEPRECATED #include diff --git a/lib/libcrypto/rsa/rsa_depr.c b/lib/libcrypto/rsa/rsa_depr.c index a859ded987a..1da0dd9087c 100644 --- a/lib/libcrypto/rsa/rsa_depr.c +++ b/lib/libcrypto/rsa/rsa_depr.c @@ -62,11 +62,7 @@ #include #include -#ifdef OPENSSL_NO_DEPRECATED - -static void *dummy=&dummy; - -#else +#ifndef OPENSSL_NO_DEPRECATED RSA *RSA_generate_key(int bits, unsigned long e_value, void (*callback)(int,int,void *), void *cb_arg) diff --git a/lib/libssl/src/crypto/bn/bn_depr.c b/lib/libssl/src/crypto/bn/bn_depr.c index e4d7f33967b..6da0d7cb223 100644 --- a/lib/libssl/src/crypto/bn/bn_depr.c +++ b/lib/libssl/src/crypto/bn/bn_depr.c @@ -62,8 +62,6 @@ #include "bn_lcl.h" #include -static void *dummy = &dummy; - #ifndef OPENSSL_NO_DEPRECATED BIGNUM * BN_generate_prime(BIGNUM *ret, int bits, int safe, const BIGNUM *add, diff --git a/lib/libssl/src/crypto/dh/dh_depr.c b/lib/libssl/src/crypto/dh/dh_depr.c index acc05f252c1..15fcca72d82 100644 --- a/lib/libssl/src/crypto/dh/dh_depr.c +++ b/lib/libssl/src/crypto/dh/dh_depr.c @@ -61,8 +61,6 @@ #include #include -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) diff --git a/lib/libssl/src/crypto/dsa/dsa_depr.c b/lib/libssl/src/crypto/dsa/dsa_depr.c index f2da680eb46..3c9958fe3b9 100644 --- a/lib/libssl/src/crypto/dsa/dsa_depr.c +++ b/lib/libssl/src/crypto/dsa/dsa_depr.c @@ -69,8 +69,6 @@ #define HASH EVP_sha1() #endif -static void *dummy=&dummy; - #ifndef OPENSSL_NO_SHA #include diff --git a/lib/libssl/src/crypto/ec/ecp_nistp224.c b/lib/libssl/src/crypto/ec/ecp_nistp224.c index 29ff2fc1f15..bd8f65b0973 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp224.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp224.c @@ -1697,6 +1697,4 @@ ec_GFp_nistp224_have_precompute_mult(const EC_GROUP * group) return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libssl/src/crypto/ec/ecp_nistp256.c b/lib/libssl/src/crypto/ec/ecp_nistp256.c index 85f370caddd..558c29c5ba2 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp256.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp256.c @@ -2243,6 +2243,4 @@ ec_GFp_nistp256_have_precompute_mult(const EC_GROUP * group) else return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libssl/src/crypto/ec/ecp_nistp521.c b/lib/libssl/src/crypto/ec/ecp_nistp521.c index fab22243451..0c40f083462 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp521.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp521.c @@ -2117,6 +2117,4 @@ ec_GFp_nistp521_have_precompute_mult(const EC_GROUP * group) return 0; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libssl/src/crypto/ec/ecp_nistputil.c b/lib/libssl/src/crypto/ec/ecp_nistputil.c index 28fecf8b6e5..efd6f368c1d 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistputil.c +++ b/lib/libssl/src/crypto/ec/ecp_nistputil.c @@ -204,6 +204,4 @@ ec_GFp_nistp_recode_scalar_bits(unsigned char *sign, unsigned char *digit, unsig *sign = s & 1; *digit = d; } -#else -static void *dummy = &dummy; #endif diff --git a/lib/libssl/src/crypto/evp/e_old.c b/lib/libssl/src/crypto/evp/e_old.c index 6d63ea4269e..c84bc29bf6f 100644 --- a/lib/libssl/src/crypto/evp/e_old.c +++ b/lib/libssl/src/crypto/evp/e_old.c @@ -56,9 +56,7 @@ * */ -#ifdef OPENSSL_NO_DEPRECATED -static void *dummy = &dummy; -#else +#ifndef OPENSSL_NO_DEPRECATED #include diff --git a/lib/libssl/src/crypto/rsa/rsa_depr.c b/lib/libssl/src/crypto/rsa/rsa_depr.c index a859ded987a..1da0dd9087c 100644 --- a/lib/libssl/src/crypto/rsa/rsa_depr.c +++ b/lib/libssl/src/crypto/rsa/rsa_depr.c @@ -62,11 +62,7 @@ #include #include -#ifdef OPENSSL_NO_DEPRECATED - -static void *dummy=&dummy; - -#else +#ifndef OPENSSL_NO_DEPRECATED RSA *RSA_generate_key(int bits, unsigned long e_value, void (*callback)(int,int,void *), void *cb_arg) -- 2.20.1