diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-05-17 11:15:49 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-05-17 11:15:49 +0000 |
| commit | 673eadec2c9032e938040d5eba241baed30d2c10 (patch) | |
| tree | 62ab979cbecbc42db99dbe080f83d0a34a20878d | |
| parent | 27a186cd5daa0951cc3a83a5d37d7dc5b98d88c7 (diff) | |
| download | openssl-673eadec2c9032e938040d5eba241baed30d2c10.zip openssl-673eadec2c9032e938040d5eba241baed30d2c10.tar.gz openssl-673eadec2c9032e938040d5eba241baed30d2c10.tar.bz2 | |
Additional, more descriptive error message for rejection of a session ID
because of missing session ID context (so that application programmers
are directly pointed to what they should do differently).
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_err.c | 1 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 6 |
3 files changed, 7 insertions, 1 deletions
@@ -1365,6 +1365,7 @@ int SSL_COMP_add_compression_method(int id,char *cm); #define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216 #define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217 #define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO 218 +#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED 277 #define SSL_R_SHORT_READ 219 #define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE 220 #define SSL_R_SSL23_DOING_SESSION_ID_REUSE 221 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 358abef..3ddc805 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -318,6 +318,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {SSL_R_REUSE_CERT_LENGTH_NOT_ZERO ,"reuse cert length not zero"}, {SSL_R_REUSE_CERT_TYPE_NOT_ZERO ,"reuse cert type not zero"}, {SSL_R_REUSE_CIPHER_LIST_NOT_ZERO ,"reuse cipher list not zero"}, +{SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED ,"session id context uninitialized"}, {SSL_R_SHORT_READ ,"short read"}, {SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE,"signature for non signing certificate"}, {SSL_R_SSL23_DOING_SESSION_ID_REUSE ,"ssl23 doing session id reuse"}, diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 259725c..cac408c 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -225,7 +225,11 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len) && (!s->sid_ctx_length || ret->sid_ctx_length != s->sid_ctx_length || memcmp(ret->sid_ctx,s->sid_ctx,ret->sid_ctx_length))) { - SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT); + if (s->sid_ctx_length) + SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT); + else + /* application should have used SSL[_CTX]_set_session_id_context */ + SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED); return 0; } |