feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4817 from julek-wolfssl/ZD13495

Browse Source 
ZD13495
This commit is contained in:
David Garske
2022-02-02 15:54:08 -08:00
committed by GitHub
parent 28d3292a16 d5b294edc4
commit 17eee2ba0c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ssl.c
View File

@ -18916,9 +18916,12 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
const char* wolfSSLeay_version(int type) const char* wolfSSLeay_version(int type)
{ {
static const char* version = "SSLeay wolfSSL compatibility";
(void)type; (void)type;
return version; #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
return wolfSSL_OpenSSL_version(type);
#else
return wolfSSL_OpenSSL_version();
#endif
} }

8
wolfssl/openssl/crypto.h
View File

@ -47,6 +47,10 @@ typedef void (CRYPTO_free_func)(void* parent, void* ptr, CRYPTO_EX_DATA* ad, int
#include "prefix_crypto.h" #include "prefix_crypto.h"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
WOLFSSL_API const char* wolfSSLeay_version(int type); WOLFSSL_API const char* wolfSSLeay_version(int type);
WOLFSSL_API unsigned long wolfSSLeay(void); WOLFSSL_API unsigned long wolfSSLeay(void);
WOLFSSL_API unsigned long wolfSSL_OpenSSL_version_num(void); WOLFSSL_API unsigned long wolfSSL_OpenSSL_version_num(void);
@ -126,4 +130,8 @@ WOLFSSL_API int wolfSSL_OPENSSL_init_crypto(word64 opts, const OPENSSL_INIT_SETT
#endif /* OPENSSL_ALL || HAVE_STUNNEL || WOLFSSL_NGINX || WOLFSSL_HAPROXY || HAVE_EX_DATA */ #endif /* OPENSSL_ALL || HAVE_STUNNEL || WOLFSSL_NGINX || WOLFSSL_HAPROXY || HAVE_EX_DATA */
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* header */ #endif /* header */