Bug 149832: renamed highestUsage as certificateUsageHighest.
authorwtc%netscape.com
Thu, 03 Oct 2002 03:48:55 +0000
changeset 3677 709c2c2600e2758e48e318f8297812620b2bcde7
parent 3676 25de3d36a97e5bf4e2f5a8bb3f01508a3687ae21
child 3678 7686f7cacf0f2cf347a4e1820f158cf389f0561b
push idunknown
push userunknown
push dateunknown
bugs149832
Bug 149832: renamed highestUsage as certificateUsageHighest. Modified files: certdb/certt.h certhigh/certvfy.c
security/nss/lib/certdb/certt.h
security/nss/lib/certhigh/certvfy.c
--- a/security/nss/lib/certdb/certt.h
+++ b/security/nss/lib/certdb/certt.h
@@ -490,17 +490,17 @@ typedef PRInt64 SECCertificateUsage;
 #define certificateUsageEmailRecipient         (0x0020)
 #define certificateUsageObjectSigner           (0x0040)
 #define certificateUsageUserCertImport         (0x0080)
 #define certificateUsageVerifyCA               (0x0100)
 #define certificateUsageProtectedObjectSigner  (0x0200)
 #define certificateUsageStatusResponder        (0x0400)
 #define certificateUsageAnyCA                  (0x0800)
 
-#define highestUsage certificateUsageAnyCA
+#define certificateUsageHighest certificateUsageAnyCA
 
 /*
  * Does the cert belong to the user, a peer, or a CA.
  */
 typedef enum CERTCertOwnerEnum {
     certOwnerUser = 0,
     certOwnerPeer = 1,
     certOwnerCA = 2
--- a/security/nss/lib/certhigh/certvfy.c
+++ b/security/nss/lib/certhigh/certvfy.c
@@ -1227,17 +1227,17 @@ CERT_VerifyCertificate(CERTCertDBHandle 
         LOG_ERROR(log,cert,0,validity);
 	return SECFailure;
     }
 
     /* check key usage and netscape cert type */
     CERT_GetCertType(cert);
     certType = cert->nsCertType;
 
-    for (i=1;i<=highestUsage && !(SECFailure == valid && !returnedUsages) ;) {
+    for (i=1;i<=certificateUsageHighest && !(SECFailure == valid && !returnedUsages) ;) {
         PRBool requiredUsage = (i & requiredUsages) ? PR_TRUE : PR_FALSE;
         if (PR_FALSE == requiredUsage && PR_FALSE == checkAllUsages) {
             NEXT_ITERATION();
         }
         if (returnedUsages) {
             *returnedUsages |= i; /* start off assuming this usage is valid */
         }
         switch ( certUsage ) {