Граф коммитов

441 Коммитов

Автор SHA1 Сообщение Дата
sandeep.konchady%sun.com 1d340a02f8 Bugzilla bug: 316629. Increased SSLServerSocket timeout from 15 sec to
90 sec. Smaller timeout was causing the server to die before client connected.
sr=glen.beasley r=alexei.volkov
2006-01-24 00:42:48 +00:00
sandeep.konchady%sun.com f4d5ee03d0 Bugzilla bug: 320980. Updated common.c and upgraded the JSS version.
sr=glen.beasley
2005-12-21 18:39:24 +00:00
christophe.ravel.bugs%sun.com 196108d1d0 Current version is JSS 4.2.1 Beta. 2005-12-14 19:53:48 +00:00
sandeep.konchady%sun.com d22f249725 Bugzilla bug: 318133
Added synchronized block and isClosed for getInetAddress(),
getLocalAddress(), and getLocalPort(). sr=glen.beasley
2005-11-29 22:40:28 +00:00
sandeep.konchady%sun.com 5951cf6fc9 Bugzilla bug:310491
Missed some System.exit(0) and reverted SigTest.java to original format.
sr=glen.beasley
2005-11-23 23:40:26 +00:00
glen.beasley%sun.com f982ea1547 313798 AES and RC2 Mozilla-JSS fixes r=sandeep, sr=wan-teh 2005-11-19 00:20:53 +00:00
sandeep.konchady%sun.com 53bdf76ed3 Bugzilla id:314098 Modified JSS_VERSION to reflect 4.0200 for 4.2 and
4.1001 for 4.10.1 when used in the constructor. Human readable values
will still be 4.2 or 4.10.1 sr=wtc
2005-11-18 22:09:39 +00:00
christophe.ravel.bugs%sun.com d1149b4b8f 238319: Sun packages changes.
RPM_RELEASE can be set from the command line.
2005-11-18 21:52:41 +00:00
glen.beasley%sun.com bf4797dda1 311934 socket port values are hard coded in the tests sr=sandeepK 2005-11-17 18:34:31 +00:00
wtchang%redhat.com 50bccfe11b Bugzilla bug 316594: print the value of the BUILD_OPT environment
variable. r=sandeep.konchady. sr=glen.beasley.
2005-11-16 00:01:32 +00:00
sandeep.konchady%sun.com a74e685ab5 Bugzilla bug: 310491
Added System.exit(0) and System.exit(1) where appropriate.  Also removed
references to deprecated code and deprecated the test SigTest.java. This
is now replaced by JCASigTest.java. sr=Glen.Beasley
2005-11-14 23:23:13 +00:00
wtchang%redhat.com 0d2dca9ab7 Bugzilla Bug 315496: expose the ability to create sensitive or insensitve
symmetric keys and public/private key pairs.  The patch is contributed by
Thomas Kwan of Red Hat. r=wtc. sr=glen.beasley.
Modified Files:
	org/mozilla/jss/crypto/KeyGenerator.java
	org/mozilla/jss/crypto/KeyPairGenerator.java
	org/mozilla/jss/crypto/KeyPairGeneratorSpi.java
	org/mozilla/jss/pkcs11/PK11KeyGenerator.c
	org/mozilla/jss/pkcs11/PK11KeyGenerator.java
	org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
	org/mozilla/jss/pkcs11/PK11KeyPairGenerator.java
2005-11-14 22:15:06 +00:00
sandeep.konchady%sun.com fc06e58741 Bugzilla bug: 314098
Rounding of double(4) + double(1)/10 to two decimal places gives 4.21.
Fixed this issue.  sr=glen.beasley
2005-11-14 21:37:32 +00:00
christophe.ravel.bugs%sun.com 8cbb2973a9 238319: Sun packages changes
Reset rpm release to 1 for JSS 4.2
2005-11-07 20:19:05 +00:00
glen.beasley%sun.com 641ae26c85 313176 jss version 4.2 because JSS needs NSS 3.11 and up for bypass sr=sandeep 2005-11-04 23:16:43 +00:00
glen.beasley%sun.com d815f7cf12 311934 added PORT_JSSE_SERVER and PORT_JSSE_SERVER plus testing bypass r=sandeep 2005-11-03 23:30:38 +00:00
glen.beasley%sun.com 0f4039e012 313176 allow JSS to enable more NSS SSLOptions r=wtc, sr=nelson 2005-11-03 23:09:26 +00:00
wtchang%redhat.com 8ad396e8b9 Import NSPR 4.6 and NSS 3.10.2 temporarily. We will import NSPR 4.6.1
and NSS 3.11 when they are released.
2005-11-01 19:00:12 +00:00
wtchang%redhat.com e58a8fe88b Bugzilla Bug 308242: expose the opFlags and the temporary/permanent
attributes of PK11_TokenKeyGenWithFlags. r=glen.beasley.
Modified Files:
	crypto/KeyGenerator.java crypto/SymmetricKey.java
	pkcs11/PK11KeyGenerator.c pkcs11/PK11KeyGenerator.java
2005-11-01 18:38:47 +00:00
sandeep.konchady%sun.com 54fc46b257 Bugzila bug : 314098 Changed Double to Double.doubleValue() in constructing java.Security.Provider(). sr=wtc 2005-10-28 22:22:44 +00:00
sandeep.konchady%sun.com 0d11c9e874 Bugzilla bug : 314098. Modified JSS provider version to 4.1.1 in
JSSProvider.java. Reflected this information in all places that needs
to be changed when there is a change in JSS version. r=wtc
2005-10-28 04:21:16 +00:00
wtchang%redhat.com ec848a59a1 Bugzilla Bug 308242: added the extractablePairs method to KeyPairGenerator
to make the new PK11_ATTR_EXTRACTABLE/PK11_ATTR_UNEXTRACTABLE flags of the
new PK11_GenerateKeyPairWithFlags function available to JSS.  r=nkwan.
sr=glen.beasley.
Modified Files:
        crypto/KeyPairGenerator.java crypto/KeyPairGeneratorSpi.java
        pkcs11/PK11KeyPairGenerator.c pkcs11/PK11KeyPairGenerator.java
2005-10-27 20:47:26 +00:00
wtchang%redhat.com 63680b1e17 Bugzilla bug 312774: support building and running the test with IBM JDK.
Removed the class name and provider name of the SUN provider.  Instead,
we compare our message digest result with the result of all providers that
support the message digest algorithm.  The patch is contributed by Rich
Megginson of Red Hat and improved by Glen Beasley of Sun. r=wtc.
2005-10-19 01:17:44 +00:00
glen.beasley%sun.com ec898fad19 171027 removed deprecated code from tests ran by all.pl sr=sandeep 2005-10-05 17:09:03 +00:00
christophe.ravel.bugs%sun.com ab4bcd2e06 238319: Sun packages changes.
Add an extra line to the copyright file to have the same as NSS and NSPR.
2005-09-30 01:56:59 +00:00
sandeep.konchady%sun.com 7b66c63352 Bugzilla Bug 164692 SSL ops that timeout should throw
java.net.SocketTimeoutException. sr=Glen.Beasley
2005-09-29 18:48:34 +00:00
wtchang%redhat.com cc926643d7 Bugzilla bug 309640: replaced the French accented a (�) with ASCII a
because IBM JDK can't handle that 8-bit character in UTF8 locales.  The
patch is contributed by Rich Megginson of Red Hat. r=wtc,glen.beasley.
2005-09-22 17:58:35 +00:00
christophe.ravel.bugs%sun.com c06cbabaf1 Unset Beta flag to sync up JSS 4.1.1 RTM with NSS 3.10.2 RTM build date. 2005-09-21 21:06:54 +00:00
sandeep.konchady%sun.com 4bb21db05f Modified import.pl, jdk.mk and release.pl under coreconf and all.pl under
jss test directory for bug #302550.  Attached below is the diff of the
changes done to these files.

Index: coreconf/import.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/import.pl,v
retrieving revision 1.2
diff -u -r1.2 import.pl
--- coreconf/import.pl  25 Apr 2004 15:02:17 -0000      1.2
+++ coreconf/import.pl  15 Sep 2005 18:37:51 -0000
@@ -46,7 +46,6 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
 $var{UNZIP} = "unzip -o";

 &parse_argv;
Index: coreconf/jdk.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/jdk.mk,v
retrieving revision 1.14
diff -u -r1.14 jdk.mk
--- coreconf/jdk.mk     25 Apr 2004 15:02:17 -0000      1.14
+++ coreconf/jdk.mk     15 Sep 2005 18:37:52 -0000
@@ -123,14 +123,14 @@

 # set [Sun Solaris] platforms
 ifeq ($(OS_ARCH), SunOS)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/lib/rt.jar
                endif
        endif

@@ -144,9 +144,13 @@

        # (3) specify "linker" information
 ifeq ($(USE_64), 1)
-       JAVA_CPU = $(shell uname -p)v9
+       ifeq ($(CPU_ARCH), x86_64)
+               JAVA_CPU = amd64
+       else
+               JAVA_CPU := $(shell uname -p)v9
+       endif
 else
-       JAVA_CPU = $(shell uname -p)
+       JAVA_CPU := $(shell uname -p)
 endif

 ifeq ($(JDK_VERSION), 1.1)
@@ -163,8 +167,6 @@
 ifneq ($(JDK_VERSION), 1.1)
 ifeq ($(USE_64), 1)
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server
-else
-       JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
 endif
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
        JAVA_LIBS += -ljvm -ljava
@@ -220,14 +222,14 @@

 # set [Redhat Linux] platforms
 ifeq ($(OS_ARCH), Linux)
-       JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip
+       JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

        ifeq ($(JRE_HOME),)
                JRE_HOME = $(JAVA_HOME)
                JRE_CLASSES = $(JAVA_CLASSES)
        else
                ifeq ($(JRE_CLASSES),)
-                       JRE_CLASSES = $(JRE_HOME)/lib/classes.zip
+                       JRE_CLASSES = $(JRE_HOME)/jre/lib/rt.jar
                endif
        endif

@@ -241,16 +243,21 @@

        # (3) specify "linker" information
        JAVA_CPU = i386
-
+       ifeq ($(CPU_ARCH),x86_64)
+               ifeq ($(USE_64), 1)
+                       JAVA_CPU = amd64
+               else
+                       JAVA_CPU = i386
+               endif
+       endif
        JAVA_LIBDIR = jre/lib/$(JAVA_CPU)

        JAVA_CLIBS =

         ifeq ($(JDK_VERSION), 1.4)
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
-        else
-           JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
+               JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm
        endif
+
        JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
        JAVA_LIBS += $(JAVA_CLIBS)

Index: coreconf/release.pl
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/release.pl,v
retrieving revision 1.3
diff -u -r1.3 release.pl
--- coreconf/release.pl 25 Apr 2004 15:02:17 -0000      1.3
+++ coreconf/release.pl 15 Sep 2005 18:37:52 -0000
@@ -41,7 +41,14 @@

 #######-- read in variables on command line into %var

-$var{ZIP} = "zip";
+$use_jar = 1;
+$ZIP     = "$ENV{JAVA_HOME}/bin/jar";
+
+if ( $ENV{JAVA_HOME} eq "" ) {
+    $ZIP      = "zip";
+    $use_jar  = 0;
+}
+

 &parse_argv;

@@ -56,11 +63,15 @@

     ($jardir,$jaropts) = split(/\|/,$jarinfo);

-    $zipoptions = "-T";
-    if ($jaropts =~ /a/) {
-       if ($var{OS_ARCH} eq 'WINNT') {
-           $zipoptions .= ' -ll';
-       }
+    if ( $use_jar ) {
+        $zipoptions = "-cvf";
+    } else {
+        $zipoptions = "-T -r";
+        if ($jaropts =~ /a/) {
+            if ($var{OS_ARCH} eq 'WINNT') {
+                $zipoptions .= ' -ll';
+            }
+        }
     }

 # just in case the directory ends in a /, remove it
@@ -117,8 +128,8 @@
        }
        closedir(DIR);

-       print STDERR "zip $zipoptions -r $jarfile $filelist\n";
-       system("zip $zipoptions -r $jarfile $filelist");
+       print STDERR "$ZIP $zipoptions $jarfile $filelist\n";
+       system("$ZIP $zipoptions $jarfile $filelist");
        rmdir("META-INF");
            for $i (1 .. $dirdepth) {
            chdir("..");
Index: jss/org/mozilla/jss/tests/all.pl
===================================================================
RCS file: /cvsroot/mozilla/security/jss/org/mozilla/jss/tests/all.pl,v
retrieving revision 1.22
diff -u -r1.22 all.pl
--- jss/org/mozilla/jss/tests/all.pl    6 Sep 2005 17:57:40 -0000       1.22
+++ jss/org/mozilla/jss/tests/all.pl    15 Sep 2005 18:37:54 -0000
@@ -136,12 +136,26 @@
         exit(1);
     }

+    #
+    # Use 64-bit Java on AMD64.
+    #
+
     $java = "$ENV{JAVA_HOME}/jre/bin/java$exe_suffix";
+    my $java_64bit = 0;
+    if ($osname eq "SunOS") {
+       if ($ENV{USE_64}) {
+           my $cpu = `/usr/bin/isainfo -n`;
+           if ($cpu == "amd64") {
+               $java = "$ENV{JAVA_HOME}/jre/bin/amd64/java$exe_suffix";
+               $java_64bit = 1;
+           }
+       }
+    }
     (-f $java) or die "'$java' does not exist\n";
     $java = $java . $ENV{NATIVE_FLAG};

-    if ($ENV{USE_64}) {
-        $java = $java . " -d64";
+    if ($ENV{USE_64} && !$java_64bit) {
+       $java = $java . " -d64";
     }

     $pwfile = "passwords";
2005-09-16 00:33:23 +00:00
christophe.ravel.bugs%sun.com 982861b69c 238319: Sun packages changes.
Install 64 bit libraries in lib64 on Linux.
2005-09-08 22:23:54 +00:00
glen.beasley%sun.com 903845deae 306114 enable/disable FIPS modes files: CryptoManager.c, tests/all.pl, tests/FipsTest.java r=sandeep,sr=wtc 2005-09-06 17:57:40 +00:00
sandeep.konchady%sun.com 5c5544016c Added Password.clear() and PBEKeyGenParams.clear() so that the objects are
released when GC tries to collect them.
2005-09-02 22:48:46 +00:00
sandeep.konchady%sun.com 57109efa29 Adding JSS SelfServ test client and server. 2005-09-02 20:58:08 +00:00
christophe.ravel.bugs%sun.com e779630b1d Uprev JSS version to 4.1.1 Beta. 2005-08-24 23:39:12 +00:00
sandeep.konchady%sun.com 699f97c20b Bug Id: 304195
Added try/catch block around the method calls within toString().  Calls
such as getInetAddress(), getPort() etc does not check if the socket is
closed, and when applications use toString() on a closed socket, there
is an uncaught exception.
2005-08-16 23:44:45 +00:00
sandeep.konchady%sun.com c6c36cd39d As per Wan-Teh's suggestion, the comments are modified to look as shown below.
#/********************************************************************/
#/* The VERSION Strings should be updated in the following           */
#/* files everytime a new release of JSS is generated:               */
#/*                                                                  */
#/* org/mozilla/jss/CryptoManager.java                               */
#/* org/mozilla/jss/CryptoManager.c                                  */
#/* org/mozilla/jss/util/jssver.h                                    */
#/* lib/manifest.mn                                                  */
#/*                                                                  */
#/********************************************************************/
2005-08-12 18:39:14 +00:00
sandeep.konchady%sun.com 8068688212 Older release of JSS had an issue with gradually slowing socket read time when
transfering large files (> 10MB).  In order to test this in current and future
release, there needs to be a test client that can read a file and transfer it to
a server (remote or local) via JSS socket.  The server should report the number
of bytes read and the time it took to read these bytes.  There should not no
degradation in read time if there is no leak of any sort.

This is not part of all.pl, but is a client/server that uses JSS to transfer
files securely.  The main purpose of this test would be to test the performance
of large file transfer using JSS.

NOTE: If bufferedStream.mark(Integer.MAX_VALUE); method is invoked then fill
method of BufferedInputStream class copies lot of data using System.arraycopy
(which in-turn use memcpy). This causes very high CPU usage.  This is one of
the reasons secure large file transfer can become slow over time.
2005-08-11 18:28:59 +00:00
christophe.ravel.bugs%sun.com 1ad56bbc2a 238319: Sun packages changes
Change rpm packaging for RHEL3 i386 and x86_64.
2005-07-22 15:32:50 +00:00
sandeep.konchady%sun.com 97986b0e8b Modified JSS/JSSE inter communication tests along with JSSPackageTest
and all.pl to use platform specific cert/keystore directory.
2005-06-23 05:59:36 +00:00
christophe.ravel.bugs%sun.com 6793b91046 297573 - Modify JSS tests such that they access certs from platform specific directories
r: Sandeep
Force Perl to do unbuffered output to avoid having Java and
Perl output out of sync.
2005-06-21 01:17:30 +00:00
christophe.ravel.bugs%sun.com 687eab8c8c 297573 - Modify JSS tests such that they access certs from platform specific directories
r=Sandeep, sr=Glen
Display the result of each test case and global pass rate.
2005-06-16 23:22:46 +00:00
christophe.ravel.bugs%sun.com c414763657 297573 - Modify JSS tests such that they access certs from platform specific directories
r=Sandeep, sr=Glen
Make $testdir a specific directory for each run.
2005-06-15 18:39:37 +00:00
sandeep.konchady%sun.com 8ecb17aec9 Added comment to all these files indicating that the version of NSS
mustbe updated every time NSS is updated.  This helps pick the right
version of NSS for JSS builds.
2005-05-19 22:56:30 +00:00
sandeep.konchady%sun.com 0ba80326d5 Modified the way MANIFEST.MF file was being generated. I now use perl
to open a file and write to it instead of execing a system command.
This is in response to build failure when rsh to a Windows machine.
2005-05-18 22:18:15 +00:00
sandeep.konchady%sun.com 73a05db3b1 Modified build_java.pl to create a MANIFEST.MF file with JSS product
version information.  This is then added to xpclass(_dbg).jar using
jar -tvf in place of zip -R.

Modified all.pl to execute a new test that checks for product package
version information in jss4.jar as well as compare this to the version
of library (libjss4.so or jss4.dll) being used.  This helps in consistency
check for jss jar and associated lib.

Added a new test JSSPackaeTest.java that reads MANIFEST.MF from jss jar
to fetch product version information.
2005-05-17 21:15:12 +00:00
christophe.ravel.bugs%sun.com 965baf82fe Change NSS version to 3.10.1 Beta. 2005-04-27 20:28:39 +00:00
sandeep.konchady%sun.com 9191087933 Fix for JSSE and JSS client timeout issue
Fixed a couple of issues.
[1] Reduced JSS and JSSE server timeout from 2 min to 35 sec
[2] Added try/catch to JSSE client to detect non Sun JCA
[3] Added socket and program timeout for JSS and JSSE clients so that they exit
gracefully
[4] Split TLS and SSLv3 in seperate mothods in JSSE_SSLclient.java
2005-04-25 21:28:12 +00:00
christophe.ravel.bugs%sun.com 6e7639c991 238319: Sun packages changes
Uprev rpm release to 4.
2005-04-20 00:18:26 +00:00
christophe.ravel.bugs%sun.com 5e63b7f6ea Changing beta flag to RTM. 2005-04-19 22:53:46 +00:00
sandeep.konchady%sun.com 49698a5486 In JSSE_SSLServer.java and JSS_SSLServer.java added a timeout
mechanism to shutdown the server after 2 min. Also added
socket timeouts in JSSE_SSLClient.java and JSS_SSLClient.java
2005-04-14 17:37:49 +00:00