summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorderaadt <>2014-04-21 16:48:59 +0000
committerderaadt <>2014-04-21 16:48:59 +0000
commitfd7ee4f098b5b70e38ec12a3ba7875821d79748f (patch)
tree18a6250bead3fb727ac586b1ce7e7e6f945f71c0 /src
parent852fcec6fe7cfa5d7c83e2f494208588dd4b4031 (diff)
downloadopenbsd-fd7ee4f098b5b70e38ec12a3ba7875821d79748f.tar.gz
openbsd-fd7ee4f098b5b70e38ec12a3ba7875821d79748f.tar.bz2
openbsd-fd7ee4f098b5b70e38ec12a3ba7875821d79748f.zip
use mallocarray(a,b) instead of malloc(a*b)
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c4
-rw-r--r--src/lib/libssl/ssl_ciph.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 41632720be..070d6a10e5 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1328,7 +1328,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1328#ifdef KSSL_DEBUG 1328#ifdef KSSL_DEBUG
1329 printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers); 1329 printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers);
1330#endif /* KSSL_DEBUG */ 1330#endif /* KSSL_DEBUG */
1331 co_list = (CIPHER_ORDER *)malloc(sizeof(CIPHER_ORDER) * num_of_ciphers); 1331 co_list = mallocarray(num_of_ciphers, sizeof(CIPHER_ORDER));
1332 if (co_list == NULL) { 1332 if (co_list == NULL) {
1333 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); 1333 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
1334 return(NULL); /* Failure */ 1334 return(NULL); /* Failure */
@@ -1390,7 +1390,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1390 */ 1390 */
1391 num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER); 1391 num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER);
1392 num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1; 1392 num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1;
1393 ca_list = malloc(sizeof(SSL_CIPHER *) * num_of_alias_max); 1393 ca_list = mallocarray(num_of_alias_max, sizeof(SSL_CIPHER *));
1394 if (ca_list == NULL) { 1394 if (ca_list == NULL) {
1395 free(co_list); 1395 free(co_list);
1396 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); 1396 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 41632720be..070d6a10e5 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1328,7 +1328,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1328#ifdef KSSL_DEBUG 1328#ifdef KSSL_DEBUG
1329 printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers); 1329 printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers);
1330#endif /* KSSL_DEBUG */ 1330#endif /* KSSL_DEBUG */
1331 co_list = (CIPHER_ORDER *)malloc(sizeof(CIPHER_ORDER) * num_of_ciphers); 1331 co_list = mallocarray(num_of_ciphers, sizeof(CIPHER_ORDER));
1332 if (co_list == NULL) { 1332 if (co_list == NULL) {
1333 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); 1333 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
1334 return(NULL); /* Failure */ 1334 return(NULL); /* Failure */
@@ -1390,7 +1390,7 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1390 */ 1390 */
1391 num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER); 1391 num_of_group_aliases = sizeof(cipher_aliases) / sizeof(SSL_CIPHER);
1392 num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1; 1392 num_of_alias_max = num_of_ciphers + num_of_group_aliases + 1;
1393 ca_list = malloc(sizeof(SSL_CIPHER *) * num_of_alias_max); 1393 ca_list = mallocarray(num_of_alias_max, sizeof(SSL_CIPHER *));
1394 if (ca_list == NULL) { 1394 if (ca_list == NULL) {
1395 free(co_list); 1395 free(co_list);
1396 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); 1396 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);