summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s3_clnt.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2015-06-24 09:44:18 +0000
committerjsing <jsing@openbsd.org>2015-06-24 09:44:18 +0000
commit9b57e2683c5329a908cacd52627dfcb3f67331dc (patch)
tree5e1fb2305eddd66461014dae48e4adb2e4789fac /lib/libssl/src/ssl/s3_clnt.c
parentIncrement if_ipackets in if_input(). (diff)
downloadwireguard-openbsd-9b57e2683c5329a908cacd52627dfcb3f67331dc.tar.xz
wireguard-openbsd-9b57e2683c5329a908cacd52627dfcb3f67331dc.zip
Stop using BUF_memdup() within the LibreSSL code base - it is correctly
spelt malloc+memcpy, which is what is used in all except two places. ok deraadt@ doug@
Diffstat (limited to 'lib/libssl/src/ssl/s3_clnt.c')
-rw-r--r--lib/libssl/src/ssl/s3_clnt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/s3_clnt.c b/lib/libssl/src/ssl/s3_clnt.c
index 0ef17d0067c..cf8b2ec41d0 100644
--- a/lib/libssl/src/ssl/s3_clnt.c
+++ b/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.113 2015/06/20 18:19:56 doug Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.114 2015/06/24 09:44:18 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1815,13 +1815,13 @@ ssl3_get_cert_status(SSL *s)
goto f_err;
}
free(s->tlsext_ocsp_resp);
- s->tlsext_ocsp_resp = BUF_memdup(p, resplen);
- if (!s->tlsext_ocsp_resp) {
+ if ((s->tlsext_ocsp_resp = malloc(resplen)) == NULL) {
al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,
ERR_R_MALLOC_FAILURE);
goto f_err;
}
+ memcpy(s->tlsext_ocsp_resp, p, resplen);
s->tlsext_ocsp_resplen = resplen;
if (s->ctx->tlsext_status_cb) {
int ret;