Commit 686ead45 authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Fix SSL_CTX_set_session_id_context() docs 



Also, use define rather than sizeof

Reviewed-by: default avatarTomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9377)

(cherry picked from commit fe9edc9d39c96c965efc4fde12ddf7fa8a852025)
parent 2b7efbd0

doc/man3/SSL_CTX_set_session_id_context.pod

+2 −2
Original line number Diff line number Diff line
@@ -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

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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;