diff options
| author | beck <> | 2014-04-17 13:37:50 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-17 13:37:50 +0000 |
| commit | 6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd (patch) | |
| tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libssl/d1_clnt.c | |
| parent | 4d13fb9c7b5ac7311d7031173c21ab0121388413 (diff) | |
| download | openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.gz openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.bz2 openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.zip | |
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
| -rw-r--r-- | src/lib/libssl/d1_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 1b7cbaec15..3f159eed26 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c | |||
| @@ -1317,7 +1317,7 @@ dtls1_send_client_key_exchange(SSL *s) | |||
| 1317 | NULL, 0, NULL); | 1317 | NULL, 0, NULL); |
| 1318 | 1318 | ||
| 1319 | encodedPoint = (unsigned char *) | 1319 | encodedPoint = (unsigned char *) |
| 1320 | OPENSSL_malloc(encoded_pt_len * | 1320 | malloc(encoded_pt_len * |
| 1321 | sizeof(unsigned char)); | 1321 | sizeof(unsigned char)); |
| 1322 | 1322 | ||
| 1323 | bn_ctx = BN_CTX_new(); | 1323 | bn_ctx = BN_CTX_new(); |
| @@ -1347,7 +1347,7 @@ dtls1_send_client_key_exchange(SSL *s) | |||
| 1347 | /* Free allocated memory */ | 1347 | /* Free allocated memory */ |
| 1348 | BN_CTX_free(bn_ctx); | 1348 | BN_CTX_free(bn_ctx); |
| 1349 | if (encodedPoint != NULL) | 1349 | if (encodedPoint != NULL) |
| 1350 | OPENSSL_free(encodedPoint); | 1350 | free(encodedPoint); |
| 1351 | if (clnt_ecdh != NULL) | 1351 | if (clnt_ecdh != NULL) |
| 1352 | EC_KEY_free(clnt_ecdh); | 1352 | EC_KEY_free(clnt_ecdh); |
| 1353 | EVP_PKEY_free(srvr_pub_pkey); | 1353 | EVP_PKEY_free(srvr_pub_pkey); |
| @@ -1393,7 +1393,7 @@ dtls1_send_client_key_exchange(SSL *s) | |||
| 1393 | s2n(psk_len, t); | 1393 | s2n(psk_len, t); |
| 1394 | 1394 | ||
| 1395 | if (s->session->psk_identity_hint != NULL) | 1395 | if (s->session->psk_identity_hint != NULL) |
| 1396 | OPENSSL_free(s->session->psk_identity_hint); | 1396 | free(s->session->psk_identity_hint); |
| 1397 | s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint); | 1397 | s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint); |
| 1398 | if (s->ctx->psk_identity_hint != NULL && | 1398 | if (s->ctx->psk_identity_hint != NULL && |
| 1399 | s->session->psk_identity_hint == NULL) { | 1399 | s->session->psk_identity_hint == NULL) { |
| @@ -1403,7 +1403,7 @@ dtls1_send_client_key_exchange(SSL *s) | |||
| 1403 | } | 1403 | } |
| 1404 | 1404 | ||
| 1405 | if (s->session->psk_identity != NULL) | 1405 | if (s->session->psk_identity != NULL) |
| 1406 | OPENSSL_free(s->session->psk_identity); | 1406 | free(s->session->psk_identity); |
| 1407 | s->session->psk_identity = BUF_strdup(identity); | 1407 | s->session->psk_identity = BUF_strdup(identity); |
| 1408 | if (s->session->psk_identity == NULL) { | 1408 | if (s->session->psk_identity == NULL) { |
| 1409 | SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE, | 1409 | SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE, |
| @@ -1460,7 +1460,7 @@ err: | |||
| 1460 | #ifndef OPENSSL_NO_ECDH | 1460 | #ifndef OPENSSL_NO_ECDH |
| 1461 | BN_CTX_free(bn_ctx); | 1461 | BN_CTX_free(bn_ctx); |
| 1462 | if (encodedPoint != NULL) | 1462 | if (encodedPoint != NULL) |
| 1463 | OPENSSL_free(encodedPoint); | 1463 | free(encodedPoint); |
| 1464 | if (clnt_ecdh != NULL) | 1464 | if (clnt_ecdh != NULL) |
| 1465 | EC_KEY_free(clnt_ecdh); | 1465 | EC_KEY_free(clnt_ecdh); |
| 1466 | EVP_PKEY_free(srvr_pub_pkey); | 1466 | EVP_PKEY_free(srvr_pub_pkey); |
