Removed some remaining SelectVisible calls in favor of CanSeeBug

git-svn-id: svn://10.0.0.236/branches/Bugzilla_PgSQL_branch@121533 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/jss/Makefile

@@ -1,79 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-# have to put this here, instead of in rules.mk, so that Java gets
-# built first
-all:: buildJava
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-include rules.mk
-
-build_coreconf:
-	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)

mozilla/security/jss/build_java.pl

@@ -1,290 +0,0 @@
-#use strict;
-use File::Find;
-use File::Compare;
-use File::Basename;
-use File::stat;
-use File::Copy;
-
-@excluded_sources = qw(
-provider\.new/
-org/mozilla/jss/provider/java/security/KeyFactorySpi1_4\.java
-org/mozilla/jss/pkix/cert/X509Certificate\.java
-samples/
-);
-
-@javah_classes = qw(
-org.mozilla.jss.DatabaseCloser        
-org.mozilla.jss.CryptoManager          
-org.mozilla.jss.crypto.Algorithm        
-org.mozilla.jss.crypto.EncryptionAlgorithm      
-org.mozilla.jss.crypto.PQGParams     
-org.mozilla.jss.crypto.SecretDecoderRing
-org.mozilla.jss.pkcs11.CertProxy        
-org.mozilla.jss.pkcs11.CipherContextProxy 
-org.mozilla.jss.pkcs11.PK11Module 
-org.mozilla.jss.pkcs11.ModuleProxy 
-org.mozilla.jss.pkcs11.PK11Cert     
-org.mozilla.jss.pkcs11.PK11Cipher     
-org.mozilla.jss.pkcs11.PK11KeyWrapper  
-org.mozilla.jss.pkcs11.PK11MessageDigest 
-org.mozilla.jss.pkcs11.PK11PrivKey   
-org.mozilla.jss.pkcs11.PK11PubKey     
-org.mozilla.jss.pkcs11.PK11SymKey      
-org.mozilla.jss.pkcs11.PK11KeyPairGenerator 
-org.mozilla.jss.pkcs11.PK11KeyGenerator
-org.mozilla.jss.pkcs11.PK11Token
-org.mozilla.jss.pkcs11.PrivateKeyProxy  
-org.mozilla.jss.pkcs11.PublicKeyProxy    
-org.mozilla.jss.pkcs11.SymKeyProxy
-org.mozilla.jss.pkcs11.KeyProxy    
-org.mozilla.jss.pkcs11.PK11Token    
-org.mozilla.jss.pkcs11.TokenProxy    
-org.mozilla.jss.pkcs11.PK11Signature  
-org.mozilla.jss.pkcs11.PK11Store       
-org.mozilla.jss.pkcs11.PK11KeyPairGenerator 
-org.mozilla.jss.pkcs11.SigContextProxy
-org.mozilla.jss.pkcs11.PK11RSAPublicKey
-org.mozilla.jss.pkcs11.PK11DSAPublicKey
-org.mozilla.jss.pkcs11.PK11SecureRandom 
-org.mozilla.jss.provider.java.security.JSSKeyStoreSpi
-org.mozilla.jss.SecretDecoderRing.KeyManager
-org.mozilla.jss.ssl.SSLSocket 
-org.mozilla.jss.ssl.SSLServerSocket 
-org.mozilla.jss.ssl.SocketBase 
-org.mozilla.jss.util.Debug
-org.mozilla.jss.util.Password       
-);
-
-@packages = qw(
-org.mozilla.jss
-org.mozilla.jss.asn1
-org.mozilla.jss.crypto
-org.mozilla.jss.pkcs7
-org.mozilla.jss.pkcs10
-org.mozilla.jss.pkcs11
-org.mozilla.jss.pkcs12
-org.mozilla.jss.pkix.primitive
-org.mozilla.jss.pkix.cert
-org.mozilla.jss.pkix.cmc
-org.mozilla.jss.pkix.cmmf
-org.mozilla.jss.pkix.cms
-org.mozilla.jss.pkix.crmf
-org.mozilla.jss.provider.java.security
-org.mozilla.jss.provider.javax.crypto
-org.mozilla.jss.SecretDecoderRing
-org.mozilla.jss.ssl
-org.mozilla.jss.tests
-org.mozilla.jss.util
-);
-
-
-# setup variables
-setup_vars(\@ARGV);
-
-# run the command with its arguments
-my $cmd = (shift || "build");   # first argument is command
-grep { s/(.*)/"$1"/ } @ARGV;    # enclose remaining arguments in quotes
-my $args = join(",",@ARGV);     # and comma-separate them
-eval "$cmd($args)";             # now run the command
-if( $@ ) {
-    die $@;                     # errors in eval will be put in $@
-}
-
-# END
-
-sub grab_cmdline_vars {
-    my $argv = shift;
-
-    while( $$argv[0] =~ /(.+)=(.*)/ ) {
-        $cmdline_vars{$1} = $2;
-        shift @$argv;
-    }
-}
-
-sub dump_cmdline_vars {
-    print "Command variables:\n";
-    for(keys %cmdline_vars) {
-        print "$_=" . $cmdline_vars{$_} . "\n";
-    }
-}
-
-sub setup_vars {
-    my $argv = shift;
-
-    grab_cmdline_vars($argv);
-    dump_cmdline_vars();
-
-    $ENV{JAVA_HOME} or die "Must specify JAVA_HOME environment variable";
-    $javac = "$ENV{JAVA_HOME}/bin/javac";
-    $javah = "$ENV{JAVA_HOME}/bin/javah";
-    $javadoc = "$ENV{JAVA_HOME}/bin/javadoc";
-
-    $dist_dir = $cmdline_vars{SOURCE_PREFIX};
-    $jce_jar = $ENV{JCE_JAR};
-
-    $class_release_dir = $cmdline_vars{SOURCE_RELEASE_PREFIX};
-    if( $ENV{BUILD_OPT} ) {
-        $class_dir = "$dist_dir/classes";
-        $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DIR}";
-        $javac_opt_flag = "-O";
-        $debug_source_file = "org/mozilla/jss/util/Debug_ship.jnot";
-    } else {
-        $class_dir = "$dist_dir/classes_DBG";
-        $class_release_dir .= "/$cmdline_vars{SOURCE_RELEASE_CLASSES_DBG_DIR}";
-        $javac_opt_flag = "-g";
-        $debug_source_file = "org/mozilla/jss/util/Debug_debug.jnot";
-    }
-    $jni_header_dir = "$dist_dir/private/jss/_jni";
-
-    if( $jce_jar ) {
-        $classpath = "-classpath $jce_jar";
-    }
-}
-
-sub clean {
-    print_do("rm -rf $class_dir");
-    print_do("rm -rf $jni_header_dir");
-}
-
-sub build {
-
-    #
-    # copy the appropriate debug file
-    #
-    my $debug_target_file = "org/mozilla/jss/util/Debug.java";
-    if( compare($debug_source_file, $debug_target_file) ) {
-        copy($debug_source_file, $debug_target_file) or die "Copying file: $!";
-    }
-
-
-    #
-    # recursively find *.java
-    #
-    my %source_list;
-    find sub {
-        my $name = $File::Find::name;
-        if( $name =~ /\.java$/) { 
-            $source_list{$File::Find::name} = 1;
-        }
-    }, ".";
-
-    #
-    # weed out files that are excluded or don't need to be updated
-    #
-    my $file;
-    foreach $file (keys %source_list) {
-        my $pattern;
-        foreach $pattern (@excluded_sources) {
-            if( $file =~ /$pattern/ ) {
-                delete $source_list{$file};
-            }
-        }
-        unless( java_source_needs_update( $file, $class_dir ) ){
-            delete $source_list{$file};
-        }
-    }
-    my @source_list = keys(%source_list);
-
-    #
-    # build the java sources
-    #
-    if( scalar(@source_list) > 0 ) {
-        ensure_dir_exists($class_dir);
-        print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
-            "$classpath " . join(" ",@source_list));
-    }
-
-    #
-    # create the JNI header files
-    #
-    ensure_dir_exists($jni_header_dir);
-    print_do("$javah -classpath $class_dir -d $jni_header_dir " .
-        (join " ", @javah_classes) );
-}
-
-sub print_do {
-    my $cmd = shift;
-    print "$cmd\n";
-    system($cmd);
-    my $exit_status = $?>>8;
-    $exit_status and die "Command failed ($exit_status)\n";
-}
-
-sub needs_update {
-    my $target = shift;
-    my @dependencies = @_;
-
-    my $target_mtime = (stat($target))[9];
-    my $dep;
-    foreach $dep( @dependencies ) {
-        my $dep_mtime = (stat($dep))[9];
-        if( $dep_mtime > $target_mtime ) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-# A quick-and-dirty way to guess whether a .java file needs to be rebuilt.
-# We merely look for a .class file of the same name. This won't work if
-# the source file's directory is different from its package, and it
-# doesn't know about nested or inner classes.
-# source_file: the relative path to the source file ("org/mozilla/jss/...")
-# dest_dir: the directory where classes are output ("../../dist/classes_DBG")
-# Returns 1 if the source file is newer than the class file, or the class file
-#   doesn't exist. Returns 0 if the class file is newer than the source file.
-sub java_source_needs_update {
-    my $source_file = shift;
-    my $dest_dir = shift;
-
-    my $class_dir = "$dest_dir/" . dirname($source_file);
-    my $class_file = basename($source_file);
-    $class_file =~ s/\.java/.class/;
-    $class_file = $class_dir . "/" . $class_file;
-    if( -f $class_file ) {
-        my $class_stat = stat($class_file);
-        my $source_stat = stat($source_file);
-
-        if( $source_stat->mtime > $class_stat->mtime) {
-            # class file exists and is out of date
-            return 1;
-        } else {
-            #class file exists and is up to date
-            return 0;
-        }
-    } else {
-        # class file hasn't been generated yet.
-        return 1;
-    }
-}
-
-# Recursively makes the given directory. Dies at the first sign of trouble
-sub ensure_dir_exists {
-    my $dir = shift;
-    my $parent = dirname($dir);
-    if( $parent ne $dir ) {
-        ensure_dir_exists($parent);
-    }
-    if( ! -d $dir ) {
-        mkdir($dir, 0777) or die "Failed to mkdir $dir: $!";
-    }
-}
-
-sub release {
-    # copy all class files into release directory
-    ensure_dir_exists("$class_release_dir");
-    print_do("cp -r $class_dir/* $class_release_dir");
-}
-
-sub javadoc {
-    my $html_header_opt;
-    if( $ENV{HTML_HEADER} ) {
-        $html_header_opt = "-header '$ENV{HTML_HEADER}'";
-    }
-    ensure_dir_exists("$dist_dir/jssdoc");
-    my $targets = join(" ", @packages);
-    print "$targets\n";
-    print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-    print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
-    print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
-}

mozilla/security/jss/config/config.mk

@@ -1,69 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#
-# Configuration information unique to the "sectools" component
-#
-
-
-#######################################################################
-#  Local "sectools" component library link options                    #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/linkage.mk
-
-#######################################################################
-#  Local "sectools" component STATIC system library names             #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/static.mk
-
-#######################################################################
-#  Local "sectools" component DYNAMIC system library names            #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/dynamic.mk
-
-# Stricter semantic checking for SunOS compiler. This catches calling
-# undeclared functions, a major headache during debugging.
-ifeq ($(OS_ARCH), SunOS)
-    OS_CFLAGS += -v
-endif
-
-ifeq ($(OS_ARCH), WINNT)
-LINK_DLL += -LIBPATH:$(SOURCE_LIB_DIR)
-LINK_DLL += -LIBPATH:$(JAVA_HOME)/$(JAVA_LIBDIR)
-LINK_DLL += $(foreach file,$(LD_LIBS),-DEFAULTLIB:"$(notdir $(file))")
-endif
-
-CFLAGS += -I$(JAVA_HOME)/include

mozilla/security/jss/config/dynamic.mk

@@ -1,146 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# Initialize DYNAMIC system library names on some platforms           #
-#######################################################################
-
-#
-# AIX platforms
-#
-
-
-ifeq ($(OS_ARCH),AIX)
-ifeq ($(OS_RELEASE),4.1)
-	DLLSYSTEM += -lsvld -lC_r -lC -lpthreads -lc_r -lm /usr/lib/libc.a
-else
-	DLLSYSTEM += -ldl -lC_r -lC -lpthreads -lc_r -lm /usr/lib/libc.a
-endif
-endif
-
-#
-# HP/UX platforms
-#
-
-ifeq ($(OS_ARCH),HP-UX)
-	ifeq ($(USE_PTHREADS), 1)
-		DLLSYSTEM += -lpthread
-	endif
-	ifeq ($(PTHREADS_USER), 1)
-		DLLSYSTEM += -lpthread
-	endif
-	ifeq ($(OS_RELEASE),A.09.03)
-		DLLSYSTEM += -ldld -L/lib/pa1.1 -lm
-	else
-		DLLSYSTEM += -ldld -lm -lc 
-	endif
-endif
-
-#
-# IRIX platforms
-#
-
-ifeq ($(OS_ARCH), IRIX)
-	ifeq ($(USE_PTHREADS), 1)
-		DLLSYSTEM += -lpthread
-	endif
-endif
-
-#
-# Linux platforms
-#
-
-ifeq ($(OS_ARCH), Linux)
-	DLLSYSTEM += -ldl -lpthread -lm
-endif
-
-#
-# NCR platforms
-#
-
-ifeq ($(OS_ARCH), NCR)
-	DLLSYSTEM += -lsocket -ldl -lnsl -lc
-endif
-
-#
-# OSF 1 platforms
-#
-
-ifeq ($(OS_ARCH),OSF1)
-	ifneq ($(OS_RELEASE),V2.0)
-		DLLSYSTEM += -lc_r
-	endif
-	ifeq ($(USE_PTHREADS), 1)
-		DLLSYSTEM += -lpthread -lrt
-	endif
-	ifeq ($(USE_IPV6), 1)
-		DLLSYSTEM += -lip6
-	endif
-endif
-
-#
-# SCO platforms
-#
-
-ifeq ($(OS_ARCH), SCO_SV)
-	DLLSYSTEM += -lsocket -ldl -lnsl -lc
-endif
-
-#
-# Solaris platforms
-#
-
-ifeq ($(OS_ARCH), SunOS)
-	ifneq ($(OS_RELEASE), 4.1.3_U1)
-		DLLSYSTEM += -lthread -lposix4 -lsocket -lnsl -lintl -ldl
-	endif
-endif
-
-#
-# UNIXWARE platforms
-#
-
-ifeq ($(OS_ARCH), UNIXWARE)
-	DLLSYSTEM += -lsocket
-endif
-
-#
-# Windows platforms
-#
-
-ifeq ($(OS_ARCH),WINNT)
-	ifneq ($(OS_TARGET),WIN16)
-		DLLSYSTEM += wsock32.lib winmm.lib
-	endif
-endif
-

mozilla/security/jss/config/linkage.mk

@@ -1,94 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# Adjust variables for component library linkage on some platforms    #
-#######################################################################
-
-#
-# AIX platforms
-#
-
-ifeq ($(OS_ARCH),AIX)
-	LDOPTS += -blibpath:.:$(PWD)/$(SOURCE_LIB_DIR):/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib 
-endif
-
-#
-# HP/UX platforms
-#
-
-ifeq ($(OS_ARCH), HP-UX)
-	LDOPTS += -Wl,+s,+b,$(PWD)/$(SOURCE_LIB_DIR)
-endif
-
-#
-# IRIX platforms
-#
-
-ifeq ($(OS_ARCH), IRIX)
-	LDOPTS += -rpath $(PWD)/$(SOURCE_LIB_DIR)
-endif
-
-#
-# OSF 1 platforms
-#
-
-ifeq ($(OS_ARCH), OSF1)
-	LDOPTS += -rpath $(PWD)/$(SOURCE_LIB_DIR) -lpthread
-endif
-
-#
-# Solaris platforms
-#     NOTE:  Disable optimization on SunOS4.1.3
-#
-
-ifeq ($(OS_ARCH), SunOS)
-	ifneq ($(OS_RELEASE), 4.1.3_U1)
-		ifdef NS_USE_GCC
-			LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(SOURCE_LIB_DIR)
-		else
-			LDOPTS += -R $(PWD)/$(SOURCE_LIB_DIR)
-		endif
-	else
-		OPTIMIZER =
-	endif
-endif
-
-#
-# Windows platforms
-#
-
-ifeq ($(OS_ARCH), WINNT)
-	LDOPTS    += -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-endif
-

mozilla/security/jss/config/rules.mk

@@ -1,39 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-###                                                                 ###
-###              R U L E S   O F   E N G A G E M E N T              ###
-###                                                                 ###
-#######################################################################
-

mozilla/security/jss/config/static.mk

@@ -1,138 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# Initialize STATIC system library names on some platforms            #
-#######################################################################
-
-#
-# AIX platforms
-#
-
-ifeq ($(OS_ARCH),AIX)
-ifeq ($(OS_RELEASE),4.1)	
-	LIBSYSTEM += /lib/libsvld.a /lib/libC_r.a /lib/libC.a /lib/libpthreads.a /lib/libc_r.a /lib/libm.a /lib/libc.a
-else 
-	LIBSYSTEM += -ldl /lib/libC_r.a /lib/libC.a /lib/libpthreads.a /lib/libc_r.a /lib/libm.a /lib/libc.a
-	endif
-endif
-
-
-#
-# HP/UX platforms
-#
-
-ifeq ($(OS_ARCH),HP-UX)
-	ifeq ($(USE_PTHREADS), 1)
-		LIBSYSTEM += -lpthread
-	endif
-	ifeq ($(PTHREADS_USER), 1)
-		LIBSYSTEM += -lpthread
-	endif
-	ifeq ($(OS_RELEASE),A.09.03)
-		LIBSYSTEM += -ldld -L/lib/pa1.1 -lm
-	else
-		LIBSYSTEM += -ldld -lm -lc 
-	endif
-endif
-
-#
-# Linux platforms
-#
-
-ifeq ($(OS_ARCH), Linux)
-	LIBSYSTEM += -ldl
-endif
-
-#
-# IRIX platforms
-#
-
-ifeq ($(OS_ARCH), IRIX)
-	ifeq ($(USE_PTHREADS), 1)
-		LIBSYSTEM += -lpthread
-	endif
-endif
-
-#
-# OSF 1 platforms
-#
-
-ifeq ($(OS_ARCH),OSF1)
-	ifneq ($(OS_RELEASE),V2.0)
-		LIBSYSTEM += -lc_r
-	endif
-	ifeq ($(USE_PTHREADS), 1)
-		LIBSYSTEM += -lpthread -lrt
-	endif
-	ifeq ($(USE_IPV6), 1)
-		LIBSYSTEM += -lip6
-	endif
-endif
-
-#
-# Solaris platforms
-#
-
-ifeq ($(OS_ARCH), SunOS)
-	ifneq ($(OS_RELEASE), 4.1.3_U1)
-		ifeq ($(OS_RELEASE), 5.5.1_i86pc)
-			LIBSYSTEM += -lsocket -lnsl -lintl -ldl
-		else
-			ifeq ($(OS_RELEASE), 5.6_i86pc)
-				LIBSYSTEM += -lsocket -lnsl -lintl -ldl
-			else
-				LIBSYSTEM += -lthread -lposix4 /lib/libsocket.a /lib/libnsl.a /lib/libintl.a -ldl
-			endif
-		endif
-	endif
-endif
-
-#
-# UNIXWARE platforms
-#
-
-ifeq ($(OS_ARCH), UNIXWARE)
-	LIBSYSTEM += -lsocket
-endif
-
-#
-# Windows platforms
-#
-
-ifeq ($(OS_ARCH),WINNT)
-	ifneq ($(OS_TARGET),WIN16)
-		LIBSYSTEM += wsock32.lib winmm.lib
-	endif
-endif
-

mozilla/security/jss/jss.html

@@ -1,97 +0,0 @@
-<html>
-<!--
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is the Netscape Security Services for Java.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corporation.  Portions created by Netscape are 
-   - Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   - 
-   - Alternatively, the contents of this file may be used under the
-   - terms of the GNU General Public License Version 2 or later (the
-   - "GPL"), in which case the provisions of the GPL are applicable 
-   - instead of those above.  If you wish to allow use of your 
-   - version of this file only under the terms of the GPL and not to
-   - allow others to use your version of this file under the MPL,
-   - indicate your decision by deleting the provisions above and
-   - replace them with the notice and other provisions required by
-   - the GPL.  If you do not delete the provisions above, a recipient
-   - may use your version of this file under either the MPL or the
-   - GPL.
-  -->
-<head>
-<title>Netscape Security Services for Java</title>
-</head>
-
-<body bgcolor="white" text="black">
-<!--font face="sans-serif"-->
-<center><h1>Netscape Security Services for Java</h1></center>
-
-Netscape Security Services for Java (JSS) is an interface allowing Java applications
-to use the Secure Sockets Layer protocol.  The interface is implemented with the
-FIPS-validated Netscape Security Services library.
-It consists of a system-dependent dynamic library (<code>libjss.so</code>
-on UNIX, <code>jss.dll</code> on Windows) and a ZIP file
-(<code>jss.zip</code>) containing system-independent Java classes.
-These classes are compatible with JDK 1.1 or later <b>using the native
-thread implementation (not green threads)</b>.
-
-<h2>Building Applications with JSS</h2>
-To construct Java applications that use JSS, you must:
-<ul>
-<li>Call the JSS classes from your application.
-<li>When compiling your application, put <code>jss.zip</code> in your
-<code>CLASSPATH</code>.
-<li>When running your application, put <code>libjss.so</code> in your
-<code>LD_LIBRARY_PATH</code> (on UNIX) or <code>jss.dll</code>
-in your <code>PATH</code> (on Windows), and put
-<code>jss.zip</code> in your <code>CLASSPATH</code>.
-</ul>
-
-<h2>Programming with JSS</h2>
-Before the SSL classes can be used,
-<a href="javadoc/org/mozilla/jss/NSSInit.html#initialize(java.lang.String, java.lang.String, java.lang.String)">
-<code>NSSInit.initialize</code></a> must be called to open the security
-databases and initialize the random number generator.
-<a href="javadoc/org/mozilla/jss/NSSInit.html#setPasswordCallback(org.mozilla.jss.util.PasswordCallback)"><code>
-NSSInit.setPasswordCallback</code></a> may be called to change the password
-callback; the default is to prompt for passwords on the command line.
-
-<p>The files in the <code>examples</code> directory illustrate the use of JSS
-in an application:
-<dl>
-<dt><a href="examples/SSLClient.java">SSLClient.java</a>
-<dd>An example of an SSL client application.
-<dt><a href="examples/SSLServer.java">SSLServer.java</a>
-<dd>An example of an SSL server application.
-To run, it requires certificate
-and key databases that contain a certificate called "SSLServer".  The sample
-<code>cert7.db</code> and <code>key3.db</code> files, also in the
-<code>examples</code> directory,
-can be used for this purpose. When <code>SSLServer</code> is run,
-it will ask for a password
-for the "Internal Key Storage Token", which is the key database.
-The password for the example <code>key3.db</code> file is "netscape".
-</dl>
-These classes are in the <code>org.mozilla.jss.ssl</code> package.
-The <code>.class</code> files must be put in the subdirectory
-<code>org/mozilla/jss/ssl</code> of a <code>CLASSPATH</code> entry
-in order to be located by the Java virtual machine.
-
-<a href="javadoc/index.html"><h2>Javadoc for the JSS Classes</h2></a>
-
-<!--/font-->
-</body>
-</html>

mozilla/security/jss/lib/Makefile

@@ -1,75 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/config.mk
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/rules.mk
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-include rules.mk

mozilla/security/jss/lib/config.mk

@@ -1,123 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-LIBRARY =
-
-SHARED_LIBRARY_LIBS=yes
-
-SHARED_LIBRARY_DIRS = \
-    ../org/mozilla/jss/crypto \
-    ../org/mozilla/jss/SecretDecoderRing \
-    ../org/mozilla/jss \
-    ../org/mozilla/jss/pkcs11 \
-    ../org/mozilla/jss/ssl \
-    ../org/mozilla/jss/util \
-    ../org/mozilla/jss/provider/java/security \
-    $(NULL)
-
-ifeq ($(OS_ARCH),WINNT)
-
-SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
-IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
-
-DLLFLAGS += -DEF:jss.def
-RES = $(OBJDIR)/jss.res
-RESNAME = jss.rc
-
-EXTRA_SHARED_LIBS += \
-    $(DIST)/lib/nss3.lib \
-    $(DIST)/lib/smime3.lib \
-    $(DIST)/lib/ssl3.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
-    $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
-    $(JAVA_LIBS) \
-    $(DLLSYSTEM) \
-    $(NULL)
-
-else
-
-EXTRA_SHARED_LIBS += \
-    -L$(DIST)/lib \
-    -lnss3 \
-    -lsmime3 \
-    -lssl3 \
-    -lplc4 \
-    -lplds4 \
-    -lnspr4 \
-    $(JAVA_LIBS) \
-    $(NULL)
-
-endif
-
-# Include "funky" link path to pick up ALL native libraries for OSF/1.
-ifeq ($(OS_ARCH), OSF1)
-	JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR).no
-endif
-
-ifeq ($(OS_ARCH),Linux)
-MAPFILE = $(OBJDIR)/jssmap.linux
-ALL_TRASH += $(MAPFILE)
-MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-
-ifeq ($(OS_ARCH),SunOS)
-MAPFILE = $(OBJDIR)/jssmap.sun
-ALL_TRASH += $(MAPFILE)
-MKSHLIB += -M $(MAPFILE)
-#ifndef USE_64
-#ifeq ($(CPU_ARCH),sparc)
-# The -R '$ORIGIN' linker option instructs libnss3.so to search for its
-# dependencies (libfreebl_*.so) in the same directory where it resides.
-#MKSHLIB += -R '$$ORIGIN'
-#endif
-#endif
-endif
-
-ifeq ($(OS_ARCH),AIX)
-MAPFILE = $(OBJDIR)/jssmap.aix
-ALL_TRASH += $(MAPFILE)
-EXPORT_RULES = -bexport:$(MAPFILE)
-endif
-
-ifeq ($(OS_ARCH),HP-UX)
-MAPFILE = $(OBJDIR)/jssmap.hp
-ALL_TRASH += $(MAPFILE)
-MKSHLIB += -c $(MAPFILE)
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-MAPFILE = $(OBJDIR)/jssmap.osf
-ALL_TRASH += $(MAPFILE)
-MKSHLIB += -hidden -input $(MAPFILE)
-endif

mozilla/security/jss/lib/jss.def

@@ -1,268 +0,0 @@
-;+#
-;+# The contents of this file are subject to the Mozilla Public
-;+# License Version 1.1 (the "License"); you may not use this file
-;+# except in compliance with the License. You may obtain a copy of
-;+# the License at http://www.mozilla.org/MPL/
-;+#
-;+# Software distributed under the License is distributed on an "AS
-;+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-;+# implied. See the License for the specific language governing
-;+# rights and limitations under the License.
-;+#
-;+# The Original Code is the Netscape security libraries.
-;+#
-;+# The Initial Developer of the Original Code is Netscape
-;+# Communications Corporation.  Portions created by Netscape are
-;+# Copyright (C) 2001 Netscape Communications Corporation.  All
-;+# Rights Reserved.
-;+#
-;+# Contributor(s):
-;+#
-;+# Alternatively, the contents of this file may be used under the
-;+# terms of the GNU General Public License Version 2 or later (the
-;+# "GPL"), in which case the provisions of the GPL are applicable
-;+# instead of those above.  If you wish to allow use of your
-;+# version of this file only under the terms of the GPL and not to
-;+# allow others to use your version of this file under the MPL,
-;+# indicate your decision by deleting the provisions above and
-;+# replace them with the notice and other provisions required by
-;+# the GPL.  If you do not delete the provisions above, a recipient
-;+# may use your version of this file under either the MPL or the
-;+# GPL.
-;+#
-;+#
-;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
-;+#   1. For all unix platforms, the string ";-"  means "remove this line"
-;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#	line on which it occurs.
-;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
-;+#      On AIX, lines containing ";+" will be removed.  
-;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
-;+#   5. For all unix platforms, after the above processing has taken place,
-;+#    all characters after the first ";" on the line will be removed.  
-;+#    And for AIX, the first ";" will also be removed.
-;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
-;+#   directives are hidden behind ";", ";+", and ";-"
-;+JSS_3.0 {       # JSS 3.0 release
-;+    global:
-LIBRARY jss3	;-
-EXPORTS		;-
-Java_org_mozilla_jss_crypto_EncryptionAlgorithm_getIVLength;
-Java_org_mozilla_jss_crypto_PQGParams_generateNative__I;
-Java_org_mozilla_jss_crypto_PQGParams_generateNative__II;
-Java_org_mozilla_jss_crypto_PQGParams_paramsAreValidNative;
-Java_org_mozilla_jss_DatabaseCloser_closeDatabases;
-Java_org_mozilla_jss_CryptoManager_FIPSEnabled;
-Java_org_mozilla_jss_CryptoManager_buildCertificateChainNative;
-Java_org_mozilla_jss_CryptoManager_enableFIPS;
-Java_org_mozilla_jss_CryptoManager_exportCertsToPKCS7;
-Java_org_mozilla_jss_CryptoManager_findCertByIssuerAndSerialNumberNative;
-Java_org_mozilla_jss_CryptoManager_findCertByNicknameNative;
-Java_org_mozilla_jss_CryptoManager_findCertsByNicknameNative;
-Java_org_mozilla_jss_CryptoManager_findPrivKeyByCertNative;
-Java_org_mozilla_jss_CryptoManager_getCACerts;
-Java_org_mozilla_jss_CryptoManager_getPermCerts;
-Java_org_mozilla_jss_CryptoManager_importCRLNative;
-Java_org_mozilla_jss_CryptoManager_importCertPackageNative;
-Java_org_mozilla_jss_CryptoManager_importCertToPermNative;
-Java_org_mozilla_jss_CryptoManager_initializeAllNative;
-Java_org_mozilla_jss_CryptoManager_putModulesInVector;
-Java_org_mozilla_jss_CryptoManager_setNativePasswordCallback;
-Java_org_mozilla_jss_pkcs11_CertProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_CipherContextProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PK11Module_getLibraryName;
-Java_org_mozilla_jss_pkcs11_PK11Module_getName;
-Java_org_mozilla_jss_pkcs11_PK11Module_putTokensInVector;
-Java_org_mozilla_jss_pkcs11_ModuleProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getEncoded;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getIssuerDNString;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getNickname;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getOwningToken;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getPublicKey;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getSerialNumberByteArray;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getSubjectDNString;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getTrust;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getUniqueID;
-Java_org_mozilla_jss_pkcs11_PK11Cert_getVersion;
-Java_org_mozilla_jss_pkcs11_PK11Cert_setTrust;
-Java_org_mozilla_jss_pkcs11_PK11Cipher_finalizeContext;
-Java_org_mozilla_jss_pkcs11_PK11Cipher_initContext;
-Java_org_mozilla_jss_pkcs11_PK11Cipher_updateContext;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeUnwrapPrivWithSym;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeUnwrapSymWithPriv;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeUnwrapSymWithSym;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeWrapPrivWithSym;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeWrapSymWithPub;
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeWrapSymWithSym;
-Java_org_mozilla_jss_pkcs11_PK11MessageDigest_digest;
-Java_org_mozilla_jss_pkcs11_PK11MessageDigest_initDigest;
-Java_org_mozilla_jss_pkcs11_PK11MessageDigest_initHMAC;
-Java_org_mozilla_jss_pkcs11_PK11MessageDigest_update;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_getKeyType;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_getOwningToken;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_getStrength;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_getUniqueID;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_verifyKeyIsOnToken;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_DSAFromRaw;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_RSAFromRaw;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_getEncoded;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_getKeyType;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_verifyKeyIsOnToken;
-Java_org_mozilla_jss_pkcs11_PK11SymKey_getKeyData;
-Java_org_mozilla_jss_pkcs11_PK11SymKey_getKeyType;
-Java_org_mozilla_jss_pkcs11_PK11SymKey_getOwningToken;
-Java_org_mozilla_jss_pkcs11_PK11SymKey_getStrength;
-Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateDSAKeyPair;
-Java_org_mozilla_jss_pkcs11_PK11KeyPairGenerator_generateRSAKeyPair;
-Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_generateNormal;
-Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_generatePBE;
-Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_generatePBE_1IV;
-Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_nativeClone;
-Java_org_mozilla_jss_pkcs11_PrivateKeyProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PublicKeyProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_SymKeyProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PK11Token_PWInitable;
-Java_org_mozilla_jss_pkcs11_PK11Token_SSOPasswordIsCorrect;
-Java_org_mozilla_jss_pkcs11_PK11Token_changePassword;
-Java_org_mozilla_jss_pkcs11_PK11Token_doesAlgorithm;
-Java_org_mozilla_jss_pkcs11_PK11Token_generatePK10;
-Java_org_mozilla_jss_pkcs11_PK11Token_getLoginMode;
-Java_org_mozilla_jss_pkcs11_PK11Token_getLoginTimeoutMinutes;
-Java_org_mozilla_jss_pkcs11_PK11Token_getName;
-Java_org_mozilla_jss_pkcs11_PK11Token_initPassword;
-Java_org_mozilla_jss_pkcs11_PK11Token_isLoggedIn;
-Java_org_mozilla_jss_pkcs11_PK11Token_isPresent;
-Java_org_mozilla_jss_pkcs11_PK11Token_isWritable;
-Java_org_mozilla_jss_pkcs11_PK11Token_logout;
-Java_org_mozilla_jss_pkcs11_PK11Token_nativeLogin;
-Java_org_mozilla_jss_pkcs11_PK11Token_passwordIsInitialized;
-Java_org_mozilla_jss_pkcs11_PK11Token_setLoginMode;
-Java_org_mozilla_jss_pkcs11_PK11Token_setLoginTimeoutMinutes;
-Java_org_mozilla_jss_pkcs11_PK11Token_userPasswordIsCorrect;
-Java_org_mozilla_jss_pkcs11_TokenProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PK11Signature_engineRawSignNative;
-Java_org_mozilla_jss_pkcs11_PK11Signature_engineRawVerifyNative;
-Java_org_mozilla_jss_pkcs11_PK11Signature_engineSignNative;
-Java_org_mozilla_jss_pkcs11_PK11Signature_engineUpdateNative;
-Java_org_mozilla_jss_pkcs11_PK11Signature_engineVerifyNative;
-Java_org_mozilla_jss_pkcs11_PK11Signature_initSigContext;
-Java_org_mozilla_jss_pkcs11_PK11Signature_initVfyContext;
-Java_org_mozilla_jss_pkcs11_PK11Store_deleteCert;
-Java_org_mozilla_jss_pkcs11_PK11Store_deletePrivateKey;
-Java_org_mozilla_jss_pkcs11_PK11Store_importPrivateKey;
-Java_org_mozilla_jss_pkcs11_PK11Store_putCertsInVector;
-Java_org_mozilla_jss_pkcs11_PK11Store_putKeysInVector;
-Java_org_mozilla_jss_pkcs11_SigContextProxy_releaseNativeResources;
-Java_org_mozilla_jss_pkcs11_PK11RSAPublicKey_getModulusByteArray;
-Java_org_mozilla_jss_pkcs11_PK11RSAPublicKey_getPublicExponentByteArray;
-Java_org_mozilla_jss_pkcs11_PK11DSAPublicKey_getGByteArray;
-Java_org_mozilla_jss_pkcs11_PK11DSAPublicKey_getPByteArray;
-Java_org_mozilla_jss_pkcs11_PK11DSAPublicKey_getQByteArray;
-Java_org_mozilla_jss_pkcs11_PK11DSAPublicKey_getYByteArray;
-Java_org_mozilla_jss_pkcs11_PK11SecureRandom_nextBytes;
-Java_org_mozilla_jss_pkcs11_PK11SecureRandom_setSeed;
-Java_org_mozilla_jss_ssl_SSLServerSocket_clearSessionCache;
-Java_org_mozilla_jss_ssl_SSLServerSocket_configServerSessionIDCache;
-Java_org_mozilla_jss_ssl_SSLServerSocket_setServerCertNickname;
-Java_org_mozilla_jss_ssl_SSLServerSocket_socketAccept;
-Java_org_mozilla_jss_ssl_SSLServerSocket_socketListen;
-Java_org_mozilla_jss_ssl_SSLSocket_forceHandshake;
-Java_org_mozilla_jss_ssl_SSLSocket_getKeepAlive;
-Java_org_mozilla_jss_ssl_SSLSocket_getLocalAddressNative;
-Java_org_mozilla_jss_ssl_SSLSocket_getPort;
-Java_org_mozilla_jss_ssl_SSLSocket_getReceiveBufferSize;
-Java_org_mozilla_jss_ssl_SSLSocket_getSendBufferSize;
-Java_org_mozilla_jss_ssl_SSLSocket_getSoLinger;
-Java_org_mozilla_jss_ssl_SSLSocket_getStatus;
-Java_org_mozilla_jss_ssl_SSLSocket_getTcpNoDelay;
-Java_org_mozilla_jss_ssl_SSLSocket_invalidateSession;
-Java_org_mozilla_jss_ssl_SSLSocket_redoHandshake;
-Java_org_mozilla_jss_ssl_SSLSocket_resetHandshakeNative;
-Java_org_mozilla_jss_ssl_SSLSocket_setCipherPolicyNative;
-Java_org_mozilla_jss_ssl_SSLSocket_setCipherPreference;
-Java_org_mozilla_jss_ssl_SSLSocket_setKeepAlive;
-Java_org_mozilla_jss_ssl_SSLSocket_setReceiveBufferSize;
-Java_org_mozilla_jss_ssl_SSLSocket_setSSLDefaultOption;
-Java_org_mozilla_jss_ssl_SSLSocket_setSendBufferSize;
-Java_org_mozilla_jss_ssl_SSLSocket_setSoLinger;
-Java_org_mozilla_jss_ssl_SSLSocket_setTcpNoDelay;
-Java_org_mozilla_jss_ssl_SSLSocket_shutdownNative;
-Java_org_mozilla_jss_ssl_SSLSocket_socketAvailable;
-Java_org_mozilla_jss_ssl_SSLSocket_socketConnect;
-Java_org_mozilla_jss_ssl_SSLSocket_socketRead;
-Java_org_mozilla_jss_ssl_SSLSocket_socketWrite;
-Java_org_mozilla_jss_ssl_SocketBase_getLocalPortNative;
-Java_org_mozilla_jss_ssl_SocketBase_getPeerAddressNative;
-Java_org_mozilla_jss_ssl_SocketBase_setClientCertNicknameNative;
-Java_org_mozilla_jss_ssl_SocketBase_requestClientAuthNoExpiryCheckNative;
-Java_org_mozilla_jss_ssl_SocketBase_setSSLOption;
-Java_org_mozilla_jss_ssl_SocketBase_socketBind;
-Java_org_mozilla_jss_ssl_SocketBase_socketClose;
-Java_org_mozilla_jss_ssl_SocketBase_socketCreate;
-Java_org_mozilla_jss_util_Debug_setNativeLevel;
-Java_org_mozilla_jss_util_Password_readPasswordFromConsole;
-;+#
-;+# Data objects (NONE)
-;+#
-;+#
-;+# commands (NONE)
-;+#
-;+#
-;+    local:
-;+       *;
-;+};
-;+JSS_3.1 {       # JSS 3.1 release
-;+    global:
-Java_org_mozilla_jss_pkcs11_PK11KeyWrapper_nativeUnwrapSymPlaintext;
-Java_org_mozilla_jss_pkcs11_PK11Store_getEncryptedPrivateKeyInfo;
-;+    local:
-;+       *;
-;+};
-;+JSS_3.1.1 {       # JSS 3.1.1 release
-;+    global:
-Java_org_mozilla_jss_ssl_SSLServerSocket_setReuseAddress;
-Java_org_mozilla_jss_ssl_SSLServerSocket_getReuseAddress;
-;+    local:
-;+       *;
-;+};
-;+JSS_3.2 {       # JSS 3.2 release
-;+    global:
-Java_org_mozilla_jss_crypto_SecretDecoderRing_encrypt;
-Java_org_mozilla_jss_crypto_SecretDecoderRing_decrypt;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_fromPrivateKeyInfo;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_fromRawNative;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_getRawAliases;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineDeleteEntry;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_getDERCert;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_getCertNickname;
-Java_org_mozilla_jss_pkcs11_PK11PubKey_fromSPKI;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineGetKey;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineIsCertificateEntry;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineSetKeyEntryNative;
-Java_org_mozilla_jss_CryptoManager_initializeAllNative2;
-Java_org_mozilla_jss_ssl_SocketBase_getLocalAddressNative;
-Java_org_mozilla_jss_pkcs11_PK11PrivKey_getDSAParamsNative;
-Java_org_mozilla_jss_CryptoManager_verifyCertNowNative;
-Java_org_mozilla_jss_ssl_SSLServerSocket_setServerCert;
-Java_org_mozilla_jss_ssl_SocketBase_setClientCert;
-Java_org_mozilla_jss_CryptoManager_verifyCertTempNative;
-Java_org_mozilla_jss_ssl_SocketProxy_releaseNativeResources;
-;+    local:
-;+       *;
-;+};
-;+JSS_3.3 {       # JSS 3.3 release
-;+    global:
-Java_org_mozilla_jss_ssl_SSLSocket_getImplementedCipherSuites;
-Java_org_mozilla_jss_ssl_SSLSocket_getCipherPreferenceDefault;
-Java_org_mozilla_jss_ssl_SSLSocket_setCipherPreferenceDefault;
-Java_org_mozilla_jss_ssl_SSLSocket_getCipherPreference;
-Java_org_mozilla_jss_CryptoManager_configureOCSPNative;
-Java_org_mozilla_jss_pkcs11_PK11SymKey_getLength;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_getCertObject;
-Java_org_mozilla_jss_provider_java_security_JSSKeyStoreSpi_engineGetKeyNative;
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_generateKeyNative;
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_lookupKeyNative;
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_deleteKeyNative;
-;+    local:
-;+       *;
-;+};

mozilla/security/jss/lib/jss.rc

@@ -1,98 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Java security libraries.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 2001 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "jssver.h"
-#include <winver.h>
-
-#define MY_LIBNAME "jss"
-#define MY_FILEDESCRIPTION "JSS Library"
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define JSS_VMAJOR_STR STRINGIZE2(JSS_VMAJOR)
-
-#ifdef _DEBUG
-#define MY_DEBUG_STR " (debug)"
-#define MY_FILEFLAGS_1 VS_FF_DEBUG
-#else
-#define MY_DEBUG_STR ""
-#define MY_FILEFLAGS_1 0x0L
-#endif
-#if JSS_BETA
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
-#else
-#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
-#endif
-
-#ifdef WINNT
-#define MY_FILEOS VOS_NT_WINDOWS32
-#else
-#define MY_FILEOS VOS__WINDOWS32
-#endif
-
-#define MY_INTERNAL_NAME MY_LIBNAME JSS_VMAJOR_STR
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version-information resource
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION JSS_VMAJOR,JSS_VMINOR,JSS_VPATCH,0
- PRODUCTVERSION JSS_VMAJOR,JSS_VMINOR,JSS_VPATCH,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS MY_FILEFLAGS_2
- FILEOS MY_FILEOS
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L // not used
-
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0" // Lang=US English, CharSet=Unicode
-        BEGIN
-            VALUE "CompanyName", "Netscape Communications Corporation\0"
-            VALUE "FileDescription", MY_FILEDESCRIPTION MY_DEBUG_STR "\0"
-            VALUE "FileVersion", JSS_VERSION "\0"
-            VALUE "InternalName", MY_INTERNAL_NAME "\0"
-            VALUE "LegalCopyright", "Copyright \251 1994-2001 Netscape Communications Corporation\0"
-            VALUE "OriginalFilename", MY_INTERNAL_NAME ".dll\0"
-            VALUE "ProductName", "Network Security Services for Java\0"
-            VALUE "ProductVersion", JSS_VERSION "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

mozilla/security/jss/lib/manifest.mn

@@ -1,41 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-CORE_DEPTH = ../..
-
-MODULE = jss
-
-NS_USE_JDK = 1
-
-LIBRARY_NAME = jss
-LIBRARY_VERSION = 3

mozilla/security/jss/lib/rules.mk

@@ -1,50 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-release_md::  release_sanitize
-
-release_sanitize::
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jsscrypto$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jssmanage$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jsspkcs11$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jsspolicy$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jssssl$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(DLL_PREFIX)jssutil$(DYNAMIC_LIB_EXTENSION)$(DYNAMIC_LIB_SUFFIX)
-ifeq ($(OS_ARCH),WINNT)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jsscrypto$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jssmanage$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jsspkcs11$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jsspolicy$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jssssl$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-	-rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jssutil$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX)
-endif

mozilla/security/jss/manifest.mn

@@ -1,46 +0,0 @@
-#
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-CORE_DEPTH = ..
- 
-MODULE = jss
- 
-IMPORTS =	nss/NSS_3_7_3_RTM \
-			nspr20/v4.2.2 \
-			$(NULL)
-
-DIRS =  org     \
-        lib     \
-        $(NULL)
-
-RELEASE = jss

mozilla/security/jss/org/Makefile

@@ -1,76 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-

mozilla/security/jss/org/manifest.mn

@@ -1,39 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-CORE_DEPTH = ../..
- 
-MODULE = jss
- 
-DIRS =  mozilla \
-        $(NULL)

mozilla/security/jss/org/mozilla/Makefile

@@ -1,76 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-

mozilla/security/jss/org/mozilla/jss/CRLImportException.java

@@ -1,43 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-/**
- * Thrown if a CRL cannot be imported
- */
-public class CRLImportException extends java.lang.Exception {
-    public CRLImportException() {}
-    public CRLImportException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/CertDatabaseException.java

@@ -1,44 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-/**
- * This exception is thrown if the certificate database does not exist,
- * or if an error occurs while opening it.
- */
-public class CertDatabaseException extends java.lang.Exception {
-    public CertDatabaseException() {}
-    public CertDatabaseException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/CryptoManager.c

@@ -1,948 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is the Netscape Security Services for Java.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-#include "_jni/org_mozilla_jss_CryptoManager.h"
-
-#include <secitem.h>
-#include <secmod.h>
-#include <cert.h>
-#include <certt.h>
-#include <key.h>
-#include <ocsp.h>
-#include <pk11func.h>
-#include <secrng.h>
-#include <nspr.h>
-#include <plstr.h>
-#include <pkcs11.h>
-#include <nss.h>
-#include <ssl.h>
-
-#include <jssutil.h>
-#include <java_ids.h>
-#include <jss_exceptions.h>
-#include <jssver.h>
-
-#include "pk11util.h"
-
-#if defined(AIX) || defined(HPUX) || defined(LINUX)
-#include <signal.h>
-#endif
-
-/********************************************************************/
-/* The following VERSION Strings should be updated in the following */
-/* files everytime a new release of JSS is generated:               */
-/*                                                                  */
-/*     jss.jar:  ns/ninja/org/mozilla/jss/manage/CryptoManager.java */
-/*     jss.dll:  ns/ninja/org/mozilla/jss/manage/CryptoManager.c    */
-/*                                                                  */
-/********************************************************************/
-
-static const char* DLL_JSS_VERSION     = "JSS_VERSION = " JSS_VERSION;
-static const char* DLL_NSS_VERSION     = "NSS_VERSION = " NSS_VERSION;
-static const char* DLL_NSPR_VERSION    = "NSPR_VERSION = " PR_VERSION;
-
-static jobject
-makePWCBInfo(JNIEnv *env, PK11SlotInfo *slot);
-
-static char*
-getPWFromCallback(PK11SlotInfo *slot, PRBool retry, void *arg);
-
-/*************************************************************
- * AIX, HP, and Linux signal handling madness
- *
- * In order for the JVM, kernel, and NSPR to work together, we setup
- * a signal handler for SIGCHLD that does nothing.  This is only done
- * on AIX, HP, and Linux.
- *************************************************************/
-#if defined(AIX) || defined(HPUX) || defined(LINUX)
-
-static PRStatus
-handleSigChild(JNIEnv *env) {
-
-    struct sigaction action;
-    sigset_t signalset;
-    int result;
-
-    sigemptyset(&signalset);
-
-    action.sa_handler = SIG_DFL;
-    action.sa_mask = signalset;
-    action.sa_flags = 0;
-
-    result = sigaction( SIGCHLD, &action, NULL );
-
-    if( result != 0 ) {
-        JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-            "Failed to set SIGCHLD handler");
-        return PR_FAILURE;
-    }
-
-    return PR_SUCCESS;
-}
-
-#endif
-
-
-int ConfigureOCSP(
-        JNIEnv *env,
-        jboolean ocspCheckingEnabled,
-        jstring ocspResponderURL,
-        jstring ocspResponderCertNickname )
-{
-    char *ocspResponderURL_string=NULL;
-    char *ocspResponderCertNickname_string=NULL;
-    SECStatus status;
-    int result = SECSuccess;
-    CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
-
-
-    /* if caller specified default responder, get the
-     * strings associated with these args
-     */
-
-    if (ocspResponderURL) {
-        ocspResponderURL_string =
-            (char*) (*env)->GetStringUTFChars(env, ocspResponderURL, NULL);
-        if (ocspResponderURL_string == NULL) {
-            JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-                    "OCSP invalid URL");
-            result = SECFailure;
-            goto loser;
-        }
-    }
-
-    if (ocspResponderCertNickname) {
-        ocspResponderCertNickname_string =
-            (char*) (*env)->GetStringUTFChars(env, ocspResponderCertNickname, NULL);
-        if (ocspResponderCertNickname_string == NULL) {
-            JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-                    "OCSP invalid nickname");
-            result = SECFailure;
-            goto loser;
-        }
-    }
-
-    /* first disable OCSP - we'll enable it later */
-
-    CERT_DisableOCSPChecking(certdb);
-
-    /* if they set the default responder, then set it up
-     * and enable it
-     */
-    if (ocspResponderURL) {
-        /* if ocspResponderURL is set they must specify the
-           ocspResponderCertNickname */
-                if (ocspResponderCertNickname == NULL ) {
-                JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-                "if OCSP responderURL is set, the Responder Cert nickname must be set");
-                        result = SECFailure;
-                        goto loser;
-                } else {
-                        CERTCertificate *cert;
-                        /* if the nickname is set */
-       cert = CERT_FindCertByNickname(certdb, ocspResponderCertNickname_string);
-                        if (cert == NULL) {
-                          /*
-                           * look for the cert on an external token.
-                        */
-       cert = PK11_FindCertFromNickname(ocspResponderCertNickname_string, NULL);
-                       }
-                        if (cert == NULL) {
-                                JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-                    "Unable to find the OCSP Responder Certificate nickname.");
-                        result = SECFailure;
-                        goto loser;
-	               }
-	}
-        status =
-            CERT_SetOCSPDefaultResponder(   certdb,
-                                            ocspResponderURL_string,
-                                            ocspResponderCertNickname_string
-                                        );
-        if (status == SECFailure) {
-            /* deal with error */
-            JSS_throwMsg(env, GENERAL_SECURITY_EXCEPTION,
-                    "OCSP Could not set responder");
-            result = SECFailure;
-            goto loser;
-        }
-        CERT_EnableOCSPDefaultResponder(certdb);
-    }
-    else {
-        /* if no defaultresponder is set, disable it */
-        CERT_DisableOCSPDefaultResponder(certdb);
-    }
-        
-
-    /* enable OCSP checking if requested */
-
-    if (ocspCheckingEnabled) {
-        CERT_EnableOCSPChecking(certdb);
-    }
-    
-loser:
-        
-    if (ocspResponderURL_string)  {
-        (*env)->ReleaseStringUTFChars(env,
-            ocspResponderURL, ocspResponderURL_string);
-    }
-
-    if (ocspResponderCertNickname_string)  {
-        (*env)->ReleaseStringUTFChars(env,
-            ocspResponderCertNickname, ocspResponderCertNickname_string);
-    }
-
-    return result;
-
-}
-
-
-/**********************************************************************
- * This is the PasswordCallback object that will be used to login
- * to tokens implicitly.
- */
-static jobject globalPasswordCallback = NULL;
-
-/**********************************************************************
- * The Java virtual machine can be used to retrieve the JNI environment
- * pointer from callback functions.
- */
-JavaVM * JSS_javaVM;
-
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_CryptoManager_initializeAllNative
-    (JNIEnv *env, jclass clazz,
-        jstring configDir,
-        jstring certPrefix,
-        jstring keyPrefix,
-        jstring secmodName,
-        jboolean readOnly,
-        jstring manuString,
-        jstring libraryString,
-        jstring tokString,
-        jstring keyTokString,
-        jstring slotString,
-        jstring keySlotString,
-        jstring fipsString,
-        jstring fipsKeyString,
-        jboolean ocspCheckingEnabled,
-        jstring ocspResponderURL,
-        jstring ocspResponderCertNickname )
-{
-    Java_org_mozilla_jss_CryptoManager_initializeAllNative2(
-        env,
-        clazz,
-        configDir,
-        certPrefix,
-        keyPrefix,
-        secmodName,
-        readOnly,
-        manuString,
-        libraryString,
-        tokString,
-        keyTokString,
-        slotString,
-        keySlotString,
-        fipsString,
-        fipsKeyString,
-        ocspCheckingEnabled,
-        ocspResponderURL,
-        ocspResponderCertNickname,
-        JNI_FALSE /*initializeJavaOnly*/ );
-}
-
-
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_CryptoManager_initializeAllNative2
-    (JNIEnv *env, jclass clazz,
-        jstring configDir,
-        jstring certPrefix,
-        jstring keyPrefix,
-        jstring secmodName,
-        jboolean readOnly,
-        jstring manuString,
-        jstring libraryString,
-        jstring tokString,
-        jstring keyTokString,
-        jstring slotString,
-        jstring keySlotString,
-        jstring fipsString,
-        jstring fipsKeyString,
-        jboolean ocspCheckingEnabled,
-        jstring ocspResponderURL,
-        jstring ocspResponderCertNickname,
-        jboolean initializeJavaOnly )
-{
-    SECStatus rv = SECFailure;
-    JavaVM *VMs[5];
-    jint numVMs;
-    char *szConfigDir = NULL;
-    char *szCertPrefix = NULL;
-    char *szKeyPrefix = NULL;
-    char *szSecmodName = NULL;
-    char *manuChars=NULL;
-    char *libraryChars=NULL;
-    char *tokChars=NULL;
-    char *keyTokChars=NULL;
-    char *slotChars=NULL;
-    char *keySlotChars=NULL;
-    char *fipsChars=NULL;
-    char *fipsKeyChars=NULL;
-    PRUint32 initFlags;
-
-    /* This is thread-safe because initialize is synchronized */
-    static PRBool initialized=PR_FALSE;
-
-    if( configDir == NULL ||
-        manuString == NULL ||
-        libraryString == NULL ||
-        tokString == NULL ||
-        keyTokString == NULL ||
-        slotString == NULL ||
-        keySlotString == NULL ||
-        fipsString == NULL ||
-        fipsKeyString == NULL )
-    {
-        JSS_throw(env, NULL_POINTER_EXCEPTION);
-        goto finish;
-    }
-
-    /* Make sure initialize() completes only once */
-    if(initialized) {
-        JSS_throw(env, ALREADY_INITIALIZED_EXCEPTION);
-        goto finish;
-    }
-
-    /*
-     * Save the JavaVM pointer so we can retrieve the JNI environment
-     * later. This only works if there is only one Java VM.
-     */
-    if( (*env)->GetJavaVM(env, &JSS_javaVM) != 0 ) {
-        JSS_trace(env, JSS_TRACE_ERROR,
-                    "Unable to to access Java virtual machine");
-        PR_ASSERT(PR_FALSE);
-        goto finish;
-    }
-
-    /*
-     * Initialize the errcode translation table.
-     */
-    JSS_initErrcodeTranslationTable();
-
-    /*
-     * The rest of the initialization (the NSS stuff) is skipped if
-     * the initializeJavaOnly flag is set.
-     */
-    if( initializeJavaOnly) {
-        initialized = PR_TRUE;
-        goto finish;
-    }
-
-
-    /*
-     * Set the PKCS #11 strings
-     */
-    manuChars = (char*) (*env)->GetStringUTFChars(env, manuString, NULL);
-    libraryChars = (char*) (*env)->GetStringUTFChars(env, libraryString, NULL);
-    tokChars = (char*) (*env)->GetStringUTFChars(env, tokString, NULL);
-    keyTokChars = (char*) (*env)->GetStringUTFChars(env, keyTokString, NULL);
-    slotChars = (char*) (*env)->GetStringUTFChars(env, slotString, NULL);
-    keySlotChars = (char*) (*env)->GetStringUTFChars(env, keySlotString, NULL);
-    fipsChars = (char*) (*env)->GetStringUTFChars(env, fipsString, NULL);
-    fipsKeyChars = (char*) (*env)->GetStringUTFChars(env, fipsKeyString, NULL);
-    if( (*env)->ExceptionOccurred(env) ) {
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-    PR_ASSERT( strlen(manuChars) == 33 );
-    PR_ASSERT( strlen(libraryChars) == 33 );
-    PR_ASSERT( strlen(tokChars) == 33 );
-    PR_ASSERT( strlen(keyTokChars) == 33 );
-    PR_ASSERT( strlen(slotChars) == 65 );
-    PR_ASSERT( strlen(keySlotChars) == 65 );
-    PR_ASSERT( strlen(fipsChars) == 65 );
-    PR_ASSERT( strlen(fipsKeyChars) == 65 );
-    PK11_ConfigurePKCS11(   PL_strdup(manuChars),
-                            PL_strdup(libraryChars),
-                            PL_strdup(tokChars),
-                            PL_strdup(keyTokChars),
-                            PL_strdup(slotChars),
-                            PL_strdup(keySlotChars),
-                            PL_strdup(fipsChars),
-                            PL_strdup(fipsKeyChars),
-                            0, /* minimum pin length */
-                            PR_FALSE /* password required */
-                        );
-
-
-    szConfigDir = (char*) (*env)->GetStringUTFChars(env, configDir, NULL);
-    if( certPrefix != NULL && keyPrefix != NULL && secmodName != NULL ) {
-        /*
-        * Set up arguments to NSS_Initialize
-        */
-        szCertPrefix = (char*) (*env)->GetStringUTFChars(env, certPrefix, NULL);
-        szKeyPrefix = (char*) (*env)->GetStringUTFChars(env, keyPrefix, NULL);
-        szSecmodName = (char*) (*env)->GetStringUTFChars(env, secmodName, NULL);
-        initFlags = 0;
-        if( readOnly ) {
-            initFlags |= NSS_INIT_READONLY;
-        }
-
-        /*
-        * Initialize NSS.
-        */
-        rv = NSS_Initialize(szConfigDir, szCertPrefix, szKeyPrefix,
-                szSecmodName, initFlags);
-    } else {
-        if( readOnly ) {
-            rv = NSS_Init(szConfigDir);
-        } else {
-            rv = NSS_InitReadWrite(szConfigDir);
-        }
-    }
-
-    if( rv != SECSuccess ) {
-        JSS_throwMsg(env, SECURITY_EXCEPTION,
-            "Unable to initialize security library");
-        goto finish;
-    }
-
-    /*
-     * Set default password callback.  This is the only place this
-     * should ever be called if you are using Ninja.
-     */
-    PK11_SetPasswordFunc(getPWFromCallback);
-
-    /*
-     * Setup NSS to call the specified OCSP responder
-     */
-    rv = ConfigureOCSP(
-        env,
-        ocspCheckingEnabled,
-        ocspResponderURL,
-        ocspResponderCertNickname );
-
-    if (rv != SECSuccess) {
-        goto finish;
-    }
-
-    /*
-     * Set up policy. We're always domestic now. Thanks to the US Government!
-     */
-    if( NSS_SetDomesticPolicy() != SECSuccess ) {
-        JSS_throwMsg(env, SECURITY_EXCEPTION, "Unable to set security policy");
-        goto finish;
-    }
-
-    initialized = PR_TRUE;
-
-finish:
-    /* LET'S BE CAREFUL.  Unbraced if statements ahead. */
-    if(szConfigDir)
-        (*env)->ReleaseStringUTFChars(env, configDir, szConfigDir);
-    if(szCertPrefix)
-        (*env)->ReleaseStringUTFChars(env, certPrefix, szCertPrefix);
-    if(szKeyPrefix)
-        (*env)->ReleaseStringUTFChars(env, keyPrefix, szKeyPrefix);
-    if(szSecmodName)
-        (*env)->ReleaseStringUTFChars(env, secmodName, szSecmodName);
-    if(manuChars)
-        (*env)->ReleaseStringUTFChars(env, manuString, manuChars);
-    if(libraryChars)
-        (*env)->ReleaseStringUTFChars(env, libraryString, libraryChars);
-    if(tokChars)
-        (*env)->ReleaseStringUTFChars(env, tokString, tokChars);
-    if(keyTokChars)
-        (*env)->ReleaseStringUTFChars(env, keyTokString, keyTokChars);
-    if(slotChars)
-        (*env)->ReleaseStringUTFChars(env, slotString, slotChars);
-    if(keySlotChars)
-        (*env)->ReleaseStringUTFChars(env, keySlotString, keySlotChars);
-    if(fipsChars)
-        (*env)->ReleaseStringUTFChars(env, fipsString, fipsChars);
-    if(fipsKeyChars)
-        (*env)->ReleaseStringUTFChars(env, fipsKeyString, fipsKeyChars);
-
-    return;
-}
-
-/**********************************************************************
- *
- * JSS_setPasswordCallback
- *
- * Sets the global PasswordCallback object, which will be used to
- * login to tokens implicitly if necessary.
- *
- */
-void
-JSS_setPasswordCallback(JNIEnv *env, jobject callback)
-{
-    PR_ASSERT(env!=NULL && callback!=NULL);
-
-    /* Free the previously-registered password callback */
-    if( globalPasswordCallback != NULL ) {
-        (*env)->DeleteGlobalRef(env, globalPasswordCallback);
-        globalPasswordCallback = NULL;
-    }
-
-    /* Store the new password callback */
-    globalPasswordCallback = (*env)->NewGlobalRef(env, callback);
-    if(globalPasswordCallback == NULL) {
-        JSS_throw(env, OUT_OF_MEMORY_ERROR);
-    }
-}
-
-/**********************************************************************
- *
- * CryptoManager.setNativePasswordCallback
- *
- * Sets the global PasswordCallback object, which will be used to
- * login to tokens implicitly if necessary.
- *
- */
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_CryptoManager_setNativePasswordCallback
-    (JNIEnv *env, jclass clazz, jobject callback)
-{
-    JSS_setPasswordCallback(env, callback);
-}
-
-/********************************************************************
- *
- * g e t P W F r o m C a l l b a c k
- *
- * Extracts a password from a password callback and returns
- * it to PKCS #11.
- *
- * INPUTS
- *      slot
- *          The PK11SlotInfo* for the slot we are logging into.
- *      retry
- *          PR_TRUE if this is the first time we are trying to login,
- *          PR_FALSE if we tried before and our password was wrong.
- *      arg
- *          This can contain a Java PasswordCallback object reference,
- *          or NULL to use the default password callback.
- * RETURNS
- *      The password as extracted from the callback, or NULL if the
- *      callback gives up.
- */
-static char*
-getPWFromCallback(PK11SlotInfo *slot, PRBool retry, void *arg)
-{
-    jobject pwcbInfo;
-    jobject pwObject;
-    jbyteArray pwArray=NULL;
-    char* pwchars;
-    char* returnchars=NULL;
-    jclass callbackClass;
-    jclass passwordClass;
-    jmethodID getPWMethod;
-    jmethodID getByteCopyMethod;
-    jmethodID clearMethod;
-    jthrowable exception;
-    jobject callback;
-    JNIEnv *env;
-
-    PR_ASSERT(slot!=NULL);
-    if(slot==NULL) {
-        return NULL;
-    }
-
-    /* Get the callback from the arg, or use the default */
-    PR_ASSERT(sizeof(void*) == sizeof(jobject));
-    callback = (jobject)arg;
-    if(callback == NULL) {
-        callback = globalPasswordCallback;
-        if(callback == NULL) {
-            /* No global password callback set, no way to get a password */
-            return NULL;
-        }
-    }
-
-    /* Get the JNI environment */
-    if((*JSS_javaVM)->AttachCurrentThread(JSS_javaVM, (void**)&env, NULL) != 0){
-        PR_ASSERT(PR_FALSE);
-        goto finish;
-    }
-    PR_ASSERT(env != NULL);
-
-    /*****************************************
-     * Construct the JSS_PasswordCallbackInfo
-     *****************************************/
-    pwcbInfo = makePWCBInfo(env, slot);
-    if(pwcbInfo==NULL) {
-        goto finish;
-    }
-
-    /*****************************************
-     * Get the callback class and methods
-     *****************************************/
-    callbackClass = (*env)->GetObjectClass(env, callback);
-    if(callbackClass == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR, "Failed to find password "
-            "callback class");
-        PR_ASSERT(PR_FALSE);
-    }
-    if(retry) {
-        getPWMethod = (*env)->GetMethodID(
-                        env,
-                        callbackClass,
-                        PW_CALLBACK_GET_PW_AGAIN_NAME,
-                        PW_CALLBACK_GET_PW_AGAIN_SIG);
-    } else {
-        getPWMethod = (*env)->GetMethodID(
-                        env,
-                        callbackClass,
-                        PW_CALLBACK_GET_PW_FIRST_NAME,
-                        PW_CALLBACK_GET_PW_FIRST_SIG);
-    }
-    if(getPWMethod == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR,
-            "Failed to find password callback accessor method");
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /*****************************************
-     * Get the password from the callback
-     *****************************************/
-    pwObject = (*env)->CallObjectMethod(
-                                        env,
-                                        callback,
-                                        getPWMethod,
-                                        pwcbInfo);
-    if( (*env)->ExceptionOccurred(env) != NULL) {
-        goto finish;
-    }
-    if( pwObject == NULL ) {
-        JSS_throw(env, GIVE_UP_EXCEPTION);
-        goto finish;
-    }
-
-    /*****************************************
-     * Get Password class and methods
-     *****************************************/
-    passwordClass = (*env)->GetObjectClass(env, pwObject);
-    if(passwordClass == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR, "Failed to find Password class");
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-    getByteCopyMethod = (*env)->GetMethodID(
-                                            env,
-                                            passwordClass,
-                                            PW_GET_BYTE_COPY_NAME,
-                                            PW_GET_BYTE_COPY_SIG);
-    clearMethod = (*env)->GetMethodID(  env,
-                                        passwordClass,
-                                        PW_CLEAR_NAME,
-                                        PW_CLEAR_SIG);
-    if(getByteCopyMethod==NULL || clearMethod==NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR,
-            "Failed to find Password manipulation methods from native "
-            "implementation");
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /************************************************
-     * Get the bytes from the password, then clear it
-     ***********************************************/
-    pwArray = (*env)->CallObjectMethod( env, pwObject, getByteCopyMethod);
-    (*env)->CallVoidMethod(env, pwObject, clearMethod);
-
-    exception = (*env)->ExceptionOccurred(env);
-    if(exception == NULL) {
-        PR_ASSERT(pwArray != NULL);
-
-        /*************************************************************
-         * Copy the characters out of the byte array,
-         * then erase it
-        *************************************************************/
-        pwchars = (char*) (*env)->GetByteArrayElements(env, pwArray, NULL);
-        PR_ASSERT(pwchars!=NULL);
-
-        returnchars = PL_strdup(pwchars);
-        JSS_wipeCharArray(pwchars);
-        (*env)->ReleaseByteArrayElements(env, pwArray, (jbyte*)pwchars, 0);
-    } else {
-        returnchars = NULL;
-    }
-
-finish:
-    if( (exception=(*env)->ExceptionOccurred(env)) != NULL) {
-#ifdef DEBUG
-        jclass giveupClass;
-        jmethodID printStackTrace;
-        jclass excepClass;
-#endif
-        (*env)->ExceptionClear(env);
-#ifdef DEBUG
-        giveupClass = (*env)->FindClass(env, GIVE_UP_EXCEPTION);
-        PR_ASSERT(giveupClass != NULL);
-        if( ! (*env)->IsInstanceOf(env, exception, giveupClass) ) {
-            excepClass = (*env)->GetObjectClass(env, exception);
-            printStackTrace = (*env)->GetMethodID(env, excepClass,
-                "printStackTrace", "()V");
-            (*env)->CallVoidMethod(env, exception, printStackTrace);
-            PR_ASSERT( PR_FALSE );
-        }
-        PR_ASSERT(returnchars==NULL);
-#endif
-    }
-    return returnchars;
-}
-
-/**********************************************************************
- *
- * m a k e P W C B I n f o
- *
- * Creates a Java PasswordCallbackInfo structure from a PKCS #11 token.
- * Returns this object, or NULL if an exception was thrown.
- */
-static jobject
-makePWCBInfo(JNIEnv *env, PK11SlotInfo *slot)
-{
-    jclass infoClass;
-    jmethodID constructor;
-    jstring name;
-    jobject pwcbInfo=NULL;
-
-    PR_ASSERT(env!=NULL && slot!=NULL);
-
-    /*****************************************
-     * Turn the token name into a Java String
-     *****************************************/
-    name = (*env)->NewStringUTF(env, PK11_GetTokenName(slot));
-    if(name == NULL) {
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /*****************************************
-     * Look up the class and constructor
-     *****************************************/
-    infoClass = (*env)->FindClass(env, TOKEN_CBINFO_CLASS_NAME);
-    if(infoClass == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR, "Unable to find TokenCallbackInfo "
-            "class");
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-    constructor = (*env)->GetMethodID(  env,
-                                        infoClass,
-                                        TOKEN_CBINFO_CONSTRUCTOR_NAME,
-                                        TOKEN_CBINFO_CONSTRUCTOR_SIG);
-    if(constructor == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR, "Unable to find "
-            "TokenCallbackInfo constructor");
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /*****************************************
-     * Create the CallbackInfo object
-     *****************************************/
-    pwcbInfo = (*env)->NewObject(env, infoClass, constructor, name);
-    if(pwcbInfo == NULL) {
-        JSS_trace(env, JSS_TRACE_ERROR, "Unable to create TokenCallbackInfo");
-        ASSERT_OUTOFMEM(env);
-    }
-
-finish:
-    return pwcbInfo;
-}
-
-/**********************************************************************
- * CryptoManager.putModulesInVector
- *
- * Wraps all PKCS #11 modules in PK11Module Java objects, then puts
- * these into a Vector.
- */
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_CryptoManager_putModulesInVector
-    (JNIEnv *env, jobject this, jobject vector)
-{
-    SECMODListLock *listLock=NULL;
-    SECMODModuleList *list;
-    SECMODModule *modp=NULL;
-    jclass vectorClass;
-    jmethodID addElement;
-    jobject module;
-
-    PR_ASSERT(env!=NULL && this!=NULL && vector!=NULL);
-
-    /***************************************************
-     * Get JNI ids
-     ***************************************************/
-    vectorClass = (*env)->GetObjectClass(env, vector);
-    if(vectorClass == NULL) goto finish;
-
-    addElement = (*env)->GetMethodID(env,
-                                     vectorClass,
-                                     VECTOR_ADD_ELEMENT_NAME,
-                                     VECTOR_ADD_ELEMENT_SIG);
-    if(addElement==NULL) goto finish;
-
-    /***************************************************
-     * Lock the list
-     ***************************************************/
-    listLock = SECMOD_GetDefaultModuleListLock();
-    PR_ASSERT(listLock!=NULL);
-
-    SECMOD_GetReadLock(listLock);
-
-    /***************************************************
-     * Loop over the modules, adding each one to the vector
-     ***************************************************/
-    for( list = SECMOD_GetDefaultModuleList(); list != NULL; list=list->next) {
-        PR_ASSERT(list->module != NULL);
-
-        /** Make a PK11Module **/
-        modp = SECMOD_ReferenceModule(list->module);
-        module = JSS_PK11_wrapPK11Module(env, &modp);
-        PR_ASSERT(modp==NULL);
-        if(module == NULL) {
-            goto finish;
-        }
-
-        /** Stick the PK11Module in the Vector **/
-        (*env)->CallVoidMethod(env, vector, addElement, module);
-    }
-
-finish:
-    /*** Unlock the list ***/
-    if(listLock != NULL) {
-        SECMOD_ReleaseReadLock(listLock);
-    }
-    /*** Free this module if it wasn't properly Java-ized ***/
-    if(modp!=NULL) {
-        SECMOD_DestroyModule(modp);
-    }
-
-    return;
-}
-
-
-/**********************************************************************
- * CryptoManager.enableFIPS
- *
- * Enables or disables FIPS mode.
- * INPUTS
- *      fips
- *          true means turn on FIPS mode, false means turn it off.
- * RETURNS
- *      true if a switch happened, false if the library was already
- *      in the requested mode.
- * THROWS
- *      java.security.GeneralSecurityException if an error occurred with
- *      the PKCS #11 library.
- */
-JNIEXPORT jboolean JNICALL
-Java_org_mozilla_jss_CryptoManager_enableFIPS
-    (JNIEnv *env, jclass clazz, jboolean fips)
-{
-    char *name=NULL;
-    jboolean switched = JNI_FALSE;
-    SECStatus status;
-
-    if( ((fips==JNI_TRUE)  && !PK11_IsFIPS()) ||
-        ((fips==JNI_FALSE) &&  PK11_IsFIPS())  )
-    {
-        name = PL_strdup(SECMOD_GetInternalModule()->commonName);
-        status = SECMOD_DeleteInternalModule(name);
-        PR_Free(name);
-        switched = JNI_TRUE;
-    }
-
-    if(status != SECSuccess) {
-        JSS_throwMsg(env,
-                     GENERAL_SECURITY_EXCEPTION,
-                     "Failed to toggle FIPS mode");
-    }
-
-    return switched;
-}
-
-/***********************************************************************
- * CryptoManager.FIPSEnabled
- *
- * Returns true if FIPS mode is currently on, false if it ain't.
- */
-JNIEXPORT jboolean JNICALL
-Java_org_mozilla_jss_CryptoManager_FIPSEnabled(JNIEnv *env, jobject this)
-{
-    if( PK11_IsFIPS() ) {
-        return JNI_TRUE;
-    } else {
-        return JNI_FALSE;
-    }
-}
-
-/***********************************************************************
- * DatabaseCloser.closeDatabases
- *
- * Closes the cert and key database, rendering the security library
- * unusable.
- */
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_DatabaseCloser_closeDatabases
-    (JNIEnv *env, jobject this)
-{
-    NSS_Shutdown();
-}
-
-/**********************************************************************
-* configureOCSPNative
-*
-* Allows configuration of the OCSP responder during runtime.
-*/
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_CryptoManager_configureOCSPNative(
-        JNIEnv *env, jobject this,
-        jboolean ocspCheckingEnabled,
-        jstring ocspResponderURL,
-        jstring ocspResponderCertNickname )
-{
-    SECStatus rv = SECFailure;
-
-    rv =  ConfigureOCSP(env,ocspCheckingEnabled,
-        ocspResponderURL, ocspResponderCertNickname);
-
-    if (rv != SECSuccess) {
-        JSS_throwMsgPrErr(env,
-                     GENERAL_SECURITY_EXCEPTION,
-                     "Failed to configure OCSP");
-    }
-}
-

mozilla/security/jss/org/mozilla/jss/DatabaseCloser.java

@@ -1,74 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-/**
- * A class for closing databases. Since closing the databases is
- * very dangerous and breaks the JSS model, it may only be done from  
- * special applications. This class should be subclasses by
- * authorized subclasses.  It cannot be instantiated itself.
- */
-public abstract class DatabaseCloser {
-
-    private static final String authorizedClosers[] =
-        {   "org.mozilla.certsetup.apps.CertSetup$DatabaseCloser",
-            "org.mozilla.jss.CloseDBs"                                  };
-
-    /**
-     * Creates a new DatabaseCloser.  This should only be called
-     * from an authorized subclass.  This class cannot itself be
-     * instantiated.
-     *
-     * @throws Exception If the instantiation is not a valid subclass.
-     */
-    public DatabaseCloser() throws Exception {
-        Class clazz = this.getClass();
-        String name = clazz.getName();
-        boolean approved = false;
-        for(int i=0; i < authorizedClosers.length; i++) {
-            if( name.equals( authorizedClosers[i] ) ) {
-                approved = true;
-                break;
-            }
-        }
-        if(!approved) {
-            throw new Exception();
-        }
-    }
-
-    /**
-     * Closes the certificate and key databases.  This is extremely
-     * dangerous.
-     */
-    protected native void closeDatabases();
-}

mozilla/security/jss/org/mozilla/jss/JSSProvider.java

@@ -1,173 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-public final class JSSProvider extends java.security.Provider {
-
-    public JSSProvider() {
-        super("Mozilla-JSS", 3.3,
-                "Provides Signature, Message Digesting, and RNG");
-
-        /////////////////////////////////////////////////////////////
-        // Signature
-        /////////////////////////////////////////////////////////////
-        put("Signature.SHA1withDSA",
-            "org.mozilla.jss.provider.java.security.JSSSignatureSpi$DSA");
-
-        put("Alg.Alias.Signature.DSA", "SHA1withDSA");
-        put("Alg.Alias.Signature.DSS", "SHA1withDSA");
-        put("Alg.Alias.Signature.SHA/DSA", "SHA1withDSA");
-        put("Alg.Alias.Signature.SHA-1/DSA", "SHA1withDSA");
-        put("Alg.Alias.Signature.SHA1/DSA", "SHA1withDSA");
-        put("Alg.Alias.Signature.DSAWithSHA1", "SHA1withDSA");
-        put("Alg.Alias.Signature.SHAwithDSA", "SHA1withDSA");
-
-        put("Signature.MD5/RSA",
-            "org.mozilla.jss.provider.java.security.JSSSignatureSpi$MD5RSA");
-        put("Signature.MD2/RSA",
-            "org.mozilla.jss.provider.java.security.JSSSignatureSpi$MD2RSA");
-        put("Signature.SHA-1/RSA",
-            "org.mozilla.jss.provider.java.security.JSSSignatureSpi$SHA1RSA");
-
-        put("Alg.Alias.Signature.SHA1/RSA", "SHA-1/RSA");
-        put("Alg.Alias.Signature.SHA1withRSA", "SHA-1/RSA");
-
-        /////////////////////////////////////////////////////////////
-        // Message Digesting
-        /////////////////////////////////////////////////////////////
-
-        put("MessageDigest.SHA-1",
-                "org.mozilla.jss.provider.java.security.JSSMessageDigestSpi$SHA1");
-        put("MessageDigest.MD2",
-                "org.mozilla.jss.provider.java.security.JSSMessageDigestSpi$MD2");
-        put("MessageDigest.MD5",
-                "org.mozilla.jss.provider.java.security.JSSMessageDigestSpi$MD5");
-
-        put("Alg.Alias.MessageDigest.SHA1", "SHA-1");
-        put("Alg.Alias.MessageDigest.SHA", "SHA-1");
-
-        /////////////////////////////////////////////////////////////
-        // SecureRandom
-        /////////////////////////////////////////////////////////////
-        put("SecureRandom.pkcs11prng",
-            "org.mozilla.jss.provider.java.security.JSSSecureRandomSpi");
-
-        /////////////////////////////////////////////////////////////
-        // KeyPairGenerator
-        /////////////////////////////////////////////////////////////
-        put("KeyPairGenerator.RSA",
-            "org.mozilla.jss.provider.java.security.JSSKeyPairGeneratorSpi$RSA");
-        put("KeyPairGenerator.DSA",
-            "org.mozilla.jss.provider.java.security.JSSKeyPairGeneratorSpi$DSA");
-
-        /////////////////////////////////////////////////////////////
-        // KeyFactory
-        /////////////////////////////////////////////////////////////
-        put("KeyFactory.RSA",
-            "org.mozilla.jss.provider.java.security.KeyFactorySpi1_2");
-        put("KeyFactory.DSA",
-            "org.mozilla.jss.provider.java.security.KeyFactorySpi1_2");
-
-        /////////////////////////////////////////////////////////////
-        // AlgorithmParameters
-        /////////////////////////////////////////////////////////////
-        put("AlgorithmParameters.IvAlgorithmParameters",
-            "org.mozilla.jss.provider.java.security.IvAlgorithmParameters");
-
-        /////////////////////////////////////////////////////////////
-        // Cipher
-        /////////////////////////////////////////////////////////////
-        put("Cipher.DES",
-            "org.mozilla.jss.provider.javax.crypto.JSSCipherSpi$DES");
-        put("Cipher.DESede",
-            "org.mozilla.jss.provider.javax.crypto.JSSCipherSpi$DESede");
-        put("Alg.Alias.Cipher.DES3", "DESede");
-        put("Cipher.AES",
-            "org.mozilla.jss.provider.javax.crypto.JSSCipherSpi$AES");
-        put("Cipher.RC4",
-            "org.mozilla.jss.provider.javax.crypto.JSSCipherSpi$RC4");
-        put("Cipher.RSA",
-            "org.mozilla.jss.provider.javax.crypto.JSSCipherSpi$RSA");
-
-        /////////////////////////////////////////////////////////////
-        // KeyGenerator
-        /////////////////////////////////////////////////////////////
-        put("KeyGenerator.DES",
-            "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$DES");
-        put("KeyGenerator.DESede",
-            "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$DESede");
-        put("Alg.Alias.KeyGenerator.DES3", "DESede");
-        put("KeyGenerator.AES",
-            "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$AES");
-        put("KeyGenerator.RC4",
-            "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$RC4");
-        put("KeyGenerator.HmacSHA1",
-           "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$HmacSHA1");
-        put("KeyGenerator.PBAHmacSHA1",
-           "org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$PBAHmacSHA1");
-
-        /////////////////////////////////////////////////////////////
-        // SecretKeyFactory
-        /////////////////////////////////////////////////////////////
-        put("SecretKeyFactory.DES",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$DES");
-        put("SecretKeyFactory.DESede",
-         "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$DESede");
-        put("Alg.Alias.SecretKeyFactory.DES3", "DESede");
-        put("SecretKeyFactory.AES",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$AES");
-        put("SecretKeyFactory.RC4",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$RC4");
-        put("SecretKeyFactory.HmacSHA1",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$HmacSHA1");
-        put("SecretKeyFactory.PBAHmacSHA1",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBAHmacSHA1");
-        put("SecretKeyFactory.PBEWithMD5AndDES",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBE_MD5_DES_CBC");
-        put("SecretKeyFactory.PBEWithSHA1AndDES",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBE_SHA1_DES_CBC");
-        put("SecretKeyFactory.PBEWithSHA1AndDESede",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBE_SHA1_DES3_CBC");
-        put("Alg.Alias.SecretKeyFactory.PBEWithSHA1AndDES3", "PBEWithSHA1AndDESede");
-        put("SecretKeyFactory.PBEWithSHA1And128RC4",
-            "org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBE_SHA1_RC4_128");
-
-
-        /////////////////////////////////////////////////////////////
-        // MAC
-        /////////////////////////////////////////////////////////////
-        put("Mac.HmacSHA1",
-            "org.mozilla.jss.provider.javax.crypto.JSSMacSpi$HmacSHA1");
-        put("Alg.Alias.Mac.Hmac-SHA1", "HmacSHA1");
-    }
-}

mozilla/security/jss/org/mozilla/jss/KeyDatabaseException.java

@@ -1,44 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-/**
- * This exception is thrown if the key database does not exist, or if
- * an error occurs while opening it.
- */
-public class KeyDatabaseException extends java.lang.Exception {
-    public KeyDatabaseException() {}
-    public KeyDatabaseException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/Makefile

@@ -1,77 +0,0 @@
-#! gmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-include rules.mk
-
-
-

mozilla/security/jss/org/mozilla/jss/NoSuchTokenException.java

@@ -1,43 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss;
-
-/**
- * Thrown if a token cannot be found.
- */
-public class NoSuchTokenException extends java.lang.Exception {
-    public NoSuchTokenException() {}
-    public NoSuchTokenException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/Decryptor.java

@@ -1,131 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Network Security Services for Java.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.mozilla.jss.SecretDecoderRing;
-
-import java.security.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-import org.mozilla.jss.asn1.*;
-import org.mozilla.jss.pkix.primitive.*;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.crypto.CryptoToken;
-import org.mozilla.jss.crypto.EncryptionAlgorithm;
-import org.mozilla.jss.crypto.TokenException;
-import java.io.*;
-
-/**
- * Decrypts data with the SecretDecoderRing.
- */
-public class Decryptor {
-    private CryptoToken token;
-    private KeyManager keyManager;
-
-    /**
-     * Creates a Decryptor for use with the given CryptoToken.
-     */
-    public Decryptor(CryptoToken token) {
-        this.token = token;
-        this.keyManager = new KeyManager(token);
-    }
-
-    /**
-     * Decrypts the given ciphertext. It must have been created previously
-     * with the SecretDecoderRing, either the JSS version or the NSS version.
-     * The key used for decryption must exist on the token that was passed
-     * into the constructor. The token will be searched for a key whose keyID
-     * matches the keyID in the encoded SecretDecoderRing result.
-     *
-     * @param ciphertext A DER-encoded Encoding object, created from a previous
-     *  call to Encryptor.encrypt(), or with the NSS SecretDecoderRing.
-     * @return The decrypted plaintext.
-     * @throws InvalidKeyException If no key can be found with the matching
-     *  keyID.
-     */
-    public byte[] decrypt(byte[] ciphertext)
-        throws CryptoManager.NotInitializedException,
-        GeneralSecurityException, TokenException
-    {
-        CryptoManager cm = CryptoManager.getInstance();
-        CryptoToken savedToken = cm.getThreadToken();
-
-        try {
-            cm.setThreadToken(token);
-
-            //
-            // decode ASN1
-            //
-            Encoding encoding = (Encoding)
-                ASN1Util.decode(Encoding.getTemplate(), ciphertext);
-
-            //
-            // lookup the algorithm
-            //
-            EncryptionAlgorithm alg = EncryptionAlgorithm.fromOID(
-                encoding.getEncryptionOID() );
-
-            //
-            // Lookup the key
-            //
-            SecretKey key = keyManager.lookupKey(alg, encoding.getKeyID());
-            if( key == null ) {
-                throw new InvalidKeyException("No matching key found");
-            }
-
-            //
-            // do the decryption
-            //
-            IvParameterSpec ivSpec = new IvParameterSpec(encoding.getIv());
-
-            Cipher cipher = Cipher.getInstance(alg.toString(),
-                Encryptor.PROVIDER);
-            cipher.init(Cipher.DECRYPT_MODE, key, ivSpec);
-
-            byte[] paddedPtext = cipher.doFinal(encoding.getCiphertext());
-            return org.mozilla.jss.crypto.Cipher.unPad(paddedPtext,
-                alg.getBlockSize() );
-        } catch(InvalidBERException ibe) {
-            throw new GeneralSecurityException(ibe.toString());
-        } catch(IllegalStateException ise) {
-            throw new GeneralSecurityException(ise.toString());
-        } catch(org.mozilla.jss.crypto.BadPaddingException bpe) {
-            throw new javax.crypto.BadPaddingException(bpe.getMessage());
-        } finally {
-            cm.setThreadToken(savedToken);
-        }
-    }
-
-}

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/Encoding.java

@@ -1,159 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Network Security Services for Java.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.mozilla.jss.SecretDecoderRing;
-
-import java.security.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-import org.mozilla.jss.asn1.*;
-import org.mozilla.jss.pkix.primitive.*;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.crypto.CryptoToken;
-import org.mozilla.jss.crypto.EncryptionAlgorithm;
-import java.io.*;
-
-/**
- * An ASN.1 class for encoding the SecretDecoderRing result.
- * This class is used internally by the SecretDecoderRing. 
- * You need not use this class directly in order to use the SecretDecoderRing.
- */
-public class Encoding implements ASN1Value {
-    private SEQUENCE seq = new SEQUENCE();
-
-    private byte[] iv;
-    private OBJECT_IDENTIFIER encOID;
-    private byte[] ctext;
-    private byte[] keyID;
-
-    public Encoding(byte[] keyID, byte[] iv, OBJECT_IDENTIFIER encOID,
-            byte[] ctext)
-    {
-        this.keyID = keyID;
-        this.iv = iv;
-        this.encOID = encOID;
-        this.ctext = ctext;
-        AlgorithmIdentifier algID = new AlgorithmIdentifier(
-            encOID, new OCTET_STRING(iv) );
-        seq.addElement(new OCTET_STRING(keyID));
-        seq.addElement(algID);
-        seq.addElement(new OCTET_STRING(ctext));
-    }
-
-    public byte[] getKeyID() {
-        return keyID;
-    }
-
-    public byte[] getIv() {
-        return iv;
-    }
-
-    public OBJECT_IDENTIFIER getEncryptionOID() {
-        return encOID;
-    }
-
-    public byte[] getCiphertext() {
-        return ctext;
-    }
-        
-
-    public static final Tag TAG = SEQUENCE.TAG;
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(TAG, ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        seq.encode(implicitTag, ostream);
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-    /**
-     * An ASN.1 class for decoding the SecretDecoderRing result.
-     * This class is used internally by the SecretDecoderRing. 
-     * You need not use this class directly in order to use the
-     * SecretDecoderRing.
-    */
-    public static class Template extends SEQUENCE.Template {
-        private SEQUENCE.Template template;
-
-        public Template() {
-            template = new SEQUENCE.Template();
-            template.addElement(OCTET_STRING.getTemplate() );
-            template.addElement(AlgorithmIdentifier.getTemplate() );
-            template.addElement(OCTET_STRING.getTemplate() );
-        }
-
-        public boolean tagMatch(Tag tag) {
-            return TAG.equals(tag);
-        }
-
-        public ASN1Value decode(InputStream istream)
-            throws IOException, InvalidBERException
-        {
-            return decode(TAG, istream);
-        }
-
-        public ASN1Value decode(Tag implicitTag, InputStream istream)
-            throws IOException, InvalidBERException
-        {
-            SEQUENCE seq = (SEQUENCE) template.decode(implicitTag, istream);
-
-            OCTET_STRING keyID = (OCTET_STRING) seq.elementAt(0);
-            AlgorithmIdentifier algID = (AlgorithmIdentifier)
-                seq.elementAt(1);
-            OCTET_STRING ivOS = (OCTET_STRING)
-                ((ANY)algID.getParameters()).decodeWith(
-                        OCTET_STRING.getTemplate());
-            OCTET_STRING ctextOS = (OCTET_STRING)seq.elementAt(2);
-
-            return new Encoding(keyID.toByteArray(),
-                ivOS.toByteArray(), algID.getOID(),
-                ctextOS.toByteArray());
-        }
-    }
-}
-
-

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/Encryptor.java

@@ -1,152 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Network Security Services for Java.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.mozilla.jss.SecretDecoderRing;
-
-import java.security.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
-import org.mozilla.jss.asn1.*;
-import org.mozilla.jss.pkix.primitive.*;
-import org.mozilla.jss.CryptoManager;
-import org.mozilla.jss.crypto.CryptoToken;
-import org.mozilla.jss.crypto.EncryptionAlgorithm;
-import org.mozilla.jss.crypto.TokenException;
-import java.io.*;
-
-/**
- * Encrypts data with the SecretDecoderRing.
- */
-public class Encryptor {
-
-    private CryptoToken token;
-    private byte[] keyID;
-    private SecretKey key;
-    private EncryptionAlgorithm alg;
-    private KeyManager keyManager;
-
-    /**
-     * The default encryption algorithm, currently DES3_CBC.
-     */
-    public static final EncryptionAlgorithm DEFAULT_ENCRYPTION_ALG
-        = EncryptionAlgorithm.DES3_CBC;
-
-    static final String PROVIDER = "Mozilla-JSS";
-    static final String RNG_ALG = "pkcs11prng";
-
-    /**
-     * Creates an Encryptor on the given CryptoToken, using the key with
-     * the given keyID and algorithm
-     * @param token The CryptoToken to use for encryption. The key must
-     *  reside on this token.
-     * @param keyID The keyID of the key to use for encryption. This key
-     *  must have been generated on this token with KeyManager.
-     * @param alg The EncryptionAlgorithm this key will be used for.
-     * @throws InvalidKeyException If no key exists on this token with this
-     *  keyID.
-     */
-    public Encryptor(CryptoToken token, byte[] keyID, EncryptionAlgorithm alg)
-            throws TokenException, InvalidKeyException
-    {
-        this.token = token;
-        this.keyID = keyID;
-        this.alg = alg;
-        this.keyManager = new KeyManager(token);
-
-        // make sure this key exists on the token
-        key = keyManager.lookupKey(alg, keyID);
-        if( key == null ) {
-            throw new InvalidKeyException("Key not found");
-        }
-
-        // make sure key matches algorithm
-        // !!! not sure how to do this
-    }
-
-    /**
-     * Encrypts a byte array.
-     * @param plaintext The plaintext bytes to be encrypted.
-     * @return The ciphertext. This is actually a DER-encoded Encoding
-     *  object. It contains the keyID, AlgorithmIdentifier, and the encrypted
-     *  plaintext. It is compatible with the SDRResult created by NSS's
-     *  SecretDecoderRing.
-     */
-    public byte[] encrypt(byte[] plaintext) throws
-            CryptoManager.NotInitializedException,
-            GeneralSecurityException,
-            InvalidBERException
-    {
-        CryptoManager cm = CryptoManager.getInstance();
-
-        CryptoToken savedToken = cm.getThreadToken();
-
-        try {
-            cm.setThreadToken(token);
-
-            //
-            // generate an IV
-            //
-            byte[] iv = new byte[alg.getIVLength()];
-            SecureRandom rng = SecureRandom.getInstance(RNG_ALG,
-                PROVIDER);
-            rng.nextBytes(iv);
-            IvParameterSpec ivSpec = new IvParameterSpec(iv);
-
-            //
-            // do the encryption
-            //
-            Cipher cipher = Cipher.getInstance(alg.toString(),PROVIDER);
-            cipher.init(Cipher.ENCRYPT_MODE, key, ivSpec);
-            byte[] paddedPtext = 
-                org.mozilla.jss.crypto.Cipher.pad(
-                    plaintext, alg.getBlockSize() );
-            byte[] rawCtext = cipher.doFinal(paddedPtext);
-
-            //
-            // package the encrypted content and IV
-            //
-            Encoding encoding =
-                new Encoding(keyID, iv, alg.toOID(), rawCtext);
-
-            return ASN1Util.encode(encoding);
-
-        } catch(IllegalStateException ise ) {
-            throw new GeneralSecurityException(ise.toString());
-        } finally {
-            cm.setThreadToken(savedToken);
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c

@@ -1,193 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Netscape Security Services for Java.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
-#include <nspr.h>
-#include <secitem.h>
-#include <jss_exceptions.h>
-#include <jssutil.h>
-#include <pk11func.h>
-#include <pk11util.h>
-#include <Algorithm.h>
-
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_generateKeyNative
-    (JNIEnv *env, jobject this, jobject tokenObj, jobject algObj,
-    jbyteArray keyIDba, jint keySize)
-{
-    PK11SlotInfo *slot = NULL;
-    CK_MECHANISM_TYPE mech;
-    PK11SymKey *symk = NULL;
-    SECItem *keyID = NULL;
-
-    /* get the slot */
-    if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS ) {
-        goto finish;
-    }
-
-    if( PK11_Authenticate(slot, PR_TRUE /*load certs*/, NULL /*wincx*/)
-        != SECSuccess)
-    {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION,
-            "Failed to login to token");
-        goto finish;
-    }
-
-    /* get the key ID */
-    keyID = JSS_ByteArrayToSECItem(env, keyIDba);
-    if( keyID == NULL ) {
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /* get the algorithm */
-    mech = JSS_getPK11MechFromAlg(env, algObj);
-    if( mech == CKM_INVALID_MECHANISM) {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION, "Failed to find PKCS #11 "
-            "mechanism for key generation algorithm");
-        goto finish;
-    }
-
-    /* generate the key */
-    symk = PK11_TokenKeyGen(slot, mech, NULL /*param*/, keySize, keyID,
-        PR_TRUE /* isToken */, NULL /*wincx*/);
-    if( symk == NULL ) {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION,
-            "Failed to generate token symmetric key");
-        goto finish;
-    }
-
-
-finish:
-    if( symk != NULL ) {
-        PK11_FreeSymKey(symk);
-    }
-    if( keyID != NULL ) {
-        SECITEM_FreeItem(keyID, PR_TRUE /*freeit*/);
-    }
-    return;
-}
-
-JNIEXPORT jobject JNICALL
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_lookupKeyNative
-    (JNIEnv *env, jobject this, jobject tokenObj, jobject algObj,
-    jbyteArray keyIDba)
-{
-    PK11SlotInfo *slot = NULL;
-    PK11SymKey *symk = NULL;
-    SECItem *keyID = NULL;
-    jobject symkObj = NULL;
-    CK_MECHANISM_TYPE mech;
-
-    /* get the slot */
-    if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS ) {
-        goto finish;
-    }
-
-    if( PK11_Authenticate(slot, PR_TRUE /*load certs*/, NULL /*wincx*/)
-        != SECSuccess)
-    {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION,
-            "Failed to login to token");
-        goto finish;
-    }
-
-    /* get the key ID */
-    keyID = JSS_ByteArrayToSECItem(env, keyIDba);
-    if( keyID == NULL ) {
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    /* get the algorithm */
-    mech = JSS_getPK11MechFromAlg(env, algObj);
-    if( mech == CKM_INVALID_MECHANISM) {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION, "Failed to find PKCS #11 "
-            "mechanism for key generation algorithm");
-        goto finish;
-    }
-
-    symk = PK11_FindFixedKey(slot, mech, keyID, NULL /*wincx*/);
-    if( symk != NULL ) {
-        symkObj = JSS_PK11_wrapSymKey(env, &symk);
-    }
-
-finish:
-    if( symk != NULL ) {
-        PK11_FreeSymKey(symk);
-    }
-    if( keyID != NULL ) {
-        SECITEM_FreeItem(keyID, PR_TRUE /*freeit*/);
-    }
-    return symkObj;
-}
-
-JNIEXPORT void JNICALL
-Java_org_mozilla_jss_SecretDecoderRing_KeyManager_deleteKeyNative
-    (JNIEnv *env, jobject this, jobject tokenObj, jobject key)
-{
-    PK11SlotInfo *slot = NULL;
-    PK11SymKey *symk = NULL;
-    SECStatus status;
-
-    /* get the slot */
-    if( JSS_PK11_getTokenSlotPtr(env, tokenObj, &slot) != PR_SUCCESS ) {
-        goto finish;
-    }
-
-    if( PK11_Authenticate(slot, PR_TRUE /*load certs*/, NULL /*wincx*/)
-        != SECSuccess)
-    {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION,
-            "Failed to login to token");
-        goto finish;
-    }
-
-    /* get the key pointer */
-    if( JSS_PK11_getSymKeyPtr(env, key, &symk) != PR_SUCCESS) {
-        goto finish;
-    }
-
-    if( PK11_DeleteTokenSymKey(symk) != SECSuccess ) {
-        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION,
-            "Failed to delete token symmetric key");
-        goto finish;
-    }
-
-finish:
-    /* don't free symk or slot, they are owned by their Java objects */
-    return;
-}

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.java

@@ -1,180 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Network Security Services for Java.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-package org.mozilla.jss.SecretDecoderRing;
-
-import java.security.*;
-import javax.crypto.*;
-import org.mozilla.jss.crypto.*;
-import org.mozilla.jss.util.Assert;
-
-/**
- * Creates, finds, and deletes keys for SecretDecoderRing.
- */
-public class KeyManager {
-    private static final int KEYID_LEN = 16;
-
-    private static final String RNG_ALG = "pkcs11prng";
-    private static final String RNG_PROVIDER = "Mozilla-JSS";
-
-    /**
-     * The default key generation algorithm, currently DES3.
-     */
-    public static final KeyGenAlgorithm DEFAULT_KEYGEN_ALG =
-        KeyGenAlgorithm.DES3;
-
-    /**
-     * The default key size. This is only relevant for algorithms
-     * with variable-length keys, such as AES.
-     */
-    public static final int DEFAULT_KEYSIZE = 0;
-
-    private CryptoToken token;
-
-    /**
-     * Creates a new KeyManager using the given CryptoToken.
-     * @param token The token on which this KeyManager operates.
-     */
-    public KeyManager(CryptoToken token) {
-        this.token = token;
-    }
-
-    /**
-     * Generates an SDR key with the default algorithm and key size.
-     * The default algorithm is stored in the constant DEFAULT_KEYGEN_ALG.
-     * The default key size is stored in the constant DEFAULT_KEYSIZE.
-     * @return The keyID of the generated key. A random keyID will be chosen
-     *  that is not currently used on the token. The keyID must be stored
-     *  by the application in order to use this key for encryption in the
-     *  future.
-     */
-    public byte[] generateKey() throws TokenException {
-        return generateKey(DEFAULT_KEYGEN_ALG, DEFAULT_KEYSIZE);
-    }
-
-    /**
-     * Generates an SDR key with the given algorithm and key size.
-     * @return The keyID of the generated key. A random keyID will be chosen
-     *  that is not currently used on the token. The keyID must be stored
-     *  by the application in order to use this key for encryption in the
-     *  future.
-     */
-    public byte[] generateKey(KeyGenAlgorithm alg, int keySize)
-            throws TokenException
-    {
-        byte[] keyID = generateUnusedKeyID();
-        generateKeyNative(token, alg, keyID, keySize);
-        return keyID;
-    }
-
-    private native void generateKeyNative(CryptoToken token,
-        KeyGenAlgorithm alg, byte[] keyID, int keySize);
-
-    /**
-     * Generates a key ID that is currently unused on this token.
-     * The caller is responsible for synchronization issues that may arise
-     * if keys are generated by different threads.
-     */
-    private byte[] generateUnusedKeyID() throws TokenException {
-      try {
-        SecureRandom rng = SecureRandom.getInstance(RNG_ALG, RNG_PROVIDER);
-        byte[] keyID = new byte[KEYID_LEN];
-        do {
-            rng.nextBytes(keyID);
-        } while( keyExists(keyID) );
-        return keyID;
-      } catch(NoSuchAlgorithmException nsae) {
-            throw new RuntimeException("No such algorithm: " + RNG_ALG);
-      } catch(NoSuchProviderException nspe) {
-            throw new RuntimeException("No such provider: " + RNG_PROVIDER);
-      }
-    }
-
-    private boolean keyExists(byte[] keyid) throws TokenException {
-        return (lookupKey(Encryptor.DEFAULT_ENCRYPTION_ALG, keyid) != null);
-    }
-    
-    /**
-     * Looks up the key on this token with the given algorithm and key ID.
-     * @param alg The algorithm that this key will be used for.
-     * This is necessary because it will be stored along with the 
-     * key for later use by the security library. It should match
-     * the actual algorithm of the key you are looking for. If you 
-     * pass in a different algorithm and try to use the key that is returned,
-     * the results are undefined.
-     * @return The key, or <tt>null</tt> if the key is not found.
-     */
-    public SecretKey lookupKey(EncryptionAlgorithm alg, byte[] keyid)
-        throws TokenException
-    {
-        SymmetricKey k = lookupKeyNative(token, alg, keyid);
-        if( k == null ) {
-            return null;
-        } else {
-            return new SecretKeyFacade(k);
-        }
-    }
-
-    private native SymmetricKey lookupKeyNative(CryptoToken token,
-        EncryptionAlgorithm alg, byte[] keyid) throws TokenException;
-
-    /**
-     * Deletes the key with the given keyID from this token.
-     * @throws InvalidKeyException If the key does not exist on this token.
-     */
-    public void deleteKey(byte[] keyID) throws TokenException,
-        InvalidKeyException
-    {
-        deleteKey(lookupKey(Encryptor.DEFAULT_ENCRYPTION_ALG, keyID));
-    }
-
-    /**
-     * Deletes this key from this token.
-     * @throws InvalidKeyException If the key does not reside on this token,
-     * or is not a JSS key.
-     */
-    public void deleteKey(SecretKey key) throws TokenException,
-            InvalidKeyException
-    {
-        if( ! (key instanceof SecretKeyFacade) ) {
-            throw new InvalidKeyException("Key must be a JSS key");
-        }
-        deleteKeyNative(token, ((SecretKeyFacade)key).key);
-    }
-
-    private native void deleteKeyNative(CryptoToken token, SymmetricKey key)
-        throws TokenException;
-}

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/Makefile

@@ -1,72 +0,0 @@
-#! gmake
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-include $(CORE_DEPTH)/$(MODULE)/config/config.mk
- 
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/config.mk

@@ -1,37 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-TARGETS=$(LIBRARY)
-SHARED_LIBRARY=
-IMPORT_LIBRARY=
-
-NO_MD_RELEASE = 1

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/manifest.mn

@@ -1,48 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-CORE_DEPTH = ../../../../..
-
-MODULE = jss
-
-NS_USE_JDK = 1
-
-REQUIRES =      nspr20 nss
-
-PACKAGE =       org/mozilla/jss/SecretDecoderRing
-
-CSRCS =		KeyManager.c		\
-			$(NULL)
-
-
-LIBRARY_NAME = jsssdr

mozilla/security/jss/org/mozilla/jss/SecretDecoderRing/package.html

@@ -1,14 +0,0 @@
-<html>
-<body>
-A facility for encrypting and decrypting small amounts of data with
-a symmetric key. This is most commonly used for encrypting password files
-to implement single sign-on.
-
-<p>KeyManager is used to create, lookup, and delete the symmetric keys used
- for SecretDecoderRing. Encryptor is used to encrypt data. Decryptor is used
-to decrypt data that was previously encrypted with Encryptor. Encoding
-and Encoding.Template are used internally, but they were made public
-because they may occasionally be useful to applications.
-
-</body>
-</html>

mozilla/security/jss/org/mozilla/jss/asn1/ANY.java

@@ -1,287 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import org.mozilla.jss.util.Assert;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * Represents an ASN.1 <code>ANY</code> value. An ANY is just an arbitrary
- * ASN.1 value. It can be thought of as the simplest implementation of the
- * <code>ASN1Value</code> interface. Although they can be created
- * from scratch (from raw BER), instances of <code>ANY</code> are usually
- * found after decoding
- * with a template that has an <code>ANY</code> field.
- *
- * <p>An <code>ANY</code> supports extracting the BER encoding, or decoding
- *  with a different template.
- */
-public class ANY implements ASN1Value {
-
-    private ANY() { }
-
-    // The complete encoding of header + contents
-    private byte[] encoded;
-    private Tag tag;
-
-    /**
-     * Creates an ANY value, which is just a generic ASN.1 value.
-     * This method is provided for efficiency if the tag is already known,
-     * so that we don't have to parse the encoding for it.
-     * @param tag The tag of this value. It must be the same as the actual tag
-     *  contained in the encoding.
-     * @param encoded The complete BER encoding of this value, including
-     *      tag, form, length, and contents.
-     */
-    public ANY(Tag tag, byte[] encoded) {
-        this.encoded = encoded;
-        this.tag = tag;
-    }
-
-    /**
-     * Creates an ANY value, which is just a generic ASN.1 value.
-     * @param encoded The complete BER encoding of this value, including
-     *      tag, form, length, and contents.
-     */
-    public ANY(byte[] encoded) throws InvalidBERException {
-      try {
-        this.encoded = encoded;
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-        ASN1Header head = new ASN1Header(bis);
-        this.tag = head.getTag();
-      } catch(IOException e) {
-            throw new org.mozilla.jss.util.AssertionException(
-                "IOException while creating ANY: "+e);
-      }
-    }
-
-    /**
-     * Returns the tag of this value.
-     */
-    public Tag getTag() {
-        return tag;
-    }
-
-    /**
-     * Returns the complete encoding of header and contents, as passed into
-     * the constructor or read from a BER input stream.
-     */
-    public byte[] getEncoded() {
-        return encoded;
-    }
-
-    /**
-     * Returns the ASN.1 header from the encoding.
-     */
-    public ASN1Header getHeader() throws InvalidBERException, IOException {
-        if( header == null ) {
-            ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-            header = new ASN1Header(bis);
-        }
-        return header;
-    }
-    private ASN1Header header=null;
-
-    /**
-     * Strips out the header and returns just the contents octets of the
-     * encoding.
-     */
-    private byte[] contents=null;
-    public byte[] getContents() throws InvalidBERException {
-      try {
-        if( contents==null ) {
-            ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-            header = new ASN1Header(bis);
-            contents = new byte[ bis.available() ];
-            if( (contents.length != header.getContentLength()) &&
-                ( header.getContentLength() != -1 ) ) {
-                throw new InvalidBERException("Length of contents was not the "+
-                    "same as the header predicted");
-            }
-            ASN1Util.readFully(contents, bis);
-        }
-
-        return contents;
-
-      } catch( IOException e ) {
-            Assert.notReached("IOException reading from byte array");
-            return null;
-      }
-    }
-    
-    public void encode(OutputStream ostream) throws IOException {
-        ostream.write(encoded);
-    }
-
-    /**
-     * Decodes this ANY using the given template.  This is useful if you
-     * originally decoded something as an ANY because you didn't know
-     * what it was, but now you know what it is supposed to be.
-     *
-     * @param template The template to use to decode this ANY.
-     * @return The output of the given template when it is fed the
-     *      encoding of this ANY.
-     */
-    public ASN1Value decodeWith(ASN1Template template)
-        throws InvalidBERException
-    {
-      try {
-        ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-        return template.decode(bis);
-      } catch( IOException e ) {
-        Assert.notReached("IOException while reading from byte array input"+
-            " stream");
-        return null;
-      }
-    }
-
-    /**
-     * Decodes this ANY using the given template.  This is useful if you
-     * originally decoded something as an ANY because you didn't know
-     * what it was, but now you know what it is supposed to be.
-     *
-     * @param implicitTag The implicit tag for the encoding.
-     * @param template The template to use to decode this ANY.
-     * @return The output of the given template when it is fed the
-     *      encoding of this ANY.
-     */
-    public ASN1Value decodeWith(Tag implicitTag, ASN1Template template)
-        throws IOException, InvalidBERException
-    {
-        ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-        return template.decode(implicitTag, bis);
-    }
-
-    /**
-     * @param implicitTag <b>This parameter is ignored</b>, because
-     * ANY values cannot have implicit tags.
-     */
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        if( ! implicitTag.equals(tag) ) {
-            Assert.notReached("No implicit tags allowed for ANY");
-        }
-        ostream.write(encoded);
-    }
-
-    /**
-     * Extracts the contents from the ANY and encodes them with
-     * the provided tag.
-     */
-    public void encodeWithAlternateTag(Tag alternateTag, OutputStream ostream)
-        throws IOException, InvalidBERException
-    {
-        byte[] contents = getContents();
-        ASN1Header oldHead = getHeader();
-        Assert._assert( contents.length == oldHead.getContentLength() );
-
-        ASN1Header newHead = new ASN1Header( alternateTag, oldHead.getForm(),
-                                contents.length);
-        newHead.encode(ostream);
-        ostream.write(contents);
-    }
-
-    /**
-     * Returns a singleton instance of a decoding template.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static Template templateInstance = new Template();
-
-/**
- * A class for decoding <code>ANY</code> values from BER.
- */
-public static class Template implements ASN1Template {
-
-    public boolean tagMatch(Tag tag) {
-        return true; // wheeeeee...it's ANY!
-
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-
-        ASN1Header head = ASN1Header.lookAhead(istream);
-
-        if( head.getContentLength() == -1 ) {
-            // indefinite length encoding
-            ByteArrayOutputStream recording = new ByteArrayOutputStream();
-
-            // eat the header off the input stream
-            head = new ASN1Header(istream);
-            
-            // write the header to the recording stream
-            recording.write( head.encode() );
-
-            // write all objects from the input stream to the recording
-            // stream, until we hit an END-OF-CONTENTS tag
-            ANY any;
-            ANY.Template anyt = new ANY.Template();
-            int count=0;
-            do {
-                any = (ANY) anyt.decode(istream);
-                recording.write( any.getEncoded() );
-            } while( ! any.getTag().equals(Tag.EOC) );
-
-            return new ANY( head.getTag(), recording.toByteArray() );
-                
-        } else {
-            // definite length encoding
-            byte[] data = new byte[ (int) head.getTotalLength() ];
-
-            ASN1Util.readFully(data, istream);
-            return new ANY(head.getTag(), data);
-        }
-
-      } catch( InvalidBERException e ) {
-            throw new InvalidBERException(e, "ANY");
-      }
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        throw new InvalidBERException("Implicit tag on ANY");
-    }
-} // End of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/ASN1Header.java

@@ -1,411 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.math.BigInteger;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Vector;
-import org.mozilla.jss.util.Assert;
-
-/**
- * The portion of a BER encoding that precedes the contents octets.  Consists
- * of the tag, form, and length octets.
- */
-public class ASN1Header {
-
-    // This is set by the the decoding constructor, and by the encode()
-    // method.  If it is set by the decoding constructor, it is supposed
-    // to represent what was actually read from the input stream, so it
-    // must not be overwritten later by the output of encode(), which could
-    // be a different encoding (DER vs. BER, for example).
-    private byte[] cachedEncoding = null;
-
-    /**
-     * Returns the length of the header plus the length of the contents;
-     *  the total length of the DER encoding of an ASN1 value. Returns
-     *  -1 if indefinite length encoding was used.
-     */
-    public long getTotalLength() {
-        if( contentLength == -1 ) {
-            return -1;
-        } else {
-            return encode().length + contentLength;
-        }
-    }
-
-    private Tag tag;
-    public Tag getTag() {
-        return tag;
-    }
-
-    // -1 means indefinite length encoding
-    private long contentLength;
-    /**
-     * Returns -1 for indefinite length encoding.
-     */
-    public long getContentLength() {
-        return contentLength;
-    }
-
-    // PRIMITIVE or CONSTRUCTED
-    public static final Form PRIMITIVE = Form.PRIMITIVE;
-    public static final Form CONSTRUCTED = Form.CONSTRUCTED;
-    private Form form;
-
-    /**
-     * Returns the Form, PRIMITIVE or CONSTRUCTED.
-     */
-    public Form getForm() {
-        return form;
-    }
-
-    // This is the maximum size of ASN1 Header we support.
-    // 32 bytes is pretty huge, I've never seen anything bigger than 7.
-    private static final int MAX_LOOK_AHEAD = 32;
-
-    /**
-     * Returns information about the next item in the stream, but does not
-     *  consume any octets.
-     * @exception IOException If the input stream does not support look ahead.
-     */
-    public static ASN1Header lookAhead(InputStream derStream)
-        throws IOException, InvalidBERException
-    {
-        if( ! derStream.markSupported() ) {
-            throw new IOException("Mark not supported on this input stream");
-        }
-
-        derStream.mark(MAX_LOOK_AHEAD);
-        ASN1Header info = new ASN1Header(derStream);
-        derStream.reset();
-
-        return info;
-    }
-
-    /**
-     * Gets info about the next item in the DER stream, consuming the
-     * identifier and length octets.
-     */
-    public ASN1Header(InputStream istream)
-        throws InvalidBERException, IOException
-    {
-        // default BAOS size is 32 bytes, which is plenty
-        ByteArrayOutputStream encoding = new ByteArrayOutputStream();
-        int inInt = istream.read();
-        if( inInt == -1 ) {
-            throw new InvalidBERException("End-of-file reached while "+
-                "decoding ASN.1 header");
-        }
-        encoding.write(inInt);
-        byte byte1 = (byte) inInt;
-        Tag.Class tagClass;
-
-        //
-        // Get Tag Class
-        //
-        tagClass = Tag.Class.fromInt( (byte1 & 0xff) >>> 6 );
-        
-        //
-        // Get form
-        //
-        if( (byte1 & 0x20) == 0x20 ) {
-            form = CONSTRUCTED;
-        } else {
-            form = PRIMITIVE;
-        }
-
-        //
-        // Get Tag Number
-        //
-        long tagNum;
-        if( (byte1 & 0x1f) == 0x1f ) {
-            // long form
-
-            //
-            // read all octets into a Vector of Bytes
-            //
-            byte next;
-            Vector bV = new Vector();
-
-            // last byte has MSB == 0.
-            do {
-                inInt = istream.read();
-                if( inInt == -1 ) {
-                    throw new InvalidBERException("End-of-file reached while"
-                        +" decoding ASN.1 header");
-                }
-                encoding.write(inInt);
-                next = (byte) inInt;
-                bV.addElement( new Byte(next) );
-            } while( (next & 0x80) == 0x80 );
-            Assert._assert( bV.size() > 0 );
-
-            //
-            // Copy Vector of 7-bit bytes into array of 8-bit bytes.
-            //
-            byte[] bA = new byte[ ( (bV.size()*7) + 7 ) / 8 ];
-            int v; // vector index
-            int a; // array index
-
-            // clear the target array
-            for( a = 0; a < bA.length; a++ ) {
-                bA[a] = 0;
-            }
-            int shift = 0; // the amount the Vector is shifted from the array
-
-            // copy bits from the Vector to the array, going from the
-            // end (LSB) to the beginning (MSB).
-            a = bA.length - 1;
-            for( v=bV.size()-1 ; v >= 0; v--) {
-                Assert._assert( v >= 0 );
-                Assert._assert( v < bV.size() );
-                Assert._assert( a >= 0 );
-                Assert._assert( a < bA.length );
-
-                // MSB is not part of the number
-                byte b = (byte) ( ((Byte)bV.elementAt(v)).byteValue() & 0x7f );
-                bA[a] |= b << shift;
-                if( shift > 1 ) {
-                    // The byte from the Vector falls across a byte boundary
-                    // in the array.  We've already got the less-significant
-                    // bits, now copy the more-significant bits into
-                    // the next element of the array.
-                    Assert._assert( a > 0 );
-                    --a;
-                    bA[a] |= b >>> (8-shift);
-                }
-
-                shift = (shift+7)%8; // update shift
-            }
-
-            // Create a new unsigned BigInteger from the byte array
-            tagNum = (new BigInteger( 1, bA )).longValue();
-
-        } else {
-            // short form
-            tagNum = byte1 & 0x1f;
-        }
-
-        tag = new Tag(tagClass, tagNum);
-
-        //
-        // Get Length
-        //
-        inInt = istream.read();
-        if(inInt == -1) {
-            throw new InvalidBERException("End-of-file reached while "+
-                "decoding ASN.1 header");
-        }
-        encoding.write(inInt);
-        byte lenByte = (byte) inInt;
-
-        if( (lenByte & 0x80) == 0 ) {
-            // short form
-            contentLength = lenByte;
-        } else {
-            // long form
-            if( (lenByte & 0x7f) == 0 ) {
-                // indefinite
-                contentLength = -1;
-            } else {
-                // definite 
-                byte[] lenBytes = new byte[ lenByte & 0x7f ];
-                ASN1Util.readFully(lenBytes, istream);
-                encoding.write( lenBytes );
-                contentLength = (new BigInteger( 1, lenBytes )).longValue();
-            }
-        }
-
-        // save our encoding so we don't have to recompute it later
-        cachedEncoding = encoding.toByteArray();
-    }
-
-    /**
-     * This constructor is to be called when we are constructing an ASN1Value
-     * rather than decoding it.
-     * @param contentLength Must be >=0. Although indefinite length
-     *      <i>decoding</i> is supported, indefinite length <i>encoding</i>
-     *      is not.
-     */
-    public ASN1Header( Tag tag, Form form, long contentLength)
-    {
-        this.tag = tag;
-        this.form = form;
-        Assert._assert(contentLength >= 0);
-        this.contentLength = contentLength;
-    }
-
-    public void encode( OutputStream ostream )
-        throws IOException
-    {
-        ostream.write( encode() );
-    }
-
-    public byte[] encode() {
-        // It's important that we not recompute the encoding if it was
-        // set by ASN1Header(InputStream), since in that case it represents
-        // the encoding that was actually read from the InputStream.
-        if( cachedEncoding != null ) {
-            return cachedEncoding;
-        }
-
-        ByteArrayOutputStream cache = new ByteArrayOutputStream();
-        
-        //
-        // Identifier octet(s)
-        //
-
-        byte idOctet = 0;
-        idOctet |= tag.getTagClass().toInt() << 6;
-
-        if( form == CONSTRUCTED ) {
-            idOctet |= 0x20;
-        }
-
-        if( tag.getNum() <= 30 ) {
-            // short form
-            idOctet |= (tag.getNum() & 0x1f );
-
-            cache.write( idOctet );
-        }  else {
-            // long form
-            idOctet |= 0x1f;
-            BigInteger tagNum = BigInteger.valueOf(tag.getNum());
-
-            cache.write( idOctet );
-
-            int bitlength = tagNum.bitLength();
-            int reps = (bitlength+6)/7;
-
-            for( reps = reps-1; reps > 0 ; reps--) {
-                long shifted = tag.getNum() >>> ( 7*reps );
-                cache.write( (((byte)shifted) & 0x7f) | 0x80 );
-            }
-
-            cache.write( ((byte)tag.getNum()) & 0x7f );
-        }
-
-        //
-        // Length Octets
-        //
-        if( contentLength == -1 ) {
-            // indefinite form
-            cache.write( (byte) 0x80 );
-        } else if( contentLength <= 127 ) {
-            // short form
-            cache.write( (byte) contentLength );
-        } else {
-            // long form
-            byte[] val = unsignedBigIntToByteArray(
-                            BigInteger.valueOf(contentLength) );
-            cache.write( ((byte)val.length) | 0x80 );
-            cache.write( val, 0, val.length );
-        }
-
-        cachedEncoding = cache.toByteArray();
-
-        return cachedEncoding;
-    }
-
-    /**
-     * Converts an unsigned BigInteger to a minimal-length byte array.
-     * This is necessary because BigInteger.toByteArray() attaches an extra
-     * sign bit, which could cause the size of the byte representation to
-     * be bumped up by an extra byte.
-     */
-    public static byte[] unsignedBigIntToByteArray(BigInteger bi) {
-        // make sure it is not negative
-        Assert._assert( bi.compareTo(BigInteger.valueOf(0)) != -1 );
-
-        // find minimal number of bytes to hold this value
-        int bitlen = bi.bitLength(); // minimal number of bits, without sign
-        int bytelen;
-        if( bitlen == 0 ) {
-            // special case, since bitLength() returns 0
-            bytelen = 1;
-        } else {
-            bytelen = (bitlen + 7) / 8;
-        }
-
-        byte[] withSign = bi.toByteArray();
-
-        if( bytelen == withSign.length ) {
-            return withSign;
-        } else {
-            // trim off extra byte at the beginning
-            Assert._assert( bytelen == withSign.length - 1 );
-            Assert._assert( withSign[0] == 0 );
-            byte[] without = new byte[bytelen];
-            System.arraycopy(withSign,1, without, 0, bytelen);
-            return without;
-        }
-    }
-
-    /**
-     * Verifies that this header has the given tag and form.
-     * @exception InvalidBERException If the header's tag or form
-     *  differ from those passed in.
-     */
-    public void validate(Tag expectedTag, Form expectedForm)
-        throws InvalidBERException
-    {
-        validate(expectedTag);
-        if( getForm() != expectedForm ) {
-            throw new InvalidBERException("Incorrect form: expected ["+
-                expectedForm+"], found ["+getForm());
-        }
-    }
-
-    /**
-     * Verifies that this head has the given tag.
-     * @exception InvalidBERException If the header's tag differs from that
-     *      passed in.
-     */
-    public void validate(Tag expectedTag) throws InvalidBERException {
-        if( ! getTag().equals( expectedTag ) ) {
-            throw new InvalidBERException("Incorrect tag: expected ["+
-                expectedTag+"], found ["+getTag()+"]");
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if this is a BER end-of-contents marker.
-     */
-    public boolean isEOC() {
-        return( tag.equals(Tag.EOC) );
-    }
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/ASN1Template.java

@@ -1,73 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * An interface for decoding ASN1Values from their BER encodings.
- *
- * @see ASN1Value
- */
-public interface ASN1Template {
-
-    /**
-     * Determines whether the given tag will satisfy this template.
-     */
-	public boolean tagMatch(Tag tag);
-
-    /**
-     * Decodes an ASN1Value from the InputStream without an implicit tag.
-     * @param istream Must support marking (markSupported() == true). 
-     *      For example, ByteArrayInputStream and BufferedInputStream
-     *      support marking, but FileInputStream does not. If your source
-     *      does not support marking, you can wrap it in a
-     *      BufferedInputStream.
-     */
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException;
-
-    /**
-     * Decodes an ASN1Value from the InputStream with the given implicit
-     *      tag.
-     * @param istream Must support marking (markSupported() == true). 
-     *      For example, ByteArrayInputStream and BufferedInputStream
-     *      support marking, but FileInputStream does not. If your source
-     *      does not support marking, you can wrap it in a
-     *      BufferedInputStream.
-     */
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException;
-}

mozilla/security/jss/org/mozilla/jss/asn1/ASN1Util.java

@@ -1,114 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.*;
-import org.mozilla.jss.asn1.InvalidBERException;
-import org.mozilla.jss.util.Assert;
-
-public class ASN1Util {
-
-    public static byte[] encode(ASN1Value val) {
-        return encode(val.getTag(), val);
-    }
-
-    public static byte[] encode(Tag implicitTag, ASN1Value val)
-    {
-      try {
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        val.encode(implicitTag, bos);
-        return bos.toByteArray();
-
-      } catch( IOException e ) {
-        Assert.notReached("Encoding to byte array gave IOException");
-        return null;
-      }
-    }
-
-    public static ASN1Value decode(ASN1Template template, byte[] encoded)
-        throws InvalidBERException
-    {
-      try {
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-        return template.decode(bis);
-
-      } catch( IOException e ) {
-        Assert.notReached("Decoding from byte array gave IOException");
-        return null;
-      }
-    }
-    
-    public static ASN1Value decode(Tag implicitTag, ASN1Template template,
-                            byte[] encoded)
-        throws InvalidBERException
-    {
-      try {
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-        return template.decode(implicitTag, bis);
-
-      } catch( IOException e ) {
-        Assert.notReached("Decoding from byte array gave IOException");
-        return null;
-      }
-    }
-
-
-
-    /**
-     * Fills a byte array with bytes from an input stream.  This method
-     * keeps reading until the array is filled, an IOException occurs, or EOF
-     * is reached.  The byte array will be completely filled unless an
-     * exception is thrown.
-     *
-     * @param bytes A byte array which will be filled up.
-     * @param istream The input stream from which to read the bytes.
-     * @exception IOException If an IOException occurs reading from the
-     *      stream, or EOF is reached before the byte array is filled.
-     */
-    public static void readFully(byte[] bytes, InputStream istream)
-        throws IOException
-    {
-
-        int numRead=0;
-        while(numRead < bytes.length) {
-            int nr = istream.read(bytes, numRead, bytes.length-numRead);
-            if( nr == -1 ) {
-                throw new EOFException();
-            }
-            numRead += nr;
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/ASN1Value.java

@@ -1,63 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.OutputStream;
-import java.io.IOException;
-
-/**
- * A value that can be decoded from BER and encoded to DER.
- *
- * @see ASN1Template
- */
-public interface ASN1Value {
-
-    /**
-     * Returns the base tag for this type, not counting any tags
-     * that may be imposed on it by its context.
-     */
-    public Tag getTag();
-
-	/**
-	 * Write this value's DER encoding to an output stream using
-	 *	its own base tag.
-	 */
-    public void encode(OutputStream ostream) throws IOException;
-
-	/**
-	 * Write this value's DER encoding to an output stream using
-	 * an implicit tag.
-	 */
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException;
-}

mozilla/security/jss/org/mozilla/jss/asn1/BIT_STRING.java

@@ -1,316 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import org.mozilla.jss.util.Assert;
-import java.math.BigInteger;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.BitSet;
-
-/**
- * An ASN.1 <code>BIT STRING</code>, which is an ordered sequence of bits.
- * The bits are stored the same way they are encoded in BER: as an array
- * of bytes with 0-7 unused bits at the end.
- */
-public class BIT_STRING implements ASN1Value {
-
-    private BIT_STRING() { }
-
-    private byte[] bits;
-    private int padCount;
-    private boolean removeTrailingZeroes = false;
-
-    /**
-     * @param bits The bits packed into an array of bytes, with padding
-     *      at the end. The array may be empty (but not null), in which case
-     *      <code>padCount</code> must be zero. The array is referenced,
-     *      not cloned.
-     * @param padCount The number of padding bits at the end of the array.
-     *      Must be in the range <code>[0,7]</code>.
-     * @exception NumberFormatException If <code>padCount</code> is not in
-     *      the range <code>[0,7]</code>, or <code>bits</code> is
-     *      empty and <code>padCount</code> is non-zero.
-     */
-    public BIT_STRING(byte[] bits, int padCount)
-        throws NumberFormatException
-    {
-        if(padCount < 0 || padCount > 7) {
-            throw new NumberFormatException();
-        }
-        if(bits.length == 0 && padCount != 0) {
-            throw new NumberFormatException();
-        }
-        this.bits = bits;
-        this.padCount = padCount;
-    }
-
-    /**
-     * Constructs a BIT_STRING from a BitSet.
-     * @param bs A BitSet.
-     * @param numBits The number of bits to copy from the BitSet.
-     *      This is necessary because the size of a BitSet is always padded
-     *      up to a multiple of 64, but not all of these bits may
-     *      be significant.
-     * @exception NumberFormatException If <code>numBits</code> is larger
-     *      than <code>bs.size()</code> or less than zero.
-     */
-    public BIT_STRING(BitSet bs, int numBits)
-        throws NumberFormatException
-    {
-        if( numBits < 0 || numBits > bs.size() ) {
-            throw new NumberFormatException();
-        }
-        // allocate enough bytes to hold all the bits
-        bits = new byte[(numBits+7) / 8];
-        padCount = (bits.length * 8) - numBits;
-        Assert._assert( padCount >= 0 && padCount <= 7);
-
-        for(int i=0; i < numBits; i++) {
-            if( bs.get(i) ) {
-                bits[i/8] |= 0x80 >>> (i%8);
-            }
-        }
-    }
-
-    /**
-     * Determines whether the DER-encoding of this bitstring will have
-     * its trailing zeroes removed. Generally, DER requires that trailing
-     * zeroes be removed when the bitstring is used to hold flags, but
-     * not when it is used to hold binary data (such as a public key).
-     * The default is <tt>false</tt>.
-     */
-    public boolean getRemoveTrailingZeroes() {
-        return this.removeTrailingZeroes;
-    }
-
-    /**
-     * Determines whether the DER-encoding of this bitstring will have
-     * its trailing zeroes removed. Generally, DER requires that trailing
-     * zeroes be removed when the bitstring is used to hold flags, but
-     * not when it is used to hold binary data (such as a public key).
-     * The default is <tt>false</tt>. If this bit string is used to hold
-     * flags, you should set this to <tt>true</tt>.
-     */
-    public void setRemoveTrailingZeroes(boolean removeTrailingZeroes) {
-        this.removeTrailingZeroes = removeTrailingZeroes;
-    }
-
-    /**
-     * Returns the bits packed into an array of bytes, with padding
-     *      at the end. The array may be empty (but not null), in which case
-     *      <code>padCount</code> must be zero. The array is referenced,
-     *      not cloned.
-     */
-    public byte[] getBits() {
-        return bits;
-    }
-
-    /**
-     * Copies this BIT STRING into a Java BitSet.  Note that BitSet.size()
-     * will not accurately reflect the number of bits in the BIT STRING,
-     * because the size of a BitSet is always rounded up to the next multiple
-     * of 64. The extra bits will be set to 0.
-     */
-    public BitSet toBitSet() {
-        BitSet bs = new BitSet();
-        int numBits = (bits.length * 8) - padCount;
-        for( int i=0; i < numBits; i++) {
-            if( (bits[i/8] & (0x80 >>> (i%8))) != 0 ) {
-                bs.set(i);
-            } else {
-                bs.clear(i);
-            }
-        }
-        return bs;
-    }
-
-    /**
-     * Copies this BIT STRING into a boolean array.  Each element of the array
-     * represents one bit with <code>true</code> for 1 and <code>false</code>
-     * for 0.
-     */
-    public boolean[] toBooleanArray() {
-        boolean[] array = new boolean[(bits.length*8) - padCount];
-        // all elements are set to false by default
-
-        for(int i=0; i < array.length; i++) {
-            if( (bits[i/8] & (0x80 >>> (i%8))) != 0 ) {
-                array[i] = true;
-            }
-        }
-        return array;
-    }
-
-    /**
-     * Returns the number of padding bits at the end of the array.
-     *      Must be in the range <code>[0,7]</code>.
-     */
-    public int getPadCount() {
-        return padCount;
-    }
-
-    public static final Tag TAG = new Tag(Tag.UNIVERSAL, 3);
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(TAG, ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        // force all unused bits to be zero, in support of DER standard.
-        if( bits.length > 0 ) {
-            bits[bits.length-1] &= (0xff << padCount);
-        }
-        int padBits;
-        int numBytes;
-
-        if( removeTrailingZeroes ) {
-            // first pare off empty bytes
-            numBytes = bits.length;
-            for( ; numBytes > 0; --numBytes) {
-                if( bits[numBytes-1] != 0 ) {
-                    break;
-                }
-            }
-
-            // Now compute the number of unused bits. This includes any
-            // trailing zeroes, whether they are significant or not.
-            if( numBytes == 0 ) {
-                padBits = 0;
-            } else {
-                for( padBits=0; padBits < 8; ++padBits ) {
-                    if( (bits[numBytes-1] & (1 << padBits)) != 0 ) {
-                        break;
-                    }
-                }
-                Assert._assert(padBits >=0 && padBits <= 7);
-            }
-        } else {
-            // Don't remove trailing zeroes. Just write the bits out as-is.
-            padBits = padCount;
-            numBytes = bits.length;
-
-        }
-
-        ASN1Header head = new ASN1Header(implicitTag, FORM, numBytes+1);
-
-        head.encode(ostream);
-
-        ostream.write(padBits);
-        ostream.write(bits, 0, numBytes);
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-/**
- * A class for decoding a <code>BIT_STRING</code> from its BER encoding.
- */
-public static class Template implements ASN1Template {
-
-
-    public boolean tagMatch(Tag tag) {
-        return( TAG.equals(tag) );
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(TAG, istream);
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header( istream );
-        head.validate( implicitTag );
-
-        if( head.getContentLength() == -1 ) {
-            // indefinite length encoding
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            int padCount=0;
-            ASN1Header ahead;
-            do {
-                ahead = ASN1Header.lookAhead(istream);
-                if( ! ahead.isEOC() ) {
-                    if(padCount != 0 ) {
-                      throw new InvalidBERException("Element of constructed "+
-                        "BIT STRING has nonzero unused bits, but is not\n"+
-                        "the last element of the construction.");
-                    }
-                    BIT_STRING.Template bst = new BIT_STRING.Template();
-                    BIT_STRING bs = (BIT_STRING) bst.decode(istream);
-                    bos.write( bs.getBits() );
-                    padCount = bs.getPadCount();
-                }
-            } while( ! ahead.isEOC() );
-
-            // consume the EOC
-            ahead = new ASN1Header(istream);
-
-            return new BIT_STRING( bos.toByteArray(), padCount );
-        }   
-
-        // First octet is the number of unused bits in last octet
-        int padCount = istream.read();
-        if( padCount == -1 ) {
-            throw new InvalidBERException.EOF();
-        } else if( padCount < 0 || padCount > 7 ) {
-            throw new InvalidBERException("Unused bits not in range [0,7]");
-        }
-
-        // get the rest of the octets
-        byte[] bits = new byte[ (int) head.getContentLength() - 1];
-        ASN1Util.readFully(bits, istream);
-
-        return new BIT_STRING(bits, padCount);
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "BIT STRING");
-      }
-    }
-} // end of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/BMPString.java

@@ -1,143 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-import java.io.UnsupportedEncodingException;
-import org.mozilla.jss.util.Assert;
-
-/**
- * The ASN.1 type <i>BMPString</i>.  BMPStrings use the Unicode character set.
- * They are encoded and decoded in big-endian format using two octets.
- */
-public class BMPString extends CharacterString implements ASN1Value {
-
-    /**
-     * Creates a new BMPString from an array of Java characters.
-     */
-    public BMPString(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    /**
-     * Creates a new BMPString from a Java String.
-     */
-    public BMPString(String s) throws CharConversionException {
-        super(s);
-    }
-
-    /**
-     * Returns the conversion object for converting between an encoded byte
-     * array an an array of Java characters.
-     */
-    CharConverter getCharConverter() {
-        return converterInstance;
-    }
-    private static final BMPConverter converterInstance = new BMPConverter();
-
-    static final Tag TAG = new Tag( Tag.UNIVERSAL, 30 );
-    static final Form FORM = Form.PRIMITIVE;
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    /**
-     * Returns a singleton instance of BMPString.Template. This is more
-     * efficient than creating a new BMPString.Template.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static final Template templateInstance = new Template();
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-    protected Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    protected CharConverter getCharConverter() {
-        return new BMPConverter();
-    }
-
-    protected CharacterString generateInstance(char[] chars)
-        throws CharConversionException
-    {
-        return new BMPString(chars);
-    }
-
-    protected String typeName() {
-        return "BMPString";
-    }
-}
-
-private static class BMPConverter implements CharConverter {
-
-    public char[] byteToChar(byte[] bytes, int offset, int len)
-        throws CharConversionException
-    {
-        try {
-            String s = new String(bytes, offset, len, "UnicodeBig");
-            return s.toCharArray();
-
-        } catch( UnsupportedEncodingException e ) {
-            String err = "Unable to find UnicodeBig encoding mechanism";
-            Assert.notReached(err);
-            throw new CharConversionException(err);
-        }
-    }
-
-    public byte[] charToByte(char[] chars, int offset, int len)
-        throws CharConversionException
-    {
-        try {
-            // We don't want the byte-order mark
-            String s = new String(chars, offset, len);
-            return s.getBytes("UnicodeBigUnmarked");
-
-        } catch( UnsupportedEncodingException e ) {
-            String err = "Unable to find UnicodeBigUnmarked encoding mechanism";
-            Assert.notReached(err);
-            throw new CharConversionException(err);
-        }
-    }
-} // end of char converter
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/BOOLEAN.java

@@ -1,147 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An ASN.1 <code>BOOLEAN</code> value.
- */
-public class BOOLEAN implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 1);
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    private ASN1Header getHeader() {
-        return getHeader(TAG);
-    }
-
-    private ASN1Header getHeader(Tag implicitTag) {
-        return new ASN1Header(implicitTag, FORM, 1 );
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(TAG, ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        getHeader(implicitTag).encode(ostream);
-        if( val ) {
-            ostream.write( 0xff );
-        } else {
-            ostream.write( 0x00 );
-        }
-    }
-
-    private BOOLEAN() { }
-
-    private boolean val;
-    /**
-     * Creates a <code>BOOLEAN</code> with the given value.
-     */
-    public BOOLEAN(boolean val) {
-        this.val = val;
-    }
-
-    /**
-     * Returns the boolean value of this <code>BOOLEAN</code>.
-     */
-    public boolean toBoolean() {
-        return val;
-    }
-
-    /**
-     * Returns "true" or "false".
-     */
-    public String toString() {
-        if(val) {
-            return "true";
-        } else {
-            return "false";
-        }
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-    /**
-     * A Class for decoding <code>BOOLEAN</code> values from their BER
-     * encodings.
-     */
-    public static class Template implements ASN1Template {
-        public boolean tagMatch(Tag tag) {
-            return( tag.equals( BOOLEAN.TAG ) );
-        }
-
-        public ASN1Value decode(InputStream istream)
-            throws IOException, InvalidBERException
-        {
-            return decode(TAG, istream);
-        }
-
-        public ASN1Value decode(Tag tag, InputStream istream)
-            throws IOException, InvalidBERException
-        {
-          try {
-            ASN1Header head = new ASN1Header(istream);
-
-            head.validate(tag, FORM);
-
-            int b = istream.read();
-            if( b == -1 ) {
-                throw new InvalidBERException("End-of-file reached while "+
-                    "decoding BOOLEAN");
-            }
-
-            if( b == 0x00 ) {
-                return new BOOLEAN(false);
-            } else {
-                return new BOOLEAN(true);
-            }
-
-          } catch(InvalidBERException e) {
-            throw new InvalidBERException(e, "BOOLEAN");
-          }
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/CHOICE.java

@@ -1,285 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-import org.mozilla.jss.util.Assert;
-
-/**
- * Objects of this class are generated by CHOICE.Template.decode(). It is
- * not necessary to use them to encode a CHOICE. Since the encoding of a
- * CHOICE is simply the encoding of the chosen element, it is easier
- * to just write out the chosen element.
- */
-public class CHOICE implements ASN1Value {
-    private CHOICE() { }
-
-    private Tag tag;
-    private ASN1Value val;
-
-    /**
-     * Create a CHOICE whose chosen element has an implicit tag.
-     */
-    public CHOICE(Tag implicitTag, ASN1Value val) {
-        tag = implicitTag;
-        this.val = val;
-    }
-
-    /**
-     * Create a CHOICE whose chosen element has no implicit tag.
-     */
-    public CHOICE(ASN1Value val) {
-        this.tag = val.getTag();
-        this.val = val;
-    }
-
-    /**
-     * Returns the tag that the chosen element is encoded with, which is
-     * either the underlying tag of the element or an implicit tag.
-     */
-    public Tag getTag() {
-        return tag;
-    }
-
-    /**
-     * Returns the chosen value. 
-     */
-    public ASN1Value getValue() {
-        return val;
-    }
-
-    public static CHOICE.Template getTemplate() {
-        return new CHOICE.Template();
-    }
-
-    /**
-     * Encodes this CHOICE.  This merely consists of encoding the chosen
-     * element with an implicit tag, if one was given in the constructor,
-     * or with its own underlying tag.
-     */
-    public void encode( OutputStream ostream ) throws IOException {
-        val.encode( tag, ostream );
-    }
-
-    /**
-     * Encodes this CHOICE.  This merely consists of encoding the chosen
-     * element with an implicit tag, if one was given in the constructor,
-     * or with its own underlying tag.
-     *
-     * @param implicitTag <b>This value is ignored</b>. The tag of a CHOICE
-     *      is merely the tag of the chosen element of the CHOICE.  A
-     *      CHOICE cannot itself have an implicit tag.
-     */
-    public void encode( Tag implicitTag, OutputStream ostream )
-        throws IOException
-    {
-        Assert._assert(implicitTag.equals(tag));
-        val.encode( tag, ostream );
-    }
-    
-/**
- * A Template for decoding ASN.1 <code>CHOICE</code>s
- */
-public static class Template implements ASN1Template {
-
-    // The the various possibilities in this CHOICE
-    private Vector templates = new Vector();
-
-    /**
-     *  Creates an empty CHOICE template
-     */
-    public Template() { }
-
-    /**
-     * Adds a new sub-template to this CHOICE template with no implicit tag.
-     */
-    public void addElement( ASN1Template template ) {
-        templates.addElement( new Element( template ) );
-    }
-
-    /**
-     * Adds a new sub-template to this CHOICE template with an implicit tag.
-     */
-    public void addElement( Tag implicitTag, ASN1Template template) {
-        templates.addElement( new Element( implicitTag, template) );
-    }
-
-    /**
-     * Returns the number of elements in this CHOICE template.
-     */
-    public int size() {
-        return templates.size();
-    }
-
-    /**
-     * Retrieves the element at the specified index.
-     */
-    public ASN1Template elementAt(int index) {
-        return ((Element)templates.elementAt(index)).getTemplate();
-    }
-
-    /**
-     * Retrieves the implicit tag of the element at the specified index.
-     * Returns null if there is no implicit tag for this element.
-     */
-    public Tag implicitTagAt(int index) {
-        return ((Element)templates.elementAt(index)).getImplicitTag();
-    }
-
-    /**
-     * Empties this CHOICE template.
-     */
-    public void removeAllElements() {
-        templates.removeAllElements();
-    }
-
-    /**
-     * Removes the element at the specified index.
-     */
-    public void removeElementAt(int index) {
-        templates.removeElementAt(index);
-    }
-
-    /**
-     * Determines whether the given tag will satisfy this template.
-     * For a CHOICE, this is true if the tag satisfies any sub-template.
-     */
-    public boolean tagMatch(Tag t) {
-        int size = size();
-        for(int i = 0; i < size; i++) {
-            Tag impl = implicitTagAt(i);
-            if( impl != null ) {
-                // There is an implicit tag, if we match it we have a match
-                if( impl.equals(t) ) {
-                    return true;
-                }
-            } else {
-                // no implicit tag, look at the sub-template itself
-                ASN1Template templ = elementAt(i);
-                if( templ.tagMatch(t) ) {
-                    return true;
-                }
-            }
-        }
-
-        // none of the elements matched
-        return false;
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        ASN1Header head = ASN1Header.lookAhead(istream);
-        Tag tag = head.getTag();
-        
-        // Loop over all the elements of the CHOICE template until we
-        // find one with a matching tag.
-        int size = size();
-        for(int i=0; i < size; i++) {
-            if( implicitTagAt(i) != null ) {
-                if( implicitTagAt(i).equals(tag) ) {
-                    // match by implicit tag!
-                    ASN1Value val = elementAt(i).decode( implicitTagAt(i),
-                                                           istream );
-                    //return elementAt(i).decode( implicitTagAt(i), istream );
-                    return new CHOICE( implicitTagAt(i), val );
-                }
-            } else {
-                if( elementAt(i).tagMatch(tag) ) {
-                    // match by base tag !
-                    //return elementAt(i).decode(istream);
-                    return new CHOICE( elementAt(i).decode(istream) );
-                }
-            }
-        }
-
-        // we didn't find any match
-        throw new InvalidBERException("Unable to decode CHOICE");
-    }
-
-    // Implicit tags are illegal for CHOICE (and ANY)
-    /**
-     * Decodes a CHOICE.
-     * @param implicitTag <b>This parameter is ignored.</b> A choice
-     *      cannot have an implicit tag.
-     */
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(istream);
-    }
-
-    /**
-     * An element in a CHOICE template, consisting of a nested template
-     *  and, optionally, an implicit tag for that template.
-     */
-    private static class Element {
-        private ASN1Template template;
-        private Tag implicitTag=null;
-
-        /**
-         * Creates a CHOICE template element with no implicit tag.
-         */
-        public Element(ASN1Template template) {
-            this.template = template;
-        }
-
-        /**
-         * Creates a CHOICE template element with an implicit tag.
-         */
-        public Element(Tag implicitTag, ASN1Template template) {
-            this.template = template;
-            this.implicitTag = implicitTag;
-        }
-
-        /**
-         * Returns the template of this CHOICE template element.
-         */
-        public ASN1Template getTemplate() {
-            return template;
-        }
-
-        /**
-         * Returns the implicit tag for this CHOICE template element,
-         *  if there is one.  If not, returns null.
-         */
-        public Tag getImplicitTag() {
-            return implicitTag;
-        }
-    }
-}
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/CharConverter.java

@@ -1,45 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-
-interface CharConverter {
-
-    public char[] byteToChar(byte[] bytes, int offset, int len)
-		throws CharConversionException;
-
-    public byte[] charToByte(char[] chars, int offset, int len)
-		throws CharConversionException;
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/CharacterString.java

@@ -1,185 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-
-/**
- * An abstract base class for all character string types in ASN.1.
- */
-public abstract class CharacterString implements ASN1Value {
-
-    abstract CharConverter getCharConverter();
-
-    public abstract Tag getTag();
-    static final Form FORM = Form.PRIMITIVE;
-
-    private char[] chars;
-
-    /**
-     * Converts this ASN.1 character string to a Java String.
-     */
-    public String toString() {
-        return new String(chars);
-    }
-
-    /**
-     * Converts this ASN.1 character string to an array of Java characters.
-     */
-    public char[] toCharArray() {
-        return chars;
-    }
-
-    protected CharacterString(char[] chars) throws CharConversionException {
-        this.chars = chars;
-        cachedContents = computeContents();
-    }
-
-    protected CharacterString(String s) throws CharConversionException {
-        this.chars = s.toCharArray();
-        cachedContents = computeContents();
-    }
-
-    private byte[] cachedContents;
-
-    private byte[] getEncodedContents() {
-        return cachedContents;
-    }
-
-    private byte[] computeContents() throws CharConversionException {
-        CharConverter converter = getCharConverter();
-
-        byte[] contents = converter.charToByte(chars, 0, chars.length);
-
-        return contents;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode( getTag(), ostream );
-    }
-
-    public void encode( Tag implicitTag, OutputStream ostream )
-        throws IOException
-    {
-        byte[] contents = getEncodedContents();
-        ASN1Header head = new ASN1Header( implicitTag, FORM, contents.length);
-
-        head.encode(ostream);
-
-        ostream.write( contents );
-    }
-
-public abstract static class Template implements ASN1Template {
-
-    /**
-     * Must be overridden to return the tag for the subclass.
-     */
-    protected abstract Tag getTag();
-
-    public abstract boolean tagMatch(Tag tag);
-
-    /**
-     * Must be overridden to return the correct character converter
-     * for the subclass.
-     */
-    protected abstract CharConverter getCharConverter();
-
-    /**
-     * Must be overridden to create an instance of the subclass given
-     * a char array.
-     */
-    protected abstract CharacterString generateInstance(char[] chars)
-        throws CharConversionException;
-
-    /**
-     * Must be overridden to provide the name of the subclass, for including
-     * into error messages.
-     */
-    protected abstract String typeName();
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(getTag(), istream);
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header(istream);
-
-        head.validate(implicitTag);
-
-        byte[] raw; // raw bytes, not translated to chars yet
-
-        if( head.getContentLength() == -1 ) {
-            // indefinite length encoding
-            ASN1Header ahead;
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            do {
-                ahead = ASN1Header.lookAhead( istream );
-                if( ! ahead.isEOC() ) {
-                    OCTET_STRING.Template ot = new OCTET_STRING.Template();
-                    OCTET_STRING os = (OCTET_STRING) ot.decode(istream);
-                    bos.write( os.toByteArray() );
-                }
-            } while( ! ahead.isEOC() );
-
-            // consume EOC
-            ahead = new ASN1Header(istream);
-
-            raw = bos.toByteArray();
-        } else {
-            // definite length
-            raw = new byte[ (int) head.getContentLength() ];
-            ASN1Util.readFully(raw, istream);
-        }
-
-        char[] chars = getCharConverter().byteToChar(raw, 0, raw.length);
-
-        return generateInstance(chars);
-
-      } catch( CharConversionException e ) {
-        throw new InvalidBERException(e.getMessage());
-      } catch( InvalidBERException e ) {
-        throw new InvalidBERException(e, typeName());
-      }
-    }
-}
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/CountingStream.java

@@ -1,134 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.asn1;
-
-import java.io.*;
-
-/**
- * This class keeps track of the number of bytes that have been read from
- * a stream. It will be incremented by the number of bytes read or skipped.
- * If the stream is marked and then reset, the number of bytes read will
- * be reset as well.
- */
-class CountingStream extends InputStream {
-
-    private int count=0;
-    private int markpos;
-    private InputStream source;
-
-    private static final boolean DEBUG = false;
-
-    private CountingStream() { }
-
-    public CountingStream(InputStream source) {
-        this.source = source;
-    }
-
-    public int available() throws IOException {
-        return source.available();
-    }
-
-    public void mark(int readlimit) {
-        source.mark(readlimit);
-        markpos = count;
-        if(DEBUG) {
-            System.out.println("Marked at position "+markpos);
-        }
-    }
-
-    public boolean markSupported() {
-        return source.markSupported();
-    }
-
-    public int read() throws IOException {
-        int n = source.read();
-        if( n != -1 ) {
-            count++;
-            if(DEBUG) {
-                System.out.println("read() 1 byte, count="+count);
-            }
-        }
-        return n;
-    }
-
-    public int read(byte[] buffer) throws IOException {
-        int n = source.read(buffer);
-        if( n != -1 ) {
-            count += n;
-        }
-        if(DEBUG) {
-            System.out.println("read([]) "+n+" bytes, count="+count);
-        }
-        return n;
-    }
-
-    public int read(byte[] buffer, int offset, int count) throws IOException {
-        int n = source.read(buffer, offset, count);
-        if( n != -1 ) {
-            this.count += n;
-        }
-        if(DEBUG) {
-            System.out.println("read(...) "+n+" bytes, count="+this.count);
-        }
-        return n;
-    }
-
-    public void reset() throws IOException {
-        source.reset();
-        if(DEBUG) {
-            System.out.println("reset from "+count+" to "+markpos);
-        }
-        count = markpos;
-    }
-
-    public long skip(long count) throws IOException {
-        this.count += count;
-        if(DEBUG) {
-            System.out.println("skipped "+count+", now at "+this.count);
-        }
-        return source.skip(count);
-    }
-
-    public int getNumRead() {
-        return count;
-    }
-
-    public void resetNumRead() {
-        count = 0;
-        markpos = 0;
-        if(DEBUG) {
-            System.out.println("resetting count to 0");
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/ENUMERATED.java

@@ -1,114 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Represents an ASN.1 <code>ENUMERATED</code> value. This has the same
- * interface as <code>INTEGER</code>
- */
-public class ENUMERATED extends INTEGER implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 10);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    /**
-     * Creates a new ENUMERATED value from a long.
-     */
-    public ENUMERATED( long val ) {
-        super( val );
-    }
-
-    ENUMERATED( byte[] valBytes ) {
-        super( valBytes );
-    }
-
-    /**
-     * Returns the value as a long.
-     */
-    public long getValue() {
-        return longValue();
-    }
-
-    private static final ENUMERATED.Template templateInstance =
-                                            new ENUMERATED.Template();
-    public static ASN1Template getTemplate() {
-        return templateInstance;
-    }
-
-
-/**
- * A template for decoding ENUMERATED values from their BER encodings.
- * The template reads the value as an INTEGER.  It does not check that it
- * is a valid value for the ENUMERATED type.
- */
-public static class Template
-    extends INTEGER.Template implements ASN1Template
-{
-    Tag getTag() {
-        return ENUMERATED.TAG;
-    }
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(ENUMERATED.TAG) );
-    }
-
-    public ASN1Value
-    decode(Tag tag, InputStream derStream)
-        throws InvalidBERException, IOException
-    {
-      try {
-        ASN1Header wrapper = new ASN1Header(derStream);
-
-        wrapper.validate(tag, FORM);
-
-        // Is length < 1 ?
-        if( wrapper.getContentLength() < 1 ) {
-            throw new InvalidBERException("Invalid 0 length for ENUMERATED");
-        }
-
-        byte[] valBytes = new byte[ (int) wrapper.getContentLength() ];
-        ASN1Util.readFully(valBytes, derStream);
-        return new ENUMERATED( valBytes );
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "ENUMERATED");
-      }
-    }
-
-} // end of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/EXPLICIT.java

@@ -1,175 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import org.mozilla.jss.util.Assert;
-
-/**
- * An explicit tag.
- */
-public class EXPLICIT implements ASN1Value {
-
-    public static final Form FORM = Form.CONSTRUCTED;
-
-    private ASN1Value content;
-    private Tag tag;
-
-    private EXPLICIT() { }
-
-    /**
-     * Creates an EXPLICIT tag wrapping some other ASN1Value.  For example,
-     * for the following ASN.1 snippet:
-     * <pre>
-     * MyType [3] EXPLICIT INTEGER
-     * </pre>
-     * assuming a sample value of 5 for the INTEGER, a MyType could be
-     * created with:
-     * <pre>
-     *  EXPLICIT myValue = new EXPLICIT( new Tag(3), new INTEGER(5) );
-     * </pre>
-     */
-    public EXPLICIT( Tag tag, ASN1Value content ) {
-        Assert._assert(tag!=null && content!=null);
-        this.content = content;
-        this.tag = tag;
-    }
-
-    /**
-     * Returns the ASN1Value that is wrapped by this EXPLICIT tag.
-     */
-    public ASN1Value getContent() {
-        return content;
-    }
-
-    /**
-     * Returns the Tag of this EXPLICIT tag.
-     */
-    public Tag getTag() {
-        return tag;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(tag, ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        content.encode(bos);
-        byte[] contentBytes = bos.toByteArray();
-        ASN1Header head = new ASN1Header(implicitTag, FORM,
-            contentBytes.length );
-        head.encode(ostream);
-        ostream.write(contentBytes);
-    }
-
-    public static Template getTemplate( Tag tag, ASN1Template content) {
-        return new Template(tag, content);
-    }
-
-/**
- * A template for decoding an object wrapped in an EXPLICIT tag.
- */
-public static class Template implements ASN1Template {
-
-    private ASN1Template content;
-    private Tag tag;
-
-    private Template() { }
-
-    /**
-     * Creates a template for unwrapping an object wrapped in an explicit tag.
-     * For example, to decode:
-     * <pre>
-     * MyValue ::= [3] EXPLICIT INTEGER
-     * </pre>
-     * use:
-     * <pre>
-     * EXPLICIT.Template myTemplate = new EXPLICIT.Template( new Tag(3),
-     *      new INTEGER.Template() );
-     * </pre>
-     *
-     * @param tag The tag value of the EXPLICIT tag.
-     * @param content The template for decoding the object that is wrapped
-     *      in the explicit tag.
-     */
-    public Template(Tag tag, ASN1Template content) {
-        this.content = content;
-        this.tag = tag;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return( this.tag.equals(tag) );
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(tag, istream);
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header(istream);
-
-        head.validate( implicitTag, FORM.CONSTRUCTED );
-
-        ASN1Value val = content.decode(istream);
-
-        EXPLICIT e = new EXPLICIT(tag, val);
-
-        // if indefinite content length, consume the end-of-content marker
-        if( head.getContentLength() == -1 ) {
-            head = new ASN1Header(istream);
-
-            if( ! head.isEOC() ) {
-                throw new InvalidBERException("No end-of-contents marker");
-            }
-        }
-
-        return e;
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "EXPLICIT");
-      }
-    }
-} // end of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/FieldNotPresentException.java

@@ -1,48 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.asn1;
-
-/**
- * An exception thrown when an optional field is not present.
- */
-public class FieldNotPresentException extends java.lang.Exception
-{
-    public FieldNotPresentException() {
-        super();
-    }
-
-    public FieldNotPresentException(String msg) {
-        super(msg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/Form.java

@@ -1,54 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-/**
- * An enumerated type representing the forms of an ASN.1 value.
- * The possibilities are PRIMITIVE and CONSTRUCTED.
- */
-public class Form {
-    private String name;
-
-    private Form() { }
-
-    private Form(String name) {
-        this.name = name;
-    }
-
-    public static final Form PRIMITIVE = new Form("PRIMITIVE");
-    public static final Form CONSTRUCTED = new Form("CONSTRUCTED");
-
-    public String toString() {
-        return name;
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/GeneralizedTime.java

@@ -1,92 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-import org.mozilla.jss.util.Assert;
-
-/**
- * The ASN.1 type <code>GeneralizedTime</code>
- */
-public class GeneralizedTime extends TimeBase implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.UNIVERSAL, 24);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    /**
-     * Creates a <code>GeneralizedTime</code> from a Date.
-     */
-    public GeneralizedTime(Date date) {
-        super(date);
-    }
-
-    protected boolean isUTC() {
-        return false;
-    }
-
-    private static final GeneralizedTime.Template templateInstance =
-                                new GeneralizedTime.Template();
-    public static GeneralizedTime.Template getTemplate() {
-        return templateInstance;
-    }
-
-    /**
-     * A class for decoding <code>GeneralizedTime</code>s.
-     */
-    public static class Template extends TimeBase.Template
-        implements ASN1Template
-    {
-        protected Tag getTag() {
-            return TAG;
-        }
-
-        public boolean tagMatch(Tag tag) {
-            return TAG.equals(tag);
-        }
-
-        protected boolean isUTC() {
-            return false;
-        }
-
-        protected TimeBase generateInstance(Date date) {
-            return new GeneralizedTime(date);
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/IA5String.java

@@ -1,127 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-
-public class IA5String extends CharacterString implements ASN1Value {
-
-    public IA5String(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    public IA5String(String s) throws CharConversionException {
-        super(s);
-    }
-
-    CharConverter getCharConverter() {
-        return new IA5Converter();
-    }
-
-    public static final Tag TAG = new Tag( Tag.Class.UNIVERSAL, 22 );
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static final Template templateInstance = new Template();
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-    public Tag getTag() {
-        return IA5String.TAG;
-    }
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals( IA5String.TAG ));
-    }
-
-    protected CharConverter getCharConverter() {
-        return new IA5Converter();
-    }
-
-    protected CharacterString generateInstance(char[] chars)
-        throws CharConversionException
-    {
-        return new IA5String(chars);
-    }
-
-    protected String typeName() {
-        return "IA5String";
-    }
-}
-
-// nested class
-private static class IA5Converter implements CharConverter {
-
-    public char[] byteToChar(byte[] bytes, int offset, int len)
-        throws CharConversionException
-    {
-        char[] chars = new char[len];
-
-        int c; // char index
-        int b; // byte index
-        for(b = offset, c=0; c < len; b++, c++) {
-            if( (bytes[b] & 0x80) != 0 ) {
-                throw new CharConversionException("Invalid character: "+
-                    bytes[b]);
-            }
-            chars[c] = (char) (bytes[b] & 0x7f);
-        }
-        return chars;
-    }
-
-    public byte[] charToByte(char[] chars, int offset, int len)
-        throws CharConversionException
-    {
-        byte[] bytes = new byte[len];
-
-        int c; // char index
-        int b; // byte index
-        for(c = offset, b = 0; b < len; c++, b++) {
-            if( (chars[c] & 0x7f) != chars[c] ) {
-                throw new CharConversionException("Invalid character: "+
-                    chars[c]);
-            }
-            bytes[b] = (byte) (chars[c] & 0x7f);
-        }
-
-        return bytes;
-    }
-}
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/INTEGER.java

@@ -1,254 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.math.BigInteger;
-import java.util.Random;
-
-/**
- * The ASN.1 type <code>INTEGER</code>. This class extends BigInteger.
- */
-public class INTEGER extends BigInteger implements ASN1Value {
-
-    private byte[] encodedContents = null;
-    private byte[] getEncodedContents() {
-        if( encodedContents == null ) {
-            encodedContents = toByteArray();
-        }
-        return encodedContents;
-    }
-
-    private ASN1Header getHeader(Tag t) {
-        return new ASN1Header( t, FORM, getContentLength() );
-    }
-
-    public INTEGER(String s) throws NumberFormatException {
-        super(s);
-    }
-
-    public INTEGER(String s, int r) throws NumberFormatException {
-        super(s, r);
-    }
-
-    public INTEGER(byte[] bval) throws NumberFormatException  {
-        super(bval);
-    }
-
-    public INTEGER(int sign, byte[] mag) throws NumberFormatException {
-        super(sign, mag);
-    }
-
-    public INTEGER(int numBits, Random rnd) throws NumberFormatException {
-        super(numBits, rnd);
-    }
-
-    public INTEGER(int bitLength, int certainty, Random rnd) {
-        super(bitLength, certainty, rnd);
-    }
-
-    public INTEGER(long val) {
-        super( BigInteger.valueOf(val).toByteArray() );
-    }
-
-    public INTEGER(BigInteger bi) {
-        super( bi.toByteArray() );
-    }
-        
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 2);
-    public Tag getTag() {
-        return TAG;
-    }
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public void encode(OutputStream outStream) throws IOException {
-        encode(getTag(), outStream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream outStream)
-        throws IOException
-    {
-        // write header
-        getHeader(implicitTag).encode( outStream );
-
-        // write contents
-        outStream.write( getEncodedContents() );
-    }
-
-    public long getContentLength() {
-        return getEncodedContents().length;
-    }
-
-    public byte[] encode() throws IOException {
-        ByteArrayOutputStream b = new ByteArrayOutputStream();
-        encode(b);
-        return b.toByteArray();
-    }
-
-    private static final INTEGER.Template templateInstance =
-                                            new INTEGER.Template();
-    public static ASN1Template getTemplate() {
-        return templateInstance;
-    }
-
-    /**
-     * Tests the DER encoding and decoding of the INTEGER class.
-     */
-    public static void main(String args[]) {
-        try {
-            int[] Is = new int[11];
-            int[][] Bs = new int[11][];
-            int i = 0;
-
-            Is[i] = 0;
-            Bs[i++] = new int[]{ 0x02, 0x01, 0x00 };
-
-            Is[i] = 1;
-            Bs[i++] = new int[]{ 0x02, 0x01, 0x01 };
-
-            Is[i] = -1;
-            Bs[i++] = new int[]{ 0x02, 0x01, 0xff };
-
-            Is[i] = 127;
-            Bs[i++] = new int[]{ 0x02, 0x01, 0x7f };
-
-            Is[i] = 128;
-            Bs[i++] = new int[]{ 0x02, 0x02, 0x00, 0x80 };
-
-            Is[i] = 255;
-            Bs[i++] = new int[]{ 0x02, 0x02, 0x00, 0xff };
-
-            Is[i] = 256;
-            Bs[i++] = new int[]{ 0x02, 0x02, 0x01, 0x00 };
-
-            Is[i] = -128;
-            Bs[i++] = new int[]{ 0x02, 0x01, 0x80 };
-
-            Is[i] = -129;
-            Bs[i++] = new int[]{ 0x02, 0x02, 0xff, 0x7f };
-
-            Is[i] = 43568;
-            Bs[i++] = new int[]{ 0x02, 0x03, 0x00, 0xaa, 0x30 };
-
-            Is[i] = -43568;
-            Bs[i++] = new int[]{ 0x02, 0x03, 0xff, 0x55, 0xd0 };
-
-            for( i = 0; i < Is.length; i++) {
-                INTEGER I = new INTEGER( Is[i] );
-                byte[] compare = I.encode();
-                if( ! arraysEqual(compare, Bs[i]) ) {
-                    System.err.println("Encoding FAILED: "+Is[i]);
-                    System.exit(-1);
-                }
-
-                ByteArrayInputStream bis = new ByteArrayInputStream(compare);
-                Template template = new Template();
-                INTEGER create = (INTEGER) template.decode(bis);
-                if( create.intValue() != Is[i] ) {
-                    System.err.println("Decoding FAILED: "+Is[i]);
-                    System.exit(-1);
-                }
-            }
-            System.out.println("PASS");
-
-        } catch( Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    private static boolean arraysEqual(byte[] bytes, int[] ints) {
-        if(bytes == null || ints == null) {
-            return false;
-        }
-
-        if(bytes.length != ints.length) {
-            return false;
-        }
-
-        for( int i=0; i < bytes.length; i++) {
-            if( bytes[i] != (byte)ints[i] ) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-///////////////////////////////////////////////////////////////////////
-// INTEGER.Template
-// This is a nested class.
-//
-public static class Template implements ASN1Template {
-
-    Tag getTag() {
-        return INTEGER.TAG;
-    }
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(INTEGER.TAG));
-    }
-
-    public ASN1Value
-    decode(InputStream derStream)
-        throws InvalidBERException, IOException
-    {
-        return decode( getTag(), derStream );
-    }
-
-    public ASN1Value
-    decode(Tag tag, InputStream derStream)
-        throws InvalidBERException, IOException
-    {
-      try {
-        ASN1Header wrapper = new ASN1Header(derStream);
-
-        wrapper.validate(tag, FORM);
-
-        // Is length < 1 ?
-        if( wrapper.getContentLength() < 1 ) {
-            throw new InvalidBERException("Invalid 0 length for INTEGER");
-        }
-
-        byte[] valBytes = new byte[ (int) wrapper.getContentLength() ];
-        ASN1Util.readFully(valBytes, derStream);
-        return new INTEGER( valBytes );
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "INTEGER");
-      }
-    }
-} // end of class Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/InvalidBERException.java

@@ -1,103 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.util.Vector;
-
-/**
- * An exception thrown when BER decoding fails.
- */
-public class InvalidBERException extends java.lang.Exception {
-
-    private InvalidBERException child=null;
-    private Vector mesgList = new Vector();
-
-    public InvalidBERException(String mesg) {
-        super(mesg);
-    }
-
-    public void append(String mesg) {
-        mesgList.addElement(mesg);
-    }
-
-    public InvalidBERException(InvalidBERException e, String mesg) {
-        super(mesg);
-        child = e;
-    }
-
-    /**
-     * Prints out the exception class and error message, including
-     * all the nested exceptions.
-     */
-    private void appendMessages(StringBuffer sb) {
-        int numMessages = mesgList.size();
-        for( int i=numMessages-1; i >= 0; --i ) {
-            sb.append(mesgList.elementAt(i));
-            sb.append(" >> ");
-        }
-        sb.append(getMessage());
-    }
-
-    public String toString() {
-        StringBuffer sb = new StringBuffer();
-        sb.append( this.getClass().getName() );
-        sb.append(": ");
-        appendMessages(sb);
-        return sb.toString();
-    }
-
-    public String toStringNested() {
-        StringBuffer sb = new StringBuffer();
-        appendMessages(sb);
-        if( child != null ) {
-            sb.append(" >> ");
-            sb.append( child.toStringNested() );
-        }
-        return sb.toString();
-    }
-        
-    public static class EOF extends InvalidBERException {
-        public EOF() {
-            super("Unexpected end-of-file encountered");
-        }
-    }
-
-	public static class InvalidChar extends InvalidBERException {
-		public InvalidChar(byte b, int offset) {
-			super("Invalid character ("+b+") encountered at offset "+offset);
-		}
-		public InvalidChar(char c, int offset) {
-			super("Invalid character ("+c+") encountered at offset"+offset);
-		}
-	}
-}

mozilla/security/jss/org/mozilla/jss/asn1/Makefile

@@ -1,79 +0,0 @@
-#! gmake
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-
-include $(CORE_DEPTH)/$(MODULE)/config/config.mk
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-#include config.mk
-
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-
-
-
-run:
-	$(DEBUG_CMD) /share/builds/components/jdk/1.2.2_05a/SunOS/jre/bin/java -classpath $(JAVA_HOME)/lib/classes.zip:$(SOURCE_CLASSES_DIR)_DBG org.mozilla.jss.asn1.SEQUENCE /tmp/p10
-

mozilla/security/jss/org/mozilla/jss/asn1/NULL.java

@@ -1,103 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-public class NULL implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 5);
-    public Tag getTag() {
-        return TAG;
-    }
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(TAG, ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        ASN1Header head = new ASN1Header(implicitTag, FORM, 0);
-        head.encode(ostream);
-    }
-
-    private static final NULL instance = new NULL();
-    public static NULL getInstance() {
-        return instance;
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-public static class Template implements ASN1Template {
-
-    public Tag getTag() {
-        return NULL.TAG;
-    }
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(NULL.TAG) );
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(getTag(), istream);
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header(istream);
-
-        head.validate(implicitTag, FORM);
-        if( head.getContentLength() != 0 ) {
-            throw new InvalidBERException("Invalid length ("+
-                head.getContentLength()+") for NULL; only 0 is permitted");
-        }
-
-        return new NULL();
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "NULL");
-      }
-    }
-} // end of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/OBJECT_IDENTIFIER.java

@@ -1,514 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import org.mozilla.jss.util.Assert;
-import java.util.Vector;
-import java.util.StringTokenizer;
-
-public class OBJECT_IDENTIFIER implements ASN1Value {
-
-    ///////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////
-    // Standard object identifiers
-    ///////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////
-
-    /**
-     * The OID space for RSA Data Security, Inc.
-     */
-    public static final OBJECT_IDENTIFIER RSADSI =
-        new OBJECT_IDENTIFIER( new long[]{1, 2, 840, 113549} );
-
-    /**
-     * The OID space for RSA's PKCS (public key cryptography standards).
-     */
-    public static final OBJECT_IDENTIFIER PKCS =
-        RSADSI.subBranch(1);
-
-    /**
-     * The OID space for RSA's PKCS #1.
-     */
-    public static final OBJECT_IDENTIFIER PKCS1 =
-        PKCS.subBranch(1);
-
-    /**
-     * The OID space for RSA's PKCS #2, which has since been folded into
-     * PKCS #1.
-     */
-    public static final OBJECT_IDENTIFIER PKCS2 = 
-        PKCS.subBranch(2);
-
-    /**
-     * The OID space for RSA's message digest algorithms.
-     */
-    public static final OBJECT_IDENTIFIER RSA_DIGEST = RSADSI.subBranch(2);
-
-    /**
-     * The OID space for RSA's password-based encryption standard.
-     */
-    public static final OBJECT_IDENTIFIER PKCS5 = PKCS.subBranch(5);
-
-    /**
-     * The OID space for RSA's Selected Attribute Types standard, PKCS #9.
-     */
-    public static final OBJECT_IDENTIFIER PKCS9 = PKCS.subBranch(9);
-
-    /**
-     * The OID space for RSA's personal information exchange syntax standard.
-     */
-    public static final OBJECT_IDENTIFIER PKCS12 = PKCS.subBranch(12);
-
-    /**
-     * The OID space for RSA's ciphers.
-     */
-    public static final OBJECT_IDENTIFIER RSA_CIPHER = RSADSI.subBranch(3);
-
-    /**
-     * The OID space for FIPS standardized algorithms.
-     */
-    public static final OBJECT_IDENTIFIER ALGORITHM =
-        new OBJECT_IDENTIFIER( new long[] { 1, 3, 14, 3, 2 } );
-
-    /**
-     * The OID space for PKIX.
-     */
-    public static final OBJECT_IDENTIFIER PKIX =
-        new OBJECT_IDENTIFIER( new long[] { 1, 3, 6, 1, 5, 5, 7 } );
-
-    public static final OBJECT_IDENTIFIER
-    id_cmc = PKIX.subBranch( 7 );
-
-	/**
-	 * CMC control attributes
-	 */
-    public static final OBJECT_IDENTIFIER
-    id_cmc_cMCStatusInfo = id_cmc.subBranch(1);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_identification = id_cmc.subBranch(2);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_identityProof = id_cmc.subBranch(3);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_dataReturn = id_cmc.subBranch(4);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_transactionId = id_cmc.subBranch(5);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_senderNonce = id_cmc.subBranch(6);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_recipientNonce = id_cmc.subBranch(7);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_addExtensions = id_cmc.subBranch(8);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_encryptedPOP = id_cmc.subBranch(9);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_decryptedPOP = id_cmc.subBranch(10);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_lraPOPWitness = id_cmc.subBranch(11);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_getCert = id_cmc.subBranch(15);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_getCRL  = id_cmc.subBranch(16);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_revokeRequest = id_cmc.subBranch(17);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_regInfo = id_cmc.subBranch(18);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_responseInfo = id_cmc.subBranch(19);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_QueryPending = id_cmc.subBranch(21);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_idPOPLinkRandom = id_cmc.subBranch(22);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_idPOPLinkWitness = id_cmc.subBranch(23);
-    public static final OBJECT_IDENTIFIER
-    id_cmc_idConfirmCertAcceptance = id_cmc.subBranch(24);
-
-    public static final OBJECT_IDENTIFIER
-    id_cct = PKIX.subBranch( 12 );
-
-    public static final OBJECT_IDENTIFIER
-    id_cct_PKIData = id_cct.subBranch( 2 );
-
-    public static final OBJECT_IDENTIFIER
-    id_cct_PKIResponse = id_cct.subBranch( 3 );
-
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 6);
-    public Tag getTag() {
-        return TAG;
-    }
-    public static final Form FORM = Form.PRIMITIVE;
-
-    private long[] numbers;
-
-    /**
-     * Creates an OBJECT_IDENTIFIER from an array of longs, which constitute
-     * the numbers that make up the OBJECT IDENTIFIER.
-     */
-    public OBJECT_IDENTIFIER( long[] numbers ) {
-        checkLongArray(numbers);
-        this.numbers = numbers;
-    }
-
-    /**
-     * Checks the given array of numbers to see if it is a valid OID.
-     * This is not an exhaustive test, it just looks for obvious problems.
-     * It will throw an assertion if a problem is found. With DEBUG turned
-     * off, it just checks for null.
-     */
-    private static void checkLongArray(long[] numbers) {
-        Assert._assert(numbers != null);
-        if(numbers == null) {
-            throw new NullPointerException();
-        }
-        Assert._assert(numbers.length >= 2);
-        Assert._assert( numbers[0]==0 || numbers[0]==1 || numbers[0]==2 );
-    }
-    
-
-    /**
-     * Creates an OBJECT_IDENTIFIER from a String version.  The proper format
-     * for the OID string is dotted numbers, for example:
-     * "<code>3.2.456.53.23.64</code>".
-     *
-     * @exception NumberFormatException If the given string cannot be
-     *      parsed into an OID.
-     */
-    public OBJECT_IDENTIFIER( String dottedOID ) throws NumberFormatException {
-
-        if( dottedOID == null || dottedOID.length()==0 ) {
-            throw new NumberFormatException("OID string is zero-length");
-        }
-
-        StringTokenizer stok = new StringTokenizer(dottedOID, ".");
-        numbers = new long[ stok.countTokens() ];
-        int i = 0;
-        while(stok.hasMoreElements()) {
-            numbers[i++] = Long.parseLong( stok.nextToken() );
-        }
-        Assert._assert( i == numbers.length );
-        checkLongArray(numbers);
-    }
-
-    public long[] getNumbers() {
-        return numbers;
-    }
-
-    public int hashCode() {
-        int code = 1;
-        for(int i = 0; i < numbers.length; i++) {
-            code = (int) (code + numbers[i])*10;
-        }
-        return code;
-    }
-
-    /**
-     * Creates a new OBJECT_IDENTIFIER that is a sub-branch of this one.
-     * For example, if <code>OBJECT_IDENTIFIER oid</code> has the value
-     * { 1 3 5 6 },
-     * then calling <code>oid.subBranch(4)</code> would return a new
-     * OBJECT_IDENTIFIER with the value { 1 3 5 6 4 }.
-     */
-    public OBJECT_IDENTIFIER subBranch(long num) {
-        long[] nums = new long[ numbers.length + 1];
-        System.arraycopy(numbers, 0, nums, 0, numbers.length);
-        nums[numbers.length] = num;
-        return new OBJECT_IDENTIFIER(nums);
-    }
-
-    /**
-     * Creates a new OBJECT_IDENTIFIER that is a sub-branch of this one.
-     * For example, if <code>OBJECT_IDENTIFIER oid</code> has the value
-     * { 1 3 5 6 },
-     * then calling <code>oid.subBranch(new long[]{ 4, 3})</code>
-     * would return a new
-     * OBJECT_IDENTIFIER with the value { 1 3 5 6 4 3}.
-     */
-    public OBJECT_IDENTIFIER subBranch(long[] newNums) {
-        long[] nums = new long[ numbers.length + newNums.length];
-        System.arraycopy(numbers, 0, nums, 0, numbers.length);
-        System.arraycopy(newNums, 0, nums, numbers.length, newNums.length);
-        return new OBJECT_IDENTIFIER(nums);
-    }
-
-    public boolean equals(Object obj) {
-        if(obj == null || ! (obj instanceof OBJECT_IDENTIFIER)) {
-            return false;
-        }
-        long[] nums = ((OBJECT_IDENTIFIER)obj).numbers;
-        if( nums.length != numbers.length ) {
-            return false;
-        }
-        for(int i = 0; i < nums.length; i++) {
-            if( nums[i] != numbers[i] ) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public String toString() {
-        String ret = "{" + String.valueOf(numbers[0]);
-        for(int i=1; i < numbers.length; i++) {
-            ret = ret + " " + numbers[i];
-        }
-        ret += "}";
-        return ret;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(TAG, ostream);
-    }
-
-    private byte[] encodedContents = null;
-    /**
-     * Gets the encoding of the contents, or a cached copy.
-     * Since the content encoding is the same regardless of the Tag,
-     * this only needs to be computed once.
-     */
-    private byte[] getEncodedContents() {
-        if( encodedContents == null ) {
-            encodedContents = computeEncodedContents();
-        }
-        return encodedContents;
-    }
-
-    // We cache our encoding for a given tag.  99% of the time, only
-    // one tag will be used for an instance, so we will get a cache hit.
-    // In the remaining 1%, we'll have to recompute the encoding.
-    byte[] cachedEncoding=null;
-    Tag tagForCache=null;
-    /**
-     * Returns the encoding for the given tag.  If the encoding for
-     * this tag was previously computed (and no encoding for a different
-     *  tag has since been computed), this method returns a cached copy.
-     * Otherwise, the encoding will be recomputed.
-     */
-    private byte[] getEncoding(Tag tag) {
-        if( ! tag.equals(tagForCache) ) {
-            // recompute for new tag
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-            ASN1Header head = getHeader(tag);
-            try {
-                head.encode(out);
-            } catch( IOException e ) {
-                // should never happen on a byte array output stream
-                Assert.notReached("exception while encoding ASN.1 header");
-            }
-
-            out.write( getEncodedContents(), 0, getEncodedContents().length );
-
-            tagForCache = tag;
-            cachedEncoding = out.toByteArray();
-        }
-        return cachedEncoding;
-    }
-
-    /**
-     * Compute the ASN1 header for this tag.
-     */
-    private ASN1Header getHeader(Tag implicitTag) {
-        return new ASN1Header( implicitTag, FORM, getEncodedContents().length );
-    }
-
-    /**
-     * Actually computes the encoding of this object identifier.
-     */
-    private byte[] computeEncodedContents() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        // handle first number
-        Assert._assert(numbers.length >= 2);
-        long n = numbers[0];
-        Assert._assert( n == 0 || n == 1 || n == 2 );
-        long outb = ( numbers[0] * 40 ) + numbers[1];
-        Assert._assert( ((byte)outb) == outb );
-        out.write( (byte)outb );
-
-        // handle consecutive numbers
-        for( int i = 2; i < numbers.length; i++ ) {
-            n = numbers[i];
-            Assert._assert( n >= 0 );
-
-            // array of output bytes, in reverse order.  10 bytes, at 7 bits
-            // per byte, is 70 bits, which is more than enough to handle
-            // the maximum value of a long, which takes up 63 bits.
-            byte[] rev = new byte[10];
-            int idx=0; // index into reversed bytes
-
-            // Create reversed byte list
-            do {
-                rev[idx++] = (byte) (n % 128);
-                n = n / 128;
-            } while( n > 0 );
-            idx--; // backup to point to last element
-
-            // now print them in reverse order
-            while( idx > 0 ) {
-                // all but last byte have MSB==1
-                out.write( rev[idx--]  | 0x80 );
-            }
-            Assert._assert(idx == 0);
-            // last byte has MSB==0
-            out.write( rev[0] );
-        }
-
-        return out.toByteArray();
-    }
-        
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        ostream.write( getEncoding(implicitTag) );
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-///////////////////////////////////////////////////////////////////////
-// OBJECT_IDENTIFIER.Template
-//
-public static class Template implements ASN1Template {
-
-    public Tag getTag() {
-        return OBJECT_IDENTIFIER.TAG;
-    }
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(OBJECT_IDENTIFIER.TAG) );
-    }
-
-    public Form getForm() {
-        return OBJECT_IDENTIFIER.FORM;
-    }
-    public boolean formMatch(Form form) {
-        return( form == OBJECT_IDENTIFIER.FORM );
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(getTag(), istream);
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header(istream);
-        long remainingContent = head.getContentLength();
-
-        // Check the information gleaned from the header
-        if( ! head.getTag().equals( implicitTag ) ) {
-            throw new InvalidBERException("Incorrect tag for "+
-                "OBJECT IDENTIFIER: "+ head.getTag() );
-        }
-        if( head.getForm() != getForm() ) {
-            throw new InvalidBERException("Incorrect form for OBJECT "+
-                "IDENTIFIER");
-        }
-        if( remainingContent < 1 ) {
-            throw new InvalidBERException("Invalid 0 length for OBJECT"+
-                " IDENTIFIER");
-        }
-
-        Vector numberV = new Vector();
-
-        // handle first byte, which contains first two numbers
-        byte b = readByte(istream);
-        remainingContent--;
-        long num = b % 40;
-        numberV.addElement( new Long( b % 40 ) ); // second number
-        numberV.insertElementAt( new Long( b / 40 ), 0); // first number
-
-        // handle the rest of the numbers
-        while( remainingContent > 0 ) {
-            num = 0;
-
-            // keep reading until MSB == 0
-            int bitcount=0;
-            do {
-                if( (bitcount+=7) > 63 ) {
-                    // we're about to overflow our long
-                    throw new InvalidBERException("OBJECT IDENTIFIER "+
-                        "element too long; max is 63 bits");
-                }
-                b = readByte(istream);
-                remainingContent--;
-                num <<= 7;
-                num |= (b & 0x7f);
-            } while( (b & 0x80) != 0 );
-
-            numberV.addElement( new Long( num ) );
-        }
-
-        // convert Vector to array
-        long numbers[] = new long[ numberV.size() ];
-        for(int i = 0; i < numbers.length; i++) {
-            numbers[i] = ((Long)numberV.elementAt(i)).longValue();
-        }
-
-        // create OBJECT_IDENTIFIER from array
-        return new OBJECT_IDENTIFIER(numbers);
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "OBJECT IDENTIFIER");
-      }
-    }
-
-    /**
-     *  Reads in a byte from the stream, throws an InvalidBERException
-     *  if EOF is reached.
-     */
-    private static byte readByte(InputStream istream)
-        throws InvalidBERException, IOException
-    {
-        int n = istream.read();
-        if( n == -1 ) {
-            throw new InvalidBERException("End-of-file reached while "+
-                "decoding OBJECT IDENTIFIER");
-        }
-        Assert._assert( (n & 0xff) == n );
-        return (byte) n;
-    }
-        
-} // end of OBJECT_IDENTIFIER.Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/OCTET_STRING.java

@@ -1,147 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-
-public class OCTET_STRING implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 4);
-    public Tag getTag() {
-        return TAG;
-    }
-    public static final Form FORM = Form.PRIMITIVE;
-
-    byte[] data;
-
-    private OCTET_STRING() { }
-
-    public OCTET_STRING( byte[] data ) {
-        this.data = data;
-    }
-
-    public byte[] toByteArray() {
-        return data;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        // use getTag() so we can be subclassed
-        encode(getTag(), ostream);
-    }
-
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        ASN1Header head = new ASN1Header(implicitTag, FORM, data.length);
-
-        head.encode(ostream);
-
-        ostream.write(data);
-    }
-
-    private static final Template templateInstance = new Template();
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-public static class Template implements ASN1Template {
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return( TAG.equals(tag) );
-    }
-
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {   
-        return decode(getTag(), istream);
-    }
-
-    // this can be overridden by subclasses
-    protected ASN1Value generateInstance(byte[] bytes) {
-        return new OCTET_STRING( bytes );
-    }
-
-    // this can be overridden by subclasses
-    protected String getName() {
-        return "OCTET_STRING";
-    }
-
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header head = new ASN1Header(istream);
-
-        head.validate(implicitTag);
-
-        byte[] data;
-
-        if( head.getContentLength() == -1 ) {
-            // indefinite length encoding
-            ASN1Header ahead;
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            do {
-                ahead = ASN1Header.lookAhead( istream );
-                if( ! ahead.isEOC() ) {
-                    OCTET_STRING.Template ot = new OCTET_STRING.Template();
-                    OCTET_STRING os = (OCTET_STRING) ot.decode(istream);
-                    bos.write( os.toByteArray() );
-                }
-            } while( ! ahead.isEOC() );
-
-            // consume EOC
-            ahead = new ASN1Header(istream);
-
-            data = bos.toByteArray();
-        } else {
-            data = new byte[ (int) head.getContentLength() ];
-            ASN1Util.readFully(data, istream);
-        }
-
-        return generateInstance(data);
-
-      } catch( InvalidBERException e ) {
-        throw new InvalidBERException(e, getName());
-      }
-    }
-
-} // end of Template
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/PrintableString.java

@@ -1,157 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-
-public class PrintableString extends CharacterString implements ASN1Value {
-
-    public PrintableString(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    public PrintableString(String s) throws CharConversionException {
-        super(s);
-    }
-
-    CharConverter getCharConverter() {
-        return new PrintableConverter();
-    }
-
-    public static final Tag TAG = new Tag( Tag.UNIVERSAL, 19 );
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    /**
-     * Returns a singleton instance of the decoding template for this class.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static final Template templateInstance = new Template();
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-    protected Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    protected CharConverter getCharConverter() {
-        return new PrintableConverter();
-    }
-
-    protected CharacterString generateInstance(char[] chars)
-        throws CharConversionException
-    {
-        return new PrintableString(chars);
-    }
-
-    protected String typeName() {
-        return "PrintableString";
-    }
-}
-
-private static class PrintableConverter implements CharConverter {
-
-    private static boolean[] isPrintable = new boolean[128];
-    static {
-        char b;
-        for(b='A'; b <= 'Z'; b++) {
-            isPrintable[b] = true;
-        }
-        for(b='a'; b <= 'z'; b++) {
-            isPrintable[b] = true;
-        }
-        for(b='0'; b <= '9'; b++) {
-            isPrintable[b] = true;
-        }
-        isPrintable[' '] = true;
-        isPrintable['\''] = true;
-        isPrintable['('] = true;
-        isPrintable[')'] = true;
-        isPrintable['+'] = true;
-        isPrintable[','] = true;
-        isPrintable['-'] = true;
-        isPrintable['.'] = true;
-        isPrintable['/'] = true;
-        isPrintable[':'] = true;
-        isPrintable['='] = true;
-        isPrintable['?'] = true;
-    }
-
-    public char[] byteToChar(byte[] bytes, int offset, int len)
-        throws CharConversionException
-    {
-        char[] chars = new char[len];
-        int c; // char index
-        int b; // byte index
-        for(c=0, b=offset; c < len; b++, c++) {
-            if( (bytes[b] & 0x80) != 0 || !isPrintable[bytes[b]] ) {
-				/* fix for bug 359010 - don't throw, just skip
-				 * throw new CharConversionException(bytes[b]+ " is not "+
-				 * "a valid character for a PrintableString");
-				 */
-            } else {
-				chars[c] = (char) bytes[b];
-			}
-        }
-        return chars;
-    }
-
-    public byte[] charToByte(char[] chars, int offset, int len)
-        throws CharConversionException
-    {
-        byte[] bytes = new byte[len];
-        int c; // char index
-        int b; // byte index
-        for(c=0, b=0; b < len; b++, c++) {
-            if( (chars[c] & 0xff80) != 0 || !isPrintable[chars[c]] ) {
-                throw new CharConversionException(chars[c]+ " is not "+
-                    "a valid character for a PrintableString");
-            }
-            bytes[b] = (byte) (chars[c] & 0x7f);
-        }
-        return bytes;
-    }
-} // end of char converter
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/SEQUENCE.java

@@ -1,759 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.Vector;
-import org.mozilla.jss.util.Assert;
-import java.math.BigInteger;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * An ASN.1 SEQUENCE.  This class is an ordered collection of ASN.1 values.
- * It has an interface similar to a Java <code>Vector</code>.
- * Null entries may be added; they will be skipped when encoded.
- */
-public class SEQUENCE extends SET implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 16);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public static Template getTemplate() {
-        return new Template();
-    }
-
-    /**
-     * Writes the DER encoding to the given output stream,
-     * using the given implicit tag.
-     */
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        BERencode(implicitTag, ostream);
-    }
-
-    // SET.Element and SEQUENCE.Element are identical types.  We could
-    // have just reused SET.Element, but that would have been a bit
-    // confusing for users.
-    private static class Element extends SET.Element {
-        public Element( ASN1Value val ) {
-            super(val);
-        }
-        public Element( Tag implicitTag, ASN1Value val) {
-            super(implicitTag, val);
-        }
-    }
-
-/**
- * A class for constructing a <code>SEQUENCE</code> from its BER encoding.
- * It is an ordered collection of sub-templates.  Each sub-template can be
- * marked optional, or a default value can be given.
- */
-public static class Template implements ASN1Template {
-
-    private Vector elements = new Vector();
-
-    private void addElement(Element el) {
-        elements.addElement( el );
-    }
-
-    private void insertElementAt(Element e, int index) {
-        elements.insertElementAt(e, index);
-    }
-
-    /**
-     * Adds a sub-template to the end of this SEQUENCE template. For example,
-     *  if the ASN.1 included:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      item        SubType,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addElement( new SubType.Template() );
-     * </pre>
-     */
-    public void addElement( ASN1Template t ) {
-        addElement( new Element(null, t, false) );
-    }
-
-    /**
-     * Inserts the template at the given index.
-     */
-    public void insertElementAt( ASN1Template t, int index )
-    {
-        insertElementAt( new Element(null, t, false), index );
-    }
-
-    /**
-     * Adds a sub-template to the end of this SEQUENCE template, with the
-     *  given implicit tag. For example, if the ASN.1 were:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      item        [0] IMPLICIT  SubType,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addElement( new Tag(0), new SubType.Template());
-     * </pre>
-     */
-    public void addElement( Tag implicitTag, ASN1Template t ) {
-        addElement( new Element(implicitTag, t, false) );
-    }
-
-    /**
-     * Inserts the template with the given implicit tag at the given index.
-     */
-    public void insertElementAt( Tag implicit, ASN1Template t,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, false), index );
-    }
-
-    /**
-     * Adds an optional sub-template. For example, if the ASN.1 were:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      item        SubType OPTIONAL,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addOptionalElement( new SubType.Template() );
-     * </pre>
-     */
-    public void addOptionalElement( ASN1Template t ) {
-        addElement( new Element(null, t, true) );
-    }
-
-    /**
-     * Inserts the optional template at the given index.
-     */
-    public void insertOptionalElementAt( ASN1Template t, int index )
-    {
-        insertElementAt( new Element(null, t, true), index );
-    }
-
-    /**
-     * Adds an optional sub-template with an implicit tag. For example,
-     *  if the ASN.1 were:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      item        [0] IMPLICIT SubType OPTIONAL,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addOptionalElement( new SubType.Template() );
-     * </pre>
-     */
-    public void addOptionalElement( Tag implicitTag, ASN1Template t ) {
-        addElement( new Element(implicitTag, t, true) );
-    }
-
-    /**
-     * Inserts the optional template with the given default
-     * value at the given index.
-     */
-    public void insertOptionalElementAt( Tag implicit, ASN1Template t,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, true), index );
-    }
-
-    /**
-     * Adds a sub-template with a default value. For example,
-     *  if the ASN.1 were:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      version     INTEGER DEFAULT 1,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addElement( new INTEGER.Template(), new INTEGER(1) );
-     * </pre>
-     * @param def The default value for this field, which will be used if
-     *      no value is supplied by the encoded structure. It must be of
-     *      the same type as what the template would produce.
-     */
-    public void addElement( ASN1Template t, ASN1Value def ) {
-        addElement( new Element(null, t, def) );
-    }
-
-    /**
-     * Inserts the template with the given default
-     * value at the given index.
-     */
-    public void insertElementAt( ASN1Template t, ASN1Value def, int index )
-    {
-        insertElementAt( new Element(null, t, def), index );
-    }
-
-    /**
-     * Adds a sub-template with a default value and an implicit tag.
-     *  For example, if the ASN.1 were:
-     * <pre>
-     * MySequence ::= SEQUENCE {
-     *      version     [0] IMPLICIT INTEGER DEFAULT 1,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySequence template with:
-     * <pre>
-     *  mySequence.addElement( new Tag(0), new INTEGER.Template(),
-     *      new INTEGER(1) );
-     * </pre>
-     * @param def The default value for this field, which will be used if
-     *      no value is supplied by the encoded structure. It must be of
-     *      the same type as what the template would produce.
-     */
-    public void addElement( Tag implicitTag, ASN1Template t, ASN1Value def) {
-        addElement( new Element(implicitTag, t, def) );
-    }
-
-    /**
-     * Inserts the template with the given implicit tag and given default
-     * value at the given index.
-     */
-    public void insertElementAt( Tag implicit, ASN1Template t, ASN1Value def,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, def), index );
-    }
-
-    /**
-     * Returns the implicit tag of the item stored at the given index.
-     * May be NULL if no implicit tag was specified.
-     */
-    public Tag implicitTagAt( int index ) {
-        return ((Element)elements.elementAt(index)).getImplicitTag();
-    }
-
-    /**
-     * Returns the sub-template stored at the given index.
-     */
-    public ASN1Template templateAt( int index ) {
-        return ((Element)elements.elementAt(index)).getTemplate();
-    }
-
-    /**
-     * Returns whether the sub-template at the given index is optional.
-     */
-    public boolean isOptionalAt( int index ) {
-        return ((Element)elements.elementAt(index)).isOptional();
-    }
-
-    /**
-     * Returns the default value for the sub-template at the given index.
-     * May return NULL if no default value was specified.
-     */
-    public ASN1Value defaultAt( int index ) {
-        return ((Element)elements.elementAt(index)).getDefault();
-    }
-
-    /**
-     * Returns the number of elements in this SEQUENCE template.
-     */
-    public int size() {
-        return elements.size();
-    }
-
-    /**
-     * Removes all sub-templates from this SEQUENCE template.
-     */
-    public void removeAllElements() {
-        elements.removeAllElements();
-    }
-
-    /**
-     * Removes the sub-template at the given index.
-     */
-    public void removeElementAt(int index) {
-        elements.removeElementAt(index);
-    }
-
-    Tag getTag() {
-        return SEQUENCE.TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(SEQUENCE.TAG) );
-    }
-
-    /**
-     * Decodes a SEQUENCE from its BER encoding.
-     */
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(getTag(), istream);
-    }
-
-    /**
-     * Decodes a SEQUENCE from its BER encoding, where the SEQUENCE itself has
-     * an implicit tag.
-     */
-    public ASN1Value decode(Tag tag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      int index = 0;
-
-      try {
-        ASN1Header header = new ASN1Header(istream);
-
-        header.validate( tag, Form.CONSTRUCTED );
-
-        // will be -1 for indefinite encoding
-        long remainingContent = header.getContentLength();
-
-        boolean repeatableElement=false;
-        SEQUENCE seq = new SEQUENCE();
-        ASN1Header lookAhead=null;
-
-        // go through the whole template
-        for( index = 0; index < size(); index++ ) {
-
-            // find out about the next item
-            if( remainingContent == 0 ) {
-                lookAhead = null;
-            } else {
-                // remainingContent > 0 or remainingContent == -1, which means
-                // indefinite encoding.
-                lookAhead = ASN1Header.lookAhead(istream);
-            }
-
-            // skip over items that don't match.  Hopefully they are
-            // optional or have a default.  Otherwise, it's an error.
-            Element e = (Element) elements.elementAt(index);
-            if( (lookAhead == null) || lookAhead.isEOC() ||
-                    ! e.tagMatch( lookAhead.getTag() ) )
-            {
-                if( e.isRepeatable() ) {
-                    repeatableElement = true;
-                } else if( e.isOptional() ) {
-                    // put an empty entry into the SEQUENCE
-                    SEQUENCE.Element se = new SEQUENCE.Element(null, null );
-                    seq.addElement( null );
-                } else if( e.getDefault() != null ) {
-                    // use the default
-                    seq.addElement( e.getDefault() );
-                } else {
-                    String tagDesc;
-                    if( lookAhead == null ) {
-                        tagDesc = "(null)";
-                    } else {
-                        tagDesc = lookAhead.getTag().toString();
-                    }
-                    throw new InvalidBERException("Missing item #" + index +
-                        ": found " + tagDesc );
-                }
-                continue;
-            }
-
-            // Decode this element
-            ASN1Template t = e.getTemplate();
-            ASN1Value val;
-            CountingStream countstream = new CountingStream(istream);
-            if( e.getImplicitTag() == null ) {
-                val = t.decode(countstream);
-            } else {
-                val = t.decode(e.getImplicitTag(), countstream);
-            }
-
-            // Decrement remaining count
-            long len = countstream.getNumRead();
-            if( remainingContent != -1 ) {
-                if( remainingContent < len ) {
-                    // this item went past the end of the SEQUENCE
-                    throw new InvalidBERException("Item went "+
-                        (len-remainingContent)+" bytes past the end of"+
-                        " the SEQUENCE");
-                }
-                remainingContent -= len;
-            }
-
-            // Store this element in the SEQUENCE
-            if( e.producesOutput() ) {
-                if(  e.getImplicitTag() == null ) {
-                    // no implicit tag
-                    seq.addElement( val );
-                } else {
-                    // there is an implicit tag
-                    seq.addElement( e.getImplicitTag(), val );
-                }
-            }
-
-            // If this element is repeatable, don't go on to the next element
-            if( e.isRepeatable() ) {
-                repeatableElement = true;
-                index--;
-            }
-        }
-
-        if( remainingContent > 0 ) {
-            throw new InvalidBERException("SEQUENCE is " + remainingContent +
-                " bytes longer than expected");
-        }
-        Assert._assert( remainingContent == 0 || remainingContent == -1 );
-
-        // If this was indefinite-length encoding, consume the end-of-contents
-        if( remainingContent == -1 ) {
-            lookAhead = new ASN1Header(istream);
-            if( ! lookAhead.isEOC() ) {
-                throw new InvalidBERException("No end-of-contents marker");
-            }
-        }
-
-        // Make sure we stayed in sync
-        if( ! repeatableElement ) {
-            Assert._assert(index == seq.size());
-        }
-
-        return seq;
-
-      } catch(InvalidBERException e) {
-        e.append("SEQUENCE(item #" +index + ")");
-        throw e;
-      }
-    }
-
-    /**
-     * An element of a SEQUENCE template. For each sub-template, contains the
-     * template, its optionality, its implicit tag, and its default value.
-     */
-    static class Element {
-
-        /**
-         * Creates a new element, which may or may not be optional.
-         */
-        public Element(Tag implicitTag, ASN1Template type, boolean optional)
-        {
-            this(implicitTag, type, optional, true);
-        }
-
-        /**
-         * Creates a new element, which may or may not be optional.
-         */
-        public Element(Tag implicitTag, ASN1Template type, boolean optional,
-            boolean doesProduceOutput)
-        {
-            this.type = type;
-            defaultVal = null;
-            this.optional = optional;
-            this.implicitTag = implicitTag;
-            this.doesProduceOutput = doesProduceOutput;
-        }
-
-        /**
-         * Creates a new element with a default value.
-         */
-        public Element(Tag implicitTag, ASN1Template type, ASN1Value defaultVal)
-        {
-            this.type = type;
-            this.defaultVal = defaultVal;
-            optional = false;
-            this.implicitTag = implicitTag;
-        }
-
-        private boolean doesProduceOutput = true;
-        boolean producesOutput() {
-            return doesProduceOutput;
-        }
-
-        // repeatability is provided to allow for SEQUENCE OF SIZE
-        // constructs.  It is package private.
-        private boolean repeatable;
-        void makeRepeatable() {
-            repeatable = true;
-        }
-        boolean isRepeatable() {
-            return repeatable;
-        }
-
-        private boolean optional;
-        public boolean isOptional() {
-            return optional;
-        }
-
-        private Tag implicitTag=null;
-        public Tag getImplicitTag() {
-            return implicitTag;
-        }
-
-        public boolean tagMatch(Tag tag) {
-            if( implicitTag != null ) {
-                return( implicitTag.equals(tag) );
-            } else {
-                return type.tagMatch(tag);
-            }
-        }
-
-        private ASN1Template type;
-        public ASN1Template getTemplate() {
-            return type;
-        }
-
-        private ASN1Value defaultVal=null;
-        public ASN1Value getDefault() {
-            return defaultVal;
-        }
-    }
-} // End of SEQUENCE.Template
-
-/**
- * A Template for decoding SEQUENCE OF values. The main difference between
- *  a SEQUENCE.Template and a SEQUENCE.OF_Template is that a regular template
- *  specifies the exact ordering, number, and type of elements of the sequence,
- *  while
- *  an OF_Template has an indefinite number of elements, all the same type.
- * For example, given:
- * <pre>
- * MyType ::= SEQUENCE OF Extension
- * </pre>
- * a MyType could be decoded with:
- * <pre>
- *  SEQUENCE.OF_Template myTypeTemplate = new SEQUENCE.OF_Template( new
- *      Extension.Template) );
- *  SEQUENCE seq = (SEQUENCE) myTypeTemplate.decode(someInputStream);
- * </pre>
- * The number of <code>Extension</code>s actually decoded could be found
- * with <code>seq.size()</code>.
- */
-public static class OF_Template implements ASN1Template {
-
-    private OF_Template() { }
-
-    Template template;  // a normal SEQUENCE template
-
-    public OF_Template(ASN1Template type) {
-        template = new Template();
-        Template.Element el = new Template.Element(null, type, true); //optional
-        el.makeRepeatable();
-        template.addElement( el );
-    }
-
-    public static OF_Template makeOutputlessOFTemplate(ASN1Template type) {
-        OF_Template t = new OF_Template();
-        t.template = new Template();
-        Template.Element el = new Template.Element(null, type, true, false);
-        el.makeRepeatable();
-        t.template.addElement(el);
-        return t;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    /**
-     * Decodes a SEQUENCE OF from an input stream.
-     */
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return template.decode(istream);
-    }
-
-    /**
-     * Decodes a SEQUENCE OF with an implicit tag from an input stream.
-     */
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return template.decode(implicitTag, istream);
-    }
-}
-
-    public static void main(String args[]) {
-
-      try {
-
-        if(args.length > 0) {
-            // input
-
-            Template type = new Template();
-            type.addOptionalElement( new Tag(15), new INTEGER.Template() );
-            type.addElement( new Tag(16), new INTEGER.Template(),
-                    new INTEGER(42) );
-            type.addElement( new INTEGER.Template() );
-            type.addElement( new BOOLEAN.Template() );
-            type.addElement( new INTEGER.Template() );
-            type.addOptionalElement( new Tag(12), new INTEGER.Template() );
-            type.addElement( new BOOLEAN.Template() );
-            type.addElement( new Tag(13), new INTEGER.Template(),
-                new INTEGER(53) );
-            type.addElement( new INTEGER.Template() );
-            type.addElement( new INTEGER.Template() );
-            type.addOptionalElement( new Tag(14), new INTEGER.Template() );
-            type.addElement( new OBJECT_IDENTIFIER.Template() );
-            type.addElement( new NULL.Template() );
-            type.addElement( new EXPLICIT.Template(
-                                    new Tag(27), new INTEGER.Template()));
-            type.addElement( new ENUMERATED.Template() );
-            type.addElement( new OCTET_STRING.Template() );
-            type.addElement( new IA5String.Template() );
-
-            CHOICE.Template choice = new CHOICE.Template();
-            choice.addElement( new Tag(23), new INTEGER.Template() );
-            choice.addElement( new BOOLEAN.Template() );
-            type.addElement( choice );
-            type.addElement( new BIT_STRING.Template() );
-            type.addElement( new ANY.Template() );
-            type.addElement( new PrintableString.Template() );
-            type.addElement( new OF_Template( new INTEGER.Template() ) );
-            type.addElement( new OF_Template( new INTEGER.Template() ) );
-
-            FileInputStream fin = new FileInputStream(args[0]);
-            System.out.println("Available: "+fin.available());
-            byte[] stuff = new byte[ fin.available() ];
-            ASN1Util.readFully(stuff, fin);
-            SEQUENCE s=null;
-            for( int i = 0; i < 1; i++) {
-                s = (SEQUENCE) type.decode( new ByteArrayInputStream(stuff) );
-            }
-
-            for(int i=0; i < s.size(); i ++ ) {
-                ASN1Value v = s.elementAt(i);
-                if(v instanceof ENUMERATED) {
-                    ENUMERATED en = (ENUMERATED) v;
-                    System.out.println("ENUMERATED: "+en);
-                } else if( v instanceof INTEGER ) {
-                    INTEGER in = (INTEGER) v;
-                    System.out.println("INTEGER: "+in);
-                } else if(v instanceof BOOLEAN ) {
-                    BOOLEAN bo = (BOOLEAN) v;
-                    System.out.println("BOOLEAN: "+bo);
-                } else if(v instanceof OBJECT_IDENTIFIER) {
-                    OBJECT_IDENTIFIER oid = (OBJECT_IDENTIFIER) v;
-                    System.out.println("OID: "+oid);
-                } else if(v instanceof NULL) {
-                    NULL n = (NULL) v;
-                    System.out.println("NULL");
-                } else if(v instanceof EXPLICIT) {
-                    EXPLICIT ex = (EXPLICIT) v;
-                    INTEGER in = (INTEGER) ex.getContent();
-                    System.out.println("EXPLICIT ["+ex.getTag()+"]: "+ 
-                        "INTEGER: "+in);
-                } else if(v instanceof OCTET_STRING) {
-                    OCTET_STRING os = (OCTET_STRING) v;
-                    byte[] bytes = os.toByteArray();
-                    System.out.print("OCTET_STRING: ");
-                    for(int j = 0; j < bytes.length; j++) {
-                        System.out.print(bytes[j]+" ");
-                    }
-                    System.out.println("");
-                } else if( v instanceof CharacterString ) {
-                    CharacterString cs = (CharacterString) v;
-                    System.out.println("String: "+cs);
-                } else if( v instanceof BIT_STRING ) {
-                    BIT_STRING bs = (BIT_STRING) v;
-                    System.out.print("BIT_STRING: padCount="+
-                        bs.getPadCount()+" : ");
-                    byte[] bits = bs.getBits();
-                    for(int j = 0; j < bits.length; j++) {
-                        System.out.print(bits[j]+" ");
-                    }
-                    System.out.println("");
-                } else if( v instanceof ANY ) {
-                    ANY any = (ANY) v;
-                    Tag tag = any.getTag();
-                    System.out.println("Got ANY, tag is "+tag);
-                    ByteArrayInputStream bos =
-                        new ByteArrayInputStream( any.getEncoded() );
-                    INTEGER in = (INTEGER) new INTEGER.Template().decode(bos);
-                    System.out.println("    INTEGER: "+in);
-                } else if(v instanceof SEQUENCE ) {
-                    SEQUENCE seq = (SEQUENCE)v;
-                    System.out.println("SEQUENCE: ");
-                    for(int j=0; j < seq.size(); j++ ) {
-                        INTEGER in = (INTEGER) seq.elementAt(j);
-                        System.out.println("    INTEGER: "+in);
-                    }
-                } else {
-                    System.out.println("Unknown value");
-                }
-            }
-
-
-        } else {
-            // output
-
-            SEQUENCE seq = new SEQUENCE();
-            seq.addElement( new INTEGER(5) );
-            seq.addElement( new BOOLEAN(true) );
-            seq.addElement( new INTEGER(-322) );
-            seq.addElement( new BOOLEAN(false) );
-            seq.addElement( new INTEGER(0) );
-            seq.addElement( new INTEGER("2934293834242") );
-            seq.addElement( new OBJECT_IDENTIFIER(
-                new long[] { 1, 2, 127, 563, 1231982 } ) );
-            seq.addElement( new NULL() );
-            seq.addElement( new EXPLICIT( new Tag(27), new INTEGER(39) ));
-            seq.addElement( new ENUMERATED(983) );
-            seq.addElement( new OCTET_STRING( new byte[] {
-                    (byte)0x0, (byte)0xff, (byte)0xcc} ) );
-            seq.addElement( new IA5String("foobar") );
-            seq.addElement( new Tag(23), new INTEGER(234) );
-            //seq.addElement( new BOOLEAN(false) );
-            byte[] bits = new byte[]{ (byte)0x80, (byte)0xff, (byte)0x0f };
-            seq.addElement( new BIT_STRING( bits, 3 ) );
-            seq.addElement( new INTEGER(82734) );
-            seq.addElement( new PrintableString("I'm printable??") );
-
-            SEQUENCE nested = new SEQUENCE();
-            nested.addElement( new INTEGER( 5 ) );
-            nested.addElement( new INTEGER( 6 ) );
-            seq.addElement( nested );
-
-            nested = new SEQUENCE();
-            seq.addElement( nested );
-            
-
-            seq.encode(System.out);
-            System.out.flush();
-        }
-      } catch( Exception e) {
-            e.printStackTrace();
-      }
-    }
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/SET.java

@@ -1,930 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.math.BigInteger;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-import org.mozilla.jss.util.Assert;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * An ASN.1 SET, which is an unordered collection of ASN.1 values.
- * It has an interface like a Java Vector, but the ordering is arbitrary.
- * Null entries may be added; they will be skipped when encoding.
- */
-public class SET implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.Class.UNIVERSAL, 17);
-
-    public Tag getTag() {
-        return TAG;
-    }
-    protected static final Form FORM = Form.CONSTRUCTED;
-
-    // The elements of the set
-    protected Vector elements = new Vector();
-
-    private void addElement( Element e ) {
-        elements.addElement(e);
-    }
-
-    private void insertElementAt( Element e, int index ) {
-        elements.insertElementAt(e, index);
-    }
-
-    /**
-     * Adds an element to this SET.
-     */
-    public void addElement( ASN1Value v ) {
-        addElement( new Element(v) );
-    }
-
-    /**
-     * Adds an element to this SET with the given implicit tag. For example,
-     * if the ASN.1 were:
-     * <pre>
-     *  MyType ::= SET {
-     *      item        [0] IMPLICIT INTEGER,
-     *      ... }
-     * </pre>
-     * then the "item" element could be added (with a sample value of 45)
-     *  to the SET with:
-     * <pre>
-     * myTypeInstance.addElement( new Tag(0), new INTEGER(45) );
-     * </pre>
-     */
-    public void addElement( Tag implicitTag, ASN1Value v ) {
-        addElement( new Element(implicitTag, v) );
-    }
-
-    /**
-     * Inserts an element at the given index.
-     */
-    public void insertElementAt( ASN1Value v, int index ) {
-        insertElementAt( new Element(v), index );
-    }
-
-    /**
-     * Inserts an element with the given implicit tag at the given index.
-     */
-    public void insertElementAt( Tag implicitTag, ASN1Value v, int index ) {
-        insertElementAt( new Element(implicitTag, v), index );
-    }
-
-    /**
-     * Returns the element at the given index in the SET.
-     */
-    public ASN1Value elementAt( int index ) {
-        return ((Element)elements.elementAt(index)).getValue();
-    }
-
-    /**
-     * Returns the tag of the element at the given index. If the element
-     * has an implicit tag, that is returned.  Otherwise, the tag of the
-     * underlying type is returned.
-     */
-     public Tag tagAt( int index ) {
-        Tag implicit = ((Element)elements.elementAt(index)).getImplicitTag();
-        if( implicit != null ) {
-            return implicit;
-        } else {
-            return elementAt(index).getTag();
-        }
-    }
-
-    /**
-     * Returns the element with the given Tag, or null if no element exists
-     * with the given tag.
-     */
-    public ASN1Value elementWithTag( Tag tag ) {
-        // hmmm...linear search for now, should use hashtable later
-
-        int size = elements.size();
-        for( int i=0; i < size; i++ ) {
-            Element e = (Element) elements.elementAt(i);
-            if( e.getTag().equals(tag) ) {
-                return e.getValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the number of elements in this SET.
-     */
-    public int size() {
-        return elements.size();
-    }
-
-    /**
-     * Removes all elements from this SET.
-     */
-    public void removeAllElements() {
-        elements.removeAllElements();
-    }
-
-    /**
-     * Removes the element from the specified index.
-     */
-    public void removeElementAt(int index) {
-        elements.removeElementAt(index);
-    }
-
-    /**
-     * Writes the DER encoding to the given output stream.
-     */
-    public void encode(OutputStream ostream)
-        throws IOException
-    {
-        encode(getTag(), ostream);
-    }
-
-    /**
-     * Writes the DER encoding to the given output stream,
-     * using the given implicit tag. To satisfy DER encoding rules,
-     * the elements will be re-ordered either by tag or lexicographically.
-     */
-    public void encode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        // what ordering method?
-        boolean lexOrdering;
-        if( elements.size() < 2 ) {
-            // doesn't matter, only one element
-            lexOrdering = true;
-        } else if( tagAt(0).equals(tagAt(1)) ) {
-            // tags are the same, lexicographic ordering
-            lexOrdering = true;
-        } else {
-            // tags are different, order by tag
-            lexOrdering = false;
-        }
-
-        // compute and order contents
-        int numElements = elements.size();
-        int totalBytes = 0;
-        Vector encodings = new Vector(numElements);
-        Vector tags = new Vector(numElements);
-        int i;
-        for(i = 0; i < numElements; i++ ) {
-
-            // if an entry is null, just skip it
-            if( elementAt(i) != null ) {
-                byte[] enc = ASN1Util.encode(tagAt(i), elementAt(i));
-
-                totalBytes += enc.length;
-
-                if( lexOrdering ) {
-                    insertInOrder(encodings, enc);
-                } else {
-                   insertInOrder(encodings, enc, tags, (int) tagAt(i).getNum());
-                }
-            }
-        }
-
-        // write header
-        ASN1Header header = new ASN1Header( implicitTag, FORM, totalBytes );
-        header.encode(ostream);
-
-        // write contents in order
-        for(i=0; i < numElements; i++ ) {
-            ostream.write( (byte[]) encodings.elementAt(i) );
-        }
-    }
-
-    /**
-     * Encodes this SET without re-ordering it.  This may violate
-     * DER, but it is within BER.
-     */
-    public void BERencode(Tag implicitTag, OutputStream ostream)
-        throws IOException
-    {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-        // compute contents
-        int size = elements.size();
-        for(int i = 0; i < size; i++ ) {
-            ASN1Value el = elementAt(i);
-            if(el!=null) {
-                el.encode(tagAt(i), bos);
-            }
-        }
-
-        byte[] bytes = bos.toByteArray();
-
-        // write header
-        ASN1Header header = new ASN1Header( implicitTag, FORM, bytes.length );
-        header.encode(ostream);
-
-        // write contents
-        ostream.write(bytes);
-    }
-
-    // performs ascending lexicographic ordering
-    // linear search, but number of items is usually going to be small.
-    private static void insertInOrder(Vector encs, byte[] enc) {
-        int size = encs.size();
-
-        // find the lowest item that we are less than or equal to
-        int i;
-        for(i=0; i < size; i++) {
-            if( compare(enc, (byte[])encs.elementAt(i)) < 1 ) {
-                break;
-            }
-        }
-
-        // insert ourself before this item
-        encs.insertElementAt(enc, i);
-    }
-
-    // performs ascending ordering by tag
-    // linear search, but number of items is usually going to be small.
-    private static void insertInOrder(Vector encs, byte[] enc, Vector tags,
-                int tag)
-    {
-        int size = encs.size();
-
-        // find the lowest item that we are less than or equal to
-        int i;
-        for(i = 0; i < size; i++) {
-            if( tag <= ((Integer)tags.elementAt(i)).intValue() ) {
-                break;
-            }
-        }
-
-        // insert ourself before this item
-        encs.insertElementAt(enc, i);
-        tags.insertElementAt(new Integer(i), i );
-    }
-
-
-    // compares two byte arrays
-    // returns 1 if left > right, -1 if left < right, 0 if left == right
-    private static int compare(byte[] left, byte[] right) {
-        int min = (left.length < right.length) ? left.length : right.length;
-
-        for(int i=0; i < min; i++) {
-            if( (left[i]&0xff) < (right[i]&0xff) ) {
-                return -1;
-            } else if( (left[i]&0xff) > (right[i]&0xff) ) {
-                return 1;
-            }
-        }
-
-        // equal up to the minimal endpoint
-        if( left.length > min ) {
-            Assert._assert(right.length==min);
-            return 1;
-        }
-        if( right.length > min ) {
-            Assert._assert(left.length==min);
-            return -1;
-        }
-        return 0;
-    }
-
-    /**
-     * An element of a SET
-     */
-    static class Element {
-
-        /**
-         * Makes a new SET element from the given value.
-         */
-        public Element( ASN1Value val ) {
-            this.val = val;
-        }
-
-        /**
-         * Makes a new SET element from the given value with the given
-         * implicit tag.
-         */
-        public Element( Tag implicitTag, ASN1Value val )
-        {
-            this.val = val;
-            this.implicitTag = implicitTag;
-        }
-
-        private ASN1Value val;
-        /**
-         * Returns the value of this SET element.
-         */
-        public ASN1Value getValue() {
-            return val;
-        }
-
-        /**
-         * Returns the tag that actually shows up in the encoding.
-         * If there is an implicit tag, it will be used.  Otherwise,
-         * it will be the base tag for the value.
-         */
-        public Tag getTag() {
-            if(implicitTag!=null) {
-                return implicitTag;
-            } else {
-                return val.getTag();
-            }
-        }
-
-        private Tag implicitTag=null;
-        /**
-         * Returns the implicit tag for this value, if there is one.
-         * If not, returns null.
-         */
-        public Tag getImplicitTag() {
-            return implicitTag;
-        }
-    }
-
-/**
- * SET.Template
- * This class is used for decoding DER-encoded SETs.
- */
-public static class Template implements ASN1Template {
-
-    private Vector elements = new Vector();
-
-    private void addElement( Element e ) {
-        elements.addElement(e);
-    }
-
-    private void insertElementAt( Element e, int index ) {
-        elements.insertElementAt(e, index);
-    }
-
-    /**
-     * Adds a sub-template to the end of this SET template. For example,
-     *  if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        SubType,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addElement( new SubType.Template() );
-     * </pre>
-     */
-    public void addElement( ASN1Template t ) {
-        addElement( new Element(TAG, t, false) );
-    }
-
-    /**
-     * Inserts the template at the given index.
-     */
-    public void insertElementAt( ASN1Template t, int index )
-    {
-        insertElementAt( new Element(TAG, t, false), index );
-    }
-
-    /**
-     * Adds a sub-template with the given implicit tag to the end of this
-     *  SET template. For example, if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        [0] IMPLICIT SubType,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addElement( new Tag(0), new SubType.Template() );
-     * </pre>
-     */
-    public void addElement( Tag implicit, ASN1Template t ) {
-        addElement( new Element(implicit, t, false) );
-    }
-
-    /**
-     * Inserts the template with the given implicit tag at the given index.
-     */
-    public void insertElementAt( Tag implicit, ASN1Template t,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, false), index );
-    }
-
-    /**
-     * Adds an optional sub-template to the end
-     *  of this SET template. For example, if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        SubType OPTIONAL,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addOptionalElement( new SubType.Template() );
-     * </pre>
-     */
-    public void addOptionalElement( ASN1Template t ) {
-        addElement( new Element(TAG, t, true) );
-    }
-
-    /**
-     * Inserts the optional template at the given index.
-     */
-    public void insertOptionalElementAt( ASN1Template t, int index )
-    {
-        insertElementAt( new Element(null, t, true), index );
-    }
-
-    /**
-     * Adds an optional sub-template with the given implicit tag to the end
-     *  of this SET template. For example, if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        [0] IMPLICIT SubType OPTIONAL,
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addOptionalElement( new Tag(0), new SubType.Template() );
-     * </pre>
-     */
-    public void addOptionalElement( Tag implicit, ASN1Template t ) {
-        addElement( new Element(implicit, t, true) );
-    }
-
-    /**
-     * Inserts the optional template with the given default
-     * value at the given index.
-     */
-    public void insertOptionalElementAt( Tag implicit, ASN1Template t,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, true), index );
-    }
-
-
-    /**
-     * Adds a sub-template with the given default value to the end
-     *  of this SET template. For example, if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        INTEGER DEFAULT (5),
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addElement( new SubType.Template(), new INTEGER(5) );
-     * </pre>
-     */
-    public void addElement( ASN1Template t, ASN1Value def ) {
-        addElement( new Element(TAG, t, def) );
-    }
-
-    /**
-     * Inserts the template with the given default
-     * value at the given index.
-     */
-    public void insertElementAt( ASN1Template t, ASN1Value def, int index )
-    {
-        insertElementAt( new Element(null, t, def), index );
-    }
-
-    /**
-     * Adds a sub-template with the given default value and implicit tag to
-     *  the end of this SET template. For example, if the ASN.1 included:
-     * <pre>
-     * MySet ::= SET {
-     *      item        [0] IMPLICIT INTEGER DEFAULT (5),
-     *      ... }
-     * </pre>
-     * the "item" element would be added to the MySet template with:
-     * <pre>
-     *  mySet.addElement( new Tag(0), new SubType.Template(), new INTEGER(5) );
-     * </pre>
-     */
-    public void addElement( Tag implicit, ASN1Template t, ASN1Value def ) {
-        addElement( new Element(implicit, t, def) );
-    }
-
-    /**
-     * Inserts the template with the given implicit tag and given default
-     * value at the given index.
-     */
-    public void insertElementAt( Tag implicit, ASN1Template t, ASN1Value def,
-        int index )
-    {
-        insertElementAt( new Element(implicit, t, def), index );
-    }
-
-    /**
-     * Returns the implicit tag of the item stored at the given index.
-     * May be NULL if no implicit tag was specified.
-     */
-    public Tag implicitTagAt(int index) {
-        return ((Element)elements.elementAt(index)).getImplicitTag();
-    }
-
-    /**
-     * Returns the sub-template stored at the given index.
-     */
-    public ASN1Template templateAt(int index) {
-        return ((Element)elements.elementAt(index)).getTemplate();
-    }
-
-    /**
-     * Returns <code>true</code> if the sub-template at the given index
-     * is optional.
-     */
-    public boolean isOptionalAt(int index) {
-        return ((Element)elements.elementAt(index)).isOptional();
-    }
-
-    private boolean isRepeatableAt(int index) {
-        return ((Element)elements.elementAt(index)).isRepeatable();
-    }
-
-    /**
-     * Returns the default value for the sub-template at the given index.
-     * May return NULL if no default value was specified.
-     */
-    public ASN1Value defaultAt(int index) {
-        return ((Element)elements.elementAt(index)).getDefault();
-    }
-
-    /**
-     * Returns the number of elements in the SET.
-     */
-    public int size() {
-        return elements.size();
-    }
-
-    public void removeAllElements() {
-        elements.removeAllElements();
-    }
-
-    public void removeElementAt(int index) {
-        elements.removeElementAt(index);
-    }
-
-    private Tag getTag() {
-        return SET.TAG;
-    }
-
-    /**
-     * Determines whether the given tag satisfies this template.
-     */
-    public boolean tagMatch(Tag tag) {
-        return( tag.equals(SET.TAG) );
-    }
-
-    /**
-     * Decodes the input stream into a SET value.
-     */
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return decode(getTag(), istream);
-    }
-
-    /**
-     * Decodes the input stream into a SET value with the given implicit
-     *  tag.
-     */
-    public ASN1Value decode(Tag tag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-      try {
-        ASN1Header header = new ASN1Header(istream);
-
-        header.validate( tag, Form.CONSTRUCTED );
-
-        // remainingContent will be -1 for indefinite length encoding
-        long remainingContent = header.getContentLength();
-        SET set = new SET();
-        ASN1Header lookAhead;
-        boolean[] found = new boolean[ elements.size() ];
-        
-        // while content remains, try to decode it
-        while( remainingContent > 0  || remainingContent == -1) {
-
-            // find out about the next item
-            lookAhead = ASN1Header.lookAhead(istream);
-
-            // if we found the end-of-content marker, we're done
-            if( lookAhead.isEOC() ) {
-                if( remainingContent != -1 ) {
-                    throw new InvalidBERException("Unexpected end-of-content"+
-                        "marker");
-                }
-                lookAhead = new ASN1Header(istream);
-                break;
-            }
-
-            // Find the element with the matching tag
-            int index = findElementByTag( lookAhead.getTag() );
-            if( index == -1 ) {
-                // element not found
-                throw new InvalidBERException("Unexpected Tag in SET: "+
-                    lookAhead.getTag() );
-            }
-            Element e = (Element) elements.elementAt(index);
-            if( found[index] && ! e.isRepeatable() ) {
-                // element already found, and it's not repeatable
-                throw new InvalidBERException("Duplicate Tag in SET: "+
-                    lookAhead.getTag() );
-            }
-
-            // mark this element as found
-            found[index] = true;
-
-            // Decode this element
-            ASN1Template t = e.getTemplate();
-            ASN1Value val;
-            CountingStream countstream = new CountingStream(istream);
-            if( e.getImplicitTag() == null ) {
-                val = t.decode(countstream);
-            } else {
-                val = t.decode(e.getImplicitTag(), countstream);
-            }
-
-            // Decrement remaining count
-            long len = countstream.getNumRead();
-            if( remainingContent != -1 ) {
-                if( remainingContent < len ) {
-                    // this item went past the end of the SET
-                    throw new InvalidBERException("Item went "+
-                        (len-remainingContent)+" bytes past the end of"+
-                        " the SET");
-                }
-                remainingContent -= len;
-            }
-
-            // Store this element in the SET
-            SET.Element se;
-            if( e.getImplicitTag() == null ) {
-                // no implicit tag
-                se = new SET.Element(val);
-            } else {
-                // there is an implicit tag
-                se = new SET.Element( e.getImplicitTag(), val );
-            }
-            set.addElement(se);
-        }
-
-        // We check for this after we read in each item, so this shouldn't
-        // happen
-        Assert._assert( remainingContent == 0 || remainingContent == -1);
-
-        // Deal with elements that weren't present.
-        int size = elements.size();
-        for(int i = 0; i < size; i++) {
-            if( !found[i] ) {
-                if( isOptionalAt(i) || isRepeatableAt(i) ) {
-                    // no problem
-                } else if( defaultAt(i) != null ) {
-                    set.addElement( new SET.Element(defaultAt(i)) );
-                } else {
-                    throw new InvalidBERException("Field not found in SET");
-                }
-            }
-        }
-
-        return set;
-
-      } catch(InvalidBERException e) {
-        throw new InvalidBERException(e, "SET");
-      }
-    }
-
-
-    /**
-     * Returns the index in the vector of the type with this tag and class,
-     * or -1 if not found.
-     * lame linear search - but we're dealing with small numbers of elements,
-     * so it's probably not worth it to use a hashtable
-     */
-    private int findElementByTag(Tag tag) {
-        int size = elements.size();
-
-        for( int i = 0; i < size ; i++ ) {
-            Element e = (Element) elements.elementAt(i);
-            if( e.tagMatch( tag ) ) {
-                // match!
-                return i;
-            }
-        }
-
-        // no match
-        return -1;
-    }
-
-    /**
-     * An element of a SET template.
-     */
-    public static class Element {
-
-        public Element(Tag implicitTag, ASN1Template type, boolean optional)
-        {
-            this.type = type;
-            defaultVal = null;
-            this.optional = optional;
-            this.implicitTag = implicitTag;
-        }
-
-        public Element(Tag implicitTag, ASN1Template type, ASN1Value defaultVal)
-        {
-            this.type = type;
-            this.defaultVal = defaultVal;
-            optional = false;
-            this.implicitTag = implicitTag;
-        }
-
-        // Repeatability is used for SET OF.  It is package private.
-        private boolean repeatable;
-        void makeRepeatable() {
-            repeatable = true;
-        }
-        boolean isRepeatable() {
-            return repeatable;
-        }
-
-        private boolean optional;
-        public boolean isOptional() {
-            return optional;
-        }
-
-        private Tag implicitTag=null;
-        public Tag getImplicitTag() {
-            return implicitTag;
-        }
-
-        /**
-         * Determines whether the given tag satisfies this SET element.
-         */
-        public boolean tagMatch(Tag tag) {
-            if( implicitTag != null ) {
-                return( implicitTag.equals(tag) );
-            } else {
-                return type.tagMatch(tag);
-            }
-        }
-
-        private ASN1Template type;
-        /**
-         * Returns the template for this element.
-         */
-        public ASN1Template getTemplate() {
-            return type;
-        }
-
-        private ASN1Value defaultVal=null;
-        /**
-         * Returns the default value for this element, if one exists.
-         * Otherwise, returns null.
-         */
-        public ASN1Value getDefault() {
-            return defaultVal;
-        }
-    }
-} // End of SET.Template
-
-/**
- * A Template for decoding SET OF values.
- * Use this if you have a SIZE qualifier on your SET OF.
- * The SET will consume as many instances of type as it can, rather than
- * stopping after the first one. This is equivalent to SIZE (0..MAX).
- * If you need something more restrictive, you can look at what gets parsed
- * and decide whether it's OK or not yourself.
- */
-public static class OF_Template implements ASN1Template {
-
-    private OF_Template() { }
-
-    private Template template;  // a normal SET template
-
-    /**
-     * Creates an OF_Template with the given type. For example:
-     * <pre>
-     * MySet ::= SET OF INTEGER;
-     * </pre>
-     * A <code>MySet</code> template would be constructed with:
-     * <pre>
-     * SET.OF_Template mySetTemplate = new SET.OF_Template( new
-     *                                          INTEGER.Template() );
-     * </pre>
-     */
-    public OF_Template(ASN1Template type) {
-        template = new Template();
-        Template.Element el = new Template.Element( null, type, false );
-        el.makeRepeatable();
-        template.addElement( el );
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    /**
-     * Decodes a <code>SET OF</code> from its BER encoding.
-     */
-    public ASN1Value decode(InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return template.decode(istream);
-    }
-
-    /**
-     * Decodes a <code>SET OF</code> with an implicit tag from its BER
-     * encoding.
-     */
-    public ASN1Value decode(Tag implicitTag, InputStream istream)
-        throws IOException, InvalidBERException
-    {
-        return template.decode(implicitTag, istream);
-    }
-}
-
-    // Test driver for SET
-    public static void main(String args[]) {
-
-      try {
-
-        if(args.length > 0) {
-
-        FileInputStream fin = new FileInputStream( args[0] );
-
-        Template t = new SET.Template();
-
-        t.addElement(new Tag(0), new INTEGER.Template() );
-        t.addElement( new Tag(3), new INTEGER.Template() );
-        t.addOptionalElement( new Tag(4), new INTEGER.Template() );
-        t.addElement( new Tag(5), new INTEGER.Template(), new INTEGER(67) );
-        t.addElement( new Tag(29), new BOOLEAN.Template() );
-        t.addElement( new Tag(30), new BOOLEAN.Template(), new BOOLEAN(false) );
-        t.addElement( new Tag(1), new INTEGER.Template() );
-        t.addElement( new Tag(2), new INTEGER.Template() );
-
-        SET st = (SET) t.decode(new BufferedInputStream(fin) );
-
-        for(int i=0; i < st.size(); i++) {
-            ASN1Value v = st.elementAt(i);
-            if( v instanceof INTEGER ) {
-                INTEGER in = (INTEGER) st.elementAt(i);
-                System.out.println("INTEGER: "+in);
-            } else if( v instanceof BOOLEAN ) {
-                BOOLEAN bo = (BOOLEAN) st.elementAt(i);
-                System.out.println("BOOLEAN: "+bo);
-            } else {
-                System.out.println("Unknown value");
-            }
-        }
-
-        } else {
-
-
-        SET s = new SET();
-        s.addElement( new Tag(0), new INTEGER(255) );
-        s.addElement( new Tag(29), new BOOLEAN(true) );
-        s.addElement( new Tag(1), new INTEGER(-322) );
-        s.addElement( new Tag(2), new INTEGER(0) );
-        s.addElement( new Tag(3), new INTEGER("623423948273") );
-
-        s.encode(System.out);
-
-        }
-
-      } catch( Exception e ) {
-        e.printStackTrace();
-      }
-
-    }
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/Tag.java

@@ -1,211 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.math.BigInteger;
-
-/**
- * Represents an ASN.1 Tag.  A tag consists of a class and a number.
- */
-public class Tag {
-
-    private long num;
-    /**
-     * Returns the tag number.
-     */
-    public long getNum() {
-        return num;
-    }
-
-    private Class tClass;
-    /**
-     * Returns the tag class.
-     */
-    public Class getTagClass() {
-        return tClass;
-    }
-
-    private Tag() { }
-
-    /**
-     * A tag class.
-     */
-    public static final Class UNIVERSAL = Class.UNIVERSAL;
-    /**
-     * A tag class.
-     */
-    public static final Class APPLICATION = Class.APPLICATION;
-    /**
-     * A tag class.
-     */
-    public static final Class CONTEXT_SPECIFIC = Class.CONTEXT_SPECIFIC;
-    /**
-     * A tag class.
-     */
-    public static final Class PRIVATE = Class.PRIVATE;
-
-    /**
-     * The end-of-contents marker for indefinite length encoding.
-     * It is encoded the same as an ASN.1 header whose tag is [UNIVERSAL 0].
-     */
-    public static final Tag END_OF_CONTENTS = new Tag( UNIVERSAL, 0 );
-
-    /**
-     * An alias for END_OF_CONTENTS.
-     */
-    public static final Tag EOC = END_OF_CONTENTS;
-
-    /**
-     * Creates a tag with the given class and number.
-     * @param clazz The class of the tag.
-     * @param num The tag number.
-     */
-    public Tag(Class clazz, long num) {
-        tClass = clazz;
-        this.num = num;
-    }
-
-    /**
-     * Creates a CONTEXT-SPECIFIC tag with the given tag number.
-     * @param num The tag number.
-     */
-    public Tag(long num) {
-        this(Class.CONTEXT_SPECIFIC, num);
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // Tag Instances
-    //
-    // Since grabbing a context-specific tag is a very common operation,
-    // let's make singletons of the most frequently used tags.
-    ///////////////////////////////////////////////////////////////////////
-    private static final int numTagInstances = 10;
-    private static Tag tagInstances[] = new Tag[numTagInstances];
-    static {
-        for(int i=0; i < numTagInstances; i++) {
-            tagInstances[i] = new Tag(i);
-        }
-    }
-
-    /**
-     * Returns an instance of a context-specific tag with the given number.
-     * The returned instance may be singleton.  It is usually more efficient to
-     * call this method than create your own context-specific tag.
-     */
-    public static Tag get(long num) {
-        if( num >= 0 && num < numTagInstances ) {
-            return tagInstances[(int)num];
-        } else {
-            return new Tag(num);
-        }
-    }
-
-    public int hashCode() {
-        return (tClass.toInt() * 131) + (int)num;
-    }
-
-    /**
-     * Compares two tags for equality.  Tags are equal if they have
-     * the same class and tag number.
-     */
-    public boolean equals(Object obj) {
-        if(obj == null) {
-            return false;
-        }
-        if(! (obj instanceof Tag) ) {
-            return false;
-        }
-
-        Tag t = (Tag) obj;
-        if( num == t.num && tClass == t.tClass ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns a String representation of the tag. For example, a tag
-     * whose class was UNIVERSAL and whose number was 16 would return
-     * "UNIVERSAL 16".
-     */
-    public String toString() {
-        return tClass+" "+num;
-    }
-
-    /**
-     * An enumeration of the ASN.1 tag classes.
-     */
-    public static class Class {
-
-        private Class() { }
-        private Class(int enc, String name) {
-            encoding = enc;
-            this.name = name;
-        }
-        private int encoding;
-        private String name;
-
-        public static final Class UNIVERSAL = new Class(0, "UNIVERSAL");
-        public static final Class APPLICATION = new Class(1, "APPLICATION");
-        public static final Class CONTEXT_SPECIFIC =
-            new Class(2, "CONTEXT-SPECIFIC");
-        public static final Class PRIVATE = new Class(3, "PRIVATE");
-
-        public int toInt() {
-            return encoding;
-        }
-
-        public String toString() {
-            return name;
-        }
-
-        /**
-         * @exception InvalidBERException If the given int does not correspond
-         *      to any tag class.
-         */
-        public static Class fromInt(int i) throws InvalidBERException {
-            if( i == 0 ) {
-                return UNIVERSAL;
-            } else if(i == 1) {
-                return APPLICATION;
-            } else if(i == 2) {
-                return CONTEXT_SPECIFIC;
-            } else if(i == 3) {
-                return PRIVATE;
-            } else {
-                throw new InvalidBERException("Invalid tag class: " + i);
-            }
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/TeletexString.java

@@ -1,127 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-
-/**
- * The ASN.1 type <i>TeletexString</i>.
- */
-public class TeletexString extends CharacterString implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.UNIVERSAL, 20);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public TeletexString(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    public TeletexString(String s) throws CharConversionException {
-        super(s);
-    }
-
-    CharConverter getCharConverter() {
-        return new TeletexConverter();
-    }
-
-    /**
-     * Returns a singleton instance of the decoding template for this class.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static final Template templateInstance = new Template();
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-
-    protected Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    protected CharConverter getCharConverter() {
-        return new TeletexConverter();
-    }
-
-    protected CharacterString generateInstance(char[] bytes)
-        throws CharConversionException
-    {
-        return new TeletexString( bytes );
-    }
-
-    protected String typeName() {
-        return "TeletexString";
-    }
-} // end of Template
-
-    private static class TeletexConverter implements CharConverter {
-
-        public char[] byteToChar(byte[] bytes, int offset, int len)
-            throws CharConversionException
-        {
-            char[] chars = new char[len];
-
-            int b;
-            int c;
-            for(b=offset, c=0; c < len; b++, c++) {
-                chars[c] = (char) (bytes[b] & 0xff);
-            }
-            return chars;
-        }
-
-        public byte[] charToByte(char[] chars, int offset, int len)
-            throws CharConversionException
-        {
-            byte[] bytes = new byte[len];
-
-            int b;
-            int c;
-            for(b=0, c=offset; b < len; b++, c++) {
-                if( (chars[c]&0xff00) != 0 ) {
-                    throw new CharConversionException("Invalid character for"+
-                        " TeletexString");
-                }
-                bytes[b] = (byte) (chars[c] & 0xff);
-            }
-            return bytes;
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/TimeBase.java

@@ -1,317 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-import org.mozilla.jss.util.Assert;
-
-public abstract class TimeBase implements ASN1Value {
-
-    public static final Form FORM = Form.PRIMITIVE;
-    abstract public Tag getTag();
-
-    private Date date;
-
-    public Date toDate() {
-        return date;
-    }
-
-    abstract protected boolean isUTC();
-
-    private TimeBase() { }
-
-    public TimeBase(Date date) {
-        this.date = date;
-    }
-
-    public void encode(OutputStream ostream) throws IOException {
-        encode(getTag(), ostream);
-    }
-
-    /**
-     * Write the DER-encoding of this TimeBase.
-     */
-    public void encode(Tag implicit, OutputStream ostream) throws IOException {
-
-        if( isUTC() ) {
-            // length will always be 13
-            (new ASN1Header(implicit, FORM, 13)).encode(ostream);
-        } else {
-            // length will always be 15
-            (new ASN1Header(implicit, FORM, 15)).encode(ostream);
-        }
-        
-        int i=0, val;
-
-        // DER-encoding mandates GMT time zone
-        Calendar cal = Calendar.getInstance( TimeZone.getTimeZone("GMT") );
-        cal.setTime( date );
-
-        if( isUTC() ) {
-            val = cal.get(Calendar.YEAR);
-            ostream.write( ((val % 100) / 10) + '0' );
-            ostream.write(  (val % 10) + '0' );
-        } else {
-            val = cal.get(Calendar.YEAR);
-            ostream.write( ((val % 10000) / 1000) + '0' );
-            ostream.write( ((val % 1000) / 100) + '0' );
-            ostream.write( ((val % 100) / 10) + '0' );
-            ostream.write(  (val % 10) + '0' );
-        }
-
-        val = cal.get(Calendar.MONTH) + 1;
-        Assert._assert( val >= 1 && val <= 12 );
-        ostream.write( (val / 10) + '0' );
-        ostream.write( (val % 10) + '0' );
-
-        val = cal.get(Calendar.DAY_OF_MONTH);
-        Assert._assert( val >=1 && val <= 31 );
-        ostream.write( (val / 10) + '0' );
-        ostream.write( (val % 10) + '0' );
-
-        val = cal.get(Calendar.HOUR_OF_DAY);
-        Assert._assert( val >= 0 && val <= 23 );
-        ostream.write( (val / 10) + '0' );
-        ostream.write( (val % 10) + '0' );
-
-        val = cal.get(Calendar.MINUTE);
-        Assert._assert( val >=0 && val <= 59 );
-        ostream.write( (val / 10) + '0' );
-        ostream.write( (val % 10) + '0' );
-
-        val = cal.get(Calendar.SECOND);
-        Assert._assert( val >= 0 && val <= 59 );
-        ostream.write( (val / 10) + '0' );
-        ostream.write( (val % 10) + '0' );
-
-        ostream.write('Z');
-    }
-
-    public abstract static class Template {
-
-        protected abstract boolean isUTC();
-
-        protected abstract Tag getTag();
-
-        protected abstract TimeBase generateInstance(Date date);
-
-        public boolean tagMatch(Tag tag) {
-            return getTag().equals(tag);
-        }
-
-        public ASN1Value decode(InputStream istream)
-            throws IOException, InvalidBERException
-        {
-            return decode(getTag(), istream);
-        }
-
-        public ASN1Value decode(Tag implicitTag, InputStream istream)
-            throws IOException, InvalidBERException
-        {
-            PrintableString.Template pst = new PrintableString.Template();
-            PrintableString ps = (PrintableString)
-                                        pst.decode(implicitTag, istream);
-            char[] chars = ps.toCharArray();
-            int i=0;
-            int year, month, day, hour, minute, second, hourOff, minOff;
-
-            //////////////////////////////////////////
-            // Get year
-            //
-            if( isUTC() ) {
-                checkBounds(i, 2, chars.length);
-                year = (chars[i] - '0') * 10;
-                year += chars[i+1] - '0';
-
-                // Y2K HACK!!!!! But this is what the spec says to do.
-                // The range is 1970 to 2069
-                if( year < 70 ) {
-                    year += 2000;
-                } else {
-                    year += 1900;
-                }
-                i += 2;
-            } else {
-                checkBounds(i, 4, chars.length);
-                year = (chars[i] - '0') * 1000;
-                year += (chars[i+1] - '0') * 100;
-                year += (chars[i+2] - '0') * 10;
-                year += (chars[i+3] - '0');
-                checkRange(year, 0, 9999, "year");
-                i += 4;
-            }
-            
-            //////////////////////////////////////////
-            // get month
-            //
-            month = 0;
-            checkBounds(i, 2, chars.length);
-            month = (chars[i] - '0') * 10;
-            month += chars[i+1] - '0';
-            checkRange(month, 1, 12, "month");
-            month--; // Java months start at 0
-            i += 2;
-
-            //////////////////////////////////////////
-            // get day
-            //
-            checkBounds(i, 2, chars.length);
-            day = (chars[i] - '0') * 10;
-            day += chars[i+1] - '0';
-            checkRange(day, 1, 31, "day");
-            i += 2;
-
-            //////////////////////////////////////////
-            // get hour
-            //
-            checkBounds(i, 2, chars.length);
-            hour = (chars[i] - '0') * 10;
-            hour += chars[i+1] - '0';
-            checkRange(hour, 0, 23, "hour");
-            i += 2;
-
-            //////////////////////////////////////////
-            // get minute
-            //
-            checkBounds(i, 2, chars.length);
-            minute = (chars[i] - '0') * 10;
-            minute += chars[i+1] - '0';
-            checkRange(minute, 0, 59, "minute");
-            i += 2;
-
-            //////////////////////////////////////////
-            // get second, if it's there
-            //
-            if( i < chars.length  && chars[i] >= '0' && chars[i] <= '9' ) {
-                checkBounds(i, 2, chars.length);
-                second = (chars[i] - '0') * 10;
-                second += chars[i+1] - '0';
-                checkRange(second, 0, 59, "second");
-                i += 2;
-            } else {
-                second = 0;
-            }
-
-            //////////////////////////////////////////
-            // Skip milliseconds for GeneralizedTime.  There are no
-            // milliseconds in UTCTime.
-            //
-            if( ! isUTC() ) {
-                while(  i < chars.length &&
-                    chars[i] != '+' &&
-                    chars[i] != '-' &&
-                    chars[i] != 'Z' )
-                {
-                    i++;
-                }
-            }
-
-            //////////////////////////////////////////
-            // get time zone
-            //
-            TimeZone tz;
-            if( i < chars.length ) {
-                checkBounds(i, 1, chars.length);
-                if( chars[i] == '+' || chars[i] == '-') {
-                    checkBounds(i+1, 4, chars.length);
-                    hourOff = (chars[i+1] - '0') * 10;
-                    hourOff += chars[i+2] - '0';
-                    minOff = (chars[i+3] - '0') * 10;
-                    minOff += chars[i+4] - '0';
-                    i += 5;
-                    checkRange(hourOff, 0, 23, "hour offset");
-                    checkRange(minOff, 0, 59, "minute offset");
-                    if( chars[i] == '-' ) {
-                        hourOff = -hourOff;
-                        minOff = -minOff;
-                    }
-                    tz = (TimeZone) TimeZone.getTimeZone("GMT").clone();
-                    tz.setRawOffset( ((hourOff*60)+minOff)*60*1000 );
-                } else if( chars[i] == 'Z' ) {
-                    i += 1;
-                    hourOff = minOff = 0;
-                    tz = (TimeZone) TimeZone.getTimeZone("GMT").clone();
-                } else {
-                    throw new InvalidBERException("Invalid character "+
-                        chars[i]);
-                }
-            } else {
-                if( isUTC() ) {
-                    // Only UTC requires timezone
-                    throw new InvalidBERException("no timezone specified for"+
-                        " UTCTime");
-                }
-                // No timezone specified, use local time.
-                // This is generally a bad idea, because who knows what the
-                // local timezone is? But the spec allows it.
-                tz = TimeZone.getDefault();
-            }
-
-            // make sure we ate all the characters, there were no stragglers
-            // at the end
-            if( i != chars.length ) {
-                throw new InvalidBERException("Extra characters at end");
-            }
-
-            // Create a calendar object from the date and time zone.
-            Calendar cal = Calendar.getInstance( tz );
-            cal.set(year, month, day, hour, minute, second);
-            
-            return generateInstance(cal.getTime());
-        }
-
-        private static void
-        checkRange(int val, int low, int high, String field)
-            throws InvalidBERException
-        {
-            if( val < low || val > high ) {
-                throw new InvalidBERException("Invalid "+field);
-            }
-        }
-
-        private static void
-        checkBounds(int index, int increment, int bound)
-            throws InvalidBERException
-        {
-            if(index+increment > bound) {
-                throw new InvalidBERException("Too few characters in " +
-                    "TimeBase");
-            }
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/UTCTime.java

@@ -1,78 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.IOException;
-import java.util.Date;
-
-public class UTCTime extends TimeBase implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.UNIVERSAL, 23);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public UTCTime(Date date) {
-        super(date);
-    }
-
-    protected boolean isUTC() {
-        return true;
-    }
-
-    private static final UTCTime.Template templateInstance =
-                                                new UTCTime.Template();
-    public static UTCTime.Template getTemplate() {
-        return templateInstance;
-    }
-
-    public static class Template extends TimeBase.Template
-        implements ASN1Template
-    {
-        protected Tag getTag() {
-            return TAG;
-        }
-
-        public boolean tagMatch(Tag tag) {
-            return TAG.equals(tag);
-        }
-
-        protected boolean isUTC() {
-            return true;
-        }
-
-        protected TimeBase generateInstance(Date date) {
-            return new UTCTime(date);
-        }
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/UTF8String.java

@@ -1,129 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-import java.io.UnsupportedEncodingException;
-import org.mozilla.jss.util.Assert;
-
-public class UTF8String extends CharacterString implements ASN1Value {
-
-    public UTF8String(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    public UTF8String(String s) throws CharConversionException {
-        super(s);
-    }
-
-    CharConverter getCharConverter() {
-        return new UTF8Converter();
-    }
-
-    public static final Tag TAG = new Tag( Tag.UNIVERSAL, 12 );
-    public static final Form FORM = Form.PRIMITIVE;
-
-    public Tag getTag() {
-        return TAG;
-    }
-
-    private static final Template templateInstance = new Template();
-    /**
-     * Returns a singleton instance of UTF8String.Template. This is more
-     * efficient than creating a new UTF8String.Template.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-    protected Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    protected CharConverter getCharConverter() {
-        return new UTF8Converter();
-    }
-
-    protected CharacterString generateInstance(char[] chars)
-        throws CharConversionException
-    {
-        return new UTF8String(chars);
-    }
-
-    protected String typeName() {
-        return "UTF8String";
-    }
-}
-
-private static class UTF8Converter implements CharConverter {
-
-    public char[] byteToChar(byte[] bytes, int offset, int len)
-        throws CharConversionException
-    {
-        try {
-
-            String s = new String(bytes, offset, len, "UTF8");
-            return s.toCharArray();
-
-        } catch( UnsupportedEncodingException e ) {
-            String err = "Unable to find UTF8 encoding mechanism";
-            Assert.notReached(err);
-            throw new CharConversionException(err);
-        }
-    }
-
-    public byte[] charToByte(char[] chars, int offset, int len)
-        throws CharConversionException
-    {
-        try {
-
-            String s = new String(chars, offset, len);
-            return s.getBytes("UTF8");
-
-        } catch( UnsupportedEncodingException e ) {
-            String err = "Unable to find UTF8 encoding mechanism";
-            Assert.notReached(err);
-            throw new CharConversionException(err);
-        }
-    }
-} // end of char converter
-
-}

mozilla/security/jss/org/mozilla/jss/asn1/UniversalString.java

@@ -1,229 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.asn1;
-
-import java.io.CharConversionException;
-import java.io.CharArrayWriter;
-import java.io.ByteArrayOutputStream;
-
-/**
- * A UCS4 string.
- */
-public class UniversalString extends CharacterString implements ASN1Value {
-
-    public static final Tag TAG = new Tag(Tag.UNIVERSAL, 28);
-    public Tag getTag() {
-        return TAG;
-    }
-
-    public UniversalString(char[] chars) throws CharConversionException {
-        super(chars);
-    }
-
-    public UniversalString(String s) throws CharConversionException {
-        super(s);
-    }
-
-    CharConverter getCharConverter() {
-        return new UniversalConverter();
-    }
-
-    /**
-     * Returns a singleton instance of the decoding template for this class.
-     */
-    public static Template getTemplate() {
-        return templateInstance;
-    }
-    private static final Template templateInstance = new Template();
-
-// nested class
-public static class Template
-    extends CharacterString.Template implements ASN1Template
-{
-    protected Tag getTag() {
-        return TAG;
-    }
-
-    public boolean tagMatch(Tag tag) {
-        return TAG.equals(tag);
-    }
-
-    protected CharConverter getCharConverter() {
-        return new UniversalConverter();
-    }
-
-    protected CharacterString generateInstance(char[] chars)
-        throws CharConversionException
-    {
-        return new UniversalString( chars );
-    }
-
-    protected String typeName() {
-        return "UniversalString";
-    }
-} // end of Template
-
-    /**
-     * A class for converting between Unicode and UCS4.
-     */
-    private static class UniversalConverter implements CharConverter {
-
-        // This is the maximum a UCS4 character can be if it has
-        // straight Unicode inside it.
-        public static final int MAX_UNICODE = 0x0000ffff;
-
-        // This is the maximum a UCS4 character can be if it is UTF-16
-        // encoded. UTF-16 encoding allows UCS4 chars to be stored across
-        // two Unicode chars.
-        public static final int MAX_UTF16 = 0x0010ffff;
-
-        // This Unicode character is used to represent an unknown character
-        // in some other encoding.  We use it for UCS4 characters that
-        // are not a part of normal Unicode and also cannot be encoded
-        // across two Unicode chars with UTF-16.
-        public static final char REPLACEMENT_CHAR = 0xfffd;
-
-        // This is the base for UCS4 characters that can be mapped with UTF16.
-        public static final int UTF16_BASE = 0x00100000;
-
-
-        // In UTF16 encoding, each Unicode character has 10 bits of
-        // information.
-        public static final int HALF_SHIFT = 10;
-
-        // The lowest 10 bits
-        public static final int HALF_MASK = 0x3ff;
-
-        public static final int UTF16_HIGH_START = 0xd800;
-        public static final int UTF16_HIGH_END = 0xdcff;
-        public static final int UTF16_LOW_START = 0xdc00;
-        public static final int UTF16_LOW_END = 0xdfff;
-
-        /**
-         * Turns big-endian UCS4 characters into Unicode Java characters
-         */
-        public char[] byteToChar(byte[] bytes, int offset, int len)
-            throws CharConversionException
-        {
-            // Each UCS4 character is 4 bytes. Most UCS4 characters will
-            // map to one Unicode character. The exception is UTF-16
-            // characters, which map to two Unicode characters.
-            CharArrayWriter out = new CharArrayWriter( len / 4 );
-
-            int end = offset + len;
-
-            while( offset < end ) {
-                // eat 4 bytes and make a UCS4 char
-                if( end - offset < 4 ) {
-                    throw new CharConversionException("input exhausted");
-                }
-                int ucs4 = (bytes[offset++] & 0xff) << 24;
-                ucs4 += (bytes[offset++] & 0xff) << 16;
-                ucs4 += (bytes[offset++] & 0xff) << 8;
-                ucs4 += bytes[offset++] & 0xff;
-
-                // convert UCS4 to Unicode
-                if( ucs4 <= MAX_UNICODE ) {
-                    // Unicode is a subset of UCS4, and this char is
-                    // in the common subset.  Just chop off the unused top
-                    // two bytes.
-
-                    out.write( ucs4 & 0xffff );
-
-                } else if( ucs4 <= MAX_UTF16 ) {
-                    // This UCS4 char is not in Unicode, but can be encoded
-                    // into two Unicode chars using UTF16.
-
-                    ucs4 -= UTF16_BASE;
-                    out.write( (ucs4 >>> HALF_SHIFT) + UTF16_HIGH_START );
-                    out.write( (ucs4 & HALF_MASK) + UTF16_LOW_START );
-
-                } else {
-                    // This character is not in Unicode or UTF16.  We can't
-                    // provide a suitable translation, so use the Unicode
-                    // replacement char.
-
-                    out.write( REPLACEMENT_CHAR );
-
-                }
-            }
-
-            return out.toCharArray();
-        }
-
-        // Convert Unicode chars to UCS4 chars
-        public byte[] charToByte(char[] chars, int offset, int len)
-            throws CharConversionException
-        {
-            ByteArrayOutputStream out = new ByteArrayOutputStream(len * 4);
-
-            int end = offset + len;
-
-            while( offset < end ) {
-
-                char c = chars[offset++];
-                int ucs4;
-
-                if( c >= UTF16_HIGH_START && c <= UTF16_HIGH_END ) {
-                    // This is the beginning of a UTF16 char
-                    if( offset == end ) {
-                        throw new CharConversionException("input exhausted");
-                    }
-                    char low = chars[offset++];
-
-                    // make sure the next char is the low half of a UTF16 char
-                    if( low < UTF16_LOW_START || low > UTF16_LOW_END ) {
-                        throw new CharConversionException("UTF16 high "+
-                            "character not followed by a UTF16 low character");
-                    }
-
-                    ucs4 = UTF16_BASE;
-                    ucs4 += (c - UTF16_HIGH_START) << HALF_SHIFT;
-                    ucs4 += low - UTF16_LOW_START;
-
-                } else {
-                    // this is a normal Unicode char
-                    ucs4 = (c & 0x0000ffff);
-                }
-
-                out.write( (ucs4 & 0xff000000) >>> 24 );
-                out.write( (ucs4 & 0x00ff0000) >>> 16 );
-                out.write( (ucs4 & 0x0000ff00) >>> 8  );
-                out.write( (ucs4 & 0x000000ff)        );
-            }
-
-            return out.toByteArray();
-        }
-
-    }
-}

mozilla/security/jss/org/mozilla/jss/asn1/manifest.mn

@@ -1,110 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-CORE_DEPTH = ../../../../..
- 
-MODULE = jss
- 
-NS_USE_JDK = 1
-
-PACKAGE =       org/mozilla/jss/asn1
-
-CLASSES = 											\
-            ANY                                     \
-            ASN1Header                              \
-            ASN1Template                            \
-            ASN1Util                                \
-            ASN1Value                               \
-            BIT_STRING                              \
-            BMPString                               \
-            BOOLEAN                                 \
-            CharacterString                         \
-            CharConverter                           \
-            CHOICE                                  \
-            CountingStream                          \
-            ENUMERATED                              \
-            EXPLICIT                                \
-            FieldNotPresentException                \
-            Form                                    \
-            GeneralizedTime                         \
-            IA5String                               \
-            INTEGER                                 \
-            InvalidBERException                     \
-            NULL                                    \
-            OBJECT_IDENTIFIER                       \
-            OCTET_STRING                            \
-            PrintableString                         \
-            SEQUENCE                                \
-            SET                                     \
-            Tag                                     \
-            TeletexString                           \
-            TimeBase                                \
-            UniversalString                         \
-            UTCTime                                 \
-            UTF8String                              \
-			$(NULL)
-
-JSRCS = 											\
-            ANY.java                                \
-            ASN1Header.java                         \
-            ASN1Template.java                       \
-            ASN1Util.java                           \
-            ASN1Value.java                          \
-            BIT_STRING.java                         \
-            BMPString.java                          \
-            BOOLEAN.java                            \
-            CharacterString.java                    \
-            CharConverter.java                      \
-            CHOICE.java                             \
-            CountingStream.java                     \
-            ENUMERATED.java                         \
-            EXPLICIT.java                           \
-            FieldNotPresentException.java           \
-            Form.java                               \
-            GeneralizedTime.java                    \
-            IA5String.java                          \
-            INTEGER.java                            \
-            InvalidBERException.java                \
-            NULL.java                               \
-            OBJECT_IDENTIFIER.java                  \
-            OCTET_STRING.java                       \
-            PrintableString.java                    \
-            SEQUENCE.java                           \
-            SET.java                                \
-            Tag.java                                \
-            TeletexString.java                      \
-            TimeBase.java                           \
-            UniversalString.java                    \
-            UTCTime.java                            \
-            UTF8String.java                         \
-			$(NULL)

mozilla/security/jss/org/mozilla/jss/asn1/package.html

@@ -1,37 +0,0 @@
-<html>
-<!--
-   - The contents of this file are subject to the Mozilla Public
-   - License Version 1.1 (the "License"); you may not use this file
-   - except in compliance with the License. You may obtain a copy of
-   - the License at http://www.mozilla.org/MPL/
-   - 
-   - Software distributed under the License is distributed on an "AS
-   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-   - implied. See the License for the specific language governing
-   - rights and limitations under the License.
-   - 
-   - The Original Code is the Netscape Security Services for Java.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corporation.  Portions created by Netscape are 
-   - Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   - 
-   - Alternatively, the contents of this file may be used under the
-   - terms of the GNU General Public License Version 2 or later (the
-   - "GPL"), in which case the provisions of the GPL are applicable 
-   - instead of those above.  If you wish to allow use of your 
-   - version of this file only under the terms of the GPL and not to
-   - allow others to use your version of this file under the MPL,
-   - indicate your decision by deleting the provisions above and
-   - replace them with the notice and other provisions required by
-   - the GPL.  If you do not delete the provisions above, a recipient
-   - may use your version of this file under either the MPL or the
-   - GPL.
-  -->
-<body>
-ASN.1 structures, BER decoding, and DER encoding.
-</body>
-</html>

mozilla/security/jss/org/mozilla/jss/config.mk

@@ -1,37 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-TARGETS=$(LIBRARY)
-SHARED_LIBRARY=
-IMPORT_LIBRARY=
-
-NO_MD_RELEASE=1

mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.c

@@ -1,268 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include <seccomon.h>
-#include <secoidt.h>
-#include <pkcs11t.h>
-#include <secmodt.h>
-#include <nspr.h>
-#include <jni.h>
-#include <java_ids.h>
-#include <pk11func.h>
-
-#include <jssutil.h>
-
-#include "_jni/org_mozilla_jss_crypto_Algorithm.h"
-#include "Algorithm.h"
-
-static PRStatus
-getAlgInfo(JNIEnv *env, jobject alg, JSS_AlgInfo *info);
-
-/***********************************************************************
-**
-**  Algorithm indices.  This must be kept in sync with the algorithm
-**	tags in the Algorithm class.
-**  We only store CKMs as a last resort if there is no corresponding
-**  SEC_OID.
-**/
-JSS_AlgInfo JSS_AlgTable[NUM_ALGS] = {
-/* 0 */		{SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION, SEC_OID_TAG},
-/* 1 */		{SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION, SEC_OID_TAG},
-/* 2 */		{SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION, SEC_OID_TAG},
-/* 3 */		{SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST, SEC_OID_TAG},
-/* 4 */     {SEC_OID_PKCS1_RSA_ENCRYPTION, SEC_OID_TAG},
-/* 5 */     {CKM_RSA_PKCS_KEY_PAIR_GEN, PK11_MECH},
-/* 6 */     {CKM_DSA_KEY_PAIR_GEN, PK11_MECH},
-/* 7 */     {SEC_OID_ANSIX9_DSA_SIGNATURE, SEC_OID_TAG},
-/* 8 */     {SEC_OID_RC4, SEC_OID_TAG},
-/* 9 */     {SEC_OID_DES_ECB, SEC_OID_TAG},
-/* 10 */    {SEC_OID_DES_CBC, SEC_OID_TAG},
-/* 11 */    {CKM_DES_CBC_PAD, PK11_MECH},
-/* 12 */    {CKM_DES3_ECB, PK11_MECH},
-/* 13 */    {SEC_OID_DES_EDE3_CBC, SEC_OID_TAG},
-/* 14 */    {CKM_DES3_CBC_PAD, PK11_MECH},
-/* 15 */    {CKM_DES_KEY_GEN, PK11_MECH},
-/* 16 */    {CKM_DES3_KEY_GEN, PK11_MECH},
-/* 17 */    {CKM_RC4_KEY_GEN, PK11_MECH},
-/* 18 */    {SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC, SEC_OID_TAG},
-/* 19 */    {SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC, SEC_OID_TAG},
-/* 20 */    {SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC, SEC_OID_TAG},
-/* 21 */    {SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4, SEC_OID_TAG},
-/* 22 */    {SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4, SEC_OID_TAG},
-/* 23 */    {SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC,
-                        SEC_OID_TAG},
-/* 24 */    {SEC_OID_MD2, SEC_OID_TAG},
-/* 25 */    {SEC_OID_MD5, SEC_OID_TAG},
-/* 26 */    {SEC_OID_SHA1, SEC_OID_TAG},
-/* 27 */    {CKM_SHA_1_HMAC, PK11_MECH},
-/* 28 */    {SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC, SEC_OID_TAG},
-/* 29 */    {SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC, SEC_OID_TAG},
-/* 30 */    {SEC_OID_RC2_CBC, SEC_OID_TAG},
-/* 31 */    {CKM_PBA_SHA1_WITH_SHA1_HMAC, PK11_MECH},
-/* 32 */    {CKM_AES_KEY_GEN, PK11_MECH},
-/* 33 */    {CKM_AES_ECB, PK11_MECH},
-/* 34 */    {CKM_AES_CBC, PK11_MECH},
-/* 35 */    {CKM_AES_CBC_PAD, PK11_MECH}
-
-/* REMEMBER TO UPDATE NUM_ALGS!!! */
-};
-
-/***********************************************************************
- *
- * J S S _ g e t P K 1 1 M e c h F r o m A l g
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * RETURNS
- *          CK_MECHANISM_TYPE corresponding to this algorithm, or
- *          CKM_INVALID_MECHANISM if none exists.
- */
-CK_MECHANISM_TYPE
-JSS_getPK11MechFromAlg(JNIEnv *env, jobject alg)
-{
-    JSS_AlgInfo info;
-
-    if( getAlgInfo(env, alg, &info) != PR_SUCCESS) {
-        return CKM_INVALID_MECHANISM;
-    }
-    if( info.type == PK11_MECH ) {
-        return (CK_MECHANISM_TYPE) info.val;
-    } else {
-        PR_ASSERT( info.type == SEC_OID_TAG );
-        return PK11_AlgtagToMechanism( (SECOidTag) info.val);
-    }
-}
-
-/***********************************************************************
- *
- * J S S _ g e t O i d T a g F r o m A l g
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * RETURNS
- *      SECOidTag corresponding to this algorithm, or SEC_OID_UNKNOWN
- *      if none was found.
- */
-SECOidTag
-JSS_getOidTagFromAlg(JNIEnv *env, jobject alg)
-{
-    JSS_AlgInfo info;
-
-    if( getAlgInfo(env, alg, &info) != PR_SUCCESS) {
-        return SEC_OID_UNKNOWN;
-    }
-    if( info.type == SEC_OID_TAG ) {
-        return (SECOidTag) info.val;
-    } else {
-        PR_ASSERT( info.type == PK11_MECH );
-        /* We only store things as PK11 mechanisms as a last resort if
-         * there is no corresponding sec oid tag. */
-        return SEC_OID_UNKNOWN;
-    }
-}
-
-/***********************************************************************
- *
- * J S S _ g e t A l g I n d e x
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * RETURNS
- *      The index obtained from the algorithm, or -1 if an exception was
- *      thrown.
- */
-static jint
-getAlgIndex(JNIEnv *env, jobject alg)
-{
-    jclass algClass;
-	jint index=-1;
-    jfieldID indexField;
-
-    PR_ASSERT(env!=NULL && alg!=NULL);
-
-    algClass = (*env)->GetObjectClass(env, alg);
-
-#ifdef DEBUG
-    /* Make sure this really is an Algorithm. */
-    {
-    jclass realClass = ((*env)->FindClass(env, ALGORITHM_CLASS_NAME));
-    PR_ASSERT( (*env)->IsInstanceOf(env, alg, realClass) );
-    }
-#endif
-
-    indexField = (*env)->GetFieldID(
-                                    env,
-                                    algClass,
-                                    OID_INDEX_FIELD_NAME,
-                                    OID_INDEX_FIELD_SIG);
-    if(indexField==NULL) {
-        ASSERT_OUTOFMEM(env);
-        goto finish;
-    }
-
-    index = (*env)->GetIntField(env, alg, indexField);
-	PR_ASSERT( (index >= 0) && (index < NUM_ALGS) );
-
-finish:
-    return index;
-}
-
-/***********************************************************************
- *
- * J S S _ g e t E n u m F r o m A l g
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * OUTPUTS
- *      info
- *          Pointer to a JSS_AlgInfo which will get the information about
- *          this algorithm, if it is found.  Must not be NULL.
- * RETURNS
- *      PR_SUCCESS if the enum was found, otherwise PR_FAILURE.
- */
-static PRStatus
-getAlgInfo(JNIEnv *env, jobject alg, JSS_AlgInfo *info)
-{
-    jint index;
-    PRStatus status;
-
-    PR_ASSERT(env!=NULL && alg!=NULL && info!=NULL);
-
-    index = getAlgIndex(env, alg);
-    if( index == -1 ) {
-        goto finish;
-    }
-	*info = JSS_AlgTable[index];
-    status = PR_SUCCESS;
-
-finish:
-    return status;
-}
-
-/***********************************************************************
- *
- * EncryptionAlgorithm.getIVLength
- *
- */
-JNIEXPORT jint JNICALL
-Java_org_mozilla_jss_crypto_EncryptionAlgorithm_getIVLength
-    (JNIEnv *env, jobject this)
-{
-    CK_MECHANISM_TYPE mech;
-
-    mech = JSS_getPK11MechFromAlg(env, this);
-
-    if( mech == CKM_INVALID_MECHANISM ) {
-        PR_ASSERT(PR_FALSE);
-        return 0;
-    } else {
-        return PK11_GetIVLength(mech);
-    }
-}
-
-/*
- * This must be synchronized with SymmetricKey.Usage
- */
-CK_ULONG JSS_symkeyUsage[] = {
-    CKA_ENCRYPT,        /* 0 */
-    CKA_DECRYPT,        /* 1 */
-    CKA_WRAP,           /* 2 */
-    CKA_UNWRAP,         /* 3 */
-    CKA_SIGN,           /* 4 */
-    CKA_VERIFY,         /* 5 */
-    0UL
-};

mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.h

@@ -1,91 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-/* These headers must be included before this header:
-#include <secoidt.h>
-#include <pkcs11t.h>
-#include <jni.h>
-#include <Policy.h>
-*/
-
-#ifndef JSS_ALGORITHM_H
-#define JSS_ALGORITHM_H
-
-PR_BEGIN_EXTERN_C
-
-typedef enum JSS_AlgType {
-    PK11_MECH,      /* CK_MECHANISM_TYPE    */
-    SEC_OID_TAG     /* SECOidTag            */
-} JSS_AlgType;
-
-typedef struct JSS_AlgInfoStr {
-    unsigned long val; /* either a CK_MECHANISM_TYPE or a SECOidTag */
-    JSS_AlgType type;
-} JSS_AlgInfo;
-
-#define NUM_ALGS 36
-
-extern JSS_AlgInfo JSS_AlgTable[];
-extern CK_ULONG JSS_symkeyUsage[];
-
-/***********************************************************************
- *
- * J S S _ g e t O i d T a g F r o m A l g
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * RETURNS
- *      SECOidTag corresponding to this algorithm, or SEC_OID_UNKNOWN
- *      if none was found.
- */
-SECOidTag
-JSS_getOidTagFromAlg(JNIEnv *env, jobject alg);
-
-/***********************************************************************
- *
- * J S S _ g e t P K 1 1 M e c h F r o m A l g
- *
- * INPUTS
- *      alg
- *          An org.mozilla.jss.Algorithm object. Must not be NULL.
- * RETURNS
- *          CK_MECHANISM_TYPE corresponding to this algorithm, or
- *          CKM_INVALID_MECHANISM if none was found.
- */
-CK_MECHANISM_TYPE
-JSS_getPK11MechFromAlg(JNIEnv *env, jobject alg);
-
-PR_END_EXTERN_C
-
-#endif

mozilla/security/jss/org/mozilla/jss/crypto/Algorithm.java

@@ -1,215 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Represents a cryptographic algorithm.
- * @see EncryptionAlgorithm
- * @see SignatureAlgorithm
- */
-public class Algorithm {
-
-	private Algorithm() { }
-
-    /**
-     * @param oidIndex Index of the oid that this algorithm represents.
-     * @param name A String representation of the Algorithm.
-     */
-    protected Algorithm(int oidIndex, String name) {
-        this.oidIndex = oidIndex;
-		this.name = name;
-    }
-
-    /**
-     * @param oidIndex Index of the oid that this algorithm represents.
-     * @param name A String representation of the Algorithm.
-     * @param oid The object identifier for this Algorithm.
-     */
-    protected Algorithm(int oidIndex, String name, OBJECT_IDENTIFIER oid) {
-        this(oidIndex, name);
-        this.oid = oid;
-    }
-
-    protected Algorithm(int oidIndex, String name, OBJECT_IDENTIFIER oid,
-                        Class paramClass)
-    {
-        this(oidIndex, name, oid);
-        if( paramClass == null ) {
-            this.parameterClasses = new Class[0];
-        } else {
-            this.parameterClasses = new Class[1];
-            this.parameterClasses[0] = paramClass;
-        }
-    }
-
-    protected Algorithm(int oidIndex, String name, OBJECT_IDENTIFIER oid,
-                        Class []paramClasses)
-    {
-        this(oidIndex, name, oid);
-        if( paramClasses != null ) {
-            this.parameterClasses = paramClasses;
-        }
-    }
-
-	/**
-	 * Returns a String representation of the algorithm.
-	 */
-	public String toString() {
-		return name;
-	}
-
-    /**
-     * Returns the object identifier for this algorithm.
-     * @exception NoSuchAlgorithmException If no OID is registered for this
-     *      algorithm.
-     */
-    public OBJECT_IDENTIFIER toOID() throws NoSuchAlgorithmException {
-        if( oid == null ) {
-            throw new NoSuchAlgorithmException();
-        } else {
-            return oid;
-        }
-    }
-
-    /**
-     * The type of parameter that this algorithm expects.  Returns
-     *   <code>null</code> if this algorithm does not take any parameters.
-     * If the algorithm can accept more than one type of parameter,
-     *   this method returns only one of them. It is better to call
-     *   <tt>getParameterClasses()</tt>.
-     * @deprecated Call <tt>getParameterClasses()</tt> instead.
-     */
-    public Class getParameterClass() {
-        if( parameterClasses.length == 0) {
-            return null;
-        } else {
-            return parameterClasses[0];
-        }
-    }
-
-    /**
-     * The types of parameter that this algorithm expects.  Returns
-     *   <code>null</code> if this algorithm does not take any parameters.
-     */
-    public Class[] getParameterClasses() {
-        return (Class[]) parameterClasses.clone();
-    }
-
-    /**
-     * Returns <tt>true</tt> if the given Object can be used as a parameter
-     * for this algorithm.
-     * <p>If <tt>null</tt> is passed in, this method will return <tt>true</tt>
-     *      if this algorithm takes no parameters, and <tt>false</tt>
-     *      if this algorithm does take parameters.
-     */
-    public boolean isValidParameterObject(Object o) {
-        if( o == null ) {
-            return (parameterClasses.length == 0);
-        }
-        if( parameterClasses.length == 0 ){
-            return false;
-        }
-        Class c = o.getClass();
-        for( int i = 0; i < parameterClasses.length; ++i) {
-            if( c.equals( parameterClasses[i] ) ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Index into the SECOidTag array in Algorithm.c.
-     */
-    protected int oidIndex;
-	String name;
-    protected OBJECT_IDENTIFIER oid;
-    private Class[] parameterClasses=new Class[0];
-
-    //////////////////////////////////////////////////////////////
-    // Algorithm OIDs
-    //////////////////////////////////////////////////////////////
-    static final OBJECT_IDENTIFIER ANSI_X9_ALGORITHM = 
-        new OBJECT_IDENTIFIER( new long[] { 1, 2, 840, 10040, 4 } );
-
-    // Algorithm indices.  These must be kept in sync with the
-    // algorithm array in Algorithm.c.
-    protected static final short SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION=0;
-    protected static final short SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION=1;
-    protected static final short SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION=2;
-    protected static final short SEC_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST=3;
-    protected static final short SEC_OID_PKCS1_RSA_ENCRYPTION=4;
-    protected static final short CKM_RSA_PKCS_KEY_PAIR_GEN=5;
-    protected static final short CKM_DSA_KEY_PAIR_GEN=6;
-    protected static final short SEC_OID_ANSIX9_DSA_SIGNATURE=7;
-    protected static final short SEC_OID_RC4=8;
-    protected static final short SEC_OID_DES_ECB=9;
-    protected static final short SEC_OID_DES_CBC=10;
-    protected static final short CKM_DES_CBC_PAD=11;
-    protected static final short CKM_DES3_ECB=12;
-    protected static final short SEC_OID_DES_EDE3_CBC=13;
-    protected static final short CKM_DES3_CBC_PAD=14;
-    protected static final short CKM_DES_KEY_GEN=15;
-    protected static final short CKM_DES3_KEY_GEN=16;
-    protected static final short CKM_RC4_KEY_GEN=17;
-
-    protected static final short SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC=18;
-    protected static final short SEC_OID_PKCS5_PBE_WITH_MD5_AND_DES_CBC=19;
-    protected static final short SEC_OID_PKCS5_PBE_WITH_SHA1_AND_DES_CBC=20;
-    protected static final short
-		SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC4=21;
-    protected static final short
-		SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC4=22;
-    protected static final short
-		SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC=23;
-    protected static final short SEC_OID_MD2=24;
-    protected static final short SEC_OID_MD5=25;
-    protected static final short SEC_OID_SHA1=26;
-    protected static final short CKM_SHA_1_HMAC=27;
-    protected static final short
-        SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_128_BIT_RC2_CBC=28;
-    protected static final short
-        SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_40_BIT_RC2_CBC=29;
-    protected static final short SEC_OID_RC2_CBC=30;
-    protected static final short CKM_PBA_SHA1_WITH_SHA1_HMAC=31;
-
-    // AES
-    protected static final short CKM_AES_KEY_GEN=32;
-    protected static final short CKM_AES_ECB=33;
-    protected static final short CKM_AES_CBC=34;
-    protected static final short CKM_AES_CBC_PAD=35;
-}

mozilla/security/jss/org/mozilla/jss/crypto/AlreadyInitializedException.java

@@ -1,45 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * This exception is thrown if an initialization operation
- * is attempted on something that is already initialized.
- */
-public class AlreadyInitializedException extends java.lang.Exception {
-    public AlreadyInitializedException() {}
-    public AlreadyInitializedException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/BadPaddingException.java

@@ -1,45 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.crypto;
-
-/**
- * @deprecated Use javax.crypto.BadPaddingException.
- */
-public class BadPaddingException extends Exception {
-    public BadPaddingException() {
-        super();
-    }
-    public BadPaddingException(String msg) {
-        super(msg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/Cipher.java

@@ -1,227 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.InvalidKeyException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.InvalidAlgorithmParameterException;
-import org.mozilla.jss.util.Assert;
-
-/**
- * A context for performing symmetric encryption and decryption.
- * First, the context must be initialized. Then, it can be updated
- * with input through zero or more calls to <code>update</code>.  Finally,
- * <code>doFinal</code> is called to finalize the operation. Note that
- * it is not necessary to call <code>update</code> if all of the data is
- * available at once.  In this case, all of the input can be processed with one
- * call to <code>doFinal</code>.
- * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
- */
-public abstract class Cipher {
-
-    /**
-     * Initializes a encryption context with a symmetric key.
-     */
-    public abstract void initEncrypt(SymmetricKey key)
-        throws InvalidKeyException, InvalidAlgorithmParameterException,
-        TokenException;
-
-    /**
-     * Initializes a decryption context with a symmetric key.
-     */
-    public abstract void initDecrypt(SymmetricKey key)
-        throws InvalidKeyException, InvalidAlgorithmParameterException,
-        TokenException;
-
-    /**
-     * Initializes an encryption context with a symmetric key and
-     * algorithm parameters.
-     */
-    public abstract void
-    initEncrypt(SymmetricKey key, AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException,
-        TokenException;
-
-    /** 
-     * Initializes a decryption context with a symmetric key and
-     * algorithm parameters.
-     */
-    public abstract void
-    initDecrypt(SymmetricKey key, AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException,
-        TokenException;
-
-    /**
-     * Updates the encryption context with additional input.
-     * @param bytes Bytes of plaintext (if encrypting) or ciphertext (if
-     *      decrypting).
-     * @return Bytes of ciphertext (if encrypting) or plaintext (if decrypting).
-     */
-    public abstract byte[] update(byte[] bytes)
-        throws IllegalStateException, TokenException;
-
-    /**
-     * Updates the encryption context with additional plaintext.
-     * @param bytes Bytes of plaintext (if encrypting) or ciphertext (if
-     *      decrypting).
-     * @param offset The index in <code>bytes</code> at which to begin reading.
-     * @param length The number of bytes from <code>bytes</code> to read.
-     * @return Bytes of ciphertext (if encrypting) or plaintext (if decrypting).
-     */
-    public abstract byte[] update(byte[] bytes, int offset, int length)
-        throws IllegalStateException, TokenException;
-
-    /**
-     * Completes an cipher operation. This can be called directly after
-     *  the context is initialized, or <code>update</code> may be called
-     *  any number of times before calling <code>final</code>.
-     * @param bytes Bytes of plaintext (if encrypting) or ciphertext (if
-     *      decrypting).
-     * @return The last of the output.
-     */
-    public abstract byte[] doFinal(byte[] bytes)
-        throws IllegalStateException, IllegalBlockSizeException,
-        BadPaddingException, TokenException;
-
-    /**
-     * Completes an cipher operation.
-     * @param bytes Bytes of plaintext (if encrypting) or ciphertext (if
-     *      decrypting).
-     * @param offset The index in <code>bytes</code> at which to begin reading.
-     * @param length The number of bytes from <code>bytes</code> to read.
-     * @return The last of the output.
-     */
-    public abstract byte[] doFinal(byte[] bytes, int offset, int length)
-        throws IllegalStateException, IllegalBlockSizeException,
-        BadPaddingException, TokenException;
-
-    /**
-     * Completes an cipher operation.
-     * @return The last of the output.
-     */
-    public abstract byte[] doFinal()
-        throws IllegalStateException, IllegalBlockSizeException,
-        BadPaddingException, TokenException;
-
-    /**
-     * Pads a byte array so that its length is a multiple of the given
-     *  blocksize.  The method of padding is the one defined in the RSA
-     *  PKCS standards. If <i>M</i> is the length of the data and
-     *  <i>B</i> is the block size, the padding string consists of
-     *  <i>B</i> - (<i>M</i> mod <i>B</i>) octets, each having the value
-     *  <i>B</i> - (<i>M</i> mod <i>B</i>).
-     * @param The block size of the encryption algorithm.  Must be greater
-     *  than zero.
-     * @see #unPad
-     */
-    public static byte[]
-    pad(byte[] toBePadded, int blockSize) {
-        Assert._assert(blockSize > 0);
-
-        // the padOctet is also the number of pad octets
-        byte padOctet = (byte) (blockSize - (toBePadded.length % blockSize));
-
-        byte[] padded = new byte[toBePadded.length + padOctet];
-
-        System.arraycopy(toBePadded, 0, padded, 0, toBePadded.length);
-
-        for(int i = toBePadded.length; i < padded.length; i++) {
-            padded[i] = padOctet;
-        }
-
-        return padded;
-    }
-
-    /**
-     * Un-pads a byte array that is padded with PKCS padding.
-     *
-     * @param blockSize The block size of the encryption algorithm. This
-     *      is only used for error checking: if the pad size is not
-     *      between 1 and blockSize, a BadPaddingException is thrown.
-     *
-     * @see #pad
-     */
-    public static byte[]
-    unPad(byte[] padded, int blockSize) throws BadPaddingException {
-        if(padded.length == 0) {
-            return new byte[0];
-        }
-
-        if( padded.length < blockSize ) {
-            throw new BadPaddingException("Length of padded array is less than"+
-                " one block");
-        }
-        byte padOctet = padded[padded.length-1];
-        if(padOctet > blockSize) {
-            throw new BadPaddingException("Padding octet ("+padOctet+") is "+
-                "larger than block size ("+blockSize+")");
-        }
-        if(padOctet < 1) {
-            throw new BadPaddingException("Padding octet is less than 1");
-        }
-
-        byte[] unpadded = new byte[padded.length - padOctet];
-
-        System.arraycopy(padded, 0, unpadded, 0, unpadded.length);
-
-        return unpadded;
-    }
-
-    /**
-     * Un-pads a byte array that is padded with PKCS padding. Since
-     * this version does not take block size as a parameter, it cannot
-     * error check.
-     * @see #pad
-     */
-    public static byte[]
-    unPad(byte[] padded) throws BadPaddingException {
-        if(padded.length == 0) {
-            return new byte[0];
-        }
-
-        byte padOctet = padded[padded.length-1];
-        if(padOctet < 1) {
-            throw new BadPaddingException("Padding octet is less than 1");
-        } else if(padOctet >= padded.length) {
-            throw new BadPaddingException("Padding is larger than entire"+
-                " array");
-        }
-
-        byte[] unpadded = new byte[padded.length - padOctet];
-
-        System.arraycopy(padded, 0, unpadded, 0, unpadded.length);
-
-        return unpadded;
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/CryptoStore.java

@@ -1,120 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import org.mozilla.jss.util.*;
-import java.security.*;
-import java.security.cert.CertificateEncodingException;
-import java.io.Serializable;
-
-/**
- * This is an interface for a permanent repository of cryptographic objects,
- * such as keys, certs, and passwords.
- */
-public interface CryptoStore {
-
-    ////////////////////////////////////////////////////////////
-    // Private Keys
-    ////////////////////////////////////////////////////////////
-
-    /**
-     * Imports a raw private key into this token.
-     *
-     * @param key The private key.
-     * @exception TokenException If the key cannot be imported to this token.
-     * @exception KeyAlreadyImportedException If the key already exists on this token.
-     */
-    public void
-    importPrivateKey(  byte[] key,
-                       PrivateKey.Type type       )
-        throws TokenException, KeyAlreadyImportedException;
-
-
-    /**
-     * Returns all private keys stored on this token.
-     *
-     * @return An array of all private keys stored on this token.
-     * @exception TokenException If an error occurs on the token while
-     *      gathering the keys.
-     */
-    public PrivateKey[]
-    getPrivateKeys() throws TokenException;
-
-    /**
-     * Deletes the given PrivateKey from the CryptoToken.
-     * This is a very dangerous call: it deletes the key from the underlying
-     * token. After calling this, the PrivateKey passed in must no longer
-     * be used, or a TokenException will occur.
-     *
-     * @param key A PrivateKey to be permanently deleted.  It must reside
-     *      on this token.
-     * @exception NoSuchItemOnTokenException If the given privae key does 
-     *      not reside on this token.
-     * @exception TokenException If an error occurs on the token while
-     *      deleting the key.
-     */
-    public void deletePrivateKey(org.mozilla.jss.crypto.PrivateKey key)
-        throws NoSuchItemOnTokenException, TokenException;
-
-
-    public byte[] getEncryptedPrivateKeyInfo(X509Certificate cert,
-        PBEAlgorithm pbeAlg, Password pw, int iteration);
-
-    ////////////////////////////////////////////////////////////
-    // Certs
-    ////////////////////////////////////////////////////////////
-    /**
-     * Returns all user certificates stored on this token. A user certificate
-     *      is one that has a matching private key.
-     *
-     * @return An array of all user certificates present on this token.
-     * @exception TokenException If an error occurs on the token while
-     *      gathering the certificates.
-     */
-    public X509Certificate[]
-    getCertificates() throws TokenException;
-
-    /**
-     * Deletes a certificate from a token.
-     *
-     * @param cert A certificate to be deleted from this token. The cert
-     *      must actually reside on this token.
-     * @exception NoSuchItemOnTokenException If the given cert does not
-     *      reside on this token.
-     * @exception TokenException If an error occurred on the token while
-     *      deleting the certificate.
-     */
-    public void deleteCert(X509Certificate cert)
-        throws NoSuchItemOnTokenException, TokenException;
-}

mozilla/security/jss/org/mozilla/jss/crypto/CryptoToken.java

@@ -1,337 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import org.mozilla.jss.util.*;
-import java.security.*;
-
-/**
- * A CryptoToken performs cryptographic operations and stores
- * cryptographic items, such as keys and certs.  It corresponds to a
- * Cryptographic Service Provider (CSP) in CDSA, and to a PKCS #11 token.
- * <p>Instances of CryptoToken are obtained from CryptoManager.
- * @see org.mozilla.jss.CryptoManager
- */
-public interface CryptoToken {
-
-//
-// SERVICES
-//
-    /**
-     * Creates a Signature object, which can perform signing and signature
-     * verification. Signing and verification cryptographic operations will
-     * take place on this token. The signing key must be located on this
-     * token.
-     *
-     * @param algorithm The algorithm used for the signing/verification.
-     * @exception java.security.NoSuchAlgorithmException If the given
-     *      algorithm is not supported by this provider.
-     * @deprecated Use the JCA interface instead ({@link java.security.Signature})
-     */
-    public abstract org.mozilla.jss.crypto.Signature
-    getSignatureContext(SignatureAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, TokenException;
-
-    /**
-     * Creates a Digest object.  Digesting cryptographic operations will
-     * take place on this token.
-     *
-     * @param algorithm The algorithm used for digesting.
-     * @exception java.security.NoSuchAlgorithmException If this provider
-     *  does not support the given algorithm.
-     * @deprecated Use the JCA interface instead ({@link java.security.MessageDigest})
-     */
-    public abstract JSSMessageDigest
-    getDigestContext(DigestAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, DigestException;
-
-    // !!! MAC ???
-
-    /**
-     * Creates a Cipher object, which can be used for encryption and
-     * decryption. Cryptographic operations will take place on this token.
-     * The keys used in the operations must be located on this token.
-     *
-     * @param algorithm The algorithm used for encryption/decryption.
-     * @exception java.security.NoSuchAlgorithmException If this provider
-     *      does not support the given algorithm.
-     * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
-     */
-    public abstract Cipher
-    getCipherContext(EncryptionAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, TokenException;
-
-    /**
-     * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
-     */
-    public abstract KeyWrapper
-    getKeyWrapper(KeyWrapAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, TokenException;
-
-    /**
-     * Returns a Random Number Generator implemented on this token.
-     *
-     * @exception org.mozilla.jss.crypto.ServiceNotProvidedException If this token
-     *      does not perform random number generation
-     */
-    /*
-    public abstract SecureRandom getRandomGenerator()
-        throws NotImplementedException, TokenException;
-    */
-
-    // !!! Derive Keys ???
-
-    /**
-     * Creates a KeyGenerator object, which can be used to generate
-     * symmetric encryption keys.  Any keys generated with this KeyGenerator
-     * will be generated on this token.
-     *
-     * @param algorithm The algorithm that the keys will be used with.
-     * @exception java.security.NoSuchAlgorithmException If this token does not
-     *      support the given algorithm.
-     * @deprecated Use the JCA interface instead ({@link javax.crypto.KeyGenerator})
-     */
-    public abstract KeyGenerator
-    getKeyGenerator(KeyGenAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, TokenException;
-
-    /**
-     * Clones a SymmetricKey from a different token onto this token.
-     *
-     * @exception SymmetricKey.NotExtractableException If the key material
-     *      cannot be extracted from the current token.
-     * @exception InvalidKeyException If the owning token cannot process
-     *      the key to be cloned.
-     * @deprecated Use the JCA interface instead ({@link javax.crypto.SecretKeyFactory})
-     */
-    public SymmetricKey cloneKey(SymmetricKey key)
-        throws SymmetricKey.NotExtractableException,
-            InvalidKeyException, TokenException;
-
-    /**
-     * Creates a KeyPairGenerator object, which can be used to generate
-     * key pairs. Any keypairs generated with this generator will be generated
-     * on this token.
-     *
-     * @param algorithm The algorithm that the keys will be used with (RSA,
-     *      DSA, etc.)
-     * @exception java.security.NoSuchAlgorithmException If this token does
-     *      not support the given algorithm.
-     * @deprecated Use the JCA interface instead ({@link java.security.KeyPairGenerator})
-     */
-    public abstract KeyPairGenerator
-    getKeyPairGenerator(KeyPairAlgorithm algorithm)
-        throws java.security.NoSuchAlgorithmException, TokenException;
-
-	/**
-	 * Generates a b64 encoded PKCS10 blob used for making cert
-	 *	 request.  Begin/End brackets included.
-	 * @param subject subject dn of the certificate
-	 * @param keysize size of the key
-	 * @param keyType "rsa" or "dsa"
-     * @param P The DSA prime parameter
-     * @param Q The DSA sub-prime parameter
-     * @param G The DSA base parameter
-	 * @return base64 encoded pkcs10 certificate request with
-	 *	 Begin/end brackets
-	 */
-	public abstract String generateCertRequest(String subject, int
-											   keysize,
-											   String keyType,
-											   byte[] P, byte[] Q,
-											   byte[] G)
-		throws TokenException, InvalidParameterException,
-												   PQGParamGenException;
-
-    /**
-     * Determines whether this token supports the given algorithm.
-     *
-     * @param alg A JSS algorithm.  Note that for Signature, a token may 
-     *      fail to support a specific SignatureAlgorithm (such as
-     *      RSASignatureWithMD5Digest) even though it does support the
-     *      generic algorithm (RSASignature). In this case, the signature
-     *      operation will be performed on that token, but the digest
-     *      operation will be performed on the internal token.
-     * @return true if the token supports the algorithm.
-     */
-    public boolean doesAlgorithm(Algorithm alg);
-
-    /**
-     * Login to the token. If a token is logged in, it will not trigger
-     * password callbacks.
-     *
-     * @param password The password for this token.
-     * @exception IncorrectPasswordException If the supplied password is
-     *  incorrect.
-     * @see #setLoginMode
-     * @see org.mozilla.jss.CryptoManager#setPasswordCallback
-     */
-    public abstract void login(PasswordCallback pwcb)
-        throws IncorrectPasswordException, TokenException;
-
-    /**
-     * Logout of the token.
-     *
-     */
-    public abstract void logout() throws TokenException;
-
-    /**
-     * Login once, never need to re-enter the password until you log out.
-     */
-    public static final int ONE_TIME=0;
-    /**
-     * Need to re-login after a period of time.
-     * @see org.mozilla.jss.crypto.CryptoToken#setLoginTimeoutMinutes
-     */
-    public static final int TIMEOUT=1;
-    /**
-     * Need to provide a password before each crypto operation.
-     */
-    public static final int EVERY_TIME=2;
-
-    /**
-     * Returns the login mode of this token: ONE_TIME, TIMEOUT, or
-     * EVERY_TIME.  The default is ONE_TIME.
-     * @see #getLoginTimeoutMinutes
-     * @exception TokenException If an error occurs on the token.
-     */
-    public abstract int getLoginMode() throws TokenException;
-
-    /**
-     * Sets the login mode of this token.
-     *
-     * @param mode ONE_TIME, TIMEOUT, or EVERY_TIME
-     * @exception TokenException If this mode is not supported by this token,
-     *  or an error occurs on the token.
-     * @see #login
-     * @see #setLoginTimeoutMinutes
-     */
-    public abstract void setLoginMode(int mode) throws TokenException;
-
-    /**
-     * Returns the login timeout period.  The timeout is only used if the
-     * login mode is TIMEOUT.
-     *
-     * @see #getLoginMode
-     * @exception TokenException If an error occurs on the token.
-     */
-    public abstract int getLoginTimeoutMinutes() throws TokenException;
-
-    /**
-     * Sets the timeout period for logging in. This will only be used
-     * if the login mode is TIMEOUT.
-     *
-     * @exception TokenException If timeouts are not supported by this
-     *      token, or an error occurs on the token.
-     * @see #setLoginMode
-     */
-    public abstract void setLoginTimeoutMinutes(int timeoutMinutes)
-        throws TokenException;
-
-    /**
-     * Find out if the token is currently logged in.
-     *
-     * @see #login
-     * @see #logout
-     */
-    public boolean isLoggedIn() throws TokenException;
-
-	/**
-	 * Initialize the password of this token.
-	 *
-	 * @param securityOfficerPW A callback to obtain the password of the
-	 * 		SecurityOfficer.  Pass in a NullPasswordCallback if there is
-	 * 		no security officer password. Must not be null.
-	 * @param userPW A callback to obtain the new password for this token.
-	 *		Must not be null.
-	 * @exception IncorrectPasswordException If the supplied security officer
-	 *		password is incorrect.
-	 * @exception AlreadyInitializedException If the token only allows one
-	 *		password initialization, and it has already occurred.
-     * @exception TokenException If an error occurs on the token.
-	 */
-	public abstract void
-	initPassword(PasswordCallback securityOfficerPW, PasswordCallback userPW)
-		throws IncorrectPasswordException, AlreadyInitializedException,
-		TokenException;
-
-	/**
-	 * Determine whether the password has been initialized yet.  Some tokens
-	 * (such as the Netscape Internal Key Token) don't allow initializing
-	 * the PIN more than once.
-     *
-     * @exception TokenException If an error occurs on the token.
-	 */
-	public abstract boolean
-	passwordIsInitialized() throws TokenException;
-
-    /**
-     * Change the password of this token.
-     *
-     * @exception IncorrectPasswordException If the supplied old password is
-     *      incorrect.
-     * @param oldpw A callback (which could be just a Password) to retrieve
-     *      the current password.
-     * @param newpw A callback (which could be just a Password) to retrieve
-     *      the new password.
-     */
-    public abstract void
-    changePassword(PasswordCallback oldpw, PasswordCallback newpw)
-        throws IncorrectPasswordException, TokenException;
-
-    /**
-     * Obtain the nickname, or label, of this token.
-     *
-     * @exception TokenException If an error occurs on the token.
-     */
-    public abstract String getName() throws TokenException;
-
-    /**
-     * Get the CryptoStore interface to this token's objects.
-     */
-    public abstract CryptoStore getCryptoStore();
-
-    /**
-     * Deep comparison operation. Use this, rather than ==, to determine
-     * whether two CryptoTokens are the same.
-     */
-    public boolean equals(Object object);
-
-    /**
-     * Determines whether this token is currently present.
-     * This could return false if the token is a smart card that was
-     * removed from its slot.
-     */
-    public boolean isPresent();
-}

mozilla/security/jss/org/mozilla/jss/crypto/DigestAlgorithm.java

@@ -1,99 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.util.Hashtable;
-import java.security.NoSuchAlgorithmException;
-import org.mozilla.jss.asn1.*;
-
-public class DigestAlgorithm extends Algorithm {
-
-    // The size in bytes of the output of this hash.
-    private int outputSize;
-
-    protected DigestAlgorithm(int oidIndex, String name,
-            OBJECT_IDENTIFIER oid, int outputSize)
-    {
-        super(oidIndex, name, oid);
-
-        this.outputSize = outputSize;
-
-        // only store the first algorithm for a given oid.  More than one
-        // alg might share the same oid, such as from child classes.
-        if( oid != null && oidMap.get(oid)==null ) {
-            oidMap.put(oid, this);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // OID mapping
-    ///////////////////////////////////////////////////////////////////////
-    private static Hashtable oidMap = new Hashtable();
-
-    public static DigestAlgorithm fromOID(OBJECT_IDENTIFIER oid)
-        throws NoSuchAlgorithmException
-    {
-        Object alg = oidMap.get(oid);
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException();
-        } else {
-            return (DigestAlgorithm) alg;
-        }
-    }
-
-    /**
-     * Returns the output size in bytes for this algorithm.
-     */
-    public int getOutputSize() {
-        return outputSize;
-    }
-
-    /**
-     * The MD2 digest algorithm, from RSA.
-     */
-    public static final DigestAlgorithm MD2 = new DigestAlgorithm
-        (SEC_OID_MD2, "MD2", OBJECT_IDENTIFIER.RSA_DIGEST.subBranch(2), 16 );
-
-    /**
-     * The MD5 digest algorithm, from RSA.
-     */
-    public static final DigestAlgorithm MD5 = new DigestAlgorithm
-        (SEC_OID_MD5, "MD5", OBJECT_IDENTIFIER.RSA_DIGEST.subBranch(5), 16 );
-
-    /**
-     * The SHA-1 digest algorithm, from Uncle Sam.
-     */
-    public static final DigestAlgorithm SHA1 = new DigestAlgorithm
-        (SEC_OID_SHA1, "SHA-1", OBJECT_IDENTIFIER.ALGORITHM.subBranch(26), 20);
-}

mozilla/security/jss/org/mozilla/jss/crypto/EncryptionAlgorithm.java

@@ -1,415 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.NoSuchAlgorithmException;
-import org.mozilla.jss.asn1.*;
-import javax.crypto.spec.IvParameterSpec;
-import java.util.*;
-
-/**
- * An algorithm for performing symmetric encryption.
- */
-public class EncryptionAlgorithm extends Algorithm {
-
-    public static class Mode {
-        private String name;
-
-        private static Hashtable nameHash = new Hashtable();
-
-        private Mode() { }
-        private Mode(String name) {
-            this.name = name;
-            nameHash.put(name.toLowerCase(), this);
-        }
-
-        public static Mode fromString(String name)
-            throws NoSuchAlgorithmException
-        {
-            Mode m = (Mode) nameHash.get(name.toLowerCase());
-            if( m == null ) {
-                throw new NoSuchAlgorithmException(
-                    "Unrecognized mode \"" + name + "\"");
-            }
-            return m;
-        }
-
-        public String toString() {
-            return name;
-        }
-
-        public static final Mode NONE = new Mode("NONE");
-        public static final Mode ECB = new Mode("ECB");
-        public static final Mode CBC = new Mode("CBC");
-    }
-
-    public static class Alg {
-        private String name;
-
-        private static Hashtable nameHash = new Hashtable();
-
-        private Alg() { }
-        private Alg(String name) {
-            this.name = name;
-            nameHash.put(name.toLowerCase(), this);
-        }
-
-        private static Alg fromString(String name)
-            throws NoSuchAlgorithmException
-        {
-            Alg a = (Alg) nameHash.get(name.toLowerCase());
-            if( a == null ) {
-                throw new NoSuchAlgorithmException("Unrecognized algorithm \""
-                    + name + "\"");
-            }
-            return a;
-        }
-
-        public String toString() {
-            return name;
-        }
-
-        public static final Alg RC4 = new Alg("RC4");
-        public static final Alg DES = new Alg("DES");
-        public static final Alg DESede = new Alg("DESede");
-        public static final Alg AES = new Alg("AES");
-        public static final Alg RC2 = new Alg("RC2");
-    }
-
-    public static class Padding {
-        private String name;
-
-        private static Hashtable nameHash = new Hashtable();
-
-        private Padding() { }
-        private Padding(String name) {
-            this.name = name;
-            nameHash.put(name.toLowerCase(), this);
-        }
-
-        public String toString() {
-            return name;
-        }
-
-        public static Padding fromString(String name)
-            throws NoSuchAlgorithmException
-        {
-            Padding p = (Padding) nameHash.get(name.toLowerCase());
-            if( p == null ) {
-                throw new NoSuchAlgorithmException("Unrecognized Padding " +
-                    "type \"" + name + "\"");
-            }
-            return p;
-        }
-
-        public static final Padding NONE = new Padding("NoPadding");
-        public static final Padding PKCS5 = new Padding("PKCS5Padding");
-    }
-
-    private static String makeName(Alg alg, Mode mode, Padding padding) {
-        StringBuffer buf = new StringBuffer();
-        buf.append(alg.toString());
-        buf.append('/');
-        buf.append(mode.toString());
-        buf.append('/');
-        buf.append(padding.toString());
-        return buf.toString();
-    }
-
-    protected EncryptionAlgorithm(int oidTag, Alg alg, Mode mode,
-        Padding padding, Class paramClass, int blockSize,
-        OBJECT_IDENTIFIER oid, int keyStrength)
-    {
-        super(oidTag, makeName(alg, mode, padding), oid, paramClass);
-        this.alg = alg;
-        this.mode = mode;
-        this.padding = padding;
-        this.blockSize = blockSize;
-        if(oid!=null) {
-            oidMap.put(oid, this);
-        }
-        if( name != null ) {
-            nameMap.put(name.toLowerCase(), this);
-        }
-        this.keyStrength = keyStrength;
-        algList.addElement(this);
-    }
-
-    protected EncryptionAlgorithm(int oidTag, Alg alg, Mode mode,
-        Padding padding, Class []paramClasses, int blockSize, 
-        OBJECT_IDENTIFIER oid, int keyStrength)
-    {
-        super(oidTag, makeName(alg, mode, padding), oid, paramClasses);
-        this.alg = alg;
-        this.mode = mode;
-        this.padding = padding;
-        this.blockSize = blockSize;
-        if(oid!=null) {
-            oidMap.put(oid, this);
-        }
-        if( name != null ) {
-            nameMap.put(name.toLowerCase(), this);
-        }
-        this.keyStrength = keyStrength;
-        algList.addElement(this);
-    }
-
-    private int blockSize;
-    private Alg alg;
-    private Mode mode;
-    private Padding padding;
-    private int keyStrength;
-
-    /**
-     * Returns the base algorithm, without the parameters. For example,
-     * the base algorithm of "AES/CBC/NoPadding" is "AES".
-     */
-    public Alg getAlg() {
-        return alg;
-    }
-
-    /**
-     * Returns the mode of this algorithm.
-     */
-    public Mode getMode() {
-        return mode;
-    }
-
-    /**
-     * Returns the padding type of this algorithm.
-     */
-    public Padding getPadding() {
-        return padding;
-    }
-
-    /**
-     * Returns the key strength of this algorithm in bits. Algorithms that
-     * use continuously variable key sizes (such as RC4) will return 0 to
-     * indicate they can use any key size.
-     */
-    public int getKeyStrength() {
-        return keyStrength;
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // mapping
-    ///////////////////////////////////////////////////////////////////////
-    private static Hashtable oidMap = new Hashtable();
-    private static Hashtable nameMap = new Hashtable();
-    private static Vector algList = new Vector();
-
-    public static EncryptionAlgorithm fromOID(OBJECT_IDENTIFIER oid)
-        throws NoSuchAlgorithmException
-    {
-        Object alg = oidMap.get(oid);
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException("OID: " + oid.toString());
-        } else {
-            return (EncryptionAlgorithm) alg;
-        }
-    }
-
-    // Note: after we remove this deprecated method, we can remove
-    // nameMap.
-    /**
-     * @deprecated This method is deprecated because algorithm strings
-     *  don't contain key length, which is necessary to distinguish between
-     *  AES algorithms.
-     */
-    public static EncryptionAlgorithm fromString(String name)
-        throws NoSuchAlgorithmException
-    {
-        Object alg = nameMap.get(name.toLowerCase());
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException();
-        } else {
-            return (EncryptionAlgorithm) alg;
-        }
-    }
-
-    public static EncryptionAlgorithm lookup(String algName, String modeName,
-        String paddingName, int keyStrength)
-        throws NoSuchAlgorithmException
-    {
-        int len = algList.size();
-        Alg alg = Alg.fromString(algName);
-        Mode mode = Mode.fromString(modeName);
-        Padding padding = Padding.fromString(paddingName);
-        int i;
-        for(i = 0; i < len; ++i ) {
-            EncryptionAlgorithm cur =
-                (EncryptionAlgorithm) algList.elementAt(i);
-            if( cur.alg == alg && cur.mode == mode && cur.padding == padding ) {
-                if( cur.keyStrength == 0 || cur.keyStrength == keyStrength ) {
-                    break;
-                }
-            }
-        }
-        if( i == len ) {
-            throw new NoSuchAlgorithmException(algName + "/" + modeName + "/"
-                + paddingName + " with key strength " + keyStrength +
-                " not found");
-        }
-        return (EncryptionAlgorithm) algList.elementAt(i);
-    }
-        
-
-    /** 
-     * The blocksize of the algorithm in bytes. Stream algorithms (such as
-     * RC4) have a blocksize of 1.
-     */
-    public int getBlockSize() {
-        return blockSize;
-    }
-
-    /**
-     * Returns <code>true</code> if this algorithm performs padding.
-     * @deprecated Call <tt>getPaddingType()</tt> instead.
-     */
-    public boolean isPadded() {
-        return ! Padding.NONE.equals(padding);
-    }
-
-    /**
-     * Returns the type of padding for this algorithm.
-     */
-    public Padding getPaddingType() {
-        return padding;
-    }
-
-    //
-    // In JDK 1.4, Sun introduced javax.crypto.spec.IvParameterSpec,
-    // which obsoletes org.mozilla.jss.crypto.IVParameterSpec. However,
-    // we still need to support pre-1.4 runtimes, so we have to be
-    // prepared for this new class not to be available. Here we try to load
-    // the new 1.4 class. If we succeed, we will accept either JSS's
-    // IVParameterSpec or Java's IvParameterSpec. If we fail, which will
-    // happen if we are running a pre-1.4 runtime, we just accept
-    // JSS's IVParameterSpec.
-    //
-    private static Class[] IVParameterSpecClasses = null;
-    static {
-        try {
-            IVParameterSpecClasses = new Class[2];
-            IVParameterSpecClasses[0] = IVParameterSpec.class;
-            IVParameterSpecClasses[1] = IvParameterSpec.class;
-        } catch(NoClassDefFoundError e) {
-            // We must be running on a pre-1.4 JRE.
-            IVParameterSpecClasses = new Class[1];
-            IVParameterSpecClasses[0] = IVParameterSpec.class;
-        }
-    }
-
-    /**
-     * Returns the number of bytes that this algorithm expects in
-     * its initialization vector.
-     *
-     * @return The size in bytes of the IV for this algorithm.  A size of
-     *      0 means this algorithm does not take an IV.
-     */
-    public native int getIVLength();
-
-    public static final EncryptionAlgorithm
-    RC4 = new EncryptionAlgorithm(SEC_OID_RC4, Alg.RC4, Mode.NONE, Padding.NONE,
-            (Class)null, 1, OBJECT_IDENTIFIER.RSA_CIPHER.subBranch(4), 0);
-
-    public static final EncryptionAlgorithm
-    DES_ECB = new EncryptionAlgorithm(SEC_OID_DES_ECB, Alg.DES, Mode.ECB,
-        Padding.NONE, (Class)null, 8, OBJECT_IDENTIFIER.ALGORITHM.subBranch(6),
-        56);
-
-    public static final EncryptionAlgorithm
-    DES_CBC = new EncryptionAlgorithm(SEC_OID_DES_CBC, Alg.DES, Mode.CBC,
-        Padding.NONE, IVParameterSpecClasses, 8,
-        OBJECT_IDENTIFIER.ALGORITHM.subBranch(7), 56);
-
-    public static final EncryptionAlgorithm
-    DES_CBC_PAD = new EncryptionAlgorithm(CKM_DES_CBC_PAD, Alg.DES, Mode.CBC,
-        Padding.PKCS5, IVParameterSpecClasses, 8, null, 56); // no oid
-
-    public static final EncryptionAlgorithm
-    DES3_ECB = new EncryptionAlgorithm(CKM_DES3_ECB, Alg.DESede, Mode.ECB,
-        Padding.NONE, (Class)null, 8, null, 168); // no oid
-
-    public static final EncryptionAlgorithm
-    DES3_CBC = new EncryptionAlgorithm(SEC_OID_DES_EDE3_CBC, Alg.DESede,
-        Mode.CBC, Padding.NONE, IVParameterSpecClasses, 8,
-        OBJECT_IDENTIFIER.RSA_CIPHER.subBranch(7), 168);
-
-    public static final EncryptionAlgorithm
-    DES3_CBC_PAD = new EncryptionAlgorithm(CKM_DES3_CBC_PAD, Alg.DESede,
-        Mode.CBC, Padding.PKCS5, IVParameterSpecClasses, 8,
-        null, 168); //no oid
-
-    public static final EncryptionAlgorithm
-    RC2_CBC = new EncryptionAlgorithm(SEC_OID_RC2_CBC, Alg.RC2, Mode.CBC,
-        Padding.NONE, IVParameterSpecClasses, 8,
-        OBJECT_IDENTIFIER.RSA_CIPHER.subBranch(2), 0);
-
-    public static final OBJECT_IDENTIFIER AES_ROOT_OID = 
-        new OBJECT_IDENTIFIER( new long[] 
-            { 2, 16, 840, 1, 101, 3, 4, 1 } );
-
-    public static final EncryptionAlgorithm
-    AES_128_ECB = new EncryptionAlgorithm(CKM_AES_ECB, Alg.AES, Mode.ECB,
-        Padding.NONE, (Class)null, 16,
-        AES_ROOT_OID.subBranch(1), 128);
-
-    public static final EncryptionAlgorithm
-    AES_128_CBC = new EncryptionAlgorithm(CKM_AES_CBC, Alg.AES, Mode.CBC,
-        Padding.NONE, IVParameterSpecClasses, 16,
-        AES_ROOT_OID.subBranch(2), 128);
-
-    public static final EncryptionAlgorithm
-    AES_192_ECB = new EncryptionAlgorithm(CKM_AES_ECB, Alg.AES, Mode.ECB,
-        Padding.NONE, (Class)null, 16, AES_ROOT_OID.subBranch(21), 192);
-
-    public static final EncryptionAlgorithm
-    AES_192_CBC = new EncryptionAlgorithm(CKM_AES_CBC, Alg.AES, Mode.CBC,
-        Padding.NONE, IVParameterSpecClasses, 16,
-        AES_ROOT_OID.subBranch(22), 192);
-
-    public static final EncryptionAlgorithm
-    AES_256_ECB = new EncryptionAlgorithm(CKM_AES_ECB, Alg.AES, Mode.ECB,
-        Padding.NONE, (Class)null, 16, AES_ROOT_OID.subBranch(41), 256);
-
-    public static final EncryptionAlgorithm
-    AES_256_CBC = new EncryptionAlgorithm(CKM_AES_CBC, Alg.AES, Mode.CBC,
-        Padding.NONE, IVParameterSpecClasses, 16,
-        AES_ROOT_OID.subBranch(42), 256);
-
-    public static final EncryptionAlgorithm
-    AES_CBC_PAD = new EncryptionAlgorithm(CKM_AES_CBC_PAD, Alg.AES, Mode.CBC,
-        Padding.PKCS5, IVParameterSpecClasses, 16, null, 256); // no oid
-}

mozilla/security/jss/org/mozilla/jss/crypto/HMACAlgorithm.java

@@ -1,85 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.util.Hashtable;
-import org.mozilla.jss.asn1.*;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Algorithms for performing HMACs. These can be used to create
- * MessageDigests.
- */
-public class HMACAlgorithm extends DigestAlgorithm {
-
-    protected HMACAlgorithm(int oidIndex, String name, OBJECT_IDENTIFIER oid,
-                int outputSize) {
-        super(oidIndex, name, oid, outputSize);
-
-        if( oid!=null && oidMap.get(oid)==null) {
-            oidMap.put(oid, this);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // OID mapping
-    ///////////////////////////////////////////////////////////////////////
-    private static Hashtable oidMap = new Hashtable();
-
-    /**
-     * Looks up the HMAC algorithm with the given OID.
-     * 
-     * @exception NoSuchAlgorithmException If no registered HMAC algorithm
-     *  has the given OID.
-     */
-    public static DigestAlgorithm fromOID(OBJECT_IDENTIFIER oid)
-        throws NoSuchAlgorithmException
-    {
-        Object alg = oidMap.get(oid);
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException();
-        } else {
-            return (HMACAlgorithm) alg;
-        }
-    }
-
-    /**
-     * SHA-1 HMAC.  This is a Message Authentication Code that uses a
-     * symmetric key together with SHA-1 digesting to create a form of
-     * signature.
-     */
-    public static final HMACAlgorithm SHA1 = new HMACAlgorithm
-        (CKM_SHA_1_HMAC, "SHA-1-HMAC",
-             OBJECT_IDENTIFIER.ALGORITHM.subBranch(26), 20);
-}

mozilla/security/jss/org/mozilla/jss/crypto/IVParameterSpec.java

@@ -1,57 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-/**
- * An algorithm parameter that consists of an initialization vector (IV).
- */
-public class IVParameterSpec implements AlgorithmParameterSpec {
-
-    private byte[] iv;
-
-    private IVParameterSpec() { }
-
-    public IVParameterSpec(byte[] iv) {
-        this.iv = iv;
-    }
-
-    /**
-     * Returns a reference to an internal copy of the initialization vector.
-     */
-    public byte[] getIV() {
-        return iv;
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/IllegalBlockSizeException.java

@@ -1,35 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.crypto;
-
-public class IllegalBlockSizeException extends Exception { }

mozilla/security/jss/org/mozilla/jss/crypto/InternalCertificate.java

@@ -1,100 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * Certificates residing in the internal database.  Their trust flags
- * can be viewed and modified. Other types of certificates do not
- * have trust flags.
- */
-public interface InternalCertificate extends X509Certificate
-{
-    ////////////////////////////////////////////////////
-    // Trust manipulation
-    ////////////////////////////////////////////////////
-    public static final int VALID_PEER          = (1<<0);
-    public static final int TRUSTED_PEER        = (1<<1); // CERTDB_TRUSTED
-    public static final int VALID_CA            = (1<<3);
-    public static final int TRUSTED_CA          = (1<<4);
-    public static final int USER                = (1<<6);
-    public static final int TRUSTED_CLIENT_CA   = (1<<7);
-
-    /**
-     * Set the SSL trust flags for this certificate.
-     *
-     * @param trust A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract void setSSLTrust(int trust);
-
-    /**
-     * Set the email (S/MIME) trust flags for this certificate.
-     *
-     * @param trust A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract void setEmailTrust(int trust);
-
-    /**
-     * Set the object signing trust flags for this certificate.
-     *
-     * @param trust A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract void setObjectSigningTrust(int trust);
-
-    /**
-     * Get the SSL trust flags for this certificate.
-     *
-     * @return A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract int getSSLTrust();
-
-    /**
-     * Get the email (S/MIME) trust flags for this certificate.
-     *
-     * @return A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract int getEmailTrust();
-
-    /**
-     * Get the object signing trust flags for this certificate.
-     *
-     * @return A bitwise OR of the trust flags VALID_PEER, VALID_CA,
-     *      TRUSTED_CA, USER, and TRUSTED_CLIENT_CA.
-     */
-    public abstract int getObjectSigningTrust();
-}

mozilla/security/jss/org/mozilla/jss/crypto/InvalidDERException.java

@@ -1,42 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * This exception is thrown when we encounter a bogus DER blob.
- */
-public class InvalidDERException extends Exception {
-    public InvalidDERException() { super(); }
-    public InvalidDERException(String mesg) { super(mesg); }
-}

mozilla/security/jss/org/mozilla/jss/crypto/InvalidKeyFormatException.java

@@ -1,49 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * An exception of this type is thrown if an encoded private key
- * cannot be decoded.
- */
-public class InvalidKeyFormatException
-        extends java.security.spec.InvalidKeySpecException
-{
-    public InvalidKeyFormatException() {
-        super();
-    }
-    public InvalidKeyFormatException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/JSSMessageDigest.java

@@ -1,144 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.DigestException;
-import java.security.InvalidKeyException;
-
-/**
- * A class for performing message digesting (hashing) and MAC operations.
- * @deprecated Use the JCA interface instead ({@link java.security.MessageDigest})
- */
-public abstract class JSSMessageDigest {
-
-    /**
-     * Initializes an HMAC digest with the given symmetric key. This also
-     *  has the effect of resetting the digest.
-     *
-     * @exception DigestException If this algorithm is not an HMAC algorithm.
-     * @exception InvalidKeyException If the given key is not valid.
-     */
-    public abstract void initHMAC(SymmetricKey key)
-        throws DigestException, InvalidKeyException;
-
-    /**
-     * Updates the digest with a single byte of input.
-     */
-    public void update(byte input) throws DigestException {
-        byte[] in = { input };
-        update(in, 0, 1);
-    }
-
-    /**
-     * Updates the digest with a portion of an array.
-     *
-     * @param input An array from which to update the digest.
-     * @param offset The index in the array at which to start digesting.
-     * @param len The number of bytes to digest.
-     * @exception DigestException If an error occurs while digesting.
-     */
-    public abstract void update(byte[] input, int offset, int len)
-        throws DigestException;
-
-    /**
-     * Updates the digest with an array.
-     *
-     * @param input An array to feed to the digest.
-     * @exception DigestException If an error occurs while digesting.
-     */
-    public void update(byte[] input) throws DigestException {
-        update(input, 0, input.length);
-    }
-
-    /**
-     * Completes digestion.
-     * 
-     * @return The, ahem, output of the digest operation.
-     * @param If an error occurs while digesting.
-     */
-    public byte[] digest() throws DigestException {
-        byte[] output = new byte[getOutputSize()];
-        digest(output, 0, output.length);
-        return output;
-    }
-
-    /**
-     * Completes digesting, storing the result into the provided array.
-     *
-     * @param buf The buffer in which to place the digest output.
-     * @param offset The offset in the buffer at which to store the output.
-     * @param len The amount of space available in the buffer for the
-     *      digest output.
-     * @return The number of bytes actually stored into buf.
-     * @exception DigestException If the provided space is too small for
-     *      the digest, or an error occurs with the digest.
-     */
-    public abstract int digest(byte[] buf, int offset, int len)
-        throws DigestException;
-
-    /**
-     * Provides final data to the digest, then completes it and returns the
-     * output.
-     *
-     * @param input The digest's last meal.
-     * @return The completed digest.
-     * @exception DigestException If an error occurs while digesting.
-     */
-    public byte[] digest(byte[] input) throws DigestException {
-        update(input);
-        return digest();
-    }
-
-    /**
-     * Resets this digest for further use.  This clears all input and
-     * output streams. If this is an HMAC digest, the HMAC key is not
-     * cleared.
-     */
-    public abstract void reset() throws DigestException;
-
-    /**
-     * Returns the algorithm that this digest uses.
-     */
-    public abstract DigestAlgorithm getAlgorithm();
-
-    /**
-     * Returns the length of the digest created by this digest's
-     * digest algorithm.
-     *
-     * @return The size in bytes of the output of this digest.
-     */
-    public int getOutputSize() {
-        return getAlgorithm().getOutputSize();
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/JSSSecureRandom.java

@@ -1,56 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * An interface for secure random numbers.
- * @deprecated Use the JCA interface instead ({@link java.security.SecureRandom})
- */
-public interface JSSSecureRandom {
-
-    /**
-     * Seed the RNG with the given seed bytes.
-     */
-    public void setSeed(byte[] seed);
-
-    /**
-     * Seed the RNG with the eight bytes contained in <code>seed</code>.
-     */
-    public void setSeed(long seed);
-
-    /**
-     * Retrieves random bytes and stores them in the given array.
-     */
-    public void nextBytes(byte bytes[]);
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyAlreadyImportedException.java

@@ -1,45 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-/**
- * This exception is thrown if the user tries to import a
- * key which is already in the specified token
- */
-public class KeyAlreadyImportedException extends java.lang.Exception {
-    public KeyAlreadyImportedException() {}
-    public KeyAlreadyImportedException(String mesg) {
-        super(mesg);
-    }
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyGenAlgorithm.java

@@ -1,146 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import org.mozilla.jss.asn1.OBJECT_IDENTIFIER;
-import java.util.Hashtable;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * Algorithms that can be used for generating symmetric keys.
- */
-public class KeyGenAlgorithm extends Algorithm {
-
-    protected static interface KeyStrengthValidator {
-        public boolean isValidKeyStrength(int strength);
-    }
-
-    protected static class FixedKeyStrengthValidator
-            implements KeyStrengthValidator
-    {
-        private int strength;
-
-        public FixedKeyStrengthValidator(int strength) {
-            this.strength = strength;
-        }
-
-        public boolean isValidKeyStrength(int strength) {
-            return this.strength == strength;
-        }
-    }
-
-    protected KeyGenAlgorithm(int oidTag, String name,
-            KeyStrengthValidator keyStrengthValidator,
-            OBJECT_IDENTIFIER oid, Class paramClass)
-    {
-        super(oidTag, name, oid, paramClass);
-        this.keyStrengthValidator = keyStrengthValidator;
-        if(oid!=null) {
-            oidMap.put(oid, this);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////
-    // OIDs
-    ///////////////////////////////////////////////////////////////////////
-    private static final OBJECT_IDENTIFIER PKCS5 = OBJECT_IDENTIFIER.PKCS5;
-    private static final OBJECT_IDENTIFIER PKCS12_PBE =
-            OBJECT_IDENTIFIER.PKCS12.subBranch(1);
-
-    ///////////////////////////////////////////////////////////////////////
-    // OID mapping
-    ///////////////////////////////////////////////////////////////////////
-    private static Hashtable oidMap = new Hashtable();
-
-    public static KeyGenAlgorithm fromOID(OBJECT_IDENTIFIER oid)
-        throws NoSuchAlgorithmException
-    {
-        Object alg = oidMap.get(oid);
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException(oid.toString());
-        } else {
-            return (KeyGenAlgorithm) alg;
-        }
-    }
-
-    private KeyStrengthValidator keyStrengthValidator;
-
-    /**
-     * Returns <code>true</code> if the given strength is valid for this
-     * key generation algorithm. Note that PBE algorithms require
-     * PBEParameterSpecs rather than strengths.  It is the responsibility
-     * of the caller to verify this.
-     */
-    public boolean isValidStrength(int strength) {
-        return keyStrengthValidator.isValidKeyStrength(strength);
-    }
-
-    //////////////////////////////////////////////////////////////
-    public static final KeyGenAlgorithm
-    DES = new KeyGenAlgorithm(CKM_DES_KEY_GEN, "DES",
-            new FixedKeyStrengthValidator(56), null, null);
-
-    //////////////////////////////////////////////////////////////
-    public static final KeyGenAlgorithm
-    DES3 = new KeyGenAlgorithm(CKM_DES3_KEY_GEN, "DESede",
-            new FixedKeyStrengthValidator(168), null, null);
-
-    public static final KeyGenAlgorithm
-    DESede = DES3;
-
-    //////////////////////////////////////////////////////////////
-    public static final KeyGenAlgorithm
-    RC4 = new KeyGenAlgorithm(CKM_RC4_KEY_GEN, "RC4",
-            new KeyStrengthValidator() {
-                public boolean isValidKeyStrength(int strength) {
-                    return true;
-                }
-            }, null, null);
-
-    //////////////////////////////////////////////////////////////
-    public static final KeyGenAlgorithm
-    PBA_SHA1_HMAC = new KeyGenAlgorithm(
-        CKM_PBA_SHA1_WITH_SHA1_HMAC,
-            "PBA/SHA1/HMAC", new FixedKeyStrengthValidator(160),
-            null, PBEKeyGenParams.class );
-
-    //////////////////////////////////////////////////////////////
-    public static final KeyGenAlgorithm
-    AES = new KeyGenAlgorithm(CKM_AES_KEY_GEN, "AES", 
-            new KeyStrengthValidator() {
-                public boolean isValidKeyStrength(int strength) {
-                    return strength==128 || strength==192 || strength==256;
-                }
-            }, null, null);
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyGenerator.java

@@ -1,112 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.io.CharConversionException;
-
-/**
- * Generates symmetric keys for encryption and decryption.
- * @deprecated Use the JCA interface instead ({@link javax.crypto.KeyGenerator})
- */
-public interface KeyGenerator {
-
-    /**
-     * @param strength Key size in bits. Must be evenly divisible by 8.
-     */
-    public void initialize(int strength)
-        throws InvalidAlgorithmParameterException;
-
-    public void initialize(AlgorithmParameterSpec parameters)
-        throws InvalidAlgorithmParameterException;
-
-    public SymmetricKey generate()
-        throws IllegalStateException, TokenException, CharConversionException;
-
-    /**
-     * Generates an Initialization Vector using a PBE algorithm.
-     * In order to call this method, the algorithm must be a PBE algorithm,
-     * and the KeyGenerator must have been initialized with an instance
-     * of <code>PBEKeyGenParams</code>.
-     *
-     * @return The initialization vector derived from the password and salt
-     *      using the PBE algorithm.
-     * @exception IllegalStateException If the algorithm is not a PBE
-     *      algorithm, or the KeyGenerator has not been initialized with
-     *      an instance of <code>PBEKeyGenParams</code>.
-     * @exception TokenException If an error occurs on the CryptoToken while
-     *      generating the IV.
-     */
-    public byte[] generatePBE_IV()
-        throws IllegalStateException, TokenException, CharConversionException;
-
-    /**
-     * Allows a SymmetricKey to be cloned on a different token.
-     *
-     * @exception SymmetricKey.NotExtractableException If the key material
-     *      cannot be extracted from the current token.
-     * @exception InvalidKeyException If the owning token cannot process
-     *      the key to be cloned.
-     */
-    public SymmetricKey clone(SymmetricKey key)
-        throws SymmetricKey.NotExtractableException,
-            InvalidKeyException, TokenException;
-
-    /**
-     * An interface for converting a password of Java characters into an array
-     * of bytes. This conversion must be performed to provide a byte array
-     * to the low-level crypto engine.  The default conversion is UTF8.
-     * Null-termination is not necessary, and indeed is usually incorrect,
-     * since the password is passed to the crypto engine as a byte array, not
-     * a C string.
-     */
-    public static interface CharToByteConverter {
-
-        /**
-         * Converts a password of Java characters into a password of
-         * bytes, using some encoding scheme.  The input char array must
-         * not be modified.
-         */
-        public byte[] convert(char[] chars) throws CharConversionException;
-    }
-
-    /**
-     * Sets the character to byte converter for passwords. The default
-     * conversion is UTF8 with no null termination.
-     */
-    public void setCharToByteConverter(CharToByteConverter charToByte);
-
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyPairAlgorithm.java

@@ -1,98 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.Hashtable;
-
-/**
- * Algorithms that can be used for keypair generation.
- */
-public class KeyPairAlgorithm extends Algorithm {
-
-    protected KeyPairAlgorithm(int oidIndex, String name, Algorithm algFamily) {
-        super(oidIndex, name);
-        this.algFamily = algFamily;
-        nameMap.put(name, this);
-    }
-
-    /**
-     * Returns the algorithm family for a given key pair generation algorithm.
-     * If a token supports a family and is writable, we can do keypair gen
-     * on the token even if it doesn't support the keypair gen algorithm.
-     * We do this by doing the keypair gen on the internal module and then
-     * moving the key out to the other token.
-     */
-    public Algorithm
-    getAlgFamily()
-    {
-        return algFamily;
-    }
-
-    private static Hashtable nameMap = new Hashtable();
-
-    /**
-     * Looks up a key pair generation algorithm from its name. The names
-     * are those specified in the JCA spec. For example, "RSA" and "DSA".
-     *
-     * @throws NoSuchAlgorithmException If the name of the algorithm is not
-     *  recognized as a supported algorithm.
-     */
-    public static KeyPairAlgorithm fromString(String algName)
-        throws NoSuchAlgorithmException
-    {
-        KeyPairAlgorithm alg = (KeyPairAlgorithm)nameMap.get(algName);
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException();
-        }
-        return alg;
-    }
-
-    protected Algorithm algFamily;
-
-    ////////////////////////////////////////////////////////////////
-    // Key-Pair Generation Algorithms
-    ////////////////////////////////////////////////////////////////
-    public static final Algorithm
-    RSAFamily = new Algorithm(SEC_OID_PKCS1_RSA_ENCRYPTION, "RSA");
-
-    public static final Algorithm
-    DSAFamily = new Algorithm(SEC_OID_ANSIX9_DSA_SIGNATURE, "DSA");
-
-    public static final KeyPairAlgorithm
-    RSA = new KeyPairAlgorithm(CKM_RSA_PKCS_KEY_PAIR_GEN, "RSA", RSAFamily);
-
-    public static final KeyPairAlgorithm
-    DSA = new KeyPairAlgorithm(CKM_DSA_KEY_PAIR_GEN, "DSA", DSAFamily);
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGenerator.java

@@ -1,170 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.*;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-/**
- * Generates RSA and DSA key pairs.  Each CryptoToken provides a
- * KeyPairGenerator, which can be used to generate key pairs on that token.
- * A given token may not support all algorithms, and some tokens may not
- * support any key pair generation. If a token does not support key pair
- * generation, the Netscape internal token may do it instead. Call
- * <code>keygenOnInternalToken</code> to find out if this is happening.
- *
- * @see org.mozilla.jss.crypto.CryptoToken#getKeyPairGenerator
- * @deprecated Use the JCA interface instead ({@link java.security.KeyPairGenerator})
- */
-public class KeyPairGenerator {
-
-    /**
-     * Creates a new key pair generator.  KeyPairGenerators should
-     * be obtained by calling <code>CryptoToken.getKeyPairGenerator</code>
-     * instead of calling this constructor.
-     *
-     * @param algorithm The type of keys that the generator will be
-     *      used to generate.
-     * @param engine The engine object that provides the implementation for
-     *      the class.
-     */
-	public KeyPairGenerator(KeyPairAlgorithm algorithm,
-							KeyPairGeneratorSpi engine) {
-		this.algorithm = algorithm;
-		this.engine = engine;
-	}
-
-    /**
-     * Generates a new key pair.
-     *
-     * @return A new key pair. The keys reside on the CryptoToken that 
-     *      provided this <code>KeyPairGenerator</code>.
-     * @exception TokenException If an error occurs on the CryptoToken
-     *      in the process of generating the key pair.
-     */
-	public java.security.KeyPair
-	genKeyPair() throws TokenException {
-		return engine.generateKeyPair();
-	}
-
-    /**
-     * @return The type of key that this generator generates.
-     */
-	public KeyPairAlgorithm getAlgorithm() {
-		return algorithm;
-	}
-
-    /**
-     * Initializes the generator with algorithm-specific parameters.
-     *  The <tt>SecureRandom</tt> parameters is ignored.
-     *
-     * @param params Algorithm-specific parameters for the key pair generation.
-     * @param random <b>This parameter is ignored.</b> NSS does not accept
-     *      an external source of random numbers.
-     * @exception InvalidAlgorithmParameterException If the parameters are
-     *      inappropriate for the type of key pair that is being generated,
-     *      or they are not supported by this generator.
-     * @see org.mozilla.jss.crypto.RSAParameterSpec
-     * @see java.security.spec.DSAParameterSpec
-     */
-	public void initialize(AlgorithmParameterSpec params, SecureRandom random)
-            throws InvalidAlgorithmParameterException
-    {
-		engine.initialize(params, random);
-	}
-
-    /**
-     * Initializes the generator with algorithm-specific parameters.
-     *
-     * @param params Algorithm-specific parameters for the key pair generation.
-     * @exception InvalidAlgorithmParameterException If the parameters are
-     *      inappropriate for the type of key pair that is being generated,
-     *      or they are not supported by this generator.
-     * @see org.mozilla.jss.crypto.RSAParameterSpec
-     * @see java.security.spec.DSAParameterSpec
-     */
-	public void initialize(AlgorithmParameterSpec params)
-		throws InvalidAlgorithmParameterException
-	{
-		engine.initialize(params, null);
-	}
-
-    /**
-     * Initializes the generator with the strength of the keys.
-     *      The <tt>SecureRandom</tt> parameter is ignored.
-     *
-     * @param strength The strength of the keys that will be generated.
-     *      Usually this is the length of the key in bits.
-     * @param random <b>This parameter is ignored.</b> NSS does not accept
-     *      an exterrnal source of random numbers.
-     */
-	public void initialize(int strength, SecureRandom random) {
-		engine.initialize(strength, random);
-	}
-
-    /**
-     * Initializes the generator with the strength of the keys.
-     *
-     * @param strength The strength of the keys that will be generated.
-     *      Usually this is the length of the key in bits.
-     */
-	public void initialize(int strength) {
-		engine.initialize(strength, null);
-	}
-
-    /**
-     * @return true if the keypair generation will take place on the 
-     *      internal token rather than the current token.  This will
-     *      happen if the token does not support keypair generation
-     *      but does support this algorithm and is writable.  In this
-     *      case the keypair will be generated on the Netscape internal
-     *      token and then moved to this token.
-     */
-    public boolean keygenOnInternalToken() {
-        return engine.keygenOnInternalToken();
-    }
-
-    /**
-     * Tells the generator to generate temporary, rather than permanent,
-     * keypairs.  Temporary keys are not written permanently to the token.
-     * They are destroyed by the garbage collector.
-     */
-    public void temporaryPairs(boolean temp) {
-        engine.temporaryPairs(temp);
-    }
-
-	protected KeyPairAlgorithm algorithm;
-	protected KeyPairGeneratorSpi engine;
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyPairGeneratorSpi.java

@@ -1,56 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.security.*;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-public abstract class KeyPairGeneratorSpi {
-
-    public KeyPairGeneratorSpi() {
-    }
-
-    public abstract void initialize(int strength, SecureRandom random);
-
-    public abstract void initialize(AlgorithmParameterSpec params,
-                                    SecureRandom random)
-        throws InvalidAlgorithmParameterException;
-
-    public abstract KeyPair generateKeyPair() throws TokenException;
-
-    public abstract void temporaryPairs(boolean temp);
-
-    public abstract boolean keygenOnInternalToken();
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyWrapAlgorithm.java

@@ -1,118 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-package org.mozilla.jss.crypto;
-
-import java.util.Hashtable;
-import java.security.NoSuchAlgorithmException;
-
-/**
- *
- */
-public class KeyWrapAlgorithm extends Algorithm {
-    protected KeyWrapAlgorithm(int oidTag, String name, Class paramClass,
-        boolean padded, int blockSize) {
-        super(oidTag, name, null, paramClass);
-        this.padded = padded;
-        this.blockSize = blockSize;
-        if( name != null ) {
-            nameMap.put(name.toLowerCase(), this);
-        }
-    }
-
-    private boolean padded;
-    private int blockSize;
-
-    private static Hashtable nameMap = new Hashtable();
-
-    public static KeyWrapAlgorithm fromString(String name)
-            throws NoSuchAlgorithmException
-    {
-        Object alg = nameMap.get( name.toLowerCase() );
-        if( alg == null ) {
-            throw new NoSuchAlgorithmException();
-        } else {
-            return (KeyWrapAlgorithm) alg;
-        }
-    }
-
-    public boolean isPadded() {
-        return padded;
-    }
-
-    public int getBlockSize() {
-        return blockSize;
-    }
-
-    public static final KeyWrapAlgorithm
-    DES_ECB = new KeyWrapAlgorithm(SEC_OID_DES_ECB, "DES/ECB", null, false, 8);
-
-    public static final KeyWrapAlgorithm
-    DES_CBC = new KeyWrapAlgorithm(SEC_OID_DES_CBC, "DES/CBC",
-                        IVParameterSpec.class, false, 8);
-
-    public static final KeyWrapAlgorithm
-    DES_CBC_PAD = new KeyWrapAlgorithm(CKM_DES_CBC_PAD, "DES/CBC/Pad",
-                        IVParameterSpec.class, true, 8);
-
-    public static final KeyWrapAlgorithm
-    DES3_ECB = new KeyWrapAlgorithm(CKM_DES3_ECB, "DES3/ECB", null, false, 8);
-
-    public static final KeyWrapAlgorithm
-    DES3_CBC = new KeyWrapAlgorithm(SEC_OID_DES_EDE3_CBC, "DES3/CBC",
-                        IVParameterSpec.class, false, 8);
-
-    public static final KeyWrapAlgorithm
-    DES3_CBC_PAD = new KeyWrapAlgorithm(CKM_DES3_CBC_PAD, "DES3/CBC/Pad",
-                        IVParameterSpec.class, true, 8);
-
-    public static final KeyWrapAlgorithm
-    RSA = new KeyWrapAlgorithm(SEC_OID_PKCS1_RSA_ENCRYPTION, "RSA", null,
-            false, 0);
-
-    public static final KeyWrapAlgorithm
-    PLAINTEXT = new KeyWrapAlgorithm(0, "Plaintext", null,
-            false, 0);
-
-    public static final KeyWrapAlgorithm
-    AES_ECB = new KeyWrapAlgorithm(CKM_AES_ECB, "AES/ECB/NoPadding", null,
-                    false, 16);
-
-    public static final KeyWrapAlgorithm
-    AES_CBC = new KeyWrapAlgorithm(CKM_AES_CBC, "AES/CBC/NoPadding",
-                        IVParameterSpec.class, false, 16);
-
-    public static final KeyWrapAlgorithm
-    AES_CBC_PAD = new KeyWrapAlgorithm(CKM_AES_CBC_PAD, "AES/CBC/PKCS5Padding",
-                        IVParameterSpec.class, true, 16);
-}

mozilla/security/jss/org/mozilla/jss/crypto/KeyWrapper.java

@@ -1,136 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Netscape Security Services for Java.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are 
- * Copyright (C) 1998-2000 Netscape Communications Corporation.  All
- * Rights Reserved.
- * 
- * Contributor(s):
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-package org.mozilla.jss.crypto;
-
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.PublicKey;
-import java.security.InvalidKeyException;
-
-/**
- * @deprecated Use the JCA interface instead ({@link javax.crypto.Cipher})
- */
-public interface KeyWrapper {
-
-    public void initWrap(SymmetricKey wrappingKey,
-                            AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    public void initWrap(PublicKey wrappingKey,
-                            AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    /**
-     * For wrapping keys in plaintext.
-     */
-    public void initWrap()
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    public void initUnwrap(SymmetricKey unwrappingKey,
-                            AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    public void initUnwrap(PrivateKey unwrappingKey,
-                            AlgorithmParameterSpec parameters)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    /**
-     * For plaintext-wrapped keys.
-     */
-    public void initUnwrap()
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    public byte[] wrap(PrivateKey toBeWrapped)
-        throws InvalidKeyException, IllegalStateException, TokenException;
-
-    public byte[] wrap(SymmetricKey toBeWrapped)
-        throws InvalidKeyException, IllegalStateException, TokenException;
-
-    /**
-     * Unwraps a private key, creating a permanent private key object.
-     * A permanent private key object resides on a token until it is
-     * explicitly deleted from the token.
-     *
-     * @param publicKey Used to calculate the key identifier that must be stored
-     *  with the private key. Must be a <code>RSAPublicKey</code> or a
-     *  <code>DSAPublicKey</code>.
-     * @exception InvalidKeyException If the type of the public key does not
-     *  match the type of the private key to be unwrapped.
-     */
-    public PrivateKey unwrapPrivate(byte[] wrapped, PrivateKey.Type type,
-        PublicKey publicKey)
-        throws TokenException, InvalidKeyException, IllegalStateException;
-
-    /**
-     * Unwraps a private key, creating a temporary private key object.
-     * A temporary
-     * private key is one that does not permanently reside on a token.
-     * As soon as it is garbage-collected, it is gone forever.
-     *
-     * @param publicKey Used to calculate the key identifier that must be stored
-     *  with the private key. Must be a <code>RSAPublicKey</code> or a
-     *  <code>DSAPublicKey</code>.
-     * @exception InvalidKeyException If the type of the public key does not
-     *  match the type of the private key to be unwrapped.
-     */
-    public PrivateKey unwrapTemporaryPrivate(byte[] wrapped,
-        PrivateKey.Type type, PublicKey publicKey)
-        throws TokenException, InvalidKeyException, IllegalStateException;
-
-    /**
-     * @param keyLength The expected length of the key in bytes.  This is 
-     *   only used for variable-length keys (RC4) and non-padding
-     *   algorithms. Otherwise, it can be set to anything(like 0).
-     * @param usage The operation the key will be used for after it is
-     *   unwrapped. You have to specify this so that the key can be properly
-     *   marked with the operation it supports. Some PKCS #11 tokens require
-     *   that a key be marked for an operation before it can perform that
-     *   operation.
-     */
-    public SymmetricKey unwrapSymmetric(byte[] wrapped, SymmetricKey.Type type,
-        SymmetricKey.Usage usage, int keyLength)
-        throws TokenException, IllegalStateException,
-            InvalidAlgorithmParameterException;
-
-    /**
-     * Unwraps a key and allows it to be used for all operations.
-     * @param keyLength The expected length of the key in bytes.  This is 
-     *   only used for variable-length keys (RC4) and non-padding
-     *   algorithms. Otherwise, it can be set to anything(like 0).
-     */
-    public SymmetricKey unwrapSymmetric(byte[] wrapped, SymmetricKey.Type type,
-        int keyLength)
-        throws TokenException, IllegalStateException,
-            InvalidAlgorithmParameterException;
-
-}

mozilla/security/jss/org/mozilla/jss/crypto/Makefile

@@ -1,72 +0,0 @@
-#! gmake
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Security Services for Java.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-#######################################################################
-# (1) Include initial platform-independent assignments (MANDATORY).   #
-#######################################################################
-
-include manifest.mn
-
-#######################################################################
-# (2) Include "global" configuration information. (OPTIONAL)          #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/config.mk
-
-#######################################################################
-# (3) Include "component" configuration information. (OPTIONAL)       #
-#######################################################################
-include $(CORE_DEPTH)/$(MODULE)/config/config.mk
- 
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-
-include config.mk
-
-#######################################################################
-# (5) Execute "global" rules. (OPTIONAL)                              #
-#######################################################################
-
-include $(CORE_DEPTH)/coreconf/rules.mk
-
-#######################################################################
-# (6) Execute "component" rules. (OPTIONAL)                           #
-#######################################################################
-
-
-#######################################################################
-# (7) Execute "local" rules. (OPTIONAL).                              #
-#######################################################################
-