Attachment 636950 Details for Bug 870864 – Patch2 V2 - extended key usage support in nss-util

[patch] Patch2 V2 - extended key usage support in nss-util

0001-nssutil-Add-extended-key-usage-for-MS-Authenticode-Code-Sign.patch (text/plain), 2.98 KB, created by Elio Maldonado Batiz on 2012-11-02 05:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-11-02 05:25:55 UTC

Size: 2.98 KB

patch

obsolete

>Index: ./mozilla/security/nss/lib/util/secoid.c
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/util/secoid.c,v
>retrieving revision 1.67
>diff -u -p -r1.67 secoid.c
>--- ./mozilla/security/nss/lib/util/secoid.c	27 Sep 2012 17:23:33 -0000	1.67
>+++ ./mozilla/security/nss/lib/util/secoid.c	30 Oct 2012 05:47:15 -0000
>@@ -3,6 +3,7 @@
>  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
> 
> #include "secoid.h"
>+#include "secoidt.h"
> #include "pkcs11t.h"
> #include "secitem.h"
> #include "secerr.h"
>@@ -145,6 +146,13 @@ const char __nss_util_sccsid[] = "@(#)NS
> #define MICROSOFT_OID 0x2b, 0x6, 0x1, 0x4, 0x1, 0x82, 0x37
> #define EV_NAME_ATTRIBUTE 	MICROSOFT_OID, 60, 2, 1
> 
>+/* Microsoft Crypto 2.0 ID space */
>+/* { 1.3.6.1.4.1.311.10 } */
>+#define MS_CRYPTO_20            MICROSOFT_OID, 10
>+/* Microsoft Crypto 2.0 Extended Key Usage ID space */
>+/* { 1.3.6.1.4.1.311.10.3 } */
>+#define MS_CRYPTO_EKU           MS_CRYPTO_20, 3
>+
> #define CERTICOM_OID            0x2b, 0x81, 0x04
> #define SECG_OID                CERTICOM_OID, 0x00
> 
>@@ -448,6 +456,8 @@ CONST_OID pkixExtendedKeyUsageCodeSign[]
> CONST_OID pkixExtendedKeyUsageEMailProtect[]  	= { PKIX_KEY_USAGE, 4 };
> CONST_OID pkixExtendedKeyUsageTimeStamp[]     	= { PKIX_KEY_USAGE, 8 };
> CONST_OID pkixOCSPResponderExtendedKeyUsage[] 	= { PKIX_KEY_USAGE, 9 };
>+/* QUESTION: why 1 instead of 10? */
>+CONST_OID msExtendedKeyUsageCodeSigning[]       = { MS_CRYPTO_EKU, 1 };
> 
> /* OIDs for Netscape defined algorithms */
> CONST_OID netscapeSMimeKEA[] 			= { NETSCAPE_ALGS, 0x01 };
>@@ -1633,7 +1643,11 @@ const static SECOidData oids[SEC_OID_TOT
>     OD( nistDSASignaturewithSHA256Digest,
> 	SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST,
> 	"DSA with SHA-256 Signature",
>-	CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION)
>+	CKM_INVALID_MECHANISM /* not yet defined */, INVALID_CERT_EXTENSION),
>+    OD( msExtendedKeyUsageCodeSigning, 
>+        szOID_KP_CTL_USAGE_SIGNING,
>+        "Microsoft Authenticode Code Signing",
>+	CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION )
> };
> 
> /* PRIVATE EXTENDED SECOID Table
>Index: ./mozilla/security/nss/lib/util/secoidt.h
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/util/secoidt.h,v
>retrieving revision 1.36
>diff -u -p -r1.36 secoidt.h
>--- ./mozilla/security/nss/lib/util/secoidt.h	25 Jun 2012 21:48:41 -0000	1.36
>+++ ./mozilla/security/nss/lib/util/secoidt.h	30 Oct 2012 01:58:26 -0000
>@@ -436,9 +436,14 @@ typedef enum {
>     SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST     = 314,
>     SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST     = 315,
> 
>+/* Microsoft Authenticode OIDs */
>+/* using the terrible microsoft name here... */
>+    szOID_KP_CTL_USAGE_SIGNING    = 316,
>+
>     SEC_OID_TOTAL
> } SECOidTag;
> 
>+
> #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
> #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
> #define SEC_OID_PKCS12_KEY_USAGE  SEC_OID_X509_KEY_USAGE

Actions: View | Diff

Attachments on bug 870864: 634838 | 634839 | 634848 | 634849 | 634850 | 636948 | 636949 | 636950 | 641077 | 644478