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/ssl_cert.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/ssl_cert.c')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 72b5d8d2bd..87dc80be20 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -180,7 +180,7 @@ CERT | |||
| 180 | { | 180 | { |
| 181 | CERT *ret; | 181 | CERT *ret; |
| 182 | 182 | ||
| 183 | ret = (CERT *)OPENSSL_malloc(sizeof(CERT)); | 183 | ret = (CERT *)malloc(sizeof(CERT)); |
| 184 | if (ret == NULL) { | 184 | if (ret == NULL) { |
| 185 | SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_MALLOC_FAILURE); | 185 | SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_MALLOC_FAILURE); |
| 186 | return (NULL); | 186 | return (NULL); |
| @@ -199,7 +199,7 @@ CERT | |||
| 199 | CERT *ret; | 199 | CERT *ret; |
| 200 | int i; | 200 | int i; |
| 201 | 201 | ||
| 202 | ret = (CERT *)OPENSSL_malloc(sizeof(CERT)); | 202 | ret = (CERT *)malloc(sizeof(CERT)); |
| 203 | if (ret == NULL) { | 203 | if (ret == NULL) { |
| 204 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE); | 204 | SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE); |
| 205 | return (NULL); | 205 | return (NULL); |
| @@ -387,7 +387,7 @@ ssl_cert_free(CERT *c) | |||
| 387 | EVP_PKEY_free(c->pkeys[i].publickey); | 387 | EVP_PKEY_free(c->pkeys[i].publickey); |
| 388 | #endif | 388 | #endif |
| 389 | } | 389 | } |
| 390 | OPENSSL_free(c); | 390 | free(c); |
| 391 | } | 391 | } |
| 392 | 392 | ||
| 393 | int | 393 | int |
| @@ -422,7 +422,7 @@ SESS_CERT | |||
| 422 | { | 422 | { |
| 423 | SESS_CERT *ret; | 423 | SESS_CERT *ret; |
| 424 | 424 | ||
| 425 | ret = OPENSSL_malloc(sizeof *ret); | 425 | ret = malloc(sizeof *ret); |
| 426 | if (ret == NULL) { | 426 | if (ret == NULL) { |
| 427 | SSLerr(SSL_F_SSL_SESS_CERT_NEW, ERR_R_MALLOC_FAILURE); | 427 | SSLerr(SSL_F_SSL_SESS_CERT_NEW, ERR_R_MALLOC_FAILURE); |
| 428 | return NULL; | 428 | return NULL; |
| @@ -483,7 +483,7 @@ ssl_sess_cert_free(SESS_CERT *sc) | |||
| 483 | EC_KEY_free(sc->peer_ecdh_tmp); | 483 | EC_KEY_free(sc->peer_ecdh_tmp); |
| 484 | #endif | 484 | #endif |
| 485 | 485 | ||
| 486 | OPENSSL_free(sc); | 486 | free(sc); |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | int | 489 | int |
