summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-05-28 16:36:51 +0100
committerMatt Caswell <matt@openssl.org>2015-05-28 16:55:15 +0100
commitd9f1c639d5162617ab0aeec23865771dc4fbcbcd (patch)
tree571e941976f42255a6457469f8198b5320eece07 /ssl
parent6b8f5d0d4379c2c366c3d07e4cdbb6145abc76d1 (diff)
Change return type of the new accessors
The new accessors SSL_get_client_random, SSL_get_server_random and SSL_SESSION_get_master_key should return a size_t to match the type of the |outlen| parameter. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_lib.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index f046770756..1ce4f36cc9 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2897,39 +2897,39 @@ long SSL_get_verify_result(const SSL *ssl)
return (ssl->verify_result);
}
-int SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen)
+size_t SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen)
{
if (outlen == 0)
return sizeof(ssl->s3->client_random);
if (outlen > sizeof(ssl->s3->client_random))
outlen = sizeof(ssl->s3->client_random);
memcpy(out, ssl->s3->client_random, outlen);
- return (outlen);
+ return outlen;
}
-int SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen)
+size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen)
{
if (outlen == 0)
return sizeof(ssl->s3->server_random);
if (outlen > sizeof(ssl->s3->server_random))
outlen = sizeof(ssl->s3->server_random);
memcpy(out, ssl->s3->server_random, outlen);
- return (outlen);
+ return outlen;
}
-int SSL_SESSION_get_master_key(const SSL_SESSION *session,
+size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,
unsigned char *out, size_t outlen)
{
- if (outlen == 0)
- return session->master_key_length;
if (session->master_key_length < 0) {
/* Should never happen */
return 0;
}
+ if (outlen == 0)
+ return session->master_key_length;
if (outlen > (size_t)session->master_key_length)
outlen = session->master_key_length;
memcpy(out, session->master_key, outlen);
- return (outlen);
+ return outlen;
}
int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,