summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/ssl_cert.c
diff options
context:
space:
mode:
authorsimon <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
committersimon <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
commit7a23485c98b888d229c5e0762dbcfcec293fcef6 (patch)
tree5691801dabb6a06320a55f5ce8ed927af41514f3 /crypto/openssl/ssl/ssl_cert.c
parent9c043d590896a77d5d66b978a963573a41d66ad3 (diff)
downloadFreeBSD-src-7a23485c98b888d229c5e0762dbcfcec293fcef6.zip
FreeBSD-src-7a23485c98b888d229c5e0762dbcfcec293fcef6.tar.gz
Merge OpenSSL 0.9.8p into head.
Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
Diffstat (limited to 'crypto/openssl/ssl/ssl_cert.c')
-rw-r--r--crypto/openssl/ssl/ssl_cert.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_cert.c b/crypto/openssl/ssl/ssl_cert.c
index 16fda5d..361cd9c 100644
--- a/crypto/openssl/ssl/ssl_cert.c
+++ b/crypto/openssl/ssl/ssl_cert.c
@@ -753,6 +753,8 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
sk_X509_NAME_push(stack,xn);
}
+ ERR_clear_error();
+
if (0)
{
err:
OpenPOWER on IntegriCloud