Commit 6b8f5d0d authored by Matt Caswell's avatar Matt Caswell
Browse files

Change the new functions to use size_t 



Change the new SSL_get_client_random(), SSL_get_server_random() and
SSL_SESSION_get_master_key() functions to use size_t for |outlen| instead of
int.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 7470cefc

doc/ssl/SSL_get_client_random.pod

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ SSL_get_client_random, SSL_get_server_random, SSL_SESSION_get_master_key - retri 


 #include <openssl/ssl.h>



 int SSL_get_client_random(const SSL *ssl, unsigned char *out, int outlen);

 int SSL_get_server_random(const SSL *ssl, unsigned char *out, int outlen);

 int SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, int outlen);

 int SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen);

 int SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen);

 int SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen);



=head1 DESCRIPTION

include/openssl/ssl.h

+6 −3
Original line number Diff line number Diff line
@@ -1652,9 +1652,12 @@ void SSL_set_state(SSL *ssl, int state); 
void SSL_set_verify_result(SSL *ssl, long v);

__owur long SSL_get_verify_result(const SSL *ssl);



__owur int SSL_get_client_random(const SSL *ssl, unsigned char *out, int outlen);

__owur int SSL_get_server_random(const SSL *ssl, unsigned char *out, int outlen);

__owur int SSL_SESSION_get_master_key(const SSL_SESSION *ssl, unsigned char *out, int outlen);

__owur int SSL_get_client_random(const SSL *ssl, unsigned char *out,

                                 size_t outlen);

__owur int SSL_get_server_random(const SSL *ssl, unsigned char *out,

                                 size_t outlen);

__owur int SSL_SESSION_get_master_key(const SSL_SESSION *ssl,

                                      unsigned char *out, size_t outlen);



__owur int SSL_set_ex_data(SSL *ssl, int idx, void *data);

void *SSL_get_ex_data(const SSL *ssl, int idx);

ssl/ssl_lib.c

+11 −7
Original line number Diff line number Diff line
@@ -2897,9 +2897,9 @@ long SSL_get_verify_result(const SSL *ssl) 
    return (ssl->verify_result);

}



int SSL_get_client_random(const SSL *ssl, unsigned char *out, int outlen)

int SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen)

{

    if (outlen < 0)

    if (outlen == 0)

        return sizeof(ssl->s3->client_random);

    if (outlen > sizeof(ssl->s3->client_random))

        outlen = sizeof(ssl->s3->client_random);
@@ -2907,9 +2907,9 @@ int SSL_get_client_random(const SSL *ssl, unsigned char *out, int outlen) 
    return (outlen);

}



int SSL_get_server_random(const SSL *ssl, unsigned char *out, int outlen)

int SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen)

{

    if (outlen < 0)

    if (outlen == 0)

        return sizeof(ssl->s3->server_random);

    if (outlen > sizeof(ssl->s3->server_random))

        outlen = sizeof(ssl->s3->server_random);
@@ -2918,11 +2918,15 @@ int SSL_get_server_random(const SSL *ssl, unsigned char *out, int outlen) 
}



int SSL_SESSION_get_master_key(const SSL_SESSION *session,

                               unsigned char *out, int outlen)

                               unsigned char *out, size_t outlen)

{

    if (outlen < 0)

    if (outlen == 0)

        return session->master_key_length;

    if (outlen > session->master_key_length)

    if (session->master_key_length < 0) {

        /* Should never happen */

        return 0;

    }

    if (outlen > (size_t)session->master_key_length)

        outlen = session->master_key_length;

    memcpy(out, session->master_key, outlen);

    return (outlen);