The branch master has been updated
via 5e6e650d62af09f47d63bfdd6c92e3b16e9da644 (commit)
via fa3a0286d178eb3b87bf2eb5fd7af40f81453314 (commit)
from 14f4656058e8ddbcf1d510bc73670250ed0e10c0 (commit)
- Log -----------------------------------------------------------------
commit 5e6e650d62af09f47d63bfdd6c92e3b16e9da644
Author: Kurt Cancemi <[email protected]>
Date: Thu Jun 9 21:57:36 2016 -0400
Remove pointless free loop in X509_TRUST_cleanup()
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1194)
commit fa3a0286d178eb3b87bf2eb5fd7af40f81453314
Author: Kurt Cancemi <[email protected]>
Date: Wed Jun 8 19:15:38 2016 -0400
Remove pointless free loop in X509_PURPOSE_cleanup()
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1194)
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/x509_trs.c | 3 ---
crypto/x509v3/v3_purp.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index f7d89bf..a9bb88d 100644
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -194,9 +194,6 @@ static void trtable_free(X509_TRUST *p)
void X509_TRUST_cleanup(void)
{
- unsigned int i;
- for (i = 0; i < X509_TRUST_COUNT; i++)
- trtable_free(trstandard + i);
sk_X509_TRUST_pop_free(trtable, trtable_free);
trtable = NULL;
}
diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
index ab3fd7e..fff0994 100644
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509v3/v3_purp.c
@@ -229,10 +229,7 @@ static void xptable_free(X509_PURPOSE *p)
void X509_PURPOSE_cleanup(void)
{
- unsigned int i;
sk_X509_PURPOSE_pop_free(xptable, xptable_free);
- for (i = 0; i < X509_PURPOSE_COUNT; i++)
- xptable_free(xstandard + i);
xptable = NULL;
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
