diff options
| author | June McEnroe <june@causal.agency> | 2022-02-27 10:28:40 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-02-27 11:12:26 -0500 |
| commit | 9c718c5df514e2a20c7d04e1db1716fdbab45a04 (patch) | |
| tree | 0645cd11cf0382906afde12e54fff66725506b69 /tls_ocsp.c | |
| parent | tls: Revert accidentally(?) reverted upstream (diff) | |
| parent | Import LibreSSL 3.5.0 (diff) | |
| download | libretls-9c718c5df514e2a20c7d04e1db1716fdbab45a04.tar.gz libretls-9c718c5df514e2a20c7d04e1db1716fdbab45a04.zip | |
Merge LibreSSL 3.5.0
Diffstat (limited to 'tls_ocsp.c')
| -rw-r--r-- | tls_ocsp.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tls_ocsp.c b/tls_ocsp.c index 2a322c1..f1c54ab 100644 --- a/tls_ocsp.c +++ b/tls_ocsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_ocsp.c,v 1.20 2021/03/23 20:04:29 tb Exp $ */ +/* $OpenBSD: tls_ocsp.c,v 1.22 2021/10/31 16:39:32 tb Exp $ */ /* * Copyright (c) 2015 Marko Kreen <markokr@gmail.com> * Copyright (c) 2016 Bob Beck <beck@openbsd.org> @@ -131,39 +131,38 @@ tls_ocsp_get_certid(X509 *main_cert, STACK_OF(X509) *extra_certs, X509_NAME *issuer_name; X509 *issuer; X509_STORE_CTX *storectx = NULL; - X509_OBJECT *tmpobj = NULL; + X509_OBJECT *obj = NULL; OCSP_CERTID *cid = NULL; X509_STORE *store; if ((issuer_name = X509_get_issuer_name(main_cert)) == NULL) - return NULL; + goto out; if (extra_certs != NULL) { issuer = X509_find_by_subject(extra_certs, issuer_name); - if (issuer != NULL) - return OCSP_cert_to_id(NULL, main_cert, issuer); + if (issuer != NULL) { + cid = OCSP_cert_to_id(NULL, main_cert, issuer); + goto out; + } } if ((store = SSL_CTX_get_cert_store(ssl_ctx)) == NULL) - return NULL; + goto out; if ((storectx = X509_STORE_CTX_new()) == NULL) - return NULL; + goto out; if (X509_STORE_CTX_init(storectx, store, main_cert, extra_certs) != 1) - goto err; - if ((tmpobj = X509_OBJECT_new()) == NULL) - goto err; - if (X509_STORE_get_by_subject(storectx, X509_LU_X509, issuer_name, - tmpobj) == 1) { - cid = OCSP_cert_to_id(NULL, main_cert, X509_OBJECT_get0_X509(tmpobj)); - X509_OBJECT_free(tmpobj); - } - X509_STORE_CTX_free(storectx); - return cid; + goto out; + if ((obj = X509_STORE_CTX_get_obj_by_subject(storectx, X509_LU_X509, + issuer_name)) == NULL) + goto out; - err: - X509_OBJECT_free(tmpobj); + cid = OCSP_cert_to_id(NULL, main_cert, X509_OBJECT_get0_X509(obj)); + + out: X509_STORE_CTX_free(storectx); - return NULL; + X509_OBJECT_free(obj); + + return cid; } struct tls_ocsp * |