mirror of https://github.com/wolfSSL/wolfssl
Expose functions to get client/server random when `HAVE_SECRET_CALLBACK` is defined.
This commit is contained in:
parent
06966a203b
commit
f65e1f1f09
|
@ -3293,7 +3293,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if defined(OPENSSL_EXTRA) || defined(HAVE_SECRET_CALLBACK)
|
||||
printf("Session timeout set to %ld seconds\n", wolfSSL_get_timeout(ssl));
|
||||
{
|
||||
byte* rnd;
|
||||
|
@ -3329,9 +3329,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
|||
XFREE(rnd, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(OPENSSL_ALL) && !defined(NO_SESSION_CACHE)
|
||||
|
||||
#if defined(OPENSSL_EXTRA) && !defined(NO_SESSION_CACHE)
|
||||
#ifndef NO_BIO
|
||||
/* print out session to stdout */
|
||||
{
|
||||
|
@ -3344,8 +3344,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
|||
}
|
||||
wolfSSL_BIO_free(bio);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#endif /* !NO_BIO */
|
||||
#endif
|
||||
|
||||
if (doSTARTTLS && starttlsProt != NULL) {
|
||||
|
|
|
@ -2648,7 +2648,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if defined(OPENSSL_EXTRA) || defined(HAVE_SECRET_CALLBACK)
|
||||
{
|
||||
byte* rnd = NULL;
|
||||
byte* pt;
|
||||
|
|
10
src/ssl.c
10
src/ssl.c
|
@ -16516,7 +16516,8 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
|
|||
|
||||
#endif /* OPENSSL_EXTRA || HAVE_WEBSERVER */
|
||||
|
||||
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
|
||||
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \
|
||||
defined(HAVE_SECRET_CALLBACK)
|
||||
#if !defined(NO_WOLFSSL_SERVER)
|
||||
size_t wolfSSL_get_server_random(const WOLFSSL *ssl, unsigned char *out,
|
||||
size_t outSz)
|
||||
|
@ -16548,7 +16549,7 @@ size_t wolfSSL_get_server_random(const WOLFSSL *ssl, unsigned char *out,
|
|||
return size;
|
||||
}
|
||||
#endif /* !NO_WOLFSSL_SERVER */
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || HAVE_SECRET_CALLBACK */
|
||||
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if !defined(NO_WOLFSSL_SERVER)
|
||||
|
@ -16810,7 +16811,8 @@ WOLFSSL_API int wolfSSL_CTX_get_min_proto_version(WOLFSSL_CTX* ctx)
|
|||
|
||||
#endif /* OPENSSL_EXTRA */
|
||||
|
||||
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
|
||||
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \
|
||||
defined(HAVE_SECRET_CALLBACK)
|
||||
#if !defined(NO_WOLFSSL_CLIENT)
|
||||
/* Return the amount of random bytes copied over or error case.
|
||||
* ssl : ssl struct after handshake
|
||||
|
@ -16849,7 +16851,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
|
|||
return size;
|
||||
}
|
||||
#endif /* !NO_WOLFSSL_CLIENT */
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || HAVE_SECRET_CALLBACK */
|
||||
|
||||
#ifdef OPENSSL_EXTRA
|
||||
unsigned long wolfSSLeay(void)
|
||||
|
|
|
@ -3613,11 +3613,14 @@ WOLFSSL_API WOLFSSL_X509* wolfSSL_d2i_X509_REQ_bio(WOLFSSL_BIO* bio,
|
|||
WOLFSSL_API void wolfSSL_CTX_set_cert_store(WOLFSSL_CTX* ctx,
|
||||
WOLFSSL_X509_STORE* str);
|
||||
WOLFSSL_API WOLFSSL_X509_STORE* wolfSSL_CTX_get_cert_store(WOLFSSL_CTX* ctx);
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
||||
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || \
|
||||
defined(HAVE_SECRET_CALLBACK)
|
||||
WOLFSSL_API size_t wolfSSL_get_server_random(const WOLFSSL *ssl,
|
||||
unsigned char *out, size_t outlen);
|
||||
WOLFSSL_API size_t wolfSSL_get_client_random(const WOLFSSL* ssl,
|
||||
unsigned char* out, size_t outSz);
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL */
|
||||
#endif /* OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL || HAVE_SECRET_CALLBACK */
|
||||
|
||||
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)
|
||||
WOLFSSL_API size_t wolfSSL_BIO_wpending(const WOLFSSL_BIO *bio);
|
||||
|
|
Loading…
Reference in New Issue