Attachment 587230 Details for Bug 810462 – proposed patch

[patch] proposed patch

0001-MozNSS-do-not-overwrite-error-in-tlsm_verify_cert.patch (text/plain), 1.42 KB, created by Jan Vcelak on 2012-05-28 12:18:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Vcelak

Created: 2012-05-28 12:18:50 UTC

Size: 1.42 KB

patch

obsolete

>From f1ec891a8c0ccf6bd38d99cd79664d01145c1246 Mon Sep 17 00:00:00 2001
>From: Jan Vcelak <jvcelak@redhat.com>
>Date: Mon, 28 May 2012 14:15:43 +0200
>Subject: [PATCH] MozNSS: do not overwrite error in tlsm_verify_cert
>
>---
> libraries/libldap/tls_m.c |    7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
>index 50c03dd..e681e66 100644
>--- a/libraries/libldap/tls_m.c
>+++ b/libraries/libldap/tls_m.c
>@@ -1019,6 +1019,10 @@ tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg,
> 				   is self issued */
> 				if ( ( node->error == SEC_ERROR_CA_CERT_INVALID ) &&
> 					 tlsm_cert_is_self_issued( node->cert ) ) {
>+
>+					PRErrorCode orig_error = PR_GetError();
>+					PRInt32 orig_oserror = PR_GetOSError();
>+
> 					CERTBasicConstraints basicConstraint;
> 					SECStatus rv = tlsm_get_basic_constraint_extension( node->cert, &basicConstraint );
> 					if ( ( rv == SECSuccess ) && ( basicConstraint.isCA == PR_FALSE ) ) {
>@@ -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",
> 							   name, 0, 0 );
> 					}
>+
>+					PR_SetError(orig_error, orig_oserror);
>+
> 				} else if ( errorToIgnore && ( node->error == errorToIgnore ) ) {
> 					Debug( debug_level,
> 						   "TLS: Warning: ignoring error for certificate [%s] - error %ld:%s.\n",
>-- 
>1.7.10.2
>

Flags:

jvcelak: review?

Actions: View | Diff

Attachments on bug 810462: 587230