mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Set JSS version to 4.2.5 (RTM). Import NSPR 4.6.6 and NSS 3.11.6.
Modified Files: manifest.mn org/mozilla/jss/CryptoManager.java org/mozilla/jss/util/jssver.h
This commit is contained in:
parent
c99e5bb54d
commit
a910769f2a
@ -50,8 +50,8 @@ MODULE = jss
|
||||
# org/mozilla/jss/CryptoManager.java, and the PRODUCT_VERSION
|
||||
# and PRODUCT_NAME values in pkg/solaris/Makefile.com.
|
||||
#
|
||||
IMPORTS = nss/NSS_3_11_3_RTM \
|
||||
nspr20/v4.6.3 \
|
||||
IMPORTS = nss/NSS_3_11_6_RTM \
|
||||
nspr20/v4.6.6 \
|
||||
$(NULL)
|
||||
|
||||
DIRS = org \
|
||||
|
@ -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.46 $ $Date: 2007/02/05 23:07:31 $
|
||||
* @version $Revision: 1.47 $ $Date: 2007/02/15 01:32:44 $
|
||||
*/
|
||||
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_3_RTM";
|
||||
JAR_NSS_VERSION = "NSS_VERSION = NSS_3_11_6_RTM";
|
||||
public static final String
|
||||
JAR_DBM_VERSION = "DBM_VERSION = N/A";
|
||||
public static final String
|
||||
JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_6_3_RTM";
|
||||
JAR_NSPR_VERSION = "NSPR_VERSION = NSPR_4_6_6_RTM";
|
||||
|
||||
/**
|
||||
* Loads the JSS dynamic library if necessary.
|
||||
|
@ -57,10 +57,10 @@
|
||||
/* */
|
||||
/********************************************************************/
|
||||
|
||||
#define JSS_VERSION "4.2.5 Beta"
|
||||
#define JSS_VERSION "4.2.5"
|
||||
#define JSS_VMAJOR 4
|
||||
#define JSS_VMINOR 2
|
||||
#define JSS_VPATCH 5
|
||||
#define JSS_BETA PR_TRUE
|
||||
#define JSS_BETA PR_FALSE
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user