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

460 Коммитов

Автор SHA1 Сообщение Дата
wtchang%redhat.com 530dee8657 Bugzilla Bug 335275: include pk11pqg.h to declare the PK11_PQG_ functions.
The PK11_PQG_ functions operate on PQGParams, so we declare pqgParams as
a pointer to PQGParams, and cast a SECKEYParams pointer to a PQGParams
pointer. (SECKEYParams and PQGParams are isomorphic.)  r=nelson.
2006-04-25 01:26:42 +00:00
sandeep.konchady%sun.com 4c4b627304 Bugzilla bug : 316448. Deprecated references to fortezza in code and test.
sr=glen.beasley
2006-04-07 15:56:50 +00:00
nkwan%redhat.com 63951af952 Updated tip to use NSS_3_11_RTM 2006-04-05 02:06:31 +00:00
nkwan%redhat.com 3363a0947f bugzilla #332608 - added new function to just delete certificate 2006-04-03 23:09:49 +00:00
gerv%gerv.net 41fd37565a Bug 236613: change to MPL/LGPL/GPL tri-license. 2006-03-31 04:41:00 +00:00
nkwan%redhat.com cef89c3f70 bugzilla #331369 - avoid calling fromRaw which calls into a non-ECC compliant NSS function 2006-03-22 21:53:52 +00:00
wtchang%redhat.com 1e7792e844 Bugzilla Bug 322871: moved the three new EC-related JNI function symbols to
a new JSS_4.2.3 section. r=sandeep.konchady.
2006-02-24 23:56:41 +00:00
nkwan%redhat.com 168ad01945 integrated patch 'build fix' from bugzilla #328246 2006-02-24 19:40:34 +00:00
sandeep.konchady%sun.com 701ae3b6eb Bugzilla bug: 328233 Fix for using SunJCE for all platformas that do not
use IBM JDK. sr=Alexei.Volkov
2006-02-23 16:47:17 +00:00
wtchang%redhat.com 564626af0d Bugzilla Bug 322871: Checked in Bob Relyea's patch again.
Add multi-hash ECC to jss (based on the 1.4 JCE).
2006-02-23 01:21:52 +00:00
sandeep.konchady%sun.com 9df872f66f Bugzilla bug: 310368 Missed a file.
sr=Glen r=Alexei
2006-02-21 23:38:58 +00:00
sandeep.konchady%sun.com 7353b4807c Bugzilla bug: 326699 Added check for libjss4.$platform_lib_extension
sr=Alexei.Volkov r=Christophe.Ravel
2006-02-21 23:27:49 +00:00
sandeep.konchady%sun.com 509a25cea2 Bugzilla bug: 310368 Modified JSSE_SSLServer and JSS_SSLClient for proper
cipher preference and communication. sr=Glen.Beasley r=Alexei.Volkov
2006-02-21 23:25:25 +00:00
sandeep.konchady%sun.com 2fa829a716 Bugzilla bug: 322998 Fix for SSLServerSocket.accept() consuming exception
cause. sr=Wan-Teh r=Alexei.Volkov
2006-02-21 22:43:27 +00:00
sandeep.konchady%sun.com 2c88207a24 Bugzilla bug: 317479. Added IBMJCE for tests to work with IBM JDK.
sr=glen.beasley r=alexei.volkov
2006-02-16 19:54:08 +00:00
christophe.ravel.bugs%sun.com 4cc50bbc40 322871: JSS needs to handle ECC keys and certs`
Back out changes by rrelyea (2006-02-10) and glen.beasley (2006-02-14).
r+: wtc
2006-02-14 23:53:05 +00:00
glen.beasley%sun.com 569463eb3e temp build fix 2006-02-14 20:16:45 +00:00
rrelyea%redhat.com 2b4f5e5d00 Add multi-hash ECC to jss (based on the 1.4 JCE). 2006-02-10 22:06:22 +00:00
sandeep.konchady%sun.com 831a7ad015 Bugzilla bug: 324451. Changed JSS version to 4.2.3. sr=glen, r=alexei 2006-02-01 23:18:57 +00:00
sandeep.konchady%sun.com e7333df0cd 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 0d963476e9 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 a639509a88 Current version is JSS 4.2.1 Beta. 2005-12-14 19:53:48 +00:00
sandeep.konchady%sun.com f87d628db7 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 3e057e0799 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 0afeff6110 313798 AES and RC2 Mozilla-JSS fixes r=sandeep, sr=wan-teh 2005-11-19 00:20:53 +00:00
sandeep.konchady%sun.com 848f2d2a1c 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 9e6573e0d5 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 674c455c2e 311934 socket port values are hard coded in the tests sr=sandeepK 2005-11-17 18:34:31 +00:00
wtchang%redhat.com 0ddc82f39a 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 e5e6b59c19 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 897e7f1f64 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 c20c35ab39 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 d348103b57 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 4c538f769b 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 3033b29443 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 972005ad9a 313176 allow JSS to enable more NSS SSLOptions r=wtc, sr=nelson 2005-11-03 23:09:26 +00:00
wtchang%redhat.com e5bbe64221 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 5ae998a3cd 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 b851582ca9 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 99af98bd06 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 63eff804d1 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 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