generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change return type of the new accessors

Browse Source 
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>
This commit is contained in:
Matt Caswell
2015-05-28 16:36:51 +01:00
parent 6b8f5d0d43
commit d9f1c639d5
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/ssl_lib.c
View File

@@ -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,