summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-04-21 16:49:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-04-21 16:49:00 +0000
commit82503226c024bac4227d2a0fe185e89797733a2c (patch)
treef53164b1b62dbeddf8d9e477fd533d3ee99c0564 /lib/libssl
parent4817e127ad26a595033ba6cab354efeef0c86798 (diff)
use mallocarray(a,b) instead of malloc(a*b)
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/ssl_ciph.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index 41632720be3..070d6a10e5e 100644
--- a/lib/libssl/ssl_ciph.c
+++ b/lib/libssl/ssl_ciph.c
@@ -1328,7 +1328,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
#ifdef KSSL_DEBUG
printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers);
#endif /* KSSL_DEBUG */
- co_list = (CIPHER_ORDER *)malloc(sizeof(CIPHER_ORDER) * num_of_ciphers);
+ co_list = mallocarray(num_of_ciphers, sizeof(CIPHER_ORDER));
if (co_list == NULL) {
SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
return(NULL); /* Failure */
@@ -1390,7 +1390,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
*/
num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER);
num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1;
- ca_list = malloc(sizeof(SSL_CIPHER *) * num_of_alias_max);
+ ca_list = mallocarray(num_of_alias_max, sizeof(SSL_CIPHER *));
if (ca_list == NULL) {
free(co_list);
SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);