Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 807890 - Add support for Microsoft Trust List Signing EKU - fix naming, a=Kaspar Brand, r=rrelya

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@264576 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
emaldona%redhat.com
2012-12-19 19:53:01 +00:00
parent 4c96f8007a
commit 525797b903
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/security/nss/cmd/certcgi/ca_form.html
View File

@@ -167,7 +167,7 @@
<input type="checkbox" name="extKeyUsage-timeStamp"> Timestamp</P>
<input type="checkbox" name="extKeyUsage-ocspResponder"> OCSP Responder</P>
<input type="checkbox" name="extKeyUsage-NS-govtApproved"> Step-up</P>
<input type="checkbox" name="extKeyUsage-msCodeSign"> Microsoft Code Signing</P>
<input type="checkbox" name="extKeyUsage-msTrustListSign"> Microsoft Trust List Signing</P>
</tr>
<tr>
<td>

4
mozilla/security/nss/cmd/certcgi/certcgi.c
View File

@@ -819,8 +819,8 @@ AddExtKeyUsage(void *extHandle, Pair *data)
if( SECSuccess != rv ) goto loser;
}
if( find_field_bool(data, "extKeyUsage-msCodeSign", PR_TRUE) ) {
rv = AddOidToSequence(os, SEC_OID_EXT_KEY_USAGE_SERVER_AUTH);
if( find_field_bool(data, "extKeyUsage-msTrustListSign", PR_TRUE) ) {
rv = AddOidToSequence(os, SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING);
if( SECSuccess != rv ) goto loser;
}

2
mozilla/security/nss/cmd/certcgi/stnd_ext_form.html
View File

@@ -34,7 +34,7 @@
<input type="checkbox" name="extKeyUsage-timeStamp"> Timestamp</P>
<input type="checkbox" name="extKeyUsage-ocspResponder"> OCSP Responder</P>
<input type="checkbox" name="extKeyUsage-NS-govtApproved"> Step-up</P>
<input type="checkbox" name="extKeyUsage-msCodeSign"> Microsoft Code Signing</P>
<input type="checkbox" name="extKeyUsage-msTrustListSign"> Microsoft Trust List Signing</P>
</tr>
<tr>
<td>

3
mozilla/security/nss/cmd/certutil/certext.c
View File

@@ -483,7 +483,7 @@ extKeyUsageKeyWordArray[] = { "serverAuth",
"timeStamp",
"ocspResponder",
"stepUp",
"msCodeSigning",
"msTrustListSigning",
NULL};
static SECStatus
@@ -512,6 +512,7 @@ AddExtKeyUsage (void *extHandle, const char *userSuppliedValue)
"\t\t4 - Timestamp\n"
"\t\t5 - OCSP Responder\n"
"\t\t6 - Step-up\n"
"\t\t7 - Microsoft Trust List Signing\n"
"\t\tOther to finish\n",
buffer, sizeof(buffer)) == SECFailure) {
GEN_BREAK(SECFailure);

3
mozilla/security/nss/cmd/certutil/certutil.c
View File

@@ -1143,9 +1143,8 @@ static void luC(enum usage_level ul, const char *command)
"%-20s Create extended key usage extension. Possible keywords:\n"
"%-20s \"serverAuth\", \"clientAuth\",\"codeSigning\",\n"
"%-20s \"emailProtection\", \"timeStamp\",\"ocspResponder\",\n"
"%-20s \"stepUp\", \"critical\"\n",
"%-20s \"stepUp\", \"msTrustListSign\", \"critical\"\n",
" -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
"%-20s \"stepUp\", \"msCodeSign\", \"critical\"\n",
FPS "%-20s Create an email subject alt name extension\n",
" -7 emailAddrs");
FPS "%-20s Create an dns subject alt name extension\n",

4
mozilla/security/nss/lib/util/secoid.c
View File

@@ -456,7 +456,7 @@ CONST_OID pkixExtendedKeyUsageCodeSign[] = { PKIX_KEY_USAGE, 3 };
CONST_OID pkixExtendedKeyUsageEMailProtect[] = { PKIX_KEY_USAGE, 4 };
CONST_OID pkixExtendedKeyUsageTimeStamp[] = { PKIX_KEY_USAGE, 8 };
CONST_OID pkixOCSPResponderExtendedKeyUsage[] = { PKIX_KEY_USAGE, 9 };
CONST_OID msExtendedKeyUsageCodeSigning[] = { MS_CRYPTO_EKU, 1 };
CONST_OID msExtendedKeyUsageTrustListSigning[] = { MS_CRYPTO_EKU, 1 };
/* OIDs for Netscape defined algorithms */
CONST_OID netscapeSMimeKEA[] = { NETSCAPE_ALGS, 0x01 };
@@ -1643,7 +1643,7 @@ const static SECOidData oids[SEC_OID_TOTAL] = {
SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST,
"DSA with SHA-256 Signature",
CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION),
OD( msExtendedKeyUsageCodeSigning,
OD( msExtendedKeyUsageTrustListSigning,
SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING,
"Microsoft Trust List Signing",
CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION )