wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2399 from dgarske/ovs

Browse Source 
Compatibility changes for OpenVSwitch
This commit is contained in:
toddouska
2019-09-09 16:02:27 -07:00
committed by GitHub
parent 95d3289fa2 c0317ad198
commit 99252cc936
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@ -2857,6 +2857,20 @@ int wolfSSL_get_alert_history(WOLFSSL* ssl, WOLFSSL_ALERT_HISTORY *h)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#ifdef OPENSSL_EXTRA
/* returns SSL_WRITING, SSL_READING or SSL_NOTHING */
int wolfSSL_want(WOLFSSL* ssl)
{
int rw_state = SSL_NOTHING;
if (ssl) {
if (ssl->error == WANT_READ)
rw_state = SSL_READING;
else if (ssl->error == WANT_WRITE)
rw_state = SSL_WRITING;
}
return rw_state;
}
#endif
/* return TRUE if current error is want read */ /* return TRUE if current error is want read */
int wolfSSL_want_read(WOLFSSL* ssl) int wolfSSL_want_read(WOLFSSL* ssl)

1
wolfssl/openssl/ssl.h
View File

@ -626,6 +626,7 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_BIT_STRING;
#define SSL_get_peer_certificate wolfSSL_get_peer_certificate #define SSL_get_peer_certificate wolfSSL_get_peer_certificate
#define SSL_get_peer_cert_chain wolfSSL_get_peer_cert_chain #define SSL_get_peer_cert_chain wolfSSL_get_peer_cert_chain
#define SSL_want wolfSSL_want
#define SSL_want_read wolfSSL_want_read #define SSL_want_read wolfSSL_want_read
#define SSL_want_write wolfSSL_want_write #define SSL_want_write wolfSSL_want_write

12
wolfssl/ssl.h
View File

@ -1249,6 +1249,7 @@ enum {
SSL_OP_TLS_ROLLBACK_BUG = 0x00000200, SSL_OP_TLS_ROLLBACK_BUG = 0x00000200,
SSL_OP_ALL = 0x00000400, SSL_OP_ALL = 0x00000400,
SSL_OP_EPHEMERAL_RSA = 0x00000800, SSL_OP_EPHEMERAL_RSA = 0x00000800,
SSL_OP_NO_SSLv2 = 0x00000000, /* N/A */
SSL_OP_NO_SSLv3 = 0x00001000, SSL_OP_NO_SSLv3 = 0x00001000,
SSL_OP_NO_TLSv1 = 0x00002000, SSL_OP_NO_TLSv1 = 0x00002000,
SSL_OP_PKCS1_CHECK_1 = 0x00004000, SSL_OP_PKCS1_CHECK_1 = 0x00004000,
@ -1269,6 +1270,14 @@ enum {
SSL_OP_NO_TLSv1_3 = 0x20000000, SSL_OP_NO_TLSv1_3 = 0x20000000,
}; };
#define SSL_OP_NO_SSL_MASK (SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | \
SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3)
#define SSL_NOTHING 1
#define SSL_WRITING 2
#define SSL_READING 3
enum { enum {
#ifdef HAVE_OCSP #ifdef HAVE_OCSP
/* OCSP Flags */ /* OCSP Flags */
@ -1616,6 +1625,9 @@ WOLFSSL_API int wolfSSL_CTX_set_session_id_context(WOLFSSL_CTX*,
WOLFSSL_API WOLFSSL_X509* wolfSSL_get_peer_certificate(WOLFSSL* ssl); WOLFSSL_API WOLFSSL_X509* wolfSSL_get_peer_certificate(WOLFSSL* ssl);
WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL*); WOLFSSL_API WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL*);
#ifdef OPENSSL_EXTRA
WOLFSSL_API int wolfSSL_want(WOLFSSL*);
#endif
WOLFSSL_API int wolfSSL_want_read(WOLFSSL*); WOLFSSL_API int wolfSSL_want_read(WOLFSSL*);
WOLFSSL_API int wolfSSL_want_write(WOLFSSL*); WOLFSSL_API int wolfSSL_want_write(WOLFSSL*);