diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-12-18 16:15:49 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-12-21 12:11:49 +0100 |
| commit | 79b2a2f2eedb9d6b24a3f6748332328cf54568fb (patch) | |
| tree | 31d61a9636cccc6a378871407b11fc1fc89aa8c6 /ssl/ssl_cert.c | |
| parent | 0d4c52320d245be80bd69346fdda4b12b4961eae (diff) | |
add OSSL_STACK_OF_X509_free() for commonly used pattern
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17307)
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 82028ec5b7..4cfd005ebe 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -212,7 +212,7 @@ void ssl_cert_clear_certs(CERT *c) cpk->x509 = NULL; EVP_PKEY_free(cpk->privatekey); cpk->privatekey = NULL; - sk_X509_pop_free(cpk->chain, X509_free); + OSSL_STACK_OF_X509_free(cpk->chain); cpk->chain = NULL; OPENSSL_free(cpk->serverinfo); cpk->serverinfo = NULL; @@ -264,7 +264,7 @@ int ssl_cert_set0_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain) return 0; } } - sk_X509_pop_free(cpk->chain, X509_free); + OSSL_STACK_OF_X509_free(cpk->chain); cpk->chain = chain; return 1; } @@ -278,7 +278,7 @@ int ssl_cert_set1_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain) if (!dchain) return 0; if (!ssl_cert_set0_chain(s, ctx, dchain)) { - sk_X509_pop_free(dchain, X509_free); + OSSL_STACK_OF_X509_free(dchain); return 0; } return 1; @@ -440,7 +440,7 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) } s->verify_result = X509_STORE_CTX_get_error(ctx); - sk_X509_pop_free(s->verified_chain, X509_free); + OSSL_STACK_OF_X509_free(s->verified_chain); s->verified_chain = NULL; if (X509_STORE_CTX_get0_chain(ctx) != NULL) { s->verified_chain = X509_STORE_CTX_get1_chain(ctx); @@ -940,12 +940,12 @@ int ssl_build_cert_chain(SSL *s, SSL_CTX *ctx, int flags) rv = ssl_security_cert(s, ctx, x, 0, 0); if (rv != 1) { ERR_raise(ERR_LIB_SSL, rv); - sk_X509_pop_free(chain, X509_free); + OSSL_STACK_OF_X509_free(chain); rv = 0; goto err; } } - sk_X509_pop_free(cpk->chain, X509_free); + OSSL_STACK_OF_X509_free(cpk->chain); cpk->chain = chain; if (rv == 0) rv = 1; |