From 7da46501cc4552f20c6212eeafe5b0e2cf0f4c26 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 6 Mar 2019 13:28:53 -0700
Subject: [PATCH] add certgen and certext to jni, add get timeout function

---
 configure.ac  | 10 ++++++++++
 src/ssl.c     | 11 +++++++++++
 wolfssl/ssl.h |  1 +
 3 files changed, 22 insertions(+)

diff --git a/configure.ac b/configure.ac
index 02f6bfa74..8040eeb19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3317,6 +3317,16 @@ then
     then
         ENABLED_PSK="yes"
     fi
+    if test "x$ENABLED_CERTEXT" = "xno"
+    then
+        ENABLED_CERTEXT="yes"
+        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_EXT"
+    fi
+    if test "x$ENABLED_CERTGEN" = "xno"
+    then
+        ENABLED_CERTGEN="yes"
+        AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_GEN"
+    fi
 fi
 
 # lighty Support
diff --git a/src/ssl.c b/src/ssl.c
index 2d2d11a69..a910cd1d0 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -34572,6 +34572,17 @@ long wolfSSL_SSL_CTX_get_timeout(const WOLFSSL_CTX *ctx)
     return ctx->timeout;
 }
 
+
+/* returns the time in seconds of the current timeout */
+long wolfSSL_get_timeout(WOLFSSL* ssl)
+{
+    WOLFSSL_ENTER("wolfSSL_get_timeout");
+
+    if (ssl == NULL)
+        return 0;
+    return ssl->timeout;
+}
+
 #ifdef HAVE_ECC
 int wolfSSL_SSL_CTX_set_tmp_ecdh(WOLFSSL_CTX *ctx, WOLFSSL_EC_KEY *ecdh)
 {
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 947ad3992..092e51822 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -2970,6 +2970,7 @@ WOLFSSL_API int wolfSSL_X509_NAME_digest(const WOLFSSL_X509_NAME *data,
     const WOLFSSL_EVP_MD *type, unsigned char *md, unsigned int *len);
 
 WOLFSSL_API long wolfSSL_SSL_CTX_get_timeout(const WOLFSSL_CTX *ctx);
+WOLFSSL_API long wolfSSL_get_timeout(WOLFSSL* ssl);
 WOLFSSL_API int wolfSSL_SSL_CTX_set_tmp_ecdh(WOLFSSL_CTX *ctx,
     WOLFSSL_EC_KEY *ecdh);
 WOLFSSL_API int wolfSSL_SSL_CTX_remove_session(WOLFSSL_CTX *,