summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_clnt.c
diff options
context:
space:
mode:
authormmcc <>2016-03-11 07:08:45 +0000
committermmcc <>2016-03-11 07:08:45 +0000
commit13f852f88b7f59607c91ef9ac8a34ae4e55e08ca (patch)
treeb799fc9672743546b69747e9e1d53d9423de380c /src/lib/libssl/d1_clnt.c
parente11a59757e997c4effb65f1ad3aa27df9dff42f5 (diff)
downloadopenbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.gz
openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.bz2
openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.zip
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'src/lib/libssl/d1_clnt.c')
-rw-r--r--src/lib/libssl/d1_clnt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index fd26bb5a1e..e018874f0d 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_clnt.c,v 1.55 2015/09/12 16:10:07 doug Exp $ */ 1/* $OpenBSD: d1_clnt.c,v 1.56 2016/03/11 07:08:45 mmcc Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -697,8 +697,7 @@ dtls1_send_client_certificate(SSL *s)
697 SSL_R_BAD_DATA_RETURNED_BY_CALLBACK); 697 SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
698 } 698 }
699 699
700 if (x509 != NULL) 700 X509_free(x509);
701 X509_free(x509);
702 EVP_PKEY_free(pkey); 701 EVP_PKEY_free(pkey);
703 if (i == 0) 702 if (i == 0)
704 s->s3->tmp.cert_req = 2; 703 s->s3->tmp.cert_req = 2;