diff options
| author |   beck <beck@openbsd.org> | 2014-04-17 13:37:48 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2014-04-17 13:37:48 +0000 |
| commit | 6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54 (patch) | |
| tree | e7ca531f41f3403bf7f04411c40317e859a02460 /lib/libssl/src/ssl/d1_srvr.c | |
| parent | Revert unintended whitespace changes. (diff) | |
| download | wireguard-openbsd-6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54.tar.xz wireguard-openbsd-6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54.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 'lib/libssl/src/ssl/d1_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index 6040dd96ca8..9b87dcd0676 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1188,7 +1188,7 @@ dtls1_send_server_key_exchange(SSL *s) NULL, 0, NULL); encodedPoint = (unsigned char *) - OPENSSL_malloc(encodedlen*sizeof(unsigned char)); + malloc(encodedlen*sizeof(unsigned char)); bn_ctx = BN_CTX_new(); if ((encodedPoint == NULL) || (bn_ctx == NULL)) { @@ -1289,7 +1289,7 @@ dtls1_send_server_key_exchange(SSL *s) memcpy((unsigned char*)p, (unsigned char *)encodedPoint, encodedlen); - OPENSSL_free(encodedPoint); + free(encodedPoint); p += encodedlen; } #endif @@ -1398,7 +1398,7 @@ f_err: err: #ifndef OPENSSL_NO_ECDH if (encodedPoint != NULL) - OPENSSL_free(encodedPoint); + free(encodedPoint); BN_CTX_free(bn_ctx); #endif EVP_MD_CTX_cleanup(&md_ctx); @@ -1564,7 +1564,7 @@ dtls1_send_newsession_ticket(SSL *s) DTLS1_HM_HEADER_LENGTH + 22 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + slen)) return -1; - senc = OPENSSL_malloc(slen); + senc = malloc(slen); if (!senc) return -1; p = senc; @@ -1580,7 +1580,7 @@ dtls1_send_newsession_ticket(SSL *s) if (tctx->tlsext_ticket_key_cb) { if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx, &hctx, 1) < 0) { - OPENSSL_free(senc); + free(senc); return -1; } } else { @@ -1624,7 +1624,7 @@ dtls1_send_newsession_ticket(SSL *s) s->init_num = len; s->state = SSL3_ST_SW_SESSION_TICKET_B; s->init_off = 0; - OPENSSL_free(senc); + free(senc); /* XDTLS: set message header ? */ msg_len = s->init_num - DTLS1_HM_HEADER_LENGTH; |