419 Commits

Author SHA1 Message Date
wtchang%redhat.com
7b145dd9ac 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
2ae43f58d5 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
f25e5155ef 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
913985ea4b 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
343315772e 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
3f8cd3784d 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
50fdf2b49f 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
cba8f8955c 238319: Sun packages changes.
Install 64 bit libraries in lib64 on Linux.
2005-09-08 22:23:54 +00:00
glen.beasley%sun.com
2a16957317 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
fca60837f2 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
09666e78db Adding JSS SelfServ test client and server. 2005-09-02 20:58:08 +00:00
christophe.ravel.bugs%sun.com
a58024a52e Uprev JSS version to 4.1.1 Beta. 2005-08-24 23:39:12 +00:00
sandeep.konchady%sun.com
9c0e116e76 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
62ee9e4e59 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
c3281b24a7 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
f970690695 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
4b431e7e5c 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
ccba0763e9 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
5265f6fc95 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
743c52ba12 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
81a95c5db7 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
73047c5d9c 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
dd8d873edd 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
18a44a9aad Change NSS version to 3.10.1 Beta. 2005-04-27 20:28:39 +00:00
sandeep.konchady%sun.com
6b0615c933 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
7c66d1bccc 238319: Sun packages changes
Uprev rpm release to 4.
2005-04-20 00:18:27 +00:00
christophe.ravel.bugs%sun.com
df9ef8a155 Changing beta flag to RTM. 2005-04-19 22:53:46 +00:00
sandeep.konchady%sun.com
f6fb7c1979 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
glen.beasley%sun.com
a7873159bf 282732 read/write/accept/close thread protection 2005-04-05 20:41:46 +00:00
christophe.ravel.bugs%sun.com
0612631846 238319: Sun packages changes.
Rpm release: 3
2005-04-05 17:36:27 +00:00
christophe.ravel.bugs%sun.com
3c6218acb3 283383 Create JSS and JSSE client/server test programs that intercommunicates to validate ciphers
Java path and options are passed from all.pl to startJssServ.sh and
startJsseServ.sh.
2005-04-04 18:07:00 +00:00
christophe.ravel.bugs%sun.com
28d7bfd55e 283383: Create JSS and JSSE client/server test programs that intercommunicates to validate ciphers.
Fix issue with testing optimized version
Wrong jar file was taken for test with BUILD_OPT=1
2005-04-03 00:24:58 +00:00
sandeep.konchady%sun.com
1bb3982eb2 Adding 7 java files, 2 shell scripts and modified all.pl for
bug id : 283383.

Java files added are JSS and JSSE server and clients. The purpose
of which is to intercommunicate between JSS and JSSE to validate
supported ciphers between the two.  startJss*.sh are scripts for
starting JSS and JSSE servers. These tests are added to all.pl
to run as a part of overall JSS test suite.

Currently these tests do not report errors when a cipher that is
suppose to work between JSS and JSSE fails.  I will file another
feature enhancement request to address this.
2005-03-30 22:19:56 +00:00
saul.edwards%sun.com
6c4afa32b5 Bug 225635 : GenerateCertRequest leaks arena 2005-03-25 21:12:05 +00:00
christophe.ravel.bugs%sun.com
0f7ac130b6 238319: Sun packages changes
Uprev rpm release number.
2005-03-11 23:06:42 +00:00
christophe.ravel.bugs%sun.com
d6f8d3ee7b 238319: Sun packages changes.
RPM release starts at 1 for JSS 3.1.5
2005-03-08 23:54:52 +00:00
christophe.ravel.bugs%sun.com
7e54357dc5 238319: Sun packages changes.
Add Mozilla license.
2005-02-26 03:40:37 +00:00
gerv%gerv.net
f45b5900c8 Bug 236613: change to MPL/LGPL/GPL tri-license. 2005-02-02 22:28:27 +00:00
glen.beasley%sun.com
7791836733 Rename HCL to NSS 171027 2005-01-28 19:16:12 +00:00
christophe.ravel.bugs%sun.com
7115486487 JSS tip: Version = 4.1 beta 2004-12-07 23:46:40 +00:00
christophe.ravel.bugs%sun.com
a8a211f314 Move to version 4.0.1 Beta. 2004-12-01 01:19:58 +00:00
wchang0222%aol.com
0d2bd6bda7 Bugzilla bug 270686: in getStatusString(), we should test statusString for
null before invoking the toString() method on it.  The patch is contributed
by Christine Ho of AOL. r=wtc,glen.beasley.
2004-11-18 22:56:11 +00:00
wchang0222%aol.com
7d4312d780 Bugscape bug 57238: implemented CMCCertId, OtherMsg, and TaggedContentInfo
for CMC.  The patch is contributed by Christine Ho of AOL. r=wtc.
Added Files: CMCCertId.java OtherMsg.java TaggedContentInfo.java
2004-11-09 06:01:15 +00:00
glen.beasley%sun.com
613c73fc0a 220223 TokenException caused by left over cert8.db 2004-10-22 00:00:51 +00:00
christophe.ravel.bugs%sun.com
f7f7257c13 238319: Sun packages changes. 2004-10-20 19:45:57 +00:00
wchang0222%aol.com
140228c846 Bugzilla bug 264257: added GetCert and LRA Pop witness controls to CMC.
The code is contributed by Christine Ho of AOL.  r=wtc.
Added Files: GetCert.java LraPopWitness.java
2004-10-13 23:35:39 +00:00
glen.beasley%sun.com
428ccbac52 181540 support SHA-256, SHA-384, SHA-512 2004-10-12 23:24:40 +00:00
christophe.ravel.bugs%sun.com
ea68779909 238319: Sun packages changes. 2004-10-12 22:37:12 +00:00
christophe.ravel.bugs%sun.com
7dd5f656a6 238319: Sun packages changes. 2004-10-12 17:54:47 +00:00
christophe.ravel.bugs%sun.com
02a2ebdc30 238319: Sun packages changes. 2004-10-09 01:53:26 +00:00