diff options
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r-- | src/lib/libcrypto/x509/by_file.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c index 68920271fc..377b3b0a8b 100644 --- a/src/lib/libcrypto/x509/by_file.c +++ b/src/lib/libcrypto/x509/by_file.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: by_file.c,v 1.19 2015/04/11 16:03:21 deraadt Exp $ */ | 1 | /* $OpenBSD: by_file.c,v 1.20 2016/03/11 07:08:45 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -172,8 +172,7 @@ X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) | |||
172 | goto err; | 172 | goto err; |
173 | } | 173 | } |
174 | err: | 174 | err: |
175 | if (x != NULL) | 175 | X509_free(x); |
176 | X509_free(x); | ||
177 | BIO_free(in); | 176 | BIO_free(in); |
178 | return (ret); | 177 | return (ret); |
179 | } | 178 | } |
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c index c9950adb27..5c043aa7b1 100644 --- a/src/lib/libcrypto/x509/x509_vfy.c +++ b/src/lib/libcrypto/x509/x509_vfy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vfy.c,v 1.48 2015/12/14 03:38:13 beck Exp $ */ | 1 | /* $OpenBSD: x509_vfy.c,v 1.49 2016/03/11 07:08:45 mmcc Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -388,8 +388,7 @@ end: | |||
388 | } | 388 | } |
389 | if (sktmp != NULL) | 389 | if (sktmp != NULL) |
390 | sk_X509_free(sktmp); | 390 | sk_X509_free(sktmp); |
391 | if (chain_ss != NULL) | 391 | X509_free(chain_ss); |
392 | X509_free(chain_ss); | ||
393 | return ok; | 392 | return ok; |
394 | } | 393 | } |
395 | 394 | ||