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

Changes to bring wolfssl up to date with stunnel 5.40

Browse Source
This commit is contained in:
Nickolas Lapp
2017-02-22 11:02:53 -07:00
parent aeea24a5e3
commit 2ef4525d4d
6 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/openssl/include.am
View File

@@ -32,6 +32,7 @@ nobase_include_HEADERS+= \
cyassl/openssl/rand.h \
cyassl/openssl/rsa.h \
cyassl/openssl/sha.h \
cyassl/openssl/ssl23.h \
cyassl/openssl/ssl.h \
cyassl/openssl/stack.h \
cyassl/openssl/ui.h \

3
cyassl/openssl/ssl23.h Normal file
View File

@@ -0,0 +1,3 @@
/* ssl23.h for openssl */
#include <wolfssl/openssl/sssl23.h>

2
src/ssl.c
View File

@@ -21223,7 +21223,7 @@ void wolfSSL_THREADID_set_numeric(void* id, unsigned long val)
}
WOLFSSL_X509* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ctx,
STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX* ctx,
WOLFSSL_X509_NAME* name)
{
WOLFSSL_ENTER("wolfSSL_X509_STORE_get1_certs");

1
wolfssl/openssl/include.am
View File

@@ -33,6 +33,7 @@ nobase_include_HEADERS+= \
wolfssl/openssl/rand.h \
wolfssl/openssl/rsa.h \
wolfssl/openssl/sha.h \
wolfssl/openssl/ssl23.h \
wolfssl/openssl/ssl.h \
wolfssl/openssl/stack.h \
wolfssl/openssl/ui.h \

1
wolfssl/openssl/ssl23.h Normal file
View File

@@ -0,0 +1 @@
/* ssl23.h for openssl */

4
wolfssl/ssl.h
View File

@@ -2160,8 +2160,8 @@ WOLFSSL_API void wolfSSL_THREADID_set_callback(void (*threadid_func)(void*));
WOLFSSL_API void wolfSSL_THREADID_set_numeric(void* id, unsigned long val);
WOLFSSL_API WOLFSSL_X509* wolfSSL_X509_STORE_get1_certs(WOLFSSL_X509_STORE_CTX*,
WOLFSSL_X509_NAME*);
WOLFSSL_API STACK_OF(WOLFSSL_X509)* wolfSSL_X509_STORE_get1_certs(
WOLFSSL_X509_STORE_CTX*, WOLFSSL_X509_NAME*);
WOLFSSL_API void wolfSSL_sk_X509_pop_free(STACK_OF(WOLFSSL_X509)* sk, void f (WOLFSSL_X509*));
#endif /* HAVE_STUNNEL */