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

Change the new functions to use size_t

Browse Source 
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>
This commit is contained in:
Matt Caswell 2015-05-28 11:12:54 +01:00
parent 7470cefcb2
commit 6b8f5d0d43
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/ssl/SSL_get_client_random.pod
View File

@ -8,9 +8,9 @@ SSL_get_client_random, SSL_get_server_random, SSL_SESSION_get_master_key - retri
#include <openssl/ssl.h> #include <openssl/ssl.h>
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);
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);
int SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, int outlen); int SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen);
=head1 DESCRIPTION =head1 DESCRIPTION

9
include/openssl/ssl.h
View File

@ -1652,9 +1652,12 @@ void SSL_set_state(SSL *ssl, int state);
void SSL_set_verify_result(SSL *ssl, long v); void SSL_set_verify_result(SSL *ssl, long v);
__owur long SSL_get_verify_result(const SSL *ssl); __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_client_random(const SSL *ssl, unsigned char *out,
__owur int SSL_get_server_random(const SSL *ssl, unsigned char *out, int outlen); size_t outlen);
__owur int SSL_SESSION_get_master_key(const SSL_SESSION *ssl, unsigned char *out, int 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); __owur int SSL_set_ex_data(SSL *ssl, int idx, void *data);
void *SSL_get_ex_data(const SSL *ssl, int idx); void *SSL_get_ex_data(const SSL *ssl, int idx);

18
ssl/ssl_lib.c
View File

@ -2897,9 +2897,9 @@ long SSL_get_verify_result(const SSL *ssl)
return (ssl->verify_result); 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); return sizeof(ssl->s3->client_random);
if (outlen > sizeof(ssl->s3->client_random)) if (outlen > sizeof(ssl->s3->client_random))
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); 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); return sizeof(ssl->s3->server_random);
if (outlen > sizeof(ssl->s3->server_random)) if (outlen > sizeof(ssl->s3->server_random))
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, 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; 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; outlen = session->master_key_length;
memcpy(out, session->master_key, outlen); memcpy(out, session->master_key, outlen);
return (outlen); return (outlen);