From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 27 Jan 2011 21:53:29 +0000 (+0000)
Subject: ITS#6791
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~47
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eedf96d89b2a90c96ff406c0c9021e01d9ded1d0;p=openldap

ITS#6791
---

diff --git a/CHANGES b/CHANGES
index e737c1fda7..945ac324d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed libldap ldap_open_internal_connection (ITS#6788)
 	Fixed libldap sync checking for BER errors (ITS#6738)	
 	Fixed libldap MozNSS default cipher suites (ITS#6790)
+	Fixed libldap MozNSS cert usage types/values (ITS#6791)
 	Fixed liblutil getpass prompts (ITS#6702)
 	Fixed ldapsearch segfault with deref (ITS#6638)
 	Fixed ldapsearch multiple controls parsing (ITS#6651)
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index f7840b2690..3091d8aa30 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -932,7 +932,7 @@ tlsm_cert_is_self_issued( CERTCertificate *cert )
 
 static SECStatus
 tlsm_verify_cert(CERTCertDBHandle *handle, CERTCertificate *cert, void *pinarg,
-				 PRBool checksig, SECCertUsage certUsage, int errorToIgnore )
+				 PRBool checksig, SECCertificateUsage certUsage, int errorToIgnore )
 {
 	CERTVerifyLog verifylog;
 	SECStatus ret = SECSuccess;
@@ -1021,7 +1021,7 @@ static SECStatus
 tlsm_auth_cert_handler(void *arg, PRFileDesc *fd,
                        PRBool checksig, PRBool isServer)
 {
-	SECCertUsage certUsage = isServer ? certUsageSSLClient : certUsageSSLServer;
+	SECCertificateUsage certUsage = isServer ? certificateUsageSSLClient : certificateUsageSSLServer;
 	SECStatus ret = SECSuccess;
 
 	ret = tlsm_verify_cert( (CERTCertDBHandle *)arg, SSL_PeerCertificate( fd ),