ITS#6791

diff --git a/CHANGES b/CHANGES
index e737c1fda740f7917ae2f21628d91fd7b3be47f5..945ac324d2a6fa11911542cd0e74d23d072b986d 100644 (file)
--- 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 f7840b26902d7b50df08e49afc1351afdafa8c8a..3091d8aa30ace1000b00f99d1185e9c3cacc60b9 100644 (file)
--- 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 ),