Commit Graph

5425 Commits

Author SHA1 Message Date
julien.pierre.bugs%sun.com
48b2d654bd Fix for 292390. NSS tools with missing command-line operands cause crash. r=nelson 2005-09-19 20:59:46 +00:00
julien.pierre.bugs%sun.com
7e8884e00e Fix for 293686 . signver has command-line options with optional arguments. r=nelsonb 2005-09-19 20:52:11 +00:00
christophe.ravel.bugs%sun.com
41da874bf6 238319: Sun packages changes.
Change libfreebl name on Solaris x86 (following changes from Bugzilla 303508).
2005-09-19 19:12:24 +00:00
bzbarsky%mit.edu
1d3384b1c6 Only do expensive GetName() calls if we're actually logging. Bug 304847,
r=kaie, sr=dmose
2005-09-19 03:23:21 +00:00
cst%andrew.cmu.edu
7ce62d0cd1 Bug 284636 Fix typo in Website Certified by an Unknown Authority alert
Patch by stephend and Kurt <supernova_00@yahoo.com> r=kaie sr=bzbarsky
2005-09-19 00:05:02 +00:00
wtchang%redhat.com
13f41d4840 Bugzilla bug 303508: a more elegant way to decide when we need to prefix
LIBRARY_VERSION with '_'. r=nelsonb.
2005-09-16 23:18:01 +00:00
julien.pierre.bugs%sun.com
d42e92ad88 Fix hoarked build from previous checkin. Doh. 2005-09-16 21:28:20 +00:00
wtchang%redhat.com
b427dc6efe Bugzilla Bug 298517: when in FIPS mode, impose minimum password length and
quality to ensure a password guessing probability of less than 1 in
10,000,000, and impose a one second delay after failed login attempt to
allow at most 60 login attempts per minute.  r=relyea,nelsonb.
Modified files: fipstokn.c pkcs11.c pkcs11i.h
2005-09-16 20:37:58 +00:00
julien.pierre.bugs%sun.com
c56d3589f6 Fix for bug 127960 . Add SSL force handshake APIs which take a timeout . r=nelson 2005-09-16 20:33:09 +00:00
smfr%smfr.org
8bda56063a Fix bug 307293: make sure we initialize the mType and mTag members of nsNSSASN1Object. r=wtchang, sr=rrelyea. 2005-09-16 18:57:55 +00:00
wtchang%redhat.com
2e75eae9d5 Bugzilla Bug 288728: handle invalid values of recipient identifier type.
r=jpierre,relyea.
2005-09-16 17:54:31 +00:00
wtchang%redhat.com
019a13cbeb Bugzilla Bug 288728: use a whitelist instead of a blacklist when checking
for invalid values of "type". r=jpierre,relyea.
2005-09-16 17:52:37 +00:00
wtchang%redhat.com
dcad184fa4 Bugzilla Bug 303508: removed the underscore from the name of the "single"
freebl shared library (freebl_3.dll -> freebl3.dll).  Do the recursive
child builds without changing directories.  This fixed the BUILD_TREE build
problem. r=nelsonb,saul.edwards.
Modified files: Makefile freebl.def manifest.mn
2005-09-16 17:17:45 +00:00
wtchang%redhat.com
d67071df3f Bugzilla Bug 303508: enhanced the makefile rule for $(MAPFILE). Added
the new variable MAPFILE_SOURCE instead of the hardcoded
$(LIBRARY_NAME).def to represent the "source" mapfile, and use $< to
refer to the "source" mapfile (prerequisite of the target) in
PROCESS_MAP_FILE. r=nelsonb.
Modified Files:
	AIX.mk BSD_OS.mk Darwin.mk FreeBSD.mk HP-UX.mk IRIX.mk
	Linux.mk Linux2.1.mk Linux2.2.mk Linux2.4.mk Linux2.5.mk
	Linux2.6.mk NCR3.0.mk NEC4.2.mk NetBSD.mk OS2.mk OSF1.mk
	OpenUNIX.mk OpenVMS.mk ReliantUNIX.mk SCO_SV3.2.mk SunOS5.mk
	UNIXWARE2.1.mk WIN16.mk WIN32.mk WINCE.mk rules.mk ruleset.mk
2005-09-16 17:09:23 +00:00
wtchang%redhat.com
65241f7ef4 Removed an unnecessary -L linker flag. r=nelsonb,saul.edwards. 2005-09-16 17:02:49 +00:00
wtchang%redhat.com
3eac80068d Bugzilla Bug 303508: code cleanup. r=nelsonb,jpierre. 2005-09-16 16:59:22 +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
nelsonb%netscape.com
9499265f5c Plug leaks in SSL bypass code. Add freeit argument to HMAC_Destroy function.
Change existing callers to pass this argument.  Call HMAC_Destroy from SSL.
Bug 305147. r=Julien.Pierre
Modified Files:  freebl/alghmac.c freebl/alghmac.h freebl/loader.c
  freebl/loader.h freebl/tlsprfalg.c softoken/lowpbe.c softoken/pkcs11c.c
  ssl/ssl3con.c
2005-09-14 04:12:50 +00:00
wtchang%redhat.com
f889a99cbb Bugzilla Bug 301554: Clear the 'present' flag if slot fails to refresh.
relyea wrote the patch. r=wtc,nelsonb.
2005-09-14 01:35:02 +00:00
cbiesinger%web.de
853c2b4645 bug 292368 remove obsolete file; replaced by nsICryptoHash 2005-09-12 17:51:57 +00:00
nelsonb%netscape.com
fdffe11308 Fix regression introduced in last checkin. If the caller disables the
use of locks while locks are in use, don't forget to unlock the locks
already locked on the stack.  bug 305147. r=julien.pierre
2005-09-10 01:18:40 +00:00
saul.edwards%sun.com
d016e006b8 Bug 305147: add -B (bypass SSL) and -s (disable SSL locking) to server and client commands; add bypass testing to SSL test suite. 2005-09-09 04:50:07 +00:00
nelsonb%netscape.com
4b56704437 Implement two new SSL socket options: SSL_BYPASS_PKCS11 and SSL_NO_LOCKS.
Reorganize the SSL Socket structure contents to obviate ssl3 pointer.
Move much of the ECC code from ssl3con to new file ssl3ecc.c.  derive.c
implements derivation of the SSL/TLS master secret and the encryption and
MAC keys and IVs without using PKCS11. Bug 305147. r=rrelyea.
Modified Files: ssl/config.mk ssl/manifest.mn ssl/ssl.h ssl/ssl3con.c
    ssl/ssl3gthr.c ssl/sslauth.c ssl/sslcon.c ssl/ssldef.c ssl/sslgathr.c
    ssl/sslimpl.h ssl/sslinfo.c ssl/sslnonce.c ssl/sslsecur.c ssl/sslsnce.c
    ssl/sslsock.c
Added Files: ssl/derive.c ssl/ssl3ecc.c
2005-09-09 03:02:16 +00:00
nelsonb%netscape.com
1d31068271 Export function PK11_MapSignKeyType for use by libSSL. Bug 305147.
r=relyea.
Modified Files: nss/nss.def pk11wrap/pk11mech.c pk11wrap/pk11obj.c
	pk11wrap/pk11pub.h pk11wrap/secmodi.h
2005-09-09 02:03:57 +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
saul.edwards%sun.com
80e0981d59 Packaging for bug 303508: new freebl library names for Solaris packages.
Note that Linux does not require these changes because the Makefile picks up
all .so and .chk files for Linux packages.
2005-09-08 02:25:49 +00:00
wtchang%redhat.com
4250ad5929 Bugzilla Bug 299197: define two bitflags for every PKCS #11 object
attribute with no exceptions. renamed PK11_ATTR_READONLY as
PK11_ATTR_UNMODIFIABLE.  In pk11_OpFlagsToAttributes, backed out a change
I made before.  Made pk11_AttrFlagsToAttributes table-driven. In
pk11_loadPrivKeyWithFlags, fixed the bug (always loading the public key as
a token object).  Other code cleanups. r=relyea,nelsonb.
Modified files: pk11akey.c pk11obj.c pk11pub.h pk11skey.c secmodt.h
2005-09-07 18:23:35 +00:00
saul.edwards%sun.com
0194469cc5 Bug 303508: Add freebl shared libs that do 64-bit integer math. Bug 274984: softoken fails to load freebl in setuid programs. freebl becomes a shared library on all platforms. r=nelson
Modified Files:
	coreconf/HP-UXB.11.mk coreconf/SunOS5.mk
	nss/cmd/shlibsign/Makefile nss/cmd/shlibsign/manifest.mn
	nss/lib/freebl/Makefile nss/lib/freebl/arcfour.c
	nss/lib/freebl/blapi.h nss/lib/freebl/config.mk
	nss/lib/freebl/ldvector.c nss/lib/freebl/loader.c
	nss/lib/freebl/loader.h nss/lib/freebl/manifest.mn
Added Files:
	nss/lib/freebl/freebl.def
2005-09-07 02:47:16 +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
glen.beasley%sun.com
8ebcacd943 305984 update FIPS values for cipher suites file=sslinfo.c r=bob,sr=wtc 2005-09-06 17:15:32 +00:00
smfr%smfr.org
c6ba13f2ab Fix bug 306795: nsNSSCertificateDB::IsCertTrusted() fails to check the return value from CERT_GetCertTrust(), so can return random trust bits. r=dougt, sr=rrelyea 2005-09-04 19:05:01 +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
julien.pierre.bugs%sun.com
132ddbe43e Fix 306785 . Memory leaks in PQG_ParamGenSeedLen . r=nelson 2005-09-02 20:05:35 +00:00
wtchang%redhat.com
db235ef59a Bugzilla Bug 299197: added PK11AttrFlags and PK11_GenerateKeyPairWithFlags.
Modified PK11_TokenKeyGenWithFlags to take a PK11AttrFlags parameter.
PK11AttrFlags controls the values of commonly used PKCS #11 object
attributes that have Boolean values. r=relyea,nelsonb.
Modified Files:
	nss/nss.def pk11wrap/pk11akey.c pk11wrap/pk11obj.c
	pk11wrap/pk11pub.h pk11wrap/pk11skey.c pk11wrap/secmodi.h
	pk11wrap/secmodt.h
2005-09-02 18:25:04 +00:00
wtchang%redhat.com
184d7ab678 Bugzilla Bug 305835: removed NSS_ENABLE_ECC ifdefs under nss/lib except
nss/lib/{freebl,softoken,ssl}. r=nelsonb.
Modified Files:
	cryptohi/keyhi.h cryptohi/manifest.mn cryptohi/seckey.c
	cryptohi/secsign.c freebl/ec.c pk11wrap/manifest.mn
	pk11wrap/pk11akey.c pk11wrap/pk11cert.c pk11wrap/pk11mech.c
	pk11wrap/pk11obj.c pk11wrap/pk11skey.c pkcs12/manifest.mn
	pkcs12/p12d.c pkcs7/config.mk pkcs7/p7decode.c
	pkcs7/p7encode.c smime/cmssiginfo.c smime/cmsutil.c
	smime/config.mk
2005-09-02 01:24:57 +00:00
wtchang%redhat.com
4113e9229d Bugzilla Bug 303507: changed GCC's default OPTIMIZER back to -O2.
r=saul.edwards.
2005-09-02 00:59:00 +00:00
bsmedberg%covad.net
a63c75a8a1 Bug 306615 - Fold PSM into libxul r=darin 2005-09-01 12:43:58 +00:00
wtchang%redhat.com
afccecc775 Bugzilla Bug 257693: code cleanup. 1. Change "X9.63" to "X9.62". 2. In
EC_ValidatePublicKey, set error codes and handle a NULL return from
ECGroup_fromName.  3. In the ECGroupStr structure, move the validate_point
field up.  4. In the test cases, if the tests that should fail, passed,
say so in the error messages.  r=douglas@stebila.ca.
Modified Files:
	blapi.h ec.c ecl/ecl-priv.h ecl/ecl.c ecl/ecl.h
	ecl/tests/ec2_test.c ecl/tests/ecp_test.c
2005-08-27 01:09:22 +00:00
gavin%gavinsharp.com
5c09c35d46 Bug 263182: Page Info (Security tab) doesn't explain mixed secure/insecure, r=kaie.bugs, sr=neil.parkwaycc.co.uk 2005-08-26 20:34:31 +00:00
dougt%meer.net
7c0ee6b9d3 Bug 302284. add xpi hash support to InstallTrigger.install(). r=dveditz, sr=shaver, a=asa 2005-08-26 06:46:21 +00:00
julien.pierre.bugs%sun.com
32714968eb Fix for 297802 . r=wtchang . Add $(OS_LIBS) to MKSHLIB rules.
Add -z defs linker option for Solaris and Linux .
Also add -z ignore on Solaris .
2005-08-26 02:17:05 +00:00
wtchang%redhat.com
dd1fe47c6d Bugzilla bug 302212: backed out the previous checkin. The corresponding
Mozilla patch hasn't been checked in yet.
2005-08-25 23:23:40 +00:00
relyea%netscape.com
33f6464950 Bug 302416 NSS root cert module & fortezza should not be using NSPR static libraries
r=wtc
sr-julien
Side effects: Root cert module now works with CKF_OS_LOCKING_OK and not callbacks,
but does not work if CKF_OS_LOCKING_OK == 0 and callbacks are define.
2005-08-25 20:08:27 +00:00
saul.edwards%sun.com
54f6fe8f80 Addendum to 303507 - set default OPTIMIZER for Linux and Solaris gcc builds
to -O3, consolidate flags to Linux.mk.
2005-08-24 23:58:36 +00:00
christophe.ravel.bugs%sun.com
a58024a52e Uprev JSS version to 4.1.1 Beta. 2005-08-24 23:39:12 +00:00
wtchang%redhat.com
d624f9129a Bugzilla Bug 296410: further simplify the code by always referencing the
buffer using the same union member. r=relyea.
VFYContextCVS: ----------------------------------------------------------------------
2005-08-24 23:05:39 +00:00
wtchang%redhat.com
bb71b54311 Bugzilla bug 302670: backed out the use of system zlib because some Linux
distributions are using zlib 1.1.4, which causes our signtool tests to
fail intermittently.  Don't know why.
2005-08-20 01:05:44 +00:00
bienvenu%nventure.com
690785e15a add optional support for mit kerberos for windows, patches by cneberg@gmail.com, r=darin, sr=bienvenu 280792 2005-08-19 14:25:22 +00:00
julien.pierre.bugs%sun.com
22ff330626 Fix AIX build problem 2005-08-18 23:37:31 +00:00