Index: nss/mozilla/security/nss/lib/certhigh/certvfy.c |
=================================================================== |
--- nss/mozilla/security/nss/lib/certhigh/certvfy.c (revision 55475) |
+++ nss/mozilla/security/nss/lib/certhigh/certvfy.c (working copy) |
@@ -482,8 +482,8 @@ |
} |
/* get the privilege mask */ |
- if (key->u.fortezza.DSSpriviledge.len > 0) { |
- priv = key->u.fortezza.DSSpriviledge.data[0]; |
+ if (key->u.fortezza.DSSprivilege.len > 0) { |
+ priv = key->u.fortezza.DSSprivilege.data[0]; |
} |
/* |
@@ -647,7 +647,10 @@ |
CERTGeneralName *subjectNameList; |
int subjectNameListLen; |
int i; |
- subjectNameList = CERT_GetCertificateNames(subjectCert, arena); |
+ PRBool getSubjectCN = (!count && certUsage == certUsageSSLServer); |
+ subjectNameList = |
+ CERT_GetConstrainedCertificateNames(subjectCert, arena, |
+ getSubjectCN); |
if (!subjectNameList) |
goto loser; |
subjectNameListLen = CERT_GetNamesLength(subjectNameList); |