From df2ee0e27d2db02660c1d15fe6a3e38be9df0a60 Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@links.org>
Date: Sat, 5 Sep 2015 13:32:58 +0100
Subject: Enable -Wmissing-variable-declarations and
 -Wincompatible-pointer-types-discards-qualifiers (the latter did not require
 any code changes).

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 crypto/dh/dh_ameth.c   | 2 --
 crypto/dh/dh_asn1.c    | 6 +++---
 crypto/dh/dh_rfc5114.c | 9 ---------
 3 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'crypto/dh')

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index efb3d805e8..f0fcd83c52 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -67,8 +67,6 @@
 # include <openssl/cms.h>
 #endif
 
-extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth;
-
 /*
  * i2d/d2i like DH parameter functions which use the appropriate routine for
  * PKCS#3 DH or X9.42 DH.
diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index 0c6a1deb8b..cc307dc2df 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c
@@ -85,7 +85,7 @@ ASN1_SEQUENCE_cb(DHparams, dh_cb) = {
         ASN1_SIMPLE(DH, p, BIGNUM),
         ASN1_SIMPLE(DH, g, BIGNUM),
         ASN1_OPT(DH, length, ZLONG),
-} ASN1_SEQUENCE_END_cb(DH, DHparams)
+} static_ASN1_SEQUENCE_END_cb(DH, DHparams)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams)
 
@@ -110,7 +110,7 @@ typedef struct {
 ASN1_SEQUENCE(DHvparams) = {
         ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
         ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
-} ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
+} static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
 
 ASN1_SEQUENCE(DHxparams) = {
         ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
@@ -118,7 +118,7 @@ ASN1_SEQUENCE(DHxparams) = {
         ASN1_SIMPLE(int_dhx942_dh, q, BIGNUM),
         ASN1_OPT(int_dhx942_dh, j, BIGNUM),
         ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
-} ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
+} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
 
 int_dhx942_dh *d2i_int_dhx(int_dhx942_dh **a,
                            const unsigned char **pp, long length);
diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 752bf2cd12..61cd9ad4d1 100644
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c
@@ -61,11 +61,6 @@
 #include <openssl/dh.h>
 #include <openssl/bn.h>
 
-#define make_dh_bn(x) \
-        const extern BIGNUM _bignum_dh##x##_p;\
-        const extern BIGNUM _bignum_dh##x##_g;\
-        const extern BIGNUM _bignum_dh##x##_q;
-
 /*
  * Macro to make a DH structure from BIGNUM data. NB: although just copying
  * the BIGNUM static pointers would be more efficient we can't as they get
@@ -90,10 +85,6 @@ DH * DH_get_##x(void) \
         return dh; \
         }
 
-make_dh_bn(1024_160)
-make_dh_bn(2048_224)
-make_dh_bn(2048_256)
-
 make_dh(1024_160)
 make_dh(2048_224)
 make_dh(2048_256)
-- 
cgit v1.2.3