From f3435eefbdb4e793c280e983977981ef75823af1 Mon Sep 17 00:00:00 2001
From: Takashi Kojo <kojo@wolfsssl.com>
Date: Fri, 11 Nov 2016 12:24:31 +0900
Subject: [PATCH] templates: ASN1_INTEGER_to_BN, BN_mod_exp,
 CONF_modules_free/unload, DSA_dup_DH

---
 src/ssl.c             | 33 +++++++++++++++++++++++++++++++++
 wolfssl/openssl/ssl.h |  6 ++++++
 wolfssl/ssl.h         | 10 +++++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/ssl.c b/src/ssl.c
index 1a7d237d3..65de1ab06 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -13233,6 +13233,14 @@ long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER* i)
     return 0;
 }
 
+/*** TBC ***/
+WOLFSSL_API WOLFSSL_BIGNUM *ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai,
+                                       WOLFSSL_BIGNUM *bn)
+{
+    (void)ai;
+    (void)bn;
+    return 0;
+}
 
 
 void* wolfSSL_X509_STORE_CTX_get_ex_data(WOLFSSL_X509_STORE_CTX* ctx, int idx)
@@ -13560,6 +13568,12 @@ WOLFSSL_API long wolfSSL_SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(WOLFSS
     return 0;
 }
 
+/*** TBC ***/
+WOLFSSL_API void wolfSSL_CONF_modules_unload(int all)
+{
+    (void) all;
+}
+
 #ifndef NO_DES3
 void wolfSSL_DES_set_key(WOLFSSL_const_DES_cblock* myDes,
                                                WOLFSSL_DES_key_schedule* key)
@@ -14095,6 +14109,17 @@ int wolfSSL_BN_mod(WOLFSSL_BIGNUM* r, const WOLFSSL_BIGNUM* a,
     return 0;
 }
 
+/*** TBFD ***/
+WOLFSSL_API int wolfSSL_BN_mod_exp(WOLFSSL_BIGNUM *r, const WOLFSSL_BIGNUM *a,
+      const WOLFSSL_BIGNUM *p, const WOLFSSL_BIGNUM *m, WOLFSSL_BN_CTX *ctx)
+{
+    (void) r;
+    (void) a;
+    (void) p;
+    (void) m;
+    (void) ctx;
+    return 0;
+}
 
 const WOLFSSL_BIGNUM* wolfSSL_BN_value_one(void)
 {
@@ -15130,6 +15155,14 @@ void wolfSSL_DSA_free(WOLFSSL_DSA* dsa)
         dsa = NULL;
     }
 }
+
+/*** TBD ***/
+WOLFSSL_API WOLFSSL_DH *wolfSSL_DSA_dup_DH(const WOLFSSL_DSA *r)
+{
+    (void) r;
+    return NULL;
+}
+
 #endif /* NO_DSA */
 
 #ifndef NO_RSA
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 621854e26..0d690fa84 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -318,6 +318,7 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX;
 
 #define ASN1_INTEGER_cmp wolfSSL_ASN1_INTEGER_cmp
 #define ASN1_INTEGER_get wolfSSL_ASN1_INTEGER_get
+#define ASN1_INTEGER_to_BN wolfSSL_ASN1_INTEGER_to_BN
 
 #define SSL_load_client_CA_file wolfSSL_load_client_CA_file
 
@@ -428,6 +429,11 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX;
 #define SSL_SESSION_get_time wolfSSL_SESSION_get_time
 #define SSL_CTX_get_ex_new_index wolfSSL_CTX_get_ex_new_index
 
+/*#if OPENSSL_API_COMPAT < 0x10100000L*/
+# define CONF_modules_free() while(0) continue
+/*#endif*/
+#define CONF_modules_unload wolfSSL_CONF_modules_unload
+
 /* yassl had set the default to be 500 */
 #define SSL_get_default_timeout(ctx) 500
 
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index e2c0c200f..bc89b29c6 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -59,7 +59,9 @@
     #undef OCSP_RESPONSE
 #endif
 
-
+#ifdef OPENSSL_EXTRA
+    #include <wolfssl/openssl/bn.h>
+#endif
 
 #ifdef __cplusplus
     extern "C" {
@@ -636,7 +638,11 @@ WOLFSSL_API int  wolfSSL_ASN1_INTEGER_cmp(const WOLFSSL_ASN1_INTEGER*,
                                        const WOLFSSL_ASN1_INTEGER*);
 WOLFSSL_API long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER*);
 
+#ifdef OPENSSL_EXTRA
+WOLFSSL_API WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai,
+                                       WOLFSSL_BIGNUM *bn);
 WOLFSSL_API STACK_OF(WOLFSSL_X509_NAME)* wolfSSL_load_client_CA_file(const char*);
+#endif
 
 WOLFSSL_API void  wolfSSL_CTX_set_client_CA_list(WOLFSSL_CTX*,
                                                STACK_OF(WOLFSSL_X509_NAME)*);
@@ -706,6 +712,8 @@ WOLFSSL_API long wolfSSL_SSL_set_tlsext_status_ids(WOLFSSL *s, void *arg);
 WOLFSSL_API long wolfSSL_SSL_get_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char **resp);
 WOLFSSL_API long wolfSSL_SSL_set_tlsext_status_ocsp_resp(WOLFSSL *s, unsigned char *resp, int len);
 
+WOLFSSL_API void wolfSSL_CONF_modules_unload(int all);
+
 #define WOLFSSL_DEFAULT_CIPHER_LIST ""   /* default all */
 #define WOLFSSL_RSA_F4 0x10001L