From ab2bbe1dfd8eeaf0ec57cf1439222b6238ec6adf Mon Sep 17 00:00:00 2001 From: "christophe.ravel.bugs%sun.com" Date: Thu, 31 Jan 2008 22:29:17 +0000 Subject: [PATCH] Prepare JSS 4.2.6 RTM. Uses NSPR 4.7 and NSS 3.11.9 git-svn-id: svn://10.0.0.236/trunk@244631 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/jss/manifest.mn | 4 ++-- mozilla/security/jss/org/mozilla/jss/CryptoManager.java | 6 +++--- mozilla/security/jss/org/mozilla/jss/util/jssver.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/security/jss/manifest.mn b/mozilla/security/jss/manifest.mn index 06bba6b68ba..883e34976d7 100644 --- a/mozilla/security/jss/manifest.mn +++ b/mozilla/security/jss/manifest.mn @@ -52,8 +52,8 @@ MODULE = jss #/* */ #/********************************************************************/ -IMPORTS = nss/NSS_3_11_7_RTM \ - nspr20/v4.6.7 \ +IMPORTS = nss/NSS_3_11_9_RTM \ + nspr20/v4.7 \ $(NULL) DIRS = org \ diff --git a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java index cde2626f8f6..87d873e875a 100644 --- a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java +++ b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java @@ -56,7 +56,7 @@ import org.mozilla.jss.provider.java.security.JSSMessageDigestSpi; * Initialization is done with static methods, and must be done before * an instance can be created. All other operations are done with instance * methods. - * @version $Revision: 1.49 $ $Date: 2007-05-31 20:10:43 $ + * @version $Revision: 1.50 $ $Date: 2008-01-31 22:29:16 $ */ public final class CryptoManager implements TokenSupplier { @@ -1322,11 +1322,11 @@ public final class CryptoManager implements TokenSupplier public static final String JAR_JDK_VERSION = "JDK_VERSION = N/A"; public static final String - JAR_NSS_VERSION = "NSS_VERSION = NSS_3_11_7_RTM"; + JAR_NSS_VERSION = "NSS_VERSION = NSS_3_11_9_RTM"; public static final String JAR_DBM_VERSION = "DBM_VERSION = N/A"; public static final String - JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_6_7_RTM"; + JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_7_RTM"; /** * Loads the JSS dynamic library if necessary. diff --git a/mozilla/security/jss/org/mozilla/jss/util/jssver.h b/mozilla/security/jss/org/mozilla/jss/util/jssver.h index e0fa571d207..a67fdfd1524 100644 --- a/mozilla/security/jss/org/mozilla/jss/util/jssver.h +++ b/mozilla/security/jss/org/mozilla/jss/util/jssver.h @@ -57,10 +57,10 @@ /* */ /********************************************************************/ -#define JSS_VERSION "4.2.6 Beta" +#define JSS_VERSION "4.2.6" #define JSS_VMAJOR 4 #define JSS_VMINOR 2 #define JSS_VPATCH 6 -#define JSS_BETA PR_TRUE +#define JSS_BETA PR_FALSE #endif