diff options
| author | Todd Short <tshort@akamai.com> | 2019-07-15 09:55:13 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-07-16 13:58:18 +0100 |
| commit | 686ead4537ade69368ebf87679397105aee5d5c8 (patch) | |
| tree | 30b44b5c3d9a282d6716d2f0f4e55c925f786060 | |
| parent | 2b7efbd03295f8a345b63acd212e22cb5a3d19df (diff) | |
Fix SSL_CTX_set_session_id_context() docs
Also, use define rather than sizeof
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9377)
(cherry picked from commit fe9edc9d39c96c965efc4fde12ddf7fa8a852025)
| -rw-r--r-- | doc/man3/SSL_CTX_set_session_id_context.pod | 4 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/man3/SSL_CTX_set_session_id_context.pod b/doc/man3/SSL_CTX_set_session_id_context.pod index d83235091c..9270b101cb 100644 --- a/doc/man3/SSL_CTX_set_session_id_context.pod +++ b/doc/man3/SSL_CTX_set_session_id_context.pod @@ -42,7 +42,7 @@ OpenSSL clients will check the session id context returned by the server when reusing a session. The maximum length of the B<sid_ctx> is limited to -B<SSL_MAX_SSL_SESSION_ID_LENGTH>. +B<SSL_MAX_SID_CTX_LENGTH>. =head1 WARNINGS @@ -67,7 +67,7 @@ return the following values: =item Z<>0 The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded -the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error +the maximum allowed length of B<SSL_MAX_SID_CTX_LENGTH>. The error is logged to the error stack. =item Z<>1 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 4e945dce5e..ac820cf9fe 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -872,7 +872,7 @@ int SSL_up_ref(SSL *s) int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx, unsigned int sid_ctx_len) { - if (sid_ctx_len > sizeof(ctx->sid_ctx)) { + if (sid_ctx_len > SSL_MAX_SID_CTX_LENGTH) { SSLerr(SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG); return 0; |