diff options
author | cvs2hg <devnull@localhost> | 2000-10-07 00:56:31 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2000-10-07 00:56:31 +0000 |
commit | a83295c043f27aabb2da612c0bbae3f4eff3fc7a (patch) | |
tree | 70e28aac44885ac02d7dffc67cf7198a221860a5 | |
parent | b8b14c9aa1ded53b794f9f20fc4b5d883f4ae610 (diff) | |
download | nss-hg-a83295c043f27aabb2da612c0bbae3f4eff3fc7a.tar.gz |
fixup commit for branch 'PSM_1_4_N6_BRANCH'PSM_1_4_N6
28 files changed, 10 insertions, 4563 deletions
diff --git a/security/coreconf/HP-UX.mk b/security/coreconf/HP-UX.mk index 7de6c2465..0c3d4440f 100644 --- a/security/coreconf/HP-UX.mk +++ b/security/coreconf/HP-UX.mk @@ -59,8 +59,6 @@ ifdef PTHREADS_USER OS_CFLAGS += -D_POSIX_C_SOURCE=199506L endif -LDFLAGS = -z -Wl,+s - MKSHLIB = $(LD) $(DSO_LDOPTS) DSO_LDOPTS = -b diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk deleted file mode 100644 index c3b7c83c2..000000000 --- a/security/coreconf/OS2.mk +++ /dev/null @@ -1,162 +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) 1994-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. -# - -MOZ_WIDGET_TOOLKIT = os2 - -# Specify toolset. Default to EMX. -ifeq ($(MOZ_OS2_TOOLS),VACPP) -XP_OS2_VACPP = 1 -else -ifeq ($(MOZ_OS2_TOOLS),PGCC) -XP_OS2_EMX = 1 -else -MOZ_OS2_TOOLS = EMX -XP_OS2_EMX = 1 -endif -endif - -# XP_PC is for Window and OS2 on Intel X86 -# XP_OS2 is strictly for OS2 only -XP_DEFINE += -DXP_PC=1 -DXP_OS2=1 - -# Override suffix in suffix.mk -LIB_SUFFIX = lib -DLL_SUFFIX = dll -OBJ_SUFFIX = .obj -ASM_SUFFIX = .asm -PROG_SUFFIX = .exe - - -# -# On OS/2 we proudly support gbash... -# -SHELL = GBASH.EXE -CCC = icc -q -DXP_OS2 -DOS2=4 -N10 -LINK = ilink -AR = emxomfar -p256 r $@ -# Keep AR_FLAGS blank so that we do not have to change rules.mk -AR_FLAGS = -RANLIB = @echo OS2 RANLIB -BSDECHO = @echo OS2 BSDECHO - -ifndef NO_SHARED_LIB -WRAP_MALLOC_LIB = -WRAP_MALLOC_CFLAGS = -DSO_CFLAGS = -DSO_PIC_CFLAGS = -MKSHLIB = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@ -MKCSHLIB = $(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@ -MKSHLIB_FORCE_ALL = -MKSHLIB_UNFORCE_ALL = -DSO_LDOPTS = -Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO -# DLL_SUFFIX = .dll -SHLIB_LDSTARTFILE = -SHLIB_LDENDFILE = -endif - -# HCT Include from Mozilla client build. -INCLUDES = -I$(CORE_DEPTH)/../dist/include -I$(CORE_DEPTH)/../include - -# This is where Mozilla Client build DIST & INCLUDE. -# while DIST is where Security build put it LIB & INCLUDE -MOZ_DIST = $(CORE_DEPTH)/../dist -MOZ_LIB = $(CORE_DEPTH)/../dist/lib - -OS_CFLAGS = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zmtd -Zomf -Zmt -DDEBUG -DDEBUG_wintrinh -DTRACING -g - -# Where the libraries are -MOZ_COMPONENT_NSPR_LIBS=-L$(DIST)/lib $(NSPR_LIBS) -NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -NSPR_INCLUDE_DIR = - - - -ifdef BUILD_OPT -OPTIMIZER = -O+ -Oi -DEFINES += -UDEBUG -U_DEBUG -DNDEBUG -DLLFLAGS = -DLL -OUT:$@ -MAP:$(@:.dll=.map) -EXEFLAGS = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE -OBJDIR_TAG = _OPT -else -#OPTIMIZER = -O+ -Oi -DEFINES += -DDEBUG -D_DEBUG -DDEBUGPRINTS #HCT Need += to avoid overidding manifest.mn -DLLFLAGS = -DEBUG -DLL -OUT:$@ -MAP:$(@:.dll=.map) -EXEFLAGS = -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE -OBJDIR_TAG = _DBG -LDFLAGS = -DEBUG -endif - -# OS/2 use nsinstall that is included in the toolkit. -# since we do not wish to support and maintain 3 version of nsinstall in mozilla, nspr and nss - -NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall -# NSINSTALL = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall -NSINSTALL = nsinstall # HCT4OS2 -INSTALL = $(NSINSTALL) - -MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend -MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend -MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk - -#################################################################### -# -# One can define the makefile variable NSDISTMODE to control -# how files are published to the 'dist' directory. If not -# defined, the default is "install using relative symbolic -# links". The two possible values are "copy", which copies files -# but preserves source mtime, and "absolute_symlink", which -# installs using absolute symbolic links. The "absolute_symlink" -# option requires NFSPWD. -# - THIS IS NOT PART OF THE NEW BINARY RELEASE PLAN for 9/30/97 -# - WE'RE KEEPING IT ONLY FOR BACKWARDS COMPATIBILITY -#################################################################### - -ifeq ($(NSDISTMODE),copy) - # copy files, but preserve source mtime - INSTALL = $(NSINSTALL) - INSTALL += -t -else - ifeq ($(NSDISTMODE),absolute_symlink) - # install using absolute symbolic links - INSTALL = $(NSINSTALL) - INSTALL += -L `$(NFSPWD)` - else - # install using relative symbolic links - INSTALL = $(NSINSTALL) - INSTALL += -R - endif -endif - -define MAKE_OBJDIR -if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi -endef diff --git a/security/coreconf/OSF1.mk b/security/coreconf/OSF1.mk index 37484fcb9..3b7cdab5f 100644 --- a/security/coreconf/OSF1.mk +++ b/security/coreconf/OSF1.mk @@ -57,6 +57,10 @@ endif NON_LD_FLAGS += -ieee_with_inexact OS_CFLAGS += -DOSF1 -D_REENTRANT +ifneq ($(USE_64), 1) + LDFLAGS += -taso +endif + ifeq ($(USE_PTHREADS),1) OS_CFLAGS += -pthread endif diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk index 57af21a2d..691acb856 100644 --- a/security/coreconf/arch.mk +++ b/security/coreconf/arch.mk @@ -290,12 +290,3 @@ endif endif endif -# -# For OS/2 -# -ifeq ($(OS_ARCH), OS_2) -OS_ARCH := OS2 -OS_RELEASE := $(shell uname -v) -OS_CONFIG := $(OS_ARCH) -endif - diff --git a/security/coreconf/suffix.mk b/security/coreconf/suffix.mk index 9c741cce1..e1db4ed7d 100644 --- a/security/coreconf/suffix.mk +++ b/security/coreconf/suffix.mk @@ -43,11 +43,7 @@ ifndef OBJ_SUFFIX ifeq ($(OS_ARCH), WINNT) OBJ_SUFFIX = .obj else - ifeq ($(OS_ARCH), OS2) - OBJ_SUFFIX = .obj - else OBJ_SUFFIX = .o - endif endif endif @@ -131,10 +127,6 @@ ifndef PROG_SUFFIX ifeq ($(OS_ARCH), WINNT) PROG_SUFFIX = .exe else - ifeq ($(OS_ARCH), OS2) - PROG_SUFFIX = .exe - else PROG_SUFFIX = - endif endif endif diff --git a/security/coreconf/tree.mk b/security/coreconf/tree.mk index 9c4c78bbc..0517a6df3 100644 --- a/security/coreconf/tree.mk +++ b/security/coreconf/tree.mk @@ -53,10 +53,10 @@ ifndef RELEASE_TREE ifdef USE_SHIPS RELEASE_TREE = $(NTBUILD_SHIP) else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif endif @@ -65,10 +65,10 @@ ifndef RELEASE_TREE ifdef USE_SHIPS RELEASE_TREE = $(NTBUILD_SHIP) else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif endif ifeq ($(OS_TARGET), WIN16) @@ -76,10 +76,10 @@ ifndef RELEASE_TREE ifdef USE_SHIPS RELEASE_TREE = $(NTBUILD_SHIP) else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif else - RELEASE_TREE = //iridium/components + RELEASE_TREE = //helium/dist endif endif endif diff --git a/security/nss/macbuild/NSS.Prefix b/security/nss/macbuild/NSS.Prefix deleted file mode 100755 index 9a088a3b1..000000000 --- a/security/nss/macbuild/NSS.Prefix +++ /dev/null @@ -1,3 +0,0 @@ -/* Optimized prefix */ -#include "MacPrefix.h" -#include "NSSCommon.h" diff --git a/security/nss/macbuild/NSS.mcp b/security/nss/macbuild/NSS.mcp Binary files differdeleted file mode 100755 index b9e31ff84..000000000 --- a/security/nss/macbuild/NSS.mcp +++ /dev/null diff --git a/security/nss/macbuild/NSSCommon.h b/security/nss/macbuild/NSSCommon.h deleted file mode 100755 index 8c9237673..000000000 --- a/security/nss/macbuild/NSSCommon.h +++ /dev/null @@ -1,3 +0,0 @@ -/* Defines common to all versions of NSS */ - -#define NSPR20 1 diff --git a/security/nss/macbuild/NSSDebug.Prefix b/security/nss/macbuild/NSSDebug.Prefix deleted file mode 100755 index 967b0889c..000000000 --- a/security/nss/macbuild/NSSDebug.Prefix +++ /dev/null @@ -1,3 +0,0 @@ -/* Optimized prefix */ -#include "MacPrefix_debug.h" -#include "NSSCommon.h" diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh deleted file mode 100755 index ca0fba124..000000000 --- a/security/nss/tests/all.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Run all our tests -# -CURDIR=`pwd` -TESTS="ssl" -cd common -. ./init.sh -export MOZILLA_ROOT -export COMMON -export DIST -export SECURITY_ROOT -export TESTDIR -export OBJDIR -export HOSTDIR - -LOGFILE=${HOSTDIR}/output.log -export LOGFILE -touch ${LOGFILE} -tail -f ${LOGFILE} & -TAILPID=$! -trap "kill ${TAILPID}; exit" 2 -for i in ${TESTS} -do - echo "Running Tests for $i" -# -# All tells the test suite to run through all their tests. -# file tells the test suite that the output is going to a log, so any -# forked() children need to redirect their output to prevent them from -# being over written. - - (cd ${CURDIR}/$i ; ./${i}.sh all file >> ${LOGFILE} 2>&1) -# cd ${CURDIR}/$i ; ./${i}.sh -done -kill ${TAILPID} diff --git a/security/nss/tests/common/arch.sh b/security/nss/tests/common/arch.sh deleted file mode 100755 index b2f6475c4..000000000 --- a/security/nss/tests/common/arch.sh +++ /dev/null @@ -1,313 +0,0 @@ -#!/bin/sh -# 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) 1994-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. -# - -####################################################################### -# Master "Core Components" macros for getting the OS architecture # -####################################################################### - -# -# Macros for getting the OS architecture -# -if [ -n "${USE_64}" ]; then - A64BIT_TAG=_64 -else - A64BIT_TAG= -fi - -#OS_ARCH := $(subst /,_,$(shell uname -s)) -OS_ARCH=`uname -s | sed -e 's;/;_;'` - -# -# Attempt to differentiate between sparc and x86 Solaris -# - -#OS_TEST := $(shell uname -m) -OS_TEST=`uname -m` -if [ ${OS_TEST} = "i86pc" ]; then - OS_RELEASE=`uname -r`"_"${OS_TEST} -else - OS_RELEASE=`uname -r` -fi - -# -# Force the IRIX64 machines to use IRIX. -# -if [ ${OS_ARCH} = "IRIX64" ]; then - OS_ARCH="IRIX" -fi - -# -# Force the newer BSDI versions to use the old arch name. -# - -if [ ${OS_ARCH} = "BSD_OS" ]; then - OS_ARCH=BSD_386 -fi - -# -# Catch Deterim if SVR4 is NCR or UNIXWARE -# - -if [ ${OS_ARCH} = "UNIX_SV" ]; then - if grep NCR /etc/bcheckrc ; then - OS_ARCH=NCR - else - # Make UnixWare something human readable - OS_ARCH=UNIXWARE - fi - - # Get the OS release number, not 4.2 - OS_RELEASE=`uname -v` -fi - -if [ ${OS_ARCH} = "UNIX_System_V" ]; then - OS_ARCH=NEC -fi - -if [ ${OS_ARCH} = "AIX" ]; then - OS_MAJOR=`uname -v` - OS_MINOR=`uname -r` - OS_RELEASE=${OS_MAJOR}.${OS_MINOR} -fi - -# -# Distinguish between OSF1 V4.0B and V4.0D -# - -if [ ${OS_ARCH}${OS_RELEASE} = "OSF1V4.0" ]; then - OS_VERSION=`uname -v` - if [ ${OS_VERSION} = "564" ]; then - OS_RELEASE=V4.0B - fi - if [ ${OS_VERSION} = "878" ]; then - OS_RELEASE=V4.0D - fi -fi - -# -# SINIX changes name to ReliantUNIX with 5.43 -# - -if [ ${OS_ARCH} = "ReliantUNIX-N" ]; then - OS_ARCH=ReliantUNIX - OS_RELEASE=5.4 -fi - -if [ ${OS_ARCH} = "SINIX-N" ]; then - OS_ARCH=ReliantUNIX - OS_RELEASE=5.4 -fi - -# -# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 -# - -#if [(,$(filter-out Linux FreeBSD,${OS_ARCH})) -#OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//') -#endif -if [ ${OS_ARCH} = "Linux" ]; then - OS_RELEASE=`echo ${OS_RELEASE} | sed 's/-.*//'` -fi - -if [ ${OS_ARCH} = "Linux" ]; then - OS_RELEASE=`echo ${OS_RELEASE} | sed 's;\\.[0123456789]*$;;'` -fi - -####################################################################### -# Master "Core Components" macros for getting the OS target # -####################################################################### - -# -# Note: OS_TARGET should be specified on the command line for gmake. -# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built. -# The difference between the Win95 target and the WinNT target is that -# the WinNT target uses Windows NT specific features not available -# in Windows 95. The Win95 target will run on Windows NT, but (supposedly) -# at lesser performance (the Win95 target uses threads; the WinNT target -# uses fibers). -# -# When OS_TARGET=WIN16 is specified, then a Windows 3.11 (16bit) target -# is built. See: win16_3.11.mk for lots more about the Win16 target. -# -# If OS_TARGET is not specified, it defaults to ${OS_ARCH}, i.e., no -# cross-compilation. -# - -# -# The following hack allows one to build on a WIN95 machine (as if -# s/he were cross-compiling on a WINNT host for a WIN95 target). -# It also accomodates for MKS's uname.exe. If you never intend -# to do development on a WIN95 machine, you don't need this. It doesn't -# work any more anyway. -# -if [ ${OS_ARCH} = "WIN95" ]; then - OS_ARCH=WINNT - OS_TARGET=WIN95 -fi -if [ ${OS_ARCH} = "Windows_95" ]; then - OS_ARCH=Windows_NT - OS_TARGET=WIN95 -fi - -# -# On WIN32, we also define the variable CPU_ARCH. -# - -if [ ${OS_ARCH} = "WINNT" ]; then - CPU_ARCH=`uname -p` - if [ ${CPU_ARCH} = "I386" ]; then - CPU_ARCH=x386 - fi -else -# -# If uname -s returns "Windows_NT", we assume that we are using -# the uname.exe in MKS toolkit. -# -# The -r option of MKS uname only returns the major version number. -# So we need to use its -v option to get the minor version number. -# Moreover, it doesn't have the -p option, so we need to use uname -m. -# -if [ ${OS_ARCH} = "Windows_NT" ]; then - OS_ARCH=WINNT - OS_MINOR_RELEASE=`uname -v` - if [ ${OS_MINOR_RELEASE} = "00" ]; then - OS_MINOR_RELEASE=0 - fi - OS_RELEASE=${OS_RELEASE}.${OS_MINOR_RELEASE} - CPU_ARCH=`uname -m` - # - # MKS's uname -m returns "586" on a Pentium machine. - # - #ifneq (,$(findstring 86,$(CPU_ARCH))) - if (echo $CPU_ARCH | grep 86) ; then - CPU_ARCH=x386 - fi -fi -fi - -if [ ${OS_ARCH} = "Linux" ]; then - IMPL_STRATEGY=_PTH - - if [ ${OS_TEST} = "ppc" ]; then - CPU_TAG=_ppc - elif [ ${OS_TEST} = "alpha" ]; then - CPU_TAG=_alpha - else - CPU_TAG=_x86 - fi - LIBC_TAG=_glibc - ARCH=linux -fi - -OS_TARGET=${OS_TARGET-${OS_ARCH}} - -if [ ${OS_TARGET} = "WIN95" ]; then - OS_RELEASE=4.0 -fi - -if [ ${OS_TARGET} = "WIN16" ]; then - OS_RELEASE= -# OS_RELEASE = _3.11 -fi - -# -# This variable is used to get OS_CONFIG.mk. -# - -OS_CONFIG=${OS_TARGET}${OS_RELEASE} - -# -# OBJDIR_TAG depends on the predefined variable BUILD_OPT, -# to distinguish between debug and release builds. -# - -if [ -n "${BUILD_OPT}" ]; then - if [ ${OS_TARGET} = "WIN16" ]; then - OBJDIR_TAG=_O - else - OBJDIR_TAG=${A64BIT_TAG}_OPT - fi -else - if [ -n "${BUILD_IDG}" ]; then - if [ ${OS_TARGET} = "WIN16" ]; then - OBJDIR_TAG=_I - else - OBJDIR_TAG=${A64BIT_TAG}_IDG - fi - else - if [ ${OS_TARGET} = WIN16 ]; then - OBJDIR_TAG=_D - else - OBJDIR_TAG=${A64BIT_TAG}_DBG - fi - fi -fi - -# -# The following flags are defined in the individual $(OS_CONFIG).mk -# files. -# -# CPU_TAG is defined if the CPU is not the most common CPU. -# COMPILER_TAG is defined if the compiler is not the native compiler. -# IMPL_STRATEGY may be defined too. -# - -# Name of the binary code directories -#ifeq (${OS_ARCH}, WINNT) -# ifeq ($(CPU_ARCH),x386) -## OBJDIR_NAME=$(OS_CONFIG)$(OBJDIR_TAG).OBJ -# else -# OBJDIR_NAME=$(OS_CONFIG)$(CPU_ARCH)$(OBJDIR_TAG).OBJ -# endif -#else -#endif - -OBJDIR_NAME=${OS_CONFIG}${CPU_TAG}${COMPILER_TAG}${LIBC_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}'.OBJ' - -#export OS_CONFIG OS_ARCH OBJDIR_NAME OS_RELEASE OBJDIR_TAG -export OS_ARCH - -if [ ${OS_ARCH} = "WINNT" ]; then -if [ ${OS_TARGET} != "WIN16" ]; then -if [ -z "${BUILD_OPT}" ]; then -# -# Define USE_DEBUG_RTL if you want to use the debug runtime library -# (RTL) in the debug build -# -if [ -n "${USE_DEBUG_RTL}" ]; then - OBJDIR_NAME=${OS_CONFIG}${CPU_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.OBJD -fi -fi -fi -fi - diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh deleted file mode 100644 index 3aa839fd7..000000000 --- a/security/nss/tests/common/init.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh -# -# Initialize a bunch of variables that may tests would be interested in -# -# -mozilla_root=`(cd ../../../..; pwd)` -common=`(cd ../common; pwd)` -MOZILLA_ROOT=${MOZILLA_ROOT-$mozilla_root} -COMMON=${TEST_COMMON-$common} -DIST=${DIST-${MOZILLA_ROOT}/dist} -NSPR_PATH=${NSPR_PATH-${DIST}} -SECURITY_ROOT=${SECURITY_ROOT-${MOZILLA_ROOT}/security/nss} -TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security} -. ../common/arch.sh -OBJDIR=${OBJDIR_NAME} -if [ ${OS_ARCH} = "WINNT" ]; then -PATH=${DIST}/${OBJDIR}/bin\;${NSPR_PATH}/${OBJDIR}/lib\;$PATH -else -PATH=${DIST}/${OBJDIR}/bin:${NSPR_PATH}/${OBJDIR}/lib:$PATH -fi -export PATH -SHLIB_PATH=${NSPR_PATH}/${OBJDIR}/lib -LIBPATH=${NSPR_PATH}/${OBJDIR}/lib -LD_LIBRARY_PATH=${NSPR_PATH}/${OBJDIR}/lib -export LD_LIBRARY_PATH SHLIB_PATH LIBPATH -echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -echo "Creating ${TESTDIR}" -if [ ! -d ${TESTDIR} ]; then - mkdir -p ${TESTDIR} -fi - -if [ -z "${HOSTDIR}" ]; then - version=1 - if [ -f ${TESTDIR}/${HOST} ]; then - version=`cat ${TESTDIR}/${HOST}` - fi - expr $version + 1 > ${TESTDIR}/${HOST} - - HOSTDIR=${TESTDIR}/${HOST}'.'$version -fi - -if [ ! -d ${HOSTDIR} ]; then - mkdir -p ${HOSTDIR} -fi - -RESULTS=${HOSTDIR}/results.html -if [ ! -f "${RESULTS}" ]; then - - cp ${COMMON}/results_header.html ${RESULTS} - echo "<H4>Platform: ${OBJDIR}<BR>" >> ${RESULTS} - echo "Test Run: ${HOST}.$version</H4>" >> ${RESULTS} - echo "Binary location: $DIST " >> ${RESULTS} - echo "<HR><BR>" >> ${RESULTS} - - echo "********************************************" - echo " Platform: ${OBJDIR}" - echo " Results: ${HOST}.$version" - echo " DIST: $DIST " - echo "********************************************" -fi - - -KILL="kill" -if [ ${OS_ARCH} = "Linux" ]; then - SLEEP="sleep 30" -fi - -export KILL - - diff --git a/security/nss/tests/common/results_header.html b/security/nss/tests/common/results_header.html deleted file mode 100644 index c09685b11..000000000 --- a/security/nss/tests/common/results_header.html +++ /dev/null @@ -1,6 +0,0 @@ -<HTML> -<HEAD> -<TITLE>Test Report for NSS</TITLE> -</HEAD> -<BODY BGCOLOR="#FFFFFF"> -<CENTER><H3>Test Report for NSS</H3></CENTER> diff --git a/security/nss/tests/pkcs11/netscape/trivial/.cvsignore b/security/nss/tests/pkcs11/netscape/trivial/.cvsignore deleted file mode 100644 index e3884c884..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -config.cache -config.h -config.log -config.status -trivial*.tar.gz diff --git a/security/nss/tests/pkcs11/netscape/trivial/Makefile.in b/security/nss/tests/pkcs11/netscape/trivial/Makefile.in deleted file mode 100644 index 7f9488350..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/Makefile.in +++ /dev/null @@ -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 a trivial PKCS#11 test program. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corp. Portions created by Netscape are -# Copyright (C) 2000. 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. -# - -MAKEFILE_IN_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" - -SHELL = /bin/sh -.SUFFIXES: -.SUFFIXES: .c .o .h .in .a .so - -srcdir = @srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -includedir = @includedir@ -bindir = @bindir@ -@SET_MAKE@ -INSTALL = @INSTALL@ -RANLIB = @RANLIB@ -AR = @AR@ -CC = @CC@ -LD = @LD@ -RM = @RM@ -TAR = @TAR@ - -CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ - -INSTALL_PROGRAM = $(INSTALL) -m 0500 - -all:: program - -# Standard Netscape/Mozilla targets: -# import import_xp export private_export libs program install all clobber -# clobber_all release release_xp alltags - -# Standard GNU targets: -# all install uninstall install-strip clean distclean mostlyclean -# maintainer-clean TAGS info dvi dist check installcheck installdirs - -# === The actual targets and the real commands that make them === -program:: trivial - -trivial: trivial.c config.h Makefile - $(CC) -I. -I${srcdir} $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LDFLAGS) $(LIBS) - -# Now, various standard targets, some that do stuff, some that are no-ops - -import:: - -export:: install - -private_export:: - -program:: - -clobber:: clean - -clobber_all:: maintainer-clean - -alltags:: TAGS - -RESULTS = \ - $(DESTDIR)$(bindir)/trivial \ - $(NULL) - -install:: $(RESULTS) - -$(DESTDIR)$(bindir)/trivial: trivial - $(INSTALL_PROGRAM) trivial $(DESTDIR)$(bindir)/trivial - -# "rm -f" with no arguments bites on some platforms. -# There should be an autoconf check and maybe a more -# general $(FORCEDREMOVE) command - -uninstall:: - $(RM) -f $(RESULTS) - -install-strip:: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s ' install - -clean:: - $(RM) -f *~ core trivial.o trivial - -distclean:: clean - $(RM) -f Makefile config.cache config.h config.log config.status stamp-h stamp-h.in - -mostlyclean:: clean - -maintainer-clean:: distclean - $(RM) -f TAGS trivial*.tar.gz - -TAGS:: - -DISTFILES = \ - .cvsignore \ - README.txt \ - Makefile.in \ - acconfig.h \ - config.h.in \ - configure \ - configure.in \ - install-sh \ - trivial.c \ - $(NULL) - -dist:: trivial.tar.gz - -# There must be an easier and more portable way of doing this.. -trivial.tar.gz: $(DISTFILES) - echo $(DISTFILES) | tr ' ' '\n' | sed "s^.*^`( cd ${srcdir}; pwd ) | xargs basename`/&^" | xargs tar czf $@ -C ${srcdir}/.. - -# other "standard" but irrelevant targets -info:: - -dvi:: - -check:: - -installcheck:: - -installdirs:: - -# Include dependancies - - -# autoheader might not change config.h.in, so touch a stamp file -${srcdir}/config.h.in: stamp-h.in -${srcdir}/stamp-h.in: configure.in acconfig.h - cd ${srcdir} && autoheader - echo timestamp > ${srcdir}/stamp-h.in - -# Remake the configuration -${srcdir}/configure: configure.in - cd ${srcdir} && autoconf - -config.h: stamp-h -stamp-h: config.h.in config.status - ./config.status - -Makefile: Makefile.in config.status - ./config.status - -config.status: configure - ./config.status --recheck diff --git a/security/nss/tests/pkcs11/netscape/trivial/README.txt b/security/nss/tests/pkcs11/netscape/trivial/README.txt deleted file mode 100644 index 5c18a5089..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/README.txt +++ /dev/null @@ -1,56 +0,0 @@ -This is a very trivial program that loads and excercises a PKCS#11 -module, trying basic operations. I used it as a basic check that -my data-only modules for NSS worked, and I'm including it here as -a first sample test program. - - -This program uses GNU autoconf: run ./configure --help for info. -In addition to the standard options, the configure script accepts -the following: - - --with-nspr[=path] specify location of NSPR - --with-nss-dist[=path] specify path to NSS dist directory - --with-nss-hdrs[=path] or, specify path to installed NSS headers - --with-rsa-hdrs[=path] if not using NSS, specify path to RSA headers - --disable-debug default is enabled - -This program uses NSPR; you may specify the path to your NSPR -installation by using the "--with-nspr" option. The specified -directory should be the one containing "include" and "lib." -If this option is not given, the default is the usual prefix -directories; see ./configure --help for more info. - -This program requires either the pkcs11*.h files from RSA, or -the NSS equivalents. To specify their location, you must -specify one of --with-nss-dist, --with-nss-hdrs, or --with-rsa-hdrs. - -If you have an NSS build tree, specify --with-nss-dist and provide -the path to the mozilla/dist/*.OBJ directory. (If you got this -package by checking it out from mozilla, it should be about six -directories up, once you've built NSS.) - -Alternatively, if you have an NSS installation (including "private" -files, e.g. "ck.h") you may point directly to the directory containing -the headers with --with-nss-hdrs. - -If you would rather use the RSA-provided header files, or your own -versions of them, specify their location with --with-rsa-hdrs. - -The flag --disable-debug doesn't really do much here other than -exclude the CVS_ID info from the binary. - - -To run the program, specify the name of the .so (or your platform's -equivalent) containing the module to be tested, e.g.: - - ./trivial ../../../../../../dist/*.OBJ/lib/libnssckbi.so - - -If you're using NSS, and using our experimental "installer's -arguments" fields in CK_C_INITIALIZE_ARGS, you can specify an -"installer argument" with the -i flag: - - ./trivial -i ~/.netscape/certs.db [...]/libnssckdb.so - - -Share and enjoy. diff --git a/security/nss/tests/pkcs11/netscape/trivial/acconfig.h b/security/nss/tests/pkcs11/netscape/trivial/acconfig.h deleted file mode 100644 index 36f98f87a..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/acconfig.h +++ /dev/null @@ -1,36 +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 a trivial PKCS#11 test program. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 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. - */ - -/* Define to use NSS header files instead of the regular RSA ones */ -#undef WITH_NSS - diff --git a/security/nss/tests/pkcs11/netscape/trivial/config.h.in b/security/nss/tests/pkcs11/netscape/trivial/config.h.in deleted file mode 100644 index bf5d5f3b5..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/config.h.in +++ /dev/null @@ -1,28 +0,0 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to use NSS header files instead of the regular RSA ones */ -#undef WITH_NSS - -/* Define if you have the memset function. */ -#undef HAVE_MEMSET - -/* Define if you have the strlen function. */ -#undef HAVE_STRLEN - -/* Define if you have the <ck.h> header file. */ -#undef HAVE_CK_H - -/* Define if you have the <nspr.h> header file. */ -#undef HAVE_NSPR_H - -/* Define if you have the <pkcs11.h> header file. */ -#undef HAVE_PKCS11_H - -/* Define if you have the <pkcs11t.h> header file. */ -#undef HAVE_PKCS11T_H - -/* Define if you have the nspr4 library (-lnspr4). */ -#undef HAVE_LIBNSPR4 diff --git a/security/nss/tests/pkcs11/netscape/trivial/configure b/security/nss/tests/pkcs11/netscape/trivial/configure deleted file mode 100755 index d9571ccdd..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/configure +++ /dev/null @@ -1,1906 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --with-nspr[=path] specify location of NSPR" -ac_help="$ac_help - --with-nss-dist[=path] specify path to NSS dist directory" -ac_help="$ac_help - --with-nss-hdrs[=path] or, specify path to installed NSS headers" -ac_help="$ac_help - --with-rsa-hdrs[=path] if not using NSS, specify path to RSA headers" -ac_help="$ac_help - --disable-debug default is enabled" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=trivial.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - - -# Check whether --with-nspr or --without-nspr was given. -if test "${with_nspr+set}" = set; then - withval="$with_nspr" - case "$withval" in - no) - { echo "configure: error: NSPR is required" 1>&2; exit 1; };; - yes) - NSPR_INCLUDE="$includedir" - NSPR_LIBPATH="$libdir" - ;; - *) - NSPR_INCLUDE="$withval/include" - NSPR_LIBPATH="$withval/lib" - ;; - esac -else - NSPR_INCLUDE="$includedir" - NSPR_LIBPATH="$libdir" - -fi - - -NSPR_CFLAGS="-I$NSPR_INCLUDE" -NSPR_LDFLAGS="-L$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4" - - -# Check whether --with-nss-dist or --without-nss-dist was given. -if test "${with_nss_dist+set}" = set; then - withval="$with_nss_dist" - case "$withval" in - no) - NSS_CFLAGS="" - nss="0" - ;; - yes) - { echo "configure: error: You have to specify a path for --with-nss-dist" 1>&2; exit 1; } - ;; - *) - NSS_CFLAGS="-I$withval/private/security -I$withval/public/security" - nss="1" - ;; - esac -fi - - -# Check whether --with-nss-hdrs or --without-nss-hdrs was given. -if test "${with_nss_hdrs+set}" = set; then - withval="$with_nss_hdrs" - if test "x$nss" != "x"; then - { echo "configure: error: Only specify --with-nss-hdrs or --with-nss-dist" 1>&2; exit 1; } - fi - case "$withval" in - no) - NSS_CFLAGS="" - nss="0" - ;; - yes) - NSS_CFLAGS="-I$includedir" - nss="1" - ;; - *) - NSS_CFLAGS="-I$withval" - nss="1" - ;; - esac -fi - - -# Check whether --with-rsa-hdrs or --without-rsa-hdrs was given. -if test "${with_rsa_hdrs+set}" = set; then - withval="$with_rsa_hdrs" - if test "x$nss" != "x"; then - { echo "configure: error: Only specify --with-nss-{hdrs" 1>&2; exit 1; } - fi - case "$withval" in - no) - rsa="0" - ;; - yes) - RSA_INCLUDE="$includedir" - rsa="1" - ;; - *) - RSA_INCLUDE="$withval" - rsa="1" - ;; - esac -fi - - -if test "x$nss" = "x"; then - if test "x$rsa" = "x"; then - RSA_INCLUDE="$includedir" - fi - RSA_CFLAGS="-I$RSA_INCLUDE" -fi - -if test "x$nss" = "x1"; then - cat >> confdefs.h <<\EOF -#define WITH_NSS 1 -EOF - -fi - - - -if test "x$rsa" = "x1"; then - RSA_CFLAGS-"-I$RSA_INCLUDE" -fi - -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - case "$enableval" in - no) - DEBUG_CFLAGS="";; - yes) - DEBUG_CFLAGS="-DDEBUG";; - *) - DEBUG_CFLAGS="-DDEBUG";; - esac -else - DEBUG_CFLAGS="-DDEBUG" -fi - - -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:693: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:723: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:774: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:806: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -cat > conftest.$ac_ext << EOF - -#line 817 "configure" -#include "confdefs.h" - -main(){return(0);} -EOF -if { (eval echo configure:822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } -fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:848: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:853: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <<EOF -#ifdef __GNUC__ - yes; -#endif -EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi - -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:881: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi - -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:913: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF -#line 928 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF -#line 945 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF -#line 962 "configure" -#include "confdefs.h" -#include <assert.h> -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1023: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -# Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1078: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1108: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="ar" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "ld", so it can be a program name with args. -set dummy ld; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1137: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LD"; then - ac_cv_prog_LD="$LD" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LD="ld" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LD="$ac_cv_prog_LD" -if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "rm", so it can be a program name with args. -set dummy rm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1166: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$RM"; then - ac_cv_prog_RM="$RM" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RM="rm" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RM="$ac_cv_prog_RM" -if test -n "$RM"; then - echo "$ac_t""$RM" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "tar", so it can be a program name with args. -set dummy tar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1195: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$TAR"; then - ac_cv_prog_TAR="$TAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_TAR="tar" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -TAR="$ac_cv_prog_TAR" -if test -n "$TAR"; then - echo "$ac_t""$TAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - -CPPFLAGS="$CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $RSA_CFLAGS $DEBUG_CFLAGS" -LIBS="$NSPR_LDFLAGS $LIBS" - - - -echo $ac_n "checking for PR_Init in -lnspr4""... $ac_c" 1>&6 -echo "configure:1229: checking for PR_Init in -lnspr4" >&5 -ac_lib_var=`echo nspr4'_'PR_Init | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lnspr4 $LIBS" -cat > conftest.$ac_ext <<EOF -#line 1237 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char PR_Init(); - -int main() { -PR_Init() -; return 0; } -EOF -if { (eval echo configure:1248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo nspr4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lnspr4 $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - - -for ac_hdr in nspr.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1280: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1285 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - - -if test "x$nss" = "x1"; then - for ac_hdr in ck.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1323: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1328 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - -fi - -if test "x$rsa" = "x1"; then - for ac_hdr in pkcs11t.h pkcs11.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1366: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1371 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - -fi - - - -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1407: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1412 "configure" -#include "confdefs.h" - -int main() { - -/* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -} - -; return 0; } -EOF -if { (eval echo configure:1461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 -if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF - -fi - - - -for ac_func in memset strlen -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1486: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <<EOF -#line 1491 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } -EOF -if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <<EOF -#define $ac_tr_func 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -DEFS=-DHAVE_CONFIG_H - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <<EOF -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS <<EOF - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@SET_MAKE@%$SET_MAKE%g -s%@WITH_NSS@%$WITH_NSS%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@RANLIB@%$RANLIB%g -s%@AR@%$AR%g -s%@LD@%$LD%g -s%@RM@%$RM%g -s%@TAR@%$TAR%g -s%@CC INSTALL RANLIB AR LD RM TAR@%$CC INSTALL RANLIB AR LD RM TAR%g -s%@HAVE_NSPR_H@%$HAVE_NSPR_H%g -s%@HAVE_CK_H HAVE_PKCS11T_H HAVE_PKCS11_H@%$HAVE_CK_H HAVE_PKCS11T_H HAVE_PKCS11_H%g -s%@const@%$const%g -s%@HAVE_MEMSET HAVE_STRLEN@%$HAVE_MEMSET HAVE_STRLEN%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <<EOF - -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <<EOF - CONFIG_HEADERS="config.h" -EOF -cat >> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - -rm -f conftest.tail -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - -EOF -cat >> $CONFIG_STATUS <<EOF - -EOF -cat >> $CONFIG_STATUS <<\EOF -echo timestamp > stamp-h -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/security/nss/tests/pkcs11/netscape/trivial/configure.in b/security/nss/tests/pkcs11/netscape/trivial/configure.in deleted file mode 100644 index 76374882e..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/configure.in +++ /dev/null @@ -1,180 +0,0 @@ -dnl -dnl The contents of this file are subject to the Mozilla Public -dnl License Version 1.1 (the "License"); you may not use this file -dnl except in compliance with the License. You may obtain a copy of -dnl the License at http://www.mozilla.org/MPL/ -dnl -dnl Software distributed under the License is distributed on an "AS -dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -dnl implied. See the License for the specific language governing -dnl rights and limitations under the License. -dnl -dnl The Original Code is a trivial PKCS#11 test program. -dnl -dnl The Initial Developer of the Original Code is Netscape -dnl Communications Corp. Portions created by Netscape are -dnl Copyright (C) 2000. All Rights Reserved. -dnl -dnl Contributor(s): -dnl -dnl Alternatively, the contents of this file may be used under the -dnl terms of the GNU General Public License Version 2 or later (the -dnl "GPL"), in which case the provisions of the GPL are applicable -dnl instead of those above. If you wish to allow use of your -dnl version of this file only under the terms of the GPL and not to -dnl allow others to use your version of this file under the MPL, -dnl indicate your decision by deleting the provisions above and -dnl replace them with the notice and other provisions required by -dnl the GPL. If you do not delete the provisions above, a recipient -dnl may use your version of this file under either the MPL or the -dnl GPL. -dnl - -dnl My revision info: "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -dnl Don't use AC_REVISION; it's broken - -AC_INIT(trivial.c) -AC_CONFIG_HEADER(config.h) -AC_PROG_MAKE_SET - -AC_ARG_WITH(nspr, [ --with-nspr[=path] specify location of NSPR], -[ case "$withval" in - no) - AC_MSG_ERROR(NSPR is required);; - yes) - NSPR_INCLUDE="$includedir" - NSPR_LIBPATH="$libdir" - ;; - *) - NSPR_INCLUDE="$withval/include" - NSPR_LIBPATH="$withval/lib" - ;; - esac ], -[ NSPR_INCLUDE="$includedir" - NSPR_LIBPATH="$libdir" ] -) - -NSPR_CFLAGS="-I$NSPR_INCLUDE" -NSPR_LDFLAGS="-L$NSPR_LIBPATH -lnspr4 -lplc4 -lplds4" - -dnl This isn't optimum, but the mozilla build system and autoconf don't really mesh well.. - -AC_ARG_WITH(nss-dist, [ --with-nss-dist[=path] specify path to NSS dist directory], -[ case "$withval" in - no) - NSS_CFLAGS="" - nss="0" - ;; - yes) - AC_MSG_ERROR(You have to specify a path for --with-nss-dist) - ;; - *) - NSS_CFLAGS="-I$withval/private/security -I$withval/public/security" - nss="1" - ;; - esac ]) - -AC_ARG_WITH(nss-hdrs, [ --with-nss-hdrs[=path] or, specify path to installed NSS headers], -[ if test "x$nss" != "x"; then - AC_MSG_ERROR(Only specify --with-nss-hdrs or --with-nss-dist, not both) - fi - case "$withval" in - no) - NSS_CFLAGS="" - nss="0" - ;; - yes) - NSS_CFLAGS="-I$includedir" - nss="1" - ;; - *) - NSS_CFLAGS="-I$withval" - nss="1" - ;; - esac ]) - -AC_ARG_WITH(rsa-hdrs, [ --with-rsa-hdrs[=path] if not using NSS, specify path to RSA headers], -[ if test "x$nss" != "x"; then - AC_MSG_ERROR(Only specify --with-nss-{hdrs,dist} or --with-rsa-hdrs, not both) - fi - case "$withval" in - no) - rsa="0" - ;; - yes) - RSA_INCLUDE="$includedir" - rsa="1" - ;; - *) - RSA_INCLUDE="$withval" - rsa="1" - ;; - esac ]) - -if test "x$nss" = "x"; then - if test "x$rsa" = "x"; then - RSA_INCLUDE="$includedir" - fi - RSA_CFLAGS="-I$RSA_INCLUDE" -fi - -if test "x$nss" = "x1"; then - AC_DEFINE(WITH_NSS,1) -fi - -AC_SUBST(WITH_NSS) - -if test "x$rsa" = "x1"; then - RSA_CFLAGS-"-I$RSA_INCLUDE" -fi - -AC_ARG_ENABLE(debug, [ --disable-debug default is enabled], -[ case "$enableval" in - no) - DEBUG_CFLAGS="";; - yes) - DEBUG_CFLAGS="-DDEBUG";; - *) - DEBUG_CFLAGS="-DDEBUG";; - esac ], DEBUG_CFLAGS="-DDEBUG") - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_RANLIB -AC_CHECK_PROG(AR, ar, ar) -AC_CHECK_PROG(LD, ld, ld) -AC_CHECK_PROG(RM, rm, rm) -AC_CHECK_PROG(TAR, tar, tar) -AC_SUBST(CC INSTALL RANLIB AR LD RM TAR) - -CPPFLAGS="$CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $RSA_CFLAGS $DEBUG_CFLAGS" -LIBS="$NSPR_LDFLAGS $LIBS" - -AC_SUBST(CFLAGS) - -dnl Checks for libraries. -AC_CHECK_LIB(nspr4, PR_Init) - -dnl Checks for header files. -AC_CHECK_HEADERS(nspr.h) -AC_SUBST(HAVE_NSPR_H) - -if test "x$nss" = "x1"; then - AC_CHECK_HEADERS(ck.h) -fi - -if test "x$rsa" = "x1"; then - AC_CHECK_HEADERS(pkcs11t.h pkcs11.h) -fi - -AC_SUBST(HAVE_CK_H HAVE_PKCS11T_H HAVE_PKCS11_H) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_SUBST(const) - -AC_CHECK_FUNCS(memset strlen) -AC_SUBST(HAVE_MEMSET HAVE_STRLEN) -AC_OUTPUT(Makefile, [echo timestamp > stamp-h]) diff --git a/security/nss/tests/pkcs11/netscape/trivial/install-sh b/security/nss/tests/pkcs11/netscape/trivial/install-sh deleted file mode 100755 index e9de23842..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/security/nss/tests/pkcs11/netscape/trivial/trivial.c b/security/nss/tests/pkcs11/netscape/trivial/trivial.c deleted file mode 100644 index 65dff22f3..000000000 --- a/security/nss/tests/pkcs11/netscape/trivial/trivial.c +++ /dev/null @@ -1,901 +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 a trivial PKCS#11 test program. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 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. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -/* - * This is a very trivial program I wrote for testing out a - * couple data-only Cryptoki modules for NSS. It's not a "real" - * test program that prints out nice "PASS" or "FAIL" messages; - * it just makes calls and dumps data. - */ - -#include "config.h" - -#ifdef HAVE_NSPR_H -#include "nspr.h" -#else -#error "NSPR is required." -#endif - -#ifdef WITH_NSS -#define FGMR 1 -#include "ck.h" -#else -#include "pkcs11t.h" -#include "pkcs11.h" -#endif - -/* The RSA versions are sloppier with namespaces */ -#ifndef CK_TRUE -#define CK_TRUE TRUE -#endif - -#ifndef CK_FALSE -#define CK_FALSE FALSE -#endif - -int -rmain -( - int argc, - char *argv[] -); - -int -main -( - int argc, - char *argv[] -) -{ - int rv = 0; - - PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 14); - rv = rmain(argc, argv); - PR_Cleanup(); - - return rv; -} - -static CK_ATTRIBUTE_TYPE all_known_attribute_types[] = { - CKA_CLASS, - CKA_TOKEN, - CKA_PRIVATE, - CKA_LABEL, - CKA_APPLICATION, - CKA_VALUE, - CKA_CERTIFICATE_TYPE, - CKA_ISSUER, - CKA_SERIAL_NUMBER, - CKA_KEY_TYPE, - CKA_SUBJECT, - CKA_ID, - CKA_SENSITIVE, - CKA_ENCRYPT, - CKA_DECRYPT, - CKA_WRAP, - CKA_UNWRAP, - CKA_SIGN, - CKA_SIGN_RECOVER, - CKA_VERIFY, - CKA_VERIFY_RECOVER, - CKA_DERIVE, - CKA_START_DATE, - CKA_END_DATE, - CKA_MODULUS, - CKA_MODULUS_BITS, - CKA_PUBLIC_EXPONENT, - CKA_PRIVATE_EXPONENT, - CKA_PRIME_1, - CKA_PRIME_2, - CKA_EXPONENT_1, - CKA_EXPONENT_2, - CKA_COEFFICIENT, - CKA_PRIME, - CKA_SUBPRIME, - CKA_BASE, - CKA_VALUE_BITS, - CKA_VALUE_LEN, - CKA_EXTRACTABLE, - CKA_LOCAL, - CKA_NEVER_EXTRACTABLE, - CKA_ALWAYS_SENSITIVE, - CKA_MODIFIABLE, -#ifdef CKA_NETSCAPE - CKA_NETSCAPE_URL, - CKA_NETSCAPE_EMAIL, - CKA_NETSCAPE_SMIME_INFO, - CKA_NETSCAPE_SMIME_TIMESTAMP, - CKA_NETSCAPE_PKCS8_SALT, - CKA_NETSCAPE_PASSWORD_CHECK, - CKA_NETSCAPE_EXPIRES, -#endif /* CKA_NETSCAPE */ -#ifdef CKA_TRUST - CKA_TRUST_DIGITAL_SIGNATURE, - CKA_TRUST_NON_REPUDIATION, - CKA_TRUST_KEY_ENCIPHERMENT, - CKA_TRUST_DATA_ENCIPHERMENT, - CKA_TRUST_KEY_AGREEMENT, - CKA_TRUST_KEY_CERT_SIGN, - CKA_TRUST_CRL_SIGN, - CKA_TRUST_SERVER_AUTH, - CKA_TRUST_CLIENT_AUTH, - CKA_TRUST_CODE_SIGNING, - CKA_TRUST_EMAIL_PROTECTION, - CKA_TRUST_IPSEC_END_SYSTEM, - CKA_TRUST_IPSEC_TUNNEL, - CKA_TRUST_IPSEC_USER, - CKA_TRUST_TIME_STAMPING, -#endif /* CKA_TRUST */ -}; - -static number_of_all_known_attribute_types = - (sizeof(all_known_attribute_types)/sizeof(all_known_attribute_types[0])); - -int -usage -( - char *argv0 -) -{ - PR_fprintf(PR_STDERR, "Usage: %s [-i {string|--}] <library>.so\n", argv0); - return 1; -} - -int -rmain -( - int argc, - char *argv[] -) -{ - char *argv0 = argv[0]; - PRLibrary *lib; - CK_C_GetFunctionList gfl; - CK_FUNCTION_LIST_PTR epv = (CK_FUNCTION_LIST_PTR)NULL; - CK_RV ck_rv; - CK_INFO info; - CK_ULONG nSlots; - CK_SLOT_ID *pSlots; - CK_ULONG i; - CK_C_INITIALIZE_ARGS ia, *iap; - - (void)memset(&ia, 0, sizeof(CK_C_INITIALIZE_ARGS)); - iap = (CK_C_INITIALIZE_ARGS *)NULL; - while( argv++, --argc ) { - if( '-' == argv[0][0] ) { - switch( argv[0][1] ) { - case 'i': - iap = &ia; - if( ((char *)NULL != argv[1]) && ('-' != argv[1][0]) ) { -#ifdef WITH_NSS - ia.pConfig = argv[1]; - ia.ulConfigLen = strlen(argv[1]); - argv++, --argc; -#else - return usage(argv0); -#endif /* WITH_NSS */ - } - break; - case '-': - argv++, --argc; - goto endargs; - default: - return usage(argv0); - } - } else { - break; - } - } - endargs:; - - if( 1 != argc ) { - return usage(argv0); - } - - lib = PR_LoadLibrary(argv[0]); - if( (PRLibrary *)NULL == lib ) { - PR_fprintf(PR_STDERR, "Can't load %s: %ld, %ld\n", argv[1], PR_GetError(), PR_GetOSError()); - return 1; - } - - gfl = (CK_C_GetFunctionList)PR_FindSymbol(lib, "C_GetFunctionList"); - if( (CK_C_GetFunctionList)NULL == gfl ) { - PR_fprintf(PR_STDERR, "Can't find C_GetFunctionList in %s: %ld, %ld\n", argv[1], - PR_GetError(), PR_GetOSError()); - return 1; - } - - ck_rv = (*gfl)(&epv); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "CK_GetFunctionList returned 0x%08x\n", ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, "Module %s loaded, epv = 0x%08x.\n\n", argv[1], (CK_ULONG)epv); - - /* C_Initialize */ - ck_rv = epv->C_Initialize(iap); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_Initialize returned 0x%08x\n", ck_rv); - return 1; - } - - /* C_GetInfo */ - (void)memset(&info, 0, sizeof(CK_INFO)); - ck_rv = epv->C_GetInfo(&info); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetInfo returned 0x%08x\n", ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, "Module Info:\n"); - PR_fprintf(PR_STDOUT, " cryptokiVersion = %lu.%02lu\n", - (PRUint32)info.cryptokiVersion.major, (PRUint32)info.cryptokiVersion.minor); - PR_fprintf(PR_STDOUT, " manufacturerID = \"%.32s\"\n", info.manufacturerID); - PR_fprintf(PR_STDOUT, " flags = 0x%08lx\n", info.flags); - PR_fprintf(PR_STDOUT, " libraryDescription = \"%.32s\"\n", info.libraryDescription); - PR_fprintf(PR_STDOUT, " libraryVersion = %lu.%02lu\n", - (PRUint32)info.libraryVersion.major, (PRUint32)info.libraryVersion.minor); - PR_fprintf(PR_STDOUT, "\n"); - - /* C_GetSlotList */ - nSlots = 0; - ck_rv = epv->C_GetSlotList(CK_FALSE, (CK_SLOT_ID_PTR)CK_NULL_PTR, &nSlots); - switch( ck_rv ) { - case CKR_BUFFER_TOO_SMALL: - case CKR_OK: - break; - default: - PR_fprintf(PR_STDERR, "C_GetSlotList(FALSE, NULL, ) returned 0x%08x\n", ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, "There are %lu slots.\n", nSlots); - - pSlots = (CK_SLOT_ID_PTR)PR_Calloc(nSlots, sizeof(CK_SLOT_ID)); - if( (CK_SLOT_ID_PTR)NULL == pSlots ) { - PR_fprintf(PR_STDERR, "[memory allocation of %lu bytes failed]\n", nSlots * sizeof(CK_SLOT_ID)); - return 1; - } - - ck_rv = epv->C_GetSlotList(CK_FALSE, pSlots, &nSlots); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetSlotList(FALSE, , ) returned 0x%08x\n", ck_rv); - return 1; - } - - for( i = 0; i < nSlots; i++ ) { - PR_fprintf(PR_STDOUT, " [%lu]: CK_SLOT_ID = %lu\n", (i+1), pSlots[i]); - } - - PR_fprintf(PR_STDOUT, "\n"); - - /* C_GetSlotInfo */ - for( i = 0; i < nSlots; i++ ) { - CK_SLOT_INFO sinfo; - - PR_fprintf(PR_STDOUT, "[%lu]: CK_SLOT_ID = %lu\n", (i+1), pSlots[i]); - - (void)memset(&sinfo, 0, sizeof(CK_SLOT_INFO)); - ck_rv = epv->C_GetSlotInfo(pSlots[i], &sinfo); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetSlotInfo(%lu, ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Slot Info:\n"); - PR_fprintf(PR_STDOUT, " slotDescription = \"%.64s\"\n", sinfo.slotDescription); - PR_fprintf(PR_STDOUT, " manufacturerID = \"%.32s\"\n", sinfo.manufacturerID); - PR_fprintf(PR_STDOUT, " flags = 0x%08lx\n", sinfo.flags); - PR_fprintf(PR_STDOUT, " -> TOKEN PRESENT = %s\n", - sinfo.flags & CKF_TOKEN_PRESENT ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> REMOVABLE DEVICE = %s\n", - sinfo.flags & CKF_REMOVABLE_DEVICE ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> HW SLOT = %s\n", - sinfo.flags & CKF_HW_SLOT ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " hardwareVersion = %lu.%02lu\n", - (PRUint32)sinfo.hardwareVersion.major, (PRUint32)sinfo.hardwareVersion.minor); - PR_fprintf(PR_STDOUT, " firmwareVersion = %lu.%02lu\n", - (PRUint32)sinfo.firmwareVersion.major, (PRUint32)sinfo.firmwareVersion.minor); - - if( sinfo.flags & CKF_TOKEN_PRESENT ) { - CK_TOKEN_INFO tinfo; - CK_MECHANISM_TYPE *pMechanismList; - CK_ULONG nMechanisms = 0; - CK_ULONG j; - - (void)memset(&tinfo, 0, sizeof(CK_TOKEN_INFO)); - ck_rv = epv->C_GetTokenInfo(pSlots[i], &tinfo); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetTokenInfo(%lu, ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Token Info:\n"); - PR_fprintf(PR_STDOUT, " label = \"%.32s\"\n", tinfo.label); - PR_fprintf(PR_STDOUT, " manufacturerID = \"%.32s\"\n", tinfo.manufacturerID); - PR_fprintf(PR_STDOUT, " model = \"%.16s\"\n", tinfo.model); - PR_fprintf(PR_STDOUT, " serialNumber = \"%.16s\"\n", tinfo.serialNumber); - PR_fprintf(PR_STDOUT, " flags = 0x%08lx\n", tinfo.flags); - PR_fprintf(PR_STDOUT, " -> RNG = %s\n", - tinfo.flags & CKF_RNG ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> WRITE PROTECTED = %s\n", - tinfo.flags & CKF_WRITE_PROTECTED ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> LOGIN REQUIRED = %s\n", - tinfo.flags & CKF_LOGIN_REQUIRED ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> USER PIN INITIALIZED = %s\n", - tinfo.flags & CKF_USER_PIN_INITIALIZED ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> RESTORE KEY NOT NEEDED = %s\n", - tinfo.flags & CKF_RESTORE_KEY_NOT_NEEDED ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> CLOCK ON TOKEN = %s\n", - tinfo.flags & CKF_CLOCK_ON_TOKEN ? "TRUE" : "FALSE"); -#ifdef CKF_SUPPORTS_PARALLEL - PR_fprintf(PR_STDOUT, " -> SUPPORTS PARALLEL = %s\n", - tinfo.flags & CKF_SUPPORTS_PARALLEL ? "TRUE" : "FALSE"); -#endif /* CKF_SUPPORTS_PARALLEL */ - PR_fprintf(PR_STDOUT, " -> PROTECTED AUTHENTICATION PATH = %s\n", - tinfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> DUAL_CRYPTO_OPERATIONS = %s\n", - tinfo.flags & CKF_DUAL_CRYPTO_OPERATIONS ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " ulMaxSessionCount = %lu\n", tinfo.ulMaxSessionCount); - PR_fprintf(PR_STDOUT, " ulSessionCount = %lu\n", tinfo.ulSessionCount); - PR_fprintf(PR_STDOUT, " ulMaxRwSessionCount = %lu\n", tinfo.ulMaxRwSessionCount); - PR_fprintf(PR_STDOUT, " ulRwSessionCount = %lu\n", tinfo.ulRwSessionCount); - PR_fprintf(PR_STDOUT, " ulMaxPinLen = %lu\n", tinfo.ulMaxPinLen); - PR_fprintf(PR_STDOUT, " ulMinPinLen = %lu\n", tinfo.ulMinPinLen); - PR_fprintf(PR_STDOUT, " ulTotalPublicMemory = %lu\n", tinfo.ulTotalPublicMemory); - PR_fprintf(PR_STDOUT, " ulFreePublicMemory = %lu\n", tinfo.ulFreePublicMemory); - PR_fprintf(PR_STDOUT, " ulTotalPrivateMemory = %lu\n", tinfo.ulTotalPrivateMemory); - PR_fprintf(PR_STDOUT, " ulFreePrivateMemory = %lu\n", tinfo.ulFreePrivateMemory); - PR_fprintf(PR_STDOUT, " hardwareVersion = %lu.%02lu\n", - (PRUint32)tinfo.hardwareVersion.major, (PRUint32)tinfo.hardwareVersion.minor); - PR_fprintf(PR_STDOUT, " firmwareVersion = %lu.%02lu\n", - (PRUint32)tinfo.firmwareVersion.major, (PRUint32)tinfo.firmwareVersion.minor); - PR_fprintf(PR_STDOUT, " utcTime = \"%.16s\"\n", tinfo.utcTime); - - - ck_rv = epv->C_GetMechanismList(pSlots[i], (CK_MECHANISM_TYPE_PTR)CK_NULL_PTR, &nMechanisms); - switch( ck_rv ) { - case CKR_BUFFER_TOO_SMALL: - case CKR_OK: - break; - default: - PR_fprintf(PR_STDERR, "C_GetMechanismList(%lu, NULL, ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " %lu mechanisms:\n", nMechanisms); - - pMechanismList = (CK_MECHANISM_TYPE_PTR)PR_Calloc(nMechanisms, sizeof(CK_MECHANISM_TYPE)); - if( (CK_MECHANISM_TYPE_PTR)NULL == pMechanismList ) { - PR_fprintf(PR_STDERR, "[memory allocation of %lu bytes failed]\n", - nMechanisms * sizeof(CK_MECHANISM_TYPE)); - return 1; - } - - ck_rv = epv->C_GetMechanismList(pSlots[i], pMechanismList, &nMechanisms); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetMechanismList(%lu, , ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - for( j = 0; j < nMechanisms; j++ ) { - PR_fprintf(PR_STDOUT, " {%lu}: CK_MECHANISM_TYPE = %lu\n", (j+1), pMechanismList[j]); - } - - PR_fprintf(PR_STDOUT, "\n"); - - for( j = 0; j < nMechanisms; j++ ) { - CK_MECHANISM_INFO minfo; - - (void)memset(&minfo, 0, sizeof(CK_MECHANISM_INFO)); - ck_rv = epv->C_GetMechanismInfo(pSlots[i], pMechanismList[j], &minfo); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_GetMechanismInfo(%lu, %lu, ) returned 0x%08x\n", pSlots[i], - pMechanismList[j]); - return 1; - } - - PR_fprintf(PR_STDOUT, " [%lu]: CK_MECHANISM_TYPE = %lu\n", (j+1), pMechanismList[j]); - PR_fprintf(PR_STDOUT, " ulMinKeySize = %lu\n", minfo.ulMinKeySize); - PR_fprintf(PR_STDOUT, " ulMaxKeySize = %lu\n", minfo.ulMaxKeySize); - PR_fprintf(PR_STDOUT, " flags = 0x%08x\n", minfo.flags); - PR_fprintf(PR_STDOUT, " -> HW = %s\n", minfo.flags & CKF_HW ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> ENCRYPT = %s\n", minfo.flags & CKF_ENCRYPT ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> DECRYPT = %s\n", minfo.flags & CKF_DECRYPT ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> DIGEST = %s\n", minfo.flags & CKF_DIGEST ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> SIGN = %s\n", minfo.flags & CKF_SIGN ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> SIGN_RECOVER = %s\n", minfo.flags & CKF_SIGN_RECOVER ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> VERIFY = %s\n", minfo.flags & CKF_VERIFY ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> VERIFY_RECOVER = %s\n", minfo.flags & CKF_VERIFY_RECOVER ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> GENERATE = %s\n", minfo.flags & CKF_GENERATE ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> GENERATE_KEY_PAIR = %s\n", minfo.flags & CKF_GENERATE_KEY_PAIR ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> WRAP = %s\n", minfo.flags & CKF_WRAP ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> UNWRAP = %s\n", minfo.flags & CKF_UNWRAP ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> DERIVE = %s\n", minfo.flags & CKF_DERIVE ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> EXTENSION = %s\n", minfo.flags & CKF_EXTENSION ? "TRUE" : "FALSE"); - - PR_fprintf(PR_STDOUT, "\n"); - } - - if( tinfo.flags & CKF_LOGIN_REQUIRED ) { - PR_fprintf(PR_STDERR, "*** LOGIN REQUIRED but not yet implemented ***\n"); - /* all the stuff about logging in as SO and setting the user pin if needed, etc. */ - return 2; - } - - /* session to find objects */ - { - CK_SESSION_HANDLE h = (CK_SESSION_HANDLE)0; - CK_SESSION_INFO sinfo; - CK_ATTRIBUTE_PTR pTemplate; - CK_ULONG tnObjects = 0; - - ck_rv = epv->C_OpenSession(pSlots[i], CKF_SERIAL_SESSION, (CK_VOID_PTR)CK_NULL_PTR, (CK_NOTIFY)CK_NULL_PTR, &h); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_OpenSession(%lu, CKF_SERIAL_SESSION, , ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Opened a session: handle = 0x%08x\n", h); - - (void)memset(&sinfo, 0, sizeof(CK_SESSION_INFO)); - ck_rv = epv->C_GetSessionInfo(h, &sinfo); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDOUT, "C_GetSessionInfo(%lu, ) returned 0x%08x\n", h, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " SESSION INFO:\n"); - PR_fprintf(PR_STDOUT, " slotID = %lu\n", sinfo.slotID); - PR_fprintf(PR_STDOUT, " state = %lu\n", sinfo.state); - PR_fprintf(PR_STDOUT, " flags = 0x%08x\n", sinfo.flags); -#ifdef CKF_EXCLUSIVE_SESSION - PR_fprintf(PR_STDOUT, " -> EXCLUSIVE SESSION = %s\n", sinfo.flags & CKF_EXCLUSIVE_SESSION ? "TRUE" : "FALSE"); -#endif /* CKF_EXCLUSIVE_SESSION */ - PR_fprintf(PR_STDOUT, " -> RW SESSION = %s\n", sinfo.flags & CKF_RW_SESSION ? "TRUE" : "FALSE"); - PR_fprintf(PR_STDOUT, " -> SERIAL SESSION = %s\n", sinfo.flags & CKF_SERIAL_SESSION ? "TRUE" : "FALSE"); -#ifdef CKF_INSERTION_CALLBACK - PR_fprintf(PR_STDOUT, " -> INSERTION CALLBACK = %s\n", sinfo.flags & CKF_INSERTION_CALLBACK ? "TRUE" : "FALSE"); -#endif /* CKF_INSERTION_CALLBACK */ - PR_fprintf(PR_STDOUT, " ulDeviceError = %lu\n", sinfo.ulDeviceError); - PR_fprintf(PR_STDOUT, "\n"); - - ck_rv = epv->C_FindObjectsInit(h, (CK_ATTRIBUTE_PTR)CK_NULL_PTR, 0); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDOUT, "C_FindObjectsInit(%lu, NULL_PTR, 0) returned 0x%08x\n", h, ck_rv); - return 1; - } - - pTemplate = (CK_ATTRIBUTE_PTR)PR_Calloc(number_of_all_known_attribute_types, sizeof(CK_ATTRIBUTE)); - if( (CK_ATTRIBUTE_PTR)NULL == pTemplate ) { - PR_fprintf(PR_STDERR, "[memory allocation of %lu bytes failed]\n", - number_of_all_known_attribute_types * sizeof(CK_ATTRIBUTE)); - return 1; - } - - PR_fprintf(PR_STDOUT, " All objects:\n"); - - while(1) { - CK_OBJECT_HANDLE o = (CK_OBJECT_HANDLE)0; - CK_ULONG nObjects = 0; - CK_ULONG k; - CK_ULONG nAttributes = 0; - CK_ATTRIBUTE_PTR pT2; - CK_ULONG l; - - ck_rv = epv->C_FindObjects(h, &o, 1, &nObjects); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjects(%lu, , 1, ) returned 0x%08x\n", h, ck_rv); - return 1; - } - - if( 0 == nObjects ) { - PR_fprintf(PR_STDOUT, "\n"); - break; - } - - tnObjects++; - - PR_fprintf(PR_STDOUT, " OBJECT HANDLE %lu:\n", o); - - for( k = 0; k < number_of_all_known_attribute_types; k++ ) { - pTemplate[k].type = all_known_attribute_types[k]; - pTemplate[k].pValue = (CK_VOID_PTR)CK_NULL_PTR; - pTemplate[k].ulValueLen = 0; - } - - ck_rv = epv->C_GetAttributeValue(h, o, pTemplate, number_of_all_known_attribute_types); - switch( ck_rv ) { - case CKR_OK: - case CKR_ATTRIBUTE_SENSITIVE: - case CKR_ATTRIBUTE_TYPE_INVALID: - case CKR_BUFFER_TOO_SMALL: - break; - default: - PR_fprintf(PR_STDERR, "C_GetAtributeValue(%lu, %lu, {all attribute types}, %lu) returned 0x%08x\n", - h, o, number_of_all_known_attribute_types, ck_rv); - return 1; - } - - for( k = 0; k < number_of_all_known_attribute_types; k++ ) { - if( -1 != (CK_LONG)pTemplate[k].ulValueLen ) { - nAttributes++; - } - } - - if( 1 ) { - PR_fprintf(PR_STDOUT, " %lu attributes:\n", nAttributes); - for( k = 0; k < number_of_all_known_attribute_types; k++ ) { - if( -1 != (CK_LONG)pTemplate[k].ulValueLen ) { - PR_fprintf(PR_STDOUT, " 0x%08x (len = %lu)\n", pTemplate[k].type, - pTemplate[k].ulValueLen); - } - } - PR_fprintf(PR_STDOUT, "\n"); - } - - pT2 = (CK_ATTRIBUTE_PTR)PR_Calloc(nAttributes, sizeof(CK_ATTRIBUTE)); - if( (CK_ATTRIBUTE_PTR)NULL == pT2 ) { - PR_fprintf(PR_STDERR, "[memory allocation of %lu bytes failed]\n", - nAttributes * sizeof(CK_ATTRIBUTE)); - return 1; - } - - for( l = 0, k = 0; k < number_of_all_known_attribute_types; k++ ) { - if( -1 != (CK_LONG)pTemplate[k].ulValueLen ) { - pT2[l].type = pTemplate[k].type; - pT2[l].ulValueLen = pTemplate[k].ulValueLen; - pT2[l].pValue = (CK_VOID_PTR)PR_Malloc(pT2[l].ulValueLen); - if( (CK_VOID_PTR)NULL == pT2[l].pValue ) { - PR_fprintf(PR_STDERR, "[memory allocation of %lu bytes failed]\n", pT2[l].ulValueLen); - return 1; - } - l++; - } - } - - PR_ASSERT( l == nAttributes ); - - ck_rv = epv->C_GetAttributeValue(h, o, pT2, nAttributes); - switch( ck_rv ) { - case CKR_OK: - case CKR_ATTRIBUTE_SENSITIVE: - case CKR_ATTRIBUTE_TYPE_INVALID: - case CKR_BUFFER_TOO_SMALL: - break; - default: - PR_fprintf(PR_STDERR, "C_GetAtributeValue(%lu, %lu, {existant attribute types}, %lu) returned 0x%08x\n", - h, o, nAttributes, ck_rv); - return 1; - } - - for( l = 0; l < nAttributes; l++ ) { - PR_fprintf(PR_STDOUT, " type = 0x%08x, len = %ld", pT2[l].type, (CK_LONG)pT2[l].ulValueLen); - if( -1 == (CK_LONG)pT2[l].ulValueLen ) { - ; - } else { - CK_ULONG m; - - if( pT2[l].ulValueLen <= 8 ) { - PR_fprintf(PR_STDOUT, ", value = "); - } else { - PR_fprintf(PR_STDOUT, ", value = \n "); - } - - for( m = 0; (m < pT2[l].ulValueLen) && (m < 20); m++ ) { - PR_fprintf(PR_STDOUT, "%02x", (CK_ULONG)(0xff & ((CK_CHAR_PTR)pT2[l].pValue)[m])); - } - - PR_fprintf(PR_STDOUT, " "); - - for( m = 0; (m < pT2[l].ulValueLen) && (m < 20); m++ ) { - CK_CHAR c = ((CK_CHAR_PTR)pT2[l].pValue)[m]; - if( (c < 0x20) || (c >= 0x7f) ) { - c = '.'; - } - PR_fprintf(PR_STDOUT, "%c", c); - } - } - - PR_fprintf(PR_STDOUT, "\n"); - } - - PR_fprintf(PR_STDOUT, "\n"); - - for( l = 0; l < nAttributes; l++ ) { - PR_Free(pT2[l].pValue); - } - PR_Free(pT2); - } /* while(1) */ - - ck_rv = epv->C_FindObjectsFinal(h); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjectsFinal(%lu) returned 0x%08x\n", h, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " (%lu objects total)\n", tnObjects); - - ck_rv = epv->C_CloseSession(h); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CloseSession(%lu) returned 0x%08x\n", h, ck_rv); - return 1; - } - } /* session to find objects */ - - /* session to create, find, and delete a couple session objects */ - { - CK_SESSION_HANDLE h = (CK_SESSION_HANDLE)0; - CK_ATTRIBUTE one[7], two[7], three[7], delta[1], mask[1]; - CK_OBJECT_CLASS cko_data = CKO_DATA; - CK_BBOOL false = CK_FALSE, true = CK_TRUE; - char *key = "TEST PROGRAM"; - CK_ULONG key_len = strlen(key); - CK_OBJECT_HANDLE hOneIn = (CK_OBJECT_HANDLE)0, hTwoIn = (CK_OBJECT_HANDLE)0, - hThreeIn = (CK_OBJECT_HANDLE)0, hDeltaIn = (CK_OBJECT_HANDLE)0; - CK_OBJECT_HANDLE found[10]; - CK_ULONG nFound; - - ck_rv = epv->C_OpenSession(pSlots[i], CKF_SERIAL_SESSION, (CK_VOID_PTR)CK_NULL_PTR, (CK_NOTIFY)CK_NULL_PTR, &h); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_OpenSession(%lu, CKF_SERIAL_SESSION, , ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Opened a session: handle = 0x%08x\n", h); - - one[0].type = CKA_CLASS; - one[0].pValue = &cko_data; - one[0].ulValueLen = sizeof(CK_OBJECT_CLASS); - one[1].type = CKA_TOKEN; - one[1].pValue = &false; - one[1].ulValueLen = sizeof(CK_BBOOL); - one[2].type = CKA_PRIVATE; - one[2].pValue = &false; - one[2].ulValueLen = sizeof(CK_BBOOL); - one[3].type = CKA_MODIFIABLE; - one[3].pValue = &true; - one[3].ulValueLen = sizeof(CK_BBOOL); - one[4].type = CKA_LABEL; - one[4].pValue = "Test data object one"; - one[4].ulValueLen = strlen(one[4].pValue); - one[5].type = CKA_APPLICATION; - one[5].pValue = key; - one[5].ulValueLen = key_len; - one[6].type = CKA_VALUE; - one[6].pValue = "Object one"; - one[6].ulValueLen = strlen(one[6].pValue); - - two[0].type = CKA_CLASS; - two[0].pValue = &cko_data; - two[0].ulValueLen = sizeof(CK_OBJECT_CLASS); - two[1].type = CKA_TOKEN; - two[1].pValue = &false; - two[1].ulValueLen = sizeof(CK_BBOOL); - two[2].type = CKA_PRIVATE; - two[2].pValue = &false; - two[2].ulValueLen = sizeof(CK_BBOOL); - two[3].type = CKA_MODIFIABLE; - two[3].pValue = &true; - two[3].ulValueLen = sizeof(CK_BBOOL); - two[4].type = CKA_LABEL; - two[4].pValue = "Test data object two"; - two[4].ulValueLen = strlen(two[4].pValue); - two[5].type = CKA_APPLICATION; - two[5].pValue = key; - two[5].ulValueLen = key_len; - two[6].type = CKA_VALUE; - two[6].pValue = "Object two"; - two[6].ulValueLen = strlen(two[6].pValue); - - three[0].type = CKA_CLASS; - three[0].pValue = &cko_data; - three[0].ulValueLen = sizeof(CK_OBJECT_CLASS); - three[1].type = CKA_TOKEN; - three[1].pValue = &false; - three[1].ulValueLen = sizeof(CK_BBOOL); - three[2].type = CKA_PRIVATE; - three[2].pValue = &false; - three[2].ulValueLen = sizeof(CK_BBOOL); - three[3].type = CKA_MODIFIABLE; - three[3].pValue = &true; - three[3].ulValueLen = sizeof(CK_BBOOL); - three[4].type = CKA_LABEL; - three[4].pValue = "Test data object three"; - three[4].ulValueLen = strlen(three[4].pValue); - three[5].type = CKA_APPLICATION; - three[5].pValue = key; - three[5].ulValueLen = key_len; - three[6].type = CKA_VALUE; - three[6].pValue = "Object three"; - three[6].ulValueLen = strlen(three[6].pValue); - - ck_rv = epv->C_CreateObject(h, one, 7, &hOneIn); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CreateObject(%lu, one, 7, ) returned 0x%08x\n", h, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Created object one: handle = %lu\n", hOneIn); - - ck_rv = epv->C_CreateObject(h, two, 7, &hTwoIn); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CreateObject(%lu, two, 7, ) returned 0x%08x\n", h, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Created object two: handle = %lu\n", hTwoIn); - - ck_rv = epv->C_CreateObject(h, three, 7, &hThreeIn); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CreateObject(%lu, three, 7, ) returned 0x%08x\n", h, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Created object three: handle = %lu\n", hThreeIn); - - delta[0].type = CKA_VALUE; - delta[0].pValue = "Copied object"; - delta[0].ulValueLen = strlen(delta[0].pValue); - - ck_rv = epv->C_CopyObject(h, hThreeIn, delta, 1, &hDeltaIn); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CopyObject(%lu, %lu, delta, 1, ) returned 0x%08x\n", - h, hThreeIn, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Copied object three: new handle = %lu\n", hDeltaIn); - - mask[0].type = CKA_APPLICATION; - mask[0].pValue = key; - mask[0].ulValueLen = key_len; - - ck_rv = epv->C_FindObjectsInit(h, mask, 1); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjectsInit(%lu, mask, 1) returned 0x%08x\n", - h, ck_rv); - return 1; - } - - (void)memset(&found, 0, sizeof(found)); - nFound = 0; - ck_rv = epv->C_FindObjects(h, found, 10, &nFound); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjects(%lu,, 10, ) returned 0x%08x\n", - h, ck_rv); - return 1; - } - - if( 4 != nFound ) { - PR_fprintf(PR_STDERR, "Found %lu objects, not 4.\n", nFound); - return 1; - } - - PR_fprintf(PR_STDOUT, " Found 4 objects: %lu, %lu, %lu, %lu\n", - found[0], found[1], found[2], found[3]); - - ck_rv = epv->C_FindObjectsFinal(h); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjectsFinal(%lu) returned 0x%08x\n", h, ck_rv); - return 1; - } - - ck_rv = epv->C_DestroyObject(h, hThreeIn); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_DestroyObject(%lu, %lu) returned 0x%08x\n", h, hThreeIn, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Destroyed object three (handle = %lu)\n", hThreeIn); - - delta[0].type = CKA_APPLICATION; - delta[0].pValue = "Changed application"; - delta[0].ulValueLen = strlen(delta[0].pValue); - - ck_rv = epv->C_SetAttributeValue(h, hTwoIn, delta, 1); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_SetAttributeValue(%lu, %lu, delta, 1) returned 0x%08x\n", - h, hTwoIn, ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Changed object two (handle = %lu).\n", hTwoIn); - - /* Can another session find these session objects? */ - { - CK_SESSION_HANDLE h2 = (CK_SESSION_HANDLE)0; - - ck_rv = epv->C_OpenSession(pSlots[i], CKF_SERIAL_SESSION, (CK_VOID_PTR)CK_NULL_PTR, (CK_NOTIFY)CK_NULL_PTR, &h2); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_OpenSession(%lu, CKF_SERIAL_SESSION, , ) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - - PR_fprintf(PR_STDOUT, " Opened a second session: handle = 0x%08x\n", h2); - - /* mask is still the same */ - - ck_rv = epv->C_FindObjectsInit(h2, mask, 1); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjectsInit(%lu, mask, 1) returned 0x%08x\n", - h2, ck_rv); - return 1; - } - - (void)memset(&found, 0, sizeof(found)); - nFound = 0; - ck_rv = epv->C_FindObjects(h2, found, 10, &nFound); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjects(%lu,, 10, ) returned 0x%08x\n", - h2, ck_rv); - return 1; - } - - if( 2 != nFound ) { - PR_fprintf(PR_STDERR, "Found %lu objects, not 2.\n", nFound); - return 1; - } - - PR_fprintf(PR_STDOUT, " Found 2 objects: %lu, %lu\n", - found[0], found[1]); - - ck_rv = epv->C_FindObjectsFinal(h2); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_FindObjectsFinal(%lu) returned 0x%08x\n", h2, ck_rv); - return 1; - } - - /* Leave the session hanging open, we'll CloseAllSessions later */ - } /* Can another session find these session objects? */ - - ck_rv = epv->C_CloseAllSessions(pSlots[i]); - if( CKR_OK != ck_rv ) { - PR_fprintf(PR_STDERR, "C_CloseAllSessions(%lu) returned 0x%08x\n", pSlots[i], ck_rv); - return 1; - } - } /* session to create, find, and delete a couple session objects */ - - - } - - PR_fprintf(PR_STDOUT, "\n"); - } - - return 0; -} diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh deleted file mode 100755 index 2838861d8..000000000 --- a/security/nss/tests/ssl/ssl.sh +++ /dev/null @@ -1,329 +0,0 @@ -#! /bin/ksh -# -# This is just a quick script so we can still run our testcases. -# Longer term we need a scriptable test environment.. -# -. ../common/init.sh -CURDIR=`pwd` -PORT=${PORT-8443} - -# Test case files -SSLCOV=${CURDIR}/sslcov.txt -SSLAUTH=${CURDIR}/sslauth.txt -SSLSTRESS=${CURDIR}/sslstress.txt -REQUEST_FILE=${CURDIR}/sslreq.txt - -#temparary files -TMP=${TMP-/tmp} -PWFILE=${TMP}/tests.pw.$$ -CERTSCRIPT=${TMP}/tests_certs.$$ -NOISE_FILE=${TMP}/tests_noise.$$ -SERVEROUTFILE=${TMP}/tests_server.$$ -SERVERPID=${TMP}/tests_pid.$$ - -TEMPFILES="${PWFILE} ${CERTSCRIPT} ${SERVEROUTFILE} ${NOISE_FILE} ${SERVERPID}" - -none=1 -coverage=0 -auth=0 -stress=0 -certs=1 -fileout=0 - -for i in $* -do - case $i in - [aA][lL]*) - none=0; coverage=1; auth=1; stress=1;; - [aA][uU]*) - none=0; auth=1;; - [Nn][Oo][aA][uU]*) - auth=0;; - [Cc][Oo]*) - none=0; coverage=1;; - [Nn][Oo][Cc][Oo]*) - coverage=0;; - [Cc][Ee]*) - none=0; certs=1;; - [Nn][Oo][Cc][Ee]*) - certs=0;; - [Ss]*) - none=0; stress=1;; - [Nn][Oo][Ss]*) - stress=0;; - [Vv][Ee][Rr][Bb]*) - verbose=-v;; - f) - fileout=1; - esac -done - -if [ $none -eq 1 ]; then - coverage=1 - auth=1 - stress=1 -fi - - -# -# should also try to kill any running server -# -trap "rm -f ${TEMPFILES}; exit" 2 3 - -CADIR=${HOSTDIR}/CA -SERVERDIR=${HOSTDIR}/server -CLIENTDIR=${HOSTDIR}/client - -if [ $certs -eq 1 ]; then -# Generate noise for our CA cert. -# -# NOTE: these keys are only suitable for testing, as this whole thing bypasses -# the entropy gathering. Don't use this method to generate keys and certs for -# product use or deployment. -# -ps -efl > ${NOISE_FILE} 2>&1 -ps aux >> ${NOISE_FILE} 2>&1 -netstat >> ${NOISE_FILE} 2>&1 -date >> ${NOISE_FILE} 2>&1 - -# -# build the TEMP CA used for testing purposes -# -echo "<TABLE BORDER=1><TR><TH COLSPAN=3>Certutil Tests</TH></TR>" >> ${RESULTS} -echo "<TR><TH width=500>Test Case</TH><TH width=50>Result</TH></TR>" >> ${RESULTS} -echo "********************** Creating a CA Certificate **********************" -if [ ! -d ${CADIR} ]; then - mkdir -p ${CADIR} -fi -cd ${CADIR} -echo nss > ${PWFILE} -echo " certutil -N -d . -f ${PWFILE}" -certutil -N -d . -f ${PWFILE} - -echo initialized -echo 5 > ${CERTSCRIPT} -echo 9 >> ${CERTSCRIPT} -echo n >> ${CERTSCRIPT} -echo y >> ${CERTSCRIPT} -echo 3 >> ${CERTSCRIPT} -echo n >> ${CERTSCRIPT} -echo 5 >> ${CERTSCRIPT} -echo 6 >> ${CERTSCRIPT} -echo 7 >> ${CERTSCRIPT} -echo 9 >> ${CERTSCRIPT} -echo n >> ${CERTSCRIPT} -echo "certutil -S -n \"TestCA\" -s \"CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US\" -t \"CTu,CTu,CTu\" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE}" -certutil -S -n "TestCA" -s "CN=NSS Test CA, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -t "CTu,CTu,CTu" -v 60 -x -d . -1 -2 -5 -f ${PWFILE} -z ${NOISE_FILE} < ${CERTSCRIPT} - -if [ $? -ne 0 ]; then - echo "<TR><TD>Creating CA Cert</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} -else - echo "<TR><TD>Creating CA Cert</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} -fi - -echo "**************** Creating Client CA Issued Certificate ****************" -netstat >> ${NOISE_FILE} 2>&1 -date >> ${NOISE_FILE} 2>&1 -if [ ! -d ${CLIENTDIR} ]; then - mkdir -p ${CLIENTDIR} -fi -cd ${CLIENTDIR} -echo " certutil -N -d . -f ${PWFILE}" -certutil -N -d . -f ${PWFILE} -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Init DB"} -fi -echo "Import the root CA" -echo " certutil -L -n \"TestCA\" -r -d ../CA > root.cert" -certutil -L -n "TestCA" -r -d ../CA > root.cert -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Export Root"} -fi -echo " certutil -A -n \"TestCA\" -t \"TC,TC,TC\" -f ${PWFILE} -d . -i root.cert" -certutil -A -n "TestCA" -t "TC,TC,TC" -f ${PWFILE} -d . -i root.cert -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Import Root"} -fi -echo "Generate a Certificate request" -echo " certutil -R -s \"CN=Test User, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req" -certutil -R -s "CN=Test User, O=BOGUS NSS, L=Mountain View, ST=California, C=US" -d . -f ${PWFILE} -z ${NOISE_FILE} -o req -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Generate Request"} -fi -echo "Sign the Certificate request" -echo "certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -f ${PWFILE} -i req -o user.cert" -certutil -C -c "TestCA" -m 3 -v 60 -d ../CA -i req -o user.cert -f ${PWFILE} -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Sign User Cert"} -fi -echo "Import the new Cert" -echo "certutil -A -n \"TestUser\" -t \"u,u,u\" -d . -f ${PWFILE} -i user.cert" -certutil -A -n "TestUser" -t "u,u,u" -d . -f ${PWFILE} -i user.cert -if [ $? -ne 0 ]; then - CERTFAILED=${CERTFAILED-"Import User"} -fi -if [ -n "${CERTFAILED}" ]; then - echo "<TR><TD>Creating User Cert</TD><TD bgcolor=red>Failed ($CERTFAILED)</TD><TR>" >> ${RESULTS} -else - echo "<TR><TD>Creating User Cert</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} -fi - -echo "***** Creating Server CA Issued Certificate for ${HOST}.${DOMSUF} *****" -netstat >> ${NOISE_FILE} 2>&1 -date >> ${NOISE_FILE} 2>&1 -if [ ! -d ${SERVERDIR} ]; then - mkdir -p ${SERVERDIR} -fi -cd ${SERVERDIR} -cp ../CA/*.db . -echo "certutil -S -n \"${HOST}.${DOMSUF}\" -s \"CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US\" -t \"Pu,Pu,Pu\" -c "TestCA" -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE}" -certutil -S -n "${HOST}.${DOMSUF}" -s "CN=${HOST}.${DOMSUF}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US" -t "Pu,Pu,Pu" -c "TestCA" -m 1 -v 60 -d . -f ${PWFILE} -z ${NOISE_FILE} -if [ $? -ne 0 ]; then - echo "<TR><TD>Creating Server Cert</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} -else - echo "<TR><TD>Creating Server Cert</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} -fi -echo "</TABLE><BR>" >> ${RESULTS} - -rm -f ${TEMPFILES} -fi - - -# OK now lets run the tests.... -if [ $coverage -eq 1 ]; then -echo "********************* SSL Cipher Coverage ****************************" -echo "<TABLE BORDER=1><TR><TH COLSPAN=3>SSL Cipher Coverage</TH></TR>" >> ${RESULTS} -echo "<TR><TH width=500>Test Case</TH><TH width=50>Result</TH></TR>" >> ${RESULTS} -cd ${CLIENTDIR} - cat ${SSLCOV} | while read tls param testname -do - if [ $tls != "#" ]; then - echo "********************* $testname ****************************" - TLS_FLAG=-T - if [ $tls = "TLS" ]; then - TLS_FLAG="" - fi - sparam="" - if [ ${param} = "i" ]; then - sparam='-c i' - fi - echo "selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -i ${SERVERPID} -w nss ${sparam} & " - if [ ${fileout} -eq 1 ]; then - selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -i ${SERVERPID} -w nss ${sparam} > ${SERVEROUTFILE} 2>&1 & - else - selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & - fi - sleep 20 - - tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . < ${REQUEST_FILE} - if [ $? -ne 0 ]; then - echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} - else - echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} - fi - ${KILL} `cat ${SERVERPID}` - wait `cat ${SERVERPID}` - if [ ${fileout} -eq 1 ]; then - cat ${SERVEROUTFILE} - fi - ${SLEEP} - fi -done - -echo "</TABLE><BR>" >> ${RESULTS} -fi - -if [ $auth -eq 1 ]; then -echo "********************* SSL Client Auth ****************************" -cd ${CLIENTDIR} -echo "<TABLE BORDER=1><TR><TH COLSPAN=3>SSL Client Authentication</TH></TR>" >> ${RESULTS} -echo "<TR><TH width=500>Test Case</TH><TH width=50>Result</TH></TR>" >> ${RESULTS} - -cat ${SSLAUTH} | while read value sparam cparam testname -do - if [ $value != "#" ]; then - echo "***** $testname ****" - sparam=`echo $sparam | sed -e 's;_; ;g'` - cparam=`echo $cparam | sed -e 's;_; ;g'` - echo "selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} &" - if [ ${fileout} -eq 1 ]; then - selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} > ${SERVEROUTFILE} 2>&1 & - else - selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & - fi - sleep 20 - pwd - echo "tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam}" - tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} < ${REQUEST_FILE} - ret=$? - -# -# for some reason the NT client does not return the same error code as Unix -# (sigh). -# - if [ ${OS_ARCH} = "WINNT" ]; then - if [ $value -ne 0 ]; then - if [ $ret -ne 0 ]; then - value=$ret - fi - fi - fi - - if [ $ret -ne $value ]; then - echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} - else - echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} - fi - ${KILL} `cat ${SERVERPID}` - wait `cat ${SERVERPID}` - if [ ${fileout} -eq 1 ]; then - cat ${SERVEROUTFILE} - fi - ${SLEEP} - fi -done - -echo "</TABLE><BR>" >> ${RESULTS} -fi - - -if [ $stress -eq 1 ]; then -echo "********************* Stress Test ****************************" -cd ${CLIENTDIR} -echo "<TABLE BORDER=1><TR><TH COLSPAN=3>SSL Stress Test</TH></TR>" >> ${RESULTS} -echo "<TR><TH width=500>Test Case</TH><TH width=50>Result</TH></TR>" >> ${RESULTS} - -cat ${SSLSTRESS} | while read value sparam cparam testname -do - if [ $value != "#" ]; then - echo "********************* $testname ****************************" - sparam=`echo $sparam | sed -e 's;_; ;g'` - cparam=`echo $cparam | sed -e 's;_; ;g'` - echo "selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose &" - if [ ${fileout} -eq 1 ]; then - selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose > ${SERVEROUTFILE} 2>&1 & - else - selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} $verbose & - fi - sleep 20 - - echo "strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOST}.${DOMSUF} " - strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOST}.${DOMSUF} - if [ $? -ne $value ]; then - echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} - else - echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} - fi - ${KILL} `cat ${SERVERPID}` - wait `cat ${SERVERPID}` - if [ ${fileout} -eq 1 ]; then - cat ${SERVEROUTFILE} - fi - ${SLEEP} - fi -done - -echo "</TABLE><BR>" >> ${RESULTS} -fi - -rm -f ${TEMPFILES} diff --git a/security/nss/tests/ssl/sslauth.txt b/security/nss/tests/ssl/sslauth.txt deleted file mode 100644 index e6beda10f..000000000 --- a/security/nss/tests/ssl/sslauth.txt +++ /dev/null @@ -1,21 +0,0 @@ -# -# This file defines the tests for client auth. -# -# expected -# return server client Test Case name -# value params params -# ------ ------ ------ --------------- - 0 -r -w_nss TLS Request don't require client auth (client does not provide auth) - 0 -r -n_TestUser_-w_bogus TLS Request don't require client auth (bad password) - 0 -r -n_TestUser_-w_nss TLS Request don't require client auth (client auth) - 0 -r_-r -w_nss TLS Require client auth (client does not provide auth) -# this one should fail - 254 -r_-r -n_TestUser_-w_bogus TLS Require client auth (bad password) - 0 -r_-r -n_TestUser_-w_nss TLS Require client auth (client auth) - 0 -r -T_-w_nss SSL3 Request don't require client auth (client does not provide auth) - 0 -r -T_-n_TestUser_-w_bogus SSL3 Request don't require client auth (bad password) - 0 -r -T_-n_TestUser_-w_nss SSL3 Request don't require client auth (client auth) - 0 -r_-r -T_-w_nss SSL3 Require client auth (client does not provide auth) -# this one should fail - 254 -r_-r -T_-n_TestUser_-w_bogus SSL3 Require client auth (bad password) - 0 -r_-r -T_-n_TestUser_-w_nss SSL3 Require client auth (client auth) diff --git a/security/nss/tests/ssl/sslcov.txt b/security/nss/tests/ssl/sslcov.txt deleted file mode 100644 index 8df8f4f2c..000000000 --- a/security/nss/tests/ssl/sslcov.txt +++ /dev/null @@ -1,37 +0,0 @@ -# -# This file enables test coverage of the various SSL ciphers -# -# NOTE: SSL2 ciphers are independent of whether TLS is enabled or not. We -# mix up the enable functions so we can tests boths paths. -# -# Enable Cipher Test Name -# TLS -# - noTLS A SSL2 RC4 128 WITH MD5 - TLS B SSL2 RC4 128 EXPORT40 WITH MD5 - TLS C SSL2 RC2 128 CBC WITH MD5 - noTLS D SSL2 RC2 128 CBC EXPORT40 WITH MD5 - TLS E SSL2 DES 64 CBC WITH MD5 - noTLS F SSL2 DES 192 EDE3 CBC WITH MD5 - noTLS c SSL3 RSA WITH RC4 128 MD5 - noTLS d SSL3 RSA WITH 3DES EDE CBC SHA - noTLS e SSL3 RSA WITH DES CBC SHA - noTLS f SSL3 RSA EXPORT WITH RC4 40 MD5 - noTLS g SSL3 RSA EXPORT WITH RC2 CBC 40 MD5 - noTLS j SSL3 RSA FIPS WITH 3DES EDE CBC SHA - noTLS k SSL3 RSA FIPS WITH DES CBC SHA - noTLS l SSL3 RSA EXPORT WITH DES CBC SHA (new) - noTLS m SSL3 RSA EXPORT WITH RC4 56 SHA (new) - TLS c TLS RSA WITH RC4 128 MD5 - TLS d TLS RSA WITH 3DES EDE CBC SHA - TLS e TLS RSA WITH DES CBC SHA - TLS f TLS RSA EXPORT WITH RC4 40 MD5 - TLS g TLS RSA EXPORT WITH RC2 CBC 40 MD5 - TLS j TLS RSA FIPS WITH 3DES EDE CBC SHA - TLS k TLS RSA FIPS WITH DES CBC SHA - TLS l TLS RSA EXPORT WITH DES CBC SHA (new) - TLS m TLS RSA EXPORT WITH RC4 56 SHA (new) -# The NULL ciphers have to be last because we need to restart selfserve -# (NULL is not enabled by default) - TLS i TLS RSA WITH NULL MD5 - noTLS i SSL3 RSA WITH NULL MD5 diff --git a/security/nss/tests/ssl/sslreq.txt b/security/nss/tests/ssl/sslreq.txt deleted file mode 100644 index 16a750fbf..000000000 --- a/security/nss/tests/ssl/sslreq.txt +++ /dev/null @@ -1,3 +0,0 @@ -GET / HTTP/1.0 - - diff --git a/security/nss/tests/ssl/sslstress.txt b/security/nss/tests/ssl/sslstress.txt deleted file mode 100644 index c4dce350f..000000000 --- a/security/nss/tests/ssl/sslstress.txt +++ /dev/null @@ -1,14 +0,0 @@ -# -# This file defines the tests for client auth. -# -# expected -# return server client Test Case name -# value params params -# ------ ------ ------ --------------- - 0 _ -c_1000_-C_A Stress SSL2 RC4 128 with MD5 - 0 _ -c_1000_-C_c Stress SSL3 RC4 128 with MD5 -# 0 _ -c_1000_-C_c Stress TLS RC4 128 with MD5 -# -# add client auth versions here... -# -# 0 -r -n_"Test_User"_-w_bogus TLS Request don't require client auth (bad password) |