From 5c2b5f86b966c129b83553f7b5f190c44f243645 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Thu, 30 Mar 2017 10:30:55 -0600
Subject: [PATCH] testing buffer size with const DH and remove redeclaration of
 WOLFSSL_CRL

---
 wolfcrypt/src/dh.c    | 9 ++++++++-
 wolfcrypt/test/test.c | 8 +++++++-
 wolfssl/crl.h         | 2 --
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wolfcrypt/src/dh.c b/wolfcrypt/src/dh.c
index 4bddf485b..a3e2e4619 100644
--- a/wolfcrypt/src/dh.c
+++ b/wolfcrypt/src/dh.c
@@ -179,7 +179,14 @@ static int GeneratePublic(DhKey* key, const byte* priv, word32 privSz,
 int wc_DhGenerateKeyPair(DhKey* key, WC_RNG* rng, byte* priv, word32* privSz,
                       byte* pub, word32* pubSz)
 {
-    int ret = GeneratePrivate(key, rng, priv, privSz);
+    int ret;
+
+    if (key == NULL || rng == NULL || priv == NULL || privSz == NULL ||
+            pub == NULL || pubSz == NULL) {
+        return BAD_FUNC_ARG;
+    }
+
+    ret = GeneratePrivate(key, rng, priv, privSz);
 
     return (ret != 0) ? ret : GeneratePublic(key, priv, *privSz, pub, pubSz);
 }
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 90572d6ec..c0861b5ba 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -7865,9 +7865,15 @@ static int dh_generate_test(WC_RNG *rng)
     DhKey  smallKey;
     byte   p[2] = { 0, 5 };
     byte   g[2] = { 0, 2 };
+#ifdef WOLFSSL_DH_CONST
+    /* the table for constant DH lookup will round to the lowest byte size 21 */
+    byte   priv[21];
+    byte   pub[21];
+#else
     byte   priv[2];
-    word32 privSz = sizeof(priv);
     byte   pub[2];
+#endif
+    word32 privSz = sizeof(priv);
     word32 pubSz = sizeof(pub);
 
     wc_InitDhKey(&smallKey);
diff --git a/wolfssl/crl.h b/wolfssl/crl.h
index 982842384..9f20cc309 100644
--- a/wolfssl/crl.h
+++ b/wolfssl/crl.h
@@ -34,8 +34,6 @@
     extern "C" {
 #endif
 
-typedef struct WOLFSSL_CRL WOLFSSL_CRL;
-
 WOLFSSL_LOCAL int  InitCRL(WOLFSSL_CRL*, WOLFSSL_CERT_MANAGER*);
 WOLFSSL_LOCAL void FreeCRL(WOLFSSL_CRL*, int dynamic);