summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordoug <>2015-07-19 01:20:32 +0000
committerdoug <>2015-07-19 01:20:32 +0000
commit6eefebebc0f30c7c04beee4f7b4703963c7648ba (patch)
treeeb49fecfb196ce1e5e23087aae8263a97a5ff794 /src
parent7a2e64eeeffefed2770f554b98a86cd1f9ff4e80 (diff)
downloadopenbsd-6eefebebc0f30c7c04beee4f7b4703963c7648ba.tar.gz
openbsd-6eefebebc0f30c7c04beee4f7b4703963c7648ba.tar.bz2
openbsd-6eefebebc0f30c7c04beee4f7b4703963c7648ba.zip
Remove case that can never happen.
It's a little convoluted due to gotos, but at that point, pci is always NULL. Spotted by Coverity 21702. ok miod@ beck@ bcook@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509v3/v3_pci.c6
-rw-r--r--src/lib/libssl/src/crypto/x509v3/v3_pci.c6
2 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c
index d3f73352d9..d19f5a6e61 100644
--- a/src/lib/libcrypto/x509v3/v3_pci.c
+++ b/src/lib/libcrypto/x509v3/v3_pci.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_pci.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ 1/* $OpenBSD: v3_pci.c,v 1.9 2015/07/19 01:20:32 doug Exp $ */
2/* Contributed to the OpenSSL Project 2004 2/* Contributed to the OpenSSL Project 2004
3 * by Richard Levitte (richard@levitte.org) 3 * by Richard Levitte (richard@levitte.org)
4 */ 4 */
@@ -317,10 +317,6 @@ err:
317 ASN1_OCTET_STRING_free(policy); 317 ASN1_OCTET_STRING_free(policy);
318 policy = NULL; 318 policy = NULL;
319 } 319 }
320 if (pci) {
321 PROXY_CERT_INFO_EXTENSION_free(pci);
322 pci = NULL;
323 }
324end: 320end:
325 sk_CONF_VALUE_pop_free(vals, X509V3_conf_free); 321 sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
326 return pci; 322 return pci;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_pci.c b/src/lib/libssl/src/crypto/x509v3/v3_pci.c
index d3f73352d9..d19f5a6e61 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_pci.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_pci.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_pci.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */ 1/* $OpenBSD: v3_pci.c,v 1.9 2015/07/19 01:20:32 doug Exp $ */
2/* Contributed to the OpenSSL Project 2004 2/* Contributed to the OpenSSL Project 2004
3 * by Richard Levitte (richard@levitte.org) 3 * by Richard Levitte (richard@levitte.org)
4 */ 4 */
@@ -317,10 +317,6 @@ err:
317 ASN1_OCTET_STRING_free(policy); 317 ASN1_OCTET_STRING_free(policy);
318 policy = NULL; 318 policy = NULL;
319 } 319 }
320 if (pci) {
321 PROXY_CERT_INFO_EXTENSION_free(pci);
322 pci = NULL;
323 }
324end: 320end:
325 sk_CONF_VALUE_pop_free(vals, X509V3_conf_free); 321 sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
326 return pci; 322 return pci;