PR: 1731 and maybe 2197

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:16:35 +00:00
parent 4fae868811
commit ee91323f52
3 changed files with 6 additions and 0 deletions

View File

@ -888,6 +888,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);

View File

@ -354,6 +354,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);

View File

@ -753,6 +753,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: