|
@@ -16713,19 +16713,6 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
|
|
|
return WOLFSSL_SUCCESS;
|
|
|
}
|
|
|
|
|
|
- long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t)
|
|
|
- {
|
|
|
- word32 tmptime;
|
|
|
- if (!ses || t < 0)
|
|
|
- return BAD_FUNC_ARG;
|
|
|
-
|
|
|
- tmptime = t & 0xFFFFFFFF;
|
|
|
-
|
|
|
- ses->timeout = tmptime;
|
|
|
-
|
|
|
- return WOLFSSL_SUCCESS;
|
|
|
- }
|
|
|
-
|
|
|
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
|
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)
|
|
@@ -27060,7 +27047,8 @@ int wolfSSL_sk_SSL_COMP_num(WOLF_STACK_OF(WOLFSSL_COMP)* sk)
|
|
|
|
|
|
#endif /* OPENSSL_EXTRA */
|
|
|
|
|
|
-#if defined(OPENSSL_EXTRA) || defined(HAVE_EXT_CACHE)
|
|
|
+#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
+ defined(HAVE_EXT_CACHE))
|
|
|
/* stunnel 4.28 needs
|
|
|
*
|
|
|
* Callback that is called if a session tries to resume but could not find
|
|
@@ -27092,9 +27080,6 @@ void wolfSSL_CTX_sess_set_new_cb(WOLFSSL_CTX* ctx,
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-#endif /* OPENSSL_EXTRA || HAVE_EXT_CACHE */
|
|
|
-
|
|
|
-#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
|
|
|
void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*,
|
|
|
WOLFSSL_SESSION*))
|
|
|
{
|
|
@@ -27107,9 +27092,7 @@ void wolfSSL_CTX_sess_set_remove_cb(WOLFSSL_CTX* ctx, void (*f)(WOLFSSL_CTX*,
|
|
|
(void)f;
|
|
|
#endif
|
|
|
}
|
|
|
-#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
|
|
|
|
|
-#ifdef OPENSSL_EXTRA
|
|
|
|
|
|
/*
|
|
|
*
|
|
@@ -27479,7 +27462,6 @@ end:
|
|
|
return s;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
long wolfSSL_SESSION_get_timeout(const WOLFSSL_SESSION* sess)
|
|
|
{
|
|
|
long timeout = 0;
|
|
@@ -27499,8 +27481,20 @@ long wolfSSL_SESSION_get_time(const WOLFSSL_SESSION* sess)
|
|
|
return bornOn;
|
|
|
}
|
|
|
|
|
|
+long wolfSSL_SSL_SESSION_set_timeout(WOLFSSL_SESSION* ses, long t)
|
|
|
+{
|
|
|
+ word32 tmptime;
|
|
|
+ if (!ses || t < 0)
|
|
|
+ return BAD_FUNC_ARG;
|
|
|
|
|
|
-#endif /* OPENSSL_EXTRA */
|
|
|
+ tmptime = t & 0xFFFFFFFF;
|
|
|
+
|
|
|
+ ses->timeout = tmptime;
|
|
|
+
|
|
|
+ return WOLFSSL_SUCCESS;
|
|
|
+}
|
|
|
+
|
|
|
+#endif /* !NO_SESSION_CACHE && OPENSSL_EXTRA || HAVE_EXT_CACHE */
|
|
|
|
|
|
|
|
|
#ifdef KEEP_PEER_CERT
|
|
@@ -41961,6 +41955,8 @@ int wolfSSL_SESSION_print(WOLFSSL_BIO *bp, const WOLFSSL_SESSION *x)
|
|
|
return WOLFSSL_FAILURE;
|
|
|
#endif
|
|
|
|
|
|
+#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
+ defined(HAVE_EXT_CACHE))
|
|
|
if (wolfSSL_BIO_printf(bp, " Start Time: %ld\n",
|
|
|
wolfSSL_SESSION_get_time(x)) <= 0)
|
|
|
return WOLFSSL_FAILURE;
|
|
@@ -41968,6 +41964,7 @@ int wolfSSL_SESSION_print(WOLFSSL_BIO *bp, const WOLFSSL_SESSION *x)
|
|
|
if (wolfSSL_BIO_printf(bp, " Timeout : %ld (sec)\n",
|
|
|
wolfSSL_SESSION_get_timeout(x)) <= 0)
|
|
|
return WOLFSSL_FAILURE;
|
|
|
+#endif /* !NO_SESSION_CACHE && OPENSSL_EXTRA || HAVE_EXT_CACHE */
|
|
|
|
|
|
/* @TODO verify return code print */
|
|
|
|