Merge pull request #1159 from cconlon/session_cache

exclude wolfSSL_SSL_get0_session when NO_SESSION_CACHE is defined
This commit is contained in:
dgarske
2017-09-25 15:20:27 -07:00
committed by GitHub
2 changed files with 7 additions and 1 deletions

View File

@@ -25030,6 +25030,8 @@ int wolfSSL_SSL_in_init(WOLFSSL *s)
return s->options.acceptState < ACCEPT_THIRD_REPLY_DONE;
}
#ifndef NO_SESSION_CACHE
WOLFSSL_SESSION *wolfSSL_SSL_get0_session(const WOLFSSL *ssl)
{
WOLFSSL_SESSION *session;
@@ -25049,6 +25051,8 @@ WOLFSSL_SESSION *wolfSSL_SSL_get0_session(const WOLFSSL *ssl)
return session;
}
#endif /* NO_SESSION_CACHE */
int wolfSSL_X509_check_host(X509 *x, const char *chk, size_t chklen,
unsigned int flags, char **peername)
{

View File

@@ -2384,7 +2384,9 @@ WOLFSSL_API WOLFSSL_BIO *wolfSSL_SSL_get_rbio(const WOLFSSL *s);
WOLFSSL_API WOLFSSL_BIO *wolfSSL_SSL_get_wbio(const WOLFSSL *s);
WOLFSSL_API int wolfSSL_SSL_do_handshake(WOLFSSL *s);
WOLFSSL_API int wolfSSL_SSL_in_init(WOLFSSL *a); /* #define in OpenSSL */
WOLFSSL_API WOLFSSL_SESSION *wolfSSL_SSL_get0_session(const WOLFSSL *s);
#ifndef NO_SESSION_CACHE
WOLFSSL_API WOLFSSL_SESSION *wolfSSL_SSL_get0_session(const WOLFSSL *s);
#endif
WOLFSSL_API int wolfSSL_X509_check_host(WOLFSSL_X509 *x, const char *chk,
size_t chklen, unsigned int flags, char **peername);