NSS 3.4 integration changes.
authorrelyea%netscape.com
Wed, 10 Dec 2008 22:48:08 +0000
changeset 8886 8f78fe7166dbd9131bffa896e3f9921d3c0c043c
parent 8885 788a66ba4aa711bba96d83c5d9961e294b2f5eac
child 8887 11e09ebe2bc462ec384924c741b70691484786fc
push idunknown
push userunknown
push dateunknown
NSS 3.4 integration changes. 1) 3.4 needs to bump the version numbers up by one on secmod.db from NSS 3.3 2) Need to add escapes to the configdirectory. (should add them to other parameters as well. 3) put exported files back into the correct headers. 4) Add _BEGIN/_END protos where appropriate.
security/nss/lib/softoken/secmodt.h
--- a/security/nss/lib/softoken/secmodt.h
+++ b/security/nss/lib/softoken/secmodt.h
@@ -163,16 +163,28 @@ struct PK11DefaultArrayEntryStr {
 #define CKM_INVALID_MECHANISM 0xffffffffL
 #define CKA_DIGEST            0x81000000L
 
 /* Cryptographic module types */
 #define SECMOD_EXTERNAL	0	/* external module */
 #define SECMOD_INTERNAL 1	/* internal default module */
 #define SECMOD_FIPS	2	/* internal fips module */
 
+/* default module configuration strings */
+#define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES]"
+
+#define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
+"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})"
+
+#define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
+#define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1)
+#define SECMOD_FIPS_NAME "NSS Internal FIPS PKCS #11 Module"
+#define SECMOD_FIPS_FLAGS SECMOD_MAKE_NSS_FLAGS(",fips",3)
+
+
 /*
  * What is the origin of a given Key. Normally this doesn't matter, but
  * the fortezza code needs to know if it needs to invoke the SSL3 fortezza
  * hack.
  */
 typedef enum {
     PK11_OriginNULL = 0,	/* There is not key, it's a null SymKey */
     PK11_OriginDerive = 1,	/* Key was derived from some other key */