|
 |
faeb29 |
# HG changeset patch
|
|
|
faeb29 |
# User Daiki Ueno <dueno@redhat.com>
|
|
|
faeb29 |
# Date 1481829086 -3600
|
|
|
faeb29 |
# Thu Dec 15 20:11:26 2016 +0100
|
|
|
faeb29 |
# Node ID 6d66c2c24e4d9d1ad12a7065c55ef1c9fe143057
|
|
|
faeb29 |
# Parent 35ecce23718136f99ca9537007481b4774c57e68
|
|
|
faeb29 |
Bug 1268143 - pk12util can't import PKCS#12 files with SHA-256 MAC, r=rrelyea
|
|
|
faeb29 |
|
|
|
faeb29 |
diff --git a/lib/util/pkcs11n.h b/lib/util/pkcs11n.h
|
|
|
faeb29 |
--- a/lib/util/pkcs11n.h
|
|
|
faeb29 |
+++ b/lib/util/pkcs11n.h
|
|
|
faeb29 |
@@ -222,6 +222,12 @@
|
|
|
faeb29 |
#define CKM_NSS_CHACHA20_KEY_GEN (CKM_NSS + 27)
|
|
|
faeb29 |
#define CKM_NSS_CHACHA20_POLY1305 (CKM_NSS + 28)
|
|
|
faeb29 |
|
|
|
faeb29 |
+/* Additional PKCS #12 PBE algorithms defined in v1.1 */
|
|
|
faeb29 |
+#define CKM_NSS_PKCS12_PBE_SHA224_HMAC_KEY_GEN (CKM_NSS + 29)
|
|
|
faeb29 |
+#define CKM_NSS_PKCS12_PBE_SHA256_HMAC_KEY_GEN (CKM_NSS + 30)
|
|
|
faeb29 |
+#define CKM_NSS_PKCS12_PBE_SHA384_HMAC_KEY_GEN (CKM_NSS + 31)
|
|
|
faeb29 |
+#define CKM_NSS_PKCS12_PBE_SHA512_HMAC_KEY_GEN (CKM_NSS + 32)
|
|
|
faeb29 |
+
|
|
|
faeb29 |
/*
|
|
|
faeb29 |
* HISTORICAL:
|
|
|
faeb29 |
* Do not attempt to use these. They are only used by NETSCAPE's internal
|
|
|
faeb29 |
# HG changeset patch
|
|
|
faeb29 |
# User Daiki Ueno <dueno@redhat.com>
|
|
|
faeb29 |
# Date 1485768835 -3600
|
|
|
faeb29 |
# Mon Jan 30 10:33:55 2017 +0100
|
|
|
faeb29 |
# Node ID 09d1a0757431fa52ae025138da654c698141971b
|
|
|
faeb29 |
# Parent 806c3106536feea0827ec54729a52b5cbac8a496
|
|
|
faeb29 |
Bug 1268141 - pk12util can't import PKCS#12 files encrypted with AES-128-CBC, r=rrelyea
|
|
|
faeb29 |
|
|
|
faeb29 |
diff --git a/lib/util/ciferfam.h b/lib/util/ciferfam.h
|
|
|
faeb29 |
--- a/lib/util/ciferfam.h
|
|
|
faeb29 |
+++ b/lib/util/ciferfam.h
|
|
|
faeb29 |
@@ -52,6 +52,9 @@
|
|
|
faeb29 |
#define PKCS12_RC4_128 (CIPHER_FAMILYID_PKCS12 | 0012)
|
|
|
faeb29 |
#define PKCS12_DES_56 (CIPHER_FAMILYID_PKCS12 | 0021)
|
|
|
faeb29 |
#define PKCS12_DES_EDE3_168 (CIPHER_FAMILYID_PKCS12 | 0022)
|
|
|
faeb29 |
+#define PKCS12_AES_CBC_128 (CIPHER_FAMILYID_PKCS12 | 0031)
|
|
|
faeb29 |
+#define PKCS12_AES_CBC_192 (CIPHER_FAMILYID_PKCS12 | 0032)
|
|
|
faeb29 |
+#define PKCS12_AES_CBC_256 (CIPHER_FAMILYID_PKCS12 | 0033)
|
|
|
faeb29 |
|
|
|
faeb29 |
/* SMIME version numbers are negative, to avoid colliding with SSL versions */
|
|
|
faeb29 |
#define SMIME_LIBRARY_VERSION_1_0 -0x0100
|