diff options
| author | Matt Caswell <matt@openssl.org> | 2015-05-28 11:12:54 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-28 16:05:56 +0100 |
| commit | 6b8f5d0d4379c2c366c3d07e4cdbb6145abc76d1 (patch) | |
| tree | 6bbdd2a7dc6e3ea63ad9e936cc6e1229ce77b503 /ssl | |
| parent | 7470cefcb249ea37f97c65e64628c1994725462d (diff) | |
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 <tjh@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 18 |
1 files changed, 11 insertions, 7 deletions
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); |