WolfSSL
/
wolfssl-nginx
mirror of https://github.com/wolfSSL/wolfssl-nginx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use SSL_SESSION_dup

pull/13/head
Juliusz Sosinowicz 2019-11-05 22:44:55 +01:00
parent febaf4b172
commit 9d9c58e049
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nginx-1.16.1-wolfssl.patch
View File

@ -102,13 +102,12 @@ diff -ur nginx/src/event/ngx_event_openssl.c nginx-1.16.1-wolfssl/src/event/ngx_
/* /*
* OpenSSL 1.0.2+ allows configuring a curve list instead of a single * OpenSSL 1.0.2+ allows configuring a curve list instead of a single
@@ -1491,10 +1504,32 @@ @@ -1491,10 +1504,26 @@
ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess) ngx_ssl_new_client_session(ngx_ssl_conn_t *ssl_conn, ngx_ssl_session_t *sess)
{ {
ngx_connection_t *c; ngx_connection_t *c;
+#ifdef WOLFSSL_NGINX +#ifdef WOLFSSL_NGINX
+ int len; + int len;
+ unsigned char buf[NGX_SSL_MAX_SESSION_SIZE];
+#endif +#endif
c = ngx_ssl_get_connection(ssl_conn); c = ngx_ssl_get_connection(ssl_conn);
@ -122,12 +121,7 @@ diff -ur nginx/src/event/ngx_event_openssl.c nginx-1.16.1-wolfssl/src/event/ngx_
+ return -1; + return -1;
+ } + }
+ +
+ len = i2d_SSL_SESSION(sess, (unsigned char**) &buf); + if (!(sess = SSL_SESSION_dup(sess))) {
+ if (len <= 0) {
+ return -1;
+ }
+ sess = d2i_SSL_SESSION(NULL, (const unsigned char**) &buf, len);
+ if (!sess) {
+ return -1; + return -1;
+ } + }
+#endif +#endif
@ -135,7 +129,7 @@ diff -ur nginx/src/event/ngx_event_openssl.c nginx-1.16.1-wolfssl/src/event/ngx_
c->ssl->session = sess; c->ssl->session = sess;
c->ssl->save_session(c); c->ssl->save_session(c);
@@ -1566,7 +1601,9 @@ @@ -1566,7 +1595,9 @@
{ {
#ifdef TLS1_3_VERSION #ifdef TLS1_3_VERSION
if (c->ssl->session) { if (c->ssl->session) {
@ -145,7 +139,7 @@ diff -ur nginx/src/event/ngx_event_openssl.c nginx-1.16.1-wolfssl/src/event/ngx_
return c->ssl->session; return c->ssl->session;
} }
#endif #endif
@@ -3929,7 +3966,8 @@ @@ -3929,7 +3960,8 @@
return -1; return -1;
} }
@ -155,7 +149,7 @@ diff -ur nginx/src/event/ngx_event_openssl.c nginx-1.16.1-wolfssl/src/event/ngx_
if (HMAC_Init_ex(hctx, key[0].hmac_key, size, digest, NULL) != 1) { if (HMAC_Init_ex(hctx, key[0].hmac_key, size, digest, NULL) != 1) {
ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed"); ngx_ssl_error(NGX_LOG_ALERT, c->log, 0, "HMAC_Init_ex() failed");
return -1; return -1;
@@ -3973,7 +4011,8 @@ @@ -3973,7 +4005,8 @@
size = 32; size = 32;
} }