Skip to content
Snippets Groups Projects
Commit da71205c authored by Jan Vcelak's avatar Jan Vcelak Committed by Quanah Gibson-Mount
Browse files

ITS#7287 MozNSS: do not overwrite error in tlsm_verify_cert

parent 987c77b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libraries/libldap/tls_m.c
+ 7
− 0
View file @ da71205c
...@@ -1019,6 +1019,10 @@ tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg, ...@@ -1019,6 +1019,10 @@ tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg,
is self issued */ is self issued */
if ( ( node->error == SEC_ERROR_CA_CERT_INVALID ) && if ( ( node->error == SEC_ERROR_CA_CERT_INVALID ) &&
tlsm_cert_is_self_issued( node->cert ) ) { tlsm_cert_is_self_issued( node->cert ) ) {
PRErrorCode orig_error = PR_GetError();
PRInt32 orig_oserror = PR_GetOSError();
CERTBasicConstraints basicConstraint; CERTBasicConstraints basicConstraint;
SECStatus rv = tlsm_get_basic_constraint_extension( node->cert, &basicConstraint ); SECStatus rv = tlsm_get_basic_constraint_extension( node->cert, &basicConstraint );
if ( ( rv == SECSuccess ) && ( basicConstraint.isCA == PR_FALSE ) ) { if ( ( rv == SECSuccess ) && ( basicConstraint.isCA == PR_FALSE ) ) {
...@@ -1032,6 +1036,9 @@ tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg, ...@@ -1032,6 +1036,9 @@ tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg,
"TLS: certificate [%s] is not valid - CA cert is not valid\n", "TLS: certificate [%s] is not valid - CA cert is not valid\n",
name, 0, 0 ); name, 0, 0 );
} }
PR_SetError(orig_error, orig_oserror);
} else if ( errorToIgnore && ( node->error == errorToIgnore ) ) { } else if ( errorToIgnore && ( node->error == errorToIgnore ) ) {
Debug( debug_level, Debug( debug_level,
"TLS: Warning: ignoring error for certificate [%s] - error %ld:%s.\n", "TLS: Warning: ignoring error for certificate [%s] - error %ld:%s.\n",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment