commit 5cb3308e5fa16a43c52e5230f8e38017933bbfad
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 06 18:06:26 2015 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon May 11 12:33:27 2015 +0200
tree 5e4e774b14133eb4721871ce498e73dbdbbf62f6
parent ae319149907137aaeb491b53c2f5fb1217433c25

Merge contexts for session cache

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index c537fe4..fd2ee93 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2475,7 +2475,7 @@
 #endif
         ssl->session_negotiate->length != 0 &&
         ssl->conf->f_get_cache != NULL &&
-        ssl->conf->f_get_cache( ssl->conf->p_get_cache, ssl->session_negotiate ) == 0 )
+        ssl->conf->f_get_cache( ssl->conf->p_cache, ssl->session_negotiate ) == 0 )
     {
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "session successfully restored from cache" ) );
         ssl->handshake->resume = 1;

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c0f5292..85aa276 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4575,7 +4575,7 @@
         ssl->session->length != 0 &&
         resume == 0 )
     {
-        if( ssl->conf->f_set_cache( ssl->conf->p_set_cache, ssl->session ) != 0 )
+        if( ssl->conf->f_set_cache( ssl->conf->p_cache, ssl->session ) != 0 )
             MBEDTLS_SSL_DEBUG_MSG( 1, ( "cache did not store session" ) );
     }
 
@@ -5245,13 +5245,13 @@
 
 #if defined(MBEDTLS_SSL_SRV_C)
 void mbedtls_ssl_set_session_cache( mbedtls_ssl_config *conf,
-        int (*f_get_cache)(void *, mbedtls_ssl_session *), void *p_get_cache,
-        int (*f_set_cache)(void *, const mbedtls_ssl_session *), void *p_set_cache )
+        void *p_cache,
+        int (*f_get_cache)(void *, mbedtls_ssl_session *),
+        int (*f_set_cache)(void *, const mbedtls_ssl_session *) )
 {
+    conf->p_cache = p_cache;
     conf->f_get_cache = f_get_cache;
-    conf->p_get_cache = p_get_cache;
     conf->f_set_cache = f_set_cache;
-    conf->p_set_cache = p_set_cache;
 }
 #endif /* MBEDTLS_SSL_SRV_C */