Allow import of IE certs

1 files changed, 16 insertions, 0 deletions

diff --git a/security/nss/lib/softoken/keydb.c b/security/nss/lib/softoken/keydb.c
index 2f9c1bdda..4b77ab809 100644
--- a/security/nss/lib/softoken/keydb.c
+++ b/security/nss/lib/softoken/keydb.c
@@ -62,6 +62,19 @@
 
 /* Size of the global salt for key database */
 #define SALT_LENGTH     16
+ 
+const SEC_ASN1Template nsslowkey_AttributeTemplate[] = {
+    { SEC_ASN1_SEQUENCE, 
+	0, NULL, sizeof(NSSLOWKEYAttribute) },
+    { SEC_ASN1_OBJECT_ID, offsetof(NSSLOWKEYAttribute, attrType) },
+    { SEC_ASN1_SET_OF, offsetof(NSSLOWKEYAttribute, attrValue), 
+	SEC_AnyTemplate },
+    { 0 }
+};
+
+const SEC_ASN1Template nsslowkey_SetOfAttributeTemplate[] = {
+    { SEC_ASN1_SET_OF, 0, nsslowkey_AttributeTemplate },
+};
 
 /* ASN1 Templates for new decoder/encoder */
 const SEC_ASN1Template nsslowkey_PrivateKeyInfoTemplate[] = {
@@ -74,6 +87,9 @@ const SEC_ASN1Template nsslowkey_PrivateKeyInfoTemplate[] = {
 	SECOID_AlgorithmIDTemplate },
     { SEC_ASN1_OCTET_STRING,
 	offsetof(NSSLOWKEYPrivateKeyInfo,privateKey) },
+    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 0,
+	offsetof(NSSLOWKEYPrivateKeyInfo, attributes),
+	nsslowkey_SetOfAttributeTemplate },
     { 0 }
 };