generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 1731 and maybe 2197

Browse Source 
Clear error queue in a few places in SSL code where errors are expected
so they don't stay in the queue.
This commit is contained in:
Dr. Stephen Henson 2010-03-24 23:17:15 +00:00
parent 26c00de46d
commit a3a06e6543
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/d1_both.c
View File

@ -886,6 +886,8 @@ unsigned long dtls1_output_cert_chain(SSL *s, X509 *x)
} }
X509_verify_cert(&xs_ctx); X509_verify_cert(&xs_ctx);
/* Don't leave errors in the queue */
ERR_clear_error();
for (i=0; i < sk_X509_num(xs_ctx.chain); i++) for (i=0; i < sk_X509_num(xs_ctx.chain); i++)
{ {
x = sk_X509_value(xs_ctx.chain, i); x = sk_X509_value(xs_ctx.chain, i);

2
ssl/s3_both.c
View File

@ -352,6 +352,8 @@ unsigned long ssl3_output_cert_chain(SSL *s, X509 *x)
return(0); return(0);
} }
X509_verify_cert(&xs_ctx); X509_verify_cert(&xs_ctx);
/* Don't leave errors in the queue */
ERR_clear_error();
for (i=0; i < sk_X509_num(xs_ctx.chain); i++) for (i=0; i < sk_X509_num(xs_ctx.chain); i++)
{ {
x = sk_X509_value(xs_ctx.chain, i); x = sk_X509_value(xs_ctx.chain, i);

2
ssl/ssl_cert.c
View File

@ -755,6 +755,8 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
sk_X509_NAME_push(stack,xn); sk_X509_NAME_push(stack,xn);
} }
ERR_clear_error();
if (0) if (0)
{ {
err: err: