The branch master has been updated
via 5bd05e579994c756cd994b5e0ff5f395aae6bfff (commit)
via e29bb83479cc567b4bb414dc55148ec06a30a115 (commit)
from b15d5ab617e3caed0489588a33eb804824b2f7d6 (commit)
- Log -----------------------------------------------------------------
commit 5bd05e579994c756cd994b5e0ff5f395aae6bfff
Author: Lingmo Zhu <[email protected]>
Date: Wed Aug 2 20:55:40 2017 +0800
remove horrible pragma macro and remove __owur from SSL_CTX_add_session()
declaration
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4014)
commit e29bb83479cc567b4bb414dc55148ec06a30a115
Author: Lingmo Zhu <[email protected]>
Date: Tue Jul 25 18:00:44 2017 +0800
Remove the obsolete misleading comment and code related to it.
The comment "The following should not return 1, otherwise, things
are very strange" is from the very first commit of OpenSSL. The
really meaning of the comment is if the identical session can be
found from internal cache after calling get_session_cb but not
found before calling get_session_cb, it is just strange.
The value 1 was originated from the old doc of SSLeay, reversed
from the actual return value of SSL_CTX_add_session().
Anyway either return value of SSL_CTX_add_session() should not
interrupt the session resumption process. So the checking of
return value of SSL_CTX_add_session() is not necessary.
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4014)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/ssl.h | 2 +-
ssl/ssl_sess.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index c634937..245f5eb 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1559,7 +1559,7 @@ int SSL_SESSION_up_ref(SSL_SESSION *ses);
void SSL_SESSION_free(SSL_SESSION *ses);
__owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
-__owur int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
+int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
__owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
__owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index a1d2013..805a3d7 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -545,11 +545,11 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello,
int *al)
(s->session_ctx->session_cache_mode &
SSL_SESS_CACHE_NO_INTERNAL_STORE)) {
/*
- * The following should not return 1, otherwise, things are
- * very strange
+ * Either return value of SSL_CTX_add_session should not
+ * interrupt the session resumption process. The return
+ * value is intentionally ignored.
*/
- if (SSL_CTX_add_session(s->session_ctx, ret))
- goto err;
+ SSL_CTX_add_session(s->session_ctx, ret);
}
}
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
