Commit 725b0f1e authored by Matt Caswell's avatar Matt Caswell
Browse files

Make the input parameters for SSL_SESSION_set1_master_key const 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
parent 8ead6158

doc/man3/SSL_get_client_random.pod

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ SSL_SESSION_set1_master_key 
 size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen);

 size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,

                                   unsigned char *out, size_t outlen);

 int SSL_SESSION_set1_master_key(SSL_SESSION *sess, unsigned char *in,

 int SSL_SESSION_set1_master_key(SSL_SESSION *sess, const unsigned char *in,

                                 size_t len);



=head1 DESCRIPTION

include/openssl/ssl.h

+2 −2
Original line number Diff line number Diff line
@@ -1865,8 +1865,8 @@ __owur size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, 
                                    size_t outlen);

__owur size_t SSL_SESSION_get_master_key(const SSL_SESSION *ssl,

                                         unsigned char *out, size_t outlen);

__owur int SSL_SESSION_set1_master_key(SSL_SESSION *sess, unsigned char *in,

                                       size_t len);

__owur int SSL_SESSION_set1_master_key(SSL_SESSION *sess,

                                       const unsigned char *in, size_t len);



#define SSL_get_ex_new_index(l, p, newf, dupf, freef) \

    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef)

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3725,7 +3725,7 @@ size_t SSL_SESSION_get_master_key(const SSL_SESSION *session, 
    return outlen;

}



int SSL_SESSION_set1_master_key(SSL_SESSION *sess, unsigned char *in,

int SSL_SESSION_set1_master_key(SSL_SESSION *sess, const unsigned char *in,

                                size_t len)

{

    if (len > sizeof(sess->master_key))