summaryrefslogtreecommitdiffstats
path: root/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-01-24 14:57:31 +0000
committerjsing <jsing@openbsd.org>2017-01-24 14:57:31 +0000
commit2da53ce5a262494b116213d78f7f70f77a590551 (patch)
tree08a54d1f04c49d31954fb8d623d2a1a9c1ebad0f /lib/libssl/t1_lib.c
parentKill some unused variables found by clang. (diff)
downloadwireguard-openbsd-2da53ce5a262494b116213d78f7f70f77a590551.tar.xz
wireguard-openbsd-2da53ce5a262494b116213d78f7f70f77a590551.zip
sk_pop_free() checks for NULL so do not bother doing it from the callers.
Diffstat (limited to 'lib/libssl/t1_lib.c')
-rw-r--r--lib/libssl/t1_lib.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c
index 23e1a2d350c..9b60d664e56 100644
--- a/lib/libssl/t1_lib.c
+++ b/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.110 2017/01/24 12:24:07 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.111 2017/01/24 14:57:31 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1593,10 +1593,8 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
}
sdata = data;
if (dsize > 0) {
- if (s->internal->tlsext_ocsp_exts) {
- sk_X509_EXTENSION_pop_free(s->internal->tlsext_ocsp_exts,
- X509_EXTENSION_free);
- }
+ sk_X509_EXTENSION_pop_free(s->internal->tlsext_ocsp_exts,
+ X509_EXTENSION_free);
s->internal->tlsext_ocsp_exts =
d2i_X509_EXTENSIONS(NULL,