Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug: 320980. Updated common.c and upgraded the JSS version.

Browse Source 
sr=glen.beasley
This commit is contained in:
sandeep.konchady%sun.com 2005-12-21 18:39:24 +00:00
parent 905fcd4b2f
commit 0d963476e9
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/jss/org/mozilla/jss/CryptoManager.java
View File

@ -56,7 +56,7 @@ import org.mozilla.jss.provider.java.security.JSSMessageDigestSpi;
* Initialization is done with static methods, and must be done before * Initialization is done with static methods, and must be done before
* an instance can be created. All other operations are done with instance * an instance can be created. All other operations are done with instance
* methods. * methods.
* @version $Revision: 1.39 $ $Date: 2005/12/14 19:53:48 $ * @version $Revision: 1.40 $ $Date: 2005/12/21 18:39:24 $
*/ */
public final class CryptoManager implements TokenSupplier public final class CryptoManager implements TokenSupplier
{ {
@ -1316,7 +1316,7 @@ public final class CryptoManager implements TokenSupplier
public static final String public static final String
JAR_JSS_VERSION = "JSS_VERSION = JSS_4_2_1_BETA"; JAR_JSS_VERSION = "JSS_VERSION = JSS_4_2_2_BETA";
public static final String public static final String
JAR_JDK_VERSION = "JDK_VERSION = N/A"; JAR_JDK_VERSION = "JDK_VERSION = N/A";
public static final String public static final String

2
security/jss/org/mozilla/jss/JSSProvider.java
View File

@ -51,7 +51,7 @@ public final class JSSProvider extends java.security.Provider {
private static int JSS_MAJOR_VERSION = 4; private static int JSS_MAJOR_VERSION = 4;
private static int JSS_MINOR_VERSION = 2; private static int JSS_MINOR_VERSION = 2;
private static int JSS_PATCH_VERSION = 1; private static int JSS_PATCH_VERSION = 2;
private static double JSS_VERSION = JSS_MAJOR_VERSION + private static double JSS_VERSION = JSS_MAJOR_VERSION +
(JSS_MINOR_VERSION * 100 + (JSS_MINOR_VERSION * 100 +
JSS_PATCH_VERSION)/10000.0; JSS_PATCH_VERSION)/10000.0;

6
security/jss/org/mozilla/jss/ssl/common.c
View File

@ -453,14 +453,10 @@ Java_org_mozilla_jss_ssl_SocketBase_socketClose(JNIEnv *env, jobject self)
/* get the FD */ /* get the FD */
if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) { if( JSSL_getSockData(env, self, &sock) != PR_SUCCESS) {
/* exception was thrown */ /* exception was thrown */
goto finish; return;
} }
JSSL_DestroySocketData(env, sock); JSSL_DestroySocketData(env, sock);
finish:
EXCEPTION_CHECK(env, sock)
return;
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL

2
security/jss/org/mozilla/jss/util/jssver.h
View File

@ -60,7 +60,7 @@
#define JSS_VERSION "4.2.1 Beta" #define JSS_VERSION "4.2.1 Beta"
#define JSS_VMAJOR 4 #define JSS_VMAJOR 4
#define JSS_VMINOR 2 #define JSS_VMINOR 2
#define JSS_VPATCH 1 #define JSS_VPATCH 2
#define JSS_BETA PR_TRUE #define JSS_BETA PR_TRUE
#endif #endif