From 6b8f5d0d4379c2c366c3d07e4cdbb6145abc76d1 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 28 May 2015 11:12:54 +0100 Subject: 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: Tim Hudson --- doc/ssl/SSL_get_client_random.pod | 6 +++--- include/openssl/ssl.h | 9 ++++++--- ssl/ssl_lib.c | 18 +++++++++++------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/doc/ssl/SSL_get_client_random.pod b/doc/ssl/SSL_get_client_random.pod index bec45d7e0e..75a5c33d22 100644 --- a/doc/ssl/SSL_get_client_random.pod +++ b/doc/ssl/SSL_get_client_random.pod @@ -8,9 +8,9 @@ SSL_get_client_random, SSL_get_server_random, SSL_SESSION_get_master_key - retri #include - 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 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index e52fbb5a13..261e399640 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -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); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 081f27a73e..f046770756 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -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); -- cgit v1.2.3