From 991f0355fb782f499e226a732c0099847048c91a Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Tue, 8 May 2018 09:47:26 +0200 Subject: [PATCH] apps/ca: fix useless get before delete. Small simplification by skipping effectively redundant step and not resuming search from point past deletion. Reviewed-by: Andy Polyakov Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6195) --- apps/ca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/ca.c b/apps/ca.c index 4a8396ee07..558809ee30 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -1706,11 +1706,11 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, BIO_printf(bio_err, "Memory allocation failure\n"); goto end; } + i = -1; while ((i = X509_NAME_get_index_by_NID(dn_subject, NID_pkcs9_emailAddress, - -1)) >= 0) { - tmpne = X509_NAME_get_entry(dn_subject, i); - X509_NAME_delete_entry(dn_subject, i); + i)) >= 0) { + tmpne = X509_NAME_delete_entry(dn_subject, i--); X509_NAME_ENTRY_free(tmpne); } -- 2.34.1