VxWorks support.

line filenames and no longer require redirection, which some platforms
don't support.

.cvsignore

@@ -11,10 +11,8 @@ maketest.log
 cctest
 cctest.c
 cctest.a
+libcrypto.so.*
+libssl.so.*
 *.flc
 semantic.cache
 Makefile
-*.so*
-*.dll*
-*.sl*
-*.dylib*

.gitignore

@@ -1,107 +0,0 @@
-# Object files
-*.o
-*.obj
-
-# editor artefacts
-*.swp
-.#*
-#*#
-*~
-
-# Top level excludes
-/Makefile.bak
-/Makefile
-/*.a
-/include
-/*.pc
-/rehash.time
-
-# Most *.c files under test/ are symlinks
-/test/*.c
-# Apart from these
-!/test/asn1test.c
-!/test/methtest.c
-!/test/dummytest.c
-!/test/igetest.c
-!/test/r160test.c
-!/test/fips_algvs.c
-
-/test/*.ss
-/test/*.srl
-/test/.rnd
-/test/test*.pem
-/test/newkey.pem
-
-# Certificate symbolic links
-*.0
-
-# Links under apps
-/apps/CA.pl
-/apps/md4.c
-
-
-# Auto generated headers
-/crypto/buildinf.h
-/crypto/opensslconf.h
-
-# Auto generated assembly language source files
-*.s
-!/crypto/bn/asm/pa-risc2.s
-!/crypto/bn/asm/pa-risc2W.s
-crypto/aes/asm/a_win32.asm
-crypto/bf/asm/b_win32.asm
-crypto/bn/asm/bn_win32.asm
-crypto/bn/asm/co_win32.asm
-crypto/bn/asm/mt_win32.asm
-crypto/cast/asm/c_win32.asm
-crypto/cpu_win32.asm
-crypto/des/asm/d_win32.asm
-crypto/des/asm/y_win32.asm
-crypto/md5/asm/m5_win32.asm
-crypto/rc4/asm/r4_win32.asm
-crypto/rc5/asm/r5_win32.asm
-crypto/ripemd/asm/rm_win32.asm
-crypto/sha/asm/s1_win32.asm
-crypto/sha/asm/sha512-sse2.asm
-
-# Executables
-/apps/openssl
-/test/sha256t
-/test/sha512t
-/test/*test
-/test/fips_aesavs
-/test/fips_desmovs
-/test/fips_dhvs
-/test/fips_drbgvs
-/test/fips_dssvs
-/test/fips_ecdhvs
-/test/fips_ecdsavs
-/test/fips_rngvs
-/test/fips_test_suite
-*.so*
-*.dylib*
-*.dll*
-# Exceptions
-!/test/bctest
-!/crypto/des/times/486-50.sol
-
-# Misc auto generated files
-/tools/c_rehash
-/test/evptests.txt
-lib
-Makefile.save
-*.bak
-
-# Windows
-/tmp32dll
-/tmp32dll.dbg
-/out32dll
-/out32dll.dbg
-/inc32
-/MINFO
-ms/bcb.mak
-ms/libeay32.def
-ms/nt.mak
-ms/ntdll.mak
-ms/ssleay32.def
-ms/version32.rc

ACKNOWLEDGMENTS

@@ -1,30 +0,0 @@
-The OpenSSL project depends on volunteer efforts and financial support from
-the end user community. That support comes in the form of donations and paid
-sponsorships, software support contracts, paid consulting services
-and commissioned software development.
-
-Since all these activities support the continued development and improvement
-of OpenSSL we consider all these clients and customers as sponsors of the
-OpenSSL project.
-
-We would like to identify and thank the following such sponsors for their past
-or current significant support of the OpenSSL project:
-
-Major support:
-
-	Qualys		http://www.qualys.com/
-
-Very significant support:
-
-	OpenGear:	http://www.opengear.com/
-
-Significant support:
-
-	PSW Group:	http://www.psw.net/
-	Acano Ltd.	http://acano.com/
-
-Please note that we ask permission to identify sponsors and that some sponsors
-we consider eligible for inclusion here have requested to remain anonymous.
-
-Additional sponsorship or financial support is always welcome: for more
-information please contact the OpenSSL Software Foundation.

ChangeLog.0_9_7-stable_not-in-head

@@ -0,0 +1,163 @@
+This file, together with ChangeLog.0_9_7-stable_not-in-head_FIPS,
+provides a collection of those CVS change log entries for the
+0.9.7 branch (OpenSSL_0_9_7-stable) that do not appear similarly in
+0.9.8-dev (CVS head).
+    
+ChangeLog.0_9_7-stable_not-in-head_FIPS  -  "FIPS" related changes
+ChangeLog.0_9_7-stable_not-in-head       -  everything else
+
+Some obvious false positives have been eliminated: e.g., we do not
+care about a simple "make update"; and we don't care about changes
+identified to the 0.9.7 branch that were explicitly identified as
+backports from head.
+    
+Eliminating all other entries (and finally this file and its
+compantion), either as false positives or as things that should go
+into 0.9.8, remains to be done.  Any additional changes to 0.9.7 that
+are not immediately put into 0.9.8, but belong there as well, should
+be added to the end of this file.
+
+
+2002-11-04 17:33  levitte
+
+	Changed:
+		Configure (1.314.2.38), "Exp", lines: +4 -2
+
+	Return my normal debug targets to something not so extreme, and
+	make the extreme ones special (or 'extreme', if you will :-)).
+
+2002-12-16 19:17  appro
+
+	Changed:
+		crypto/bn/bn_lcl.h (1.23.2.3), "Exp", lines: +3 -0
+		crypto/bn/bn_mul.c (1.28.2.4), "Exp", lines: +84 -445
+
+	This is rollback to 0.9.6h bn_mul.c to address problem reported in
+	RT#272.
+
+2003-07-27 15:46  ben
+
+	Changed:
+		crypto/aes/aes.h (1.1.2.5), "Exp", lines: +3 -0
+		crypto/aes/aes_cfb.c (1.1.2.4), "Exp", lines: +57 -0
+
+	Add untested CFB-r mode. Will be tested soon.
+
+2003-07-28 17:07  ben
+
+	Changed:
+		Makefile.org (1.154.2.69), "Exp", lines: +5 -1
+		crypto/aes/aes.h (1.1.2.6), "Exp", lines: +3 -0
+		crypto/aes/aes_cfb.c (1.1.2.5), "Exp", lines: +19 -0
+		crypto/dsa/Makefile.ssl (1.49.2.6), "Exp", lines: +3 -2
+		crypto/err/Makefile.ssl (1.48.2.4), "Exp", lines: +17 -16
+		crypto/evp/e_aes.c (1.6.2.5), "Exp", lines: +8 -0
+		crypto/evp/e_des.c (1.5.2.2), "Exp", lines: +1 -1
+		crypto/evp/e_des3.c (1.8.2.3), "Exp", lines: +2 -2
+		crypto/evp/evp.h (1.86.2.11), "Exp", lines: +28 -11
+		crypto/evp/evp_locl.h (1.7.2.3), "Exp", lines: +2 -2
+		crypto/objects/obj_dat.h (1.49.2.13), "Exp", lines: +10 -5
+		crypto/objects/obj_mac.h (1.19.2.13), "Exp", lines: +5 -0
+		crypto/objects/obj_mac.num (1.15.2.9), "Exp", lines: +1 -0
+		crypto/objects/objects.txt (1.20.2.14), "Exp", lines: +4 -0
+		fips/Makefile.ssl (1.1.2.3), "Exp", lines: +7 -0
+		fips/aes/Makefile.ssl (1.1.2.2), "Exp", lines: +23 -1
+		fips/aes/fips_aesavs.c (1.1.2.3), "Exp", lines: +9 -1
+		test/Makefile.ssl (1.84.2.30), "Exp", lines: +101 -43
+
+	Add support for partial CFB modes, make tests work, update
+	dependencies.
+
+2003-07-29 12:56  ben
+
+	Changed:
+		crypto/aes/aes_cfb.c (1.1.2.6), "Exp", lines: +9 -6
+		crypto/evp/c_allc.c (1.8.2.3), "Exp", lines: +1 -0
+		crypto/evp/evp_test.c (1.14.2.11), "Exp", lines: +17 -8
+		crypto/evp/evptests.txt (1.9.2.2), "Exp", lines: +48 -1
+
+	Working CFB1 and test vectors.
+
+2003-07-29 15:24  ben
+
+	Changed:
+		crypto/evp/e_aes.c (1.6.2.6), "Exp", lines: +14 -0
+		crypto/objects/obj_dat.h (1.49.2.14), "Exp", lines: +15 -5
+		crypto/objects/obj_mac.h (1.19.2.14), "Exp", lines: +10 -0
+		crypto/objects/obj_mac.num (1.15.2.10), "Exp", lines: +2 -0
+		crypto/objects/objects.txt (1.20.2.15), "Exp", lines: +2 -0
+		fips/aes/Makefile.ssl (1.1.2.3), "Exp", lines: +1 -1
+		fips/aes/fips_aesavs.c (1.1.2.4), "Exp", lines: +34 -19
+
+	The rest of the keysizes for CFB1, working AES AVS test for CFB1.
+
+2003-07-29 19:05  ben
+
+	Changed:
+		crypto/aes/aes.h (1.1.2.7), "Exp", lines: +3 -0
+		crypto/aes/aes_cfb.c (1.1.2.7), "Exp", lines: +14 -0
+		crypto/evp/c_allc.c (1.8.2.4), "Exp", lines: +1 -0
+		crypto/evp/e_aes.c (1.6.2.7), "Exp", lines: +4 -9
+		crypto/evp/evptests.txt (1.9.2.3), "Exp", lines: +48 -0
+		crypto/objects/obj_dat.h (1.49.2.15), "Exp", lines: +20 -5
+		crypto/objects/obj_mac.h (1.19.2.15), "Exp", lines: +15 -0
+		crypto/objects/obj_mac.num (1.15.2.11), "Exp", lines: +3 -0
+		crypto/objects/objects.txt (1.20.2.16), "Exp", lines: +3 -0
+		fips/aes/fips_aesavs.c (1.1.2.7), "Exp", lines: +11 -0
+
+	AES CFB8.
+
+2003-07-30 20:30  ben
+
+	Changed:
+		Makefile.org (1.154.2.70), "Exp", lines: +16 -5
+		crypto/des/cfb_enc.c (1.7.2.1), "Exp", lines: +2 -1
+		crypto/des/des_enc.c (1.11.2.2), "Exp", lines: +4 -0
+		crypto/evp/e_aes.c (1.6.2.8), "Exp", lines: +7 -14
+		crypto/evp/e_des.c (1.5.2.3), "Exp", lines: +37 -1
+		crypto/evp/evp.h (1.86.2.12), "Exp", lines: +6 -0
+		crypto/evp/evp_locl.h (1.7.2.4), "Exp", lines: +9 -0
+		crypto/objects/obj_dat.h (1.49.2.16), "Exp", lines: +48 -23
+		crypto/objects/obj_mac.h (1.19.2.16), "Exp", lines: +31 -6
+		crypto/objects/obj_mac.num (1.15.2.12), "Exp", lines: +5 -0
+		crypto/objects/objects.txt (1.20.2.17), "Exp", lines: +12 -6
+		fips/Makefile.ssl (1.1.2.4), "Exp", lines: +8 -1
+		fips/fips_make_sha1 (1.1.2.3), "Exp", lines: +3 -0
+		fips/aes/Makefile.ssl (1.1.2.4), "Exp", lines: +1 -1
+		fips/des/.cvsignore (1.1.2.1), "Exp", lines: +3 -0
+		fips/des/Makefile.ssl (1.1.2.1), "Exp", lines: +96 -0
+		fips/des/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0
+		fips/des/fips_des_enc.c (1.1.2.1), "Exp", lines: +288 -0
+		fips/des/fips_des_locl.h (1.1.2.1), "Exp", lines: +428 -0
+		fips/des/fips_desmovs.c (1.1.2.1), "Exp", lines: +659 -0
+
+	Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8.
+
+2003-08-01 12:25  ben
+
+	Changed:
+		crypto/des/cfb_enc.c (1.7.2.2), "Exp", lines: +45 -36
+		crypto/evp/c_allc.c (1.8.2.5), "Exp", lines: +2 -0
+		crypto/evp/e_des.c (1.5.2.4), "Exp", lines: +8 -3
+		crypto/evp/evptests.txt (1.9.2.4), "Exp", lines: +6 -0
+
+	Fix DES CFB-r.
+
+2003-08-01 12:31  ben
+
+	Changed:
+		crypto/evp/evptests.txt (1.9.2.5), "Exp", lines: +4 -0
+
+	DES CFB8 test.
+
+2005-04-19 16:21  appro
+
+	Changed:
+		Configure (1.314.2.117), "Exp", lines: +24 -21
+		Makefile.org (1.154.2.100), "Exp", lines: +1 -11
+		TABLE (1.99.2.52), "Exp", lines: +20 -20
+		apps/Makefile (1.1.4.15), "Exp", lines: +1 -1
+		test/Makefile (1.1.4.12), "Exp", lines: +1 -1
+
+	Enable shared link on HP-UX.
+

Configure

@@ -12,7 +12,7 @@ print STDERR "Warning: perl module strict not found.\n" if ($@);
 
 # see INSTALL for instructions.
 
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [enable-montasm] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
 
 # Options:
 #
@@ -56,8 +56,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
 # [no-]zlib     [don't] compile support for zlib compression.
 # zlib-dynamic	Like "zlib", but the zlib library is expected to be a shared
 #		library and will be loaded in run-time by the OpenSSL library.
-# enable-montasm 0.9.8 branch only: enable Montgomery x86 assembler backport
-#               from 0.9.9
 # 386           generate 80386 code
 # no-sse2	disables IA-32 SSE2 code, above option implies no-sse2
 # no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)
@@ -101,13 +99,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
 # SHA512_ASM	sha512_block is implemented in assembler
 # AES_ASM	ASE_[en|de]crypt is implemented in assembler
 
-# Minimum warning options... any contributions to OpenSSL should at least get
-# past these. 
-
-my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED";
-
-my $strict_warnings = 0;
-
 my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
 
 # MD2_CHAR slags pentium pros
@@ -125,15 +116,17 @@ my $tlib="-lnsl -lsocket";
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
-my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o MAYBE-MO86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o rc4_skey.o:rm86-elf.o:r586-elf.o";
+my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o mo86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o";
-my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o MAYBE-MO86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o rc4_skey.o:rm86-cof.o:r586-cof.o";
+my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o mo86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o";
-my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o";
+my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o mo86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o";
 
 my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
-my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
 
 my $no_asm="::::::::::";
 
+my $ia64_asm=$no_asm;
+my $s390x_asm=$no_asm;
+
 # As for $BSDthreads. Idea is to maintain "collective" set of flags,
 # which would cover all BSD flavors. -pthread applies to them all, 
 # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD
@@ -161,30 +154,22 @@ my %table=(
 "debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o",
 "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
-"debug-ben-debug",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG  -DDEBUG_SAFESTACK -ggdb3 -O2 -pipe::(unknown)::::::",
+"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",
-"debug-ben-debug-64",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-ben-debug-noopt",	"gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG  -DDEBUG_SAFESTACK -ggdb3 -pipe::(unknown)::::::",
 "debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-bodo",	"gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
-"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -m32 -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
-"debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -m32 -g -pedantic -Wno-long-long -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared",
 "debug-steve-linux-pseudo64",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT:${no_asm}:dlfcn:linux-shared",
-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-geoff","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO  -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "dist",		"cc:-O::(unknown)::::::",
 
 # Basic configs that should work on any (32 and less bit) box
@@ -210,33 +195,33 @@ my %table=(
 # actually recommend to consider using gcc shared build even with vendor
 # compiler:-)
 #						<appro@fy.chalmers.se>
-"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
 #### Solaris x86 with Sun C setups
 "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Solaris with GNU C setups
 "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
-"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 ####
-"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SPARC Solaris with Sun C setups
 # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2.
 # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8
 # SC5.0 note: Compiler common patch 107357-01 or later is required!
 "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
+"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs",
 ####
-"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
+"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
 
 #### SunOS configs, assuming sparc for the gcc one.
 #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
@@ -249,11 +234,11 @@ my %table=(
 #### IRIX 6.x configs
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
-"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${no_asm}:dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o::::::::::dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${no_asm}:dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # N64 ABI builds.
-"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${no_asm}:dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o::::::::::dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${no_asm}:dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### Unified HP-UX ANSI C configs.
 # Special notes:
@@ -286,8 +271,8 @@ my %table=(
 # Since there is mention of this in shlib/hpux10-cc.sh
 "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o::::::::::dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # More attempts at unified 10.X and 11.X targets for HP C compiler.
 #
@@ -295,8 +280,8 @@ my %table=(
 # Kevin Steves <ks@hp.se>
 "hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "hpux-parisc1_0-cc","cc:+DAportable +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o::::::::::dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 # HP/UX IA-64 targets
 "hpux-ia64-cc","cc:-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD32 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -333,27 +318,28 @@ my %table=(
 # *-generic* is endian-neutral target, but ./config is free to
 # throw in -D[BL]_ENDIAN, whichever appropriate...
 "linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### IA-32 targets...
 "linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 ####
 "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ppc64",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64",	"gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-s390x",  "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### SPARC Linux setups
 # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### Alpha Linux with GNU C and Compaq C setups
 # Special notes:
 # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you
@@ -380,13 +366,13 @@ my %table=(
 "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-BSD-x86-elf",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-sparcv8",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-sparcv8",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 "BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
 # simply *happens* to work around a compiler bug in gcc 3.3.3,
 # triggered by RIPEMD160 code.
-"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
@@ -400,8 +386,7 @@ my %table=(
 
 # QNX
 "qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
-"QNX6",       "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",
-"QNX6-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 #### SCO/Caldera targets.
 #
@@ -425,12 +410,12 @@ my %table=(
 
 #### IBM's AIX.
 "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
-"aix-gcc",  "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
+"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:${no_asm}:dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
+"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${no_asm}:dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
 # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
 # at build time. $OBJECT_MODE is respected at ./config stage!
-"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
+"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${no_asm}:dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
+"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${no_asm}:dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
 
 #
 # Cray T90 and similar (SDSC)
@@ -501,20 +486,15 @@ my %table=(
 "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
 "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
 
-# NetWare from David Ward (dsward@novell.com)
+# NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools
-# requires either MetroWerks NLM development tools, or gcc / nlmconv
-# NetWare defaults socket bio to WinSock sockets. However,
-# the builds can be configured to use BSD sockets instead.
 # netware-clib => legacy CLib c-runtime support
-"netware-clib", "mwccnlm::::::${x86_gcc_opts}::",
+"netware-clib", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
-"netware-clib-bsdsock", "mwccnlm::::::${x86_gcc_opts}::",
-"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
-"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
 # netware-libc => LibC/NKS support
+# NetWare defaults socket bio to WinSock sockets. However, the LibC build can be
+# configured to use BSD sockets instead.
 "netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
 "netware-libc-bsdsock", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
 "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
 
 # DJGPP
 "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
@@ -527,12 +507,9 @@ my %table=(
 
 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
 "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### A/UX
 "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@@ -547,6 +524,8 @@ my %table=(
 "OS2-EMX", "gcc::::::::",
 
 ##### VxWorks for various targets
+"vxworks-ppc60x","ccppc:-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common:::linux_ppc32.o:::::::::::::::ranlibppc:",
+"vxworks-ppcgen","ccppc:-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon:::linux_ppc32.o:::::::::::::::ranlibppc:",
 "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
 "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
 "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
@@ -560,9 +539,7 @@ my %table=(
 
 my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
 		    VC-NT VC-CE VC-WIN32
-		    BC-32 OS2-EMX
+		    BC-32 OS2-EMX netware-clib netware-libc netware-libc-bsdsock);
-		    netware-clib netware-clib-bsdsock
-		    netware-libc netware-libc-bsdsock);
 
 my $idx = 0;
 my $idx_cc = $idx++;
@@ -592,12 +569,11 @@ my $idx_ranlib = $idx++;
 my $idx_arflags = $idx++;
 
 my $prefix="";
-my $libdir="";
 my $openssldir="";
 my $exe_ext="";
-my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
+my $install_prefix="$ENV{'INSTALL_PREFIX'}";
-my $cross_compile_prefix="";
+my $cross_compile_prefix="$ENV{'CROSS_COMPILE'}";
-my $fipslibdir="/usr/local/ssl/fips-1.0/lib/";
+my $fipslibdir="/usr/local/ssl/lib/fips-1.0/";
 my $nofipscanistercheck=0;
 my $fipsdso=0;
 my $fipscanisterinternal="n";
@@ -608,7 +584,6 @@ my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_rfc3779=1; # but "no-rfc3779" is default
-my $montasm=1;   # but "no-montasm" is default
 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;
@@ -629,7 +604,7 @@ my $fips_des_enc="fips_des_enc.o";
 my $aes_enc="aes_core.o aes_cbc.o";
 my $bf_enc	="bf_enc.o";
 my $cast_enc="c_enc.o";
-my $rc4_enc="rc4_enc.o rc4_skey.o";
+my $rc4_enc="rc4_enc.o";
 my $rc5_enc="rc5_enc.o";
 my $md5_obj="";
 my $sha1_obj="";
@@ -642,14 +617,10 @@ my $fips=0;
 
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
 
-my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
+my %disabled = ( # "what"         => "comment"
                  "camellia"       => "default",
-                 "capieng"        => "default",
-                 "cms"            => "default",
                  "gmp"            => "default",
-                 "jpake"          => "experimental",
                  "mdc2"           => "default",
-                 "montasm"        => "default", # explicit option in 0.9.8 only (implicitly enabled in 0.9.9)
                  "rc5"            => "default",
                  "rfc3779"        => "default",
                  "seed"           => "default",
@@ -657,20 +628,13 @@ my %disabled = ( # "what"         => "comment" [or special keyword "experimental
                  "zlib"           => "default",
                  "zlib-dynamic"   => "default"
                );
-my @experimental = ();
 
-# This is what $depflags will look like with the above defaults
+# Additional "no-..." options will be collected in %disabled.
-# (we need this to see if we should advise the user to run "make depend"):
+# To remove something from %disabled, use e.g. "enable-rc5".
-my $default_depflags = " -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED";
+# For symmetry, "disable-..." is a synonym for "no-...".
 
-
+# This is what $depflags will look like with the above default:
-# Explicit "no-..." options will be collected in %disabled along with the defaults.
+my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED ";
-# To remove something from %disabled, use "enable-foo" (unless it's experimental).
-# For symmetry, "disable-foo" is a synonym for "no-foo".
-
-# For features called "experimental" here, a more explicit "experimental-foo" is needed to enable.
-# We will collect such requests in @experimental.
-# To avoid accidental use of experimental features, applications will have to use -DOPENSSL_EXPERIMENTAL_FOO.
 
 
 my $no_sse2=0;
@@ -679,7 +643,6 @@ my $no_sse2=0;
 
 my $flags;
 my $depflags;
-my $openssl_experimental_defines;
 my $openssl_algorithm_defines;
 my $openssl_thread_defines;
 my $openssl_sys_defines="";
@@ -700,7 +663,6 @@ while($argv_unprocessed)
 	{
 	$flags="";
 	$depflags="";
-	$openssl_experimental_defines="";
 	$openssl_algorithm_defines="";
 	$openssl_thread_defines="";
 	$openssl_sys_defines="";
@@ -725,8 +687,6 @@ PROCESS_ARGS:
 		s /^zlib-dynamic$/enable-zlib-dynamic/;
 
 		if (/^no-(.+)$/ || /^disable-(.+)$/)
-			{
-			if (!($disabled{$1} eq "experimental"))
 			{
 			if ($1 eq "ssl")
 				{
@@ -742,28 +702,16 @@ PROCESS_ARGS:
 				$disabled{$1} = "option";
 				}
 			}			
-			}			
+		elsif (/^enable-(.+)$/)
-		elsif (/^enable-(.+)$/ || /^experimental-(.+)$/)
 			{
-			my $algo = $1;
+			delete $disabled{$1};
-			if ($disabled{$algo} eq "experimental")
-				{
-				die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n"
-					unless (/^experimental-/);
-				push @experimental, $algo;
-				}
-			delete $disabled{$algo};
 
-			$threads = 1 if ($algo eq "threads");
+			$threads = 1 if ($1 eq "threads");
 			}
 		elsif (/^--test-sanity$/)
 			{
 			exit(&test_sanity());
 			}
-		elsif (/^--strict-warnings/)
-			{
-			$strict_warnings = 1;
-			}
 		elsif (/^reconfigure/ || /^reconf/)
 			{
 			if (open(IN,"<$Makefile"))
@@ -833,10 +781,6 @@ PROCESS_ARGS:
 				{
 				$prefix=$1;
 				}
-			elsif (/^--libdir=(.*)$/)
-				{
-				$libdir=$1;
-				}
 			elsif (/^--openssldir=(.*)$/)
 				{
 				$openssldir=$1;
@@ -944,10 +888,6 @@ if (defined($disabled{"md5"}) || defined($disabled{"sha"})
 	$disabled{"tls1"} = "forced";
 	}
 
-if (defined($disabled{"tls1"}))
-	{
-	$disabled{"tlsext"} = "forced";
-	}
 
 if ($target eq "TABLE") {
 	foreach $target (sort keys %table) {
@@ -974,10 +914,6 @@ print "Configuring for $target\n";
 
 my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
 my $cc = $fields[$idx_cc];
-# Allow environment CC to override compiler...
-if($ENV{CC}) {
-    $cc = $ENV{CC};
-}
 my $cflags = $fields[$idx_cflags];
 my $unistd = $fields[$idx_unistd];
 my $thread_cflag = $fields[$idx_thread_cflag];
@@ -1000,8 +936,7 @@ my $shared_target = $fields[$idx_shared_target];
 my $shared_cflag = $fields[$idx_shared_cflag];
 my $shared_ldflag = $fields[$idx_shared_ldflag];
 my $shared_extension = $fields[$idx_shared_extension];
-my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+my $ranlib = $fields[$idx_ranlib];
-my $ar = $ENV{'AR'} || "ar";
 my $arflags = $fields[$idx_arflags];
 
 if ($fips)
@@ -1012,15 +947,6 @@ if ($fips)
 		    "$cpuid_obj:$bn_obj:$aes_obj:$des_obj:$sha1_obj" eq "::::");
 	}
 
-foreach (sort @experimental)
-	{
-	my $ALGO;
-	($ALGO = $_) =~ tr/[a-z]/[A-Z]/;
-
-	# opensslconf.h will set OPENSSL_NO_... unless OPENSSL_EXPERIMENTAL_... is defined
-	$openssl_experimental_defines .= "#define OPENSSL_NO_$ALGO\n";
-	$cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO";
-	}
 
 foreach (sort (keys %disabled))
 	{
@@ -1036,8 +962,6 @@ foreach (sort (keys %disabled))
 		{ $no_shared = 1; }
 	elsif (/^zlib$/)
 		{ $zlib = 0; }
-	elsif (/^montasm$/)
-		{ $montasm = 0; }
 	elsif (/^static-engine$/)
 		{ }
 	elsif (/^zlib-dynamic$/)
@@ -1071,7 +995,7 @@ foreach (sort (keys %disabled))
 				push @skip, $algo;
 				print " (skip dir)";
 
-				$depflags .= " -DOPENSSL_NO_$ALGO";
+				$depflags .="-DOPENSSL_NO_$ALGO ";
 				}
 			}
 		}
@@ -1079,6 +1003,7 @@ foreach (sort (keys %disabled))
 	print "\n";
 	}
 
+
 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
 
 $IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
@@ -1086,13 +1011,12 @@ $IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
 $no_shared = 0 if ($fipsdso && !$IsMK1MF);
 
 $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw");
-$exe_ext=".nlm" if ($target =~ /netware/);
 $exe_ext=".pm"  if ($target =~ /vos/);
 if ($openssldir eq "" and $prefix eq "")
 	{
 	if ($fips)
 		{
-		$openssldir="/usr/local/ssl/fips";
+		$openssldir="/usr/local/ssl/fips-1.0";
 		}
 	else
 		{
@@ -1101,17 +1025,12 @@ if ($openssldir eq "" and $prefix eq "")
 	}
 $prefix=$openssldir if $prefix eq "";
 
-$libdir="lib" if $libdir eq "";
-
 $default_ranlib= &which("ranlib") or $default_ranlib="true";
 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
   or $perl="perl";
-my $make = $ENV{'MAKE'} || "make";
-
-$cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq "";
 
 chop $openssldir if $openssldir =~ /\/$/;
-chop $prefix if $prefix =~ /.\/$/;
+chop $prefix if $prefix =~ /\/$/;
 
 $openssldir=$prefix . "/ssl" if $openssldir eq "";
 $openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
@@ -1255,14 +1174,6 @@ if ($no_asm)
 	$cflags=~s/\-D[BL]_ENDIAN//		if ($fips);
 	$thread_cflags=~s/\-D[BL]_ENDIAN//	if ($fips);
 	}
-if ($montasm)
-	{
-	$bn_obj =~ s/MAYBE-MO86-/mo86-/;
-	}
-else
-	{
-	$bn_obj =~ s/MAYBE-MO86-[a-z.]*//;
-	}
 
 if (!$no_shared)
 	{
@@ -1328,6 +1239,7 @@ if ($target =~ /\-icc$/)	# Intel C compiler
 		while(<FD>) { $iccver=$1 if (/Version ([0-9]+)\./); }
 		close(FD);
 		}
+
 	if ($iccver>=8)
 		{
 		# Eliminate unnecessary dependency from libirc.a. This is
@@ -1461,16 +1373,6 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
 	$shlib_minor=$2;
 	}
 
-if ($strict_warnings)
-	{
-	my $wopt;
-	die "ERROR --strict-warnings requires gcc" unless ($cc =~ /gcc$/);
-	foreach $wopt (split /\s+/, $gcc_devteam_warn)
-		{
-		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
-		}
-	}
-
 open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
 unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
 open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
@@ -1483,13 +1385,10 @@ while (<IN>)
 	if ($sdirs) {
 		my $dir;
 		foreach $dir (@skip) {
-			s/(\s)$dir\s/$1/;
+			s/([ 	])$dir /\1/;
-			s/\s$dir$//;
 			}
 		}
 	$sdirs = 0 unless /\\$/;
-        s/fips // if (/^DIRS=/ && !$fips);
-        s/engines // if (/^DIRS=/ && $disabled{"engine"});
 	s/^VERSION=.*/VERSION=$version/;
 	s/^MAJOR=.*/MAJOR=$major/;
 	s/^MINOR=.*/MINOR=$minor/;
@@ -1500,7 +1399,6 @@ while (<IN>)
 	s/^SHLIB_EXT=.*/SHLIB_EXT=$shared_extension/;
 	s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
 	s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
-	s/^LIBDIR=.*$/LIBDIR=$libdir/;
 	s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
 	s/^PLATFORM=.*$/PLATFORM=$target/;
 	s/^OPTIONS=.*$/OPTIONS=$options/;
@@ -1513,12 +1411,11 @@ while (<IN>)
 		}
 	else	{
 		s/^CC=.*$/CC= $cc/;
-		s/^AR=\s*ar/AR= $ar/;
 		s/^RANLIB=.*/RANLIB= $ranlib/;
 		}
 	s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
 	s/^CFLAG=.*$/CFLAG= $cflags/;
-	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
+	s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
 	s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
 	s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
 	s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
@@ -1661,7 +1558,6 @@ print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configur
 
 print OUT "/* OpenSSL was configured with the following options: */\n";
 my $openssl_algorithm_defines_trans = $openssl_algorithm_defines;
-$openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n#  define OPENSSL_NO_$1\n# endif\n#endif/mg;
 $openssl_algorithm_defines_trans =~ s/^\s*#\s*define\s+OPENSSL_(.*)/# if defined(OPENSSL_$1) \&\& !defined($1)\n#  define $1\n# endif/mg;
 $openssl_algorithm_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
 $openssl_algorithm_defines = "   /* no ciphers excluded */\n" if $openssl_algorithm_defines eq "";
@@ -1670,10 +1566,8 @@ $openssl_sys_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/
 $openssl_other_defines =~ s/^\s*#\s*define\s+(.*)/#ifndef $1\n# define $1\n#endif/mg;
 print OUT $openssl_sys_defines;
 print OUT "#ifndef OPENSSL_DOING_MAKEDEPEND\n\n";
-print OUT $openssl_experimental_defines;
-print OUT "\n";
 print OUT $openssl_algorithm_defines;
-print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n\n";
+print OUT "\n#endif /* OPENSSL_DOING_MAKEDEPEND */\n";
 print OUT $openssl_thread_defines;
 print OUT $openssl_other_defines,"\n";
 
@@ -1690,20 +1584,9 @@ print OUT "#define OPENSSL_CPUID_OBJ\n\n" if ($cpuid_obj);
 while (<IN>)
 	{
 	if	(/^#define\s+OPENSSLDIR/)
-		{
+		{ print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
-		my $foo = $openssldir;
-		$foo =~ s/\\/\\\\/g;
-		print OUT "#define OPENSSLDIR \"$foo\"\n";
-		}
 	elsif	(/^#define\s+ENGINESDIR/)
-		{
+		{ print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
-		# $foo is to become "$prefix/lib$multilib/engines";
-		# as Makefile.org and engines/Makefile are adapted for
-		# $multilib suffix.
-		my $foo = "$prefix/lib/engines";
-		$foo =~ s/\\/\\\\/g;
-		print OUT "#define ENGINESDIR \"$foo\"\n";
-		}
 	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
 		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
 			if $export_var_as_fn;
@@ -1808,7 +1691,7 @@ if($IsMK1MF) {
 EOF
 	close(OUT);
 } else {
-	my $make_command = "$make PERL=\'$perl\'";
+	my $make_command = "make PERL=\'$perl\'";
 	my $make_targets = "";
 	$make_targets .= " links" if $symlink;
 	$make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
@@ -1816,11 +1699,11 @@ EOF
 	(system $make_command.$make_targets) == 0 or exit $?
 		if $make_targets ne "";
 	if ( $perl =~ m@^/@) {
-	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
+	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
 	    &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
 	} else {
 	    # No path for Perl known ...
-	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";',  '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
+	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
 	    &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
 	}
 	if ($depflags ne $default_depflags && !$make_depend) {
@@ -1835,7 +1718,7 @@ EOF
 }
 
 # create the ms/version32.rc file if needed
-if ($IsMK1MF && ($target !~ /^netware/)) {
+if ($IsMK1MF) {
 	my ($v1, $v2, $v3, $v4);
 	if ($version_num =~ /(^[0-9a-f]{1})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})/i) {
 		$v1=hex $1;
@@ -1937,7 +1820,7 @@ OpenSSL FIPS Object Module as identified by the CMVP
 (http://csrc.nist.gov/cryptval/) in any application requiring the use of FIPS
 140-2 validated software. 
 
-This is an OpenSSL 0.9.8 test version.
+This is an OpenSSL 0.9.8-fips test version.
 
 See the file README.FIPS for details of how to build a test library.
 

FAQ

@@ -10,7 +10,6 @@ OpenSSL  -  Frequently Asked Questions
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
-* How does the versioning scheme work?
 
 [LEGAL] Legal questions
 
@@ -33,8 +32,6 @@ OpenSSL  -  Frequently Asked Questions
 * How do I install a CA certificate into a browser?
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 * What is a "128 bit certificate"? Can I create one with OpenSSL?
-* Why does OpenSSL set the authority key identifier extension incorrectly?
-* How can I set up a bundle of commercial root CA certificates?
 
 [BUILD] Questions about building and testing OpenSSL
 
@@ -53,9 +50,6 @@ OpenSSL  -  Frequently Asked Questions
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 * Why does compiler fail to compile sha512.c?
 * Test suite still fails, what to do?
-* I think I've found a bug, what should I do?
-* I'm SURE I've found a bug, how do I report it?
-* I've found a security issue, how do I report it?
 
 [PROG] Questions about programming with OpenSSL
 
@@ -72,9 +66,6 @@ OpenSSL  -  Frequently Asked Questions
 * Why doesn't my server application receive a client certificate?
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 * I think I've detected a memory leak, is this a bug?
-* Why does Valgrind complain about the use of uninitialized data?
-* Why doesn't a memory BIO work when a file does?
-* Where are the declarations and implementations of d2i_X509() etc?
 
 ===============================================================================
 
@@ -83,11 +74,11 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 1.0.1d was released on Feb 5th, 2013.
+OpenSSL 0.9.8e was released on February 23rd, 2007.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
-ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access.
+ftp://ftp.openssl.org/snapshot/>, or get it by anonymous CVS access.
 
 
 * Where is the documentation?
@@ -99,19 +90,19 @@ explains how to install this library.
 
 OpenSSL includes a command line utility that can be used to perform a
 variety of cryptographic functions.  It is described in the openssl(1)
-manpage.  Documentation for developers is currently being written. Many
+manpage.  Documentation for developers is currently being written.  A
-manual pages are available; overviews over libcrypto and
+few manual pages already are available; overviews over libcrypto and
 libssl are given in the crypto(3) and ssl(3) manpages.
 
 The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
 different directory if you specified one as described in INSTALL).
 In addition, you can read the most current versions at
-<URL: http://www.openssl.org/docs/>. Note that the online documents refer
+<URL: http://www.openssl.org/docs/>.
-to the very latest development versions of OpenSSL and may include features
+
-not present in released versions. If in doubt refer to the documentation
+For information on parts of libcrypto that are not yet documented, you
-that came with the version of OpenSSL you are using. The pod format
+might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
-documentation is included in each OpenSSL distribution under the docs
+predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
-directory.
+of this still applies to OpenSSL.
 
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
@@ -132,7 +123,7 @@ OpenSSL.  Information on the OpenSSL mailing lists is available from
 * Where can I get a compiled version of OpenSSL?
 
 You can finder pointers to binary distributions in
-<URL: http://www.openssl.org/related/binaries.html> .
+http://www.openssl.org/related/binaries.html .
 
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
@@ -171,19 +162,6 @@ just do:
 
    pgp TARBALL.asc
 
-* How does the versioning scheme work?
-
-After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter 
-releases (e.g. 1.0.1a) can only contain bug and security fixes and no
-new features. Minor releases change the last number (e.g. 1.0.2) and 
-can contain new features that retain binary compatibility. Changes to
-the middle number are considered major releases and neither source nor
-binary compatibility is guaranteed.
-
-Therefore the answer to the common question "when will feature X be
-backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear
-in the next minor release.
-
 [LEGAL] =======================================================================
 
 * Do I need patent licenses to use OpenSSL?
@@ -295,7 +273,7 @@ current directory in this case, but this has changed with 0.9.6a.)
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
-extensions documentation (in ca(1), req(1), x509v3_config(5) )
+extensions documentation (currently in doc/openssl.txt).
 
 
 * Why can't I create certificate requests?
@@ -423,10 +401,10 @@ You can't generally create such a certificate using OpenSSL but there is no
 need to any more. Nowadays web browsers using unrestricted strong encryption
 are generally available.
 
-When there were tight restrictions on the export of strong encryption
+When there were tight export restrictions on the export of strong encryption
 software from the US only weak encryption algorithms could be freely exported
 (initially 40 bit and then 56 bit). It was widely recognised that this was
-inadequate. A relaxation of the rules allowed the use of strong encryption but
+inadequate. A relaxation the rules allowed the use of strong encryption but
 only to an authorised server.
 
 Two slighly different techniques were developed to support this, one used by
@@ -447,39 +425,6 @@ The export laws were later changed to allow almost unrestricted use of strong
 encryption so these certificates are now obsolete.
 
 
-* Why does OpenSSL set the authority key identifier (AKID) extension incorrectly?
-
-It doesn't: this extension is often the cause of confusion.
-
-Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose
-certificate C contains AKID.
-
-The purpose of this extension is to identify the authority certificate B. This
-can be done either by including the subject key identifier of B or its issuer
-name and serial number.
-
-In this latter case because it is identifying certifcate B it must contain the
-issuer name and serial number of B.
-
-It is often wrongly assumed that it should contain the subject name of B. If it
-did this would be redundant information because it would duplicate the issuer
-name of C.
-
-
-* How can I set up a bundle of commercial root CA certificates?
-
-The OpenSSL software is shipped without any root CA certificate as the
-OpenSSL project does not have any policy on including or excluding
-any specific CA and does not intend to set up such a policy. Deciding
-about which CAs to support is up to application developers or
-administrators.
-
-Other projects do have other policies so you can for example extract the CA
-bundle used by Mozilla and/or modssl as described in this article:
-
-  <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html>
-
-
 [BUILD] =======================================================================
 
 * Why does the linker complain about undefined symbols?
@@ -519,7 +464,7 @@ when you run the test suite (using "make test").  The message returned is
 "bc: 1 not implemented".
 
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
+and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 
 
@@ -530,7 +475,7 @@ that the OpenSSL bntest throws at it.  This gets triggered when you run the
 test suite (using "make test").  The message returned is "bc: stack empty".
 
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
+and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 
 
@@ -723,49 +668,6 @@ never make sense, and tend to emerge when you least expect them. In order
 to identify one, drop optimization level, e.g. by editing CFLAG line in
 top-level Makefile, recompile and re-run the test.
 
-* I think I've found a bug, what should I do?
-
-If you are a new user then it is quite likely you haven't found a bug and
-something is happening you aren't familiar with. Check this FAQ, the associated
-documentation and the mailing lists for similar queries. If you are still
-unsure whether it is a bug or not submit a query to the openssl-users mailing
-list.
-
-
-* I'm SURE I've found a bug, how do I report it?
-
-Bug reports with no security implications should be sent to the request
-tracker. This can be done by mailing the report to <rt@openssl.org> (or its
-alias <openssl-bugs@openssl.org>), please note that messages sent to the
-request tracker also appear in the public openssl-dev mailing list.
-
-The report should be in plain text. Any patches should be sent as
-plain text attachments because some mailers corrupt patches sent inline.
-If your issue affects multiple versions of OpenSSL check any patches apply
-cleanly and, if possible include patches to each affected version.
-
-The report should be given a meaningful subject line briefly summarising the
-issue. Just "bug in OpenSSL" or "bug in OpenSSL 0.9.8n" is not very helpful.
-
-By sending reports to the request tracker the bug can then be given a priority
-and assigned to the appropriate maintainer. The history of discussions can be
-accessed and if the issue has been addressed or a reason why not. If patches
-are only sent to openssl-dev they can be mislaid if a team member has to
-wade through months of old messages to review the discussion.
-
-See also <URL: http://www.openssl.org/support/rt.html>
-
-
-* I've found a security issue, how do I report it?
-
-If you think your bug has security implications then please send it to
-openssl-security@openssl.org if you don't get a prompt reply at least 
-acknowledging receipt then resend or mail it directly to one of the
-more active team members (e.g. Steve).
-
-Note that bugs only present in the openssl utility are not in general
-considered to be security issues. 
-
 [PROG] ========================================================================
 
 * Is OpenSSL thread-safe?
@@ -778,10 +680,8 @@ file.
 
 Multi-threaded applications must provide two callback functions to
 OpenSSL by calling CRYPTO_set_locking_callback() and
-CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
+CRYPTO_set_id_callback().  This is described in the threads(3)
-including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
+manpage.
-and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
-and friends. This is described in the threads(3) manpage.
 
 * I've compiled a program under Windows and it crashes: why?
 
@@ -922,11 +822,11 @@ code itself (the hex digits after the second colon).
 
 * Why do I get errors about unknown algorithms?
 
-The cause is forgetting to load OpenSSL's table of algorithms with
+This can happen under several circumstances such as reading in an
-OpenSSL_add_all_algorithms(). See the manual page for more information. This
+encrypted private key or attempting to decrypt a PKCS#12 file. The cause
-can cause several problems such as being unable to read in an encrypted
+is forgetting to load OpenSSL's table of algorithms with
-PEM file, unable to decrypt a PKCS#12 file or signature failure when
+OpenSSL_add_all_algorithms(). See the manual page for more information.
-verifying certificates.
+
 
 * Why can't the OpenSSH configure script detect OpenSSL?
 
@@ -994,46 +894,5 @@ thread-safe):
   ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
 
 
-* Why does Valgrind complain about the use of uninitialized data?
-
-When OpenSSL's PRNG routines are called to generate random numbers the supplied
-buffer contents are mixed into the entropy pool: so it technically does not
-matter whether the buffer is initialized at this point or not.  Valgrind (and
-other test tools) will complain about this. When using Valgrind, make sure the
-OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY)
-to get rid of these warnings.
-
-
-* Why doesn't a memory BIO work when a file does?
-
-This can occur in several cases for example reading an S/MIME email message.
-The reason is that a memory BIO can do one of two things when all the data
-has been read from it.
-
-The default behaviour is to indicate that no more data is available and that
-the call should be retried, this is to allow the application to fill up the BIO
-again if necessary.
-
-Alternatively it can indicate that no more data is available and that EOF has
-been reached.
-
-If a memory BIO is to behave in the same way as a file this second behaviour
-is needed. This must be done by calling:
-
-   BIO_set_mem_eof_return(bio, 0);
-
-See the manual pages for more details.
-
-
-* Where are the declarations and implementations of d2i_X509() etc?
-
-These are defined and implemented by macros of the form:
-
-
- DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509)
-
-The implementation passes an ASN1 "template" defining the structure into an
-ASN1 interpreter using generalised functions such as ASN1_item_d2i().
-
-
 ===============================================================================
+

INSTALL

@@ -158,7 +158,7 @@
      standard headers).  If it is a problem with OpenSSL itself, please
      report the problem to <openssl-bugs@openssl.org> (note that your
      message will be recorded in the request tracker publicly readable
-     via http://www.openssl.org/support/rt.html and will be forwarded to a
+     via http://www.openssl.org/support/rt2.html and will be forwarded to a
      public mailing list). Include the output of "make report" in your message.
      Please check out the request tracker. Maybe the bug was already
      reported or has already been fixed.
@@ -180,7 +180,7 @@
      in Makefile.ssl and run "make clean; make". Please send a bug
      report to <openssl-bugs@openssl.org>, including the output of
      "make report" in order to be added to the request tracker at
-     http://www.openssl.org/support/rt.html.
+     http://www.openssl.org/support/rt2.html.
 
   4. If everything tests ok, install OpenSSL with
 

INSTALL.NW

@@ -8,62 +8,58 @@ Notes about building OpenSSL for NetWare.
 BUILD PLATFORM:
 ---------------
 The build scripts (batch files, perl scripts, etc) have been developed and
-tested on W2K.  The scripts should run fine on other Windows platforms
+tested on W2K.  The scripts should run fine on other Windows
-(NT, Win9x, WinXP) but they have not been tested.  They may require some
+platforms (NT, Win9x, WinXP) but they haven't been tested.  They may require 
-modifications.
+some modifications.
 
 
 Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
--------------------------------------------------------
+------------------------------------------
-OpenSSL can either use the WinSock interfaces introduced in NetWare 5,
+OpenSSL uses the WinSock interfaces introduced in NetWare 5.  Therefore,
-or the BSD socket interface.  Previous versions of NetWare, 4.x and 3.x,
+previous versions of NetWare, 4.x and 3.x, are not supported.
-are only supported if OpenSSL is build for CLIB and BSD sockets;
-WinSock builds only support NetWare 5 and up.
 
 On NetWare there are two c-runtime libraries.  There is the legacy CLIB 
-interfaces and the newer LIBC interfaces.  Being ANSI-C libraries, the 
+interfaces and the newer LibC interfaces.  Being ANSI-C libraries, the 
-functionality in CLIB and LIBC is similar but the LIBC interfaces are built 
+functionality in CLIB and LibC is similar but the LibC interfaces are built 
 using Novell Kernal Services (NKS) which is designed to leverage 
 multi-processor environments.
 
-The NetWare port of OpenSSL can be configured to build using CLIB or LIBC.
+The NetWare port of OpenSSL can configured to build using CLIB or LibC.  The 
-The CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LIBC 
+CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LibC 
 build was developed and tested using the NetWare 6.0 FCS.  
 
-The necessary LIBC functionality ships with NetWare 6.  However, earlier 
+The necessary LibC functionality ships with NetWare 6.  However, earlier 
-NetWare 5.x versions will require updates in order to run the OpenSSL LIBC
+NetWare 5.x versions will require updates in order to run the OpenSSL LibC
-build (NetWare 5.1 SP8 is known to work).
+build.
 
-As of June 2005, the LIBC build can be configured to use BSD sockets instead
+As of June 2005, the LibC build can be configured to use BSD sockets instead
 of WinSock sockets. Call Configure (usually through netware\build.bat) using
 a target of "netware-libc-bsdsock" instead of "netware-libc".
 
-As of June 2007, support for CLIB and BSD sockets is also now available
-using a target of "netware-clib-bsdsock" instead of "netware-clib";
-also gcc builds are now supported on both Linux and Win32 (post 0.9.8e).
 
 REQUIRED TOOLS:
 ---------------
 Based upon the configuration and build options used, some or all of the
 following tools may be required:
 
+
 * Perl for Win32 - required (http://www.activestate.com/ActivePerl)
    Used to run the various perl scripts on the build platform.
 
+
 * Perl 5.8.0 for NetWare v3.20 (or later) - required 
    (http://developer.novell.com) Used to run the test script on NetWare 
    after building.
 
-* Compiler / Linker - required:
+
-   Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare (commercial):
+* Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare - required:
    Provides command line tools used for building.
+
    Tools:
    mwccnlm.exe  - C/C++ Compiler for NetWare
    mwldnlm.exe  - Linker for NetWare
    mwasmnlm.exe - x86 assembler for NetWare (if using assembly option)
 
-   gcc / nlmconv Cross-Compiler, available from Novell Forge (free):
-         http://forge.novell.com/modules/xfmod/project/?aunixnw
 
 * Assemblers - optional:
    If you intend to build using the assembly options you will need an
@@ -83,11 +79,11 @@ following tools may be required:
    In order to build you will need a make tool.  Two make tools are
    supported, GNU make (gmake.exe) or Microsoft nmake.exe.
 
-   make.exe - GNU make for Windows (version 3.75 used for development)
+   gmake.exe - GNU make for Windows (version 3.75 used for development)
-         http://gnuwin32.sourceforge.net/packages/make.htm
+         http://www.gnu.org/software/make/make.html
 
    nmake.exe - Microsoft make (Version 6.00.8168.0 used for development)
-         http://support.microsoft.com/kb/132084/EN-US/
+
 
 * Novell Developer Kit (NDK) - required: (http://developer.novell.com)
 
@@ -127,14 +123,14 @@ following tools may be required:
 
    LIBC - BUILDS:
    
-      Libraries for C (LIBC) - LIBC headers and import files
+      Libraries for C (LibC) - LibC headers and import files
-         If you are going to build a LIBC version of OpenSSL, you will
+         If you are going to build a LibC version of OpenSSL, you will
-         need the LIBC headers and imports.  The March 14, 2002 NDK release or
+         need the LibC headers and imports.  The March 14, 2002 NDK release or
          later is required.  
          
-         NOTE: The LIBC SDK includes the necessary WinSock2 support.
+         NOTE: The LibC SDK includes the necessary WinSock2 support.  It
-         It is not necessary to download the WinSock2 NDK when building for
+         It is not necessary to download the WinSock2 Developer when building
-         LIBC. The LIBC SDK also includes the appropriate BSD socket support
+         for LibC. The LibC SDK also includes the appropriate BSD socket support
          if configuring to use BSD sockets.
 
 
@@ -147,36 +143,33 @@ The set_env.bat file is a template you can use to set up the path
 and environment variables you will need to build.  Modify the
 various lines to point to YOUR tools and run set_env.bat.
 
-   netware\set_env.bat <target> [compiler]
+   netware\set_env.bat [target]
 
-      target        - "netware-clib" - CLIB NetWare build
+      target        - "netware-clib" - CLib NetWare build
-                    - "netware-libc" - LIBC NetWare build
+                    - "netware-libc" - LibC NetWare build
-
-      compiler      - "gnuc"         - GNU GCC Compiler
-                    - "codewarrior"  - MetroWerks CodeWarrior (default)
 
 If you don't use set_env.bat, you will need to set up the following
 environment variables:
 
-   PATH - Set PATH to point to the tools you will use.
+   path - Set path to point to the tools you will use.
 
-   INCLUDE - The location of the NDK include files.
+   MWCIncludes - The location of the NDK include files.
          
-            CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm
+            CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
-            LIBC ex: set INCLUDE=c:\ndk\libc\include
+            LibC ex: set MWCIncludes=c:\ndk\libc\include
 
    PRELUDE - The absolute path of the prelude object to link with.  For
             a CLIB build it is recommended you use the "clibpre.o" files shipped
-            with the Metrowerks PDK for NetWare.  For a LIBC build you should 
+            with the Metrowerks PDK for NetWare.  For a LibC build you should 
-            use the "libcpre.o" file delivered with the LIBC NDK components.
+            use the "libcpre.o" file delivered with the LibC NDK components.
 
             CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
-            LIBC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
+            LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
 
    IMPORTS - The locaton of the NDK import files.
 
             CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
-            LIBC ex: set IMPORTS=c:\ndk\libc\imports
+            LibC ex: set IMPORTS=c:\ndk\libc\imports
 
 
 In order to build, you need to run the Perl scripts to configure the build
@@ -189,10 +182,9 @@ the assembly code.  Always run build.bat from the "openssl" directory.
 
    netware\build [target] [debug opts] [assembly opts] [configure opts]
 
-      target        - "netware-clib" - CLIB NetWare build (WinSock Sockets)
+      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
-                    - "netware-clib-bsdsock" - CLIB NetWare build (BSD Sockets)
+                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
-                    - "netware-libc" - LIBC NetWare build (WinSock Sockets)
+                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
-                    - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets)
  
       debug opts    - "debug"  - build debug
 
@@ -201,27 +193,25 @@ the assembly code.  Always run build.bat from the "openssl" directory.
                       "no-asm"   - don't use assembly
 
       configure opts- all unrecognized arguments are passed to the
-                      perl 'configure' script. See that script for
+                      perl configure script
-                      internal documentation regarding options that
-                      are available.
 
    examples:
 
       CLIB build, debug, without assembly:
          netware\build.bat netware-clib debug no-asm
 
-      LIBC build, non-debug, using NASM assembly, add mdc2 support:
+      LibC build, non-debug, using NASM assembly:
-         netware\build.bat netware-libc nw-nasm enable-mdc2
+         netware\build.bat netware-libc nw-nasm
 
-      LIBC build, BSD sockets, non-debug, without assembly:
+      LibC build, BSD sockets, non-debug, without assembly:
          netware\build.bat netware-libc-bsdsock no-asm
 
 Running build.bat generates a make file to be processed by your make 
 tool (gmake or nmake):
 
    CLIB ex: gmake -f netware\nlm_clib_dbg.mak 
-   LIBC ex: gmake -f netware\nlm_libc.mak 
+   LibC ex: gmake -f netware\nlm_libc.mak 
-   LIBC ex: gmake -f netware\nlm_libc_bsdsock.mak 
+   LibC ex: gmake -f netware\nlm_libc_bsdsock.mak 
 
 
 You can also run the build scripts manually if you do not want to use the
@@ -230,7 +220,7 @@ subdirectory (in the order listed below):
 
    perl configure no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock]
       configures no assembly build for specified netware environment
-      (CLIB or LIBC).
+      (CLIB or LibC).
 
    perl util\mkfiles.pl >MINFO
       generates a listing of source files (used by mk1mf)
@@ -260,12 +250,12 @@ The output from the build is placed in the following directories:
       tmp_nw_clib         - temporary build files
       outinc_nw_clib      - necesary include files
 
-   LIBC Debug build:
+   LibC Debug build:
       out_nw_libc.dbg     - static libs & test nlm(s)
       tmp_nw_libc.dbg     - temporary build files
       outinc_nw_libc      - necessary include files
 
-   LIBC Non-debug build:
+   LibC Non-debug build:
       out_nw_libc         - static libs & test nlm(s)
       tmp_nw_libc         - temporary build files
       outinc_nw_libc      - necesary include files
@@ -291,7 +281,7 @@ To run cpy_tests.bat:
       NetWare drive    - drive letter of mapped drive
 
       CLIB ex: netware\cpy_tests out_nw_clib m:
-      LIBC ex: netware\cpy_tests out_nw_libc m:
+      LibC ex: netware\cpy_tests out_nw_libc m:
 
 
 The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server
@@ -366,9 +356,9 @@ clean up the resources!
 
 Multi-threaded Development
 ---------------------------
-The NetWare version of OpenSSL is thread-safe, however multi-threaded
+The NetWare version of OpenSSL is thread-safe however, multi-threaded
 applications must provide the necessary locking function callbacks.  This
-is described in doc\threads.doc.  The file "openssl-x.x.x\crypto\threads\mttest.c"
+is described in doc\threads.doc.  The file "openssl\crypto\threads\mttest.c"
 is a multi-threaded test program and demonstrates the locking functions.
 
 
@@ -438,7 +428,7 @@ Makefile "vclean"
 ------------------
 The generated makefile has a "vclean" target which cleans up the build
 directories.  If you have been building successfully and suddenly
-experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry.
+experience problems, use "vclean" (gmake -f netware\nlm.mak vclean) and retry.
 
 
 "Undefined Symbol" Linker errors

INSTALL.W32

@@ -18,7 +18,7 @@
   * Borland C
   * GNU C (Cygwin or MinGW)
 
- If you are compiling from a tarball or a Git snapshot then the Win32 files
+ If you are compiling from a tarball or a CVS snapshot then the Win32 files
  may well be not up to date. This may mean that some "tweaking" is required to
  get it all to work. See the trouble shooting section later on for if (when?)
  it goes wrong.
@@ -264,7 +264,7 @@ To install OpenSSL to the specified location do:
 
  then ms\do_XXX should not give a warning any more. However the numbers that
  get assigned by this technique may not match those that eventually get
- assigned in the Git tree: so anything linked against this version of the
+ assigned in the CVS tree: so anything linked against this version of the
  library may need to be recompiled.
 
  If you get errors about unresolved symbols there are several possible

LICENSE

@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

MacOS/GetHTTPS.src/ErrorHandling.hpp

@@ -29,7 +29,7 @@ OSErr AppendErrorMessageToHandle(Handle inoutHandle);
 
 
 
-//	A bunch of evil macros that would be unnecessary if I were always using C++ !
+//	A bunch of evil macros that would be uneccessary if I were always using C++ !
 
 #define SetErrorMessageAndBailIfNil(theArg,theMessage)								\
 {																					\

MacOS/GetHTTPS.src/MacSocket.h

@@ -5,98 +5,97 @@
 extern "C" {
 #endif
 
-enum {
+
+
+enum
+{
 	kMacSocket_TimeoutErr = -2
 };
 
+
 //	Since MacSocket does busy waiting, I do a callback while waiting
 
-typedef OSErr(*MacSocket_IdleWaitCallback) (void *);
+typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
+
 
 //	Call this before anything else!
 
 OSErr MacSocket_Startup(void);
 
+
 //	Call this to cleanup before quitting
 
 OSErr MacSocket_Shutdown(void);
 
-// Call this to allocate a "socket" (reference number is returned in
+
-// outSocketNum)
+//	Call this to allocate a "socket" (reference number is returned in outSocketNum)
-// Note that inDoThreadSwitching is pretty much irrelevant right now, since I
+//	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
-// ignore it
 //	The inTimeoutTicks parameter is applied during reads/writes of data
-// The inIdleWaitCallback parameter specifies a callback which is called
+//	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
-// during busy-waiting periods
 //	The inUserRefPtr parameter is passed back to the idle-wait callback
 
-OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
+OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
-                       const long inTimeoutTicks,
+
-                       MacSocket_IdleWaitCallback inIdleWaitCallback,
-                       void *inUserRefPtr);
 
 //	Call this to connect to an IP/DNS address
-// Note that inTargetAddressAndPort is in "IP:port" format-- e.g.
+//	Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
-// 10.1.1.1:123
+
+OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
 
-OSErr MacSocket_connect(const int inSocketNum, char *inTargetAddressAndPort);
 
 //	Call this to listen on a port
-// Since this a low-performance implementation, I allow a maximum of 1 (one!)
+//	Since this a low-performance implementation, I allow a maximum of 1 (one!) incoming request when I listen
-// incoming request when I listen
+
+OSErr MacSocket_listen(const int inSocketNum,const int inPortNum);
 
-OSErr MacSocket_listen(const int inSocketNum, const int inPortNum);
 
 //	Call this to close a socket
 
 OSErr MacSocket_close(const int inSocketNum);
 
-// Call this to receive data on a socket
-// Most parameters' purpose are obvious-- except maybe "inBlock" which
-// controls whether I wait for data or return immediately
 
-int MacSocket_recv(const int inSocketNum, void *outBuff, int outBuffLength,
+//	Call this to receive data on a socket
-                   const Boolean inBlock);
+//	Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
+
+int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const Boolean inBlock);
+
 
 //	Call this to send data on a socket
 
-int MacSocket_send(const int inSocketNum, const void *inBuff,
+int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
-                   int inBuffLength);
 
-// If zero bytes were read in a call to MacSocket_recv(), it may be that the
+
-// remote end has done a half-close
+//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
 //	This function will let you check whether that's true or not
 
 Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
 
-// Call this to see if the listen has completed after a call to
+
-// MacSocket_listen()
+//	Call this to see if the listen has completed after a call to MacSocket_listen()
 
 Boolean MacSocket_ListenCompleted(const int inSocketNum);
 
+
 //	These really aren't very useful anymore
 
 Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
 Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
 
-// You may wish to change the userRefPtr for a socket callback-- use this to
-// do it
 
-void MacSocket_SetUserRefPtr(const int inSocketNum, void *inNewRefPtr);
+//	You may wish to change the userRefPtr for a socket callback-- use this to do it
+
+void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
+
 
 //	Call these to get the socket's IP:port descriptor
 
-void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
+void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
-                                 const int inIPAndPortLength);
+void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
-void MacSocket_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
+
-                                  const int inIPAndPortLength);
 
 //	Call this to get error info from a socket
 
-void MacSocket_GetSocketErrorInfo(const int inSocketNum,
+void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
-                                  int *outSocketErrCode,
-                                  char *outSocketErrString,
-                                  const int inSocketErrStringMaxLength);
 
 
 #ifdef __cplusplus

MacOS/Randomizer.h

@@ -4,27 +4,28 @@
 
 #include <MacTypes.h>
 
-class CRandomizer {
+class CRandomizer
- public:
+{
-    CRandomizer(void);
+public:
-    void PeriodicAction(void);
+	CRandomizer (void);
+	void PeriodicAction (void);
 	
- private:
+private:
 
 	// Private calls
 
-    void AddTimeSinceMachineStartup(void);
+	void		AddTimeSinceMachineStartup (void);
-    void AddAbsoluteSystemStartupTime(void);
+	void		AddAbsoluteSystemStartupTime (void);
-    void AddAppRunningTime(void);
+	void		AddAppRunningTime (void);
-    void AddStartupVolumeInfo(void);
+	void		AddStartupVolumeInfo (void);
-    void AddFiller(void);
+	void		AddFiller (void);
 
-    void AddCurrentMouse(void);
+	void		AddCurrentMouse (void);
-    void AddNow(double millisecondUncertainty);
+	void		AddNow (double millisecondUncertainty);
-    void AddBytes(void *data, long size, double entropy);
+	void		AddBytes (void *data, long size, double entropy);
 	
-    void GetTimeBaseResolution(void);
+	void		GetTimeBaseResolution (void);
-    unsigned long SysTimer(void);
+	unsigned long	SysTimer (void);
 
 	// System Info	
 	bool		mSupportsLargeVolumes;

MacOS/_MWERKS_GUSI_prefix.h

@@ -1,9 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
-# pragma longlong on
+#pragma longlong on
 #endif
 #if 1
-# define MAC_OS_GUSI_SOURCE
+#define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH

MacOS/_MWERKS_prefix.h

@@ -1,9 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
-# pragma longlong on
+#pragma longlong on
 #endif
 #if 0
-# define MAC_OS_GUSI_SOURCE
+#define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH

MacOS/opensslconf.h

@@ -1,126 +1,116 @@
 /* MacOS/opensslconf.h */
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#  define OPENSSLDIR "/usr/local/ssl"
+#define OPENSSLDIR "/usr/local/ssl"
-# endif
+#endif
 #endif
 
 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-# define IDEA_INT unsigned int
+#define IDEA_INT unsigned int
 #endif
 
 #if defined(HEADER_MD2_H) && !defined(MD2_INT)
-# define MD2_INT unsigned int
+#define MD2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC2_H) && !defined(RC2_INT)
 /* I need to put in a mod for the alpha - eay */
-# define RC2_INT unsigned int
+#define RC2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC4_H)
-# if !defined(RC4_INT)
+#if !defined(RC4_INT)
+/* using int types make the structure larger but make the code faster
+ * on most boxes I have tested - up to %20 faster. */
 /*
- * using int types make the structure larger but make the code faster on most
- * boxes I have tested - up to %20 faster.
- */
-/*-
  * I don't know what does "most" mean, but declaring "int" is a must on:
  * - Intel P6 because partial register stalls are very expensive;
  * - elder Alpha because it lacks byte load/store instructions;
  */
-#  define RC4_INT unsigned char
+#define RC4_INT unsigned char
-# endif
+#endif
-# if !defined(RC4_CHUNK)
+#if !defined(RC4_CHUNK)
 /*
  * This enables code handling data aligned at natural CPU word
  * boundary. See crypto/rc4/rc4_enc.c for further details.
  */
-#  define RC4_CHUNK unsigned long
+#define RC4_CHUNK unsigned long
-# endif
+#endif
 #endif
 
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
-/*
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * If this is set to 'unsigned int' on a DEC Alpha, this gives about a %20
+ * %20 speed up (longs are 8 bytes, int's are 4). */
- * speed up (longs are 8 bytes, int's are 4).
+#ifndef DES_LONG
- */
+#define DES_LONG unsigned long
-# ifndef DES_LONG
+#endif
-#  define DES_LONG unsigned long
-# endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-# define CONFIG_HEADER_BN_H
+#define CONFIG_HEADER_BN_H
-# if __option(longlong)
+#if __option(longlong)
 #  define BN_LLONG
-# else
+#else
 #  undef BN_LLONG
-# endif
+#endif
 
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-/*
+/* The prime number generation stuff may not work when
- * The prime number generation stuff may not work when EIGHT_BIT but I don't
+ * EIGHT_BIT but I don't care since I've only used this mode
- * care since I've only used this mode for debuging the bignum libraries
+ * for debuging the bignum libraries */
- */
+#undef SIXTY_FOUR_BIT_LONG
-# undef SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
-# undef SIXTY_FOUR_BIT
+#define THIRTY_TWO_BIT
-# define THIRTY_TWO_BIT
+#undef SIXTEEN_BIT
-# undef SIXTEEN_BIT
+#undef EIGHT_BIT
-# undef EIGHT_BIT
 #endif
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-# define CONFIG_HEADER_RC4_LOCL_H
+#define CONFIG_HEADER_RC4_LOCL_H
-/*
+/* if this is defined data[i] is used instead of *data, this is a %20
- * if this is defined data[i] is used instead of *data, this is a %20 speedup
+ * speedup on x86 */
- * on x86
+#undef RC4_INDEX
- */
-# undef RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-# define CONFIG_HEADER_BF_LOCL_H
+#define CONFIG_HEADER_BF_LOCL_H
-# define BF_PTR
+#define BF_PTR
 #endif /* HEADER_BF_LOCL_H */
 
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-# define CONFIG_HEADER_DES_LOCL_H
+#define CONFIG_HEADER_DES_LOCL_H
-/*
+/* the following is tweaked from a config script, that is why it is a
- * the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
- * protected undef/define
+#ifndef DES_PTR
- */
+#define DES_PTR
-# ifndef DES_PTR
+#endif
-#  define DES_PTR
+
-# endif
+/* This helps C compiler generate the correct code for multiple functional
-
+ * units.  It reduces register dependancies at the expense of 2 more
-/*
+ * registers */
- * This helps C compiler generate the correct code for multiple functional
+#ifndef DES_RISC1
- * units.  It reduces register dependancies at the expense of 2 more
+#define DES_RISC1
- * registers
+#endif
- */
+
-# ifndef DES_RISC1
+#ifndef DES_RISC2
-#  define DES_RISC1
+#undef DES_RISC2
-# endif
+#endif
-
+
-# ifndef DES_RISC2
+#if defined(DES_RISC1) && defined(DES_RISC2)
-#  undef DES_RISC2
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-# endif
+#endif
-
+
-# if defined(DES_RISC1) && defined(DES_RISC2)
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED ! !!!!
+ * Very mucy CPU dependant */
-# endif
+#ifndef DES_UNROLL
-/*
+#define DES_UNROLL
- * Unroll the inner loop, this sometimes helps, sometimes hinders. Very mucy
+#endif
- * CPU dependant
+
- */
+#endif /* HEADER_DES_LOCL_H */
-# ifndef DES_UNROLL
+
-#  define DES_UNROLL
+#ifndef __POWERPC__
-# endif
+#define MD32_XARRAY
-#endif                          /* HEADER_DES_LOCL_H */
-#ifndef __POWERPC__
-# define MD32_XARRAY
 #endif

Makefile.org

@@ -69,9 +69,8 @@ ARD=ar $(ARFLAGS) d
 RANLIB= ranlib
 PERL= perl
 TAR= tar
-TARFLAGS= --no-recursion --record-size=10240
+TARFLAGS= --no-recursion
 MAKEDEPPROG=makedepend
-LIBDIR=lib
 
 # We let the C compiler driver to take care of .s files. This is done in
 # order to be excused from maintaining a separate set of architecture
@@ -113,7 +112,7 @@ LIBZLIB=
 # $(INSTALLTOP) for this build make be different so hard
 # code the path.
 
-FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
+FIPSLIBDIR=/usr/local/ssl/lib/
 
 # This is set to "y" if fipscanister.o is compiled internally as
 # opposed to coming from an external validated location.
@@ -143,7 +142,7 @@ SDIRS=  \
 	bn ec rsa dsa ecdsa dh ecdh dso engine \
 	buffer bio stack lhash rand err \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-	store cms pqueue jpake
+	store pqueue
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -173,7 +172,7 @@ SHARED_LDFLAGS=
 
 GENERAL=        Makefile
 BASENAME=       openssl
-NAME=           $(BASENAME)-$(VERSION)
+NAME=           $(BASENAME)-fips-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
@@ -201,10 +200,9 @@ BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 		CC='${CC}' CFLAG='${CFLAG}' 			\
 		AS='${CC}' ASFLAG='${CFLAG} -c'			\
 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
-		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
+		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
 		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
-		LIBDIR='${LIBDIR}' \
 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
 		MAKEDEPPROG='${MAKEDEPPROG}'			\
@@ -221,8 +219,7 @@ BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\
 		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\
 		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\
-		FIPSLIBDIR='${FIPSLIBDIR}'			\
+		FIPSLIBDIR='${FIPSLIBDIR}' FIPSCANLIB='${FIPSCANLIB}' \
-		FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"	\
 		FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'	\
 		FIPS_EX_OBJ='${FIPS_EX_OBJ}'	\
 		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
@@ -243,8 +240,7 @@ BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 # subdirectories defined in $(DIRS).  It requires that the target
 # is given through the shell variable `target'.
 BUILD_CMD=  if [ -d "$$dir" ]; then \
-	    (	[ $$target != all -a -z "$(FIPSCANLIB)" ] && FIPSCANLIB=/dev/null; \
+	    (	cd $$dir && echo "making $$target in $$dir..." && \
-		cd $$dir && echo "making $$target in $$dir..." && \
 		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
 	    ) || exit 1; \
 	    fi
@@ -335,15 +331,15 @@ build_crypto:
 		dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_fips:
 	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
-build_ssl: build_crypto
+build_ssl:
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines: build_crypto
+build_engines:
 	@dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps: build_libs
+build_apps:
 	@dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests: build_libs
+build_tests:
 	@dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools: build_libs
+build_tools:
 	@dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps
@@ -359,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
 			$(AR) libcrypto.a fips/fipscanister.o ; \
 		else \
 			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
-				FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+				FIPSLD_CC=$(CC); CC=fips/fipsld; \
 				export CC FIPSLD_CC; \
 			fi; \
 			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
@@ -382,7 +378,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
 fips/fipscanister.o:	build_fips
 libfips$(SHLIB_EXT):		fips/fipscanister.o
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \
+		FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
 		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
 			CC=$${CC} LIBNAME=fips THIS=$@ \
 			LIBEXTRAS=fips/fipscanister.o \
@@ -438,7 +434,7 @@ do_$(SHLIB_TARGET):
 libcrypto.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libcrypto'; \
@@ -451,7 +447,7 @@ libcrypto.pc: Makefile
 libssl.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL'; \
@@ -464,7 +460,7 @@ libssl.pc: Makefile
 openssl.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL'; \
@@ -506,9 +502,6 @@ links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
 	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
-	@if [ -z "$(FIPSCANLIB)" ]; then \
-		set -e; target=links; dir=fips ; $(BUILD_CMD) ; \
-	fi
 
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \
@@ -526,7 +519,7 @@ rehash.time: certs apps
 		export OPENSSL OPENSSL_DEBUG_MEMORY; \
 		$(PERL) tools/c_rehash certs) && \
 		touch rehash.time; \
-	fi
+	else :; fi
 
 test:   tests
 
@@ -593,7 +586,7 @@ tar:
 	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
 	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
+	      --prefix=openssl-fips-$(VERSION) - |\
 	gzip --best >../$(TARFILE).gz; \
 	rm -f ../$(TARFILE).list; \
 	ls -l ../$(TARFILE).gz
@@ -615,13 +608,13 @@ dist:
 dist_pem_h:
 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 
-install: all install_docs install_sw
+install: all install_sw
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
@@ -636,10 +629,10 @@ install_sw:
 	do \
 		if [ -f "$$i" ]; then \
 		(       echo installing $$i; \
-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 		fi; \
 	done;
 	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -649,22 +642,22 @@ install_sw:
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 			(       echo installing $$i; \
 				if [ "$(PLATFORM)" != "Cygwin" ]; then \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				else \
 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				fi ); \
 			fi; \
 		done; \
 		(	here="`pwd`"; \
-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
 			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
 			echo 'OpenSSL shared libraries have been installed in:'; \
@@ -673,12 +666,12 @@ install_sw:
 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
 		fi; \
 	fi
-	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
-	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
 
 install_docs:
 	@$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -686,7 +679,7 @@ install_docs:
 		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 		$(INSTALL_PREFIX)$(MANDIR)/man7
-	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
 	here="`pwd`"; \
 	filecase=; \
 	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \

Makefile.shared

@@ -491,23 +491,23 @@ link_app.hpux:
 
 link_o.aix:
 	@ $(CALC_VERSIONS); \
-	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \
+	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \
 	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS=''; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_O);
 link_a.aix:
 	@ $(CALC_VERSIONS); \
-	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
+	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \
 	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-bnogc'; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_A_VIA_O)
 link_app.aix:
 	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \

NEWS

@@ -5,189 +5,23 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 0.9.8ze and OpenSSL 0.9.8zf [19 Mar 2015]
+  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
-
-      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
-      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
-      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
-      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
-      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
-      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
-      o Removed the export ciphers from the DEFAULT ciphers
-
-  Major changes between OpenSSL 0.9.8zd and OpenSSL 0.9.8ze [15 Jan 2015]
-
-      o Build fixes for the Windows and OpenVMS platforms
-
-  Major changes between OpenSSL 0.9.8zc and OpenSSL 0.9.8zd [8 Jan 2015]
-
-      o Fix for CVE-2014-3571
-      o Fix for CVE-2014-3569
-      o Fix for CVE-2014-3572
-      o Fix for CVE-2015-0204
-      o Fix for CVE-2014-8275
-      o Fix for CVE-2014-3570
-
-  Major changes between OpenSSL 0.9.8zb and OpenSSL 0.9.8zc [15 Oct 2014]:
-
-      o Fix for CVE-2014-3513
-      o Fix for CVE-2014-3567
-      o Mitigation for CVE-2014-3566 (SSL protocol vulnerability)
-      o Fix for CVE-2014-3568
-
-  Major changes between OpenSSL 0.9.8za and OpenSSL 0.9.8zb [6 Aug 2014]:
-
-      o Fix for CVE-2014-3510
-      o Fix for CVE-2014-3507
-      o Fix for CVE-2014-3506
-      o Fix for CVE-2014-3505
-      o Fix for CVE-2014-3508
-
-  Known issues in OpenSSL 0.9.8za:
-
-      o Compilation failure of s3_pkt.c on some platforms due to missing
-        <limits.h> include. Fixed in 0.9.8zb-dev.
-      o FIPS capable link failure with missing symbol BN_consttime_swap.
-        Fixed in 0.9.8zb-dev. Workaround is to compile with no-ec: the EC
-        algorithms are not FIPS approved in OpenSSL 0.9.8 anyway.
-
-  Major changes between OpenSSL 0.9.8y and OpenSSL 0.9.8za [5 Jun 2014]:
-
-      o Fix for CVE-2014-0224
-      o Fix for CVE-2014-0221
-      o Fix for CVE-2014-0195
-      o Fix for CVE-2014-3470
-      o Fix for CVE-2014-0076
-      o Fix for CVE-2010-5298
-      o Fix to TLS alert handling.
-
-  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
-
-      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
-      o Fix OCSP bad key DoS attack CVE-2013-0166
-
-  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
-
-      o Fix DTLS record length checking bug CVE-2012-2333
-
-  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
-
-      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
-
-  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
-
-      o Fix for ASN1 overflow bug CVE-2012-2110
-
-  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
-
-      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
-      o Corrected fix for CVE-2011-4619
-      o Various DTLS fixes.
-
-  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
-
-      o Fix for DTLS DoS issue CVE-2012-0050
-
-  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
-
-      o Fix for DTLS plaintext recovery attack CVE-2011-4108
-      o Fix policy check double free error CVE-2011-4109
-      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
-      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
-      o Check for malformed RFC3779 data CVE-2011-4577
-
-  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
-
-      o Fix for security issue CVE-2011-0014
-
-  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
-
-      o Fix for security issue CVE-2010-4180
-      o Fix for CVE-2010-4252
-
-  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
-
-      o Fix for security issue CVE-2010-3864.
-
-  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
-
-      o Fix for security issue CVE-2010-0742.
-      o Various DTLS fixes.
-      o Recognise SHA2 certificates if only SSL algorithms added.
-      o Fix for no-rc4 compilation.
-      o Chil ENGINE unload workaround.
-
-  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
-
-      o CFB cipher definition fixes.
-      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
-
-  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
-
-      o Cipher definition fixes.
-      o Workaround for slow RAND_poll() on some WIN32 versions.
-      o Remove MD2 from algorithm tables.
-      o SPKAC handling fixes.
-      o Support for RFC5746 TLS renegotiation extension.
-      o Compression memory leak fixed.
-      o Compression session resumption fixed.
-      o Ticket and SNI coexistence fixes.
-      o Many fixes to DTLS handling. 
-
-  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
-
-      o Temporary work around for CVE-2009-3555: disable renegotiation.
-
-  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
-
-      o Fix various build issues.
-      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
-
-  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
-
-      o Fix security issue (CVE-2008-5077)
-      o Merge FIPS 140-2 branch code.
-
-  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
-
-      o CryptoAPI ENGINE support.
-      o Various precautionary measures.
-      o Fix for bugs affecting certificate request creation.
-      o Support for local machine keyset attribute in PKCS#12 files.
-
-  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
-
-      o Backport of CMS functionality to 0.9.8.
-      o Fixes for bugs introduced with 0.9.8f.
-
-  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
-
-      o Add gcc 4.2 support.
-      o Add support for AES and SSE2 assembly lanugauge optimization
-        for VC++ build.
-      o Support for RFC4507bis and server name extensions if explicitly 
-        selected at compile time.
-      o DTLS improvements.
-      o RFC4507bis support.
-      o TLS Extensions support.
-
-  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
 
       o Various ciphersuite selection fixes.
       o RFC3779 support.
 
-  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
+  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d:
 
       o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
       o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
       o Changes to ciphersuite selection algorithm
 
-  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c [5 Sep 2006]:
+  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c:
 
       o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
       o New cipher Camellia
 
-  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
+  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b:
 
       o Cipher string fixes.
       o Fixes for VC++ 2005.
@@ -197,12 +31,12 @@
       o Built in dynamic engine compilation support on Win32.
       o Fixes auto dynamic engine loading in Win32.
 
-  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
+  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
 
       o Fix potential SSL 2.0 rollback, CVE-2005-2969
       o Extended Windows CE support
 
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8 [5 Jul 2005]:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8:
 
       o Major work on the BIGNUM library for higher efficiency and to
         make operations more streamlined and less contradictory.  This
@@ -276,36 +110,31 @@
       o Added initial support for Win64.
       o Added alternate pkg-config files.
 
-  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m [23 Feb 2007]:
+  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
-
-      o FIPS 1.1.1 module linking.
-      o Various ciphersuite selection fixes.
-
-  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
 
       o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
       o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
 
-  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
+  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
 
       o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
 
-  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
+  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
 
       o Visual C++ 2005 fixes.
       o Update Windows build system for FIPS.
 
-  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
 
       o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
 
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
 
       o Fix SSL 2.0 Rollback, CVE-2005-2969
       o Allow use of fixed-length exponent on DSA signing
       o Default fixed-window RSA, DSA, DH private-key operations
 
-  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
+  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
 
       o More compilation issues fixed.
       o Adaptation to more modern Kerberos API.
@@ -314,7 +143,7 @@
       o More constification.
       o Added processing of proxy certificates (RFC 3820).
 
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
 
       o Several compilation issues fixed.
       o Many memory allocation failure checks added.
@@ -322,12 +151,12 @@
       o Mandatory basic checks on certificates.
       o Performance improvements.
 
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
 
       o Fix race condition in CRL checking code.
       o Fixes to PKCS#7 (S/MIME) code.
 
-  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
 
       o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
       o Security: Fix null-pointer assignment in do_change_cipher_spec()
@@ -335,14 +164,14 @@
       o Multiple X509 verification fixes
       o Speed up HMAC and other operations
 
-  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
 
       o Security: fix various ASN1 parsing bugs.
       o New -ignore_err option to OCSP utility.
       o Various interop and bug fixes in S/MIME code.
       o SSL/TLS protocol fix for unrequested client certificates.
 
-  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
 
       o Security: counter the Klima-Pokorny-Rosa extension of
         Bleichbacher's attack 
@@ -353,7 +182,7 @@
       o ASN.1: treat domainComponent correctly.
       o Documentation: fixes and additions.
 
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
 
       o Security: Important security related bugfixes.
       o Enhanced compatibility with MIT Kerberos.
@@ -364,7 +193,7 @@
       o SSL/TLS: now handles manual certificate chain building.
       o SSL/TLS: certain session ID malfunctions corrected.
 
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
 
       o New library section OCSP.
       o Complete rewrite of ASN1 code.
@@ -410,23 +239,23 @@
       o SSL/TLS: add callback to retrieve SSL/TLS messages.
       o SSL/TLS: support AES cipher suites (RFC3268).
 
-  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
 
       o Security: fix various ASN1 parsing bugs.
       o SSL/TLS protocol fix for unrequested client certificates.
 
-  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
 
       o Security: counter the Klima-Pokorny-Rosa extension of
         Bleichbacher's attack 
       o Security: make RSA blinding default.
       o Build: shared library support fixes.
 
-  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
 
       o Important security related bugfixes.
 
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
 
       o New configuration targets for Tandem OSS and A/UX.
       o New OIDs for Microsoft attributes.
@@ -440,25 +269,25 @@
       o Fixes for smaller building problems.
       o Updates of manuals, FAQ and other instructive documents.
 
-  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g [9 Aug 2002]:
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
 
       o Important building fixes on Unix.
 
-  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f [8 Aug 2002]:
+  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
 
       o Various important bugfixes.
 
-  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e [30 Jul 2002]:
+  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
 
       o Important security related bugfixes.
       o Various SSL/TLS library bugfixes.
 
-  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d [9 May 2002]:
+  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
 
       o Various SSL/TLS library bugfixes.
       o Fix DH parameter generation for 'non-standard' generators.
 
-  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c [21 Dec 2001]:
+  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c:
 
       o Various SSL/TLS library bugfixes.
       o BIGNUM library fixes.
@@ -471,7 +300,7 @@
         Broadcom and Cryptographic Appliance's keyserver
         [in 0.9.6c-engine release].
 
-  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b [9 Jul 2001]:
+  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b:
 
       o Security fix: PRNG improvements.
       o Security fix: RSA OAEP check.
@@ -488,7 +317,7 @@
       o Increase default size for BIO buffering filter.
       o Compatibility fixes in some scripts.
 
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a [5 Apr 2001]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:
 
       o Security fix: change behavior of OpenSSL to avoid using
         environment variables when running as root.
@@ -513,7 +342,7 @@
       o New function BN_rand_range().
       o Add "-rand" option to openssl s_client and s_server.
 
-  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6 [10 Oct 2000]:
+  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:
 
       o Some documentation for BIO and SSL libraries.
       o Enhanced chain verification using key identifiers.
@@ -528,7 +357,7 @@
     [1] The support for external crypto devices is currently a separate
         distribution.  See the file README.ENGINE.
 
-  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a [1 Apr 2000]:
+  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:
 
       o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
       o Shared library support for HPUX and Solaris-gcc
@@ -537,7 +366,7 @@
       o New 'rand' application
       o New way to check for existence of algorithms from scripts
 
-  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5 [25 May 2000]:
+  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5:
 
       o S/MIME support in new 'smime' command
       o Documentation for the OpenSSL command line application
@@ -573,7 +402,7 @@
       o Enhanced support for Alpha Linux
       o Experimental MacOS support
 
-  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4 [9 Aug 1999]:
+  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4:
 
       o Transparent support for PKCS#8 format private keys: these are used
         by several software packages and are more secure than the standard
@@ -584,7 +413,7 @@
       o New pipe-like BIO that allows using the SSL library when actual I/O
         must be handled by the application (BIO pair)
 
-  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3 [24 May 1999]:
+  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3:
       o Lots of enhancements and cleanups to the Configuration mechanism
       o RSA OEAP related fixes
       o Added `openssl ca -revoke' option for revoking a certificate
@@ -598,7 +427,7 @@
       o Sparc assembler bignum implementation, optimized hash functions
       o Option to disable selected ciphers
 
-  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b [22 Mar 1999]:
+  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b:
       o Fixed a security hole related to session resumption
       o Fixed RSA encryption routines for the p < q case
       o "ALL" in cipher lists now means "everything except NULL ciphers"
@@ -620,7 +449,7 @@
       o Lots of memory leak fixes.
       o Lots of bug fixes.
 
-  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c [23 Dec 1998]:
+  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c:
       o Integration of the popular NO_RSA/NO_DSA patches
       o Initial support for compression inside the SSL record layer
       o Added BIO proxy and filtering functionality

Netware/build.bat

@@ -7,9 +7,8 @@ rem   usage:
 rem      build [target] [debug opts] [assembly opts] [configure opts]
 rem
 rem      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
-rem                    - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
+rem                    - "netware-libc" - LibC NKS NetWare build (WinSock Sockets)
-rem                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
+rem                    - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
-rem                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 rem 
 rem      debug opts    - "debug"  - build debug
 rem
@@ -76,8 +75,6 @@ if "%1" == "nw-mwasm" set NO_ASM=
 if "%1" == "nw-mwasm" set ARG_PROCESSED=YES
 if "%1" == "netware-clib" set BLD_TARGET=netware-clib
 if "%1" == "netware-clib" set ARG_PROCESSED=YES
-if "%1" == "netware-clib-bsdsock" set BLD_TARGET=netware-clib-bsdsock
-if "%1" == "netware-clib-bsdsock" set ARG_PROCESSED=YES
 if "%1" == "netware-libc" set BLD_TARGET=netware-libc
 if "%1" == "netware-libc" set ARG_PROCESSED=YES
 if "%1" == "netware-libc-bsdsock" set BLD_TARGET=netware-libc-bsdsock
@@ -97,7 +94,6 @@ if "%BLD_TARGET%" == "no_target" goto no_target
 rem build the nlm make file name which includes target and debug info
 set NLM_MAKE=
 if "%BLD_TARGET%" == "netware-clib" set NLM_MAKE=netware\nlm_clib
-if "%BLD_TARGET%" == "netware-clib-bsdsock" set NLM_MAKE=netware\nlm_clib_bsdsock
 if "%BLD_TARGET%" == "netware-libc" set NLM_MAKE=netware\nlm_libc
 if "%BLD_TARGET%" == "netware-libc-bsdsock" set NLM_MAKE=netware\nlm_libc_bsdsock
 if "%DEBUG%" == "" set NLM_MAKE=%NLM_MAKE%.mak
@@ -114,14 +110,7 @@ echo Generating x86 for %ASSEMBLER% assembler
 
 echo Bignum
 cd crypto\bn\asm
-rem perl x86.pl %ASM_MODE% > bn-nw.asm
+perl x86.pl %ASM_MODE% > bn-nw.asm
-perl bn-586.pl %ASM_MODE% > bn-nw.asm
-perl co-586.pl %ASM_MODE% > co-nw.asm
-cd ..\..\..
-
-echo AES
-cd crypto\aes\asm
-perl aes-586.pl %ASM_MODE% > a-nw.asm
 cd ..\..\..
 
 echo DES
@@ -171,11 +160,6 @@ cd crypto\rc5\asm
 perl rc5-586.pl %ASM_MODE% > r5-nw.asm
 cd ..\..\..
 
-echo CPUID
-cd crypto
-perl x86cpuid.pl %ASM_MODE% > x86cpuid-nw.asm
-cd ..\
-
 rem ===============================================================
 rem
 :do_config
@@ -192,10 +176,8 @@ echo mk1mf.pl options: %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET%
 echo .
 perl util\mk1mf.pl %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET% >%NLM_MAKE%
 
-make -f %NLM_MAKE% vclean
-echo .
 echo The makefile "%NLM_MAKE%" has been created use your maketool to
-echo build (ex: make -f %NLM_MAKE%)
+echo build (ex: gmake -f %NLM_MAKE%)
 goto end
 
 rem ===============================================================
@@ -207,9 +189,8 @@ echo .
 echo .  usage: build [target] [debug opts] [assembly opts] [configure opts]
 echo .
 echo .     target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
-echo .                   - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
+echo .                   - "netware-libc" - LibC NKS NetWare build (WinSock Sockets)
-echo .                   - "netware-libc" - LibC NetWare build (WinSock Sockets)
+echo .                   - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
-echo .                   - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 echo .
 echo .     debug opts    - "debug"  - build debug
 echo .

Netware/cpy_tests.bat

@@ -73,7 +73,6 @@ copy %loc%\test\testsid.pem   %2\openssl\test\
 copy %loc%\test\testx509.pem  %2\openssl\test\
 copy %loc%\test\v3-cert1.pem  %2\openssl\test\
 copy %loc%\test\v3-cert2.pem  %2\openssl\test\
-copy %loc%\crypto\evp\evptests.txt %2\openssl\test\
 
 rem   copy the apps directory stuff
 copy %loc%\apps\client.pem    %2\openssl\apps\

Netware/do_tests.pl

@@ -37,14 +37,9 @@ sub main()
    # open the main log file 
    open(OUT, ">$log_file") || die "unable to open $log_file\n";
 
-   print( OUT "========================================================\n");
-   my $outFile = "$output_path\\version.out";
-   system("openssl2 version (CLIB_OPT)/>$outFile");
-   log_output("CHECKING FOR OPENSSL VERSION:", $outFile);
    
    algorithm_tests();
    encryption_tests();
-   evp_tests();
    pem_tests();
    verify_tests();
    ca_tests();
@@ -61,10 +56,9 @@ sub algorithm_tests
 {
    my $i;
    my $outFile;
-   my @tests = ( rsa_test, destest, ideatest, bftest, bntest, shatest, sha1test,
+   my @tests = ( rsa_test, destest, ideatest, bftest, shatest, sha1test,
-                 sha256t, sha512t, dsatest, md2test, md4test, md5test, mdc2test,
+                 md5test, dsatest, md2test, mdc2test, rc2test, rc4test, randtest,
-                 rc2test, rc4test, rc5test, randtest, rmdtest, dhtest, ecdhtest,
+                 dhtest, exptest );
-                 ecdsatest, ectest, exptest, casttest, hmactest );
 
    print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n");
 
@@ -76,7 +70,7 @@ sub algorithm_tests
       if (-e "$base_path\\$i.nlm")
 	  {
          $outFile = "$output_path\\$i.out";
-         system("$i (CLIB_OPT)/>$outFile");
+         system("$i > $outFile");
          log_desc("Test: $i\.nlm:");
          log_output("", $outFile );
 	  }
@@ -115,24 +109,24 @@ sub encryption_tests
 
       # do encryption
       $outFile = "$output_path\\enc.out";
-      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile" );
+      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher > $outFile" );
       log_output("Encrypting: $input --> $cipher", $outFile);
 
       # do decryption
       $outFile = "$output_path\\dec.out";
-      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
+      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear > $outFile");
       log_output("Decrypting: $cipher --> $clear", $outFile);
 
       # compare files
       $x = compare_files( $input, $clear, 1);
       if ( $x == 0 )
       {
-         print( "\rSUCCESS - files match: $input, $clear\n");
+         print( "SUCCESS - files match: $input, $clear\n");
          print( OUT "SUCCESS - files match: $input, $clear\n");
       }
       else
       {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
 
@@ -142,24 +136,24 @@ sub encryption_tests
 
       # do encryption B64
       $outFile = "$output_path\\B64enc.out";
-      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile");
+      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher > $outFile");
       log_output("Encrypting(B64): $cipher --> $clear", $outFile);
 
       # do decryption B64
       $outFile = "$output_path\\B64dec.out";
-      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
+      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear > $outFile");
       log_output("Decrypting(B64): $cipher --> $clear", $outFile);
 
       # compare files
       $x = compare_files( $input, $clear, 1);
       if ( $x == 0 )
       {
-         print( "\rSUCCESS - files match: $input, $clear\n");
+         print( "SUCCESS - files match: $input, $clear\n");
          print( OUT "SUCCESS - files match: $input, $clear\n");
       }
       else
       {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
 
@@ -205,24 +199,24 @@ sub pem_tests
 
       if ($i ne "req" )
       {
-         system("openssl2 $i -in $input -out $tmp_out (CLIB_OPT)/>$outFile");
+         system("openssl2 $i -in $input -out $tmp_out > $outFile");
          log_output( "openssl2 $i -in $input -out $tmp_out", $outFile);
       }
       else
       {
-         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config (CLIB_OPT)/>$outFile");
+         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config > $outFile");
          log_output( "openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config", $outFile );
       }
 
       $x = compare_files( $input, $tmp_out);
       if ( $x == 0 )
       {
-         print( "\rSUCCESS - files match: $input, $tmp_out\n");
+         print( "SUCCESS - files match: $input, $tmp_out\n");
          print( OUT "SUCCESS - files match: $input, $tmp_out\n");
       }
       else
       {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
       do_wait();
@@ -237,8 +231,7 @@ sub verify_tests
    my $i;
    my $outFile = "$output_path\\verify.out";
 
-   $cert_path =~ s/\\/\//g;
+   my @cert_files = <$cert_path\\*.pem>;
-   my @cert_files = <$cert_path/*.pem>;
 
    print( "\nRUNNING VERIFY TESTS:\n\n");
 
@@ -249,7 +242,7 @@ sub verify_tests
 
    foreach $i (@cert_files)
    {
-      system("openssl2 verify -CAfile $tmp_cert $i (CLIB_OPT)/>$outFile");
+      system("openssl2 verify -CAfile $tmp_cert $i >$outFile");
       log_desc("Verifying cert: $i");
       log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile);
    }
@@ -270,103 +263,103 @@ sub ssl_tests
    print( OUT "\n========================================================\n");
    print( OUT "SSL TESTS:\n\n");
 
-   system("ssltest -ssl2 (CLIB_OPT)/>$outFile");
+   system("ssltest -ssl2 >$outFile");
    log_desc("Testing sslv2:");
    log_output("ssltest -ssl2", $outFile);
 
-   system("$ssltest -ssl2 -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl2 -server_auth >$outFile");
    log_desc("Testing sslv2 with server authentication:");
    log_output("$ssltest -ssl2 -server_auth", $outFile);
 
-   system("$ssltest -ssl2 -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl2 -client_auth >$outFile");
    log_desc("Testing sslv2 with client authentication:");
    log_output("$ssltest -ssl2 -client_auth", $outFile);
 
-   system("$ssltest -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl2 -server_auth -client_auth >$outFile");
    log_desc("Testing sslv2 with both client and server authentication:");
    log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
 
-   system("ssltest -ssl3 (CLIB_OPT)/>$outFile");
+   system("ssltest -ssl3 >$outFile");
    log_desc("Testing sslv3:");
    log_output("ssltest -ssl3", $outFile);
 
-   system("$ssltest -ssl3 -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl3 -server_auth >$outFile");
    log_desc("Testing sslv3 with server authentication:");
    log_output("$ssltest -ssl3 -server_auth", $outFile);
 
-   system("$ssltest -ssl3 -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl3 -client_auth >$outFile");
    log_desc("Testing sslv3 with client authentication:");
    log_output("$ssltest -ssl3 -client_auth", $outFile);
 
-   system("$ssltest -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl3 -server_auth -client_auth >$outFile");
    log_desc("Testing sslv3 with both client and server authentication:");
    log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile);
 
-   system("ssltest (CLIB_OPT)/>$outFile");
+   system("ssltest >$outFile");
    log_desc("Testing sslv2/sslv3:");
    log_output("ssltest", $outFile);
 
-   system("$ssltest -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -server_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with server authentication:");
    log_output("$ssltest -server_auth", $outFile);
 
-   system("$ssltest -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -client_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with client authentication:");
    log_output("$ssltest -client_auth ", $outFile);
 
-   system("$ssltest -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -server_auth -client_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with both client and server authentication:");
    log_output("$ssltest -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl2 (CLIB_OPT)/>$outFile");
+   system("ssltest -bio_pair -ssl2 >$outFile");
    log_desc("Testing sslv2 via BIO pair:");
    log_output("ssltest -bio_pair -ssl2", $outFile);
 
-   system("ssltest -bio_pair -dhe1024dsa -v (CLIB_OPT)/>$outFile");
+   system("ssltest -bio_pair -dhe1024dsa -v >$outFile");
    log_desc("Testing sslv2/sslv3 with 1024 bit DHE via BIO pair:");
    log_output("ssltest -bio_pair -dhe1024dsa -v", $outFile);
 
-   system("$ssltest -bio_pair -ssl2 -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl2 -server_auth >$outFile");
    log_desc("Testing sslv2 with server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
 
-   system("$ssltest -bio_pair -ssl2 -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl2 -client_auth >$outFile");
    log_desc("Testing sslv2 with client authentication via BIO pair:");
    log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
 
-   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth >$outFile");
    log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl3 (CLIB_OPT)/>$outFile");
+   system("ssltest -bio_pair -ssl3 >$outFile");
    log_desc("Testing sslv3 via BIO pair:");
    log_output("ssltest -bio_pair -ssl3", $outFile);
 
-   system("$ssltest -bio_pair -ssl3 -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl3 -server_auth >$outFile");
    log_desc("Testing sslv3 with server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile);
 
-   system("$ssltest -bio_pair -ssl3 -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl3 -client_auth >$outFile");
    log_desc("Testing sslv3 with client authentication  via BIO pair:");
    log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile);
 
-   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth >$outFile");
    log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair (CLIB_OPT)/>$outFile");
+   system("ssltest -bio_pair >$outFile");
    log_desc("Testing sslv2/sslv3 via BIO pair:");
    log_output("ssltest -bio_pair", $outFile);
 
-   system("$ssltest -bio_pair -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -server_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -server_auth", $outFile);
 
-   system("$ssltest -bio_pair -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -client_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
    log_output("$ssltest -bio_pair -client_auth", $outFile);
 
-   system("$ssltest -bio_pair -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -server_auth -client_auth >$outFile");
    log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
    log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile);
 }
@@ -396,43 +389,43 @@ sub ca_tests
    print( OUT "\n========================================================\n");
    print( OUT "CA TESTS:\n");
 
-   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new >$outFile");
    log_desc("Make a certificate request using req:");
    log_output("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new", $outFile);
 
-   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey (CLIB_OPT)/>$outFile");
+   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey >$outFile");
    log_desc("Convert the certificate request into a self signed certificate using x509:");
    log_output("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey", $outFile);
 
-   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 (CLIB_OPT)/>$outFile");
+   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 >$outFile");
    log_desc("Convert a certificate into a certificate request using 'x509':");
    log_output("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2", $outFile);
 
-   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout >$outFile");
    log_output("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout", $outFile);
 
-   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout >$outFile");
    log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile);
 
-   system("openssl2 verify -CAfile $CAcert $CAcert (CLIB_OPT)/>$outFile");
+   system("openssl2 verify -CAfile $CAcert $CAcert >$outFile");
    log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile);
 
-   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new >$outFile");
    log_desc("Make another certificate request using req:");
    log_output("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new", $outFile);
 
-   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial (CLIB_OPT)/>$outFile");
+   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial >$outFile");
    log_desc("Sign certificate request with the just created CA via x509:");
    log_output("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial", $outFile);
 
-   system("openssl2 verify -CAfile $CAcert $Ucert (CLIB_OPT)/>$outFile");
+   system("openssl2 verify -CAfile $CAcert $Ucert >$outFile");
    log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile);
 
-   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert (CLIB_OPT)/>$outFile");
+   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert >$outFile");
    log_desc("Certificate details");
    log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile);
 
-   print(OUT "--\n");
+   print(OUT "-- \n");
    print(OUT "The generated CA certificate is $CAcert\n");
    print(OUT "The generated CA private key is $CAkey\n");
    print(OUT "The current CA signing serial number is in $CAserial\n");
@@ -442,29 +435,6 @@ sub ca_tests
    print(OUT "--\n");
 }
 
-############################################################################
-sub evp_tests
-{
-   my $i = 'evp_test';
-
-   print( "\nRUNNING EVP TESTS:\n\n");
-
-   print( OUT "\n========================================================\n");
-   print( OUT "EVP TESTS:\n\n");
-
-   if (-e "$base_path\\$i.nlm")
-   {
-       my $outFile = "$output_path\\$i.out";
-       system("$i $test_path\\evptests.txt (CLIB_OPT)/>$outFile");
-       log_desc("Test: $i\.nlm:");
-       log_output("", $outFile );
-   }
-   else
-   {
-       log_desc("Test: $i\.nlm: file not found");
-   }
-}
-
 ############################################################################
 sub log_output( $ $ )
 {
@@ -475,7 +445,7 @@ sub log_output( $ $ )
 
    if ($desc)
    {
-      print("\r$desc\n");
+      print("$desc\n");
       print(OUT "$desc\n");
    }
 
@@ -592,7 +562,7 @@ sub do_wait()
 ############################################################################
 sub make_tmp_cert_file()
 {
-   my @cert_files = <$cert_path/*.pem>;
+   my @cert_files = <$cert_path\\*.pem>;
 
       # delete the file if it already exists
    unlink($tmp_cert);

Netware/set_env.bat

@@ -16,7 +16,6 @@ if "a%1" == "a" goto usage
                
 set LIBC_BUILD=
 set CLIB_BUILD=
-set GNUC=
 
 if "%1" == "netware-clib" set CLIB_BUILD=Y
 if "%1" == "netware-clib" set LIBC_BUILD=
@@ -24,89 +23,68 @@ if "%1" == "netware-clib" set LIBC_BUILD=
 if "%1" == "netware-libc"  set LIBC_BUILD=Y
 if "%1" == "netware-libc"  set CLIB_BUILD=
 
-if "%2" == "gnuc" set GNUC=Y
-if "%2" == "codewarrior" set GNUC=
-
 rem   Location of tools (compiler, linker, etc)
-if "%NDKBASE%" == "" set NDKBASE=c:\Novell
+set TOOLS=d:\i_drive\tools
 
 rem   If Perl for Win32 is not already in your path, add it here
 set PERL_PATH=
 
 rem   Define path to the Metrowerks command line tools
-rem   or GNU Crosscompiler gcc / nlmconv
 rem   ( compiler, assembler, linker)
-if "%GNUC%" == "Y" set COMPILER_PATH=c:\usr\i586-netware\bin;c:\usr\bin
+set METROWERKS_PATH=%TOOLS%\codewar\pdk_21\tools\command line tools
-if "%GNUC%" == "" set COMPILER_PATH=c:\prg\cwcmdl40
+rem set METROWERKS_PATH=%TOOLS%\codewar\PDK_40\Other Metrowerks Tools\Command Line Tools
 
 rem   If using gnu make define path to utility
-rem set GNU_MAKE_PATH=%NDKBASE%\gnu
+set GNU_MAKE_PATH=%TOOLS%\gnu
-set GNU_MAKE_PATH=c:\prg\tools
 
 rem   If using ms nmake define path to nmake
-rem set MS_NMAKE_PATH=%NDKBASE%\msvc\600\bin
+set MS_NMAKE_PATH=%TOOLS%\msvc\600\bin
 
 rem   If using NASM assembler define path
-rem set NASM_PATH=%NDKBASE%\nasm
+set NASM_PATH=%TOOLS%\nasm
-set NASM_PATH=c:\prg\tools
 
 rem   Update path to include tool paths
-set path=%path%;%COMPILER_PATH%
+set path=%path%;%METROWERKS_PATH%
 if not "%GNU_MAKE_PATH%" == "" set path=%path%;%GNU_MAKE_PATH%
 if not "%MS_NMAKE_PATH%" == "" set path=%path%;%MS_NMAKE_PATH%
 if not "%NASM_PATH%"     == "" set path=%path%;%NASM_PATH%
 if not "%PERL_PATH%"     == "" set path=%path%;%PERL_PATH%
 
-rem   Set INCLUDES to location of Novell NDK includes
+rem   Set MWCIncludes to location of Novell NDK includes
-if "%LIBC_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\libc\include;%NDKBASE%\ndk\libc\include\winsock
+if "%LIBC_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\libc\include;%TOOLS%\ndk\libc\include\winsock;.\engines
-if "%CLIB_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\nwsdk\include\nlm;%NDKBASE%\ws295sdk\include
+if "%CLIB_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\nwsdk\include\nlm;.\engines
+set include=
 
 rem   Set Imports to location of Novell NDK import files
-if "%LIBC_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\libc\imports
+if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports
-if "%CLIB_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\nwsdk\imports
+if "%CLIB_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\nwsdk\imports
 
 rem   Set PRELUDE to the absolute path of the prelude object to link with in
 rem   the Metrowerks NetWare PDK - NOTE: for Clib builds "clibpre.o" is 
 rem   recommended, for LibC NKS builds libcpre.o must be used
-if "%GNUC%" == "Y" goto gnuc
 if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.o
-rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o
+if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o
-if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.o
-echo using MetroWerks CodeWarrior 
-goto info
 
-:gnuc
-if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.gcc.o
-rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.gcc.o
-if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.gcc.o
-echo using GNU GCC Compiler 
-
-:info
-echo.
 
 if "%LIBC_BUILD%" == "Y" echo Enviroment configured for LibC build
 if "%LIBC_BUILD%" == "Y" echo use "netware\build.bat netware-libc ..." 
 
 if "%CLIB_BUILD%" == "Y" echo Enviroment configured for CLib build
 if "%CLIB_BUILD%" == "Y" echo use "netware\build.bat netware-clib ..." 
-
 goto end
 
 :usage
 rem ===============================================================
-echo.
+echo .
-echo No target build specified!
+echo . No target build specified!
-echo.
+echo .
-echo usage: set_env [target] [compiler]
+echo . usage: set_env [target]
-echo.
+echo .
-echo target      - "netware-clib" - Clib build
+echo .   target      - "netware-clib" - Clib build
-echo             - "netware-libc" - LibC build
+echo .               - "netware-libc" - LibC build
-echo.
+echo .
-echo compiler    - "gnuc"         - GNU GCC Compiler
+
-echo             - "codewarrior"  - MetroWerks CodeWarrior (default)
+
-echo.
 
 :end
-echo.
-
 

PROBLEMS

@@ -36,9 +36,7 @@ may differ on your machine.
 
 
 As long as Apple doesn't fix the problem with ld, this problem building
-OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by
+OpenSSL will remain as is.
-passing -Wl,-search_paths_first, but it's unknown if the flag was
-supported from the initial MacOS X release.
 
 
 * Parallell make leads to errors

README

@@ -1,10 +1,16 @@
 
- OpenSSL 0.9.8zf 19 Mar 2015
+ OpenSSL 0.9.8f-fips-dev test version
 
- Copyright (c) 1998-2011 The OpenSSL Project
+ Copyright (c) 1998-2007 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
+ WARNING
+ -------
+
+ This version of OpenSSL is an initial port of the FIPS 140-2 code to OpenSSL
+ 0.9.8. See the file README.FIPS for brief usage details.
+
  DESCRIPTION
  -----------
 
@@ -112,6 +118,8 @@
  should be contacted if that algorithm is to be used; their web page is
  http://www.ascom.ch/.
 
+ The MDC2 algorithm is patented by IBM.
+
  NTT and Mitsubishi have patents and pending patents on the Camellia
  algorithm, but allow use at no charge without requiring an explicit
  licensing agreement: http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html
@@ -137,9 +145,6 @@
  SUPPORT
  -------
 
- See the OpenSSL website www.openssl.org for details of how to obtain
- commercial technical support.
-
  If you have any problems with OpenSSL then please take the following steps
  first:
 
@@ -162,14 +167,10 @@
     - Stack Traceback (if the application dumps core)
 
  Report the bug to the OpenSSL project via the Request Tracker
- (http://www.openssl.org/support/rt.html) by mail to:
+ (http://www.openssl.org/support/rt2.html) by mail to:
 
     openssl-bugs@openssl.org
 
- Note that the request tracker should NOT be used for general assistance
- or support queries. Just because something doesn't work the way you expect
- does not mean it is necessarily a bug in OpenSSL.
-
  Note that mail to openssl-bugs@openssl.org is recorded in the publicly
  readable request tracker database and is forwarded to a public
  mailing list. Confidential mail may be sent to openssl-security@openssl.org
@@ -180,22 +181,10 @@
 
  Development is coordinated on the openssl-dev mailing list (see
  http://www.openssl.org for information on subscribing). If you
- would like to submit a patch, send it to openssl-bugs@openssl.org with
+ would like to submit a patch, send it to openssl-dev@openssl.org with
  the string "[PATCH]" in the subject. Please be sure to include a
  textual explanation of what your patch does.
 
- If you are unsure as to whether a feature will be useful for the general
- OpenSSL community please discuss it on the openssl-dev mailing list first.
- Someone may be already working on the same thing or there may be a good
- reason as to why that feature isn't implemented.
-
- Patches should be as up to date as possible, preferably relative to the
- current Git or the last snapshot. They should follow the coding style of
- OpenSSL and compile without warnings. Some of the core team developer targets
- can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
- compiles on many varied platforms: try to ensure you only use portable
- features.
-
  Note: For legal reasons, contributions from the US can be accepted only
  if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
  (formerly BXA) with a copy to the ENC Encryption Request Coordinator;

README.FIPS

@@ -0,0 +1,35 @@
+
+Brief instructions on using OpenSSL 0.9.8 FIPS test branch.
+
+To avoid any confusion that this might generate a validate library just
+supplying "fips" on the command line wont work. Additional options are
+needed...
+
+To build fipscanister and produce a usable distribution the configuration
+option "fipscanisterbuild" is used to either the config or Configure scripts.
+For example:
+
+./config fipscanisterbuild
+
+This builds static libraries in a way similar to the FIPS 1.1.1 distro.
+
+To build the shared library fipscanister version use the configuration
+options "fipsdso".
+
+Note that the fipscanister.o file is totally incompatible with the version
+produced by the FIPS 1.1.1 distribution and cannot be made to work with
+it.
+
+Both options should also work under Windows and VC++. With this version the
+use of MinGW is unnecessary and the normal VC++ build procedure can be
+followed *except* the GNU linker "ld.exe" (for example from MinGW) must be
+accessible somewhere on the PATH. For example:
+
+perl Configure VC-WIN32 fipsdso
+ms\do_masm
+nmake -f ms\ntdll.mak
+
+Note that any warnings from a Windows version of "tar" about being unable to
+create symbolic links can be ignored.
+
+

STATUS

@@ -0,0 +1,129 @@
+
+  OpenSSL STATUS                           Last modified at
+  ______________                           $Date: 2007/02/23 12:12:27 $
+
+  DEVELOPMENT STATE
+
+    o  OpenSSL 0.9.9:  Under development...
+    o  OpenSSL 0.9.8e: Released on February  23rd, 2007
+    o  OpenSSL 0.9.8d: Released on September 28th, 2006
+    o  OpenSSL 0.9.8c: Released on September  5th, 2006
+    o  OpenSSL 0.9.8b: Released on May        4th, 2006
+    o  OpenSSL 0.9.8a: Released on October   11th, 2005
+    o  OpenSSL 0.9.8:  Released on July       5th, 2005
+    o  OpenSSL 0.9.7m: Released on February  23rd, 2007
+    o  OpenSSL 0.9.7l: Released on September 28th, 2006
+    o  OpenSSL 0.9.7k: Released on September  5th, 2006
+    o  OpenSSL 0.9.7j: Released on May        4th, 2006
+    o  OpenSSL 0.9.7i: Released on October   14th, 2005
+    o  OpenSSL 0.9.7h: Released on October   11th, 2005
+    o  OpenSSL 0.9.7g: Released on April     11th, 2005
+    o  OpenSSL 0.9.7f: Released on March     22nd, 2005
+    o  OpenSSL 0.9.7e: Released on October   25th, 2004
+    o  OpenSSL 0.9.7d: Released on March     17th, 2004
+    o  OpenSSL 0.9.7c: Released on September 30th, 2003
+    o  OpenSSL 0.9.7b: Released on April     10th, 2003
+    o  OpenSSL 0.9.7a: Released on February  19th, 2003
+    o  OpenSSL 0.9.7:  Released on December  31st, 2002
+    o  OpenSSL 0.9.6m: Released on March     17th, 2004
+    o  OpenSSL 0.9.6l: Released on November   4th, 2003
+    o  OpenSSL 0.9.6k: Released on September 30th, 2003
+    o  OpenSSL 0.9.6j: Released on April     10th, 2003
+    o  OpenSSL 0.9.6i: Released on February  19th, 2003
+    o  OpenSSL 0.9.6h: Released on December   5th, 2002
+    o  OpenSSL 0.9.6g: Released on August     9th, 2002
+    o  OpenSSL 0.9.6f: Released on August     8th, 2002
+    o  OpenSSL 0.9.6e: Released on July      30th, 2002
+    o  OpenSSL 0.9.6d: Released on May        9th, 2002
+    o  OpenSSL 0.9.6c: Released on December  21st, 2001
+    o  OpenSSL 0.9.6b: Released on July       9th, 2001
+    o  OpenSSL 0.9.6a: Released on April      5th, 2001
+    o  OpenSSL 0.9.6:  Released on September 24th, 2000
+    o  OpenSSL 0.9.5a: Released on April      1st, 2000
+    o  OpenSSL 0.9.5:  Released on February  28th, 2000
+    o  OpenSSL 0.9.4:  Released on August    09th, 1999
+    o  OpenSSL 0.9.3a: Released on May       29th, 1999
+    o  OpenSSL 0.9.3:  Released on May       25th, 1999
+    o  OpenSSL 0.9.2b: Released on March     22th, 1999
+    o  OpenSSL 0.9.1c: Released on December  23th, 1998
+
+  [See also http://www.openssl.org/support/rt2.html]
+
+  RELEASE SHOWSTOPPERS
+
+    o The Makefiles fail with some SysV makes.
+    o 
+
+  AVAILABLE PATCHES
+
+    o 
+
+  IN PROGRESS
+
+    o Steve is currently working on (in no particular order):
+        ASN1 code redesign, butchery, replacement.
+        OCSP
+        EVP cipher enhancement.
+        Enhanced certificate chain verification.
+	Private key, certificate and CRL API and implementation.
+	Developing and bugfixing PKCS#7 (S/MIME code).
+        Various X509 issues: character sets, certificate request extensions.
+    o Richard is currently working on:
+	Constification
+	Attribute Certificate support
+	Certificate Pair support
+	Storage Engines (primarly an LDAP storage engine)
+	Certificate chain validation with full RFC 3280 compatibility
+
+  NEEDS PATCH
+
+    o  0.9.8-dev: COMPLEMENTOFALL and COMPLEMENTOFDEFAULT do not
+       handle ECCdraft cipher suites correctly.
+
+    o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file
+
+    o  "OpenSSL STATUS" is never up-to-date.
+
+  OPEN ISSUES
+
+    o  The Makefile hierarchy and build mechanism is still not a round thing:
+
+       1. The config vs. Configure scripts
+          It's the same nasty situation as for Apache with APACI vs.
+          src/Configure. It confuses.
+          Suggestion: Merge Configure and config into a single configure
+                      script with a Autoconf style interface ;-) and remove
+                      Configure and config. Or even let us use GNU Autoconf
+                      itself. Then we can avoid a lot of those platform checks
+                      which are currently in Configure.
+
+    o  Support for Shared Libraries has to be added at least
+       for the major Unix platforms. The details we can rip from the stuff
+       Ralf has done for the Apache src/Configure script. Ben wants the
+       solution to be really simple.
+
+       Status: Ralf will look how we can easily incorporate the
+               compiler PIC and linker DSO flags from Apache
+               into the OpenSSL Configure script.
+
+               Ulf: +1 for using GNU autoconf and libtool (but not automake,
+                    which apparently is not flexible enough to generate
+                    libcrypto)
+
+  WISHES
+
+    o  Add variants of DH_generate_parameters() and BN_generate_prime() [etc?]
+       where the callback function can request that the function be aborted.
+       [Gregory Stark <ghstark@pobox.com>, <rayyang2000@yahoo.com>]
+
+    o  SRP in TLS.
+       [wished by:
+        Dj <derek@yo.net>, Tom Wu <tom@arcot.com>,
+        Tom Holroyd <tomh@po.crl.go.jp>]
+
+       See http://search.ietf.org/internet-drafts/draft-ietf-tls-srp-00.txt
+       as well as http://www-cs-students.stanford.edu/~tjw/srp/.
+
+       Tom Holroyd tells us there is a SRP patch for OpenSSH at
+       http://members.tripod.com/professor_tom/archives/, that could
+       be useful.

VMS/install.com

@@ -12,14 +12,6 @@ $	    WRITE SYS$OUTPUT "Should be the directory where you want things installed.
 $	    EXIT
 $	ENDIF
 $
-$	IF (F$GETSYI("CPU").LT.128)
-$	THEN
-$	    ARCH := VAX
-$	ELSE
-$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$	ENDIF
-$
 $	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
 $	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
 $	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
@@ -27,7 +19,13 @@ $	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
 $	ROOT = ROOT_DEV + "[" + ROOT_DIR
 $
 $	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
+$	DEFINE/NOLOG WRK_SSLVLIB WRK_SSLROOT:[VAX_LIB]
+$	DEFINE/NOLOG WRK_SSLALIB WRK_SSLROOT:[ALPHA_LIB]
 $	DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
+$	DEFINE/NOLOG WRK_SSLVEXE WRK_SSLROOT:[VAX_EXE]
+$	DEFINE/NOLOG WRK_SSLAEXE WRK_SSLROOT:[ALPHA_EXE]
+$	DEFINE/NOLOG WRK_SSLCERTS WRK_SSLROOT:[CERTS]
+$	DEFINE/NOLOG WRK_SSLPRIVATE WRK_SSLROOT:[PRIVATE]
 $
 $	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
 	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
@@ -41,7 +39,7 @@ $	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -
 $
 $	OPEN/WRITE SF WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
 $	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM")," created."
-$	WRITE SF "$! Startup file for Openssl"
+$	WRITE SF "$! Startup file for Openssl 0.9.2-RL 15-Mar-1999"
 $	WRITE SF "$!"
 $	WRITE SF "$! Do not edit this file, as it will be regenerated during next installation."
 $	WRITE SF "$! Instead, add or change SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
@@ -49,13 +47,8 @@ $	WRITE SF "$!"
 $	WRITE SF "$! P1	a qualifier to DEFINE.  For example ""/SYSTEM"" to get the logical names"
 $	WRITE SF "$!	defined in the system logical name table."
 $	WRITE SF "$!"
-$	WRITE SF "$	IF (F$GETSYI(""CPU"").LT.128)"
+$	WRITE SF "$	ARCH = ""VAX"""
-$	WRITE SF "$	THEN"
+$	WRITE SF "$	IF F$GETSYI(""CPU"") .GE. 128 THEN ARCH = ""ALPHA"""
-$	WRITE SF "$	    ARCH := VAX"
-$	WRITE SF "$	ELSE"
-$	WRITE SF "$	    ARCH = F$EDIT( F$GETSYI( ""ARCH_NAME""), ""UPCASE"")"
-$	WRITE SF "$	    IF (ARCH .EQS. """") THEN ARCH = ""UNK"""
-$	WRITE SF "$	ENDIF"
 $	WRITE SF "$	DEFINE/NOLOG'P1	SSLROOT		",ROOT,".] /TRANS=CONC"
 $	WRITE SF "$	DEFINE/NOLOG'P1	SSLLIB		SSLROOT:['ARCH'_LIB]"
 $	WRITE SF "$	DEFINE/NOLOG'P1	SSLINCLUDE	SSLROOT:[INCLUDE]"

VMS/mkshared.com

@@ -3,10 +3,10 @@ $!
 $! No command line parameters.  This should be run at the start of the source
 $! tree (the same directory where one finds INSTALL.VMS).
 $!
-$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB
+$! Input:	[.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
-$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]LIBSSL.OLB
+$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
-$! Output:	[.xxx.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
+$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
-$!		[.xxx.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
+$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
 $!
 $! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
 $! ===========================================================================
@@ -19,41 +19,31 @@ $   write sys$error "ERROR: Couldn't find any library version info..."
 $   exit
 $ endif
 $
-$ if (f$getsyi("cpu").lt.128)
+$ if f$getsyi("CPU") .ge. 128
 $ then
-$     arch := VAX
-$ else
-$     arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
-$     if (arch .eqs. "") then arch = "UNK"
-$ endif
-$
-$ if arch .nes. "VAX"
-$ then
-$   arch_vax = 0
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.CRYPTO]"
+$   libdir = "[.AXP.EXE.CRYPTO]"
 $   libolb = "''libdir'LIBCRYPTO.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
 $   libmap = "''libdir'LIBCRYPTO.MAP"
 $   libgoal= "''libdir'LIBCRYPTO.EXE"
 $   libref = ""
-$   gosub create_nonvax_shr
+$   gosub create_axp_shr
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.SSL]"
+$   libdir = "[.AXP.EXE.SSL]"
 $   libolb = "''libdir'LIBSSL.OLB"
 $   libopt = "''libdir'LIBSSL.OPT"
 $   libmap = "''libdir'LIBSSL.MAP"
 $   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.AXP.EXE.CRYPTO]LIBCRYPTO.EXE"
-$   gosub create_nonvax_shr
+$   gosub create_axp_shr
 $ else
-$   arch_vax = 1
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.CRYPTO]"
+$   libdir = "[.VAX.EXE.CRYPTO]"
 $   libmar = "''libdir'LIBCRYPTO.MAR"
 $   libolb = "''libdir'LIBCRYPTO.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
@@ -66,22 +56,22 @@ $   gosub create_vax_shr
 $   libtit = "SSL_TRANSFER_VECTOR"
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.''ARCH'.EXE.SSL]"
+$   libdir = "[.VAX.EXE.SSL]"
 $   libmar = "''libdir'LIBSSL.MAR"
 $   libolb = "''libdir'LIBSSL.OLB"
 $   libopt = "''libdir'LIBSSL.OPT"
 $   libobj = "''libdir'LIBSSL.OBJ"
 $   libmap = "''libdir'LIBSSL.MAP"
 $   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
 $   libvec = "LIBSSL"
 $   gosub create_vax_shr
 $ endif
 $ exit
 $
-$! ----- Soubroutines to build the shareable libraries
+$! ----- Soubroutines to actually build the shareable libraries
-$! For each supported architecture, there's a main shareable library
+$! The way things work, there's a main shareable library creator for each
-$! creator, which is called from the main code above.
+$! supported architecture, which is called from the main code above.
 $! The creator will define a number of variables to tell the next levels of
 $! subroutines what routines to use to write to the option files, call the
 $! main processor, read_func_num, and when that is done, it will write version
@@ -107,10 +97,10 @@ $! read_func_num depends on the following variables from the creator:
 $! libwriter	The name of the writer routine to call for each .num file line
 $! -----
 $
-$! ----- Subroutines for non-VAX
+$! ----- Subroutines for AXP
 $! -----
 $! The creator routine
-$ create_nonvax_shr:
+$ create_axp_shr:
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
 $   write opt libolb,"/lib"
@@ -118,7 +108,7 @@ $   if libref .nes. "" then write opt libref,"/SHARE"
 $   write opt "SYMBOL_VECTOR=(-"
 $   libfirstentry := true
 $   libwrch   := opt
-$   libwriter := write_nonvax_transfer_entry
+$   libwriter := write_axp_transfer_entry
 $   textcount = 0
 $   gosub read_func_num
 $   write opt ")"
@@ -128,7 +118,7 @@ $   link/map='libmap'/full/share='libgoal' 'libopt'/option
 $   return
 $
 $! The record writer routine
-$ write_nonvax_transfer_entry:
+$ write_axp_transfer_entry:
 $   if libentry .eqs. ".dummy" then return
 $   if info_kind .eqs. "VARIABLE"
 $   then
@@ -154,7 +144,7 @@ $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for VAX
+$! ----- Subroutines for AXP
 $! -----
 $! The creator routine
 $ create_vax_shr:
@@ -274,15 +264,8 @@ $             truesum = truesum + 1
 $           if plat_entry .eqs. "!EXPORT_VAR_AS_FUNCTION" then -
 $             falsesum = falsesum + 1
 $         endif
-$!
+$         if plat_entry .eqs. "VMS" then truesum = truesum + 1
-$         if ((plat_entry .eqs. "VMS") .or. -
+$         if plat_entry .eqs. "!VMS" then falsesum = falsesum + 1
-            (arch_vax .and. (plat_entry .eqs. "VMSVAX"))) then -
-            truesum = truesum + 1
-$!
-$         if ((plat_entry .eqs. "!VMS") .or. -
-            (arch_vax .and. (plat_entry .eqs. "!VMSVAX"))) then -
-            falsesum = falsesum + 1
-$!
 $	  goto loop1
 $       endif
 $     endloop1:

VMS/openssl_utils.com

@@ -8,17 +8,10 @@ $!
 $!
 $! Slightly modified by Richard Levitte <richard@levitte.org>
 $!
-$!
-$! Always define OPENSSL.  Others are optional (non-null P1).
-$!
 $ OPENSSL  :== $SSLEXE:OPENSSL
-$
-$ IF (P1 .NES. "")
-$ THEN
 $ VERIFY   :== $SSLEXE:OPENSSL VERIFY
 $ ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
-$! REQ could conflict with REQUEST.
+$ REQ      :== $SSLEXE:OPENSSL REQ
-$     OREQ     :== $SSLEXE:OPENSSL REQ
 $ DGST     :== $SSLEXE:OPENSSL DGST
 $ DH       :== $SSLEXE:OPENSSL DH
 $ ENC      :== $SSLEXE:OPENSSL ENC
@@ -43,4 +36,3 @@ $     SESS_ID  :== $SSLEXE:OPENSSL SESS_ID
 $ CIPHERS  :== $SSLEXE:OPENSSL CIPHERS
 $ NSEQ     :== $SSLEXE:OPENSSL NSEQ
 $ PKCS12   :== $SSLEXE:OPENSSL PKCS12
-$ ENDIF

apps/CA.com

@@ -114,8 +114,8 @@ $!
 $   IF F$SEARCH(CATOP+".private"+CAKEY) .EQS. ""
 $   THEN
 $     READ '__INPUT' FILE -
-	   /PROMPT="CA certificate filename (or enter to create): "
+	   /PROMT="CA certificate filename (or enter to create)"
-$     IF (FILE .NES. "") .AND. (F$SEARCH(FILE) .NES. "")
+$     IF F$SEARCH(FILE) .NES. ""
 $     THEN
 $       COPY 'FILE' 'CATOP'.private'CAKEY'
 $	RET=$STATUS

apps/CA.sh

@@ -29,56 +29,26 @@
 
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
-cp_pem() {
-    infile=$1
-    outfile=$2
-    bound=$3
-    flag=0
-    exec <$infile;
-    while read line; do
-	if [ $flag -eq 1 ]; then
-		echo $line|grep "^-----END.*$bound"  2>/dev/null 1>/dev/null
-		if [ $? -eq 0 ] ; then
-			echo $line >>$outfile
-			break
-		else
-			echo $line >>$outfile
-		fi
-	fi
-
-	echo $line|grep "^-----BEGIN.*$bound"  2>/dev/null 1>/dev/null
-	if [ $? -eq 0 ]; then
-		echo $line >$outfile
-		flag=1
-	fi
-    done
-}
-
-usage() {
- echo "usage: $0 -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify" >&2
-}
 
 if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
 
-if [ -z "$DAYS" ] ; then DAYS="-days 365" ; fi	# 1 year
+DAYS="-days 365"	# 1 year
 CADAYS="-days 1095"	# 3 years
 REQ="$OPENSSL req $SSLEAY_CONFIG"
 CA="$OPENSSL ca $SSLEAY_CONFIG"
 VERIFY="$OPENSSL verify"
 X509="$OPENSSL x509"
-PKCS12="openssl pkcs12"
 
-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
+CATOP=./demoCA
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
 
-RET=0
+for i
-
+do
-while [ "$1" != "" ] ; do
+case $i in
-case $1 in
 -\?|-h|-help)
-    usage
+    echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" >&2
     exit 0
     ;;
 -newcert) 
@@ -93,23 +63,18 @@ case $1 in
     RET=$?
     echo "Request is in newreq.pem, private key is in newkey.pem"
     ;;
--newreq-nodes) 
-    # create a certificate request
-    $REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS
-    RET=$?
-    echo "Request (and private key) is in newreq.pem"
-    ;;
 -newca)     
     # if explicitly asked for or it doesn't exist then setup the directory
     # structure that Eric likes to manage things 
     NEW="1"
     if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
 	# create the directory hierarchy
-	mkdir -p ${CATOP}
+	mkdir ${CATOP} 
-	mkdir -p ${CATOP}/certs
+	mkdir ${CATOP}/certs 
-	mkdir -p ${CATOP}/crl
+	mkdir ${CATOP}/crl 
-	mkdir -p ${CATOP}/newcerts
+	mkdir ${CATOP}/newcerts
-	mkdir -p ${CATOP}/private
+	mkdir ${CATOP}/private
+	echo "00" > ${CATOP}/serial
 	touch ${CATOP}/index.txt
     fi
     if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@ -118,20 +83,14 @@ case $1 in
 
 	# ask user for existing CA certificate
 	if [ "$FILE" ]; then
-	    cp_pem $FILE ${CATOP}/private/$CAKEY PRIVATE
+	    cp $FILE ${CATOP}/private/$CAKEY
-	    cp_pem $FILE ${CATOP}/$CACERT CERTIFICATE
 	    RET=$?
-	    if [ ! -f "${CATOP}/serial" ]; then
-		$X509 -in ${CATOP}/$CACERT -noout -next_serial \
-		      -out ${CATOP}/serial
-	    fi
 	else
 	    echo "Making CA certificate ..."
 	    $REQ -new -keyout ${CATOP}/private/$CAKEY \
 			   -out ${CATOP}/$CAREQ
-	    $CA -create_serial -out ${CATOP}/$CACERT $CADAYS -batch \
+	    $CA -out ${CATOP}/$CACERT $CADAYS -batch \
 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
-			   -extensions v3_ca \
 			   -infiles ${CATOP}/$CAREQ 
 	    RET=$?
 	fi
@@ -141,33 +100,16 @@ case $1 in
     $CA -policy policy_anything -infiles newreq.pem 
     RET=$?
     ;;
--pkcs12)
-    if [ -z "$2" ] ; then
-	CNAME="My Certificate"
-    else
-	CNAME="$2"
-    fi
-    $PKCS12 -in newcert.pem -inkey newreq.pem -certfile ${CATOP}/$CACERT \
-	    -out newcert.p12 -export -name "$CNAME"
-    RET=$?
-    exit $RET
-    ;;
 -sign|-signreq) 
     $CA -policy policy_anything -out newcert.pem -infiles newreq.pem
     RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
--signCA)
-    $CA -policy policy_anything -out newcert.pem -extensions v3_ca -infiles newreq.pem
-    RET=$?
-    echo "Signed CA certificate is in newcert.pem"
-    ;;
 -signcert) 
     echo "Cert passphrase will be requested twice - bug?"
     $X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
     $CA -policy policy_anything -out newcert.pem -infiles tmp.pem
-    RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
@@ -185,14 +127,13 @@ case $1 in
 	    fi
 	done
     fi
-    exit $RET
+    exit 0
     ;;
 *)
-    echo "Unknown arg $i" >&2
+    echo "Unknown arg $i";
-    usage
     exit 1
     ;;
 esac
-shift
 done
 exit $RET
+

apps/app_rand.c

@@ -115,44 +115,44 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
+
 static int seeded = 0;
 static int egdsocket = 0;
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
-{
+	{
 	int consider_randfile = (file == NULL);
 	char buffer[200];
 	
 #ifdef OPENSSL_SYS_WINDOWS
-    BIO_printf(bio_e, "Loading 'screen' into random state -");
+	BIO_printf(bio_e,"Loading 'screen' into random state -");
 	BIO_flush(bio_e);
 	RAND_screen();
-    BIO_printf(bio_e, " done\n");
+	BIO_printf(bio_e," done\n");
 #endif
 
 	if (file == NULL)
 		file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
+	else if (RAND_egd(file) > 0)
-        /*
+		{
-         * we try if the given filename is an EGD socket. if it is, we don't
+		/* we try if the given filename is an EGD socket.
-         * write anything back to the file.
+		   if it is, we don't write anything back to the file. */
-         */
 		egdsocket = 1;
 		return 1;
 		}
-    if (file == NULL || !RAND_load_file(file, -1)) {
+	if (file == NULL || !RAND_load_file(file, -1))
-        if (RAND_status() == 0) {
+		{
-            if (!dont_warn) {
+		if (RAND_status() == 0)
-                BIO_printf(bio_e, "unable to load 'random state'\n");
+			{
-                BIO_printf(bio_e,
+			if (!dont_warn)
-                           "This means that the random number generator has not been seeded\n");
+				{
-                BIO_printf(bio_e, "with much random data.\n");
+				BIO_printf(bio_e,"unable to load 'random state'\n");
-                if (consider_randfile) { /* explanation does not apply when a
+				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
-                                          * file is explicitly named */
+				BIO_printf(bio_e,"with much random data.\n");
-                    BIO_printf(bio_e,
+				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
+					{
-                    BIO_printf(bio_e,
+					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
-                               "'random' data can be kept in (the file will be overwritten).\n");
+					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
 					}
 				}
 			return 0;
@@ -160,61 +160,59 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 		}
 	seeded = 1;
 	return 1;
-}
+	}
 
 long app_RAND_load_files(char *name)
-{
+	{
-    char *p, *n;
+	char *p,*n;
 	int last;
-    long tot = 0;
+	long tot=0;
 	int egd;
 	
-    for (;;) {
+	for (;;)
-        last = 0;
+		{
-        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
+		last=0;
-        if (*p == '\0')
+		for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++);
-            last = 1;
+		if (*p == '\0') last=1;
-        *p = '\0';
+		*p='\0';
-        n = name;
+		n=name;
-        name = p + 1;
+		name=p+1;
-        if (*n == '\0')
+		if (*n == '\0') break;
-            break;
 
-        egd = RAND_egd(n);
+		egd=RAND_egd(n);
 		if (egd > 0)
-            tot += egd;
+			tot+=egd;
 		else
-            tot += RAND_load_file(n, -1);
+			tot+=RAND_load_file(n,-1);
-        if (last)
+		if (last) break;
-            break;
 		}
 	if (tot > 512)
 		app_RAND_allow_write_file();
-    return (tot);
+	return(tot);
-}
+	}
 
 int app_RAND_write_file(const char *file, BIO *bio_e)
-{
+	{
 	char buffer[200];
 	
 	if (egdsocket || !seeded)
-        /*
+		/* If we did not manage to read the seed file,
-         * If we did not manage to read the seed file, we should not write a
+		 * we should not write a low-entropy seed file back --
-         * low-entropy seed file back -- it would suppress a crucial warning
+		 * it would suppress a crucial warning the next time
-         * the next time we want to use it.
+		 * we want to use it. */
-         */
 		return 0;
 
 	if (file == NULL)
 		file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
+	if (file == NULL || !RAND_write_file(file))
-        BIO_printf(bio_e, "unable to write 'random state'\n");
+		{
+		BIO_printf(bio_e,"unable to write 'random state'\n");
 		return 0;
 		}
 	return 1;
-}
+	}
 
 void app_RAND_allow_write_file(void)
-{
+	{
 	seeded = 1;
-}
+	}

apps/apps.h

@@ -110,78 +110,74 @@
  */
 
 #ifndef HEADER_APPS_H
-# define HEADER_APPS_H
+#define HEADER_APPS_H
 
-# include "e_os.h"
+#include "e_os.h"
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/lhash.h>
+#include <openssl/lhash.h>
-# include <openssl/conf.h>
+#include <openssl/conf.h>
-# include <openssl/txt_db.h>
+#include <openssl/txt_db.h>
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-#  include <openssl/engine.h>
+#include <openssl/engine.h>
-# endif
+#endif
-# ifndef OPENSSL_NO_OCSP
+#include <openssl/ossl_typ.h>
-#  include <openssl/ocsp.h>
-# endif
-# include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
-/*
+/* When `file' is NULL, use defaults.
- * When `file' is NULL, use defaults. `bio_e' is for error messages.
+ * `bio_e' is for error messages. */
- */
 void app_RAND_allow_write_file(void);
 long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                        * separated by LIST_SEPARATOR_CHAR
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-# ifdef OPENSSL_SYS_WIN32
+#ifdef OPENSSL_SYS_WIN32
-#  define rename(from,to) WIN32_rename((from),(to))
+#define rename(from,to) WIN32_rename((from),(to))
-int WIN32_rename(const char *oldname, const char *newname);
+int WIN32_rename(const char *oldname,const char *newname);
-# endif
+#endif
 
-# ifndef MONOLITH
+#ifndef MONOLITH
 
-#  define MAIN(a,v)       main(a,v)
+#define MAIN(a,v)	main(a,v)
 
-#  ifndef NON_MAIN
+#ifndef NON_MAIN
-CONF *config = NULL;
+CONF *config=NULL;
-BIO *bio_err = NULL;
+BIO *bio_err=NULL;
-int in_FIPS_mode = 0;
+int in_FIPS_mode=0;
-#  else
+#else
 extern CONF *config;
 extern BIO *bio_err;
 extern int in_FIPS_mode;
-#  endif
+#endif
 
-# else
+#else
 
-#  define MAIN(a,v)       PROG(a,v)
+#define MAIN(a,v)	PROG(a,v)
 extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 extern int in_FIPS_mode;
 
-# endif
+#endif
 
-# ifndef OPENSSL_SYS_NETWARE
+#ifndef OPENSSL_SYS_NETWARE
-#  include <signal.h>
+#include <signal.h>
-# endif
+#endif
 
-# ifdef SIGPIPE
+#ifdef SIGPIPE
-#  define do_pipe_sig()   signal(SIGPIPE,SIG_IGN)
+#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
-# else
+#else
-#  define do_pipe_sig()
+#define do_pipe_sig()
-# endif
+#endif
 
-# if defined(MONOLITH) && !defined(OPENSSL_C)
+#if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup() \
 		do_pipe_sig()
 #  define apps_shutdown()
-# else
+#else
 #  ifndef OPENSSL_NO_ENGINE
 #    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
      defined(OPENSSL_SYS_WIN32)
@@ -233,26 +229,23 @@ extern int in_FIPS_mode;
 			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 			ERR_free_strings(); } while(0)
 #  endif
-# endif
+#endif
 
-# ifdef OPENSSL_SYSNAME_WIN32
+typedef struct args_st
-#  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
+	{
-# else
-#  define openssl_fdset(a,b) FD_SET(a, b)
-# endif
-
-typedef struct args_st {
 	char **data;
 	int count;
-} ARGS;
+	} ARGS;
 
-# define PW_MIN_LENGTH 4
+#define PW_MIN_LENGTH 4
-typedef struct pw_cb_data {
+typedef struct pw_cb_data
+	{
 	const void *password;
 	const char *prompt_info;
-} PW_CB_DATA;
+	} PW_CB_DATA;
 
-int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
+int password_callback(char *buf, int bufsiz, int verify,
+	PW_CB_DATA *cb_data);
 
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -260,13 +253,12 @@ void destroy_ui_method(void);
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
-void program_name(char *in, char *out, int size);
+void program_name(char *in,char *out,int size);
-int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]);
+int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
-# ifdef HEADER_X509_H
+#ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm,
+void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
-                unsigned long lflags);
+#endif
-# endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
 int set_ext_copy(int *copy_type, const char *arg);
@@ -280,18 +272,11 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 	const char *pass, ENGINE *e, const char *key_descrip);
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
-                           const char *pass, ENGINE *e,
+	const char *pass, ENGINE *e, const char *cert_descrip);
-                           const char *cert_descrip);
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
-# endif
+#endif
-
-# ifndef OPENSSL_NO_OCSP
-OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
-                                 char *host, char *path, char *port,
-                                 int use_ssl, int req_timeout);
-# endif
 
 int load_config(BIO *err, CONF *cnf);
 char *make_config_name(void);
@@ -300,37 +285,36 @@ char *make_config_name(void);
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 			ASN1_GENERALIZEDTIME **pinvtm, const char *str);
 
-# define DB_type         0
+#define DB_type         0
-# define DB_exp_date     1
+#define DB_exp_date     1
-# define DB_rev_date     2
+#define DB_rev_date     2
-# define DB_serial       3      /* index - unique */
+#define DB_serial       3       /* index - unique */
-# define DB_file         4
+#define DB_file         4       
-# define DB_name         5      /* index - unique when active and not
+#define DB_name         5       /* index - unique when active and not disabled */
-                                 * disabled */
+#define DB_NUMBER       6
-# define DB_NUMBER       6
 
-# define DB_TYPE_REV     'R'
+#define DB_TYPE_REV	'R'
-# define DB_TYPE_EXP     'E'
+#define DB_TYPE_EXP	'E'
-# define DB_TYPE_VAL     'V'
+#define DB_TYPE_VAL	'V'
 
-typedef struct db_attr_st {
+typedef struct db_attr_st
+	{
 	int unique_subject;
-} DB_ATTR;
+	} DB_ATTR;
-typedef struct ca_db_st {
+typedef struct ca_db_st
+	{
 	DB_ATTR attributes;
 	TXT_DB *db;
-} CA_DB;
+	} CA_DB;
 
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
-                ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
-int rotate_index(const char *dbfile, const char *new_suffix,
+int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
-                 const char *old_suffix);
 void free_index(CA_DB *db);
 int index_name_cmp(const char **a, const char **b);
 int parse_yesno(const char *str, int def);
@@ -339,30 +323,26 @@ X509_NAME *parse_name(char *str, long chtype, int multirdn);
 int args_verify(char ***pargs, int *pargc,
 			int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 void policies_print(BIO *out, X509_STORE_CTX *ctx);
-# ifndef OPENSSL_NO_JPAKE
-void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
-void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
-# endif
 
-# define FORMAT_UNDEF    0
+#define FORMAT_UNDEF    0
-# define FORMAT_ASN1     1
+#define FORMAT_ASN1     1
-# define FORMAT_TEXT     2
+#define FORMAT_TEXT     2
-# define FORMAT_PEM      3
+#define FORMAT_PEM      3
-# define FORMAT_NETSCAPE 4
+#define FORMAT_NETSCAPE 4
-# define FORMAT_PKCS12   5
+#define FORMAT_PKCS12   5
-# define FORMAT_SMIME    6
+#define FORMAT_SMIME    6
-# define FORMAT_ENGINE   7
+#define FORMAT_ENGINE   7
-# define FORMAT_IISSGC   8      /* XXX this stupid macro helps us to avoid
+#define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
 				 * adding yet another param to load_*key() */
 
-# define EXT_COPY_NONE   0
+#define EXT_COPY_NONE	0
-# define EXT_COPY_ADD    1
+#define EXT_COPY_ADD	1
-# define EXT_COPY_ALL    2
+#define EXT_COPY_ALL	2
 
-# define NETSCAPE_CERT_HDR       "certificate"
+#define NETSCAPE_CERT_HDR	"certificate"
 
-# define APP_PASS_LEN    1024
+#define APP_PASS_LEN	1024
 
-# define SERIAL_RAND_BITS        64
+#define SERIAL_RAND_BITS	64
 
 #endif

apps/asn1pars.c

@@ -56,9 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-/*
+/* A nice addition from Dr Stephen Henson <shenson@bigfoot.com> to 
- * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * add the -strparse option which parses nested binary structures
- * -strparse option which parses nested binary structures
  */
 
 #include <stdio.h>
@@ -70,8 +69,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -in arg	- input file - default stdin
  * -i		- indent the details by depth
  * -offset	- where in the file to start
@@ -87,134 +85,145 @@ int MAIN(int, char **);
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int i, badops = 0, offset = 0, ret = 1, j;
+	int i,badops=0,offset=0,ret=1,j;
-    unsigned int length = 0;
+	unsigned int length=0;
-    long num, tmplen;
+	long num,tmplen;
-    BIO *in = NULL, *out = NULL, *b64 = NULL, *derout = NULL;
+	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
-    int informat, indent = 0, noout = 0, dump = 0;
+	int informat,indent=0, noout = 0, dump = 0;
-    char *infile = NULL, *str = NULL, *prog, *oidfile = NULL, *derfile = NULL;
+	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
-    char *genstr = NULL, *genconf = NULL;
+	char *genstr=NULL, *genconf=NULL;
 	unsigned char *tmpbuf;
 	const unsigned char *ctmpbuf;
-    BUF_MEM *buf = NULL;
+	BUF_MEM *buf=NULL;
-    STACK *osk = NULL;
+	STACK *osk=NULL;
-    ASN1_TYPE *at = NULL;
+	ASN1_TYPE *at=NULL;
 
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    if ((osk = sk_new_null()) == NULL) {
+	if ((osk=sk_new_null()) == NULL)
-        BIO_printf(bio_err, "Memory allocation failure\n");
+		{
+		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto end;
 		}
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-in") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-in") == 0)
-            infile = *(++argv);
+			{
-        } else if (strcmp(*argv, "-out") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			infile= *(++argv);
-                goto bad;
+			}
-            derfile = *(++argv);
+		else if (strcmp(*argv,"-out") == 0)
-        } else if (strcmp(*argv, "-i") == 0) {
+			{
-            indent = 1;
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-noout") == 0)
+			derfile= *(++argv);
-            noout = 1;
+			}
-        else if (strcmp(*argv, "-oid") == 0) {
+		else if (strcmp(*argv,"-i") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			indent=1;
-            oidfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-offset") == 0) {
+		else if (strcmp(*argv,"-noout") == 0) noout = 1;
-            if (--argc < 1)
+		else if (strcmp(*argv,"-oid") == 0)
-                goto bad;
+			{
-            offset = atoi(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-length") == 0) {
+			oidfile= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-offset") == 0)
-            length = atoi(*(++argv));
+			{
-            if (length == 0)
+			if (--argc < 1) goto bad;
-                goto bad;
+			offset= atoi(*(++argv));
-        } else if (strcmp(*argv, "-dump") == 0) {
+			}
-            dump = -1;
+		else if (strcmp(*argv,"-length") == 0)
-        } else if (strcmp(*argv, "-dlimit") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			length= atoi(*(++argv));
-            dump = atoi(*(++argv));
+			if (length == 0) goto bad;
-            if (dump <= 0)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-dump") == 0)
-        } else if (strcmp(*argv, "-strparse") == 0) {
+			{
-            if (--argc < 1)
+			dump= -1;
-                goto bad;
+			}
-            sk_push(osk, *(++argv));
+		else if (strcmp(*argv,"-dlimit") == 0)
-        } else if (strcmp(*argv, "-genstr") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			dump= atoi(*(++argv));
-            genstr = *(++argv);
+			if (dump <= 0) goto bad;
-        } else if (strcmp(*argv, "-genconf") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-strparse") == 0)
-                goto bad;
+			{
-            genconf = *(++argv);
+			if (--argc < 1) goto bad;
-        } else {
+			sk_push(osk,*(++argv));
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+			}
-            badops = 1;
+		else if (strcmp(*argv,"-genstr") == 0)
+			{
+			if (--argc < 1) goto bad;
+			genstr= *(++argv);
+			}
+		else if (strcmp(*argv,"-genconf") == 0)
+			{
+			if (--argc < 1) goto bad;
+			genconf= *(++argv);
+			}
+		else
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile\n",prog);
-        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -in arg       input file\n");
+		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -in arg       input file\n");
-                   " -out arg      output file (output format is always DER\n");
+		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
-        BIO_printf(bio_err, " -noout arg    don't produce any output\n");
+		BIO_printf(bio_err," -noout arg    don't produce any output\n");
-        BIO_printf(bio_err, " -offset arg   offset into file\n");
+		BIO_printf(bio_err," -offset arg   offset into file\n");
-        BIO_printf(bio_err, " -length arg   length of section in file\n");
+		BIO_printf(bio_err," -length arg   length of section in file\n");
-        BIO_printf(bio_err, " -i            indent entries\n");
+		BIO_printf(bio_err," -i            indent entries\n");
-        BIO_printf(bio_err, " -dump         dump unknown data in hex form\n");
+		BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
-                   " -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
+		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
-        BIO_printf(bio_err, " -oid file     file of extra oid definitions\n");
+		BIO_printf(bio_err," -strparse offset\n");
-        BIO_printf(bio_err, " -strparse offset\n");
+		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
-                   "               a series of these can be used to 'dig' into multiple\n");
+		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
-        BIO_printf(bio_err, "               ASN1 blob wrappings\n");
+		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
-        BIO_printf(bio_err,
-                   " -genstr str   string to generate ASN1 structure from\n");
-        BIO_printf(bio_err,
-                   " -genconf file file to generate ASN1 structure from\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -222,9 +231,11 @@ int MAIN(int argc, char **argv)
 	}
 #endif
 
-    if (oidfile != NULL) {
+	if (oidfile != NULL)
-        if (BIO_read_filename(in, oidfile) <= 0) {
+		{
-            BIO_printf(bio_err, "problems opening %s\n", oidfile);
+		if (BIO_read_filename(in,oidfile) <= 0)
+			{
+			BIO_printf(bio_err,"problems opening %s\n",oidfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
@@ -232,160 +243,164 @@ int MAIN(int argc, char **argv)
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
 
 	if (derfile) {
-        if (!(derout = BIO_new_file(derfile, "wb"))) {
+		if(!(derout = BIO_new_file(derfile, "wb"))) {
-            BIO_printf(bio_err, "problems opening %s\n", derfile);
+			BIO_printf(bio_err,"problems opening %s\n",derfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 
-    if ((buf = BUF_MEM_new()) == NULL)
+	if ((buf=BUF_MEM_new()) == NULL) goto end;
-        goto end;
+	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
-    if (!BUF_MEM_grow(buf, BUFSIZ * 8))
-        goto end;               /* Pre-allocate :-) */
 
-    if (genstr || genconf) {
+	if (genstr || genconf)
+		{
 		num = do_generate(bio_err, genstr, genconf, buf);
-        if (num < 0) {
+		if (num < 0)
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 
-    else {
+	else
+		{
 
-        if (informat == FORMAT_PEM) {
+		if (informat == FORMAT_PEM)
+			{
 			BIO *tmp;
 
-            if ((b64 = BIO_new(BIO_f_base64())) == NULL)
+			if ((b64=BIO_new(BIO_f_base64())) == NULL)
 				goto end;
-            BIO_push(b64, in);
+			BIO_push(b64,in);
-            tmp = in;
+			tmp=in;
-            in = b64;
+			in=b64;
-            b64 = tmp;
+			b64=tmp;
 			}
 
-        num = 0;
+		num=0;
-        for (;;) {
+		for (;;)
-            if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
+			{
-                goto end;
+			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
-            i = BIO_read(in, &(buf->data[num]), BUFSIZ);
+			i=BIO_read(in,&(buf->data[num]),BUFSIZ);
-            if (i <= 0)
+			if (i <= 0) break;
-                break;
+			num+=i;
-            num += i;
 			}
 		}
-    str = buf->data;
+	str=buf->data;
 
 	/* If any structs to parse go through in sequence */
 
-    if (sk_num(osk)) {
+	if (sk_num(osk))
-        tmpbuf = (unsigned char *)str;
+		{
-        tmplen = num;
+		tmpbuf=(unsigned char *)str;
-        for (i = 0; i < sk_num(osk); i++) {
+		tmplen=num;
+		for (i=0; i<sk_num(osk); i++)
+			{
 			ASN1_TYPE *atmp;
 			int typ;
-            j = atoi(sk_value(osk, i));
+			j=atoi(sk_value(osk,i));
-            if (j == 0) {
+			if (j == 0)
-                BIO_printf(bio_err, "'%s' is an invalid number\n",
+				{
-                           sk_value(osk, i));
+				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_value(osk,i));
 				continue;
 				}
-            tmpbuf += j;
+			tmpbuf+=j;
-            tmplen -= j;
+			tmplen-=j;
 			atmp = at;
 			ctmpbuf = tmpbuf;
-            at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
+			at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
 			ASN1_TYPE_free(atmp);
-            if (!at) {
+			if(!at)
-                BIO_printf(bio_err, "Error parsing structure\n");
+				{
+				BIO_printf(bio_err,"Error parsing structure\n");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			typ = ASN1_TYPE_get(at);
 			if ((typ == V_ASN1_OBJECT)
-                || (typ == V_ASN1_NULL)) {
+				|| (typ == V_ASN1_NULL))
+				{
 				BIO_printf(bio_err, "Can't parse %s type\n",
 					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			/* hmm... this is a little evil but it works */
-            tmpbuf = at->value.asn1_string->data;
+			tmpbuf=at->value.asn1_string->data;
-            tmplen = at->value.asn1_string->length;
+			tmplen=at->value.asn1_string->length;
 			}
-        str = (char *)tmpbuf;
+		str=(char *)tmpbuf;
-        num = tmplen;
+		num=tmplen;
 		}
 
-    if (offset >= num) {
+	if (offset >= num)
+		{
 		BIO_printf(bio_err, "Error: offset too large\n");
 		goto end;
 		}
 
 	num -= offset;
 
-    if ((length == 0) || ((long)length > num))
+	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
-        length = (unsigned int)num;
+	if(derout) {
-    if (derout) {
+		if(BIO_write(derout, str + offset, length) != (int)length) {
-        if (BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 	if (!noout &&
-        !ASN1_parse_dump(out, (unsigned char *)&(str[offset]), length,
+	    !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
-                         indent, dump)) {
+		    indent,dump))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    ret = 0;
+	ret=0;
- end:
+end:
 	BIO_free(derout);
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (b64 != NULL) BIO_free(b64);
-        BIO_free_all(out);
-    if (b64 != NULL)
-        BIO_free(b64);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (buf != NULL)
+	if (buf != NULL) BUF_MEM_free(buf);
-        BUF_MEM_free(buf);
+	if (at != NULL) ASN1_TYPE_free(at);
-    if (at != NULL)
+	if (osk != NULL) sk_free(osk);
-        ASN1_TYPE_free(at);
-    if (osk != NULL)
-        sk_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
-{
+	{
 	CONF *cnf = NULL;
 	int len;
 	long errline;
 	unsigned char *p;
 	ASN1_TYPE *atyp = NULL;
 
-    if (genconf) {
+	if (genconf)
+		{
 		cnf = NCONF_new(NULL);
 		if (!NCONF_load(cnf, genconf, &errline))
 			goto conferr;
 		if (!genstr)
 			genstr = NCONF_get_string(cnf, "default", "asn1");
-        if (!genstr) {
+		if (!genstr)
+			{
 			BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
 			goto err;
 			}
@@ -393,7 +408,6 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 
 	atyp = ASN1_generate_nconf(genstr, cnf);
 	NCONF_free(cnf);
-    cnf = NULL;
 
 	if (!atyp)
 		return -1;
@@ -403,10 +417,10 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 	if (len <= 0)
 		goto err;
 
-    if (!BUF_MEM_grow(buf, len))
+	if (!BUF_MEM_grow(buf,len))
 		goto err;
 
-    p = (unsigned char *)buf->data;
+	p=(unsigned char *)buf->data;
 
 	i2d_ASN1_TYPE(atyp, &p);
 
@@ -427,4 +441,4 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 
 	return -1;
 
-}
+	}

apps/ciphers.c

@@ -60,7 +60,7 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-# define APPS_WIN16
+#define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
@@ -69,45 +69,45 @@
 #undef PROG
 #define PROG	ciphers_main
 
-static const char *ciphers_usage[] = {
+static const char *ciphers_usage[]={
-    "usage: ciphers args\n",
+"usage: ciphers args\n",
-    " -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
+" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
-    " -ssl2       - SSL2 mode\n",
+" -ssl2       - SSL2 mode\n",
-    " -ssl3       - SSL3 mode\n",
+" -ssl3       - SSL3 mode\n",
-    " -tls1       - TLS1 mode\n",
+" -tls1       - TLS1 mode\n",
-    NULL
+NULL
 };
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int ret = 1, i;
+	int ret=1,i;
-    int verbose = 0;
+	int verbose=0;
 	const char **pp;
 	const char *p;
-    int badops = 0;
+	int badops=0;
-    SSL_CTX *ctx = NULL;
+	SSL_CTX *ctx=NULL;
-    SSL *ssl = NULL;
+	SSL *ssl=NULL;
-    char *ciphers = NULL;
+	char *ciphers=NULL;
-    SSL_METHOD *meth = NULL;
+	SSL_METHOD *meth=NULL;
 	STACK_OF(SSL_CIPHER) *sk;
 	char buf[512];
-    BIO *STDout = NULL;
+	BIO *STDout=NULL;
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-    meth = SSLv23_server_method();
+	meth=SSLv23_server_method();
 #elif !defined(OPENSSL_NO_SSL3)
-    meth = SSLv3_server_method();
+	meth=SSLv3_server_method();
 #elif !defined(OPENSSL_NO_SSL2)
-    meth = SSLv2_server_method();
+	meth=SSLv2_server_method();
 #endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-    STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
+	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -117,85 +117,92 @@ int MAIN(int argc, char **argv)
 
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-v") == 0)
+		{
-            verbose = 1;
+		if (strcmp(*argv,"-v") == 0)
+			verbose=1;
 #ifndef OPENSSL_NO_SSL2
-        else if (strcmp(*argv, "-ssl2") == 0)
+		else if (strcmp(*argv,"-ssl2") == 0)
-            meth = SSLv2_client_method();
+			meth=SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
-        else if (strcmp(*argv, "-ssl3") == 0)
+		else if (strcmp(*argv,"-ssl3") == 0)
-            meth = SSLv3_client_method();
+			meth=SSLv3_client_method();
 #endif
 #ifndef OPENSSL_NO_TLS1
-        else if (strcmp(*argv, "-tls1") == 0)
+		else if (strcmp(*argv,"-tls1") == 0)
-            meth = TLSv1_client_method();
+			meth=TLSv1_client_method();
 #endif
-        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
+		else if ((strncmp(*argv,"-h",2) == 0) ||
-            badops = 1;
+			 (strcmp(*argv,"-?") == 0))
+			{
+			badops=1;
 			break;
-        } else {
+			}
-            ciphers = *argv;
+		else
+			{
+			ciphers= *argv;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
-        for (pp = ciphers_usage; (*pp != NULL); pp++)
+		{
-            BIO_printf(bio_err, "%s", *pp);
+		for (pp=ciphers_usage; (*pp != NULL); pp++)
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
 	OpenSSL_add_ssl_algorithms();
 
-    ctx = SSL_CTX_new(meth);
+	ctx=SSL_CTX_new(meth);
-    if (ctx == NULL)
+	if (ctx == NULL) goto err;
-        goto err;
 	if (ciphers != NULL) {
-        if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
+		if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
 			BIO_printf(bio_err, "Error in cipher list\n");
 			goto err;
 		}
 	}
-    ssl = SSL_new(ctx);
+	ssl=SSL_new(ctx);
-    if (ssl == NULL)
+	if (ssl == NULL) goto err;
-        goto err;
 
-    if (!verbose) {
+
-        for (i = 0;; i++) {
+	if (!verbose)
-            p = SSL_get_cipher_list(ssl, i);
+		{
-            if (p == NULL)
+		for (i=0; ; i++)
-                break;
+			{
-            if (i != 0)
+			p=SSL_get_cipher_list(ssl,i);
-                BIO_printf(STDout, ":");
+			if (p == NULL) break;
-            BIO_printf(STDout, "%s", p);
+			if (i != 0) BIO_printf(STDout,":");
+			BIO_printf(STDout,"%s",p);
 			}
-        BIO_printf(STDout, "\n");
+		BIO_printf(STDout,"\n");
-    } else {
+		}
-        sk = SSL_get_ciphers(ssl);
+	else
+		{
+		sk=SSL_get_ciphers(ssl);
 
-        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-            BIO_puts(STDout,
+			{
-                     SSL_CIPHER_description(sk_SSL_CIPHER_value(sk, i), buf,
+			BIO_puts(STDout,SSL_CIPHER_description(
-                                            sizeof buf));
+				sk_SSL_CIPHER_value(sk,i),
+				buf,sizeof buf));
 			}
 		}
 
-    ret = 0;
+	ret=0;
-    if (0) {
+	if (0)
- err:
+		{
+err:
 		SSL_load_error_strings();
 		ERR_print_errors(bio_err);
 		}
- end:
+end:
-    if (ctx != NULL)
+	if (ctx != NULL) SSL_CTX_free(ctx);
-        SSL_CTX_free(ctx);
+	if (ssl != NULL) SSL_free(ssl);
-    if (ssl != NULL)
+	if (STDout != NULL) BIO_free_all(STDout);
-        SSL_free(ssl);
-    if (STDout != NULL)
-        BIO_free_all(STDout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
+

apps/crl.c

@@ -72,44 +72,42 @@
 #undef POSTFIX
 #define	POSTFIX	".rvk"
 
-static const char *crl_usage[] = {
+static const char *crl_usage[]={
-    "usage: crl args\n",
+"usage: crl args\n",
-    "\n",
+"\n",
-    " -inform arg     - input format - default PEM (DER or PEM)\n",
+" -inform arg     - input format - default PEM (DER or PEM)\n",
-    " -outform arg    - output format - default PEM\n",
+" -outform arg    - output format - default PEM\n",
-    " -text           - print out a text format version\n",
+" -text           - print out a text format version\n",
-    " -in arg         - input file - default stdin\n",
+" -in arg         - input file - default stdin\n",
-    " -out arg        - output file - default stdout\n",
+" -out arg        - output file - default stdout\n",
-    " -hash           - print hash value\n",
+" -hash           - print hash value\n",
-    " -fingerprint    - print the crl fingerprint\n",
+" -fingerprint    - print the crl fingerprint\n",
-    " -issuer         - print issuer DN\n",
+" -issuer         - print issuer DN\n",
-    " -lastupdate     - lastUpdate field\n",
+" -lastupdate     - lastUpdate field\n",
-    " -nextupdate     - nextUpdate field\n",
+" -nextupdate     - nextUpdate field\n",
-    " -crlnumber      - print CRL number\n",
+" -noout          - no CRL output\n",
-    " -noout          - no CRL output\n",
+" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
-    " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
+" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
-    " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
+" -nameopt arg    - various certificate name options\n",
-    " -nameopt arg    - various certificate name options\n",
+NULL
-    NULL
 };
 
 static X509_CRL *load_crl(char *file, int format);
-static BIO *bio_out = NULL;
+static BIO *bio_out=NULL;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	unsigned long nmflag = 0;
-    X509_CRL *x = NULL;
+	X509_CRL *x=NULL;
 	char *CAfile = NULL, *CApath = NULL;
-    int ret = 1, i, num, badops = 0;
+	int ret=1,i,num,badops=0;
-    BIO *out = NULL;
+	BIO *out=NULL;
-    int informat, outformat;
+	int informat,outformat;
-    char *infile = NULL, *outfile = NULL;
+	char *infile=NULL,*outfile=NULL;
-    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
+	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
-        0, text = 0;
+	int fingerprint = 0;
-    int fingerprint = 0, crlnumber = 0;
 	const char **pp;
 	X509_STORE *store = NULL;
 	X509_STORE_CTX ctx;
@@ -117,20 +115,21 @@ int MAIN(int argc, char **argv)
 	X509_OBJECT xobj;
 	EVP_PKEY *pkey;
 	int do_ver = 0;
-    const EVP_MD *md_alg, *digest = EVP_sha1();
+	const EVP_MD *md_alg,*digest=EVP_sha1();
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	if (bio_out == NULL)
-        if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
+		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
+			{
+			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -139,280 +138,292 @@ int MAIN(int argc, char **argv)
 #endif
 			}
 
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
 	argc--;
 	argv++;
-    num = 0;
+	num=0;
-    while (argc >= 1) {
+	while (argc >= 1)
+		{
 #ifdef undef
-        if (strcmp(*argv, "-p") == 0) {
+		if	(strcmp(*argv,"-p") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            if (!args_from_file(++argv, Nargc, Nargv)) {
+			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
-                goto end;
 			}
-        */}
 #endif
-        if (strcmp(*argv, "-inform") == 0) {
+		if 	(strcmp(*argv,"-inform") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            informat = str2fmt(*(++argv));
+			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
-            outformat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-in") == 0) {
+			outformat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-in") == 0)
-            infile = *(++argv);
+			{
-        } else if (strcmp(*argv, "-out") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			infile= *(++argv);
-                goto bad;
+			}
-            outfile = *(++argv);
+		else if (strcmp(*argv,"-out") == 0)
-        } else if (strcmp(*argv, "-CApath") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outfile= *(++argv);
+			}
+		else if (strcmp(*argv,"-CApath") == 0)
+			{
+			if (--argc < 1) goto bad;
 			CApath = *(++argv);
 			do_ver = 1;
-        } else if (strcmp(*argv, "-CAfile") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-CAfile") == 0)
-                goto bad;
+			{
+			if (--argc < 1) goto bad;
 			CAfile = *(++argv);
 			do_ver = 1;
-        } else if (strcmp(*argv, "-verify") == 0)
+			}
+		else if (strcmp(*argv,"-verify") == 0)
 			do_ver = 1;
-        else if (strcmp(*argv, "-text") == 0)
+		else if (strcmp(*argv,"-text") == 0)
 			text = 1;
-        else if (strcmp(*argv, "-hash") == 0)
+		else if (strcmp(*argv,"-hash") == 0)
-            hash = ++num;
+			hash= ++num;
-        else if (strcmp(*argv, "-nameopt") == 0) {
+		else if (strcmp(*argv,"-nameopt") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            if (!set_name_ex(&nmflag, *(++argv)))
+			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
-                goto bad;
+			}
-        } else if (strcmp(*argv, "-issuer") == 0)
+		else if (strcmp(*argv,"-issuer") == 0)
-            issuer = ++num;
+			issuer= ++num;
-        else if (strcmp(*argv, "-lastupdate") == 0)
+		else if (strcmp(*argv,"-lastupdate") == 0)
-            lastupdate = ++num;
+			lastupdate= ++num;
-        else if (strcmp(*argv, "-nextupdate") == 0)
+		else if (strcmp(*argv,"-nextupdate") == 0)
-            nextupdate = ++num;
+			nextupdate= ++num;
-        else if (strcmp(*argv, "-noout") == 0)
+		else if (strcmp(*argv,"-noout") == 0)
-            noout = ++num;
+			noout= ++num;
-        else if (strcmp(*argv, "-fingerprint") == 0)
+		else if (strcmp(*argv,"-fingerprint") == 0)
-            fingerprint = ++num;
+			fingerprint= ++num;
-        else if (strcmp(*argv, "-crlnumber") == 0)
+		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
-            crlnumber = ++num;
+			{
-        else if ((md_alg = EVP_get_digestbyname(*argv + 1))) {
 			/* ok */
-            digest = md_alg;
+			digest=md_alg;
-        } else {
+			}
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+		else
-            badops = 1;
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        for (pp = crl_usage; (*pp != NULL); pp++)
+bad:
-            BIO_printf(bio_err, "%s", *pp);
+		for (pp=crl_usage; (*pp != NULL); pp++)
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
-    x = load_crl(infile, informat);
+	x=load_crl(infile,informat);
-    if (x == NULL) {
+	if (x == NULL) { goto end; }
-        goto end;
-    }
 
-    if (do_ver) {
+	if(do_ver) {
 		store = X509_STORE_new();
-        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
+		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
-        if (lookup == NULL)
+		if (lookup == NULL) goto end;
-            goto end;
+		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
-        if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM))
+			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-            X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 			
-        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
+		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
-        if (lookup == NULL)
+		if (lookup == NULL) goto end;
-            goto end;
+		if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
-        if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM))
+			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-            X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
 		ERR_clear_error();
 
-        if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
+		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-            BIO_printf(bio_err, "Error initialising X509 store\n");
+			BIO_printf(bio_err,
+				"Error initialising X509 store\n");
 			goto end;
 		}
 
 		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
 					X509_CRL_get_issuer(x), &xobj);
-        if (i <= 0) {
+		if(i <= 0) {
-            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
+			BIO_printf(bio_err,
+				"Error getting CRL issuer certificate\n");
 			goto end;
 		}
 		pkey = X509_get_pubkey(xobj.data.x509);
 		X509_OBJECT_free_contents(&xobj);
-        if (!pkey) {
+		if(!pkey) {
-            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
+			BIO_printf(bio_err,
+				"Error getting CRL issuer public key\n");
 			goto end;
 		}
 		i = X509_CRL_verify(x, pkey);
 		EVP_PKEY_free(pkey);
-        if (i < 0)
+		if(i < 0) goto end;
-            goto end;
+		if(i == 0) BIO_printf(bio_err, "verify failure\n");
-        if (i == 0)
+		else BIO_printf(bio_err, "verify OK\n");
-            BIO_printf(bio_err, "verify failure\n");
-        else
-            BIO_printf(bio_err, "verify OK\n");
 	}
 
-    if (num) {
+	if (num)
-        for (i = 1; i <= num; i++) {
+		{
-            if (issuer == i) {
+		for (i=1; i<=num; i++)
-                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
+			{
-                           nmflag);
+			if (issuer == i)
+				{
+				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
 				}
-            if (crlnumber == i) {
+
-                ASN1_INTEGER *crlnum;
+			if (hash == i)
-                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
+				{
-                BIO_printf(bio_out, "crlNumber=");
+				BIO_printf(bio_out,"%08lx\n",
-                if (crlnum) {
-                    i2a_ASN1_INTEGER(bio_out, crlnum);
-                    ASN1_INTEGER_free(crlnum);
-                } else
-                    BIO_puts(bio_out, "<NONE>");
-                BIO_printf(bio_out, "\n");
-            }
-            if (hash == i) {
-                BIO_printf(bio_out, "%08lx\n",
 					X509_NAME_hash(X509_CRL_get_issuer(x)));
 				}
-            if (lastupdate == i) {
+			if (lastupdate == i)
-                BIO_printf(bio_out, "lastUpdate=");
+				{
-                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
+				BIO_printf(bio_out,"lastUpdate=");
-                BIO_printf(bio_out, "\n");
+				ASN1_TIME_print(bio_out,
+						X509_CRL_get_lastUpdate(x));
+				BIO_printf(bio_out,"\n");
 				}
-            if (nextupdate == i) {
+			if (nextupdate == i)
-                BIO_printf(bio_out, "nextUpdate=");
+				{
+				BIO_printf(bio_out,"nextUpdate=");
 				if (X509_CRL_get_nextUpdate(x)) 
-                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
+					ASN1_TIME_print(bio_out,
+						X509_CRL_get_nextUpdate(x));
 				else
-                    BIO_printf(bio_out, "NONE");
+					BIO_printf(bio_out,"NONE");
-                BIO_printf(bio_out, "\n");
+				BIO_printf(bio_out,"\n");
 				}
-            if (fingerprint == i) {
+			if (fingerprint == i)
+				{
 				int j;
 				unsigned int n;
 				unsigned char md[EVP_MAX_MD_SIZE];
 
-                if (!X509_CRL_digest(x, digest, md, &n)) {
+				if (!X509_CRL_digest(x,digest,md,&n))
-                    BIO_printf(bio_err, "out of memory\n");
+					{
+					BIO_printf(bio_err,"out of memory\n");
 					goto end;
 					}
-                BIO_printf(bio_out, "%s Fingerprint=",
+				BIO_printf(bio_out,"%s Fingerprint=",
 						OBJ_nid2sn(EVP_MD_type(digest)));
-                for (j = 0; j < (int)n; j++) {
+				for (j=0; j<(int)n; j++)
-                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
+					{
-                               ? '\n' : ':');
+					BIO_printf(bio_out,"%02X%c",md[j],
+						(j+1 == (int)n)
+						?'\n':':');
 					}
 				}
 			}
 		}
 
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if (out == NULL) {
+	if (out == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-    if (text)
+	if (text) X509_CRL_print(out, x);
-        X509_CRL_print(out, x);
 
-    if (noout) {
+	if (noout) 
+		{
 		ret = 0;
 		goto end;
 		}
 
 	if 	(outformat == FORMAT_ASN1)
-        i = (int)i2d_X509_CRL_bio(out, x);
+		i=(int)i2d_X509_CRL_bio(out,x);
 	else if (outformat == FORMAT_PEM)
-        i = PEM_write_bio_X509_CRL(out, x);
+		i=PEM_write_bio_X509_CRL(out,x);
-    else {
+	else	
-        BIO_printf(bio_err, "bad output format specified for outfile\n");
+		{
+		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
-    if (!i) {
+	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
-        BIO_printf(bio_err, "unable to write CRL\n");
+	ret=0;
-        goto end;
+end:
-    }
-    ret = 0;
- end:
 	BIO_free_all(out);
 	BIO_free_all(bio_out);
-    bio_out = NULL;
+	bio_out=NULL;
 	X509_CRL_free(x);
-    if (store) {
+	if(store) {
 		X509_STORE_CTX_cleanup(&ctx);
 		X509_STORE_free(store);
 	}
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static X509_CRL *load_crl(char *infile, int format)
-{
+	{
-    X509_CRL *x = NULL;
+	X509_CRL *x=NULL;
-    BIO *in = NULL;
+	BIO *in=NULL;
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    if (in == NULL) {
+	if (in == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
 	if 	(format == FORMAT_ASN1)
-        x = d2i_X509_CRL_bio(in, NULL);
+		x=d2i_X509_CRL_bio(in,NULL);
 	else if (format == FORMAT_PEM)
-        x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+		x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
 	else	{
-        BIO_printf(bio_err, "bad input format specified for input crl\n");
+		BIO_printf(bio_err,"bad input format specified for input crl\n");
 		goto end;
 		}
-    if (x == NULL) {
+	if (x == NULL)
-        BIO_printf(bio_err, "unable to load CRL\n");
+		{
+		BIO_printf(bio_err,"unable to load CRL\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	
- end:
+end:
 	BIO_free(in);
-    return (x);
+	return(x);
-}
+	}
+

apps/crl2p7.c

@@ -56,11 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-/*
+/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
- * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
+ * and donated 'to the cause' along with lots and lots of other fixes to
- * donated 'to the cause' along with lots and lots of other fixes to the
+ * the library. */
- * library.
- */
 
 #include <stdio.h>
 #include <string.h>
@@ -78,8 +76,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG	crl2pkcs7_main
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -88,149 +85,152 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int i, badops = 0;
+	int i,badops=0;
-    BIO *in = NULL, *out = NULL;
+	BIO *in=NULL,*out=NULL;
-    int informat, outformat;
+	int informat,outformat;
-    char *infile, *outfile, *prog, *certfile;
+	char *infile,*outfile,*prog,*certfile;
 	PKCS7 *p7 = NULL;
 	PKCS7_SIGNED *p7s = NULL;
-    X509_CRL *crl = NULL;
+	X509_CRL *crl=NULL;
-    STACK *certflst = NULL;
+	STACK *certflst=NULL;
-    STACK_OF(X509_CRL) *crl_stack = NULL;
+	STACK_OF(X509_CRL) *crl_stack=NULL;
-    STACK_OF(X509) *cert_stack = NULL;
+	STACK_OF(X509) *cert_stack=NULL;
-    int ret = 1, nocrl = 0;
+	int ret=1,nocrl=0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-nocrl") == 0) {
-            nocrl = 1;
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
-        } else if (strcmp(*argv, "-certfile") == 0) {
-            if (--argc < 1)
-                goto bad;
-            if (!certflst)
-                certflst = sk_new_null();
-            if (!certflst)
-                goto end;
-            if (!sk_push(certflst, *(++argv))) {
-                sk_free(certflst);
-                goto end;
 			}
-        } else {
+		else if (strcmp(*argv,"-outform") == 0)
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+			{
-            badops = 1;
+			if (--argc < 1) goto bad;
+			outformat=str2fmt(*(++argv));
+			}
+		else if (strcmp(*argv,"-in") == 0)
+			{
+			if (--argc < 1) goto bad;
+			infile= *(++argv);
+			}
+		else if (strcmp(*argv,"-nocrl") == 0)
+			{
+			nocrl=1;
+			}
+		else if (strcmp(*argv,"-out") == 0)
+			{
+			if (--argc < 1) goto bad;
+			outfile= *(++argv);
+			}
+		else if (strcmp(*argv,"-certfile") == 0)
+			{
+			if (--argc < 1) goto bad;
+			if(!certflst) certflst = sk_new_null();
+			sk_push(certflst,*(++argv));
+			}
+		else
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-        BIO_printf(bio_err, " -inform arg    input format - DER or PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -outform arg   output format - DER or PEM\n");
+		BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
-        BIO_printf(bio_err, " -in arg        input file\n");
+		BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
-        BIO_printf(bio_err, " -out arg       output file\n");
+		BIO_printf(bio_err," -in arg        input file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -out arg       output file\n");
-                   " -certfile arg  certificates file of chain to a trusted CA\n");
+		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
-        BIO_printf(bio_err, "                (can be used more than once)\n");
+		BIO_printf(bio_err,"                (can be used more than once)\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
-                   " -nocrl         no crl to load, just certs from '-certfile'\n");
 		ret = 1;
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (!nocrl) {
+	if (!nocrl)
+		{
 		if (infile == NULL)
-            BIO_set_fp(in, stdin, BIO_NOCLOSE);
+			BIO_set_fp(in,stdin,BIO_NOCLOSE);
-        else {
+		else
-            if (BIO_read_filename(in, infile) <= 0) {
+			{
+			if (BIO_read_filename(in,infile) <= 0)
+				{
 				perror(infile);
 				goto end;
 				}
 			}
 
 		if 	(informat == FORMAT_ASN1)
-            crl = d2i_X509_CRL_bio(in, NULL);
+			crl=d2i_X509_CRL_bio(in,NULL);
 		else if (informat == FORMAT_PEM)
-            crl = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+			crl=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
 		else	{
-            BIO_printf(bio_err, "bad input format specified for input crl\n");
+			BIO_printf(bio_err,"bad input format specified for input crl\n");
 			goto end;
 			}
-        if (crl == NULL) {
+		if (crl == NULL)
-            BIO_printf(bio_err, "unable to load CRL\n");
+			{
+			BIO_printf(bio_err,"unable to load CRL\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 	
-    if ((p7 = PKCS7_new()) == NULL)
+	if ((p7=PKCS7_new()) == NULL) goto end;
-        goto end;
+	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
-    if ((p7s = PKCS7_SIGNED_new()) == NULL)
+	p7->type=OBJ_nid2obj(NID_pkcs7_signed);
-        goto end;
+	p7->d.sign=p7s;
-    p7->type = OBJ_nid2obj(NID_pkcs7_signed);
+	p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
-    p7->d.sign = p7s;
-    p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
 
-    if (!ASN1_INTEGER_set(p7s->version, 1))
+	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
-        goto end;
+	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
-    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+	p7s->crl=crl_stack;
-        goto end;
+	if (crl != NULL)
-    p7s->crl = crl_stack;
+		{
-    if (crl != NULL) {
+		sk_X509_CRL_push(crl_stack,crl);
-        sk_X509_CRL_push(crl_stack, crl);
+		crl=NULL; /* now part of p7 for OPENSSL_freeing */
-        crl = NULL;             /* now part of p7 for OPENSSL_freeing */
 		}
 
-    if ((cert_stack = sk_X509_new_null()) == NULL)
+	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
-        goto end;
+	p7s->cert=cert_stack;
-    p7s->cert = cert_stack;
 
-    if (certflst)
+	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
-        for (i = 0; i < sk_num(certflst); i++) {
 		certfile = sk_value(certflst, i);
-            if (add_certs_from_file(cert_stack, certfile) < 0) {
+		if (add_certs_from_file(cert_stack,certfile) < 0)
+			{
 			BIO_printf(bio_err, "error loading certificates\n");
 			ERR_print_errors(bio_err);
 			goto end;
@@ -239,50 +239,51 @@ int MAIN(int argc, char **argv)
 
 	sk_free(certflst);
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
 	if 	(outformat == FORMAT_ASN1)
-        i = i2d_PKCS7_bio(out, p7);
+		i=i2d_PKCS7_bio(out,p7);
 	else if (outformat == FORMAT_PEM)
-        i = PEM_write_bio_PKCS7(out, p7);
+		i=PEM_write_bio_PKCS7(out,p7);
 	else	{
-        BIO_printf(bio_err, "bad output format specified for outfile\n");
+		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
-    if (!i) {
+	if (!i)
-        BIO_printf(bio_err, "unable to write pkcs7 object\n");
+		{
+		BIO_printf(bio_err,"unable to write pkcs7 object\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (p7 != NULL) PKCS7_free(p7);
-        BIO_free_all(out);
+	if (crl != NULL) X509_CRL_free(crl);
-    if (p7 != NULL)
-        PKCS7_free(p7);
-    if (crl != NULL)
-        X509_CRL_free(crl);
 
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
-/*-
+/*
  *----------------------------------------------------------------------
  * int add_certs_from_file
  *
@@ -293,49 +294,52 @@ int MAIN(int argc, char **argv)
  *----------------------------------------------------------------------
  */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
-{
+	{
 	struct stat st;
-    BIO *in = NULL;
+	BIO *in=NULL;
-    int count = 0;
+	int count=0;
-    int ret = -1;
+	int ret= -1;
-    STACK_OF(X509_INFO) *sk = NULL;
+	STACK_OF(X509_INFO) *sk=NULL;
 	X509_INFO *xi;
 
-    if ((stat(certfile, &st) != 0)) {
+	if ((stat(certfile,&st) != 0))
-        BIO_printf(bio_err, "unable to load the file, %s\n", certfile);
+		{
+		BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
 		goto end;
 		}
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    if ((in == NULL) || (BIO_read_filename(in, certfile) <= 0)) {
+	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
-        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
+		{
+		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
 		goto end;
 		}
 
 	/* This loads from a file, a stack of x509/crl/pkey sets */
-    sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+	sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
 	if (sk == NULL) {
-        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
+		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
 		goto end;
 	}
 
 	/* scan over it and pull out the CRL's */
-    while (sk_X509_INFO_num(sk)) {
+	while (sk_X509_INFO_num(sk))
-        xi = sk_X509_INFO_shift(sk);
+		{
-        if (xi->x509 != NULL) {
+		xi=sk_X509_INFO_shift(sk);
-            sk_X509_push(stack, xi->x509);
+		if (xi->x509 != NULL)
-            xi->x509 = NULL;
+			{
+			sk_X509_push(stack,xi->x509);
+			xi->x509=NULL;
 			count++;
 			}
 		X509_INFO_free(xi);
 		}
 
-    ret = count;
+	ret=count;
- end:
+end:
  	/* never need to OPENSSL_free x */
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (sk != NULL) sk_X509_INFO_free(sk);
-    if (sk != NULL)
+	return(ret);
-        sk_X509_INFO_free(sk);
+	}
-    return (ret);
+
-}

apps/dgst.c

@@ -76,26 +76,25 @@
 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-          const char *file, BIO *bmd, const char *hmac_key,
+	  const char *file,BIO *bmd,const char *hmac_key, int non_fips_allow);
-          int non_fips_allow);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
-    unsigned char *buf = NULL;
+	unsigned char *buf=NULL;
-    int i, err = 1;
+	int i,err=0;
-    const EVP_MD *md = NULL, *m;
+	const EVP_MD *md=NULL,*m;
-    BIO *in = NULL, *inp;
+	BIO *in=NULL,*inp;
-    BIO *bmd = NULL;
+	BIO *bmd=NULL;
 	BIO *out = NULL;
 	const char *name;
 #define PROG_NAME_SIZE  39
-    char pname[PROG_NAME_SIZE + 1];
+	char pname[PROG_NAME_SIZE+1];
-    int separator = 0;
+	int separator=0;
-    int debug = 0;
+	int debug=0;
-    int keyform = FORMAT_PEM;
+	int keyform=FORMAT_PEM;
 	const char *outfile = NULL, *keyfile = NULL;
 	const char *sigfile = NULL, *randfile = NULL;
 	int out_bin = -1, want_pub = 0, do_verify = 0;
@@ -105,113 +104,125 @@ int MAIN(int argc, char **argv)
 	unsigned int sig_flags = 0;
 	char *passargin = NULL, *passin = NULL;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
-    char *hmac_key = NULL;
+	char *hmac_key=NULL;
 	int non_fips_allow = 0;
 
 	apps_startup();
-    ERR_load_crypto_strings();
+ERR_load_crypto_strings();
-    if ((buf = (unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL) {
+	if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
-        BIO_printf(bio_err, "out of memory\n");
+		{
+		BIO_printf(bio_err,"out of memory\n");
 		goto end;
 		}
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	/* first check the program name */
-    program_name(argv[0], pname, sizeof pname);
+	program_name(argv[0],pname,sizeof pname);
 
-    md = EVP_get_digestbyname(pname);
+	md=EVP_get_digestbyname(pname);
 
 	argc--;
 	argv++;
-    while (argc > 0) {
+	while (argc > 0)
-        if ((*argv)[0] != '-')
+		{
-            break;
+		if ((*argv)[0] != '-') break;
-        if (strcmp(*argv, "-c") == 0)
+		if (strcmp(*argv,"-c") == 0)
-            separator = 1;
+			separator=1;
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) break;
+			randfile=*(++argv);
+			}
+		else if (strcmp(*argv,"-out") == 0)
+			{
+			if (--argc < 1) break;
+			outfile=*(++argv);
+			}
+		else if (strcmp(*argv,"-sign") == 0)
+			{
+			if (--argc < 1) break;
+			keyfile=*(++argv);
+			}
+		else if (!strcmp(*argv,"-passin"))
+			{
 			if (--argc < 1)
 				break;
-            randfile = *(++argv);
+			passargin=*++argv;
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-verify") == 0)
-                break;
+			{
-            outfile = *(++argv);
+			if (--argc < 1) break;
-        } else if (strcmp(*argv, "-sign") == 0) {
+			keyfile=*(++argv);
-            if (--argc < 1)
-                break;
-            keyfile = *(++argv);
-        } else if (!strcmp(*argv, "-passin")) {
-            if (--argc < 1)
-                break;
-            passargin = *++argv;
-        } else if (strcmp(*argv, "-verify") == 0) {
-            if (--argc < 1)
-                break;
-            keyfile = *(++argv);
 			want_pub = 1;
 			do_verify = 1;
-        } else if (strcmp(*argv, "-prverify") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-prverify") == 0)
-                break;
+			{
-            keyfile = *(++argv);
+			if (--argc < 1) break;
+			keyfile=*(++argv);
 			do_verify = 1;
-        } else if (strcmp(*argv, "-x931") == 0)
+			}
+		else if (strcmp(*argv,"-x931") == 0)
 			sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
-        else if (strcmp(*argv, "-pss_saltlen") == 0) {
+		else if (strcmp(*argv,"-pss_saltlen") == 0)
+			{
 			int saltlen;
-            if (--argc < 1)
+			if (--argc < 1) break;
-                break;
+			saltlen=atoi(*(++argv));
-            saltlen = atoi(*(++argv));
 			if (saltlen == -1)
 				sig_flags = EVP_MD_CTX_FLAG_PSS_MREC;
 			else if (saltlen == -2)
 				sig_flags = EVP_MD_CTX_FLAG_PSS_MDLEN;
-            else if (saltlen < -2 || saltlen >= 0xFFFE) {
+			else if (saltlen < -2 || saltlen >= 0xFFFE)
+				{
 				BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
 				goto end;
-            } else
+				}
+			else
 				sig_flags = saltlen;
 			sig_flags <<= 16;
 			sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
-        } else if (strcmp(*argv, "-signature") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-signature") == 0)
-                break;
+			{
-            sigfile = *(++argv);
+			if (--argc < 1) break;
-        } else if (strcmp(*argv, "-keyform") == 0) {
+			sigfile=*(++argv);
-            if (--argc < 1)
+			}
-                break;
+		else if (strcmp(*argv,"-keyform") == 0)
-            keyform = str2fmt(*(++argv));
+			{
+			if (--argc < 1) break;
+			keyform=str2fmt(*(++argv));
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                break;
+			if (--argc < 1) break;
-            engine = *(++argv);
+			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-hex") == 0)
+		else if (strcmp(*argv,"-hex") == 0)
 			out_bin = 0;
-        else if (strcmp(*argv, "-binary") == 0)
+		else if (strcmp(*argv,"-binary") == 0)
 			out_bin = 1;
-        else if (strcmp(*argv, "-d") == 0)
+		else if (strcmp(*argv,"-d") == 0)
-            debug = 1;
+			debug=1;
-        else if (strcmp(*argv, "-non-fips-allow") == 0)
+		else if (strcmp(*argv,"-non-fips-allow") == 0)
-            non_fips_allow = 1;
+			non_fips_allow=1;
-        else if (!strcmp(*argv, "-fips-fingerprint"))
+		else if (!strcmp(*argv,"-hmac"))
-            hmac_key = "etaonrishdlcupfm";
+			{
-        else if (!strcmp(*argv, "-hmac")) {
 			if (--argc < 1)
 				break;
-            hmac_key = *++argv;
+			hmac_key=*++argv;
-        } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+			}
-            md = m;
+		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+			md=m;
 		else
 			break;
 		argc--;
@@ -219,108 +230,101 @@ int MAIN(int argc, char **argv)
 		}
 
 	if (md == NULL)
-        md = EVP_md5();
+		md=EVP_md5();
 
-    if (do_verify && !sigfile) {
+	if(do_verify && !sigfile) {
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
-                   "No signature to verify: use the -signature option\n");
 		err = 1; 
 		goto end;
 	}
 
-    if ((argc > 0) && (argv[0][0] == '-')) { /* bad option */
+	if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
-        BIO_printf(bio_err, "unknown option '%s'\n", *argv);
+		{
-        BIO_printf(bio_err, "options are\n");
+		BIO_printf(bio_err,"unknown option '%s'\n",*argv);
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"options are\n");
-                   "-c              to output the digest with separating colons\n");
+		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
-        BIO_printf(bio_err, "-d              to output debug info\n");
+		BIO_printf(bio_err,"-d              to output debug info\n");
-        BIO_printf(bio_err, "-hex            output as hex dump\n");
+		BIO_printf(bio_err,"-hex            output as hex dump\n");
-        BIO_printf(bio_err, "-binary         output in binary form\n");
+		BIO_printf(bio_err,"-binary         output in binary form\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
-                   "-sign   file    sign digest using private key in file\n");
+		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
-                   "-verify file    verify a signature using public key in file\n");
+		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-signature file signature to verify\n");
-                   "-prverify file  verify a signature using private key in file\n");
+		BIO_printf(bio_err,"-binary         output in binary form\n");
-        BIO_printf(bio_err,
-                   "-keyform arg    key file format (PEM or ENGINE)\n");
-        BIO_printf(bio_err, "-signature file signature to verify\n");
-        BIO_printf(bio_err, "-binary         output in binary form\n");
-        BIO_printf(bio_err, "-hmac key       create hashed MAC with key\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
-                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
 
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm (default)\n",
-                   "-%-14s to use the %s message digest algorithm (default)\n",
+			LN_md5,LN_md5);
-                   LN_md5, LN_md5);
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+			LN_md4,LN_md4);
-                   LN_md4, LN_md4);
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+			LN_md2,LN_md2);
-                   LN_md2, LN_md2);
 #ifndef OPENSSL_NO_SHA
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                   LN_sha1, LN_sha1);
+			LN_sha1,LN_sha1);
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                   LN_sha, LN_sha);
+			LN_sha,LN_sha);
-# ifndef OPENSSL_NO_SHA256
+#ifndef OPENSSL_NO_SHA256
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                   LN_sha224, LN_sha224);
+			LN_sha224,LN_sha224);
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                   LN_sha256, LN_sha256);
+			LN_sha256,LN_sha256);
-# endif
-# ifndef OPENSSL_NO_SHA512
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-                   LN_sha384, LN_sha384);
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-                   LN_sha512, LN_sha512);
-# endif
 #endif
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+#ifndef OPENSSL_NO_SHA512
-                   LN_mdc2, LN_mdc2);
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+			LN_sha384,LN_sha384);
-                   LN_ripemd160, LN_ripemd160);
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-        err = 1;
+			LN_sha512,LN_sha512);
+#endif
+#endif
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
+			LN_mdc2,LN_mdc2);
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
+			LN_ripemd160,LN_ripemd160);
+		err=1;
 		goto end;
 		}
+
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
 #endif
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    bmd = BIO_new(BIO_f_md());
+	bmd=BIO_new(BIO_f_md());
-    if (debug) {
+	if (debug)
-        BIO_set_callback(in, BIO_debug_callback);
+		{
+		BIO_set_callback(in,BIO_debug_callback);
 		/* needed for windows 3.1 */
-        BIO_set_callback_arg(in, (char *)bio_err);
+		BIO_set_callback_arg(in,(char *)bio_err);
 		}
 
-    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+		{
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 		}
 
-    if ((in == NULL) || (bmd == NULL)) {
+	if ((in == NULL) || (bmd == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (out_bin == -1) {
+	if(out_bin == -1) {
-        if (keyfile)
+		if(keyfile) out_bin = 1;
-            out_bin = 1;
+		else out_bin = 0;
-        else
-            out_bin = 0;
 	}
 
-    if (randfile)
+	if(randfile)
 		app_RAND_load_file(randfile, bio_err, 0);
 
-    if (outfile) {
+	if(outfile) {
-        if (out_bin)
+		if(out_bin)
 			out = BIO_new_file(outfile, "wb");
-        else
+		else    out = BIO_new_file(outfile, "w");
-            out = BIO_new_file(outfile, "w");
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -331,192 +335,214 @@ int MAIN(int argc, char **argv)
 #endif
 	}
 
-    if (!out) {
+	if(!out) {
 		BIO_printf(bio_err, "Error opening output file %s\n", 
 					outfile ? outfile : "(stdout)");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-    if (keyfile) {
+	if(keyfile)
+		{
 		if (want_pub)
 			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
 				e, "key file");
 		else
 			sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
 				e, "key file");
-        if (!sigkey) {
+		if (!sigkey)
-            /*
+			{
-             * load_[pub]key() has already printed an appropriate message
+			/* load_[pub]key() has already printed an appropriate
-             */
+			   message */
 			goto end;
 			}
 		}
 
-    if (sigfile && sigkey) {
+	if(sigfile && sigkey) {
 		BIO *sigbio;
 		sigbio = BIO_new_file(sigfile, "rb");
 		siglen = EVP_PKEY_size(sigkey);
 		sigbuf = OPENSSL_malloc(siglen);
-        if (!sigbio) {
+		if(!sigbio) {
-            BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
+			BIO_printf(bio_err, "Error opening signature file %s\n",
+								sigfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 		siglen = BIO_read(sigbio, sigbuf, siglen);
 		BIO_free(sigbio);
-        if (siglen <= 0) {
+		if(siglen <= 0) {
-            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
+			BIO_printf(bio_err, "Error reading signature file %s\n",
+								sigfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 
-    if (non_fips_allow) {
+	if (non_fips_allow)
+		{
 		EVP_MD_CTX *md_ctx;
-        BIO_get_md_ctx(bmd, &md_ctx);
+		BIO_get_md_ctx(bmd,&md_ctx);
 		EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 		}
 
-    if (sig_flags) {
+	if (sig_flags)
+		{
 		EVP_MD_CTX *md_ctx;
-        BIO_get_md_ctx(bmd, &md_ctx);
+		BIO_get_md_ctx(bmd,&md_ctx);
 		EVP_MD_CTX_set_flags(md_ctx, sig_flags);
 		}
 
 	/* we use md as a filter, reading from 'in' */
-    if (!BIO_set_md(bmd, md)) {
+	if (!BIO_set_md(bmd,md))
+		{
 		BIO_printf(bio_err, "Error setting digest %s\n", pname);
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 		
-    inp = BIO_push(bmd, in);
+	inp=BIO_push(bmd,in);
 
-    if (argc == 0) {
+	if (argc == 0)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		{
-        err = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-                    siglen, "", "(stdin)", bmd, hmac_key, non_fips_allow);
+		err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
-    } else {
+			  siglen,"","(stdin)",bmd,hmac_key,non_fips_allow);
-        name = OBJ_nid2sn(md->type);
+		}
-        err = 0;
+	else
-        for (i = 0; i < argc; i++) {
+		{
-            char *tmp, *tofree = NULL;
+		name=OBJ_nid2sn(md->type);
+		for (i=0; i<argc; i++)
+			{
+			char *tmp,*tofree=NULL;
 			int r;
 
-            if (BIO_read_filename(in, argv[i]) <= 0) {
+			if (BIO_read_filename(in,argv[i]) <= 0)
+				{
 				perror(argv[i]);
 				err++;
 				continue;
 				}
-            if (!out_bin) {
+			if(!out_bin)
-                size_t len =
+				{
-                    strlen(name) + strlen(argv[i]) + (hmac_key ? 5 : 0) + 5;
+				size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
-                tmp = tofree = OPENSSL_malloc(len);
+				tmp=tofree=OPENSSL_malloc(len);
-                BIO_snprintf(tmp, len, "%s%s(%s)= ",
+				BIO_snprintf(tmp,len,"%s%s(%s)= ",
-                             hmac_key ? "HMAC-" : "", name, argv[i]);
+							 hmac_key ? "HMAC-" : "",name,argv[i]);
-            } else
+				}
-                tmp = "";
+			else
-            r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+				tmp="";
-                      siglen, tmp, argv[i], bmd, hmac_key, non_fips_allow);
+			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
-            if (r)
+				siglen,tmp,argv[i],bmd,hmac_key,non_fips_allow);
-                err = r;
+			if(r)
-            if (tofree)
+			    err=r;
+			if(tofree)
 				OPENSSL_free(tofree);
 			(void)BIO_reset(bmd);
 			}
 		}
- end:
+end:
-    if (buf != NULL) {
+	if (buf != NULL)
-        OPENSSL_cleanse(buf, BUFSIZE);
+		{
+		OPENSSL_cleanse(buf,BUFSIZE);
 		OPENSSL_free(buf);
 		}
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
 	if (passin)
 		OPENSSL_free(passin);
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
-    if (sigbuf)
+	if(sigbuf) OPENSSL_free(sigbuf);
-        OPENSSL_free(sigbuf);
+	if (bmd != NULL) BIO_free(bmd);
-    if (bmd != NULL)
-        BIO_free(bmd);
 	apps_shutdown();
 	OPENSSL_EXIT(err);
-}
+	}
 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-          const char *file, BIO *bmd, const char *hmac_key,
+	  const char *file,BIO *bmd,const char *hmac_key,int non_fips_allow)
-          int non_fips_allow)
+	{
-{
 	unsigned int len;
 	int i;
 	EVP_MD_CTX *md_ctx;
 	HMAC_CTX hmac_ctx;
 
-    if (hmac_key) {
+	if (hmac_key)
+		{
 		EVP_MD *md;
 
-        BIO_get_md(bmd, &md);
+		BIO_get_md(bmd,&md);
 		HMAC_CTX_init(&hmac_ctx);
-        HMAC_Init_ex(&hmac_ctx, hmac_key, strlen(hmac_key), md, NULL);
+		HMAC_Init_ex(&hmac_ctx,hmac_key,strlen(hmac_key),md, NULL);
-        BIO_get_md_ctx(bmd, &md_ctx);
+		BIO_get_md_ctx(bmd,&md_ctx);
-        BIO_set_md_ctx(bmd, &hmac_ctx.md_ctx);
+		BIO_set_md_ctx(bmd,&hmac_ctx.md_ctx);
 		}
-    for (;;) {
+	for (;;)
-        i = BIO_read(bp, (char *)buf, BUFSIZE);
+		{
-        if (i < 0) {
+		i=BIO_read(bp,(char *)buf,BUFSIZE);
-            BIO_printf(bio_err, "Read Error in %s\n", file);
+		if(i < 0)
+			{
+			BIO_printf(bio_err, "Read Error in %s\n",file);
 			ERR_print_errors(bio_err);
 			return 1;
 			}
-        if (i == 0)
+		if (i == 0) break;
-            break;
 		}
-    if (sigin) {
+	if(sigin)
+		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
 		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
-        if (i > 0)
+		if(i > 0)
 			BIO_printf(out, "Verified OK\n");
-        else if (i == 0) {
+		else if(i == 0)
+			{
 			BIO_printf(out, "Verification Failure\n");
 			return 1;
-        } else {
+			}
+		else
+			{
 			BIO_printf(bio_err, "Error Verifying Data\n");
 			ERR_print_errors(bio_err);
 			return 1;
 			}
 		return 0;
 		}
-    if (key) {
+	if(key)
+		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
-        if (!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) {
+		if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) 
+			{
 			BIO_printf(bio_err, "Error Signing Data\n");
 			ERR_print_errors(bio_err);
 			return 1;
 			}
-    } else if (hmac_key) {
+		}
-        HMAC_Final(&hmac_ctx, buf, &len);
+	else if(hmac_key)
+		{
+		HMAC_Final(&hmac_ctx,buf,&len);
 		HMAC_CTX_cleanup(&hmac_ctx);
-    } else
+		}
-        len = BIO_gets(bp, (char *)buf, BUFSIZE);
+	else
+		len=BIO_gets(bp,(char *)buf,BUFSIZE);
 
-    if (binout)
+	if(binout) BIO_write(out, buf, len);
-        BIO_write(out, buf, len);
+	else 
-    else {
+		{
-        BIO_write(out, title, strlen(title));
+		BIO_write(out,title,strlen(title));
-        for (i = 0; i < (int)len; i++) {
+		for (i=0; i<(int)len; i++)
+			{
 			if (sep && (i != 0))
 				BIO_printf(out, ":");
-            BIO_printf(out, "%02x", buf[i]);
+			BIO_printf(out, "%02x",buf[i]);
 			}
 		BIO_printf(out, "\n");
 		}
-    if (hmac_key) {
+	if (hmac_key)
-        BIO_set_md_ctx(bmd, md_ctx);
+		{
+		BIO_set_md_ctx(bmd,md_ctx);
 		}
 	return 0;
-}
+	}
+

apps/dh.c

@@ -59,23 +59,22 @@
 
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <time.h>
+#include <time.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dh.h>
+#include <openssl/dh.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# undef PROG
+#undef PROG
-# define PROG    dh_main
+#define PROG	dh_main
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -88,164 +87,184 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    DH *dh = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    int i, badops = 0, text = 0;
+	ENGINE *e = NULL;
-    BIO *in = NULL, *out = NULL;
+#endif
-    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
+	DH *dh=NULL;
-    char *infile, *outfile, *prog;
+	int i,badops=0,text=0;
-# ifndef OPENSSL_NO_ENGINE
+	BIO *in=NULL,*out=NULL;
+	int informat,outformat,check=0,noout=0,C=0,ret=1;
+	char *infile,*outfile,*prog;
+#ifndef OPENSSL_NO_ENGINE
 	char *engine;
-# endif
+#endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    engine = NULL;
+	engine=NULL;
-# endif
+#endif
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-outform") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outformat=str2fmt(*(++argv));
-            engine = *(++argv);
 			}
-# endif
+		else if (strcmp(*argv,"-in") == 0)
-        else if (strcmp(*argv, "-check") == 0)
+			{
-            check = 1;
+			if (--argc < 1) goto bad;
-        else if (strcmp(*argv, "-text") == 0)
+			infile= *(++argv);
-            text = 1;
+			}
-        else if (strcmp(*argv, "-C") == 0)
+		else if (strcmp(*argv,"-out") == 0)
-            C = 1;
+			{
-        else if (strcmp(*argv, "-noout") == 0)
+			if (--argc < 1) goto bad;
-            noout = 1;
+			outfile= *(++argv);
-        else {
+			}
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+#ifndef OPENSSL_NO_ENGINE
-            badops = 1;
+		else if (strcmp(*argv,"-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+#endif
+		else if (strcmp(*argv,"-check") == 0)
+			check=1;
+		else if (strcmp(*argv,"-text") == 0)
+			text=1;
+		else if (strcmp(*argv,"-C") == 0)
+			C=1;
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
-                   " -outform arg  output format - one of DER PEM\n");
+		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
-        BIO_printf(bio_err, " -in arg       input file\n");
+		BIO_printf(bio_err," -in arg       input file\n");
-        BIO_printf(bio_err, " -out arg      output file\n");
+		BIO_printf(bio_err," -out arg      output file\n");
-        BIO_printf(bio_err, " -check        check the DH parameters\n");
+		BIO_printf(bio_err," -check        check the DH parameters\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
-                   " -text         print a text form of the DH parameters\n");
+		BIO_printf(bio_err," -C            Output C code\n");
-        BIO_printf(bio_err, " -C            Output C code\n");
+		BIO_printf(bio_err," -noout        no output\n");
-        BIO_printf(bio_err, " -noout        no output\n");
+#ifndef OPENSSL_NO_ENGINE
-# ifndef OPENSSL_NO_ENGINE
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-        BIO_printf(bio_err,
+#endif
-                   " -engine e     use engine e, possibly a hardware device.\n");
-# endif
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
 	if	(informat == FORMAT_ASN1)
-        dh = d2i_DHparams_bio(in, NULL);
+		dh=d2i_DHparams_bio(in,NULL);
 	else if (informat == FORMAT_PEM)
-        dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
+		dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
-    else {
+	else
-        BIO_printf(bio_err, "bad input format specified\n");
+		{
+		BIO_printf(bio_err,"bad input format specified\n");
 		goto end;
 		}
-    if (dh == NULL) {
+	if (dh == NULL)
-        BIO_printf(bio_err, "unable to load DH parameters\n");
+		{
+		BIO_printf(bio_err,"unable to load DH parameters\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (text) {
+	
-        DHparams_print(out, dh);
+
-# ifdef undef
+	if (text)
+		{
+		DHparams_print(out,dh);
+#ifdef undef
 		printf("p=");
-        BN_print(stdout, dh->p);
+		BN_print(stdout,dh->p);
 		printf("\ng=");
-        BN_print(stdout, dh->g);
+		BN_print(stdout,dh->g);
 		printf("\n");
 		if (dh->length != 0)
-            printf("recommended private length=%ld\n", dh->length);
+			printf("recommended private length=%ld\n",dh->length);
-# endif
+#endif
 		}
 	
-    if (check) {
+	if (check)
-        if (!DH_check(dh, &i)) {
+		{
+		if (!DH_check(dh,&i))
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
@@ -260,72 +279,74 @@ int MAIN(int argc, char **argv)
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
-    if (C) {
+	if (C)
+		{
 		unsigned char *data;
-        int len, l, bits;
+		int len,l,bits;
 
-        len = BN_num_bytes(dh->p);
+		len=BN_num_bytes(dh->p);
-        bits = BN_num_bits(dh->p);
+		bits=BN_num_bits(dh->p);
-        data = (unsigned char *)OPENSSL_malloc(len);
+		data=(unsigned char *)OPENSSL_malloc(len);
-        if (data == NULL) {
+		if (data == NULL)
+			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
-        l = BN_bn2bin(dh->p, data);
+		l=BN_bn2bin(dh->p,data);
-        printf("static unsigned char dh%d_p[]={", bits);
+		printf("static unsigned char dh%d_p[]={",bits);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 
-        l = BN_bn2bin(dh->g, data);
+		l=BN_bn2bin(dh->g,data);
-        printf("static unsigned char dh%d_g[]={", bits);
+		printf("static unsigned char dh%d_g[]={",bits);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
 
-        printf("DH *get_dh%d()\n\t{\n", bits);
+		printf("DH *get_dh%d()\n\t{\n",bits);
 		printf("\tDH *dh;\n\n");
 		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
 		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
-               bits, bits);
+			bits,bits);
 		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
-               bits, bits);
+			bits,bits);
 		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 		printf("\t\treturn(NULL);\n");
 		printf("\treturn(dh);\n\t}\n");
 		OPENSSL_free(data);
 		}
 
-    if (!noout) {
+
+	if (!noout)
+		{
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_DHparams_bio(out, dh);
+			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_DHparams(out, dh);
+			i=PEM_write_bio_DHparams(out,dh);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
-        if (!i) {
+		if (!i)
-            BIO_printf(bio_err, "unable to write DH parameters\n");
+			{
+			BIO_printf(bio_err,"unable to write DH parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dh != NULL) DH_free(dh);
-        BIO_free_all(out);
-    if (dh != NULL)
-        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 #endif

apps/dhparam.c

@@ -111,29 +111,28 @@
 
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <time.h>
+#include <time.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dh.h>
+#include <openssl/dh.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
-#  include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# endif
+#endif
 
-# undef PROG
+#undef PROG
-# define PROG    dhparam_main
+#define PROG	dhparam_main
 
-# define DEFBITS 512
+#define DEFBITS	512
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -149,191 +148,194 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    DH *dh = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    int i, badops = 0, text = 0;
+	ENGINE *e = NULL;
-# ifndef OPENSSL_NO_DSA
+#endif
-    int dsaparam = 0;
+	DH *dh=NULL;
-# endif
+	int i,badops=0,text=0;
-    BIO *in = NULL, *out = NULL;
+#ifndef OPENSSL_NO_DSA
-    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
+	int dsaparam=0;
-    char *infile, *outfile, *prog;
+#endif
-    char *inrand = NULL;
+	BIO *in=NULL,*out=NULL;
-# ifndef OPENSSL_NO_ENGINE
+	int informat,outformat,check=0,noout=0,C=0,ret=1;
-    char *engine = NULL;
+	char *infile,*outfile,*prog;
-# endif
+	char *inrand=NULL;
+#ifndef OPENSSL_NO_ENGINE
+	char *engine=NULL;
+#endif
 	int num = 0, g = 0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-outform") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outformat=str2fmt(*(++argv));
-            engine = *(++argv);
 			}
-# endif
+		else if (strcmp(*argv,"-in") == 0)
-        else if (strcmp(*argv, "-check") == 0)
+			{
-            check = 1;
+			if (--argc < 1) goto bad;
-        else if (strcmp(*argv, "-text") == 0)
+			infile= *(++argv);
-            text = 1;
+			}
-# ifndef OPENSSL_NO_DSA
+		else if (strcmp(*argv,"-out") == 0)
-        else if (strcmp(*argv, "-dsaparam") == 0)
+			{
-            dsaparam = 1;
+			if (--argc < 1) goto bad;
-# endif
+			outfile= *(++argv);
-        else if (strcmp(*argv, "-C") == 0)
+			}
-            C = 1;
+#ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-noout") == 0)
+		else if (strcmp(*argv,"-engine") == 0)
-            noout = 1;
+			{
-        else if (strcmp(*argv, "-2") == 0)
+			if (--argc < 1) goto bad;
-            g = 2;
+			engine= *(++argv);
-        else if (strcmp(*argv, "-5") == 0)
+			}
-            g = 5;
+#endif
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-check") == 0)
-            if (--argc < 1)
+			check=1;
-                goto bad;
+		else if (strcmp(*argv,"-text") == 0)
-            inrand = *(++argv);
+			text=1;
-        } else if (((sscanf(*argv, "%d", &num) == 0) || (num <= 0)))
+#ifndef OPENSSL_NO_DSA
+		else if (strcmp(*argv,"-dsaparam") == 0)
+			dsaparam=1;
+#endif
+		else if (strcmp(*argv,"-C") == 0)
+			C=1;
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else if (strcmp(*argv,"-2") == 0)
+			g=2;
+		else if (strcmp(*argv,"-5") == 0)
+			g=5;
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) goto bad;
+			inrand= *(++argv);
+			}
+		else if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0)))
 			goto bad;
 		argv++;
 		argc--;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] [numbits]\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] [numbits]\n",prog);
-        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
-                   " -outform arg  output format - one of DER PEM\n");
+		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
-        BIO_printf(bio_err, " -in arg       input file\n");
+		BIO_printf(bio_err," -in arg       input file\n");
-        BIO_printf(bio_err, " -out arg      output file\n");
+		BIO_printf(bio_err," -out arg      output file\n");
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
-                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
+#endif
-# endif
+		BIO_printf(bio_err," -check        check the DH parameters\n");
-        BIO_printf(bio_err, " -check        check the DH parameters\n");
+		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -C            Output C code\n");
-                   " -text         print a text form of the DH parameters\n");
+		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
-        BIO_printf(bio_err, " -C            Output C code\n");
+		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
-                   " -2            generate parameters using  2 as the generator value\n");
+#ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-                   " -5            generate parameters using  5 as the generator value\n");
+#endif
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   " numbits       number of bits in to generate (default 512)\n");
+		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
-# ifndef OPENSSL_NO_ENGINE
+		BIO_printf(bio_err,"               the random number generator\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -noout        no output\n");
-                   " -engine e     use engine e, possibly a hardware device.\n");
-# endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-                   LIST_SEPARATOR_CHAR);
-        BIO_printf(bio_err,
-                   "               - load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err, "               the random number generator\n");
-        BIO_printf(bio_err, " -noout        no output\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
 	if (g && !num)
 		num = DEFBITS;
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
-    if (dsaparam) {
+	if (dsaparam)
-        if (g) {
+		{
-            BIO_printf(bio_err,
+		if (g)
-                       "generator may not be chosen for DSA parameters\n");
+			{
+			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
 			goto end;
 			}
-    } else
+		}
-# endif
+	else
+#endif
 		{
 		/* DH parameters */
 		if (num && !g)
 			g = 2;
 		}
 
-    if (num) {
+	if(num) {
 
 		BN_GENCB cb;
 		BN_GENCB_set(&cb, dh_cb, bio_err);
-        if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-            BIO_printf(bio_err,
+			{
-                       "warning, not much extra random data, consider using the -rand option\n");
+			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 			}
 		if (inrand != NULL)
-            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
-        if (dsaparam) {
+		if (dsaparam)
+			{
 			DSA *dsa = DSA_new();
 			
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-                       "Generating DSA parameters, %d bit long prime\n", num);
+			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
-            if (!dsa
+						NULL, 0, NULL, NULL, &cb))
-                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
+				{
-                                               &cb)) {
+				if(dsa) DSA_free(dsa);
-                if (dsa)
-                    DSA_free(dsa);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 
 			dh = DSA_dup_DH(dsa);
 			DSA_free(dsa);
-            if (dh == NULL) {
+			if (dh == NULL)
+				{
 				ERR_print_errors(bio_err);
 				goto end;
 				}
-        } else
+			}
-# endif
+		else
+#endif
 			{
 			dh = DH_new();
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
-                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
+			BIO_printf(bio_err,"This is going to take a long time\n");
-                       num, g);
+			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
-            BIO_printf(bio_err, "This is going to take a long time\n");
+				{
-            if (!dh || !DH_generate_parameters_ex(dh, num, g, &cb)) {
+				if(dh) DH_free(dh);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -342,55 +344,65 @@ int MAIN(int argc, char **argv)
 		app_RAND_write_file(NULL, bio_err);
 	} else {
 
-        in = BIO_new(BIO_s_file());
+		in=BIO_new(BIO_s_file());
-        if (in == NULL) {
+		if (in == NULL)
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		if (infile == NULL)
-            BIO_set_fp(in, stdin, BIO_NOCLOSE);
+			BIO_set_fp(in,stdin,BIO_NOCLOSE);
-        else {
+		else
-            if (BIO_read_filename(in, infile) <= 0) {
+			{
+			if (BIO_read_filename(in,infile) <= 0)
+				{
 				perror(infile);
 				goto end;
 				}
 			}
 
-        if (informat != FORMAT_ASN1 && informat != FORMAT_PEM) {
+		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
-            BIO_printf(bio_err, "bad input format specified\n");
+			{
+			BIO_printf(bio_err,"bad input format specified\n");
 			goto end;
 			}
-# ifndef OPENSSL_NO_DSA
+
-        if (dsaparam) {
+#ifndef OPENSSL_NO_DSA
+		if (dsaparam)
+			{
 			DSA *dsa;
 			
 			if (informat == FORMAT_ASN1)
-                dsa = d2i_DSAparams_bio(in, NULL);
+				dsa=d2i_DSAparams_bio(in,NULL);
 			else /* informat == FORMAT_PEM */
-                dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
+				dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
 			
-            if (dsa == NULL) {
+			if (dsa == NULL)
-                BIO_printf(bio_err, "unable to load DSA parameters\n");
+				{
+				BIO_printf(bio_err,"unable to load DSA parameters\n");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			
 			dh = DSA_dup_DH(dsa);
 			DSA_free(dsa);
-            if (dh == NULL) {
+			if (dh == NULL)
+				{
 				ERR_print_errors(bio_err);
 				goto end;
 				}
-        } else
+			}
-# endif
+		else
+#endif
 			{
 			if (informat == FORMAT_ASN1)
-                dh = d2i_DHparams_bio(in, NULL);
+				dh=d2i_DHparams_bio(in,NULL);
 			else /* informat == FORMAT_PEM */
-                dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
+				dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
 			
-            if (dh == NULL) {
+			if (dh == NULL)
-                BIO_printf(bio_err, "unable to load DH parameters\n");
+				{
+				BIO_printf(bio_err,"unable to load DH parameters\n");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -399,32 +411,41 @@ int MAIN(int argc, char **argv)
 		/* dh != NULL */
 	}
 	
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if (out == NULL) {
+	if (out == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-    if (text) {
+
-        DHparams_print(out, dh);
+	if (text)
+		{
+		DHparams_print(out,dh);
 		}
 	
-    if (check) {
+	if (check)
-        if (!DH_check(dh, &i)) {
+		{
+		if (!DH_check(dh,&i))
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
@@ -439,45 +460,48 @@ int MAIN(int argc, char **argv)
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
-    if (C) {
+	if (C)
+		{
 		unsigned char *data;
-        int len, l, bits;
+		int len,l,bits;
 
-        len = BN_num_bytes(dh->p);
+		len=BN_num_bytes(dh->p);
-        bits = BN_num_bits(dh->p);
+		bits=BN_num_bits(dh->p);
-        data = (unsigned char *)OPENSSL_malloc(len);
+		data=(unsigned char *)OPENSSL_malloc(len);
-        if (data == NULL) {
+		if (data == NULL)
+			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
 		printf("#ifndef HEADER_DH_H\n"
-               "#include <openssl/dh.h>\n" "#endif\n");
+		       "#include <openssl/dh.h>\n"
-        printf("DH *get_dh%d()\n\t{\n", bits);
+		       "#endif\n");
+		printf("DH *get_dh%d()\n\t{\n",bits);
 
-        l = BN_bn2bin(dh->p, data);
+		l=BN_bn2bin(dh->p,data);
-        printf("\tstatic unsigned char dh%d_p[]={", bits);
+		printf("\tstatic unsigned char dh%d_p[]={",bits);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t\t");
+			if ((i%12) == 0) printf("\n\t\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t\t};\n");
 
-        l = BN_bn2bin(dh->g, data);
+		l=BN_bn2bin(dh->g,data);
-        printf("\tstatic unsigned char dh%d_g[]={", bits);
+		printf("\tstatic unsigned char dh%d_g[]={",bits);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t\t");
+			if ((i%12) == 0) printf("\n\t\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t\t};\n");
 
 		printf("\tDH *dh;\n\n");
 		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
 		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
-               bits, bits);
+			bits,bits);
 		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
-               bits, bits);
+			bits,bits);
 		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 		printf("\t\t{ DH_free(dh); return(NULL); }\n");
 		if (dh->length)
@@ -486,52 +510,48 @@ int MAIN(int argc, char **argv)
 		OPENSSL_free(data);
 		}
 
-    if (!noout) {
+
+	if (!noout)
+		{
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_DHparams_bio(out, dh);
+			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_DHparams(out, dh);
+			i=PEM_write_bio_DHparams(out,dh);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
-        if (!i) {
+		if (!i)
-            BIO_printf(bio_err, "unable to write DH parameters\n");
+			{
+			BIO_printf(bio_err,"unable to write DH parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dh != NULL) DH_free(dh);
-        BIO_free_all(out);
-    if (dh != NULL)
-        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-{
+	{
-    char c = '*';
+	char c='*';
 
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write(cb->arg,&c,1);
-        c = '*';
-    if (p == 3)
-        c = '\n';
-    BIO_write(cb->arg, &c, 1);
 	(void)BIO_flush(cb->arg);
-# ifdef LINT
+#ifdef LINT
-    p = n;
+	p=n;
-# endif
+#endif
 	return 1;
-}
+	}
 
 #endif

apps/dsa.c

@@ -58,24 +58,23 @@
 
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <string.h>
+#include <string.h>
-# include <time.h>
+#include <time.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/evp.h>
+#include <openssl/dsa.h>
-# include <openssl/x509.h>
+#include <openssl/evp.h>
-# include <openssl/pem.h>
+#include <openssl/x509.h>
-# include <openssl/bn.h>
+#include <openssl/pem.h>
-# include <openssl/dsa.h>
+#include <openssl/bn.h>
 
-# undef PROG
+#undef PROG
-# define PROG    dsa_main
+#define PROG	dsa_main
 
-/*-
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
- * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -96,239 +95,251 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
+#ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
-    int ret = 1;
+#endif
-    DSA *dsa = NULL;
+	int ret=1;
-    int i, badops = 0;
+	DSA *dsa=NULL;
-    const EVP_CIPHER *enc = NULL;
+	int i,badops=0;
-    BIO *in = NULL, *out = NULL;
+	const EVP_CIPHER *enc=NULL;
-    int informat, outformat, text = 0, noout = 0;
+	BIO *in=NULL,*out=NULL;
+	int informat,outformat,text=0,noout=0;
 	int pubin = 0, pubout = 0;
-    char *infile, *outfile, *prog;
+	char *infile,*outfile,*prog;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 	char *engine;
-# endif
+#endif
 	char *passargin = NULL, *passargout = NULL;
 	char *passin = NULL, *passout = NULL;
-    int modulus = 0;
+	int modulus=0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    engine = NULL;
+	engine=NULL;
-# endif
+#endif
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
-        } else if (strcmp(*argv, "-passin") == 0) {
-            if (--argc < 1)
-                goto bad;
-            passargin = *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
-            if (--argc < 1)
-                goto bad;
-            passargout = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-outform") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outformat=str2fmt(*(++argv));
-            engine = *(++argv);
 			}
-# endif
+		else if (strcmp(*argv,"-in") == 0)
-        else if (strcmp(*argv, "-noout") == 0)
+			{
-            noout = 1;
+			if (--argc < 1) goto bad;
-        else if (strcmp(*argv, "-text") == 0)
+			infile= *(++argv);
-            text = 1;
+			}
-        else if (strcmp(*argv, "-modulus") == 0)
+		else if (strcmp(*argv,"-out") == 0)
-            modulus = 1;
+			{
-        else if (strcmp(*argv, "-pubin") == 0)
+			if (--argc < 1) goto bad;
-            pubin = 1;
+			outfile= *(++argv);
-        else if (strcmp(*argv, "-pubout") == 0)
+			}
-            pubout = 1;
+		else if (strcmp(*argv,"-passin") == 0)
-        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
+			{
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+			if (--argc < 1) goto bad;
-            badops = 1;
+			passargin= *(++argv);
+			}
+		else if (strcmp(*argv,"-passout") == 0)
+			{
+			if (--argc < 1) goto bad;
+			passargout= *(++argv);
+			}
+#ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+#endif
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else if (strcmp(*argv,"-text") == 0)
+			text=1;
+		else if (strcmp(*argv,"-modulus") == 0)
+			modulus=1;
+		else if (strcmp(*argv,"-pubin") == 0)
+			pubin=1;
+		else if (strcmp(*argv,"-pubout") == 0)
+			pubout=1;
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-        BIO_printf(bio_err, " -inform arg     input format - DER or PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
+		BIO_printf(bio_err," -inform arg     input format - DER or PEM\n");
-        BIO_printf(bio_err, " -in arg         input file\n");
+		BIO_printf(bio_err," -outform arg    output format - DER or PEM\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -in arg         input file\n");
-                   " -passin arg     input file pass phrase source\n");
+		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
-        BIO_printf(bio_err, " -out arg        output file\n");
+		BIO_printf(bio_err," -out arg        output file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-                   " -passout arg    output file pass phrase source\n");
+#ifndef OPENSSL_NO_ENGINE
-# ifndef OPENSSL_NO_ENGINE
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
-        BIO_printf(bio_err,
+#endif
-                   " -engine e       use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
-# endif
+		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_IDEA
-                   " -des            encrypt PEM output with cbc des\n");
+		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
-        BIO_printf(bio_err,
+#endif
-                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+#ifndef OPENSSL_NO_AES
-# ifndef OPENSSL_NO_IDEA
+		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
-                   " -idea           encrypt PEM output with cbc idea\n");
+#endif
-# endif
+#ifndef OPENSSL_NO_CAMELLIA
-# ifndef OPENSSL_NO_AES
+		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
-        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
-        BIO_printf(bio_err,
+#endif
-                   "                 encrypt PEM output with cbc aes\n");
+#ifndef OPENSSL_NO_SEED
-# endif
+		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
-# ifndef OPENSSL_NO_CAMELLIA
+#endif
-        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+		BIO_printf(bio_err," -text           print the key in text\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -noout          don't print key out\n");
-                   "                 encrypt PEM output with cbc camellia\n");
+		BIO_printf(bio_err," -modulus        print the DSA public value\n");
-# endif
-# ifndef OPENSSL_NO_SEED
-        BIO_printf(bio_err,
-                   " -seed           encrypt PEM output with cbc seed\n");
-# endif
-        BIO_printf(bio_err, " -text           print the key in text\n");
-        BIO_printf(bio_err, " -noout          don't print key out\n");
-        BIO_printf(bio_err, " -modulus        print the DSA public value\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
 		goto end;
 	}
 
-    out = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    if (out == NULL) {
+	out=BIO_new(BIO_s_file());
-        ERR_print_errors(bio_err);
+	if ((in == NULL) || (out == NULL))
-        goto end;
-    }
-
-    BIO_printf(bio_err, "read DSA key\n");
 		{
-        EVP_PKEY *pkey;
-        if (pubin)
-            pkey = load_pubkey(bio_err, infile, informat, 1,
-                               passin, e, "Public Key");
-        else
-            pkey = load_key(bio_err, infile, informat, 1,
-                            passin, e, "Private Key");
-
-        if (pkey != NULL)
-            dsa = pkey == NULL ? NULL : EVP_PKEY_get1_DSA(pkey);
-        EVP_PKEY_free(pkey);
-    }
-    if (dsa == NULL) {
-        BIO_printf(bio_err, "unable to load Key\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (infile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-# ifdef OPENSSL_SYS_VMS
+	else
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
+			perror(infile);
+			goto end;
+			}
+		}
+
+	BIO_printf(bio_err,"read DSA key\n");
+	if	(informat == FORMAT_ASN1) {
+		if(pubin) dsa=d2i_DSA_PUBKEY_bio(in,NULL);
+		else dsa=d2i_DSAPrivateKey_bio(in,NULL);
+	} else if (informat == FORMAT_PEM) {
+		if(pubin) dsa=PEM_read_bio_DSA_PUBKEY(in,NULL, NULL, NULL);
+		else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,passin);
+	} else
+		{
+		BIO_printf(bio_err,"bad input format specified for key\n");
+		goto end;
+		}
+	if (dsa == NULL)
+		{
+		BIO_printf(bio_err,"unable to load Key\n");
+		ERR_print_errors(bio_err);
+		goto end;
+		}
+
+	if (outfile == NULL)
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
 	if (text) 
-        if (!DSA_print(out, dsa, 0)) {
+		if (!DSA_print(out,dsa,0))
+			{
 			perror(outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 
-    if (modulus) {
+	if (modulus)
-        fprintf(stdout, "Public Key=");
+		{
-        BN_print(out, dsa->pub_key);
+		fprintf(stdout,"Public Key=");
-        fprintf(stdout, "\n");
+		BN_print(out,dsa->pub_key);
+		fprintf(stdout,"\n");
 		}
 
-    if (noout)
+	if (noout) goto end;
-        goto end;
+	BIO_printf(bio_err,"writing DSA key\n");
-    BIO_printf(bio_err, "writing DSA key\n");
 	if 	(outformat == FORMAT_ASN1) {
-        if (pubin || pubout)
+		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
-            i = i2d_DSA_PUBKEY_bio(out, dsa);
+		else i=i2d_DSAPrivateKey_bio(out,dsa);
-        else
-            i = i2d_DSAPrivateKey_bio(out, dsa);
 	} else if (outformat == FORMAT_PEM) {
-        if (pubin || pubout)
+		if(pubin || pubout)
-            i = PEM_write_bio_DSA_PUBKEY(out, dsa);
+			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
-        else
+		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
-            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
+							NULL,0,NULL, passout);
-                                            NULL, 0, NULL, passout);
 	} else {
-        BIO_printf(bio_err, "bad output format specified for outfile\n");
+		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
-    if (!i) {
+	if (!i)
-        BIO_printf(bio_err, "unable to write private key\n");
+		{
+		BIO_printf(bio_err,"unable to write private key\n");
 		ERR_print_errors(bio_err);
-    } else
+		}
-        ret = 0;
+	else
- end:
+		ret=0;
-    if (in != NULL)
+end:
-        BIO_free(in);
+	if(in != NULL) BIO_free(in);
-    if (out != NULL)
+	if(out != NULL) BIO_free_all(out);
-        BIO_free_all(out);
+	if(dsa != NULL) DSA_free(dsa);
-    if (dsa != NULL)
+	if(passin) OPENSSL_free(passin);
-        DSA_free(dsa);
+	if(passout) OPENSSL_free(passout);
-    if (passin)
-        OPENSSL_free(passin);
-    if (passout)
-        OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 #endif

apps/dsaparam.c

@@ -57,33 +57,30 @@
  */
 
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
-/*
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
- * deprecated functions for openssl-internal code
- */
 #ifdef OPENSSL_NO_DEPRECATED
-# undef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DSA
-# include <assert.h>
+#include <assert.h>
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <time.h>
+#include <time.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# undef PROG
+#undef PROG
-# define PROG    dsaparam_main
+#define PROG	dsaparam_main
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -97,368 +94,385 @@
  *  #endif
  */
 
-# ifdef GENCB_TEST
+#ifdef GENCB_TEST
 
 static int stop_keygen_flag = 0;
 
 static void timebomb_sigalarm(int foo)
-{
+	{
 	stop_keygen_flag = 1;
-}
+	}
 
-# endif
+#endif
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    DSA *dsa = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    int i, badops = 0, text = 0;
+	ENGINE *e = NULL;
-    BIO *in = NULL, *out = NULL;
+#endif
-    int informat, outformat, noout = 0, C = 0, ret = 1;
+	DSA *dsa=NULL;
-    char *infile, *outfile, *prog, *inrand = NULL;
+	int i,badops=0,text=0;
-    int numbits = -1, num, genkey = 0;
+	BIO *in=NULL,*out=NULL;
-    int need_rand = 0;
+	int informat,outformat,noout=0,C=0,ret=1;
-# ifndef OPENSSL_NO_ENGINE
+	char *infile,*outfile,*prog,*inrand=NULL;
-    char *engine = NULL;
+	int numbits= -1,num,genkey=0;
-# endif
+	int need_rand=0;
-# ifdef GENCB_TEST
+#ifndef OPENSSL_NO_ENGINE
-    int timebomb = 0;
+	char *engine=NULL;
-# endif
+#endif
+#ifdef GENCB_TEST
+	int timebomb=0;
+#endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-outform") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outformat=str2fmt(*(++argv));
+			}
+		else if (strcmp(*argv,"-in") == 0)
+			{
+			if (--argc < 1) goto bad;
+			infile= *(++argv);
+			}
+		else if (strcmp(*argv,"-out") == 0)
+			{
+			if (--argc < 1) goto bad;
+			outfile= *(++argv);
+			}
+#ifndef OPENSSL_NO_ENGINE
+		else if(strcmp(*argv, "-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
 			engine = *(++argv);
 			}
-# endif
+#endif
-# ifdef GENCB_TEST
+#ifdef GENCB_TEST
-        else if (strcmp(*argv, "-timebomb") == 0) {
+		else if(strcmp(*argv, "-timebomb") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			timebomb = atoi(*(++argv));
 			}
-# endif
+#endif
-        else if (strcmp(*argv, "-text") == 0)
+		else if (strcmp(*argv,"-text") == 0)
-            text = 1;
+			text=1;
-        else if (strcmp(*argv, "-C") == 0)
+		else if (strcmp(*argv,"-C") == 0)
-            C = 1;
+			C=1;
-        else if (strcmp(*argv, "-genkey") == 0) {
+		else if (strcmp(*argv,"-genkey") == 0)
-            genkey = 1;
+			{
-            need_rand = 1;
+			genkey=1;
-        } else if (strcmp(*argv, "-rand") == 0) {
+			need_rand=1;
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-rand") == 0)
-            inrand = *(++argv);
+			{
-            need_rand = 1;
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-noout") == 0)
+			inrand= *(++argv);
-            noout = 1;
+			need_rand=1;
-        else if (sscanf(*argv, "%d", &num) == 1) {
+			}
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else if (sscanf(*argv,"%d",&num) == 1)
+			{
 			/* generate a key */
-            numbits = num;
+			numbits=num;
-            need_rand = 1;
+			need_rand=1;
-        } else {
+			}
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+		else
-            badops = 1;
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] [bits] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
-        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
+		BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
-        BIO_printf(bio_err, " -in arg       input file\n");
+		BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
-        BIO_printf(bio_err, " -out arg      output file\n");
+		BIO_printf(bio_err," -in arg       input file\n");
-        BIO_printf(bio_err, " -text         print as text\n");
+		BIO_printf(bio_err," -out arg      output file\n");
-        BIO_printf(bio_err, " -C            Output C code\n");
+		BIO_printf(bio_err," -text         print as text\n");
-        BIO_printf(bio_err, " -noout        no output\n");
+		BIO_printf(bio_err," -C            Output C code\n");
-        BIO_printf(bio_err, " -genkey       generate a DSA key\n");
+		BIO_printf(bio_err," -noout        no output\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -genkey       generate a DSA key\n");
-                   " -rand         files to use for random number input\n");
+		BIO_printf(bio_err," -rand         files to use for random number input\n");
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-                   " -engine e     use engine e, possibly a hardware device.\n");
+#endif
-# endif
+#ifdef GENCB_TEST
-# ifdef GENCB_TEST
+		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
-        BIO_printf(bio_err,
+#endif
-                   " -timebomb n   interrupt keygen after <n> seconds\n");
+		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
-# endif
-        BIO_printf(bio_err,
-                   " number        number of bits to use for generating private key\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    if (need_rand) {
+	if (need_rand)
+		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 		if (inrand != NULL)
-            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 		}
 
-    if (numbits > 0) {
+	if (numbits > 0)
+		{
 		BN_GENCB cb;
 		BN_GENCB_set(&cb, dsa_cb, bio_err);
 		assert(need_rand);
 		dsa = DSA_new();
-        if (!dsa) {
+		if(!dsa)
-            BIO_printf(bio_err, "Error allocating DSA object\n");
+			{
+			BIO_printf(bio_err,"Error allocating DSA object\n");
 			goto end;
 			}
-        BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
+		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-                   num);
+	        BIO_printf(bio_err,"This could take some time\n");
-        BIO_printf(bio_err, "This could take some time\n");
+#ifdef GENCB_TEST
-# ifdef GENCB_TEST
+		if(timebomb > 0)
-        if (timebomb > 0) {
+	{
 		struct sigaction act;
 		act.sa_handler = timebomb_sigalarm;
 		act.sa_flags = 0;
-            BIO_printf(bio_err,
+		BIO_printf(bio_err,"(though I'll stop it if not done within %d secs)\n",
-                       "(though I'll stop it if not done within %d secs)\n",
 				timebomb);
-            if (sigaction(SIGALRM, &act, NULL) != 0) {
+		if(sigaction(SIGALRM, &act, NULL) != 0)
-                BIO_printf(bio_err, "Error, couldn't set SIGALRM handler\n");
+			{
+			BIO_printf(bio_err,"Error, couldn't set SIGALRM handler\n");
 			goto end;
 			}
 		alarm(timebomb);
 	}
-# endif
+#endif
-        if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, &cb)) {
+	        if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
-# ifdef GENCB_TEST
+			{
-            if (stop_keygen_flag) {
+#ifdef GENCB_TEST
-                BIO_printf(bio_err, "DSA key generation time-stopped\n");
+			if(stop_keygen_flag)
+				{
+				BIO_printf(bio_err,"DSA key generation time-stopped\n");
 				/* This is an asked-for behaviour! */
 				ret = 0;
 				goto end;
 				}
-# endif
+#endif
-            BIO_printf(bio_err, "Error, DSA key generation failed\n");
+			BIO_printf(bio_err,"Error, DSA key generation failed\n");
 			goto end;
 			}
-    } else if (informat == FORMAT_ASN1)
+		}
-        dsa = d2i_DSAparams_bio(in, NULL);
+	else if	(informat == FORMAT_ASN1)
+		dsa=d2i_DSAparams_bio(in,NULL);
 	else if (informat == FORMAT_PEM)
-        dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
+		dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
-    else {
+	else
-        BIO_printf(bio_err, "bad input format specified\n");
+		{
+		BIO_printf(bio_err,"bad input format specified\n");
 		goto end;
 		}
-    if (dsa == NULL) {
+	if (dsa == NULL)
-        BIO_printf(bio_err, "unable to load DSA parameters\n");
+		{
+		BIO_printf(bio_err,"unable to load DSA parameters\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (text) {
+	if (text)
-        DSAparams_print(out, dsa);
+		{
+		DSAparams_print(out,dsa);
 		}
 	
-    if (C) {
+	if (C)
+		{
 		unsigned char *data;
-        int l, len, bits_p;
+		int l,len,bits_p,bits_q,bits_g;
 
-        len = BN_num_bytes(dsa->p);
+		len=BN_num_bytes(dsa->p);
-        bits_p = BN_num_bits(dsa->p);
+		bits_p=BN_num_bits(dsa->p);
-        data = (unsigned char *)OPENSSL_malloc(len + 20);
+		bits_q=BN_num_bits(dsa->q);
-        if (data == NULL) {
+		bits_g=BN_num_bits(dsa->g);
+		data=(unsigned char *)OPENSSL_malloc(len+20);
+		if (data == NULL)
+			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
-        l = BN_bn2bin(dsa->p, data);
+		l=BN_bn2bin(dsa->p,data);
-        printf("static unsigned char dsa%d_p[]={", bits_p);
+		printf("static unsigned char dsa%d_p[]={",bits_p);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 
-        l = BN_bn2bin(dsa->q, data);
+		l=BN_bn2bin(dsa->q,data);
-        printf("static unsigned char dsa%d_q[]={", bits_p);
+		printf("static unsigned char dsa%d_q[]={",bits_p);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 
-        l = BN_bn2bin(dsa->g, data);
+		l=BN_bn2bin(dsa->g,data);
-        printf("static unsigned char dsa%d_g[]={", bits_p);
+		printf("static unsigned char dsa%d_g[]={",bits_p);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
-            printf("0x%02X,", data[i]);
+			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
 
-        printf("DSA *get_dsa%d()\n\t{\n", bits_p);
+		printf("DSA *get_dsa%d()\n\t{\n",bits_p);
 		printf("\tDSA *dsa;\n\n");
 		printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
 		printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
-               bits_p, bits_p);
+			bits_p,bits_p);
 		printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
-               bits_p, bits_p);
+			bits_p,bits_p);
 		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
-               bits_p, bits_p);
+			bits_p,bits_p);
-        printf
+		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
-            ("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
 		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
 		printf("\treturn(dsa);\n\t}\n");
 		}
 
-    if (!noout) {
+
+	if (!noout)
+		{
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_DSAparams_bio(out, dsa);
+			i=i2d_DSAparams_bio(out,dsa);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_DSAparams(out, dsa);
+			i=PEM_write_bio_DSAparams(out,dsa);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
-        if (!i) {
+		if (!i)
-            BIO_printf(bio_err, "unable to write DSA parameters\n");
+			{
+			BIO_printf(bio_err,"unable to write DSA parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    if (genkey) {
+	if (genkey)
+		{
 		DSA *dsakey;
 
 		assert(need_rand);
-        if ((dsakey = DSAparams_dup(dsa)) == NULL)
+		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
-            goto end;
+		if (!DSA_generate_key(dsakey)) goto end;
-        if (!DSA_generate_key(dsakey))
-            goto end;
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_DSAPrivateKey_bio(out, dsakey);
+			i=i2d_DSAPrivateKey_bio(out,dsakey);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
+			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
-                                            NULL);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		DSA_free(dsakey);
 		}
 	if (need_rand)
 		app_RAND_write_file(NULL, bio_err);
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dsa != NULL) DSA_free(dsa);
-        BIO_free_all(out);
-    if (dsa != NULL)
-        DSA_free(dsa);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
-{
+	{
-    char c = '*';
+	char c='*';
 
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write(cb->arg,&c,1);
-        c = '*';
-    if (p == 3)
-        c = '\n';
-    BIO_write(cb->arg, &c, 1);
 	(void)BIO_flush(cb->arg);
-# ifdef LINT
+#ifdef LINT
-    p = n;
+	p=n;
-# endif
+#endif
-# ifdef GENCB_TEST
+#ifdef GENCB_TEST
-    if (stop_keygen_flag)
+	if(stop_keygen_flag)
-        return 0;
+		return 0;
-# endif
+#endif
-    return 1;
+	return 1;
-}
+	}
-#else                           /* !OPENSSL_NO_DSA */
-
-# if PEDANTIC
-static void *dummy = &dummy;
-# endif
-
 #endif

apps/ec.c

@@ -58,20 +58,19 @@
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# undef PROG
+#undef PROG
-# define PROG    ec_main
+#define PROG	ec_main
 
-/*-
+/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
- * -inform arg    - input format - default PEM (one of DER, NET or PEM)
  * -outform arg   - output format - default PEM
  * -in arg        - input file - default stdin
  * -out arg       - output file - default stdout
@@ -86,13 +85,16 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
+#ifndef OPENSSL_NO_ENGINE
+	ENGINE 	*e = NULL;
+#endif
 	int 	ret = 1;
 	EC_KEY 	*eckey = NULL;
 	const EC_GROUP *group;
 	int 	i, badops = 0;
 	const EVP_CIPHER *enc = NULL;
 	BIO 	*in = NULL, *out = NULL;
-    int informat, outformat, text = 0, noout = 0;
+	int 	informat, outformat, text=0, noout=0;
 	int  	pubin = 0, pubout = 0, param_out = 0;
 	char 	*infile, *outfile, *prog, *engine;
 	char 	*passargin = NULL, *passargout = NULL;
@@ -105,8 +107,8 @@ int MAIN(int argc, char **argv)
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
@@ -120,40 +122,49 @@ int MAIN(int argc, char **argv)
 	prog = argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if (strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-outform") == 0)
-            outformat = str2fmt(*(++argv));
+			{
-        } else if (strcmp(*argv, "-in") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outformat=str2fmt(*(++argv));
-                goto bad;
+			}
-            infile = *(++argv);
+		else if (strcmp(*argv,"-in") == 0)
-        } else if (strcmp(*argv, "-out") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			infile= *(++argv);
-            outfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-passin") == 0) {
+		else if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            passargin = *(++argv);
+			outfile= *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passin") == 0)
-                goto bad;
+			{
-            passargout = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-engine") == 0) {
+			passargin= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-passout") == 0)
-            engine = *(++argv);
+			{
-        } else if (strcmp(*argv, "-noout") == 0)
+			if (--argc < 1) goto bad;
+			passargout= *(++argv);
+			}
+		else if (strcmp(*argv, "-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+		else if (strcmp(*argv, "-noout") == 0)
 			noout = 1;
 		else if (strcmp(*argv, "-text") == 0)
 			text = 1;
-        else if (strcmp(*argv, "-conv_form") == 0) {
+		else if (strcmp(*argv, "-conv_form") == 0)
+			{
 			if (--argc < 1)
 				goto bad;
 			++argv;
@@ -166,7 +177,9 @@ int MAIN(int argc, char **argv)
 				form = POINT_CONVERSION_HYBRID;
 			else
 				goto bad;
-        } else if (strcmp(*argv, "-param_enc") == 0) {
+			}
+		else if (strcmp(*argv, "-param_enc") == 0)
+			{
 			if (--argc < 1)
 				goto bad;
 			++argv;
@@ -177,23 +190,26 @@ int MAIN(int argc, char **argv)
 				asn1_flag = 0;
 			else
 				goto bad;
-        } else if (strcmp(*argv, "-param_out") == 0)
+			}
+		else if (strcmp(*argv, "-param_out") == 0)
 			param_out = 1;
 		else if (strcmp(*argv, "-pubin") == 0)
-            pubin = 1;
+			pubin=1;
 		else if (strcmp(*argv, "-pubout") == 0)
-            pubout = 1;
+			pubout=1;
-        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+			{
 			BIO_printf(bio_err, "unknown option %s\n", *argv);
-            badops = 1;
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
+bad:
 		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, " -inform arg     input format - "
@@ -222,75 +238,93 @@ int MAIN(int argc, char **argv)
 				" compressed\n");
 		BIO_printf(bio_err, "                                 "
 				" uncompressed (default)\n");
-        BIO_printf(bio_err, "                                  " " hybrid\n");
+		BIO_printf(bio_err, "                                  "
+				" hybrid\n");
 		BIO_printf(bio_err, " -param_enc arg  specifies the way"
 				" the ec parameters are encoded\n");
-        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
+		BIO_printf(bio_err, "                 in the asn1 der "
-        BIO_printf(bio_err, "                 possible values:"
+				"encoding\n");
+		BIO_printf(bio_err, "                 possilbe values:"
 				" named_curve (default)\n");
-        BIO_printf(bio_err, "                                  "
+		BIO_printf(bio_err,"                                  "
 				"explicit\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
+		{
 		BIO_printf(bio_err, "Error getting passwords\n");
 		goto end;
 		}
 
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
 		BIO_set_fp(in, stdin, BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in, infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
 
 	BIO_printf(bio_err, "read EC key\n");
-    if (informat == FORMAT_ASN1) {
+	if (informat == FORMAT_ASN1) 
+		{
 		if (pubin) 
 			eckey = d2i_EC_PUBKEY_bio(in, NULL);
 		else 
 			eckey = d2i_ECPrivateKey_bio(in, NULL);
-    } else if (informat == FORMAT_PEM) {
+		} 
+	else if (informat == FORMAT_PEM) 
+		{
 		if (pubin) 
-            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
+			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
+				NULL);
 		else 
-            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
+			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
-    } else {
+				passin);
+		} 
+	else
+		{
 		BIO_printf(bio_err, "bad input format specified for key\n");
 		goto end;
 		}
-    if (eckey == NULL) {
+	if (eckey == NULL)
-        BIO_printf(bio_err, "unable to load Key\n");
+		{
+		BIO_printf(bio_err,"unable to load Key\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
+		{
 		BIO_set_fp(out, stdout, BIO_NOCLOSE);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
 			}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out, outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
@@ -305,26 +339,31 @@ int MAIN(int argc, char **argv)
 		EC_KEY_set_asn1_flag(eckey, asn1_flag);
 
 	if (text) 
-        if (!EC_KEY_print(out, eckey, 0)) {
+		if (!EC_KEY_print(out, eckey, 0))
+			{
 			perror(outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 
-    if (noout) {
+	if (noout) 
+		{
 		ret = 0;
 		goto end;
 		}
 
 	BIO_printf(bio_err, "writing EC key\n");
-    if (outformat == FORMAT_ASN1) {
+	if (outformat == FORMAT_ASN1) 
+		{
 		if (param_out)
 			i = i2d_ECPKParameters_bio(out, group);
 		else if (pubin || pubout) 
 			i = i2d_EC_PUBKEY_bio(out, eckey);
 		else 
 			i = i2d_ECPrivateKey_bio(out, eckey);
-    } else if (outformat == FORMAT_PEM) {
+		} 
+	else if (outformat == FORMAT_PEM) 
+		{
 		if (param_out)
 			i = PEM_write_bio_ECPKParameters(out, group);
 		else if (pubin || pubout)
@@ -332,17 +371,22 @@ int MAIN(int argc, char **argv)
 		else 
 			i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
 						NULL, 0, NULL, passout);
-    } else {
+		} 
-        BIO_printf(bio_err, "bad output format specified for " "outfile\n");
+	else 
+		{
+		BIO_printf(bio_err, "bad output format specified for "
+			"outfile\n");
 		goto end;
 		}
 
-    if (!i) {
+	if (!i)
+		{
 		BIO_printf(bio_err, "unable to write private key\n");
 		ERR_print_errors(bio_err);
-    } else
+		}
-        ret = 0;
+	else
- end:
+		ret=0;
+end:
 	if (in)
 		BIO_free(in);
 	if (out)

apps/ecparam.c

@@ -71,24 +71,23 @@
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
-# include <assert.h>
+#include <assert.h>
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <time.h>
+#include <time.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/ec.h>
+#include <openssl/ec.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# undef PROG
+#undef PROG
-# define PROG    ecparam_main
+#define PROG	ecparam_main
 
-/*-
+/* -inform arg      - input format - default PEM (DER or PEM)
- * -inform arg      - input format - default PEM (DER or PEM)
  * -outform arg     - output format - default PEM
  * -in  arg         - input file  - default stdin
  * -out arg         - output file - default stdout
@@ -112,13 +111,13 @@
  * -engine e        - use engine e, possibly a hardware device
  */
 
-static int ecparam_print_var(BIO *, BIGNUM *, const char *, int,
+
-                             unsigned char *);
+static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	EC_GROUP *group = NULL;
 	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED; 
 	int 	new_form = 0;
@@ -130,6 +129,9 @@ int MAIN(int argc, char **argv)
 	char	*infile = NULL, *outfile = NULL, *prog;
 	BIO 	*in = NULL, *out = NULL;
 	int 	informat, outformat, noout = 0, C = 0, ret = 1;
+#ifndef OPENSSL_NO_ENGINE
+	ENGINE	*e = NULL;
+#endif
 	char	*engine = NULL;
 
 	BIGNUM	*ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
@@ -139,48 +141,56 @@ int MAIN(int argc, char **argv)
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-outform") == 0)
-            outformat = str2fmt(*(++argv));
+			{
-        } else if (strcmp(*argv, "-in") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outformat=str2fmt(*(++argv));
-                goto bad;
+			}
-            infile = *(++argv);
+		else if (strcmp(*argv,"-in") == 0)
-        } else if (strcmp(*argv, "-out") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			infile= *(++argv);
-            outfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-text") == 0)
+		else if (strcmp(*argv,"-out") == 0)
+			{
+			if (--argc < 1) goto bad;
+			outfile= *(++argv);
+			}
+		else if (strcmp(*argv,"-text") == 0)
 			text = 1;
-        else if (strcmp(*argv, "-C") == 0)
+		else if (strcmp(*argv,"-C") == 0)
 			C = 1;
-        else if (strcmp(*argv, "-check") == 0)
+		else if (strcmp(*argv,"-check") == 0)
 			check = 1;
-        else if (strcmp(*argv, "-name") == 0) {
+		else if (strcmp (*argv, "-name") == 0)
+			{
 			if (--argc < 1)
 				goto bad;
 			curve_name = *(++argv);
-        } else if (strcmp(*argv, "-list_curves") == 0)
+			}
+		else if (strcmp(*argv, "-list_curves") == 0)
 			list_curves = 1;
-        else if (strcmp(*argv, "-conv_form") == 0) {
+		else if (strcmp(*argv, "-conv_form") == 0)
+			{
 			if (--argc < 1)
 				goto bad;
 			++argv;
@@ -193,7 +203,9 @@ int MAIN(int argc, char **argv)
 				form = POINT_CONVERSION_HYBRID;
 			else
 				goto bad;
-        } else if (strcmp(*argv, "-param_enc") == 0) {
+			}
+		else if (strcmp(*argv, "-param_enc") == 0)
+			{
 			if (--argc < 1)
 				goto bad;
 			++argv;
@@ -204,34 +216,41 @@ int MAIN(int argc, char **argv)
 				asn1_flag = 0;
 			else
 				goto bad;
-        } else if (strcmp(*argv, "-no_seed") == 0)
+			}
+		else if (strcmp(*argv, "-no_seed") == 0)
 			no_seed = 1;
 		else if (strcmp(*argv, "-noout") == 0)
-            noout = 1;
+			noout=1;
-        else if (strcmp(*argv, "-genkey") == 0) {
+		else if (strcmp(*argv,"-genkey") == 0)
-            genkey = 1;
+			{
-            need_rand = 1;
+			genkey=1;
-        } else if (strcmp(*argv, "-rand") == 0) {
+			need_rand=1;
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv, "-rand") == 0)
-            inrand = *(++argv);
+			{
-            need_rand = 1;
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-engine") == 0) {
+			inrand= *(++argv);
-            if (--argc < 1)
+			need_rand=1;
-                goto bad;
+			}
+		else if(strcmp(*argv, "-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
 			engine = *(++argv);
-        } else {
+			}	
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+		else
-            badops = 1;
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
+		BIO_printf(bio_err, "%s [options] <infile >outfile\n",prog);
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, " -inform arg       input format - "
 				"default PEM (DER or PEM)\n");
@@ -270,8 +289,10 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err, "                                   "
 				" explicit\n");
 		BIO_printf(bio_err, " -no_seed          if 'explicit'"
-                   " parameters are choosen do not" " use the seed\n");
+				" parameters are choosen do not"
-        BIO_printf(bio_err, " -genkey           generate ec" " key\n");
+				" use the seed\n");
+		BIO_printf(bio_err, " -genkey           generate ec"
+				" key\n");
 		BIO_printf(bio_err, " -rand file        files to use for"
 				" random number input\n");
 		BIO_printf(bio_err, " -engine e         use engine e, "
@@ -281,41 +302,49 @@ int MAIN(int argc, char **argv)
 
 	ERR_load_crypto_strings();
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+	e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    if (list_curves) {
+	if (list_curves)
+		{
 		EC_builtin_curve *curves = NULL;
 		size_t crv_len = 0;
 		size_t n = 0;
@@ -327,12 +356,15 @@ int MAIN(int argc, char **argv)
 		if (curves == NULL)
 			goto end;
 
-        if (!EC_get_builtin_curves(curves, crv_len)) {
+		if (!EC_get_builtin_curves(curves, crv_len))
+			{
 			OPENSSL_free(curves);
 			goto end;
 			}
 
-        for (n = 0; n < crv_len; n++) {
+		
+		for (n = 0; n < crv_len; n++)
+			{
 			const char *comment;
 			const char *sname;
 			comment = curves[n].comment;
@@ -351,48 +383,64 @@ int MAIN(int argc, char **argv)
 		goto end;
 		}
 
-    if (curve_name != NULL) {
+	if (curve_name != NULL)
+		{
 		int nid;
 
-        /*
+		/* workaround for the SECG curve names secp192r1
-         * workaround for the SECG curve names secp192r1 and secp256r1 (which
+		 * and secp256r1 (which are the same as the curves
-         * are the same as the curves prime192v1 and prime256v1 defined in
+		 * prime192v1 and prime256v1 defined in X9.62)
-         * X9.62)
 		 */
-        if (!strcmp(curve_name, "secp192r1")) {
+		if (!strcmp(curve_name, "secp192r1"))
+			{
 			BIO_printf(bio_err, "using curve name prime192v1 "
 				"instead of secp192r1\n");
 			nid = NID_X9_62_prime192v1;
-        } else if (!strcmp(curve_name, "secp256r1")) {
+			}
+		else if (!strcmp(curve_name, "secp256r1"))
+			{
 			BIO_printf(bio_err, "using curve name prime256v1 "
 				"instead of secp256r1\n");
 			nid = NID_X9_62_prime256v1;
-        } else
+			}
+		else
 			nid = OBJ_sn2nid(curve_name);
 	
-        if (nid == 0) {
+		if (nid == 0)
-            BIO_printf(bio_err, "unknown curve name (%s)\n", curve_name);
+			{
+			BIO_printf(bio_err, "unknown curve name (%s)\n", 
+				curve_name);
 			goto end;
 			}
 
 		group = EC_GROUP_new_by_curve_name(nid);
-        if (group == NULL) {
+		if (group == NULL)
-            BIO_printf(bio_err, "unable to create curve (%s)\n", curve_name);
+			{
+			BIO_printf(bio_err, "unable to create curve (%s)\n", 
+				curve_name);
 			goto end;
 			}
 		EC_GROUP_set_asn1_flag(group, asn1_flag);
 		EC_GROUP_set_point_conversion_form(group, form);
-    } else if (informat == FORMAT_ASN1) {
+		}
+	else if (informat == FORMAT_ASN1)
+		{
 		group = d2i_ECPKParameters_bio(in, NULL);
-    } else if (informat == FORMAT_PEM) {
+		}
-        group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
+	else if (informat == FORMAT_PEM)
-    } else {
+		{
+		group = PEM_read_bio_ECPKParameters(in,NULL,NULL,NULL);
+		}
+	else
+		{
 		BIO_printf(bio_err, "bad input format specified\n");
 		goto end;
 		}
 
-    if (group == NULL) {
+	if (group == NULL)
-        BIO_printf(bio_err, "unable to load elliptic curve parameters\n");
+		{
+		BIO_printf(bio_err, 
+			"unable to load elliptic curve parameters\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
@@ -403,28 +451,34 @@ int MAIN(int argc, char **argv)
 	if (new_asn1_flag)
 		EC_GROUP_set_asn1_flag(group, asn1_flag);
 
-    if (no_seed) {
+	if (no_seed)
+		{
 		EC_GROUP_set_seed(group, NULL, 0);
 		}
 
-    if (text) {
+	if (text)
+		{
 		if (!ECPKParameters_print(out, group, 0))
 			goto end;
 		}
 
-    if (check) {
+	if (check)
+		{
 		if (group == NULL)
 			BIO_printf(bio_err, "no elliptic curve parameters\n");
 		BIO_printf(bio_err, "checking elliptic curve parameters: ");
-        if (!EC_GROUP_check(group, NULL)) {
+		if (!EC_GROUP_check(group, NULL))
+			{
 			BIO_printf(bio_err, "failed\n");
 			ERR_print_errors(bio_err);
-        } else
+			}
+		else
 			BIO_printf(bio_err, "ok\n");
 			
 		}
 
-    if (C) {
+	if (C)
+		{
 		size_t	buf_len = 0, tmp_len = 0;
 		const EC_POINT *point;
 		int	is_prime, len = 0;
@@ -433,17 +487,23 @@ int MAIN(int argc, char **argv)
 		if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
 		    (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
 		    (ec_order = BN_new()) == NULL || 
-            (ec_cofactor = BN_new()) == NULL) {
+		    (ec_cofactor = BN_new()) == NULL )
+			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
 
-        is_prime = (EC_METHOD_get_field_type(meth) == NID_X9_62_prime_field);
+		is_prime = (EC_METHOD_get_field_type(meth) == 
+			NID_X9_62_prime_field);
 
-        if (is_prime) {
+		if (is_prime)
-            if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
+			{
+			if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a,
+				ec_b, NULL))
 				goto end;
-        } else {
+			}
+		else
+			{
 			/* TODO */
 			goto end;
 			}
@@ -451,15 +511,16 @@ int MAIN(int argc, char **argv)
 		if ((point = EC_GROUP_get0_generator(group)) == NULL)
 			goto end;
 		if (!EC_POINT_point2bn(group, point, 
-                               EC_GROUP_get_point_conversion_form(group),
+			EC_GROUP_get_point_conversion_form(group), ec_gen, 
-                               ec_gen, NULL))
+			NULL))
 			goto end;
 		if (!EC_GROUP_get_order(group, ec_order, NULL))
 			goto end;
 		if (!EC_GROUP_get_cofactor(group, ec_cofactor, NULL))
 			goto end;
 
-        if (!ec_p || !ec_a || !ec_b || !ec_gen || !ec_order || !ec_cofactor)
+		if (!ec_p || !ec_a || !ec_b || !ec_gen || 
+			!ec_order || !ec_cofactor)
 			goto end;
 
 		len = BN_num_bits(ec_order);
@@ -479,7 +540,8 @@ int MAIN(int argc, char **argv)
 
 		buffer = (unsigned char *)OPENSSL_malloc(buf_len);
 
-        if (buffer == NULL) {
+		if (buffer == NULL)
+			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
@@ -489,7 +551,8 @@ int MAIN(int argc, char **argv)
 		ecparam_print_var(out, ec_b, "ec_b", len, buffer);
 		ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
 		ecparam_print_var(out, ec_order, "ec_order", len, buffer);
-        ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
+		ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, 
+			buffer);
 
 		BIO_printf(out, "\n\n");
 
@@ -508,11 +571,14 @@ int MAIN(int argc, char **argv)
 		BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
 				"sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
 				"goto err;\n", len, len);
-        if (is_prime) {
+		if (is_prime)
+			{
 			BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
 				"GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
 				"\n\t\tgoto err;\n\n");
-        } else {
+			}
+		else
+			{
 			/* TODO */
 			goto end;
 			}
@@ -545,17 +611,20 @@ int MAIN(int argc, char **argv)
 		BIO_printf(out, "\treturn(group);\n\t}\n");
 	}
 
-    if (!noout) {
+	if (!noout)
+		{
 		if (outformat == FORMAT_ASN1)
 			i = i2d_ECPKParameters_bio(out, group);
 		else if (outformat == FORMAT_PEM)
 			i = PEM_write_bio_ECPKParameters(out, group);
-        else {
+		else	
-            BIO_printf(bio_err, "bad output format specified for"
+			{
+			BIO_printf(bio_err,"bad output format specified for"
 				" outfile\n");
 			goto end;
 			}
-        if (!i) {
+		if (!i)
+			{
 			BIO_printf(bio_err, "unable to write elliptic "
 				"curve parameters\n");
 			ERR_print_errors(bio_err);
@@ -563,14 +632,16 @@ int MAIN(int argc, char **argv)
 			}
 		}
 	
-    if (need_rand) {
+	if (need_rand)
+		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 		if (inrand != NULL)
-            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 		}
 
-    if (genkey) {
+	if (genkey)
+		{
 		EC_KEY *eckey = EC_KEY_new();
 
 		if (eckey == NULL)
@@ -581,7 +652,8 @@ int MAIN(int argc, char **argv)
 		if (EC_KEY_set_group(eckey, group) == 0)
 			goto end;
 		
-        if (!EC_KEY_generate_key(eckey)) {
+		if (!EC_KEY_generate_key(eckey))
+			{
 			EC_KEY_free(eckey);
 			goto end;
 			}
@@ -590,7 +662,8 @@ int MAIN(int argc, char **argv)
 		else if (outformat == FORMAT_PEM)
 			i = PEM_write_bio_ECPrivateKey(out, eckey, NULL,
 				NULL, 0, NULL, NULL);
-        else {
+		else	
+			{
 			BIO_printf(bio_err, "bad output format specified "
 				"for outfile\n");
 			EC_KEY_free(eckey);
@@ -602,8 +675,8 @@ int MAIN(int argc, char **argv)
 	if (need_rand)
 		app_RAND_write_file(NULL, bio_err);
 
-    ret = 0;
+	ret=0;
- end:
+end:
 	if (ec_p)
 		BN_free(ec_p);
 	if (ec_a)
@@ -630,24 +703,26 @@ int MAIN(int argc, char **argv)
 
 static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
 	int len, unsigned char *buffer)
-{
+	{
 	BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
 	if (BN_is_zero(in))
 		BIO_printf(out, "\n\t0x00");
-    else {
+	else 
+		{
 		int i, l;
 
 		l = BN_bn2bin(in, buffer);
-        for (i = 0; i < l - 1; i++) {
+		for (i=0; i<l-1; i++)
-            if ((i % 12) == 0)
+			{
+			if ((i%12) == 0) 
 				BIO_printf(out, "\n\t");
 			BIO_printf(out, "0x%02X,", buffer[i]);
 			}
-        if ((i % 12) == 0)
+		if ((i%12) == 0) 
 			BIO_printf(out, "\n\t");
 		BIO_printf(out, "0x%02X", buffer[i]);
 		}
 	BIO_printf(out, "\n\t};\n\n");
 	return 1;
-}
+	}
 #endif

apps/enc.c

@@ -69,7 +69,7 @@
 #include <openssl/pem.h>
 #include <ctype.h>
 
-int set_hex(char *in, unsigned char *out, int size);
+int set_hex(char *in,unsigned char *out,int size);
 #undef SIZE
 #undef BSIZE
 #undef PROG
@@ -78,218 +78,226 @@ int set_hex(char *in, unsigned char *out, int size);
 #define BSIZE	(8*1024)
 #define	PROG	enc_main
 
-static void show_ciphers(const OBJ_NAME *name, void *bio_)
+static void show_ciphers(const OBJ_NAME *name,void *bio_)
-{
+	{
-    BIO *bio = bio_;
+	BIO *bio=bio_;
 	static int n;
 
-    if (!islower((unsigned char)*name->name))
+	if(!islower((unsigned char)*name->name))
 		return;
 
-    BIO_printf(bio, "-%-25s", name->name);
+	BIO_printf(bio,"-%-25s",name->name);
-    if (++n == 3) {
+	if(++n == 3)
-        BIO_printf(bio, "\n");
+		{
-        n = 0;
+		BIO_printf(bio,"\n");
-    } else
+		n=0;
-        BIO_printf(bio, " ");
+		}
-}
+	else
+		BIO_printf(bio," ");
+	}
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    static const char magic[] = "Salted__";
+#ifndef OPENSSL_NO_ENGINE
-    char mbuf[sizeof magic - 1];
+	ENGINE *e = NULL;
-    char *strbuf = NULL;
+#endif
-    unsigned char *buff = NULL, *bufsize = NULL;
+	static const char magic[]="Salted__";
-    int bsize = BSIZE, verbose = 0;
+	char mbuf[sizeof magic-1];
-    int ret = 1, inl;
+	char *strbuf=NULL;
+	unsigned char *buff=NULL,*bufsize=NULL;
+	int bsize=BSIZE,verbose=0;
+	int ret=1,inl;
 	int nopad = 0;
-    unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
+	unsigned char key[EVP_MAX_KEY_LENGTH],iv[EVP_MAX_IV_LENGTH];
 	unsigned char salt[PKCS5_SALT_LEN];
-    char *str = NULL, *passarg = NULL, *pass = NULL;
+	char *str=NULL, *passarg = NULL, *pass = NULL;
-    char *hkey = NULL, *hiv = NULL, *hsalt = NULL;
+	char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
-    char *md = NULL;
+	char *md=NULL;
-    int enc = 1, printkey = 0, i, base64 = 0;
+	int enc=1,printkey=0,i,base64=0;
-    int debug = 0, olb64 = 0, nosalt = 0;
+	int debug=0,olb64=0,nosalt=0;
-    const EVP_CIPHER *cipher = NULL, *c;
+	const EVP_CIPHER *cipher=NULL,*c;
 	EVP_CIPHER_CTX *ctx = NULL;
-    char *inf = NULL, *outf = NULL;
+	char *inf=NULL,*outf=NULL;
-    BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
+	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
-        NULL, *wbio = NULL;
 #define PROG_NAME_SIZE  39
-    char pname[PROG_NAME_SIZE + 1];
+	char pname[PROG_NAME_SIZE+1];
 #ifndef OPENSSL_NO_ENGINE
 	char *engine = NULL;
 #endif
-    const EVP_MD *dgst = NULL;
+	const EVP_MD *dgst=NULL;
 	int non_fips_allow = 0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	/* first check the program name */
-    program_name(argv[0], pname, sizeof pname);
+	program_name(argv[0],pname,sizeof pname);
-    if (strcmp(pname, "base64") == 0)
+	if (strcmp(pname,"base64") == 0)
-        base64 = 1;
+		base64=1;
 
-    cipher = EVP_get_cipherbyname(pname);
+	cipher=EVP_get_cipherbyname(pname);
-    if (!base64 && (cipher == NULL) && (strcmp(pname, "enc") != 0)) {
+	if (!base64 && (cipher == NULL) && (strcmp(pname,"enc") != 0))
-        BIO_printf(bio_err, "%s is an unknown cipher\n", pname);
+		{
+		BIO_printf(bio_err,"%s is an unknown cipher\n",pname);
 		goto bad;
 		}
 
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-e") == 0)
+		{
-            enc = 1;
+		if	(strcmp(*argv,"-e") == 0)
-        else if (strcmp(*argv, "-in") == 0) {
+			enc=1;
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
-            inf = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-out") == 0) {
+			inf= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-out") == 0)
-            outf = *(++argv);
+			{
-        } else if (strcmp(*argv, "-pass") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outf= *(++argv);
-                goto bad;
+			}
-            passarg = *(++argv);
+		else if (strcmp(*argv,"-pass") == 0)
+			{
+			if (--argc < 1) goto bad;
+			passarg= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            engine = *(++argv);
+			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-d") == 0)
+		else if	(strcmp(*argv,"-d") == 0)
-            enc = 0;
+			enc=0;
-        else if (strcmp(*argv, "-p") == 0)
+		else if	(strcmp(*argv,"-p") == 0)
-            printkey = 1;
+			printkey=1;
-        else if (strcmp(*argv, "-v") == 0)
+		else if	(strcmp(*argv,"-v") == 0)
-            verbose = 1;
+			verbose=1;
-        else if (strcmp(*argv, "-nopad") == 0)
+		else if	(strcmp(*argv,"-nopad") == 0)
-            nopad = 1;
+			nopad=1;
-        else if (strcmp(*argv, "-salt") == 0)
+		else if	(strcmp(*argv,"-salt") == 0)
-            nosalt = 0;
+			nosalt=0;
-        else if (strcmp(*argv, "-nosalt") == 0)
+		else if	(strcmp(*argv,"-nosalt") == 0)
-            nosalt = 1;
+			nosalt=1;
-        else if (strcmp(*argv, "-debug") == 0)
+		else if	(strcmp(*argv,"-debug") == 0)
-            debug = 1;
+			debug=1;
-        else if (strcmp(*argv, "-P") == 0)
+		else if	(strcmp(*argv,"-P") == 0)
-            printkey = 2;
+			printkey=2;
-        else if (strcmp(*argv, "-A") == 0)
+		else if	(strcmp(*argv,"-A") == 0)
-            olb64 = 1;
+			olb64=1;
-        else if (strcmp(*argv, "-a") == 0)
+		else if	(strcmp(*argv,"-a") == 0)
-            base64 = 1;
+			base64=1;
-        else if (strcmp(*argv, "-base64") == 0)
+		else if	(strcmp(*argv,"-base64") == 0)
-            base64 = 1;
+			base64=1;
-        else if (strcmp(*argv, "-bufsize") == 0) {
+		else if (strcmp(*argv,"-bufsize") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            bufsize = (unsigned char *)*(++argv);
+			bufsize=(unsigned char *)*(++argv);
-        } else if (strcmp(*argv, "-k") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-k") == 0)
-                goto bad;
+			{
-            str = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-kfile") == 0) {
+			str= *(++argv);
+			}
+		else if (strcmp(*argv,"-kfile") == 0)
+			{
 			static char buf[128];
 			FILE *infile;
 			char *file;
 
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			file= *(++argv);
-            file = *(++argv);
+			infile=fopen(file,"r");
-            infile = fopen(file, "r");
+			if (infile == NULL)
-            if (infile == NULL) {
+				{
-                BIO_printf(bio_err, "unable to read key from '%s'\n", file);
+				BIO_printf(bio_err,"unable to read key from '%s'\n",
-                goto bad;
+					file);
-            }
-            buf[0] = '\0';
-            if (!fgets(buf, sizeof buf, infile)) {
-                BIO_printf(bio_err, "unable to read key from '%s'\n", file);
 				goto bad;
 				}
+			buf[0]='\0';
+			fgets(buf,sizeof buf,infile);
 			fclose(infile);
-            i = strlen(buf);
+			i=strlen(buf);
-            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
+			if ((i > 0) &&
-                buf[--i] = '\0';
+				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
-            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
+				buf[--i]='\0';
-                buf[--i] = '\0';
+			if ((i > 0) &&
-            if (i < 1) {
+				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
-                BIO_printf(bio_err, "zero length password\n");
+				buf[--i]='\0';
+			if (i < 1)
+				{
+				BIO_printf(bio_err,"zero length password\n");
 				goto bad;
 				}
-            str = buf;
+			str=buf;
-        } else if (strcmp(*argv, "-K") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-K") == 0)
-                goto bad;
+			{
-            hkey = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-S") == 0) {
+			hkey= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-S") == 0)
-            hsalt = *(++argv);
+			{
-        } else if (strcmp(*argv, "-iv") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			hsalt= *(++argv);
-                goto bad;
+			}
-            hiv = *(++argv);
+		else if (strcmp(*argv,"-iv") == 0)
-        } else if (strcmp(*argv, "-md") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			hiv= *(++argv);
-            md = *(++argv);
+			}
-        } else if (strcmp(*argv, "-non-fips-allow") == 0)
+		else if (strcmp(*argv,"-md") == 0)
+			{
+			if (--argc < 1) goto bad;
+			md= *(++argv);
+			}
+		else if (strcmp(*argv,"-non-fips-allow") == 0)
 			non_fips_allow = 1;
 		else if	((argv[0][0] == '-') &&
-                 ((c = EVP_get_cipherbyname(&(argv[0][1]))) != NULL)) {
+			((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
-            cipher = c;
+			{
-        } else if (strcmp(*argv, "-none") == 0)
+			cipher=c;
-            cipher = NULL;
+			}
-        else {
+		else if (strcmp(*argv,"-none") == 0)
-            BIO_printf(bio_err, "unknown option '%s'\n", *argv);
+			cipher=NULL;
- bad:
+		else
-            BIO_printf(bio_err, "options are\n");
+			{
-            BIO_printf(bio_err, "%-14s input file\n", "-in <file>");
+			BIO_printf(bio_err,"unknown option '%s'\n",*argv);
-            BIO_printf(bio_err, "%-14s output file\n", "-out <file>");
+bad:
-            BIO_printf(bio_err, "%-14s pass phrase source\n", "-pass <arg>");
+			BIO_printf(bio_err,"options are\n");
-            BIO_printf(bio_err, "%-14s encrypt\n", "-e");
+			BIO_printf(bio_err,"%-14s input file\n","-in <file>");
-            BIO_printf(bio_err, "%-14s decrypt\n", "-d");
+			BIO_printf(bio_err,"%-14s output file\n","-out <file>");
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s pass phrase source\n","-pass <arg>");
-                       "%-14s base64 encode/decode, depending on encryption flag\n",
+			BIO_printf(bio_err,"%-14s encrypt\n","-e");
-                       "-a/-base64");
+			BIO_printf(bio_err,"%-14s decrypt\n","-d");
-            BIO_printf(bio_err, "%-14s passphrase is the next argument\n",
+			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
-                       "-k");
+			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
-                       "%-14s passphrase is the first line of the file argument\n",
+			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
-                       "-kfile");
+			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
-                       "%-14s the next argument is the md to use to create a key\n",
+			BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
-                       "-md");
+			BIO_printf(bio_err,"%-14s buffer size\n","-bufsize <n>");
-            BIO_printf(bio_err,
-                       "%-14s   from a passphrase.  One of md2, md5, sha or sha1\n",
-                       "");
-            BIO_printf(bio_err, "%-14s key/iv in hex is the next argument\n",
-                       "-K/-iv");
-            BIO_printf(bio_err, "%-14s print the iv/key (then exit if -P)\n",
-                       "-[pP]");
-            BIO_printf(bio_err, "%-14s buffer size\n", "-bufsize <n>");
 #ifndef OPENSSL_NO_ENGINE
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
-                       "%-14s use engine e, possibly a hardware device.\n",
-                       "-engine e");
 #endif
 
-            BIO_printf(bio_err, "Cipher Types\n");
+			BIO_printf(bio_err,"Cipher Types\n");
 			OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-                                   show_ciphers, bio_err);
+					       show_ciphers,
-            BIO_printf(bio_err, "\n");
+					       bio_err);
+			BIO_printf(bio_err,"\n");
 
 			goto end;
 			}
@@ -298,114 +306,131 @@ int MAIN(int argc, char **argv)
 		}
 
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 
-    if (md && (dgst = EVP_get_digestbyname(md)) == NULL) {
+	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
-        BIO_printf(bio_err, "%s is an unsupported message digest type\n", md);
+		{
+		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
 		goto end;
 		}
 
-    if (dgst == NULL) {
+	if (dgst == NULL)
+		{
 		if (in_FIPS_mode)
 			dgst = EVP_sha1();
 		else
 			dgst = EVP_md5();
 		}
 
-    if (bufsize != NULL) {
+	if (bufsize != NULL)
+		{
 		unsigned long n;
 
-        for (n = 0; *bufsize; bufsize++) {
+		for (n=0; *bufsize; bufsize++)
-            i = *bufsize;
+			{
+			i= *bufsize;
 			if ((i <= '9') && (i >= '0'))
-                n = n * 10 + i - '0';
+				n=n*10+i-'0';
-            else if (i == 'k') {
+			else if (i == 'k')
-                n *= 1024;
+				{
+				n*=1024;
 				bufsize++;
 				break;
 				}
 			}
-        if (*bufsize != '\0') {
+		if (*bufsize != '\0')
-            BIO_printf(bio_err, "invalid 'bufsize' specified.\n");
+			{
+			BIO_printf(bio_err,"invalid 'bufsize' specified.\n");
 			goto end;
 			}
 
 		/* It must be large enough for a base64 encoded line */
-        if (base64 && n < 80)
+		if (base64 && n < 80) n=80;
-            n = 80;
 
-        bsize = (int)n;
+		bsize=(int)n;
-        if (verbose)
+		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
-            BIO_printf(bio_err, "bufsize=%d\n", bsize);
 		}
 
-    strbuf = OPENSSL_malloc(SIZE);
+	strbuf=OPENSSL_malloc(SIZE);
-    buff = (unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize));
+	buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize));
-    if ((buff == NULL) || (strbuf == NULL)) {
+	if ((buff == NULL) || (strbuf == NULL))
-        BIO_printf(bio_err, "OPENSSL_malloc failure %ld\n",
+		{
-                   (long)EVP_ENCODE_LENGTH(bsize));
+		BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
 		goto end;
 		}
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    if (debug) {
+	if (debug)
-        BIO_set_callback(in, BIO_debug_callback);
+		{
-        BIO_set_callback(out, BIO_debug_callback);
+		BIO_set_callback(in,BIO_debug_callback);
-        BIO_set_callback_arg(in, (char *)bio_err);
+		BIO_set_callback(out,BIO_debug_callback);
-        BIO_set_callback_arg(out, (char *)bio_err);
+		BIO_set_callback_arg(in,(char *)bio_err);
+		BIO_set_callback_arg(out,(char *)bio_err);
 		}
 
-    if (inf == NULL) {
+	if (inf == NULL)
+	        {
 		if (bufsize != NULL)
 			setvbuf(stdin, (char *)NULL, _IONBF, 0);
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    } else {
+	        }
-        if (BIO_read_filename(in, inf) <= 0) {
+	else
+		{
+		if (BIO_read_filename(in,inf) <= 0)
+			{
 			perror(inf);
 			goto end;
 			}
 		}
 
-    if (!str && passarg) {
+	if(!str && passarg) {
-        if (!app_passwd(bio_err, passarg, NULL, &pass, NULL)) {
+		if(!app_passwd(bio_err, passarg, NULL, &pass, NULL)) {
 			BIO_printf(bio_err, "Error getting password\n");
 			goto end;
 		}
 		str = pass;
 	}
 
-    if ((str == NULL) && (cipher != NULL) && (hkey == NULL)) {
+	if ((str == NULL) && (cipher != NULL) && (hkey == NULL))
-        for (;;) {
+		{
+		for (;;)
+			{
 			char buf[200];
 
-            BIO_snprintf(buf, sizeof buf, "enter %s %s password:",
+			BIO_snprintf(buf,sizeof buf,"enter %s %s password:",
 				     OBJ_nid2ln(EVP_CIPHER_nid(cipher)),
-                         (enc) ? "encryption" : "decryption");
+				     (enc)?"encryption":"decryption");
-            strbuf[0] = '\0';
+			strbuf[0]='\0';
-            i = EVP_read_pw_string((char *)strbuf, SIZE, buf, enc);
+			i=EVP_read_pw_string((char *)strbuf,SIZE,buf,enc);
-            if (i == 0) {
+			if (i == 0)
-                if (strbuf[0] == '\0') {
+				{
-                    ret = 1;
+				if (strbuf[0] == '\0')
+					{
+					ret=1;
 					goto end;
 					}
-                str = strbuf;
+				str=strbuf;
 				break;
 				}
-            if (i < 0) {
+			if (i < 0)
-                BIO_printf(bio_err, "bad password read\n");
+				{
+				BIO_printf(bio_err,"bad password read\n");
 				goto end;
 				}
 			}
 		}
 
-    if (outf == NULL) {
+
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+	if (outf == NULL)
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 		if (bufsize != NULL)
 			setvbuf(stdout, (char *)NULL, _IONBF, 0);
 #ifdef OPENSSL_SYS_VMS
@@ -414,123 +439,129 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outf) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outf) <= 0)
+			{
 			perror(outf);
 			goto end;
 			}
 		}
 
-    rbio = in;
+	rbio=in;
-    wbio = out;
+	wbio=out;
 
-    if (base64) {
+	if (base64)
-        if ((b64 = BIO_new(BIO_f_base64())) == NULL)
+		{
+		if ((b64=BIO_new(BIO_f_base64())) == NULL)
 			goto end;
-        if (debug) {
+		if (debug)
-            BIO_set_callback(b64, BIO_debug_callback);
+			{
-            BIO_set_callback_arg(b64, (char *)bio_err);
+			BIO_set_callback(b64,BIO_debug_callback);
+			BIO_set_callback_arg(b64,(char *)bio_err);
 			}
 		if (olb64)
-            BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+			BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
 		if (enc)
-            wbio = BIO_push(b64, wbio);
+			wbio=BIO_push(b64,wbio);
 		else
-            rbio = BIO_push(b64, rbio);
+			rbio=BIO_push(b64,rbio);
 		}
 
-    if (cipher != NULL) {
+	if (cipher != NULL)
-        /*
+		{
-         * Note that str is NULL if a key was passed on the command line, so
+		/* Note that str is NULL if a key was passed on the command
-         * we get no salt in that case. Is this a bug?
+		 * line, so we get no salt in that case. Is this a bug?
 		 */
-        if (str != NULL) {
+		if (str != NULL)
-            /*
+			{
-             * Salt handling: if encrypting generate a salt and write to
+			/* Salt handling: if encrypting generate a salt and
-             * output BIO. If decrypting read salt from input BIO.
+			 * write to output BIO. If decrypting read salt from
+			 * input BIO.
 			 */
 			unsigned char *sptr;
-            if (nosalt)
+			if(nosalt) sptr = NULL;
-                sptr = NULL;
 			else {
-                if (enc) {
+				if(enc) {
-                    if (hsalt) {
+					if(hsalt) {
-                        if (!set_hex(hsalt, salt, sizeof salt)) {
+						if(!set_hex(hsalt,salt,sizeof salt)) {
-                            BIO_printf(bio_err, "invalid hex salt value\n");
+							BIO_printf(bio_err,
+								"invalid hex salt value\n");
 							goto end;
 						}
 					} else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
 						goto end;
-                    /*
+					/* If -P option then don't bother writing */
-                     * If -P option then don't bother writing
+					if((printkey != 2)
-                     */
+					   && (BIO_write(wbio,magic,
-                    if ((printkey != 2)
+							 sizeof magic-1) != sizeof magic-1
-                        && (BIO_write(wbio, magic,
-                                      sizeof magic - 1) != sizeof magic - 1
 					       || BIO_write(wbio,
 							    (char *)salt,
 							    sizeof salt) != sizeof salt)) {
-                        BIO_printf(bio_err, "error writing output file\n");
+						BIO_printf(bio_err,"error writing output file\n");
 						goto end;
 					}
-                } else if (BIO_read(rbio, mbuf, sizeof mbuf) != sizeof mbuf
+				} else if(BIO_read(rbio,mbuf,sizeof mbuf) != sizeof mbuf
 					  || BIO_read(rbio,
 						      (unsigned char *)salt,
 				    sizeof salt) != sizeof salt) {
-                    BIO_printf(bio_err, "error reading input file\n");
+					BIO_printf(bio_err,"error reading input file\n");
 					goto end;
-                } else if (memcmp(mbuf, magic, sizeof magic - 1)) {
+				} else if(memcmp(mbuf,magic,sizeof magic-1)) {
-                    BIO_printf(bio_err, "bad magic number\n");
+				    BIO_printf(bio_err,"bad magic number\n");
 				    goto end;
 				}
 
 				sptr = salt;
 			}
 
-            EVP_BytesToKey(cipher, dgst, sptr,
+			EVP_BytesToKey(cipher,dgst,sptr,
-                           (unsigned char *)str, strlen(str), 1, key, iv);
+				(unsigned char *)str,
-            /*
+				strlen(str),1,key,iv);
-             * zero the complete buffer or the string passed from the command
+			/* zero the complete buffer or the string
-             * line bug picked up by Larry J. Hughes Jr. <hughes@indiana.edu>
+			 * passed from the command line
-             */
+			 * bug picked up by
+			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 			if (str == strbuf)
-                OPENSSL_cleanse(str, SIZE);
+				OPENSSL_cleanse(str,SIZE);
 			else
-                OPENSSL_cleanse(str, strlen(str));
+				OPENSSL_cleanse(str,strlen(str));
 			}
-        if ((hiv != NULL) && !set_hex(hiv, iv, sizeof iv)) {
+		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
-            BIO_printf(bio_err, "invalid hex iv value\n");
+			{
+			BIO_printf(bio_err,"invalid hex iv value\n");
 			goto end;
 			}
-        if ((hiv == NULL) && (str == NULL)
+		if ((hiv == NULL) && (str == NULL))
-            && EVP_CIPHER_iv_length(cipher) != 0) {
+			{
-            /*
+			/* No IV was explicitly set and no IV was generated
-             * No IV was explicitly set and no IV was generated during
+			 * during EVP_BytesToKey. Hence the IV is undefined,
-             * EVP_BytesToKey. Hence the IV is undefined, making correct
+			 * making correct decryption impossible. */
-             * decryption impossible.
-             */
 			BIO_printf(bio_err, "iv undefined\n");
 			goto end;
 			}
-        if ((hkey != NULL) && !set_hex(hkey, key, sizeof key)) {
+		if ((hkey != NULL) && !set_hex(hkey,key,sizeof key))
-            BIO_printf(bio_err, "invalid hex key value\n");
+			{
+			BIO_printf(bio_err,"invalid hex key value\n");
 			goto end;
 			}
 
-        if ((benc = BIO_new(BIO_f_cipher())) == NULL)
+		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
 			goto end;
 
-        /*
+		/* Since we may be changing parameters work on the encryption
-         * Since we may be changing parameters work on the encryption context
+		 * context rather than calling BIO_set_cipher().
-         * rather than calling BIO_set_cipher().
 		 */
 
 		BIO_get_cipher_ctx(benc, &ctx);
 
 		if (non_fips_allow)
-            EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_NON_FIPS_ALLOW);
+			EVP_CIPHER_CTX_set_flags(ctx,
+				EVP_CIPH_FLAG_NON_FIPS_ALLOW);
 
-        if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)) {
+		if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
+			{
 			BIO_printf(bio_err, "Error setting cipher %s\n",
 				EVP_CIPHER_name(cipher));
 			ERR_print_errors(bio_err);
@@ -540,39 +571,46 @@ int MAIN(int argc, char **argv)
 		if (nopad)
 			EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-        if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc)) {
+		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
+			{
 			BIO_printf(bio_err, "Error setting cipher %s\n",
 				EVP_CIPHER_name(cipher));
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 
-        if (debug) {
+		if (debug)
-            BIO_set_callback(benc, BIO_debug_callback);
+			{
-            BIO_set_callback_arg(benc, (char *)bio_err);
+			BIO_set_callback(benc,BIO_debug_callback);
+			BIO_set_callback_arg(benc,(char *)bio_err);
 			}
 
-        if (printkey) {
+		if (printkey)
-            if (!nosalt) {
+			{
+			if (!nosalt)
+				{
 				printf("salt=");
-                for (i = 0; i < (int)sizeof(salt); i++)
+				for (i=0; i<(int)sizeof(salt); i++)
-                    printf("%02X", salt[i]);
+					printf("%02X",salt[i]);
 				printf("\n");
 				}
-            if (cipher->key_len > 0) {
+			if (cipher->key_len > 0)
+				{
 				printf("key=");
-                for (i = 0; i < cipher->key_len; i++)
+				for (i=0; i<cipher->key_len; i++)
-                    printf("%02X", key[i]);
+					printf("%02X",key[i]);
 				printf("\n");
 				}
-            if (cipher->iv_len > 0) {
+			if (cipher->iv_len > 0)
+				{
 				printf("iv =");
-                for (i = 0; i < cipher->iv_len; i++)
+				for (i=0; i<cipher->iv_len; i++)
-                    printf("%02X", iv[i]);
+					printf("%02X",iv[i]);
 				printf("\n");
 				}
-            if (printkey == 2) {
+			if (printkey == 2)
-                ret = 0;
+				{
+				ret=0;
 				goto end;
 				}
 			}
@@ -580,77 +618,75 @@ int MAIN(int argc, char **argv)
 
 	/* Only encrypt/decrypt as we write the file */
 	if (benc != NULL)
-        wbio = BIO_push(benc, wbio);
+		wbio=BIO_push(benc,wbio);
 
-    for (;;) {
+	for (;;)
-        inl = BIO_read(rbio, (char *)buff, bsize);
+		{
-        if (inl <= 0)
+		inl=BIO_read(rbio,(char *)buff,bsize);
-            break;
+		if (inl <= 0) break;
-        if (BIO_write(wbio, (char *)buff, inl) != inl) {
+		if (BIO_write(wbio,(char *)buff,inl) != inl)
-            BIO_printf(bio_err, "error writing output file\n");
+			{
+			BIO_printf(bio_err,"error writing output file\n");
 			goto end;
 			}
 		}
-    if (!BIO_flush(wbio)) {
+	if (!BIO_flush(wbio))
-        BIO_printf(bio_err, "bad decrypt\n");
+		{
+		BIO_printf(bio_err,"bad decrypt\n");
 		goto end;
 		}
 
-    ret = 0;
+	ret=0;
-    if (verbose) {
+	if (verbose)
-        BIO_printf(bio_err, "bytes read   :%8ld\n", BIO_number_read(in));
+		{
-        BIO_printf(bio_err, "bytes written:%8ld\n", BIO_number_written(out));
+		BIO_printf(bio_err,"bytes read   :%8ld\n",BIO_number_read(in));
+		BIO_printf(bio_err,"bytes written:%8ld\n",BIO_number_written(out));
 		}
- end:
+end:
 	ERR_print_errors(bio_err);
-    if (strbuf != NULL)
+	if (strbuf != NULL) OPENSSL_free(strbuf);
-        OPENSSL_free(strbuf);
+	if (buff != NULL) OPENSSL_free(buff);
-    if (buff != NULL)
+	if (in != NULL) BIO_free(in);
-        OPENSSL_free(buff);
+	if (out != NULL) BIO_free_all(out);
-    if (in != NULL)
+	if (benc != NULL) BIO_free(benc);
-        BIO_free(in);
+	if (b64 != NULL) BIO_free(b64);
-    if (out != NULL)
+	if(pass) OPENSSL_free(pass);
-        BIO_free_all(out);
-    if (benc != NULL)
-        BIO_free(benc);
-    if (b64 != NULL)
-        BIO_free(b64);
-    if (pass)
-        OPENSSL_free(pass);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 int set_hex(char *in, unsigned char *out, int size)
-{
+	{
-    int i, n;
+	int i,n;
 	unsigned char j;
 
-    n = strlen(in);
+	n=strlen(in);
-    if (n > (size * 2)) {
+	if (n > (size*2))
-        BIO_printf(bio_err, "hex string is too long\n");
+		{
-        return (0);
+		BIO_printf(bio_err,"hex string is too long\n");
+		return(0);
 		}
-    memset(out, 0, size);
+	memset(out,0,size);
-    for (i = 0; i < n; i++) {
+	for (i=0; i<n; i++)
-        j = (unsigned char)*in;
+		{
-        *(in++) = '\0';
+		j=(unsigned char)*in;
-        if (j == 0)
+		*(in++)='\0';
-            break;
+		if (j == 0) break;
 		if ((j >= '0') && (j <= '9'))
-            j -= '0';
+			j-='0';
 		else if ((j >= 'A') && (j <= 'F'))
-            j = j - 'A' + 10;
+			j=j-'A'+10;
 		else if ((j >= 'a') && (j <= 'f'))
-            j = j - 'a' + 10;
+			j=j-'a'+10;
-        else {
-            BIO_printf(bio_err, "non-hex digit\n");
-            return (0);
-        }
-        if (i & 1)
-            out[i / 2] |= j;
 		else
-            out[i / 2] = (j << 4);
+			{
+			BIO_printf(bio_err,"non-hex digit\n");
+			return(0);
+			}
+		if (i&1)
+			out[i/2]|=j;
+		else
+			out[i/2]=(j<<4);
+		}
+	return(1);
 	}
-    return (1);
-}

apps/engine.c

@@ -1,7 +1,6 @@
 /* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/*
+/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
- * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * project 2000.
- * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -57,51 +56,53 @@
  *
  */
 
+#ifndef OPENSSL_NO_ENGINE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-# define APPS_WIN16
+#define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
-#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
-# include <openssl/engine.h>
+#include <openssl/ssl.h>
-# include <openssl/ssl.h>
 
-# undef PROG
+#undef PROG
-# define PROG    engine_main
+#define PROG	engine_main
 
-static const char *engine_usage[] = {
+static const char *engine_usage[]={
-    "usage: engine opts [engine ...]\n",
+"usage: engine opts [engine ...]\n",
-    " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
+" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
-    "               -vv will additionally display each command's description\n",
+"               -vv will additionally display each command's description\n",
-    "               -vvv will also add the input flags for each command\n",
+"               -vvv will also add the input flags for each command\n",
-    "               -vvvv will also show internal input flags\n",
+"               -vvvv will also show internal input flags\n",
-    " -c          - for each engine, also list the capabilities\n",
+" -c          - for each engine, also list the capabilities\n",
-    " -t[t]       - for each engine, check that they are really available\n",
+" -t[t]       - for each engine, check that they are really available\n",
-    "               -tt will display error trace for unavailable engines\n",
+"               -tt will display error trace for unavailable engines\n",
-    " -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
+" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
-    "               to load it (if -t is used)\n",
+"               to load it (if -t is used)\n",
-    " -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
+" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
-    "               (only used if -t is also provided)\n",
+"               (only used if -t is also provided)\n",
-    " NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
+" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
-    " line, or all supported ENGINEs if none are specified.\n",
+" line, or all supported ENGINEs if none are specified.\n",
-    " Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
+" Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
-    " argument \"/lib/libdriver.so\".\n",
+" argument \"/lib/libdriver.so\".\n",
-    NULL
+NULL
 };
 
 static void identity(void *ptr)
-{
+	{
 	return;
-}
+	}
 
 static int append_buf(char **buf, const char *s, int *size, int step)
-{
+	{
 	int l = strlen(s);
 
-    if (*buf == NULL) {
+	if (*buf == NULL)
+		{
 		*size = step;
 		*buf = OPENSSL_malloc(*size);
 		if (*buf == NULL)
@@ -112,7 +113,8 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 	if (**buf != '\0')
 		l += 2;		/* ", " */
 
-    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
+	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
+		{
 		*size += step;
 		*buf = OPENSSL_realloc(*buf, *size);
 		}
@@ -125,49 +127,53 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 	BUF_strlcat(*buf, s, *size);
 
 	return 1;
-}
+	}
 
 static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
-{
+	{
 	int started = 0, err = 0;
 	/* Indent before displaying input flags */
 	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-    if (flags == 0) {
+	if(flags == 0)
+		{
 		BIO_printf(bio_out, "<no flags>\n");
 		return 1;
 		}
-    /*
+        /* If the object is internal, mark it in a way that shows instead of
-     * If the object is internal, mark it in a way that shows instead of
+         * having it part of all the other flags, even if it really is. */
-     * having it part of all the other flags, even if it really is.
+	if(flags & ENGINE_CMD_FLAG_INTERNAL)
-     */
+		{
-    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
 		BIO_printf(bio_out, "[Internal] ");
 		}
 
-    if (flags & ENGINE_CMD_FLAG_NUMERIC) {
+	if(flags & ENGINE_CMD_FLAG_NUMERIC)
-        if (started) {
+		{
+		if(started)
+			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "NUMERIC");
 		started = 1;
 		}
-    /*
+	/* Now we check that no combinations of the mutually exclusive NUMERIC,
-     * Now we check that no combinations of the mutually exclusive NUMERIC,
 	 * STRING, and NO_INPUT flags have been used. Future flags that can be
 	 * OR'd together with these would need to added after these to preserve
-     * the testing logic.
+	 * the testing logic. */
-     */
+	if(flags & ENGINE_CMD_FLAG_STRING)
-    if (flags & ENGINE_CMD_FLAG_STRING) {
+		{
-        if (started) {
+		if(started)
+			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "STRING");
 		started = 1;
 		}
-    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
+	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
-        if (started) {
+		{
+		if(started)
+			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
@@ -177,21 +183,21 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
 	/* Check for unknown flags */
 	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
 			~ENGINE_CMD_FLAG_STRING &
-        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
+			~ENGINE_CMD_FLAG_NO_INPUT &
-    if (flags) {
+			~ENGINE_CMD_FLAG_INTERNAL;
-        if (started)
+	if(flags)
-            BIO_printf(bio_out, "|");
+		{
+		if(started) BIO_printf(bio_out, "|");
 		BIO_printf(bio_out, "<0x%04X>", flags);
 		}
-    if (err)
+	if(err)
 		BIO_printf(bio_out, "  <illegal flags!>");
 	BIO_printf(bio_out, "\n");
 	return 1;
-}
+	}
 
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
-                        const char *indent)
+	{
-{
 	static const int line_wrap = 78;
 	int num;
 	int ret = 0;
@@ -200,311 +206,337 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
 	int flags;
 	int xpos = 0;
 	STACK *cmds = NULL;
-    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
+	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
 			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-                            0, NULL, NULL)) <= 0)) {
+					0, NULL, NULL)) <= 0))
-# if 0
+		{
+#if 0
 		BIO_printf(bio_out, "%s<no control commands>\n", indent);
-# endif
+#endif
 		return 1;
 		}
 
 	cmds = sk_new_null();
 
-    if (!cmds)
+	if(!cmds)
 		goto err;
 	do {
 		int len;
 		/* Get the command input flags */
-        if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
+		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
 					NULL, NULL)) < 0)
 			goto err;
-        if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
+                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
+                        {
                         /* Get the command name */
-            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
+                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
                                 NULL, NULL)) <= 0)
                                 goto err;
-            if ((name = OPENSSL_malloc(len + 1)) == NULL)
+                        if((name = OPENSSL_malloc(len + 1)) == NULL)
                                 goto err;
-            if (ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
+                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
                                 NULL) <= 0)
                                 goto err;
                         /* Get the command description */
-            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
                                 NULL, NULL)) < 0)
                                 goto err;
-            if (len > 0) {
+                        if(len > 0)
-                if ((desc = OPENSSL_malloc(len + 1)) == NULL)
+                                {
+                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
                                         goto err;
-                if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
+                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
                                         NULL) <= 0)
                                         goto err;
                                 }
                         /* Now decide on the output */
-            if (xpos == 0)
+                        if(xpos == 0)
                                 /* Do an indent */
-                xpos = BIO_puts(bio_out, indent);
+                                xpos = BIO_printf(bio_out, indent);
                         else
                                 /* Otherwise prepend a ", " */
                                 xpos += BIO_printf(bio_out, ", ");
-            if (verbose == 1) {
+                        if(verbose == 1)
-                /*
+                                {
-                 * We're just listing names, comma-delimited
+                                /* We're just listing names, comma-delimited */
-                 */
+                                if((xpos > (int)strlen(indent)) &&
-                if ((xpos > (int)strlen(indent)) &&
+					(xpos + (int)strlen(name) > line_wrap))
-                    (xpos + (int)strlen(name) > line_wrap)) {
+                                        {
                                         BIO_printf(bio_out, "\n");
-                    xpos = BIO_puts(bio_out, indent);
+                                        xpos = BIO_printf(bio_out, indent);
                                         }
                                 xpos += BIO_printf(bio_out, "%s", name);
-            } else {
+                                }
+                        else
+                                {
                                 /* We're listing names plus descriptions */
                                 BIO_printf(bio_out, "%s: %s\n", name,
                                         (desc == NULL) ? "<no description>" : desc);
                                 /* ... and sometimes input flags */
-                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
+                                if((verbose >= 3) && !util_flags(bio_out, flags,
+                                        indent))
                                         goto err;
                                 xpos = 0;
                                 }
                         }
-        OPENSSL_free(name);
+		OPENSSL_free(name); name = NULL;
-        name = NULL;
+		if(desc) { OPENSSL_free(desc); desc = NULL; }
-        if (desc) {
-            OPENSSL_free(desc);
-            desc = NULL;
-        }
 		/* Move to the next command */
-        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
+		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
-    } while (num > 0);
+					num, NULL, NULL);
-    if (xpos > 0)
+		} while(num > 0);
+	if(xpos > 0)
 		BIO_printf(bio_out, "\n");
 	ret = 1;
- err:
+err:
-    if (cmds)
+	if(cmds) sk_pop_free(cmds, identity);
-        sk_pop_free(cmds, identity);
+	if(name) OPENSSL_free(name);
-    if (name)
+	if(desc) OPENSSL_free(desc);
-        OPENSSL_free(name);
-    if (desc)
-        OPENSSL_free(desc);
 	return ret;
-}
+	}
 
-static void util_do_cmds(ENGINE *e, STACK * cmds, BIO *bio_out,
+static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
-                         const char *indent)
+	{
-{
 	int loop, res, num = sk_num(cmds);
-    if (num < 0) {
+	if(num < 0)
+		{
 		BIO_printf(bio_out, "[Error]: internal stack error\n");
 		return;
 		}
-    for (loop = 0; loop < num; loop++) {
+	for(loop = 0; loop < num; loop++)
+		{
 		char buf[256];
 		const char *cmd, *arg;
 		cmd = sk_value(cmds, loop);
 		res = 1; /* assume success */
 		/* Check if this command has no ":arg" */
-        if ((arg = strstr(cmd, ":")) == NULL) {
+		if((arg = strstr(cmd, ":")) == NULL)
-            if (!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
+			{
+			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
 				res = 0;
-        } else {
+			}
-            if ((int)(arg - cmd) > 254) {
+		else
-                BIO_printf(bio_out, "[Error]: command name too long\n");
+			{
+			if((int)(arg - cmd) > 254)
+				{
+				BIO_printf(bio_out,"[Error]: command name too long\n");
 				return;
 				}
 			memcpy(buf, cmd, (int)(arg - cmd));
-            buf[arg - cmd] = '\0';
+			buf[arg-cmd] = '\0';
 			arg++; /* Move past the ":" */
 			/* Call the command with the argument */
-            if (!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
+			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
 				res = 0;
 			}
-        if (res)
+		if(res)
 			BIO_printf(bio_out, "[Success]: %s\n", cmd);
-        else {
+		else
+			{
 			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
 			ERR_print_errors(bio_out);
 			}
 		}
-}
+	}
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int ret = 1, i;
+	int ret=1,i;
 	const char **pp;
-    int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
+	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
 	ENGINE *e;
 	STACK *engines = sk_new_null();
 	STACK *pre_cmds = sk_new_null();
 	STACK *post_cmds = sk_new_null();
-    int badops = 1;
+	int badops=1;
-    BIO *bio_out = NULL;
+	BIO *bio_out=NULL;
 	const char *indent = "     ";
 
 	apps_startup();
 	SSL_load_error_strings();
 
 	if (bio_err == NULL)
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
-    bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
+	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	bio_out = BIO_push(tmpbio, bio_out);
 	}
-# endif
+#endif
 
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strncmp(*argv, "-v", 2) == 0) {
+		{
-            if (strspn(*argv + 1, "v") < strlen(*argv + 1))
+		if (strncmp(*argv,"-v",2) == 0)
+			{
+			if(strspn(*argv + 1, "v") < strlen(*argv + 1))
 				goto skip_arg_loop;
-            if ((verbose = strlen(*argv + 1)) > 4)
+			if((verbose=strlen(*argv + 1)) > 4)
 				goto skip_arg_loop;
-        } else if (strcmp(*argv, "-c") == 0)
+			}
-            list_cap = 1;
+		else if (strcmp(*argv,"-c") == 0)
-        else if (strncmp(*argv, "-t", 2) == 0) {
+			list_cap=1;
-            test_avail = 1;
+		else if (strncmp(*argv,"-t",2) == 0)
-            if (strspn(*argv + 1, "t") < strlen(*argv + 1))
+			{
+			test_avail=1;
+			if(strspn(*argv + 1, "t") < strlen(*argv + 1))
 				goto skip_arg_loop;
-            if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
+			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
 				goto skip_arg_loop;
-        } else if (strcmp(*argv, "-pre") == 0) {
+			}
-            argc--;
+		else if (strcmp(*argv,"-pre") == 0)
-            argv++;
+			{
+			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-            sk_push(pre_cmds, *argv);
+			sk_push(pre_cmds,*argv);
-        } else if (strcmp(*argv, "-post") == 0) {
+			}
-            argc--;
+		else if (strcmp(*argv,"-post") == 0)
-            argv++;
+			{
+			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-            sk_push(post_cmds, *argv);
+			sk_push(post_cmds,*argv);
-        } else if ((strncmp(*argv, "-h", 2) == 0) ||
+			}
-                   (strcmp(*argv, "-?") == 0))
+		else if ((strncmp(*argv,"-h",2) == 0) ||
+				(strcmp(*argv,"-?") == 0))
 			goto skip_arg_loop;
 		else
-            sk_push(engines, *argv);
+			sk_push(engines,*argv);
 		argc--;
 		argv++;
 		}
 	/* Looks like everything went OK */
 	badops = 0;
- skip_arg_loop:
+skip_arg_loop:
 
-    if (badops) {
+	if (badops)
-        for (pp = engine_usage; (*pp != NULL); pp++)
+		{
-            BIO_printf(bio_err, "%s", *pp);
+		for (pp=engine_usage; (*pp != NULL); pp++)
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
-    if (sk_num(engines) == 0) {
+	if (sk_num(engines) == 0)
-        for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
+		{
-            sk_push(engines, (char *)ENGINE_get_id(e));
+		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
+			{
+			sk_push(engines,(char *)ENGINE_get_id(e));
 			}
 		}
 
-    for (i = 0; i < sk_num(engines); i++) {
+	for (i=0; i<sk_num(engines); i++)
-        const char *id = sk_value(engines, i);
+		{
-        if ((e = ENGINE_by_id(id)) != NULL) {
+		const char *id = sk_value(engines,i);
+		if ((e = ENGINE_by_id(id)) != NULL)
+			{
 			const char *name = ENGINE_get_name(e);
-            /*
+			/* Do "id" first, then "name". Easier to auto-parse. */
-             * Do "id" first, then "name". Easier to auto-parse.
-             */
 			BIO_printf(bio_out, "(%s) %s\n", id, name);
 			util_do_cmds(e, pre_cmds, bio_out, indent);
-            if (strcmp(ENGINE_get_id(e), id) != 0) {
+			if (strcmp(ENGINE_get_id(e), id) != 0)
+				{
 				BIO_printf(bio_out, "Loaded: (%s) %s\n",
 					ENGINE_get_id(e), ENGINE_get_name(e));
 				}
-            if (list_cap) {
+			if (list_cap)
+				{
 				int cap_size = 256;
 				char *cap_buf = NULL;
-                int k, n;
+				int k,n;
 				const int *nids;
 				ENGINE_CIPHERS_PTR fn_c;
 				ENGINE_DIGESTS_PTR fn_d;
 
 				if (ENGINE_get_RSA(e) != NULL
-                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
+					&& !append_buf(&cap_buf, "RSA",
+						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_DSA(e) != NULL
-                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
+					&& !append_buf(&cap_buf, "DSA",
+						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_DH(e) != NULL
-                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
+					&& !append_buf(&cap_buf, "DH",
+						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_RAND(e) != NULL
-                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
+					&& !append_buf(&cap_buf, "RAND",
+						&cap_size, 256))
 					goto end;
 
 				fn_c = ENGINE_get_ciphers(e);
-                if (!fn_c)
+				if(!fn_c) goto skip_ciphers;
-                    goto skip_ciphers;
 				n = fn_c(e, NULL, &nids, 0);
-                for (k = 0; k < n; ++k)
+				for(k=0 ; k < n ; ++k)
-                    if (!append_buf(&cap_buf,
+					if(!append_buf(&cap_buf,
-                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
+						       OBJ_nid2sn(nids[k]),
+						       &cap_size, 256))
 						goto end;
 
- skip_ciphers:
+skip_ciphers:
 				fn_d = ENGINE_get_digests(e);
-                if (!fn_d)
+				if(!fn_d) goto skip_digests;
-                    goto skip_digests;
 				n = fn_d(e, NULL, &nids, 0);
-                for (k = 0; k < n; ++k)
+				for(k=0 ; k < n ; ++k)
-                    if (!append_buf(&cap_buf,
+					if(!append_buf(&cap_buf,
-                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
+						       OBJ_nid2sn(nids[k]),
+						       &cap_size, 256))
 						goto end;
 
- skip_digests:
+skip_digests:
 				if (cap_buf && (*cap_buf != '\0'))
 					BIO_printf(bio_out, " [%s]\n", cap_buf);
 
 				OPENSSL_free(cap_buf);
 				}
-            if (test_avail) {
+			if(test_avail)
+				{
 				BIO_printf(bio_out, "%s", indent);
-                if (ENGINE_init(e)) {
+				if (ENGINE_init(e))
+					{
 					BIO_printf(bio_out, "[ available ]\n");
 					util_do_cmds(e, post_cmds, bio_out, indent);
 					ENGINE_finish(e);
-                } else {
+					}
+				else
+					{
 					BIO_printf(bio_out, "[ unavailable ]\n");
-                    if (test_avail_noise)
+					if(test_avail_noise)
 						ERR_print_errors_fp(stdout);
 					ERR_clear_error();
 					}
 				}
-            if ((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
+			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
 				goto end;
 			ENGINE_free(e);
-        } else
+			}
+		else
 			ERR_print_errors(bio_err);
 		}
 
-    ret = 0;
+	ret=0;
- end:
+end:
 
 	ERR_print_errors(bio_err);
 	sk_pop_free(engines, identity);
 	sk_pop_free(pre_cmds, identity);
 	sk_pop_free(post_cmds, identity);
-    if (bio_out != NULL)
+	if (bio_out != NULL) BIO_free_all(bio_out);
-        BIO_free_all(bio_out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 #else
 
 # if PEDANTIC
-static void *dummy = &dummy;
+static void *dummy=&dummy;
 # endif
 
 #endif

apps/errstr.c

@@ -71,51 +71,56 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int i, ret = 0;
+	int i,ret=0;
 	char buf[256];
 	unsigned long l;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	SSL_load_error_strings();
 
-    if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
+	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
-        BIO *out = NULL;
+		{
+		BIO *out=NULL;
 
-        out = BIO_new(BIO_s_file());
+		out=BIO_new(BIO_s_file());
-        if ((out != NULL) && BIO_set_fp(out, stdout, BIO_NOCLOSE)) {
+		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
+			{
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
 			}
 #endif
-            lh_node_stats_bio((LHASH *)ERR_get_string_table(), out);
+			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
-            lh_stats_bio((LHASH *)ERR_get_string_table(), out);
+			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
 			lh_node_usage_stats_bio((LHASH *)
-                                    ERR_get_string_table(), out);
+				ERR_get_string_table(),out);
 			}
-        if (out != NULL)
+		if (out != NULL) BIO_free_all(out);
-            BIO_free_all(out);
 		argc--;
 		argv++;
 		}
 
-    for (i = 1; i < argc; i++) {
+	for (i=1; i<argc; i++)
-        if (sscanf(argv[i], "%lx", &l)) {
+		{
+		if (sscanf(argv[i],"%lx",&l))
+			{
 			ERR_error_string_n(l, buf, sizeof buf);
-            printf("%s\n", buf);
+			printf("%s\n",buf);
-        } else {
+			}
-            printf("%s: bad error code\n", argv[i]);
+		else
+			{
+			printf("%s: bad error code\n",argv[i]);
 			printf("usage: errstr [-stats] <errno> ...\n");
 			ret++;
 			}
 		}
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}

apps/gendh.c

@@ -58,185 +58,181 @@
  */
 
 #include <openssl/opensslconf.h>
-/*
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
- * deprecated functions for openssl-internal code
- */
 #ifdef OPENSSL_NO_DEPRECATED
-# undef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DH
-# include <stdio.h>
+#include <stdio.h>
-# include <string.h>
+#include <string.h>
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/rand.h>
+#include <openssl/rand.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dh.h>
+#include <openssl/dh.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# define DEFBITS 512
+#define DEFBITS	512
-# undef PROG
+#undef PROG
-# define PROG gendh_main
+#define PROG gendh_main
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	BN_GENCB cb;
-    DH *dh = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    int ret = 1, num = DEFBITS;
+	ENGINE *e = NULL;
-    int g = 2;
+#endif
-    char *outfile = NULL;
+	DH *dh=NULL;
-    char *inrand = NULL;
+	int ret=1,num=DEFBITS;
-# ifndef OPENSSL_NO_ENGINE
+	int g=2;
-    char *engine = NULL;
+	char *outfile=NULL;
-# endif
+	char *inrand=NULL;
-    BIO *out = NULL;
+#ifndef OPENSSL_NO_ENGINE
+	char *engine=NULL;
+#endif
+	BIO *out=NULL;
 
 	apps_startup();
 
 	BN_GENCB_set(&cb, dh_cb, bio_err);
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	argv++;
 	argc--;
-    for (;;) {
+	for (;;)
-        if (argc <= 0)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            outfile = *(++argv);
+			outfile= *(++argv);
-        } else if (strcmp(*argv, "-2") == 0)
-            g = 2;
-/*-     else if (strcmp(*argv,"-3") == 0)
-                g=3; */
-        else if (strcmp(*argv, "-5") == 0)
-            g = 5;
-# ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
-            if (--argc < 1)
-                goto bad;
-            engine = *(++argv);
 			}
-# endif
+		else if (strcmp(*argv,"-2") == 0)
-        else if (strcmp(*argv, "-rand") == 0) {
+			g=2;
-            if (--argc < 1)
+	/*	else if (strcmp(*argv,"-3") == 0)
-                goto bad;
+			g=3; */
-            inrand = *(++argv);
+		else if (strcmp(*argv,"-5") == 0)
-        } else
+			g=5;
+#ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+#endif
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) goto bad;
+			inrand= *(++argv);
+			}
+		else
 			break;
 		argv++;
 		argc--;
 		}
-    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
+	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
- bad:
+		{
-        BIO_printf(bio_err, "usage: gendh [args] [numbits]\n");
+bad:
-        BIO_printf(bio_err, " -out file - output the key to 'file\n");
+		BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
-        BIO_printf(bio_err, " -2        - use 2 as the generator value\n");
+		BIO_printf(bio_err," -out file - output the key to 'file\n");
-        /*
+		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
-         * BIO_printf(bio_err," -3 - use 3 as the generator value\n");
+	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
-         */
+		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
-        BIO_printf(bio_err, " -5        - use 5 as the generator value\n");
+#ifndef OPENSSL_NO_ENGINE
-# ifndef OPENSSL_NO_ENGINE
+		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
-        BIO_printf(bio_err,
+#endif
-                   " -engine e - use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-# endif
+		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err,"             the random number generator\n");
-                   LIST_SEPARATOR_CHAR);
-        BIO_printf(bio_err,
-                   "           - load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err, "             the random number generator\n");
 		goto end;
 		}
-# ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
-# endif
 		
-    out = BIO_new(BIO_s_file());
+#ifndef OPENSSL_NO_ENGINE
-    if (out == NULL) {
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+	out=BIO_new(BIO_s_file());
+	if (out == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
-        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 
-    BIO_printf(bio_err,
+	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
-               "Generating DH parameters, %d bit long safe prime, generator %d\n",
+	BIO_printf(bio_err,"This is going to take a long time\n");
-               num, g);
-    BIO_printf(bio_err, "This is going to take a long time\n");
 
-    if (((dh = DH_new()) == NULL)
+	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
-        || !DH_generate_parameters_ex(dh, num, g, &cb))
 		goto end;
 		
 	app_RAND_write_file(NULL, bio_err);
 
-    if (!PEM_write_bio_DHparams(out, dh))
+	if (!PEM_write_bio_DHparams(out,dh))
 		goto end;
-    ret = 0;
+	ret=0;
- end:
+end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (out != NULL)
+	if (out != NULL) BIO_free_all(out);
-        BIO_free_all(out);
+	if (dh != NULL) DH_free(dh);
-    if (dh != NULL)
-        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-{
+	{
-    char c = '*';
+	char c='*';
 
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write(cb->arg,&c,1);
-        c = '*';
-    if (p == 3)
-        c = '\n';
-    BIO_write(cb->arg, &c, 1);
 	(void)BIO_flush(cb->arg);
-# ifdef LINT
+#ifdef LINT
-    p = n;
+	p=n;
-# endif
+#endif
-    return 1;
+	return 1;
-}
+	}
 #endif

apps/gendsa.c

@@ -58,230 +58,225 @@
 
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-# include <stdio.h>
+#include <stdio.h>
-# include <string.h>
+#include <string.h>
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
 
-# define DEFBITS 512
+#define DEFBITS	512
-# undef PROG
+#undef PROG
-# define PROG gendsa_main
+#define PROG gendsa_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    DSA *dsa = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    int ret = 1;
+	ENGINE *e = NULL;
-    char *outfile = NULL;
+#endif
-    char *inrand = NULL, *dsaparams = NULL;
+	DSA *dsa=NULL;
+	int ret=1;
+	char *outfile=NULL;
+	char *inrand=NULL,*dsaparams=NULL;
 	char *passargout = NULL, *passout = NULL;
-    BIO *out = NULL, *in = NULL;
+	BIO *out=NULL,*in=NULL;
-    const EVP_CIPHER *enc = NULL;
+	const EVP_CIPHER *enc=NULL;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
-# endif
+#endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	argv++;
 	argc--;
-    for (;;) {
+	for (;;)
-        if (argc <= 0)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            outfile = *(++argv);
+			outfile= *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
-            if (--argc < 1)
-                goto bad;
-            passargout = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-passout") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			passargout= *(++argv);
-            engine = *(++argv);
 			}
-# endif
+#ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+#endif
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) goto bad;
+			inrand= *(++argv);
+			}
+		else if (strcmp(*argv,"-") == 0)
 			goto bad;
-            inrand = *(++argv);
+#ifndef OPENSSL_NO_DES
-        } else if (strcmp(*argv, "-") == 0)
+		else if (strcmp(*argv,"-des") == 0)
-            goto bad;
+			enc=EVP_des_cbc();
-# ifndef OPENSSL_NO_DES
+		else if (strcmp(*argv,"-des3") == 0)
-        else if (strcmp(*argv, "-des") == 0)
+			enc=EVP_des_ede3_cbc();
-            enc = EVP_des_cbc();
+#endif
-        else if (strcmp(*argv, "-des3") == 0)
+#ifndef OPENSSL_NO_IDEA
-            enc = EVP_des_ede3_cbc();
+		else if (strcmp(*argv,"-idea") == 0)
-# endif
+			enc=EVP_idea_cbc();
-# ifndef OPENSSL_NO_IDEA
+#endif
-        else if (strcmp(*argv, "-idea") == 0)
+#ifndef OPENSSL_NO_SEED
-            enc = EVP_idea_cbc();
+		else if (strcmp(*argv,"-seed") == 0)
-# endif
+			enc=EVP_seed_cbc();
-# ifndef OPENSSL_NO_SEED
+#endif
-        else if (strcmp(*argv, "-seed") == 0)
+#ifndef OPENSSL_NO_AES
-            enc = EVP_seed_cbc();
+		else if (strcmp(*argv,"-aes128") == 0)
-# endif
+			enc=EVP_aes_128_cbc();
-# ifndef OPENSSL_NO_AES
+		else if (strcmp(*argv,"-aes192") == 0)
-        else if (strcmp(*argv, "-aes128") == 0)
+			enc=EVP_aes_192_cbc();
-            enc = EVP_aes_128_cbc();
+		else if (strcmp(*argv,"-aes256") == 0)
-        else if (strcmp(*argv, "-aes192") == 0)
+			enc=EVP_aes_256_cbc();
-            enc = EVP_aes_192_cbc();
+#endif
-        else if (strcmp(*argv, "-aes256") == 0)
+#ifndef OPENSSL_NO_CAMELLIA
-            enc = EVP_aes_256_cbc();
+		else if (strcmp(*argv,"-camellia128") == 0)
-# endif
+			enc=EVP_camellia_128_cbc();
-# ifndef OPENSSL_NO_CAMELLIA
+		else if (strcmp(*argv,"-camellia192") == 0)
-        else if (strcmp(*argv, "-camellia128") == 0)
+			enc=EVP_camellia_192_cbc();
-            enc = EVP_camellia_128_cbc();
+		else if (strcmp(*argv,"-camellia256") == 0)
-        else if (strcmp(*argv, "-camellia192") == 0)
+			enc=EVP_camellia_256_cbc();
-            enc = EVP_camellia_192_cbc();
+#endif
-        else if (strcmp(*argv, "-camellia256") == 0)
+		else if (**argv != '-' && dsaparams == NULL)
-            enc = EVP_camellia_256_cbc();
+			{
-# endif
-        else if (**argv != '-' && dsaparams == NULL) {
 			dsaparams = *argv;
-        } else
+			}
+		else
 			goto bad;
 		argv++;
 		argc--;
 		}
 
-    if (dsaparams == NULL) {
+	if (dsaparams == NULL)
- bad:
+		{
-        BIO_printf(bio_err, "usage: gendsa [args] dsaparam-file\n");
+bad:
-        BIO_printf(bio_err, " -out file - output the key to 'file'\n");
+		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
-# ifndef OPENSSL_NO_DES
+		BIO_printf(bio_err," -out file - output the key to 'file'\n");
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_DES
-                   " -des      - encrypt the generated key with DES in cbc mode\n");
+		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-                   " -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+#endif
-# endif
+#ifndef OPENSSL_NO_IDEA
-# ifndef OPENSSL_NO_IDEA
+		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
-        BIO_printf(bio_err,
+#endif
-                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
+#ifndef OPENSSL_NO_SEED
-# endif
+		BIO_printf(bio_err," -seed\n");
-# ifndef OPENSSL_NO_SEED
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
-        BIO_printf(bio_err, " -seed\n");
+#endif
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_AES
-                   "                 encrypt PEM output with cbc seed\n");
+		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-# endif
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
-# ifndef OPENSSL_NO_AES
+#endif
-        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
+#ifndef OPENSSL_NO_CAMELLIA
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
-                   "                 encrypt PEM output with cbc aes\n");
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
-# endif
+#endif
-# ifndef OPENSSL_NO_CAMELLIA
+#ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
-        BIO_printf(bio_err,
+#endif
-                   "                 encrypt PEM output with cbc camellia\n");
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-# endif
+		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
-# ifndef OPENSSL_NO_ENGINE
+		BIO_printf(bio_err,"             the random number generator\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," dsaparam-file\n");
-                   " -engine e - use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
-# endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-                   LIST_SEPARATOR_CHAR);
-        BIO_printf(bio_err,
-                   "           - load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err, "             the random number generator\n");
-        BIO_printf(bio_err, " dsaparam-file\n");
-        BIO_printf(bio_err,
-                   "           - a DSA parameter file as generated by the dsaparam command\n");
 		goto end;
 		}
-# ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
-# endif
 
-    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 	}
 
-    in = BIO_new(BIO_s_file());
+
-    if (!(BIO_read_filename(in, dsaparams))) {
+	in=BIO_new(BIO_s_file());
+	if (!(BIO_read_filename(in,dsaparams)))
+		{
 		perror(dsaparams);
 		goto end;
 		}
 
-    if ((dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL)) == NULL) {
+	if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
-        BIO_printf(bio_err, "unable to load DSA parameter file\n");
+		{
+		BIO_printf(bio_err,"unable to load DSA parameter file\n");
 		goto end;
 		}
 	BIO_free(in);
 	in = NULL;
 		
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if (out == NULL)
+	if (out == NULL) goto end;
-        goto end;
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
-        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 
-    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
+	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
-    if (!DSA_generate_key(dsa))
+							BN_num_bits(dsa->p));
-        goto end;
+	if (!DSA_generate_key(dsa)) goto end;
 
 	app_RAND_write_file(NULL, bio_err);
 
-    if (!PEM_write_bio_DSAPrivateKey(out, dsa, enc, NULL, 0, NULL, passout))
+	if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))
 		goto end;
-    ret = 0;
+	ret=0;
- end:
+end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dsa != NULL) DSA_free(dsa);
-        BIO_free_all(out);
+	if(passout) OPENSSL_free(passout);
-    if (dsa != NULL)
-        DSA_free(dsa);
-    if (passout)
-        OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
-#else                           /* !OPENSSL_NO_DSA */
-
-# if PEDANTIC
-static void *dummy = &dummy;
-# endif
-
 #endif

apps/genrsa.c

@@ -57,225 +57,220 @@
  */
 
 #include <openssl/opensslconf.h>
-/*
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
- * deprecated functions for openssl-internal code
- */
 #ifdef OPENSSL_NO_DEPRECATED
-# undef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_RSA
-# include <stdio.h>
+#include <stdio.h>
-# include <string.h>
+#include <string.h>
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/rsa.h>
+#include <openssl/rsa.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# include <openssl/rand.h>
+#include <openssl/rand.h>
 
-# define DEFBITS 512
+#define DEFBITS	512
-# undef PROG
+#undef PROG
-# define PROG genrsa_main
+#define PROG genrsa_main
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	BN_GENCB cb;
-    int ret = 1;
+#ifndef OPENSSL_NO_ENGINE
-    int i, num = DEFBITS;
+	ENGINE *e = NULL;
+#endif
+	int ret=1;
+	int i,num=DEFBITS;
 	long l;
 	int use_x931 = 0;
-    const EVP_CIPHER *enc = NULL;
+	const EVP_CIPHER *enc=NULL;
-    unsigned long f4 = RSA_F4;
+	unsigned long f4=RSA_F4;
-    char *outfile = NULL;
+	char *outfile=NULL;
 	char *passargout = NULL, *passout = NULL;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
-# endif
+#endif
-    char *inrand = NULL;
+	char *inrand=NULL;
-    BIO *out = NULL;
+	BIO *out=NULL;
 	BIGNUM *bn = BN_new();
-    RSA *rsa = NULL;
+	RSA *rsa = RSA_new();
 
-    if (!bn)
+	if(!bn || !rsa) goto err;
-        goto err;
 
 	apps_startup();
 	BN_GENCB_set(&cb, genrsa_cb, bio_err);
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto err;
-    if ((out = BIO_new(BIO_s_file())) == NULL) {
+	if ((out=BIO_new(BIO_s_file())) == NULL)
-        BIO_printf(bio_err, "unable to create BIO for output\n");
+		{
+		BIO_printf(bio_err,"unable to create BIO for output\n");
 		goto err;
 		}
 
 	argv++;
 	argc--;
-    for (;;) {
+	for (;;)
-        if (argc <= 0)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            outfile = *(++argv);
+			outfile= *(++argv);
-        } else if (strcmp(*argv, "-3") == 0)
+			}
-            f4 = 3;
+		else if (strcmp(*argv,"-3") == 0)
-        else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
+			f4=3;
-            f4 = RSA_F4;
+		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
-        else if (strcmp(*argv, "-x931") == 0)
+			f4=RSA_F4;
+		else if (strcmp(*argv,"-x931") == 0)
 			use_x931 = 1;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            engine = *(++argv);
+			engine= *(++argv);
 			}
-# endif
+#endif
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-rand") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            inrand = *(++argv);
+			inrand= *(++argv);
 			}
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
-        else if (strcmp(*argv, "-des") == 0)
+		else if (strcmp(*argv,"-des") == 0)
-            enc = EVP_des_cbc();
+			enc=EVP_des_cbc();
-        else if (strcmp(*argv, "-des3") == 0)
+		else if (strcmp(*argv,"-des3") == 0)
-            enc = EVP_des_ede3_cbc();
+			enc=EVP_des_ede3_cbc();
-# endif
+#endif
-# ifndef OPENSSL_NO_IDEA
+#ifndef OPENSSL_NO_IDEA
-        else if (strcmp(*argv, "-idea") == 0)
+		else if (strcmp(*argv,"-idea") == 0)
-            enc = EVP_idea_cbc();
+			enc=EVP_idea_cbc();
-# endif
+#endif
-# ifndef OPENSSL_NO_SEED
+#ifndef OPENSSL_NO_SEED
-        else if (strcmp(*argv, "-seed") == 0)
+		else if (strcmp(*argv,"-seed") == 0)
-            enc = EVP_seed_cbc();
+			enc=EVP_seed_cbc();
-# endif
+#endif
-# ifndef OPENSSL_NO_AES
+#ifndef OPENSSL_NO_AES
-        else if (strcmp(*argv, "-aes128") == 0)
+		else if (strcmp(*argv,"-aes128") == 0)
-            enc = EVP_aes_128_cbc();
+			enc=EVP_aes_128_cbc();
-        else if (strcmp(*argv, "-aes192") == 0)
+		else if (strcmp(*argv,"-aes192") == 0)
-            enc = EVP_aes_192_cbc();
+			enc=EVP_aes_192_cbc();
-        else if (strcmp(*argv, "-aes256") == 0)
+		else if (strcmp(*argv,"-aes256") == 0)
-            enc = EVP_aes_256_cbc();
+			enc=EVP_aes_256_cbc();
-# endif
+#endif
-# ifndef OPENSSL_NO_CAMELLIA
+#ifndef OPENSSL_NO_CAMELLIA
-        else if (strcmp(*argv, "-camellia128") == 0)
+		else if (strcmp(*argv,"-camellia128") == 0)
-            enc = EVP_camellia_128_cbc();
+			enc=EVP_camellia_128_cbc();
-        else if (strcmp(*argv, "-camellia192") == 0)
+		else if (strcmp(*argv,"-camellia192") == 0)
-            enc = EVP_camellia_192_cbc();
+			enc=EVP_camellia_192_cbc();
-        else if (strcmp(*argv, "-camellia256") == 0)
+		else if (strcmp(*argv,"-camellia256") == 0)
-            enc = EVP_camellia_256_cbc();
+			enc=EVP_camellia_256_cbc();
-# endif
+#endif
-        else if (strcmp(*argv, "-passout") == 0) {
+		else if (strcmp(*argv,"-passout") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            passargout = *(++argv);
+			passargout= *(++argv);
-        } else
+			}
+		else
 			break;
 		argv++;
 		argc--;
 		}
-    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
+	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
- bad:
+		{
-        BIO_printf(bio_err, "usage: genrsa [args] [numbits]\n");
+bad:
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
-                   " -des            encrypt the generated key with DES in cbc mode\n");
+		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-                   " -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+#ifndef OPENSSL_NO_IDEA
-# ifndef OPENSSL_NO_IDEA
+		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
-        BIO_printf(bio_err,
+#endif
-                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
+#ifndef OPENSSL_NO_SEED
-# endif
+		BIO_printf(bio_err," -seed\n");
-# ifndef OPENSSL_NO_SEED
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
-        BIO_printf(bio_err, " -seed\n");
+#endif
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_AES
-                   "                 encrypt PEM output with cbc seed\n");
+		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-# endif
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
-# ifndef OPENSSL_NO_AES
+#endif
-        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
+#ifndef OPENSSL_NO_CAMELLIA
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
-                   "                 encrypt PEM output with cbc aes\n");
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
-# endif
+#endif
-# ifndef OPENSSL_NO_CAMELLIA
+		BIO_printf(bio_err," -out file       output the key to 'file\n");
-        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
-                   "                 encrypt PEM output with cbc camellia\n");
+		BIO_printf(bio_err," -3              use 3 for the E value\n");
-# endif
+#ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err, " -out file       output the key to 'file\n");
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
-        BIO_printf(bio_err,
+#endif
-                   " -passout arg    output file pass phrase source\n");
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
-                   " -f4             use F4 (0x10001) for the E value\n");
+		BIO_printf(bio_err,"                 the random number generator\n");
-        BIO_printf(bio_err, " -3              use 3 for the E value\n");
-# ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
-                   " -engine e       use engine e, possibly a hardware device.\n");
-# endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-                   LIST_SEPARATOR_CHAR);
-        BIO_printf(bio_err,
-                   "                 load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err, "                 the random number generator\n");
 		goto err;
 		}
 		
 	ERR_load_crypto_strings();
 
-    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto err;
 	}
-# ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
-# endif
 
-    if (outfile == NULL) {
+#ifndef OPENSSL_NO_ENGINE
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+        e = setup_engine(bio_err, engine, 0);
-# ifdef OPENSSL_SYS_VMS
+#endif
+
+	if (outfile == NULL)
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto err;
 			}
 		}
 
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-        && !RAND_status()) {
+		&& !RAND_status())
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
-        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 
-    BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
+	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
 		num);
 
-    rsa = RSA_new();
+	if (use_x931)
-    if (!rsa)
+		{
-        goto err;
-
-    if (use_x931) {
 		BIGNUM *pubexp;
 		pubexp = BN_new();
 		if (!BN_set_word(pubexp, f4))
@@ -283,74 +278,64 @@ int MAIN(int argc, char **argv)
 		if (!RSA_X931_generate_key_ex(rsa, num, pubexp, &cb))
 			goto err;
 		BN_free(pubexp);
-    } else if (!BN_set_word(bn, f4)
+		}
-               || !RSA_generate_key_ex(rsa, num, bn, &cb))
+	else if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
 		goto err;
 		
 	app_RAND_write_file(NULL, bio_err);
 
-    /*
+	/* We need to do the following for when the base number size is <
-     * We need to do the following for when the base number size is < long,
+	 * long, esp windows 3.1 :-(. */
-     * esp windows 3.1 :-(.
+	l=0L;
-     */
+	for (i=0; i<rsa->e->top; i++)
-    l = 0L;
+		{
-    for (i = 0; i < rsa->e->top; i++) {
+#ifndef SIXTY_FOUR_BIT
-# ifndef SIXTY_FOUR_BIT
+		l<<=BN_BITS4;
-        l <<= BN_BITS4;
+		l<<=BN_BITS4;
-        l <<= BN_BITS4;
+#endif
-# endif
+		l+=rsa->e->d[i];
-        l += rsa->e->d[i];
 		}
-    BIO_printf(bio_err, "e is %ld (0x%lX)\n", l, l);
+	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
 	{
 	PW_CB_DATA cb_data;
 	cb_data.password = passout;
 	cb_data.prompt_info = outfile;
-        if (!PEM_write_bio_RSAPrivateKey(out, rsa, enc, NULL, 0,
+	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
-                                         (pem_password_cb *)password_callback,
+		(pem_password_cb *)password_callback,&cb_data))
-                                         &cb_data))
 		goto err;
 	}
 
-    ret = 0;
+	ret=0;
- err:
+err:
-    if (bn)
+	if (bn) BN_free(bn);
-        BN_free(bn);
+	if (rsa) RSA_free(rsa);
-    if (rsa)
+	if (out) BIO_free_all(out);
-        RSA_free(rsa);
+	if(passout) OPENSSL_free(passout);
-    if (out)
-        BIO_free_all(out);
-    if (passout)
-        OPENSSL_free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
-{
+	{
-    char c = '*';
+	char c='*';
 
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write(cb->arg,&c,1);
-        c = '*';
-    if (p == 3)
-        c = '\n';
-    BIO_write(cb->arg, &c, 1);
 	(void)BIO_flush(cb->arg);
-# ifdef LINT
+#ifdef LINT
-    p = n;
+	p=n;
-# endif
+#endif
 	return 1;
-}
+	}
 #else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy = &dummy;
+static void *dummy=&dummy;
 # endif
 
 #endif

apps/install.com

@@ -5,23 +5,13 @@ $! Time of creation: 22-MAY-1998 10:13
 $!
 $! P1	root of the directory tree
 $!
-$
 $	IF P1 .EQS. ""
 $	THEN
 $	    WRITE SYS$OUTPUT "First argument missing."
-$	    WRITE SYS$OUTPUT -
+$	    WRITE SYS$OUTPUT "Should be the directory where you want things installed."
-		  "Should be the directory where you want things installed."
 $	    EXIT
 $	ENDIF
 $
-$	IF (F$GETSYI("CPU").LT.128)
-$	THEN
-$	    ARCH := VAX
-$	ELSE
-$	    ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
-$	    IF (ARCH .EQS. "") THEN ARCH = "UNK"
-$	ENDIF
-$
 $	ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
 $	ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
 $	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
@@ -29,16 +19,23 @@ $	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
 $	ROOT = ROOT_DEV + "[" + ROOT_DIR
 $
 $	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLEXE WRK_SSLROOT:['ARCH'_EXE]
+$	DEFINE/NOLOG WRK_SSLVEXE WRK_SSLROOT:[VAX_EXE]
+$	DEFINE/NOLOG WRK_SSLAEXE WRK_SSLROOT:[ALPHA_EXE]
+$	DEFINE/NOLOG WRK_SSLLIB WRK_SSLROOT:[LIB]
 $
 $	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
 	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$	IF F$PARSE("WRK_SSLEXE:") .EQS. "" THEN -
+$	IF F$PARSE("WRK_SSLVEXE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLEXE:
+	   CREATE/DIR/LOG WRK_SSLVEXE:
+$	IF F$PARSE("WRK_SSLAEXE:") .EQS. "" THEN -
+	   CREATE/DIR/LOG WRK_SSLAEXE:
+$	IF F$PARSE("WRK_SSLLIB:") .EQS. "" THEN -
+	   CREATE/DIR/LOG WRK_SSLLIB:
 $
 $	EXE := openssl
 $
-$	EXE_DIR := [-.'ARCH'.EXE.APPS]
+$	VEXE_DIR := [-.VAX.EXE.APPS]
+$	AEXE_DIR := [-.AXP.EXE.APPS]
 $
 $	I = 0
 $ LOOP_EXE: 
@@ -46,18 +43,25 @@ $	E = F$EDIT(F$ELEMENT(I, ",", EXE),"TRIM")
 $	I = I + 1
 $	IF E .EQS. "," THEN GOTO LOOP_EXE_END
 $	SET NOON
-$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""
+$	IF F$SEARCH(VEXE_DIR+E+".EXE") .NES. ""
 $	THEN
-$	  COPY 'EXE_DIR''E'.EXE WRK_SSLEXE:'E'.EXE/log
+$	  COPY 'VEXE_DIR''E'.EXE WRK_SSLVEXE:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLEXE:'E'.EXE
+$	  SET FILE/PROT=W:RE WRK_SSLVEXE:'E'.EXE
+$	ENDIF
+$	IF F$SEARCH(AEXE_DIR+E+".EXE") .NES. ""
+$	THEN
+$	  COPY 'AEXE_DIR''E'.EXE WRK_SSLAEXE:'E'.EXE/log
+$	  SET FILE/PROT=W:RE WRK_SSLAEXE:'E'.EXE
 $	ENDIF
 $	SET ON
 $	GOTO LOOP_EXE
 $ LOOP_EXE_END:
 $
 $	SET NOON
-$	COPY CA.COM WRK_SSLEXE:CA.COM/LOG
+$	COPY CA.COM WRK_SSLAEXE:CA.COM/LOG
-$	SET FILE/PROT=W:RE WRK_SSLEXE:CA.COM
+$	SET FILE/PROT=W:RE WRK_SSLAEXE:CA.COM
+$	COPY CA.COM WRK_SSLVEXE:CA.COM/LOG
+$	SET FILE/PROT=W:RE WRK_SSLVEXE:CA.COM
 $	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
 $	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
 $	SET ON

apps/makeapps.com

@@ -6,12 +6,11 @@ $!               A-Com Computing, Inc.
 $!               byer@mail.all-net.net
 $!
 $!  Changes by Richard Levitte <richard@levitte.org>
-$!             Zoltan Arpadffy <zoli@polarhome.com>   
 $!
 $!  This command files compiles and creates all the various different
 $!  "application" programs for the different types of encryption for OpenSSL.
 $!  The EXE's are placed in the directory [.xxx.EXE.APPS] where "xxx" denotes
-$!  ALPHA, IA64 or VAX, depending on your machine architecture.
+$!  either AXP or VAX depending on your machine architecture.
 $!
 $!  It was written so it would try to determine what "C" compiler to
 $!  use or you can specify which "C" compiler to use.
@@ -47,21 +46,20 @@ $ TCPIP_LIB = ""
 $!
 $! Check What Architecture We Are Using.
 $!
-$ IF (F$GETSYI("CPU").LT.128)
+$ IF (F$GETSYI("CPU").GE.128)
 $ THEN
 $!
-$!  The Architecture Is VAX.
+$!  The Architecture Is AXP.
 $!
-$   ARCH := VAX
+$   ARCH := AXP
 $!
 $! Else...
 $!
 $ ELSE
 $!
-$!  The Architecture Is Alpha, IA64 or whatever comes in the future.
+$!  The Architecture Is VAX.
 $!
-$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
+$   ARCH := VAX
-$   IF (ARCH .EQS. "") THEN ARCH = "UNK"
 $!
 $! End The Architecture Check.
 $!
@@ -70,22 +68,10 @@ $!
 $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
-$!
+$!$ PROGRAMS := VERIFY,ASN1PARS,REQ,DGST,DH,ENC,PASSWD,GENDH,ERRSTR,CA,CRL,-
-$! Define The CRYPTO Library.
+$!	      RSA,DSA,DSAPARAM,-
-$!
+$!	      X509,GENRSA,GENDSA,S_SERVER,S_CLIENT,SPEED,-
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
+$!	      S_TIME,VERSION,PKCS7,CRL2P7,SESS_ID,CIPHERS,NSEQ,
-$!
-$! Define The SSL Library.
-$!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
-$!
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
-$!
-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -99,6 +85,18 @@ $! Tell The User What Kind of Machine We Run On.
 $!
 $ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
 $!
+$! Define The CRYPTO Library.
+$!
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
+$!
+$! Define The SSL Library.
+$!
+$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
+$!
+$! Define The OBJ Directory.
+$!
+$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
+$!
 $! Check To See If The OBJ Directory Exists.
 $!
 $ IF (F$PARSE(OBJ_DIR).EQS."")
@@ -112,6 +110,10 @@ $! End The OBJ Directory Check.
 $!
 $ ENDIF
 $!
+$! Define The EXE Directory.
+$!
+$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
+$!
 $! Check To See If The EXE Directory Exists.
 $!
 $ IF (F$PARSE(EXE_DIR).EQS."")
@@ -134,101 +136,64 @@ $!
 $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The Application Files.
-$! NOTE: Some might think this list ugly.  However, it's made this way to
-$! reflect the E_OBJ variable in Makefile as closely as possible, thereby
-$! making it fairly easy to verify that the lists are the same.
 $!
-$ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
+$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
-		"CA,PKCS7,CRL2P7,CRL,"+-
+	      "CA;PKCS7;CRL2P7;CRL;"+-
-		"RSA,RSAUTL,DSA,DSAPARAM,EC,ECPARAM,"+-
+	      "RSA;RSAUTL;DSA;DSAPARAM;EC;ECPARAM;"+-
-		"X509,GENRSA,GENDSA,S_SERVER,S_CLIENT,SPEED,"+-
+	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
-		"S_TIME,APPS,S_CB,S_SOCKET,APP_RAND,VERSION,SESS_ID,"+-
+	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
-		"CIPHERS,NSEQ,PKCS12,PKCS8,SPKAC,SMIME,RAND,ENGINE,"+-
+	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP;PRIME"
-		"OCSP,PRIME,CMS"
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"
 $!
 $! Setup exceptional compilations
 $!
-$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
 $!
 $ PHASE := LIB
 $!
 $ RESTART: 
 $!
-$!  Define An App Counter And Set It To "0".
+$!  Define A File Counter And Set It To "0".
 $!
-$ APP_COUNTER = 0
+$ FILE_COUNTER = 0
 $!
-$!  Top Of The App Loop.
+$! Top Of The File Loop.
 $!
-$ NEXT_APP:
+$ NEXT_FILE:
 $!
-$!  Make The Application File Name
+$! O.K, Extract The File Name From The File List.
 $!
-$ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
+$ FILE_NAME0 = F$EDIT(F$ELEMENT(FILE_COUNTER,";",'PHASE'_FILES),"TRIM")
-$!
+$ FILE_NAME = F$EDIT(F$ELEMENT(0,",",FILE_NAME0),"TRIM")
-$!  Create The Executable File Name.
+$ EXTRA_OBJ = FILE_NAME0 - FILE_NAME
-$!
-$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
 $!
 $! Check To See If We Are At The End Of The File List.
 $!
-$ IF (CURRENT_APP.EQS.",")
+$ IF (FILE_NAME0.EQS.";")
 $ THEN
 $   IF (PHASE.EQS."LIB")
 $   THEN
 $     PHASE := APP
 $     GOTO RESTART
 $   ELSE
-$     GOTO APP_DONE
+$     GOTO FILE_DONE
 $   ENDIF
 $ ENDIF
 $!
 $! Increment The Counter.
 $!
-$ APP_COUNTER = APP_COUNTER + 1
+$ FILE_COUNTER = FILE_COUNTER + 1
 $!
-$!  Decide if we're building the object files or not.
+$! Check to see if this program should actually be compiled
 $!
-$ IF (PHASE.EQS."LIB")
+$ IF PHASE .EQS. "APP" .AND. -
+     ","+PROGRAMS+"," - (","+F$EDIT(FILE_NAME,"UPCASE")+",") .EQS. ","+PROGRAMS+","
 $ THEN
-$!
+$   GOTO NEXT_FILE
-$!  Define A Library File Counter And Set It To "-1".
-$!  -1 Means The Application File Name Is To Be Used.
-$!
-$   LIB_COUNTER = -1
-$!
-$!  Create a .OPT file for the object files
-$!
-$   OPEN/WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
-$!
-$!  Top Of The File Loop.
-$!
-$  NEXT_LIB:
-$!
-$!  O.K, Extract The File Name From The File List.
-$!
-$   IF LIB_COUNTER .GE. 0
-$   THEN
-$     FILE_NAME = F$EDIT(F$ELEMENT(LIB_COUNTER,",",LIB_'CURRENT_APP'),"TRIM")
-$   ELSE
-$     FILE_NAME = CURRENT_APP
 $ ENDIF
 $!
-$!  Check To See If We Are At The End Of The File List.
-$!
-$   IF (FILE_NAME.EQS.",")
-$   THEN
-$     CLOSE OBJECTS
-$     GOTO NEXT_APP
-$   ENDIF
-$!
-$!  Increment The Counter.
-$!
-$   LIB_COUNTER = LIB_COUNTER + 1
-$!
 $! Create The Source File Name.
 $!
 $ SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C"
@@ -236,7 +201,11 @@ $!
 $! Create The Object File Name.
 $!
 $ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
-$   ON WARNING THEN GOTO NEXT_LIB
+$!
+$! Create The Executable File Name.
+$!
+$ EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"
+$ ON WARNING THEN GOTO NEXT_FILE
 $!
 $! Check To See If The File We Want To Compile Actually Exists.
 $!
@@ -268,38 +237,39 @@ $   ENDIF
 $!
 $! Compile The File.
 $!
-$   ON ERROR THEN GOTO NEXT_LIB
+$ ON ERROR THEN GOTO NEXT_FILE
 $ IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
 $ THEN
 $   CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ELSE
 $   CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ENDIF
-$   WRITE OBJECTS OBJECT_FILE
 $!
-$   GOTO NEXT_LIB
+$ ON WARNING THEN GOTO NEXT_FILE
+$!
+$ IF (PHASE.EQS."LIB") 
+$ THEN 
+$   GOTO NEXT_FILE
 $ ENDIF
 $!
 $!  Check if this program works well without a TCPIP library
 $!
-$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - CURRENT_APP .NES. TCPIP_PROGRAMS
+$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - FILE_NAME .NES. TCPIP_PROGRAMS
 $ THEN
-$   WRITE SYS$OUTPUT CURRENT_APP," needs a TCP/IP library.  Can't link.  Skipping..."
+$   WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library.  Can't link.  Skipping..."
-$   GOTO NEXT_APP
+$   GOTO NEXT_FILE
 $ ENDIF
 $!
 $! Link The Program.
 $! Check To See If We Are To Link With A Specific TCP/IP Library.
 $!
-$ ON WARNING THEN GOTO NEXT_APP
-$!
 $ IF (TCPIP_LIB.NES."")
 $ THEN
 $!
 $! Don't Link With The RSAREF Routines And TCP/IP Library.
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
+	'OBJECT_FILE''EXTRA_OBJ', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'TCPIP_LIB','OPT_FILE'/OPTION
 $!
@@ -310,7 +280,7 @@ $!
 $! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
+	'OBJECT_FILE''EXTRA_OBJ', -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'OPT_FILE'/OPTION
 $!
@@ -320,11 +290,11 @@ $ ENDIF
 $!
 $! Go Back And Do It Again.
 $!
-$ GOTO NEXT_APP
+$ GOTO NEXT_FILE
 $!
 $! All Done With This File.
 $!
-$ APP_DONE:
+$ FILE_DONE:
 $ EXIT:
 $!
 $! All Done, Time To Clean Up And Exit.
@@ -425,19 +395,19 @@ $!    Else...
 $!
 $     ELSE
 $!
-$!      Create The non-VAX Linker Option File.
+$!      Create The AXP Linker Option File.
 $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File For non-VAX To Link Agianst 
+! Default System Options File For AXP To Link Agianst 
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
 SYS$SHARE:CMA$OPEN_RTL/SHARE
 $EOD
 $!
-$!    End The DEC C Option File Check.
+$!    End The VAX/AXP DEC C Option File Check.
 $!
 $     ENDIF
 $!
@@ -586,7 +556,7 @@ $   ELSE
 $!
 $!  Check To See If We Have VAXC Or DECC.
 $!
-$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
+$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
 $     THEN 
 $!
 $!      Looks Like DECC, Set To Use DECC.
@@ -696,7 +666,7 @@ $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -717,9 +687,9 @@ $!
 $!    Compile Using VAXC.
 $!
 $     CC = "CC"
-$     IF ARCH.NES."VAX"
+$     IF ARCH.EQS."AXP"
 $     THEN
-$	WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"
+$	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
@@ -733,7 +703,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -760,7 +730,7 @@ $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!

apps/nseq.c

@@ -1,7 +1,6 @@
 /* nseq.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 1999.
- * 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -77,51 +76,47 @@ int MAIN(int argc, char **argv)
 	NETSCAPE_CERT_SEQUENCE *seq = NULL;
 	int i, ret = 1;
 	int badarg = 0;
-    if (bio_err == NULL)
+	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 	ERR_load_crypto_strings();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
-        if (!strcmp(*args, "-toseq"))
+		if (!strcmp (*args, "-toseq")) toseq = 1;
-            toseq = 1;
+		else if (!strcmp (*args, "-in")) {
-        else if (!strcmp(*args, "-in")) {
 			if (args[1]) {
 				args++;
 				infile = *args;
-            } else
+			} else badarg = 1;
-                badarg = 1;
+		} else if (!strcmp (*args, "-out")) {
-        } else if (!strcmp(*args, "-out")) {
 			if (args[1]) {
 				args++;
 				outfile = *args;
-            } else
+			} else badarg = 1;
-                badarg = 1;
+		} else badarg = 1;
-        } else
-            badarg = 1;
 		args++;
 	}
 
 	if (badarg) {
-        BIO_printf(bio_err, "Netscape certificate sequence utility\n");
+		BIO_printf (bio_err, "Netscape certificate sequence utility\n");
-        BIO_printf(bio_err, "Usage nseq [options]\n");
+		BIO_printf (bio_err, "Usage nseq [options]\n");
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf (bio_err, "where options are\n");
-        BIO_printf(bio_err, "-in file  input file\n");
+		BIO_printf (bio_err, "-in file  input file\n");
-        BIO_printf(bio_err, "-out file output file\n");
+		BIO_printf (bio_err, "-out file output file\n");
-        BIO_printf(bio_err, "-toseq    output NS Sequence file\n");
+		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
 		OPENSSL_EXIT(1);
 	}
 
 	if (infile) {
-        if (!(in = BIO_new_file(infile, "r"))) {
+		if (!(in = BIO_new_file (infile, "r"))) {
-            BIO_printf(bio_err, "Can't open input file %s\n", infile);
+			BIO_printf (bio_err,
+				 "Can't open input file %s\n", infile);
 			goto end;
 		}
-    } else
+	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
 	if (outfile) {
-        if (!(out = BIO_new_file(outfile, "w"))) {
+		if (!(out = BIO_new_file (outfile, "w"))) {
-            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
+			BIO_printf (bio_err,
+				 "Can't open output file %s\n", outfile);
 			goto end;
 		}
 	} else {
@@ -136,11 +131,12 @@ int MAIN(int argc, char **argv)
 	if (toseq) {
 		seq = NETSCAPE_CERT_SEQUENCE_new();
 		seq->certs = sk_X509_new_null();
-        while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
+		while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
-            sk_X509_push(seq->certs, x509);
+		    sk_X509_push(seq->certs,x509);
 
-        if (!sk_X509_num(seq->certs)) {
+		if(!sk_X509_num(seq->certs))
-            BIO_printf(bio_err, "Error reading certs file %s\n", infile);
+		{
+			BIO_printf (bio_err, "Error reading certs file %s\n", infile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
@@ -150,21 +146,22 @@ int MAIN(int argc, char **argv)
 	}
 
 	if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
-        BIO_printf(bio_err, "Error reading sequence file %s\n", infile);
+		BIO_printf (bio_err, "Error reading sequence file %s\n", infile);
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-    for (i = 0; i < sk_X509_num(seq->certs); i++) {
+	for(i = 0; i < sk_X509_num(seq->certs); i++) {
 		x509 = sk_X509_value(seq->certs, i);
 		dump_cert_text(out, x509);
 		PEM_write_bio_X509(out, x509);
 	}
 	ret = 0;
- end:
+end:
 	BIO_free(in);
 	BIO_free_all(out);
 	NETSCAPE_CERT_SEQUENCE_free(seq);
 
 	OPENSSL_EXIT(ret);
 }
+

apps/openssl-vms.cnf

@@ -8,9 +8,8 @@
 HOME			= .
 RANDFILE		= $ENV::HOME/.rnd
 
-# Extra OBJECT IDENTIFIER info:
+# Uncomment out to enable OpenSSL configuration see config(3)
-#oid_file		= $ENV::HOME/.oid
+# openssl_conf = openssl_init
-oid_section		= new_oids
 
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
@@ -19,13 +18,22 @@ oid_section		= new_oids
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
+[openssl_init]
+# Extra OBJECT IDENTIFIER info:
+oid_section = new_oids
+alg_section = algs
+
 [ new_oids ]
 
-# We can add new OIDs in here for use by 'ca' and 'req'.
+# We can add new OIDs in here for use by any config aware application
 # Add a simple OID like this:
-# testoid1=1.2.3.4
+# shortname=Long Object Identifier Name, 1.2.3.4
 # Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
+# testoid2=OID2 LONG NAME, ${testoid1}.5.6, OTHER OID
+
+[ algs ]
+# Algorithm configuration options. Currently just fips_mode
+fips_mode = no
 
 ####################################################################
 [ ca ]
@@ -141,7 +149,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName			= Common Name (eg, YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address

apps/openssl.c

@@ -109,11 +109,11 @@
  *
  */
 
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#define OPENSSL_C               /* tells apps.h to use complete
+#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
-                                 * apps_startup() */
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
@@ -123,135 +123,142 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
-#define USE_SOCKETS             /* needed for the _O_BINARY defs in the MS
+#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
-                                 * world */
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
 
-/*
+/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
- * The LHASH callbacks ("hash" & "cmp") have been replaced by functions with
+ * base prototypes (we cast each variable inside the function to the required
- * the base prototypes (we cast each variable inside the function to the
+ * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
- * required type of "FUNCTION*"). This removes the necessity for
+ * functions. */
- * macro-generated wrapper functions.
- */
 
 /* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
 static unsigned long MS_CALLBACK hash(const void *a_void);
 /* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
-static int MS_CALLBACK cmp(const void *a_void, const void *b_void);
+static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
-static LHASH *prog_init(void);
+static LHASH *prog_init(void );
-static int do_cmd(LHASH *prog, int argc, char *argv[]);
+static int do_cmd(LHASH *prog,int argc,char *argv[]);
-char *default_config_file = NULL;
+char *default_config_file=NULL;
 
 /* Make sure there is only one when MONOLITH is defined */
 #ifdef MONOLITH
-CONF *config = NULL;
+CONF *config=NULL;
-BIO *bio_err = NULL;
+BIO *bio_err=NULL;
-int in_FIPS_mode = 0;
+int in_FIPS_mode=0;
 #endif
 
+
 static void lock_dbg_cb(int mode, int type, const char *file, int line)
-{
+	{
 	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
 	const char *errstr = NULL;
 	int rw;
 	
-    rw = mode & (CRYPTO_READ | CRYPTO_WRITE);
+	rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
-    if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE))) {
+	if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
+		{
 		errstr = "invalid mode";
 		goto err;
 		}
 
-    if (type < 0 || type >= CRYPTO_NUM_LOCKS) {
+	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
+		{
 		errstr = "type out of bounds";
 		goto err;
 		}
 
-    if (mode & CRYPTO_LOCK) {
+	if (mode & CRYPTO_LOCK)
-        if (modes[type]) {
+		{
+		if (modes[type])
+			{
 			errstr = "already locked";
-            /*
+			/* must not happen in a single-threaded program
-             * must not happen in a single-threaded program (would deadlock)
+			 * (would deadlock) */
-             */
 			goto err;
 			}
 
 		modes[type] = rw;
-    } else if (mode & CRYPTO_UNLOCK) {
+		}
-        if (!modes[type]) {
+	else if (mode & CRYPTO_UNLOCK)
+		{
+		if (!modes[type])
+			{
 			errstr = "not locked";
 			goto err;
 			}
 		
-        if (modes[type] != rw) {
+		if (modes[type] != rw)
+			{
 			errstr = (rw == CRYPTO_READ) ?
 				"CRYPTO_r_unlock on write lock" :
 				"CRYPTO_w_unlock on read lock";
 			}
 
 		modes[type] = 0;
-    } else {
+		}
+	else
+		{
 		errstr = "invalid mode";
 		goto err;
 		}
 
  err:
-    if (errstr) {
+	if (errstr)
+		{
 		/* we cannot use bio_err here */
-        fprintf(stderr,
+		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
-                "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
 			errstr, mode, type, file, line);
 		}
-}
+	}
+
 
 int main(int Argc, char *Argv[])
-{
+	{
 	ARGS arg;
 #define PROG_NAME_SIZE	39
-    char pname[PROG_NAME_SIZE + 1];
+	char pname[PROG_NAME_SIZE+1];
-    FUNCTION f, *fp;
+	FUNCTION f,*fp;
 	MS_STATIC const char *prompt;
 	MS_STATIC char buf[1024];
-    char *to_free = NULL;
+	char *to_free=NULL;
-    int n, i, ret = 0;
+	int n,i,ret=0;
 	int argc;
-    char **argv, *p;
+	char **argv,*p;
-    LHASH *prog = NULL;
+	LHASH *prog=NULL;
 	long errline;
  
-    arg.data = NULL;
+	arg.data=NULL;
-    arg.count = 0;
+	arg.count=0;
 
 	in_FIPS_mode = 0;
 
-    if (getenv("OPENSSL_FIPS")) {
 #ifdef OPENSSL_FIPS
+	if(getenv("OPENSSL_FIPS")) {
 		if (!FIPS_mode_set(1)) {
 			ERR_load_crypto_strings();
-            ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
+			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
 			EXIT(1);
 		}
 		in_FIPS_mode = 1;
-#else
-        fprintf(stderr, "FIPS mode not supported.\n");
-        EXIT(1);
-#endif
 		}
+#endif
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-    if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) { /* if not defined, use
+	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
-                                                   * compiled-in library
+		{
-                                                   * defaults */
+		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
-        if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))) {
+			{
 			CRYPTO_malloc_debug_init();
 			CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-        } else {
+			}
+		else
+			{
 			/* OPENSSL_DEBUG_MEMORY=off */
 			CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
 			}
@@ -268,164 +275,166 @@ int main(int Argc, char *Argv[])
 	apps_startup();
 
 	/* Lets load up our environment a little */
-    p = getenv("OPENSSL_CONF");
+	p=getenv("OPENSSL_CONF");
 	if (p == NULL)
-        p = getenv("SSLEAY_CONF");
+		p=getenv("SSLEAY_CONF");
 	if (p == NULL)
-        p = to_free = make_config_name();
+		p=to_free=make_config_name();
 
-    default_config_file = p;
+	default_config_file=p;
 
-    config = NCONF_new(NULL);
+	config=NCONF_new(NULL);
-    i = NCONF_load(config, p, &errline);
+	i=NCONF_load(config,p,&errline);
-    if (i == 0) {
+	if (i == 0)
+		{
 		NCONF_free(config);
 		config = NULL;
 		ERR_clear_error();
 		}
 
-    prog = prog_init();
+	prog=prog_init();
 
 	/* first check the program name */
-    program_name(Argv[0], pname, sizeof pname);
+	program_name(Argv[0],pname,sizeof pname);
 
-    f.name = pname;
+	f.name=pname;
-    fp = (FUNCTION *) lh_retrieve(prog, &f);
+	fp=(FUNCTION *)lh_retrieve(prog,&f);
-    if (fp != NULL) {
+	if (fp != NULL)
-        Argv[0] = pname;
+		{
-        ret = fp->func(Argc, Argv);
+		Argv[0]=pname;
+		ret=fp->func(Argc,Argv);
 		goto end;
 		}
 
-    /*
+	/* ok, now check that there are not arguments, if there are,
-     * ok, now check that there are not arguments, if there are, run with
+	 * run with them, shifting the ssleay off the front */
-     * them, shifting the ssleay off the front
+	if (Argc != 1)
-     */
+		{
-    if (Argc != 1) {
 		Argc--;
 		Argv++;
-        ret = do_cmd(prog, Argc, Argv);
+		ret=do_cmd(prog,Argc,Argv);
-        if (ret < 0)
+		if (ret < 0) ret=0;
-            ret = 0;
 		goto end;
 		}
 
 	/* ok, lets enter the old 'OpenSSL>' mode */
 	
-    for (;;) {
+	for (;;)
-        ret = 0;
+		{
-        p = buf;
+		ret=0;
-        n = sizeof buf;
+		p=buf;
-        i = 0;
+		n=sizeof buf;
-        for (;;) {
+		i=0;
-            p[0] = '\0';
+		for (;;)
+			{
+			p[0]='\0';
 			if (i++)
-                prompt = ">";
+				prompt=">";
-            else
+			else	prompt="OpenSSL> ";
-                prompt = "OpenSSL> ";
+			fputs(prompt,stdout);
-            fputs(prompt, stdout);
 			fflush(stdout);
-            if (!fgets(p, n, stdin))
+			fgets(p,n,stdin);
-                goto end;
+			if (p[0] == '\0') goto end;
-            if (p[0] == '\0')
+			i=strlen(p);
-                goto end;
+			if (i <= 1) break;
-            i = strlen(p);
+			if (p[i-2] != '\\') break;
-            if (i <= 1)
+			i-=2;
-                break;
+			p+=i;
-            if (p[i - 2] != '\\')
+			n-=i;
-                break;
-            i -= 2;
-            p += i;
-            n -= i;
 			}
-        if (!chopup_args(&arg, buf, &argc, &argv))
+		if (!chopup_args(&arg,buf,&argc,&argv)) break;
-            break;
 
-        ret = do_cmd(prog, argc, argv);
+		ret=do_cmd(prog,argc,argv);
-        if (ret < 0) {
+		if (ret < 0)
-            ret = 0;
+			{
+			ret=0;
 			goto end;
 			}
 		if (ret != 0)
-            BIO_printf(bio_err, "error in %s\n", argv[0]);
+			BIO_printf(bio_err,"error in %s\n",argv[0]);
 		(void)BIO_flush(bio_err);
 		}
-    BIO_printf(bio_err, "bad exit\n");
+	BIO_printf(bio_err,"bad exit\n");
-    ret = 1;
+	ret=1;
- end:
+end:
 	if (to_free)
 		OPENSSL_free(to_free);
-    if (config != NULL) {
+	if (config != NULL)
+		{
 		NCONF_free(config);
-        config = NULL;
+		config=NULL;
 		}
-    if (prog != NULL)
+	if (prog != NULL) lh_free(prog);
-        lh_free(prog);
+	if (arg.data != NULL) OPENSSL_free(arg.data);
-    if (arg.data != NULL)
-        OPENSSL_free(arg.data);
 
 	apps_shutdown();
 
 	CRYPTO_mem_leaks(bio_err);
-    if (bio_err != NULL) {
+	if (bio_err != NULL)
+		{
 		BIO_free(bio_err);
-        bio_err = NULL;
+		bio_err=NULL;
 		}
 	OPENSSL_EXIT(ret);
-}
+	}
 
 #define LIST_STANDARD_COMMANDS "list-standard-commands"
 #define LIST_MESSAGE_DIGEST_COMMANDS "list-message-digest-commands"
 #define LIST_CIPHER_COMMANDS "list-cipher-commands"
 
 static int do_cmd(LHASH *prog, int argc, char *argv[])
-{
+	{
-    FUNCTION f, *fp;
+	FUNCTION f,*fp;
-    int i, ret = 1, tp, nl;
+	int i,ret=1,tp,nl;
 
-    if ((argc <= 0) || (argv[0] == NULL)) {
+	if ((argc <= 0) || (argv[0] == NULL))
-        ret = 0;
+		{ ret=0; goto end; }
-        goto end;
+	f.name=argv[0];
+	fp=(FUNCTION *)lh_retrieve(prog,&f);
+	if (fp != NULL)
+		{
+		ret=fp->func(argc,argv);
 		}
-    f.name = argv[0];
+	else if ((strncmp(argv[0],"no-",3)) == 0)
-    fp = (FUNCTION *) lh_retrieve(prog, &f);
+		{
-    if (fp != NULL) {
+		BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-        ret = fp->func(argc, argv);
-    } else if ((strncmp(argv[0], "no-", 3)) == 0) {
-        BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		bio_stdout = BIO_push(tmpbio, bio_stdout);
 		}
 #endif
-        f.name = argv[0] + 3;
+		f.name=argv[0]+3;
-        ret = (lh_retrieve(prog, &f) != NULL);
+		ret = (lh_retrieve(prog,&f) != NULL);
 		if (!ret)
 			BIO_printf(bio_stdout, "%s\n", argv[0]);
 		else
-            BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
+			BIO_printf(bio_stdout, "%s\n", argv[0]+3);
 		BIO_free_all(bio_stdout);
 		goto end;
-    } else if ((strcmp(argv[0], "quit") == 0) ||
+		}
-               (strcmp(argv[0], "q") == 0) ||
+	else if ((strcmp(argv[0],"quit") == 0) ||
-               (strcmp(argv[0], "exit") == 0) ||
+		(strcmp(argv[0],"q") == 0) ||
-               (strcmp(argv[0], "bye") == 0)) {
+		(strcmp(argv[0],"exit") == 0) ||
-        ret = -1;
+		(strcmp(argv[0],"bye") == 0))
+		{
+		ret= -1;
 		goto end;
-    } else if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
+		}
-               (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
+	else if ((strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0) ||
-               (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0)) {
+		(strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
+		(strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0))
+		{
 		int list_type;
 		BIO *bio_stdout;
 
-        if (strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0)
+		if (strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0)
 			list_type = FUNC_TYPE_GENERAL;
-        else if (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0)
+		else if (strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0)
 			list_type = FUNC_TYPE_MD;
 		else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
 			list_type = FUNC_TYPE_CIPHER;
-        bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
+		bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -433,93 +442,99 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 		}
 #endif
 		
-        for (fp = functions; fp->name != NULL; fp++)
+		for (fp=functions; fp->name != NULL; fp++)
 			if (fp->type == list_type)
 				BIO_printf(bio_stdout, "%s\n", fp->name);
 		BIO_free_all(bio_stdout);
-        ret = 0;
+		ret=0;
 		goto end;
-    } else {
+		}
-        BIO_printf(bio_err, "openssl:Error: '%s' is an invalid command.\n",
+	else
+		{
+		BIO_printf(bio_err,"openssl:Error: '%s' is an invalid command.\n",
 			argv[0]);
 		BIO_printf(bio_err, "\nStandard commands");
-        i = 0;
+		i=0;
-        tp = 0;
+		tp=0;
-        for (fp = functions; fp->name != NULL; fp++) {
+		for (fp=functions; fp->name != NULL; fp++)
-            nl = 0;
+			{
+			nl=0;
 #ifdef OPENSSL_NO_CAMELLIA
 			if (((i++) % 5) == 0)
 #else
 			if (((i++) % 4) == 0)
 #endif
 				{
-                BIO_printf(bio_err, "\n");
+				BIO_printf(bio_err,"\n");
-                nl = 1;
+				nl=1;
 				}
-            if (fp->type != tp) {
+			if (fp->type != tp)
-                tp = fp->type;
+				{
-                if (!nl)
+				tp=fp->type;
-                    BIO_printf(bio_err, "\n");
+				if (!nl) BIO_printf(bio_err,"\n");
-                if (tp == FUNC_TYPE_MD) {
+				if (tp == FUNC_TYPE_MD)
-                    i = 1;
+					{
+					i=1;
 					BIO_printf(bio_err,
 						"\nMessage Digest commands (see the `dgst' command for more details)\n");
-                } else if (tp == FUNC_TYPE_CIPHER) {
+					}
-                    i = 1;
+				else if (tp == FUNC_TYPE_CIPHER)
-                    BIO_printf(bio_err,
+					{
-                               "\nCipher commands (see the `enc' command for more details)\n");
+					i=1;
+					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
 					}
 				}
 #ifdef OPENSSL_NO_CAMELLIA
-            BIO_printf(bio_err, "%-15s", fp->name);
+			BIO_printf(bio_err,"%-15s",fp->name);
 #else
-            BIO_printf(bio_err, "%-18s", fp->name);
+			BIO_printf(bio_err,"%-18s",fp->name);
 #endif
 			}
-        BIO_printf(bio_err, "\n\n");
+		BIO_printf(bio_err,"\n\n");
-        ret = 0;
+		ret=0;
+		}
+end:
+	return(ret);
 	}
- end:
-    return (ret);
-}
 
-static int SortFnByName(const void *_f1, const void *_f2)
+static int SortFnByName(const void *_f1,const void *_f2)
-{
+    {
-    const FUNCTION *f1 = _f1;
+    const FUNCTION *f1=_f1;
-    const FUNCTION *f2 = _f2;
+    const FUNCTION *f2=_f2;
 
-    if (f1->type != f2->type)
+    if(f1->type != f2->type)
-        return f1->type - f2->type;
+	return f1->type-f2->type;
-    return strcmp(f1->name, f2->name);
+    return strcmp(f1->name,f2->name);
-}
+    }
 
 static LHASH *prog_init(void)
-{
+	{
 	LHASH *ret;
 	FUNCTION *f;
 	size_t i;
 
 	/* Purely so it looks nice when the user hits ? */
-    for (i = 0, f = functions; f->name != NULL; ++f, ++i) ;
+	for(i=0,f=functions ; f->name != NULL ; ++f,++i)
-    qsort(functions, i, sizeof *functions, SortFnByName);
+	    ;
+	qsort(functions,i,sizeof *functions,SortFnByName);
 
-    if ((ret = lh_new(hash, cmp)) == NULL)
+	if ((ret=lh_new(hash, cmp)) == NULL)
-        return (NULL);
+		return(NULL);
 
-    for (f = functions; f->name != NULL; f++)
+	for (f=functions; f->name != NULL; f++)
-        lh_insert(ret, f);
+		lh_insert(ret,f);
-    return (ret);
+	return(ret);
-}
+	}
 
 /* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
 static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
-{
+	{
-    return (strncmp(((const FUNCTION *)a_void)->name,
+	return(strncmp(((const FUNCTION *)a_void)->name,
-                    ((const FUNCTION *)b_void)->name, 8));
+			((const FUNCTION *)b_void)->name,8));
-}
+	}
 
 /* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
 static unsigned long MS_CALLBACK hash(const void *a_void)
-{
+	{
-    return (lh_strhash(((const FUNCTION *)a_void)->name));
+	return(lh_strhash(((const FUNCTION *)a_void)->name));
-}
+	}

apps/openssl.cnf

@@ -8,9 +8,8 @@
 HOME			= .
 RANDFILE		= $ENV::HOME/.rnd
 
-# Extra OBJECT IDENTIFIER info:
+# Uncomment out to enable OpenSSL configuration see config(3)
-#oid_file		= $ENV::HOME/.oid
+# openssl_conf = openssl_init
-oid_section		= new_oids
 
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
@@ -19,13 +18,22 @@ oid_section		= new_oids
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
+[openssl_init]
+# Extra OBJECT IDENTIFIER info:
+oid_section = new_oids
+alg_section = algs
+
 [ new_oids ]
 
-# We can add new OIDs in here for use by 'ca' and 'req'.
+# We can add new OIDs in here for use by any config aware application
 # Add a simple OID like this:
-# testoid1=1.2.3.4
+# shortname=Long Object Identifier Name, 1.2.3.4
 # Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
+# testoid2=OID2 LONG NAME, ${testoid1}.5.6, OTHER OID
+
+[ algs ]
+# Algorithm configuration options. Currently just fips_mode
+fips_mode = no
 
 ####################################################################
 [ ca ]
@@ -141,7 +149,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName			= Common Name (eg, YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address

apps/passwd.c

@@ -6,44 +6,44 @@
 
 #if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1)
 
-# include <assert.h>
+#include <assert.h>
-# include <string.h>
+#include <string.h>
 
-# include "apps.h"
+#include "apps.h"
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/rand.h>
+#include <openssl/rand.h>
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
 # include <openssl/des.h>
-# endif
+#endif
-# ifndef NO_MD5CRYPT_1
+#ifndef NO_MD5CRYPT_1
 # include <openssl/md5.h>
-# endif
+#endif
 
-# undef PROG
-# define PROG passwd_main
 
-static unsigned const char cov_2char[64] = {
+#undef PROG
+#define PROG passwd_main
+
+
+static unsigned const char cov_2char[64]={
 	/* from crypto/des/fcrypt.c */
-    0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
+	0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
-    0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x43, 0x44,
+	0x36,0x37,0x38,0x39,0x41,0x42,0x43,0x44,
-    0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C,
+	0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,
-    0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54,
+	0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,
-    0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62,
+	0x55,0x56,0x57,0x58,0x59,0x5A,0x61,0x62,
-    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A,
+	0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,
-    0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72,
+	0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,
-    0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
+	0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A
 };
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-                     char *passwd, BIO *out, int quiet, int table,
+	char *passwd, BIO *out, int quiet, int table, int reverse,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
-                     int useapr1);
 
-/*-
+/* -crypt        - standard Unix password algorithm (default)
- * -crypt        - standard Unix password algorithm (default)
  * -1            - MD5-based password algorithm
  * -apr1         - MD5-based password algorithm, Apache variant
  * -salt string  - salt
@@ -58,7 +58,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	int ret = 1;
 	char *infile = NULL;
 	int in_stdin = 0;
@@ -76,8 +76,8 @@ int MAIN(int argc, char **argv)
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto err;
@@ -85,41 +85,54 @@ int MAIN(int argc, char **argv)
 	if (out == NULL)
 		goto err;
 	BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	out = BIO_push(tmpbio, out);
 	}
-# endif
+#endif
 
 	badopt = 0, opt_done = 0;
 	i = 0;
-    while (!badopt && !opt_done && argv[++i] != NULL) {
+	while (!badopt && !opt_done && argv[++i] != NULL)
+		{
 		if (strcmp(argv[i], "-crypt") == 0)
 			usecrypt = 1;
 		else if (strcmp(argv[i], "-1") == 0)
 			use1 = 1;
 		else if (strcmp(argv[i], "-apr1") == 0)
 			useapr1 = 1;
-        else if (strcmp(argv[i], "-salt") == 0) {
+		else if (strcmp(argv[i], "-salt") == 0)
-            if ((argv[i + 1] != NULL) && (salt == NULL)) {
+			{
+			if ((argv[i+1] != NULL) && (salt == NULL))
+				{
 				passed_salt = 1;
 				salt = argv[++i];
-            } else
+				}
+			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-in") == 0) {
+			}
-            if ((argv[i + 1] != NULL) && !pw_source_defined) {
+		else if (strcmp(argv[i], "-in") == 0)
+			{
+			if ((argv[i+1] != NULL) && !pw_source_defined)
+				{
 				pw_source_defined = 1;
 				infile = argv[++i];
-            } else
+				}
+			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-stdin") == 0) {
+			}
-            if (!pw_source_defined) {
+		else if (strcmp(argv[i], "-stdin") == 0)
+			{
+			if (!pw_source_defined)
+				{
 				pw_source_defined = 1;
 				in_stdin = 1;
-            } else
+				}
+			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-noverify") == 0)
+			}
+		else if (strcmp(argv[i], "-noverify") == 0)
 			in_noverify = 1;
 		else if (strcmp(argv[i], "-quiet") == 0)
 			quiet = 1;
@@ -135,7 +148,8 @@ int MAIN(int argc, char **argv)
 			pw_source_defined = 1;
 			passwds = &argv[i];
 			opt_done = 1;
-        } else
+			}
+		else
 			badopt = 1;
 		}
 
@@ -145,33 +159,28 @@ int MAIN(int argc, char **argv)
 		badopt = 1;
 
 	/* reject unsupported algorithms */
-# ifdef OPENSSL_NO_DES
+#ifdef OPENSSL_NO_DES
-    if (usecrypt)
+	if (usecrypt) badopt = 1;
-        badopt = 1;
+#endif
-# endif
+#ifdef NO_MD5CRYPT_1
-# ifdef NO_MD5CRYPT_1
+	if (use1 || useapr1) badopt = 1;
-    if (use1 || useapr1)
+#endif
-        badopt = 1;
-# endif
 
-    if (badopt) {
+	if (badopt) 
+		{
 		BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
 		BIO_printf(bio_err, "where options are\n");
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
-                   "-crypt             standard Unix password algorithm (default)\n");
+#endif
-# endif
+#ifndef NO_MD5CRYPT_1
-# ifndef NO_MD5CRYPT_1
+		BIO_printf(bio_err, "-1                 MD5-based password algorithm\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-apr1              MD5-based password algorithm, Apache variant\n");
-                   "-1                 MD5-based password algorithm\n");
+#endif
-        BIO_printf(bio_err,
-                   "-apr1              MD5-based password algorithm, Apache variant\n");
-# endif
 		BIO_printf(bio_err, "-salt string       use provided salt\n");
 		BIO_printf(bio_err, "-in file           read passwords from file\n");
 		BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
-                   "-noverify          never verify when reading password from terminal\n");
 		BIO_printf(bio_err, "-quiet             no warnings\n");
 		BIO_printf(bio_err, "-table             format output as table\n");
 		BIO_printf(bio_err, "-reverse           switch table columns\n");
@@ -179,15 +188,19 @@ int MAIN(int argc, char **argv)
 		goto err;
 		}
 
-    if ((infile != NULL) || in_stdin) {
+	if ((infile != NULL) || in_stdin)
+		{
 		in = BIO_new(BIO_s_file());
 		if (in == NULL)
 			goto err;
-        if (infile != NULL) {
+		if (infile != NULL)
+			{
 			assert(in_stdin == 0);
 			if (BIO_read_filename(in, infile) <= 0)
 				goto err;
-        } else {
+			}
+		else
+			{
 			assert(in_stdin);
 			BIO_set_fp(in, stdin, BIO_NOCLOSE);
 			}
@@ -196,59 +209,61 @@ int MAIN(int argc, char **argv)
 	if (usecrypt)
 		pw_maxlen = 8;
 	else if (use1 || useapr1)
-        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
+		pw_maxlen = 256; /* arbitrary limit, should be enough for most passwords */
-                                 * passwords */
 
-    if (passwds == NULL) {
+	if (passwds == NULL)
+		{
 		/* no passwords on the command line */
 
 		passwd_malloc_size = pw_maxlen + 2;
-        /*
+		/* longer than necessary so that we can warn about truncation */
-         * longer than necessary so that we can warn about truncation
-         */
 		passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
 		if (passwd_malloc == NULL)
 			goto err;
 		}
 
-    if ((in == NULL) && (passwds == NULL)) {
+	if ((in == NULL) && (passwds == NULL))
+		{
 		/* build a null-terminated list */
-        static char *passwds_static[2] = { NULL, NULL };
+		static char *passwds_static[2] = {NULL, NULL};
 		
 		passwds = passwds_static;
 		if (in == NULL)
-            if (EVP_read_pw_string
+			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
-                (passwd_malloc, passwd_malloc_size, "Password: ",
-                 !(passed_salt || in_noverify)) != 0)
 				goto err;
 		passwds[0] = passwd_malloc;
 		}
 
-    if (in == NULL) {
+	if (in == NULL)
+		{
 		assert(passwds != NULL);
 		assert(*passwds != NULL);
 		
-        do {                    /* loop over list of passwords */
+		do /* loop over list of passwords */
+			{
 			passwd = *passwds++;
 			if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
+				quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
-                           useapr1))
 				goto err;
 			}
 		while (*passwds != NULL);
-    } else
+		}
+	else
 		/* in != NULL */
 		{
 		int done;
 
-        assert(passwd != NULL);
+		assert (passwd != NULL);
-        do {
+		do
+			{
 			int r = BIO_gets(in, passwd, pw_maxlen + 1);
-            if (r > 0) {
+			if (r > 0)
-                char *c = (strchr(passwd, '\n'));
+				{
+				char *c = (strchr(passwd, '\n')) ;
 				if (c != NULL)
 					*c = 0; /* truncate at newline */
-                else {
+				else
+					{
 					/* ignore rest of line */
 					char trash[BUFSIZ];
 					do
@@ -257,8 +272,7 @@ int MAIN(int argc, char **argv)
 					}
 				
 				if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-                               quiet, table, reverse, pw_maxlen, usecrypt,
+					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
-                               use1, useapr1))
 					goto err;
 				}
 			done = (r <= 0);
@@ -267,7 +281,7 @@ int MAIN(int argc, char **argv)
 		}
 	ret = 0;
 
- err:
+err:
 	ERR_print_errors(bio_err);
 	if (salt_malloc)
 		OPENSSL_free(salt_malloc);
@@ -279,27 +293,28 @@ int MAIN(int argc, char **argv)
 		BIO_free_all(out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
-# ifndef NO_MD5CRYPT_1
+
-/*
+#ifndef NO_MD5CRYPT_1
- * MD5-based password algorithm (should probably be available as a library
+/* MD5-based password algorithm (should probably be available as a library
- * function; then the static buffer would not be acceptable). For magic
+ * function; then the static buffer would not be acceptable).
- * string "1", this should be compatible to the MD5-based BSD password
+ * For magic string "1", this should be compatible to the MD5-based BSD
- * algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
+ * password algorithm.
- * Apache password algorithm. (Apparently, the Apache password algorithm is
+ * For 'magic' string "apr1", this is compatible to the MD5-based Apache
- * identical except that the 'magic' string was changed -- the laziest
+ * password algorithm.
- * application of the NIH principle I've ever encountered.)
+ * (Apparently, the Apache password algorithm is identical except that the
+ * 'magic' string was changed -- the laziest application of the NIH principle
+ * I've ever encountered.)
  */
 static char *md5crypt(const char *passwd, const char *magic, const char *salt)
-{
+	{
-    /* "$apr1$..salt..$.......md5hash..........\0" */
+	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
-    static char out_buf[6 + 9 + 24 + 2];
 	unsigned char buf[MD5_DIGEST_LENGTH];
 	char *salt_out;
 	int n;
 	unsigned int i;
-    EVP_MD_CTX md, md2;
+	EVP_MD_CTX md,md2;
 	size_t passwd_len, salt_len;
 
 	passwd_len = strlen(passwd);
@@ -315,7 +330,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	assert(salt_len <= 8);
 	
 	EVP_MD_CTX_init(&md);
-    EVP_DigestInit_ex(&md, EVP_md5(), NULL);
+	EVP_DigestInit_ex(&md,EVP_md5(), NULL);
 	EVP_DigestUpdate(&md, passwd, passwd_len);
 	EVP_DigestUpdate(&md, "$", 1);
 	EVP_DigestUpdate(&md, magic, strlen(magic));
@@ -323,7 +338,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	EVP_DigestUpdate(&md, salt_out, salt_len);
 	
 	EVP_MD_CTX_init(&md2);
-    EVP_DigestInit_ex(&md2, EVP_md5(), NULL);
+	EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
 	EVP_DigestUpdate(&md2, passwd, passwd_len);
 	EVP_DigestUpdate(&md2, salt_out, salt_len);
 	EVP_DigestUpdate(&md2, passwd, passwd_len);
@@ -334,21 +349,23 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	EVP_DigestUpdate(&md, buf, i);
 	
 	n = passwd_len;
-    while (n) {
+	while (n)
+		{
 		EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
 		n >>= 1;
 		}
 	EVP_DigestFinal_ex(&md, buf, NULL);
 
-    for (i = 0; i < 1000; i++) {
+	for (i = 0; i < 1000; i++)
-        EVP_DigestInit_ex(&md2, EVP_md5(), NULL);
+		{
-        EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *)passwd : buf,
+		EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
+		EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *) passwd : buf,
 		                       (i & 1) ? passwd_len : sizeof buf);
 		if (i % 3)
 			EVP_DigestUpdate(&md2, salt_out, salt_len);
 		if (i % 7)
 			EVP_DigestUpdate(&md2, passwd, passwd_len);
-        EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *)passwd,
+		EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *) passwd,
 		                       (i & 1) ? sizeof buf : passwd_len);
 		EVP_DigestFinal_ex(&md2, buf, NULL);
 		}
@@ -362,27 +379,26 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 		char *output;
 
 		/* silly output permutation */
-        for (dest = 0, source = 0; dest < 14;
+		for (dest = 0, source = 0; dest < 14; dest++, source = (source + 6) % 17)
-             dest++, source = (source + 6) % 17)
 			buf_perm[dest] = buf[source];
 		buf_perm[14] = buf[5];
 		buf_perm[15] = buf[11];
-#  ifndef PEDANTIC              /* Unfortunately, this generates a "no
+#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */
-                                 * effect" warning */
 		assert(16 == sizeof buf_perm);
-#  endif
+#endif
 		
 		output = salt_out + salt_len;
 		assert(output == out_buf + strlen(out_buf));
 		
 		*output++ = '$';
 
-        for (i = 0; i < 15; i += 3) {
+		for (i = 0; i < 15; i += 3)
-            *output++ = cov_2char[buf_perm[i + 2] & 0x3f];
+			{
-            *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
+			*output++ = cov_2char[buf_perm[i+2] & 0x3f];
-                                  (buf_perm[i + 2] >> 6)];
+			*output++ = cov_2char[((buf_perm[i+1] & 0xf) << 2) |
+				                  (buf_perm[i+2] >> 6)];
 			*output++ = cov_2char[((buf_perm[i] & 3) << 4) |
-                                  (buf_perm[i + 1] >> 4)];
+				                  (buf_perm[i+1] >> 4)];
 			*output++ = cov_2char[buf_perm[i] >> 2];
 			}
 		assert(i == 15);
@@ -394,24 +410,27 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	EVP_MD_CTX_cleanup(&md);
 
 	return out_buf;
-}
+	}
-# endif
+#endif
+
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-                     char *passwd, BIO *out, int quiet, int table,
+	char *passwd, BIO *out,	int quiet, int table, int reverse,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
-                     int useapr1)
+	{
-{
 	char *hash = NULL;
 
 	assert(salt_p != NULL);
 	assert(salt_malloc_p != NULL);
 
 	/* first make sure we have a salt */
-    if (!passed_salt) {
+	if (!passed_salt)
-# ifndef OPENSSL_NO_DES
+		{
-        if (usecrypt) {
+#ifndef OPENSSL_NO_DES
-            if (*salt_malloc_p == NULL) {
+		if (usecrypt)
+			{
+			if (*salt_malloc_p == NULL)
+				{
 				*salt_p = *salt_malloc_p = OPENSSL_malloc(3);
 				if (*salt_malloc_p == NULL)
 					goto err;
@@ -421,18 +440,20 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 			(*salt_p)[0] = cov_2char[(*salt_p)[0] & 0x3f]; /* 6 bits */
 			(*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
 			(*salt_p)[2] = 0;
-#  ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
-            ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert back
+			ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert
-                                                * to ASCII */
+			                                    * back to ASCII */
-#  endif
+#endif
 			}
-# endif                         /* !OPENSSL_NO_DES */
+#endif /* !OPENSSL_NO_DES */
 
-# ifndef NO_MD5CRYPT_1
+#ifndef NO_MD5CRYPT_1
-        if (use1 || useapr1) {
+		if (use1 || useapr1)
+			{
 			int i;
 			
-            if (*salt_malloc_p == NULL) {
+			if (*salt_malloc_p == NULL)
+				{
 				*salt_p = *salt_malloc_p = OPENSSL_malloc(9);
 				if (*salt_malloc_p == NULL)
 					goto err;
@@ -444,33 +465,30 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 				(*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
 			(*salt_p)[8] = 0;
 			}
-# endif                         /* !NO_MD5CRYPT_1 */
+#endif /* !NO_MD5CRYPT_1 */
 		}
 	
 	assert(*salt_p != NULL);
 	
 	/* truncate password if necessary */
-    if ((strlen(passwd) > pw_maxlen)) {
+	if ((strlen(passwd) > pw_maxlen))
+		{
 		if (!quiet)
-            /*
+			/* XXX: really we should know how to print a size_t, not cast it */
-             * XXX: really we should know how to print a size_t, not cast it
+			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", (unsigned)pw_maxlen);
-             */
-            BIO_printf(bio_err,
-                       "Warning: truncating password to %u characters\n",
-                       (unsigned)pw_maxlen);
 		passwd[pw_maxlen] = 0;
 		}
 	assert(strlen(passwd) <= pw_maxlen);
 	
 	/* now compute password hash */
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
 	if (usecrypt)
 		hash = DES_crypt(passwd, *salt_p);
-# endif
+#endif
-# ifndef NO_MD5CRYPT_1
+#ifndef NO_MD5CRYPT_1
 	if (use1 || useapr1)
 		hash = md5crypt(passwd, (use1 ? "1" : "apr1"), *salt_p);
-# endif
+#endif
 	assert(hash != NULL);
 
 	if (table && !reverse)
@@ -481,14 +499,14 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 		BIO_printf(out, "%s\n", hash);
 	return 1;
 	
- err:
+err:
 	return 0;
-}
+	}
 #else
 
 int MAIN(int argc, char **argv)
-{
+	{
 	fputs("Program not available.\n", stderr)
 	OPENSSL_EXIT(1);
-}
+	}
 #endif

apps/pkcs7.c

@@ -71,8 +71,7 @@
 #undef PROG
 #define PROG	pkcs7_main
 
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
- * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -82,90 +81,97 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    PKCS7 *p7 = NULL;
-    int i, badops = 0;
-    BIO *in = NULL, *out = NULL;
-    int informat, outformat;
-    char *infile, *outfile, *prog;
-    int print_certs = 0, text = 0, noout = 0;
-    int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	ENGINE *e = NULL;
+#endif
+	PKCS7 *p7=NULL;
+	int i,badops=0;
+	BIO *in=NULL,*out=NULL;
+	int informat,outformat;
+	char *infile,*outfile,*prog;
+	int print_certs=0,text=0,noout=0;
+	int ret=1;
+#ifndef OPENSSL_NO_ENGINE
+	char *engine=NULL;
 #endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-outform") == 0)
-            outformat = str2fmt(*(++argv));
+			{
-        } else if (strcmp(*argv, "-in") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outformat=str2fmt(*(++argv));
-                goto bad;
+			}
-            infile = *(++argv);
+		else if (strcmp(*argv,"-in") == 0)
-        } else if (strcmp(*argv, "-out") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			infile= *(++argv);
-            outfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-noout") == 0)
+		else if (strcmp(*argv,"-out") == 0)
-            noout = 1;
+			{
-        else if (strcmp(*argv, "-text") == 0)
+			if (--argc < 1) goto bad;
-            text = 1;
+			outfile= *(++argv);
-        else if (strcmp(*argv, "-print_certs") == 0)
+			}
-            print_certs = 1;
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else if (strcmp(*argv,"-text") == 0)
+			text=1;
+		else if (strcmp(*argv,"-print_certs") == 0)
+			print_certs=1;
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            engine = *(++argv);
+			engine= *(++argv);
 			}
 #endif
-        else {
+		else
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+			{
-            badops = 1;
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
+		BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
-        BIO_printf(bio_err, " -in arg       input file\n");
+		BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
-        BIO_printf(bio_err, " -out arg      output file\n");
+		BIO_printf(bio_err," -in arg       input file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -out arg      output file\n");
-                   " -print_certs  print any certs or crl in the input\n");
+		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -text         print full details of certificates\n");
-                   " -text         print full details of certificates\n");
+		BIO_printf(bio_err," -noout        don't output encoded data\n");
-        BIO_printf(bio_err, " -noout        don't output encoded data\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		ret = 1;
 		goto end;
@@ -174,130 +180,139 @@ int MAIN(int argc, char **argv)
 	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
-    if ((in == NULL) || (out == NULL)) {
+	if ((in == NULL) || (out == NULL))
+		{
 		ERR_print_errors(bio_err);
                 goto end;
                 }
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0)
+		{
-            if (in == NULL) {
+		if (BIO_read_filename(in,infile) <= 0)
+		if (in == NULL)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
 
 	if	(informat == FORMAT_ASN1)
-        p7 = d2i_PKCS7_bio(in, NULL);
+		p7=d2i_PKCS7_bio(in,NULL);
 	else if (informat == FORMAT_PEM)
-        p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
+		p7=PEM_read_bio_PKCS7(in,NULL,NULL,NULL);
-    else {
+	else
-        BIO_printf(bio_err, "bad input format specified for pkcs7 object\n");
+		{
+		BIO_printf(bio_err,"bad input format specified for pkcs7 object\n");
 		goto end;
 		}
-    if (p7 == NULL) {
+	if (p7 == NULL)
-        BIO_printf(bio_err, "unable to load PKCS7 object\n");
+		{
+		BIO_printf(bio_err,"unable to load PKCS7 object\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
-    if (print_certs) {
+	if (print_certs)
-        STACK_OF(X509) *certs = NULL;
+		{
-        STACK_OF(X509_CRL) *crls = NULL;
+		STACK_OF(X509) *certs=NULL;
+		STACK_OF(X509_CRL) *crls=NULL;
 
-        i = OBJ_obj2nid(p7->type);
+		i=OBJ_obj2nid(p7->type);
-        switch (i) {
+		switch (i)
+			{
 		case NID_pkcs7_signed:
-            certs = p7->d.sign->cert;
+			certs=p7->d.sign->cert;
-            crls = p7->d.sign->crl;
+			crls=p7->d.sign->crl;
 			break;
 		case NID_pkcs7_signedAndEnveloped:
-            certs = p7->d.signed_and_enveloped->cert;
+			certs=p7->d.signed_and_enveloped->cert;
-            crls = p7->d.signed_and_enveloped->crl;
+			crls=p7->d.signed_and_enveloped->crl;
 			break;
 		default:
 			break;
 			}
 
-        if (certs != NULL) {
+		if (certs != NULL)
+			{
 			X509 *x;
 
-            for (i = 0; i < sk_X509_num(certs); i++) {
+			for (i=0; i<sk_X509_num(certs); i++)
-                x = sk_X509_value(certs, i);
+				{
-                if (text)
+				x=sk_X509_value(certs,i);
-                    X509_print(out, x);
+				if(text) X509_print(out, x);
-                else
+				else dump_cert_text(out, x);
-                    dump_cert_text(out, x);
 
-                if (!noout)
+				if(!noout) PEM_write_bio_X509(out,x);
-                    PEM_write_bio_X509(out, x);
+				BIO_puts(out,"\n");
-                BIO_puts(out, "\n");
 				}
 			}
-        if (crls != NULL) {
+		if (crls != NULL)
+			{
 			X509_CRL *crl;
 
-            for (i = 0; i < sk_X509_CRL_num(crls); i++) {
+			for (i=0; i<sk_X509_CRL_num(crls); i++)
-                crl = sk_X509_CRL_value(crls, i);
+				{
+				crl=sk_X509_CRL_value(crls,i);
 
 				X509_CRL_print(out, crl);
 
-                if (!noout)
+				if(!noout)PEM_write_bio_X509_CRL(out,crl);
-                    PEM_write_bio_X509_CRL(out, crl);
+				BIO_puts(out,"\n");
-                BIO_puts(out, "\n");
 				}
 			}
 
-        ret = 0;
+		ret=0;
 		goto end;
 		}
 
-    if (!noout) {
+	if(!noout) {
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_PKCS7_bio(out, p7);
+			i=i2d_PKCS7_bio(out,p7);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_PKCS7(out, p7);
+			i=PEM_write_bio_PKCS7(out,p7);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 
-        if (!i) {
+		if (!i)
-            BIO_printf(bio_err, "unable to write pkcs7 object\n");
+			{
+			BIO_printf(bio_err,"unable to write pkcs7 object\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 	}
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (p7 != NULL)
+	if (p7 != NULL) PKCS7_free(p7);
-        PKCS7_free(p7);
+	if (in != NULL) BIO_free(in);
-    if (in != NULL)
+	if (out != NULL) BIO_free_all(out);
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}

apps/pkcs8.c

@@ -1,7 +1,6 @@
 /* pkcs8.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 1999-2004.
- * 1999-2004.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -69,7 +68,7 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
 	char **args, *infile = NULL, *outfile = NULL;
 	char *passargin = NULL, *passargout = NULL;
@@ -83,140 +82,158 @@ int MAIN(int argc, char **argv)
 	int nocrypt = 0;
 	X509_SIG *p8;
 	PKCS8_PRIV_KEY_INFO *p8inf;
-    EVP_PKEY *pkey = NULL;
+	EVP_PKEY *pkey=NULL;
 	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
 	int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
 
-    if (bio_err == NULL)
+	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
 	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
-    while (!badarg && *args && *args[0] == '-') {
+	while (!badarg && *args && *args[0] == '-')
-        if (!strcmp(*args, "-v2")) {
+		{
-            if (args[1]) {
+		if (!strcmp(*args,"-v2"))
+			{
+			if (args[1])
+				{
 				args++;
-                cipher = EVP_get_cipherbyname(*args);
+				cipher=EVP_get_cipherbyname(*args);
-                if (!cipher) {
+				if (!cipher)
-                    BIO_printf(bio_err, "Unknown cipher %s\n", *args);
+					{
+					BIO_printf(bio_err,
+						 "Unknown cipher %s\n", *args);
 					badarg = 1;
 					}
-            } else
+				}
-                badarg = 1;
+			else
-        } else if (!strcmp(*args, "-v1")) {
-            if (args[1]) {
-                args++;
-                pbe_nid = OBJ_txt2nid(*args);
-                if (pbe_nid == NID_undef) {
-                    BIO_printf(bio_err, "Unknown PBE algorithm %s\n", *args);
 				badarg = 1;
 			}
-            } else
+		else if (!strcmp(*args,"-v1"))
-                badarg = 1;
+			{
-        } else if (!strcmp(*args, "-inform")) {
+			if (args[1])
-            if (args[1]) {
+				{
 				args++;
-                informat = str2fmt(*args);
+				pbe_nid=OBJ_txt2nid(*args);
-            } else
+				if (pbe_nid == NID_undef)
+					{
+					BIO_printf(bio_err,
+						 "Unknown PBE algorithm %s\n", *args);
 					badarg = 1;
-        } else if (!strcmp(*args, "-outform")) {
+					}
-            if (args[1]) {
+				}
+			else
+				badarg = 1;
+			}
+		else if (!strcmp(*args,"-inform"))
+			{
+			if (args[1])
+				{
 				args++;
-                outformat = str2fmt(*args);
+				informat=str2fmt(*args);
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-topk8"))
+			}
+		else if (!strcmp(*args,"-outform"))
+			{
+			if (args[1])
+				{
+				args++;
+				outformat=str2fmt(*args);
+				}
+			else badarg = 1;
+			}
+		else if (!strcmp (*args, "-topk8"))
 			topk8 = 1;
-        else if (!strcmp(*args, "-noiter"))
+		else if (!strcmp (*args, "-noiter"))
 			iter = 1;
-        else if (!strcmp(*args, "-nocrypt"))
+		else if (!strcmp (*args, "-nocrypt"))
 			nocrypt = 1;
-        else if (!strcmp(*args, "-nooct"))
+		else if (!strcmp (*args, "-nooct"))
 			p8_broken = PKCS8_NO_OCTET;
-        else if (!strcmp(*args, "-nsdb"))
+		else if (!strcmp (*args, "-nsdb"))
 			p8_broken = PKCS8_NS_DB;
-        else if (!strcmp(*args, "-embed"))
+		else if (!strcmp (*args, "-embed"))
 			p8_broken = PKCS8_EMBEDDED_PARAM;
-        else if (!strcmp(*args, "-passin")) {
+		else if (!strcmp(*args,"-passin"))
-            if (!args[1])
+			{
-                goto bad;
+			if (!args[1]) goto bad;
-            passargin = *(++args);
+			passargin= *(++args);
-        } else if (!strcmp(*args, "-passout")) {
+			}
-            if (!args[1])
+		else if (!strcmp(*args,"-passout"))
-                goto bad;
+			{
-            passargout = *(++args);
+			if (!args[1]) goto bad;
+			passargout= *(++args);
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*args, "-engine") == 0) {
+		else if (strcmp(*args,"-engine") == 0)
-            if (!args[1])
+			{
-                goto bad;
+			if (!args[1]) goto bad;
-            engine = *(++args);
+			engine= *(++args);
 			}
 #endif
-        else if (!strcmp(*args, "-in")) {
+		else if (!strcmp (*args, "-in"))
-            if (args[1]) {
+			{
+			if (args[1])
+				{
 				args++;
 				infile = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-out")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-out"))
+			{
+			if (args[1])
+				{
 				args++;
 				outfile = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else
+			}
-            badarg = 1;
+		else badarg = 1;
 		args++;
 		}
 
-    if (badarg) {
+	if (badarg)
+		{
 		bad:
 		BIO_printf(bio_err, "Usage pkcs8 [options]\n");
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, "-in file        input file\n");
 		BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
-                   "-passin arg     input file pass phrase source\n");
 		BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
 		BIO_printf(bio_err, "-out file       output file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
-                   "-passout arg    output file pass phrase source\n");
 		BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
-                   "-nooct          use (nonstandard) no octet format\n");
+		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
-                   "-embed          use (nonstandard) embedded DSA parameters format\n");
-        BIO_printf(bio_err,
-                   "-nsdb           use (nonstandard) DSA Netscape DB format\n");
 		BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
-                   "-nocrypt        use or expect unencrypted private key\n");
+		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
-                   "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
-        BIO_printf(bio_err,
-                   "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
-                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
 		return 1;
 		}
+
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
 #endif
 
-    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
+		{
 		BIO_printf(bio_err, "Error getting passwords\n");
 		return 1;
 		}
@@ -224,21 +241,30 @@ int MAIN(int argc, char **argv)
 	if ((pbe_nid == -1) && !cipher)
 		pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
-    if (infile) {
+	if (infile)
-        if (!(in = BIO_new_file(infile, "rb"))) {
+		{
-            BIO_printf(bio_err, "Can't open input file %s\n", infile);
+		if (!(in = BIO_new_file(infile, "rb")))
+			{
+			BIO_printf(bio_err,
+				 "Can't open input file %s\n", infile);
 			return (1);
 			}
-    } else
+		}
-        in = BIO_new_fp(stdin, BIO_NOCLOSE);
+	else
+		in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
-    if (outfile) {
+	if (outfile)
-        if (!(out = BIO_new_file(outfile, "wb"))) {
+		{
-            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
+		if (!(out = BIO_new_file (outfile, "wb")))
+			{
+			BIO_printf(bio_err,
+				 "Can't open output file %s\n", outfile);
 			return (1);
 			}
-    } else {
+		}
-        out = BIO_new_fp(stdout, BIO_NOCLOSE);
+	else
+		{
+		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -246,39 +272,48 @@ int MAIN(int argc, char **argv)
 			}
 #endif
 		}
-    if (topk8) {
+	if (topk8)
+		{
 		BIO_free(in); /* Not needed in this section */
-        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
+		pkey = load_key(bio_err, infile, informat, 1,
-        if (!pkey) {
+			passin, e, "key");
+		if (!pkey)
+			{
 			BIO_free_all(out);
 			return 1;
 			}
-        if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
+		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
+			{
 			BIO_printf(bio_err, "Error converting key\n");
 			ERR_print_errors(bio_err);
 			EVP_PKEY_free(pkey);
 			BIO_free_all(out);
 			return 1;
 			}
-        if (nocrypt) {
+		if (nocrypt)
+			{
 			if (outformat == FORMAT_PEM) 
 				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
 			else if (outformat == FORMAT_ASN1)
 				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
-            else {
+			else
+				{
 				BIO_printf(bio_err, "Bad format specified for key\n");
 				PKCS8_PRIV_KEY_INFO_free(p8inf);
 				EVP_PKEY_free(pkey);
 				BIO_free_all(out);
 				return (1);
 				}
-        } else {
+			}
+		else
+			{
 			if (passout)
 				p8pass = passout;
-            else {
+			else
+				{
 				p8pass = pass;
-                if (EVP_read_pw_string
+				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
-                    (pass, sizeof pass, "Enter Encryption Password:", 1)) {
+					{
 					PKCS8_PRIV_KEY_INFO_free(p8inf);
 					EVP_PKEY_free(pkey);
 					BIO_free_all(out);
@@ -288,7 +323,8 @@ int MAIN(int argc, char **argv)
 			app_RAND_load_file(NULL, bio_err, 0);
 			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
 					p8pass, strlen(p8pass),
-                                     NULL, 0, iter, p8inf))) {
+					NULL, 0, iter, p8inf)))
+				{
 				BIO_printf(bio_err, "Error encrypting key\n");
 				ERR_print_errors(bio_err);
 				PKCS8_PRIV_KEY_INFO_free(p8inf);
@@ -301,7 +337,8 @@ int MAIN(int argc, char **argv)
 				PEM_write_bio_PKCS8(out, p8);
 			else if (outformat == FORMAT_ASN1)
 				i2d_PKCS8_bio(out, p8);
-            else {
+			else
+				{
 				BIO_printf(bio_err, "Bad format specified for key\n");
 				PKCS8_PRIV_KEY_INFO_free(p8inf);
 				EVP_PKEY_free(pkey);
@@ -311,7 +348,7 @@ int MAIN(int argc, char **argv)
 			X509_SIG_free(p8);
 			}
 
-        PKCS8_PRIV_KEY_INFO_free(p8inf);
+		PKCS8_PRIV_KEY_INFO_free (p8inf);
 		EVP_PKEY_free(pkey);
 		BIO_free_all(out);
 		if (passin)
@@ -321,33 +358,40 @@ int MAIN(int argc, char **argv)
 		return (0);
 		}
 
-    if (nocrypt) {
+	if (nocrypt)
+		{
 		if (informat == FORMAT_PEM) 
-            p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in, NULL, NULL, NULL);
+			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
 		else if (informat == FORMAT_ASN1)
 			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
-        else {
+		else
+			{
 			BIO_printf(bio_err, "Bad format specified for key\n");
 			return (1);
 			}
-    } else {
+		}
+	else
+		{
 		if (informat == FORMAT_PEM) 
 			p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
 		else if (informat == FORMAT_ASN1)
 			p8 = d2i_PKCS8_bio(in, NULL);
-        else {
+		else
+			{
 			BIO_printf(bio_err, "Bad format specified for key\n");
 			return (1);
 			}
 
-        if (!p8) {
+		if (!p8)
-            BIO_printf(bio_err, "Error reading key\n");
+			{
+			BIO_printf (bio_err, "Error reading key\n");
 			ERR_print_errors(bio_err);
 			return (1);
 			}
 		if (passin)
 			p8pass = passin;
-        else {
+		else
+			{
 			p8pass = pass;
 			EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
 			}
@@ -355,21 +399,25 @@ int MAIN(int argc, char **argv)
 		X509_SIG_free(p8);
 		}
 
-    if (!p8inf) {
+	if (!p8inf)
+		{
 		BIO_printf(bio_err, "Error decrypting key\n");
 		ERR_print_errors(bio_err);
 		return (1);
 		}
 
-    if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
+	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
+		{
 		BIO_printf(bio_err, "Error converting key\n");
 		ERR_print_errors(bio_err);
 		return (1);
 		}
 	
-    if (p8inf->broken) {
+	if (p8inf->broken)
+		{
 		BIO_printf(bio_err, "Warning: broken key encoding: ");
-        switch (p8inf->broken) {
+		switch (p8inf->broken)
+			{
 			case PKCS8_NO_OCTET:
 			BIO_printf(bio_err, "No Octet String in PrivateKey\n");
 			break;
@@ -393,7 +441,8 @@ int MAIN(int argc, char **argv)
 		PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
 	else if (outformat == FORMAT_ASN1)
 		i2d_PrivateKey_bio(out, pkey);
-    else {
+	else
+		{
 		BIO_printf(bio_err, "Bad format specified for key\n");
 			return (1);
 		}
@@ -408,4 +457,4 @@ int MAIN(int argc, char **argv)
 		OPENSSL_free(passout);
 
 	return (0);
-}
+	}

apps/prime.c

@@ -52,49 +52,54 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
+
 #undef PROG
 #define PROG prime_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+    {
-    int hex = 0;
+    int hex=0;
-    int checks = 20;
+    int checks=20;
-    BIGNUM *bn = NULL;
+    BIGNUM *bn=NULL;
     BIO *bio_out;
 
     apps_startup();
 
     if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+	if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+	    BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
     --argc;
     ++argv;
-    while (argc >= 1 && **argv == '-') {
+    while (argc >= 1 && **argv == '-')
-        if (!strcmp(*argv, "-hex"))
+	{
-            hex = 1;
+	if(!strcmp(*argv,"-hex"))
-        else if (!strcmp(*argv, "-checks"))
+	    hex=1;
-            if (--argc < 1)
+	else if(!strcmp(*argv,"-checks"))
+	    if(--argc < 1)
 		goto bad;
 	    else
-                checks = atoi(*++argv);
+		checks=atoi(*++argv);
-        else {
+	else
-            BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
+	    {
+	    BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
 	    goto bad;
 	    }
 	--argc;
 	++argv;
 	}
 
-    if (argv[0] == NULL) {
+    if (argv[0] == NULL)
-        BIO_printf(bio_err, "No prime specified\n");
+	{
+	BIO_printf(bio_err,"No prime specified\n");
 	goto bad;
 	}
 
-    if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
+   if ((bio_out=BIO_new(BIO_s_file())) != NULL)
-        BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
+	{
+	BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 	    {
 	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
@@ -103,14 +108,14 @@ int MAIN(int argc, char **argv)
 #endif
 	}
 
-    if (hex)
+    if(hex)
-        BN_hex2bn(&bn, argv[0]);
+	BN_hex2bn(&bn,argv[0]);
     else
-        BN_dec2bn(&bn, argv[0]);
+	BN_dec2bn(&bn,argv[0]);
 
-    BN_print(bio_out, bn);
+    BN_print(bio_out,bn);
-    BIO_printf(bio_out, " is %sprime\n",
+    BIO_printf(bio_out," is %sprime\n",
-               BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
+	       BN_is_prime_ex(bn,checks,NULL,NULL) ? "" : "not ");
 
     BN_free(bn);
     BIO_free_all(bio_out);
@@ -118,8 +123,8 @@ int MAIN(int argc, char **argv)
     return 0;
 
     bad:
-    BIO_printf(bio_err, "options are\n");
+    BIO_printf(bio_err,"options are\n");
-    BIO_printf(bio_err, "%-14s hex\n", "-hex");
+    BIO_printf(bio_err,"%-14s hex\n","-hex");
-    BIO_printf(bio_err, "%-14s number of checks\n", "-checks <n>");
+    BIO_printf(bio_err,"%-14s number of checks\n","-checks <n>");
     return 1;
-}
+    }

apps/progs.h

@@ -1,46 +1,45 @@
 /* apps/progs.h */
 /* automatically generated by progs.pl for openssl.c */
 
-extern int verify_main(int argc, char *argv[]);
+extern int verify_main(int argc,char *argv[]);
-extern int asn1parse_main(int argc, char *argv[]);
+extern int asn1parse_main(int argc,char *argv[]);
-extern int req_main(int argc, char *argv[]);
+extern int req_main(int argc,char *argv[]);
-extern int dgst_main(int argc, char *argv[]);
+extern int dgst_main(int argc,char *argv[]);
-extern int dh_main(int argc, char *argv[]);
+extern int dh_main(int argc,char *argv[]);
-extern int dhparam_main(int argc, char *argv[]);
+extern int dhparam_main(int argc,char *argv[]);
-extern int enc_main(int argc, char *argv[]);
+extern int enc_main(int argc,char *argv[]);
-extern int passwd_main(int argc, char *argv[]);
+extern int passwd_main(int argc,char *argv[]);
-extern int gendh_main(int argc, char *argv[]);
+extern int gendh_main(int argc,char *argv[]);
-extern int errstr_main(int argc, char *argv[]);
+extern int errstr_main(int argc,char *argv[]);
-extern int ca_main(int argc, char *argv[]);
+extern int ca_main(int argc,char *argv[]);
-extern int crl_main(int argc, char *argv[]);
+extern int crl_main(int argc,char *argv[]);
-extern int rsa_main(int argc, char *argv[]);
+extern int rsa_main(int argc,char *argv[]);
-extern int rsautl_main(int argc, char *argv[]);
+extern int rsautl_main(int argc,char *argv[]);
-extern int dsa_main(int argc, char *argv[]);
+extern int dsa_main(int argc,char *argv[]);
-extern int dsaparam_main(int argc, char *argv[]);
+extern int dsaparam_main(int argc,char *argv[]);
-extern int ec_main(int argc, char *argv[]);
+extern int ec_main(int argc,char *argv[]);
-extern int ecparam_main(int argc, char *argv[]);
+extern int ecparam_main(int argc,char *argv[]);
-extern int x509_main(int argc, char *argv[]);
+extern int x509_main(int argc,char *argv[]);
-extern int genrsa_main(int argc, char *argv[]);
+extern int genrsa_main(int argc,char *argv[]);
-extern int gendsa_main(int argc, char *argv[]);
+extern int gendsa_main(int argc,char *argv[]);
-extern int s_server_main(int argc, char *argv[]);
+extern int s_server_main(int argc,char *argv[]);
-extern int s_client_main(int argc, char *argv[]);
+extern int s_client_main(int argc,char *argv[]);
-extern int speed_main(int argc, char *argv[]);
+extern int speed_main(int argc,char *argv[]);
-extern int s_time_main(int argc, char *argv[]);
+extern int s_time_main(int argc,char *argv[]);
-extern int version_main(int argc, char *argv[]);
+extern int version_main(int argc,char *argv[]);
-extern int pkcs7_main(int argc, char *argv[]);
+extern int pkcs7_main(int argc,char *argv[]);
-extern int cms_main(int argc, char *argv[]);
+extern int crl2pkcs7_main(int argc,char *argv[]);
-extern int crl2pkcs7_main(int argc, char *argv[]);
+extern int sess_id_main(int argc,char *argv[]);
-extern int sess_id_main(int argc, char *argv[]);
+extern int ciphers_main(int argc,char *argv[]);
-extern int ciphers_main(int argc, char *argv[]);
+extern int nseq_main(int argc,char *argv[]);
-extern int nseq_main(int argc, char *argv[]);
+extern int pkcs12_main(int argc,char *argv[]);
-extern int pkcs12_main(int argc, char *argv[]);
+extern int pkcs8_main(int argc,char *argv[]);
-extern int pkcs8_main(int argc, char *argv[]);
+extern int spkac_main(int argc,char *argv[]);
-extern int spkac_main(int argc, char *argv[]);
+extern int smime_main(int argc,char *argv[]);
-extern int smime_main(int argc, char *argv[]);
+extern int rand_main(int argc,char *argv[]);
-extern int rand_main(int argc, char *argv[]);
+extern int engine_main(int argc,char *argv[]);
-extern int engine_main(int argc, char *argv[]);
+extern int ocsp_main(int argc,char *argv[]);
-extern int ocsp_main(int argc, char *argv[]);
+extern int prime_main(int argc,char *argv[]);
-extern int prime_main(int argc, char *argv[]);
 
 #define FUNC_TYPE_GENERAL	1
 #define FUNC_TYPE_MD		2
@@ -49,295 +48,292 @@ extern int prime_main(int argc, char *argv[]);
 typedef struct {
 	int type;
 	const char *name;
-    int (*func) (int argc, char *argv[]);
+	int (*func)(int argc,char *argv[]);
-} FUNCTION;
+	} FUNCTION;
 
 FUNCTION functions[] = {
-    {FUNC_TYPE_GENERAL, "verify", verify_main},
+	{FUNC_TYPE_GENERAL,"verify",verify_main},
-    {FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main},
+	{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
-    {FUNC_TYPE_GENERAL, "req", req_main},
+	{FUNC_TYPE_GENERAL,"req",req_main},
-    {FUNC_TYPE_GENERAL, "dgst", dgst_main},
+	{FUNC_TYPE_GENERAL,"dgst",dgst_main},
 #ifndef OPENSSL_NO_DH
-    {FUNC_TYPE_GENERAL, "dh", dh_main},
+	{FUNC_TYPE_GENERAL,"dh",dh_main},
 #endif
 #ifndef OPENSSL_NO_DH
-    {FUNC_TYPE_GENERAL, "dhparam", dhparam_main},
+	{FUNC_TYPE_GENERAL,"dhparam",dhparam_main},
 #endif
-    {FUNC_TYPE_GENERAL, "enc", enc_main},
+	{FUNC_TYPE_GENERAL,"enc",enc_main},
-    {FUNC_TYPE_GENERAL, "passwd", passwd_main},
+	{FUNC_TYPE_GENERAL,"passwd",passwd_main},
 #ifndef OPENSSL_NO_DH
-    {FUNC_TYPE_GENERAL, "gendh", gendh_main},
+	{FUNC_TYPE_GENERAL,"gendh",gendh_main},
 #endif
-    {FUNC_TYPE_GENERAL, "errstr", errstr_main},
+	{FUNC_TYPE_GENERAL,"errstr",errstr_main},
-    {FUNC_TYPE_GENERAL, "ca", ca_main},
+	{FUNC_TYPE_GENERAL,"ca",ca_main},
-    {FUNC_TYPE_GENERAL, "crl", crl_main},
+	{FUNC_TYPE_GENERAL,"crl",crl_main},
 #ifndef OPENSSL_NO_RSA
-    {FUNC_TYPE_GENERAL, "rsa", rsa_main},
+	{FUNC_TYPE_GENERAL,"rsa",rsa_main},
 #endif
 #ifndef OPENSSL_NO_RSA
-    {FUNC_TYPE_GENERAL, "rsautl", rsautl_main},
+	{FUNC_TYPE_GENERAL,"rsautl",rsautl_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-    {FUNC_TYPE_GENERAL, "dsa", dsa_main},
+	{FUNC_TYPE_GENERAL,"dsa",dsa_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-    {FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main},
+	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
 #endif
 #ifndef OPENSSL_NO_EC
-    {FUNC_TYPE_GENERAL, "ec", ec_main},
+	{FUNC_TYPE_GENERAL,"ec",ec_main},
 #endif
 #ifndef OPENSSL_NO_EC
-    {FUNC_TYPE_GENERAL, "ecparam", ecparam_main},
+	{FUNC_TYPE_GENERAL,"ecparam",ecparam_main},
 #endif
-    {FUNC_TYPE_GENERAL, "x509", x509_main},
+	{FUNC_TYPE_GENERAL,"x509",x509_main},
 #ifndef OPENSSL_NO_RSA
-    {FUNC_TYPE_GENERAL, "genrsa", genrsa_main},
+	{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
 #endif
 #ifndef OPENSSL_NO_DSA
-    {FUNC_TYPE_GENERAL, "gendsa", gendsa_main},
+	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
 #endif
 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
-    {FUNC_TYPE_GENERAL, "s_server", s_server_main},
+	{FUNC_TYPE_GENERAL,"s_server",s_server_main},
 #endif
 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
-    {FUNC_TYPE_GENERAL, "s_client", s_client_main},
+	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
 #endif
 #ifndef OPENSSL_NO_SPEED
-    {FUNC_TYPE_GENERAL, "speed", speed_main},
+	{FUNC_TYPE_GENERAL,"speed",speed_main},
 #endif
 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
-    {FUNC_TYPE_GENERAL, "s_time", s_time_main},
+	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
 #endif
-    {FUNC_TYPE_GENERAL, "version", version_main},
+	{FUNC_TYPE_GENERAL,"version",version_main},
-    {FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main},
+	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},
-#ifndef OPENSSL_NO_CMS
+	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
-    {FUNC_TYPE_GENERAL, "cms", cms_main},
+	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
-#endif
-    {FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main},
-    {FUNC_TYPE_GENERAL, "sess_id", sess_id_main},
 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
-    {FUNC_TYPE_GENERAL, "ciphers", ciphers_main},
+	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
-    {FUNC_TYPE_GENERAL, "nseq", nseq_main},
+	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
 #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
-    {FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main},
+	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
 #endif
-    {FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main},
+	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
-    {FUNC_TYPE_GENERAL, "spkac", spkac_main},
+	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
-    {FUNC_TYPE_GENERAL, "smime", smime_main},
+	{FUNC_TYPE_GENERAL,"smime",smime_main},
-    {FUNC_TYPE_GENERAL, "rand", rand_main},
+	{FUNC_TYPE_GENERAL,"rand",rand_main},
 #ifndef OPENSSL_NO_ENGINE
-    {FUNC_TYPE_GENERAL, "engine", engine_main},
+	{FUNC_TYPE_GENERAL,"engine",engine_main},
 #endif
-    {FUNC_TYPE_GENERAL, "ocsp", ocsp_main},
+	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
-    {FUNC_TYPE_GENERAL, "prime", prime_main},
+	{FUNC_TYPE_GENERAL,"prime",prime_main},
 #ifndef OPENSSL_NO_MD2
-    {FUNC_TYPE_MD, "md2", dgst_main},
+	{FUNC_TYPE_MD,"md2",dgst_main},
 #endif
 #ifndef OPENSSL_NO_MD4
-    {FUNC_TYPE_MD, "md4", dgst_main},
+	{FUNC_TYPE_MD,"md4",dgst_main},
 #endif
 #ifndef OPENSSL_NO_MD5
-    {FUNC_TYPE_MD, "md5", dgst_main},
+	{FUNC_TYPE_MD,"md5",dgst_main},
 #endif
 #ifndef OPENSSL_NO_SHA
-    {FUNC_TYPE_MD, "sha", dgst_main},
+	{FUNC_TYPE_MD,"sha",dgst_main},
 #endif
 #ifndef OPENSSL_NO_SHA1
-    {FUNC_TYPE_MD, "sha1", dgst_main},
+	{FUNC_TYPE_MD,"sha1",dgst_main},
 #endif
 #ifndef OPENSSL_NO_MDC2
-    {FUNC_TYPE_MD, "mdc2", dgst_main},
+	{FUNC_TYPE_MD,"mdc2",dgst_main},
 #endif
 #ifndef OPENSSL_NO_RMD160
-    {FUNC_TYPE_MD, "rmd160", dgst_main},
+	{FUNC_TYPE_MD,"rmd160",dgst_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_AES
-    {FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-128-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-128-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-192-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-192-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-256-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-    {FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"camellia-256-ecb",enc_main},
 #endif
-    {FUNC_TYPE_CIPHER, "base64", enc_main},
+	{FUNC_TYPE_CIPHER,"base64",enc_main},
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des", enc_main},
+	{FUNC_TYPE_CIPHER,"des",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des3", enc_main},
+	{FUNC_TYPE_CIPHER,"des3",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "desx", enc_main},
+	{FUNC_TYPE_CIPHER,"desx",enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-    {FUNC_TYPE_CIPHER, "idea", enc_main},
+	{FUNC_TYPE_CIPHER,"idea",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-    {FUNC_TYPE_CIPHER, "seed", enc_main},
+	{FUNC_TYPE_CIPHER,"seed",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC4
-    {FUNC_TYPE_CIPHER, "rc4", enc_main},
+	{FUNC_TYPE_CIPHER,"rc4",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC4
-    {FUNC_TYPE_CIPHER, "rc4-40", enc_main},
+	{FUNC_TYPE_CIPHER,"rc4-40",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2",enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-    {FUNC_TYPE_CIPHER, "bf", enc_main},
+	{FUNC_TYPE_CIPHER,"bf",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast", enc_main},
+	{FUNC_TYPE_CIPHER,"cast",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-    {FUNC_TYPE_CIPHER, "rc5", enc_main},
+	{FUNC_TYPE_CIPHER,"rc5",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede3", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede3",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"des-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede3-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede3-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
-    {FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"des-ede3-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-    {FUNC_TYPE_CIPHER, "idea-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"idea-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-    {FUNC_TYPE_CIPHER, "idea-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"idea-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-    {FUNC_TYPE_CIPHER, "idea-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"idea-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_IDEA
-    {FUNC_TYPE_CIPHER, "idea-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"idea-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-    {FUNC_TYPE_CIPHER, "seed-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"seed-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-    {FUNC_TYPE_CIPHER, "seed-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"seed-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-    {FUNC_TYPE_CIPHER, "seed-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"seed-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
-    {FUNC_TYPE_CIPHER, "seed-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"seed-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
-    {FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-    {FUNC_TYPE_CIPHER, "bf-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-    {FUNC_TYPE_CIPHER, "bf-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-    {FUNC_TYPE_CIPHER, "bf-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_BF
-    {FUNC_TYPE_CIPHER, "bf-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast5-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"cast5-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast5-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"cast5-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast5-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"cast5-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast5-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"cast5-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAST
-    {FUNC_TYPE_CIPHER, "cast-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"cast-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-    {FUNC_TYPE_CIPHER, "rc5-cbc", enc_main},
+	{FUNC_TYPE_CIPHER,"rc5-cbc",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-    {FUNC_TYPE_CIPHER, "rc5-ecb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc5-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-    {FUNC_TYPE_CIPHER, "rc5-cfb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc5-cfb",enc_main},
 #endif
 #ifndef OPENSSL_NO_RC5
-    {FUNC_TYPE_CIPHER, "rc5-ofb", enc_main},
+	{FUNC_TYPE_CIPHER,"rc5-ofb",enc_main},
 #endif
-    {0, NULL, NULL}
+	{0,NULL,NULL}
-};
+	};

apps/progs.pl

@@ -43,8 +43,6 @@ foreach (@ARGV)
 		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^pkcs12$/))
 		{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
-	elsif ( ($_ =~ /^cms$/))
-		{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
 	else
 		{ print $str; }
 	}

apps/rand.c

@@ -66,109 +66,111 @@
 #undef PROG
 #define PROG rand_main
 
-/*-
+/* -out file         - write to file
- * -out file         - write to file
  * -rand file:file   - PRNG seed files
- * -base64           - base64 encode output
+ * -base64           - encode output
- * -hex              - hex encode output
  * num               - write 'num' bytes
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
+#ifndef OPENSSL_NO_ENGINE
+	ENGINE *e = NULL;
+#endif
 	int i, r, ret = 1;
 	int badopt;
 	char *outfile = NULL;
 	char *inrand = NULL;
 	int base64 = 0;
-    int hex = 0;
 	BIO *out = NULL;
 	int num = -1;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
 
 	apps_startup();
 
 	if (bio_err == NULL)
 		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto err;
 
 	badopt = 0;
 	i = 0;
-    while (!badopt && argv[++i] != NULL) {
+	while (!badopt && argv[++i] != NULL)
-        if (strcmp(argv[i], "-out") == 0) {
+		{
-            if ((argv[i + 1] != NULL) && (outfile == NULL))
+		if (strcmp(argv[i], "-out") == 0)
+			{
+			if ((argv[i+1] != NULL) && (outfile == NULL))
 				outfile = argv[++i];
 			else
 				badopt = 1;
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(argv[i], "-engine") == 0) {
+		else if (strcmp(argv[i], "-engine") == 0)
-            if ((argv[i + 1] != NULL) && (engine == NULL))
+			{
+			if ((argv[i+1] != NULL) && (engine == NULL))
 				engine = argv[++i];
 			else
 				badopt = 1;
 			}
 #endif
-        else if (strcmp(argv[i], "-rand") == 0) {
+		else if (strcmp(argv[i], "-rand") == 0)
-            if ((argv[i + 1] != NULL) && (inrand == NULL))
+			{
+			if ((argv[i+1] != NULL) && (inrand == NULL))
 				inrand = argv[++i];
 			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-base64") == 0) {
+			}
+		else if (strcmp(argv[i], "-base64") == 0)
+			{
 			if (!base64)
 				base64 = 1;
 			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-hex") == 0) {
+			}
-            if (!hex)
+		else if (isdigit((unsigned char)argv[i][0]))
-                hex = 1;
+			{
-            else
+			if (num < 0)
-                badopt = 1;
+				{
-        } else if (isdigit((unsigned char)argv[i][0])) {
-            if (num < 0) {
 				r = sscanf(argv[i], "%d", &num);
 				if (r == 0 || num < 0)
 					badopt = 1;
-            } else
+				}
-                badopt = 1;
+			else
-        } else
 				badopt = 1;
 			}
-
+		else
-    if (hex && base64)
 			badopt = 1;
+		}
 
 	if (num < 0)
 		badopt = 1;
 	
-    if (badopt) {
+	if (badopt) 
+		{
 		BIO_printf(bio_err, "Usage: rand [options] num\n");
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, "-out file             - write to file\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
-                   "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n",
+		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err, "-base64               - encode output\n");
-        BIO_printf(bio_err, "-base64               - base64 encode output\n");
-        BIO_printf(bio_err, "-hex                  - hex encode output\n");
 		goto err;
 		}
+
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 
 	app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 	if (inrand != NULL)
-        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 
 	out = BIO_new(BIO_s_file());
@@ -176,7 +178,8 @@ int MAIN(int argc, char **argv)
 		goto err;
 	if (outfile != NULL)
 		r = BIO_write_filename(out, outfile);
-    else {
+	else
+		{
 		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -188,14 +191,16 @@ int MAIN(int argc, char **argv)
 	if (r <= 0)
 		goto err;
 
-    if (base64) {
+	if (base64)
+		{
 		BIO *b64 = BIO_new(BIO_f_base64());
 		if (b64 == NULL)
 			goto err;
 		out = BIO_push(b64, out);
 		}
 	
-    while (num > 0) {
+	while (num > 0) 
+		{
 		unsigned char buf[4096];
 		int chunk;
 
@@ -205,25 +210,18 @@ int MAIN(int argc, char **argv)
 		r = RAND_bytes(buf, chunk);
 		if (r <= 0)
 			goto err;
-        if (!hex)
 		BIO_write(out, buf, chunk);
-        else {
-            for (i = 0; i < chunk; i++)
-                BIO_printf(out, "%02x", buf[i]);
-        }
 		num -= chunk;
 		}
-    if (hex)
-        BIO_puts(out, "\n");
 	(void)BIO_flush(out);
 
 	app_RAND_write_file(NULL, bio_err);
 	ret = 0;
 	
- err:
+err:
 	ERR_print_errors(bio_err);
 	if (out)
 		BIO_free_all(out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}

apps/rsa.c

@@ -58,24 +58,23 @@
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <string.h>
+#include <string.h>
-# include <time.h>
+#include <time.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/rsa.h>
+#include <openssl/rsa.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
 
-# undef PROG
+#undef PROG
-# define PROG    rsa_main
+#define PROG	rsa_main
 
-/*-
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
- * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg	- input file - default stdin
  * -out arg	- output file - default stdout
@@ -99,164 +98,160 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
-    int ret = 1;
+	int ret=1;
-    RSA *rsa = NULL;
+	RSA *rsa=NULL;
-    int i, badops = 0, sgckey = 0;
+	int i,badops=0, sgckey=0;
-    const EVP_CIPHER *enc = NULL;
+	const EVP_CIPHER *enc=NULL;
-    BIO *out = NULL;
+	BIO *out=NULL;
-    int informat, outformat, text = 0, check = 0, noout = 0;
+	int informat,outformat,text=0,check=0,noout=0;
 	int pubin = 0, pubout = 0;
-    char *infile, *outfile, *prog;
+	char *infile,*outfile,*prog;
 	char *passargin = NULL, *passargout = NULL;
 	char *passin = NULL, *passout = NULL;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
-# endif
+#endif
-    int modulus = 0;
+	int modulus=0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    infile = NULL;
+	infile=NULL;
-    outfile = NULL;
+	outfile=NULL;
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
-                goto bad;
-            outformat = str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
-            if (--argc < 1)
-                goto bad;
-            infile = *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
-            if (--argc < 1)
-                goto bad;
-            outfile = *(++argv);
-        } else if (strcmp(*argv, "-passin") == 0) {
-            if (--argc < 1)
-                goto bad;
-            passargin = *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
-            if (--argc < 1)
-                goto bad;
-            passargout = *(++argv);
 			}
-# ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-outform") == 0)
-        else if (strcmp(*argv, "-engine") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			outformat=str2fmt(*(++argv));
-            engine = *(++argv);
 			}
-# endif
+		else if (strcmp(*argv,"-in") == 0)
-        else if (strcmp(*argv, "-sgckey") == 0)
+			{
-            sgckey = 1;
+			if (--argc < 1) goto bad;
-        else if (strcmp(*argv, "-pubin") == 0)
+			infile= *(++argv);
-            pubin = 1;
+			}
-        else if (strcmp(*argv, "-pubout") == 0)
+		else if (strcmp(*argv,"-out") == 0)
-            pubout = 1;
+			{
-        else if (strcmp(*argv, "-noout") == 0)
+			if (--argc < 1) goto bad;
-            noout = 1;
+			outfile= *(++argv);
-        else if (strcmp(*argv, "-text") == 0)
+			}
-            text = 1;
+		else if (strcmp(*argv,"-passin") == 0)
-        else if (strcmp(*argv, "-modulus") == 0)
+			{
-            modulus = 1;
+			if (--argc < 1) goto bad;
-        else if (strcmp(*argv, "-check") == 0)
+			passargin= *(++argv);
-            check = 1;
+			}
-        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
+		else if (strcmp(*argv,"-passout") == 0)
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+			{
-            badops = 1;
+			if (--argc < 1) goto bad;
+			passargout= *(++argv);
+			}
+#ifndef OPENSSL_NO_ENGINE
+		else if (strcmp(*argv,"-engine") == 0)
+			{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+			}
+#endif
+		else if (strcmp(*argv,"-sgckey") == 0)
+			sgckey=1;
+		else if (strcmp(*argv,"-pubin") == 0)
+			pubin=1;
+		else if (strcmp(*argv,"-pubout") == 0)
+			pubout=1;
+		else if (strcmp(*argv,"-noout") == 0)
+			noout=1;
+		else if (strcmp(*argv,"-text") == 0)
+			text=1;
+		else if (strcmp(*argv,"-modulus") == 0)
+			modulus=1;
+		else if (strcmp(*argv,"-check") == 0)
+			check=1;
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"where options are\n");
-                   " -inform arg     input format - one of DER NET PEM\n");
+		BIO_printf(bio_err," -inform arg     input format - one of DER NET PEM\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -outform arg    output format - one of DER NET PEM\n");
-                   " -outform arg    output format - one of DER NET PEM\n");
+		BIO_printf(bio_err," -in arg         input file\n");
-        BIO_printf(bio_err, " -in arg         input file\n");
+		BIO_printf(bio_err," -sgckey         Use IIS SGC key format\n");
-        BIO_printf(bio_err, " -sgckey         Use IIS SGC key format\n");
+		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -out arg        output file\n");
-                   " -passin arg     input file pass phrase source\n");
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-        BIO_printf(bio_err, " -out arg        output file\n");
+		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-                   " -passout arg    output file pass phrase source\n");
+#ifndef OPENSSL_NO_IDEA
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
-                   " -des            encrypt PEM output with cbc des\n");
+#endif
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_SEED
-                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
-# ifndef OPENSSL_NO_IDEA
+#endif
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_AES
-                   " -idea           encrypt PEM output with cbc idea\n");
+		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-# endif
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
-# ifndef OPENSSL_NO_SEED
+#endif
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_CAMELLIA
-                   " -seed           encrypt PEM output with cbc seed\n");
+		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
-# endif
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
-# ifndef OPENSSL_NO_AES
+#endif
-        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
+		BIO_printf(bio_err," -text           print the key in text\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -noout          don't print key out\n");
-                   "                 encrypt PEM output with cbc aes\n");
+		BIO_printf(bio_err," -modulus        print the RSA key modulus\n");
-# endif
+		BIO_printf(bio_err," -check          verify key consistency\n");
-# ifndef OPENSSL_NO_CAMELLIA
+		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
-        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+		BIO_printf(bio_err," -pubout         output a public key\n");
-        BIO_printf(bio_err,
+#ifndef OPENSSL_NO_ENGINE
-                   "                 encrypt PEM output with cbc camellia\n");
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
-# endif
+#endif
-        BIO_printf(bio_err, " -text           print the key in text\n");
-        BIO_printf(bio_err, " -noout          don't print key out\n");
-        BIO_printf(bio_err, " -modulus        print the RSA key modulus\n");
-        BIO_printf(bio_err, " -check          verify key consistency\n");
-        BIO_printf(bio_err,
-                   " -pubin          expect a public key in input file\n");
-        BIO_printf(bio_err, " -pubout         output a public key\n");
-# ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
-                   " -engine e       use engine e, possibly a hardware device.\n");
-# endif
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
 
-    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
 		goto end;
 	}
 
-    if (check && pubin) {
+	if(check && pubin) {
 		BIO_printf(bio_err, "Only private keys can be checked\n");
 		goto end;
 	}
 
-    out = BIO_new(BIO_s_file());
+	out=BIO_new(BIO_s_file());
 
 	{
 		EVP_PKEY	*pkey;
@@ -277,123 +272,130 @@ int MAIN(int argc, char **argv)
 		EVP_PKEY_free(pkey);
 	}
 
-    if (rsa == NULL) {
+	if (rsa == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
-    if (outfile == NULL) {
+	if (outfile == NULL)
-        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+		{
-# ifdef OPENSSL_SYS_VMS
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
+		{
+		if (BIO_write_filename(out,outfile) <= 0)
+			{
 			perror(outfile);
 			goto end;
 			}
 		}
 
 	if (text) 
-        if (!RSA_print(out, rsa, 0)) {
+		if (!RSA_print(out,rsa,0))
+			{
 			perror(outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 
-    if (modulus) {
+	if (modulus)
-        BIO_printf(out, "Modulus=");
+		{
-        BN_print(out, rsa->n);
+		BIO_printf(out,"Modulus=");
-        BIO_printf(out, "\n");
+		BN_print(out,rsa->n);
+		BIO_printf(out,"\n");
 		}
 
-    if (check) {
+	if (check)
+		{
 		int r = RSA_check_key(rsa);
 
 		if (r == 1)
-            BIO_printf(out, "RSA key ok\n");
+			BIO_printf(out,"RSA key ok\n");
-        else if (r == 0) {
+		else if (r == 0)
+			{
 			unsigned long err;
 
 			while ((err = ERR_peek_error()) != 0 &&
 				ERR_GET_LIB(err) == ERR_LIB_RSA &&
 				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
-                   ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE) {
+				ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE)
-                BIO_printf(out, "RSA key error: %s\n",
+				{
-                           ERR_reason_error_string(err));
+				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
 				ERR_get_error(); /* remove e from error stack */
 				}
 			}
 		
-        if (r == -1 || ERR_peek_error() != 0) { /* should happen only if r ==
+		if (r == -1 || ERR_peek_error() != 0) /* should happen only if r == -1 */
-                                                 * -1 */
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 		
-    if (noout) {
+	if (noout)
+		{
 		ret = 0;
 		goto end;
 		}
-    BIO_printf(bio_err, "writing RSA key\n");
+	BIO_printf(bio_err,"writing RSA key\n");
 	if 	(outformat == FORMAT_ASN1) {
-        if (pubout || pubin)
+		if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
-            i = i2d_RSA_PUBKEY_bio(out, rsa);
+		else i=i2d_RSAPrivateKey_bio(out,rsa);
-        else
-            i = i2d_RSAPrivateKey_bio(out, rsa);
 	}
-# ifndef OPENSSL_NO_RC4
+#ifndef OPENSSL_NO_RC4
-    else if (outformat == FORMAT_NETSCAPE) {
+	else if (outformat == FORMAT_NETSCAPE)
-        unsigned char *p, *pp;
+		{
+		unsigned char *p,*pp;
 		int size;
 
-        i = 1;
+		i=1;
-        size = i2d_RSA_NET(rsa, NULL, NULL, sgckey);
+		size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
-        if ((p = (unsigned char *)OPENSSL_malloc(size)) == NULL) {
+		if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
-            BIO_printf(bio_err, "Memory allocation failure\n");
+			{
+			BIO_printf(bio_err,"Memory allocation failure\n");
 			goto end;
 			}
-        pp = p;
+		pp=p;
-        i2d_RSA_NET(rsa, &p, NULL, sgckey);
+		i2d_RSA_NET(rsa,&p,NULL, sgckey);
-        BIO_write(out, (char *)pp, size);
+		BIO_write(out,(char *)pp,size);
 		OPENSSL_free(pp);
 		}
-# endif
+#endif
 	else if (outformat == FORMAT_PEM) {
-        if (pubout || pubin)
+		if(pubout || pubin)
-            i = PEM_write_bio_RSA_PUBKEY(out, rsa);
+		    i=PEM_write_bio_RSA_PUBKEY(out,rsa);
-        else
+		else i=PEM_write_bio_RSAPrivateKey(out,rsa,
-            i = PEM_write_bio_RSAPrivateKey(out, rsa,
+						enc,NULL,0,NULL,passout);
-                                            enc, NULL, 0, NULL, passout);
 	} else	{
-        BIO_printf(bio_err, "bad output format specified for outfile\n");
+		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
-    if (!i) {
+	if (!i)
-        BIO_printf(bio_err, "unable to write key\n");
+		{
+		BIO_printf(bio_err,"unable to write key\n");
 		ERR_print_errors(bio_err);
-    } else
+		}
-        ret = 0;
+	else
- end:
+		ret=0;
-    if (out != NULL)
+end:
-        BIO_free_all(out);
+	if(out != NULL) BIO_free_all(out);
-    if (rsa != NULL)
+	if(rsa != NULL) RSA_free(rsa);
-        RSA_free(rsa);
+	if(passin) OPENSSL_free(passin);
-    if (passin)
+	if(passout) OPENSSL_free(passout);
-        OPENSSL_free(passin);
-    if (passout)
-        OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 #else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy = &dummy;
+static void *dummy=&dummy;
 # endif
 
 #endif

apps/rsautl.c

@@ -1,7 +1,6 @@
 /* rsautl.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 2000.
- * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -60,26 +59,26 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 
-# include "apps.h"
+#include "apps.h"
-# include <string.h>
+#include <string.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# include <openssl/rsa.h>
+#include <openssl/rsa.h>
 
-# define RSA_SIGN        1
+#define RSA_SIGN 	1
-# define RSA_VERIFY      2
+#define RSA_VERIFY 	2
-# define RSA_ENCRYPT     3
+#define RSA_ENCRYPT 	3
-# define RSA_DECRYPT     4
+#define RSA_DECRYPT 	4
 
-# define KEY_PRIVKEY     1
+#define KEY_PRIVKEY	1
-# define KEY_PUBKEY      2
+#define KEY_PUBKEY	2
-# define KEY_CERT        3
+#define KEY_CERT	3
 
 static void usage(void);
 
-# undef PROG
+#undef PROG
 
-# define PROG rsautl_main
+#define PROG rsautl_main
 
 int MAIN(int argc, char **);
 
@@ -88,9 +87,9 @@ int MAIN(int argc, char **argv)
 	ENGINE *e = NULL;
 	BIO *in = NULL, *out = NULL;
 	char *infile = NULL, *outfile = NULL;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 	char *engine = NULL;
-# endif
+#endif
 	char *keyfile = NULL;
 	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
 	int keyform = FORMAT_PEM;
@@ -109,8 +108,7 @@ int MAIN(int argc, char **argv)
 	argc--;
 	argv++;
 
-    if (!bio_err)
+	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
@@ -118,72 +116,51 @@ int MAIN(int argc, char **argv)
 	OpenSSL_add_all_algorithms();
 	pad = RSA_PKCS1_PADDING;
 	
-    while (argc >= 1) {
+	while(argc >= 1)
-        if (!strcmp(*argv, "-in")) {
+	{
-            if (--argc < 1)
+		if (!strcmp(*argv,"-in")) {
-                badarg = 1;
+			if (--argc < 1) badarg = 1;
-            else
+                        infile= *(++argv);
-                infile = *(++argv);
+		} else if (!strcmp(*argv,"-out")) {
-        } else if (!strcmp(*argv, "-out")) {
+			if (--argc < 1) badarg = 1;
-            if (--argc < 1)
+			outfile= *(++argv);
-                badarg = 1;
+		} else if(!strcmp(*argv, "-inkey")) {
-            else
+			if (--argc < 1) badarg = 1;
-                outfile = *(++argv);
-        } else if (!strcmp(*argv, "-inkey")) {
-            if (--argc < 1)
-                badarg = 1;
-            else
 			keyfile = *(++argv);
-        } else if (!strcmp(*argv, "-passin")) {
+		} else if (!strcmp(*argv,"-passin")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
-                badarg = 1;
+			passargin= *(++argv);
-            else
+		} else if (strcmp(*argv,"-keyform") == 0) {
-                passargin = *(++argv);
+			if (--argc < 1) badarg = 1;
-        } else if (strcmp(*argv, "-keyform") == 0) {
+			keyform=str2fmt(*(++argv));
-            if (--argc < 1)
+#ifndef OPENSSL_NO_ENGINE
-                badarg = 1;
+		} else if(!strcmp(*argv, "-engine")) {
-            else
+			if (--argc < 1) badarg = 1;
-                keyform = str2fmt(*(++argv));
-# ifndef OPENSSL_NO_ENGINE
-        } else if (!strcmp(*argv, "-engine")) {
-            if (--argc < 1)
-                badarg = 1;
-            else
 			engine = *(++argv);
-# endif
+#endif
-        } else if (!strcmp(*argv, "-pubin")) {
+		} else if(!strcmp(*argv, "-pubin")) {
 			key_type = KEY_PUBKEY;
-        } else if (!strcmp(*argv, "-certin")) {
+		} else if(!strcmp(*argv, "-certin")) {
 			key_type = KEY_CERT;
-        } else if (!strcmp(*argv, "-asn1parse"))
+		} 
-            asn1parse = 1;
+		else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
-        else if (!strcmp(*argv, "-hexdump"))
+		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
-            hexdump = 1;
+		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
-        else if (!strcmp(*argv, "-raw"))
+		else if(!strcmp(*argv, "-oaep")) pad = RSA_PKCS1_OAEP_PADDING;
-            pad = RSA_NO_PADDING;
+		else if(!strcmp(*argv, "-ssl")) pad = RSA_SSLV23_PADDING;
-        else if (!strcmp(*argv, "-oaep"))
+		else if(!strcmp(*argv, "-pkcs")) pad = RSA_PKCS1_PADDING;
-            pad = RSA_PKCS1_OAEP_PADDING;
+		else if(!strcmp(*argv, "-x931")) pad = RSA_X931_PADDING;
-        else if (!strcmp(*argv, "-ssl"))
+		else if(!strcmp(*argv, "-sign")) {
-            pad = RSA_SSLV23_PADDING;
-        else if (!strcmp(*argv, "-pkcs"))
-            pad = RSA_PKCS1_PADDING;
-        else if (!strcmp(*argv, "-x931"))
-            pad = RSA_X931_PADDING;
-        else if (!strcmp(*argv, "-sign")) {
 			rsa_mode = RSA_SIGN;
 			need_priv = 1;
-        } else if (!strcmp(*argv, "-verify"))
+		} else if(!strcmp(*argv, "-verify")) rsa_mode = RSA_VERIFY;
-            rsa_mode = RSA_VERIFY;
+		else if(!strcmp(*argv, "-rev")) rev = 1;
-        else if (!strcmp(*argv, "-rev"))
+		else if(!strcmp(*argv, "-encrypt")) rsa_mode = RSA_ENCRYPT;
-            rev = 1;
+		else if(!strcmp(*argv, "-decrypt")) {
-        else if (!strcmp(*argv, "-encrypt"))
-            rsa_mode = RSA_ENCRYPT;
-        else if (!strcmp(*argv, "-decrypt")) {
 			rsa_mode = RSA_DECRYPT;
 			need_priv = 1;
-        } else
+		} else badarg = 1;
-            badarg = 1;
+		if(badarg) {
-        if (badarg) {
 			usage();
 			goto end;
 		}
@@ -191,14 +168,15 @@ int MAIN(int argc, char **argv)
 		argv++;
 	}
 
-    if (need_priv && (key_type != KEY_PRIVKEY)) {
+	if(need_priv && (key_type != KEY_PRIVKEY)) {
 		BIO_printf(bio_err, "A private key is needed for this operation\n");
 		goto end;
 	}
-# ifndef OPENSSL_NO_ENGINE
+
+#ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
-# endif
+#endif
-    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 	}
@@ -206,7 +184,7 @@ int MAIN(int argc, char **argv)
 /* FIXME: seed PRNG only if needed */
 	app_RAND_load_file(NULL, bio_err, 0);
 	
-    switch (key_type) {
+	switch(key_type) {
 		case KEY_PRIVKEY:
 		pkey = load_key(bio_err, keyfile, keyform, 0,
 			passin, e, "Private Key");
@@ -218,50 +196,51 @@ int MAIN(int argc, char **argv)
 		break;
 
 		case KEY_CERT:
-        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
+		x = load_cert(bio_err, keyfile, keyform,
-        if (x) {
+			NULL, e, "Certificate");
+		if(x) {
 			pkey = X509_get_pubkey(x);
 			X509_free(x);
 		}
 		break;
 	}
 
-    if (!pkey) {
+	if(!pkey) {
 		return 1;
 	}
 
 	rsa = EVP_PKEY_get1_RSA(pkey);
 	EVP_PKEY_free(pkey);
 
-    if (!rsa) {
+	if(!rsa) {
 		BIO_printf(bio_err, "Error getting RSA key\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-    if (infile) {
+
-        if (!(in = BIO_new_file(infile, "rb"))) {
+	if(infile) {
+		if(!(in = BIO_new_file(infile, "rb"))) {
 			BIO_printf(bio_err, "Error Reading Input File\n");
 			ERR_print_errors(bio_err);	
 			goto end;
 		}
-    } else
+	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-    if (outfile) {
+	if(outfile) {
-        if (!(out = BIO_new_file(outfile, "wb"))) {
+		if(!(out = BIO_new_file(outfile, "wb"))) {
 			BIO_printf(bio_err, "Error Reading Output File\n");
 			ERR_print_errors(bio_err);	
 			goto end;
 		}
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 		{
 		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		    out = BIO_push(tmpbio, out);
 		}
-# endif
+#endif
 	}
 
 	keysize = RSA_size(rsa);
@@ -271,28 +250,27 @@ int MAIN(int argc, char **argv)
 
 	/* Read the input data */
 	rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
-    if (rsa_inlen <= 0) {
+	if(rsa_inlen <= 0) {
 		BIO_printf(bio_err, "Error reading input Data\n");
 		exit(1);
 	}
-    if (rev) {
+	if(rev) {
 		int i;
 		unsigned char ctmp;
-        for (i = 0; i < rsa_inlen / 2; i++) {
+		for(i = 0; i < rsa_inlen/2; i++) {
 			ctmp = rsa_in[i];
 			rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
 			rsa_in[rsa_inlen - 1 - i] = ctmp;
 		}
 	}
-    switch (rsa_mode) {
+	switch(rsa_mode) {
 
 		case RSA_VERIFY:
 			rsa_outlen  = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 		break;
 
 		case RSA_SIGN:
-        rsa_outlen =
+			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-            RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 		break;
 
 		case RSA_ENCRYPT:
@@ -300,36 +278,30 @@ int MAIN(int argc, char **argv)
 		break;
 
 		case RSA_DECRYPT:
-        rsa_outlen =
+			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-            RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 		break;
 
 	}
 
-    if (rsa_outlen <= 0) {
+	if(rsa_outlen <= 0) {
 		BIO_printf(bio_err, "RSA operation error\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 	ret = 0;
-    if (asn1parse) {
+	if(asn1parse) {
-        if (!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
+		if(!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
 			ERR_print_errors(bio_err);
 		}
-    } else if (hexdump)
+	} else if(hexdump) BIO_dump(out, (char *)rsa_out, rsa_outlen);
-        BIO_dump(out, (char *)rsa_out, rsa_outlen);
+	else BIO_write(out, rsa_out, rsa_outlen);
-    else
-        BIO_write(out, rsa_out, rsa_outlen);
 	end:
 	RSA_free(rsa);
 	BIO_free(in);
 	BIO_free_all(out);
-    if (rsa_in)
+	if(rsa_in) OPENSSL_free(rsa_in);
-        OPENSSL_free(rsa_in);
+	if(rsa_out) OPENSSL_free(rsa_out);
-    if (rsa_out)
+	if(passin) OPENSSL_free(passin);
-        OPENSSL_free(rsa_out);
-    if (passin)
-        OPENSSL_free(passin);
 	return ret;
 }
 
@@ -341,23 +313,20 @@ static void usage()
 	BIO_printf(bio_err, "-inkey file     input key\n");
 	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
 	BIO_printf(bio_err, "-pubin          input is an RSA public\n");
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
-               "-certin         input is a certificate carrying an RSA public key\n");
 	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
 	BIO_printf(bio_err, "-raw            use no padding\n");
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
-               "-pkcs           use PKCS#1 v1.5 padding (default)\n");
 	BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
 	BIO_printf(bio_err, "-sign           sign with private key\n");
 	BIO_printf(bio_err, "-verify         verify with public key\n");
 	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
 	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
 	BIO_printf(bio_err, "-hexdump        hex dump output\n");
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
-               "-engine e       use engine e, possibly a hardware device.\n");
+	BIO_printf (bio_err, "-passin arg    pass phrase source\n");
-    BIO_printf(bio_err, "-passin arg    pass phrase source\n");
+#endif
-# endif
 
 }
 

apps/s_apps.h

@@ -108,52 +108,47 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-/* conflicts with winsock2 stuff on netware */
+#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
-#if !defined(OPENSSL_SYS_NETWARE)
+#include <sys/types.h>
-# include <sys/types.h>
 #endif
 #include <openssl/opensslconf.h>
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-# include <conio.h>
+#include <conio.h>
 #endif
 
 #ifdef OPENSSL_SYS_MSDOS
-# define _kbhit kbhit
+#define _kbhit kbhit
 #endif
 
 #if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
-/*
+/* VAX C does not defined fd_set and friends, but it's actually quite simple */
- * VAX C does not defined fd_set and friends, but it's actually quite simple
- */
 /* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
-# define MAX_NOFILE      32
+#define MAX_NOFILE	32
-# define NBBY             8     /* number of bits in a byte */
+#define	NBBY		 8		/* number of bits in a byte	*/
 
-# ifndef FD_SETSIZE
+#ifndef	FD_SETSIZE
-#  define FD_SETSIZE      MAX_NOFILE
+#define	FD_SETSIZE	MAX_NOFILE
-# endif                         /* FD_SETSIZE */
+#endif	/* FD_SETSIZE */
 
 /* How many things we'll allow select to use. 0 if unlimited */
-# define MAXSELFD        MAX_NOFILE
+#define MAXSELFD	MAX_NOFILE
 typedef int	fd_mask;	/* int here! VMS prototypes int, not long */
-# define NFDBITS (sizeof(fd_mask) * NBBY)/* bits per mask (power of 2!) */
+#define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask (power of 2!)*/
-# define NFDSHIFT 5             /* Shift based on above */
+#define NFDSHIFT 5				/* Shift based on above */
 
 typedef fd_mask fd_set;
-# define FD_SET(n, p)    (*(p) |= (1 << ((n) % NFDBITS)))
+#define	FD_SET(n, p)	(*(p) |= (1 << ((n) % NFDBITS)))
-# define FD_CLR(n, p)    (*(p) &= ~(1 << ((n) % NFDBITS)))
+#define	FD_CLR(n, p)	(*(p) &= ~(1 << ((n) % NFDBITS)))
-# define FD_ISSET(n, p)  (*(p) & (1 << ((n) % NFDBITS)))
+#define	FD_ISSET(n, p)	(*(p) & (1 << ((n) % NFDBITS)))
-# define FD_ZERO(p)      memset((char *)(p), 0, sizeof(*(p)))
+#define FD_ZERO(p)	memset((char *)(p), 0, sizeof(*(p)))
 #endif
 
 #define PORT            4433
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret,
+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
-              int (*cb) (char *hostname, int s, unsigned char *context),
-              unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -164,21 +159,12 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
 int init_client(int *sock, char *server, int port, int type);
 int should_retry(int i);
 int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
+int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
-                      short *p);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 	int argi, long argl, long ret);
 
 #ifdef HEADER_SSL_H
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
+void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
-                        const void *buf, size_t len, SSL *ssl, void *arg);
-void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
-                           unsigned char *data, int len, void *arg);
 #endif
-
-int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                         unsigned int *cookie_len);
-int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                       unsigned int cookie_len);

apps/s_cb.c

@@ -117,89 +117,89 @@
 #undef NON_MAIN
 #undef USE_SOCKETS
 #include <openssl/err.h>
-#include <openssl/rand.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include "s_apps.h"
 
-#define COOKIE_SECRET_LENGTH    16
+int verify_depth=0;
-
+int verify_error=X509_V_OK;
-int verify_depth = 0;
-int verify_error = X509_V_OK;
-unsigned char cookie_secret[COOKIE_SECRET_LENGTH];
-int cookie_initialized = 0;
 
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
-{
+	{
 	char buf[256];
 	X509 *err_cert;
-    int err, depth;
+	int err,depth;
 
-    err_cert = X509_STORE_CTX_get_current_cert(ctx);
+	err_cert=X509_STORE_CTX_get_current_cert(ctx);
-    err = X509_STORE_CTX_get_error(ctx);
+	err=	X509_STORE_CTX_get_error(ctx);
-    depth = X509_STORE_CTX_get_error_depth(ctx);
+	depth=	X509_STORE_CTX_get_error_depth(ctx);
 
-    X509_NAME_oneline(X509_get_subject_name(err_cert), buf, sizeof buf);
+	X509_NAME_oneline(X509_get_subject_name(err_cert),buf,sizeof buf);
-    BIO_printf(bio_err, "depth=%d %s\n", depth, buf);
+	BIO_printf(bio_err,"depth=%d %s\n",depth,buf);
-    if (!ok) {
+	if (!ok)
-        BIO_printf(bio_err, "verify error:num=%d:%s\n", err,
+		{
+		BIO_printf(bio_err,"verify error:num=%d:%s\n",err,
 			X509_verify_cert_error_string(err));
-        if (verify_depth >= depth) {
+		if (verify_depth >= depth)
-            ok = 1;
+			{
-            verify_error = X509_V_OK;
+			ok=1;
-        } else {
+			verify_error=X509_V_OK;
-            ok = 0;
+			}
-            verify_error = X509_V_ERR_CERT_CHAIN_TOO_LONG;
+		else
+			{
+			ok=0;
+			verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
 			}
 		}
-    switch (ctx->error) {
+	switch (ctx->error)
+		{
 	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-        X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf,
+		X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,sizeof buf);
-                          sizeof buf);
+		BIO_printf(bio_err,"issuer= %s\n",buf);
-        BIO_printf(bio_err, "issuer= %s\n", buf);
 		break;
 	case X509_V_ERR_CERT_NOT_YET_VALID:
 	case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-        BIO_printf(bio_err, "notBefore=");
+		BIO_printf(bio_err,"notBefore=");
-        ASN1_TIME_print(bio_err, X509_get_notBefore(ctx->current_cert));
+		ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
-        BIO_printf(bio_err, "\n");
+		BIO_printf(bio_err,"\n");
 		break;
 	case X509_V_ERR_CERT_HAS_EXPIRED:
 	case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-        BIO_printf(bio_err, "notAfter=");
+		BIO_printf(bio_err,"notAfter=");
-        ASN1_TIME_print(bio_err, X509_get_notAfter(ctx->current_cert));
+		ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
-        BIO_printf(bio_err, "\n");
+		BIO_printf(bio_err,"\n");
 		break;
 		}
-    BIO_printf(bio_err, "verify return:%d\n", ok);
+	BIO_printf(bio_err,"verify return:%d\n",ok);
-    return (ok);
+	return(ok);
-}
+	}
 
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
-{
+	{
-    if (cert_file != NULL) {
+	if (cert_file != NULL)
-        /*-
+		{
+		/*
 		SSL *ssl;
 		X509 *x509;
 		*/
 
-        if (SSL_CTX_use_certificate_file(ctx, cert_file,
+		if (SSL_CTX_use_certificate_file(ctx,cert_file,
-                                         SSL_FILETYPE_PEM) <= 0) {
+			SSL_FILETYPE_PEM) <= 0)
-            BIO_printf(bio_err, "unable to get certificate from '%s'\n",
+			{
-                       cert_file);
+			BIO_printf(bio_err,"unable to get certificate from '%s'\n",cert_file);
 			ERR_print_errors(bio_err);
-            return (0);
+			return(0);
 			}
-        if (key_file == NULL)
+		if (key_file == NULL) key_file=cert_file;
-            key_file = cert_file;
+		if (SSL_CTX_use_PrivateKey_file(ctx,key_file,
-        if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
+			SSL_FILETYPE_PEM) <= 0)
-            BIO_printf(bio_err, "unable to get private key from '%s'\n",
+			{
-                       key_file);
+			BIO_printf(bio_err,"unable to get private key from '%s'\n",key_file);
 			ERR_print_errors(bio_err);
-            return (0);
+			return(0);
 			}
 
-        /*-
+		/*
 		In theory this is no longer needed 
 		ssl=SSL_new(ctx);
 		x509=SSL_get_certificate(ssl);
@@ -214,115 +214,119 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
 		SSL_free(ssl);
 		*/
 
-        /*
+		/* If we are using DSA, we can copy the parameters from
-         * If we are using DSA, we can copy the parameters from the private
+		 * the private key */
-         * key
-         */
 		
-        /*
+		
-         * Now we know that a key and cert have been set against the SSL
+		/* Now we know that a key and cert have been set against
-         * context
+		 * the SSL context */
-         */
+		if (!SSL_CTX_check_private_key(ctx))
-        if (!SSL_CTX_check_private_key(ctx)) {
+			{
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"Private key does not match the certificate public key\n");
-                       "Private key does not match the certificate public key\n");
+			return(0);
-            return (0);
 			}
 		}
-    return (1);
+	return(1);
-}
+	}
 
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
-{
+	{
 	if (cert ==  NULL)
 		return 1;
-    if (SSL_CTX_use_certificate(ctx, cert) <= 0) {
+	if (SSL_CTX_use_certificate(ctx,cert) <= 0)
-        BIO_printf(bio_err, "error setting certificate\n");
+		{
+		BIO_printf(bio_err,"error setting certificate\n");
 		ERR_print_errors(bio_err);
 		return 0;
 		}
-    if (SSL_CTX_use_PrivateKey(ctx, key) <= 0) {
+	if (SSL_CTX_use_PrivateKey(ctx,key) <= 0)
-        BIO_printf(bio_err, "error setting private key\n");
+		{
+		BIO_printf(bio_err,"error setting private key\n");
 		ERR_print_errors(bio_err);
 		return 0;
 		}
 
-    /*
+		
-     * Now we know that a key and cert have been set against the SSL context
+		/* Now we know that a key and cert have been set against
-     */
+		 * the SSL context */
-    if (!SSL_CTX_check_private_key(ctx)) {
+	if (!SSL_CTX_check_private_key(ctx))
-        BIO_printf(bio_err,
+		{
-                   "Private key does not match the certificate public key\n");
+		BIO_printf(bio_err,"Private key does not match the certificate public key\n");
 		return 0;
 		}
 	return 1;
-}
+	}
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 	int argi, long argl, long ret)
-{
+	{
 	BIO *out;
 
-    out = (BIO *)BIO_get_callback_arg(bio);
+	out=(BIO *)BIO_get_callback_arg(bio);
-    if (out == NULL)
+	if (out == NULL) return(ret);
-        return (ret);
 
-    if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+	if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
-        BIO_printf(out, "read from %p [%p] (%d bytes => %ld (0x%lX))\n",
+		{
-                   (void *)bio, argp, argi, ret, ret);
+		BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",
-        BIO_dump(out, argp, (int)ret);
+ 			(void *)bio,argp,argi,ret,ret);
-        return (ret);
+		BIO_dump(out,argp,(int)ret);
-    } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+		return(ret);
-        BIO_printf(out, "write to %p [%p] (%d bytes => %ld (0x%lX))\n",
+		}
-                   (void *)bio, argp, argi, ret, ret);
+	else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
-        BIO_dump(out, argp, (int)ret);
+		{
+		BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",
+			(void *)bio,argp,argi,ret,ret);
+		BIO_dump(out,argp,(int)ret);
+		}
+	return(ret);
 	}
-    return (ret);
-}
 
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
-{
+	{
 	const char *str;
 	int w;
 
-    w = where & ~SSL_ST_MASK;
+	w=where& ~SSL_ST_MASK;
 
-    if (w & SSL_ST_CONNECT)
+	if (w & SSL_ST_CONNECT) str="SSL_connect";
-        str = "SSL_connect";
+	else if (w & SSL_ST_ACCEPT) str="SSL_accept";
-    else if (w & SSL_ST_ACCEPT)
+	else str="undefined";
-        str = "SSL_accept";
-    else
-        str = "undefined";
 
-    if (where & SSL_CB_LOOP) {
+	if (where & SSL_CB_LOOP)
-        BIO_printf(bio_err, "%s:%s\n", str, SSL_state_string_long(s));
+		{
-    } else if (where & SSL_CB_ALERT) {
+		BIO_printf(bio_err,"%s:%s\n",str,SSL_state_string_long(s));
-        str = (where & SSL_CB_READ) ? "read" : "write";
+		}
-        BIO_printf(bio_err, "SSL3 alert %s:%s:%s\n",
+	else if (where & SSL_CB_ALERT)
+		{
+		str=(where & SSL_CB_READ)?"read":"write";
+		BIO_printf(bio_err,"SSL3 alert %s:%s:%s\n",
 			str,
 			SSL_alert_type_string_long(ret),
 			SSL_alert_desc_string_long(ret));
-    } else if (where & SSL_CB_EXIT) {
+		}
+	else if (where & SSL_CB_EXIT)
+		{
 		if (ret == 0)
-            BIO_printf(bio_err, "%s:failed in %s\n",
+			BIO_printf(bio_err,"%s:failed in %s\n",
-                       str, SSL_state_string_long(s));
+				str,SSL_state_string_long(s));
-        else if (ret < 0) {
+		else if (ret < 0)
-            BIO_printf(bio_err, "%s:error in %s\n",
+			{
-                       str, SSL_state_string_long(s));
+			BIO_printf(bio_err,"%s:error in %s\n",
+				str,SSL_state_string_long(s));
+			}
 		}
 	}
-}
 
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
+
-                        const void *buf, size_t len, SSL *ssl, void *arg)
+void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
-{
+	{
 	BIO *bio = arg;
-    const char *str_write_p, *str_version, *str_content_type =
+	const char *str_write_p, *str_version, *str_content_type = "", *str_details1 = "", *str_details2= "";
-        "", *str_details1 = "", *str_details2 = "";
 	
 	str_write_p = write_p ? ">>>" : "<<<";
 
-    switch (version) {
+	switch (version)
+		{
 	case SSL2_VERSION:
 		str_version = "SSL 2.0";
 		break;
@@ -334,28 +338,25 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 		break;
 	default:
 		str_version = "???";
-    case DTLS1_VERSION:
-        str_version = "DTLS 1.0 ";
-        break;
-    case DTLS1_BAD_VER:
-        str_version = "DTLS 1.0 (bad) ";
-        break;
 		}
 
-    if (version == SSL2_VERSION) {
+	if (version == SSL2_VERSION)
+		{
 		str_details1 = "???";
 
-        if (len > 0) {
+		if (len > 0)
-            switch (((const unsigned char *)buf)[0]) {
+			{
+			switch (((const unsigned char*)buf)[0])
+				{
 				case 0:
 					str_details1 = ", ERROR:";
 					str_details2 = " ???";
-                if (len >= 3) {
+					if (len >= 3)
-                    unsigned err =
+						{
-                        (((const unsigned char *)buf)[1] << 8) +
+						unsigned err = (((const unsigned char*)buf)[1]<<8) + ((const unsigned char*)buf)[2];
-                        ((const unsigned char *)buf)[2];
 						
-                    switch (err) {
+						switch (err)
+							{
 						case 0x0001:
 							str_details2 = " NO-CIPHER-ERROR";
 							break;
@@ -400,10 +401,10 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 			}
 		}
 
-    if (version == SSL3_VERSION ||
+	if (version == SSL3_VERSION || version == TLS1_VERSION)
-        version == TLS1_VERSION ||
+		{
-        version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
+		switch (content_type)
-        switch (content_type) {
+			{
 		case 20:
 			str_content_type = "ChangeCipherSpec";
 			break;
@@ -415,11 +416,14 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 			break;
 			}
 
-        if (content_type == 21) { /* Alert */
+		if (content_type == 21) /* Alert */
+			{
 			str_details1 = ", ???";
 			
-            if (len == 2) {
+			if (len == 2)
-                switch (((const unsigned char *)buf)[0]) {
+				{
+				switch (((const unsigned char*)buf)[0])
+					{
 				case 1:
 					str_details1 = ", warning";
 					break;
@@ -429,7 +433,8 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 					}
 
 				str_details2 = " ???";
-                switch (((const unsigned char *)buf)[1]) {
+				switch (((const unsigned char*)buf)[1])
+					{
 				case 0:
 					str_details2 = " close_notify";
 					break;
@@ -499,33 +504,18 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 				case 100:
 					str_details2 = " no_renegotiation";
 					break;
-                case 110:
-                    str_details2 = " unsupported_extension";
-                    break;
-                case 111:
-                    str_details2 = " certificate_unobtainable";
-                    break;
-                case 112:
-                    str_details2 = " unrecognized_name";
-                    break;
-                case 113:
-                    str_details2 = " bad_certificate_status_response";
-                    break;
-                case 114:
-                    str_details2 = " bad_certificate_hash_value";
-                    break;
-                case 115:
-                    str_details2 = " unknown_psk_identity";
-                    break;
 					}
 				}
 			}
 		
-        if (content_type == 22) { /* Handshake */
+		if (content_type == 22) /* Handshake */
+			{
 			str_details1 = "???";
 
-            if (len > 0) {
+			if (len > 0)
-                switch (((const unsigned char *)buf)[0]) {
+				{
+				switch (((const unsigned char*)buf)[0])
+					{
 				case 0:
 					str_details1 = ", HelloRequest";
 					break;
@@ -550,9 +540,6 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 				case 15:
 					str_details1 = ", CertificateVerify";
 					break;
-                case 3:
-                    str_details1 = ", HelloVerifyRequest";
-                    break;
 				case 16:
 					str_details1 = ", ClientKeyExchange";
 					break;
@@ -564,11 +551,10 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 			}
 		}
 
-    BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version,
+	BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version, str_content_type, (unsigned long)len, str_details1, str_details2);
-               str_content_type, (unsigned long)len, str_details1,
-               str_details2);
 
-    if (len > 0) {
+	if (len > 0)
+		{
 		size_t num, i;
 		
 		BIO_printf(bio, "   ");
@@ -577,157 +563,15 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
 		if (num > 16)
 			num = 16;
 #endif
-        for (i = 0; i < num; i++) {
+		for (i = 0; i < num; i++)
+			{
 			if (i % 16 == 0 && i > 0)
 				BIO_printf(bio, "\n   ");
-            BIO_printf(bio, " %02x", ((const unsigned char *)buf)[i]);
+			BIO_printf(bio, " %02x", ((const unsigned char*)buf)[i]);
 			}
 		if (i < len)
 			BIO_printf(bio, " ...");
 		BIO_printf(bio, "\n");
 		}
 	(void)BIO_flush(bio);
-}
-
-void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
-                           unsigned char *data, int len, void *arg)
-{
-    BIO *bio = arg;
-    char *extname;
-
-    switch (type) {
-    case TLSEXT_TYPE_server_name:
-        extname = "server name";
-        break;
-
-    case TLSEXT_TYPE_max_fragment_length:
-        extname = "max fragment length";
-        break;
-
-    case TLSEXT_TYPE_client_certificate_url:
-        extname = "client certificate URL";
-        break;
-
-    case TLSEXT_TYPE_trusted_ca_keys:
-        extname = "trusted CA keys";
-        break;
-
-    case TLSEXT_TYPE_truncated_hmac:
-        extname = "truncated HMAC";
-        break;
-
-    case TLSEXT_TYPE_status_request:
-        extname = "status request";
-        break;
-
-    case TLSEXT_TYPE_elliptic_curves:
-        extname = "elliptic curves";
-        break;
-
-    case TLSEXT_TYPE_ec_point_formats:
-        extname = "EC point formats";
-        break;
-
-    case TLSEXT_TYPE_session_ticket:
-        extname = "server ticket";
-        break;
-
-    case TLSEXT_TYPE_renegotiate:
-        extname = "renegotiate";
-        break;
-
-    default:
-        extname = "unknown";
-        break;
-
 	}
-
-    BIO_printf(bio, "TLS %s extension \"%s\" (id=%d), len=%d\n",
-               client_server ? "server" : "client", extname, type, len);
-    BIO_dump(bio, (char *)data, len);
-    (void)BIO_flush(bio);
-}
-
-int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                         unsigned int *cookie_len)
-{
-    unsigned char *buffer, result[EVP_MAX_MD_SIZE];
-    unsigned int length, resultlength;
-    struct sockaddr_in peer;
-
-    /* Initialize a random secret */
-    if (!cookie_initialized) {
-        if (!RAND_bytes(cookie_secret, COOKIE_SECRET_LENGTH)) {
-            BIO_printf(bio_err, "error setting random cookie secret\n");
-            return 0;
-        }
-        cookie_initialized = 1;
-    }
-
-    /* Read peer information */
-    (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
-
-    /* Create buffer with peer's address and port */
-    length = sizeof(peer.sin_addr);
-    length += sizeof(peer.sin_port);
-    buffer = OPENSSL_malloc(length);
-
-    if (buffer == NULL) {
-        BIO_printf(bio_err, "out of memory\n");
-        return 0;
-    }
-
-    memcpy(buffer, &peer.sin_addr, sizeof(peer.sin_addr));
-    memcpy(buffer + sizeof(peer.sin_addr), &peer.sin_port,
-           sizeof(peer.sin_port));
-
-    /* Calculate HMAC of buffer using the secret */
-    HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
-         buffer, length, result, &resultlength);
-    OPENSSL_free(buffer);
-
-    memcpy(cookie, result, resultlength);
-    *cookie_len = resultlength;
-
-    return 1;
-}
-
-int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                       unsigned int cookie_len)
-{
-    unsigned char *buffer, result[EVP_MAX_MD_SIZE];
-    unsigned int length, resultlength;
-    struct sockaddr_in peer;
-
-    /* If secret isn't initialized yet, the cookie can't be valid */
-    if (!cookie_initialized)
-        return 0;
-
-    /* Read peer information */
-    (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
-
-    /* Create buffer with peer's address and port */
-    length = sizeof(peer.sin_addr);
-    length += sizeof(peer.sin_port);
-    buffer = (unsigned char *)OPENSSL_malloc(length);
-
-    if (buffer == NULL) {
-        BIO_printf(bio_err, "out of memory\n");
-        return 0;
-    }
-
-    memcpy(buffer, &peer.sin_addr, sizeof(peer.sin_addr));
-    memcpy(buffer + sizeof(peer.sin_addr), &peer.sin_port,
-           sizeof(peer.sin_port));
-
-    /* Calculate HMAC of buffer using the secret */
-    HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
-         buffer, length, result, &resultlength);
-    OPENSSL_free(buffer);
-
-    if (cookie_len == resultlength
-        && memcmp(result, cookie, resultlength) == 0)
-        return 1;
-
-    return 0;
-}

apps/s_socket.c

@@ -1,6 +1,4 @@
-/*
+/* apps/s_socket.c -  socket-related functions used by s_client and s_server */
- * apps/s_socket.c - socket-related functions used by s_client and s_server
- */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,20 +62,12 @@
 #include <errno.h>
 #include <signal.h>
 
-#ifdef FLAT_INC
+/* With IPv6, it looks like Digital has mixed up the proper order of
-# include "e_os2.h"
+   recursive header file inclusion, resulting in the compiler complaining
-#else
+   that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
-# include "../e_os2.h"
+   is needed to have fileno() declared correctly...  So let's define u_int */
-#endif
-
-/*
- * With IPv6, it looks like Digital has mixed up the proper order of
- * recursive header file inclusion, resulting in the compiler complaining
- * that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which is
- * needed to have fileno() declared correctly...  So let's define u_int
- */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
 typedef unsigned int u_int;
 #endif
 
@@ -90,344 +80,344 @@ typedef unsigned int u_int;
 #include <openssl/ssl.h>
 
 #ifdef FLAT_INC
-# include "e_os.h"
+#include "e_os.h"
 #else
-# include "../e_os.h"
+#include "../e_os.h"
 #endif
 
 #ifndef OPENSSL_NO_SOCK
 
-# if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
+#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
-#  include "netdb.h"
+#include "netdb.h"
-# endif
+#endif
 
 static struct hostent *GetHostByName(char *name);
-# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
 static void ssl_sock_cleanup(void);
-# endif
+#endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type);
+static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
 static int init_server(int *sock, int port, int type);
-static int init_server_long(int *sock, int port, char *ip, int type);
+static int init_server_long(int *sock, int port,char *ip, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
 
-# ifdef OPENSSL_SYS_WIN16
+#ifdef OPENSSL_SYS_WIN16
-#  define SOCKET_PROTOCOL 0     /* more microsoft stupidity */
+#define SOCKET_PROTOCOL	0 /* more microsoft stupidity */
-# else
+#else
-#  define SOCKET_PROTOCOL IPPROTO_TCP
+#define SOCKET_PROTOCOL	IPPROTO_TCP
-# endif
+#endif
 
-# if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
+#if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
-static int wsa_init_done = 0;
+static int wsa_init_done=0;
-# endif
+#endif
 
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 static struct WSAData wsa_state;
-static int wsa_init_done = 0;
+static int wsa_init_done=0;
 
-#  ifdef OPENSSL_SYS_WIN16
+#ifdef OPENSSL_SYS_WIN16
-static HWND topWnd = 0;
+static HWND topWnd=0;
-static FARPROC lpTopWndProc = NULL;
+static FARPROC lpTopWndProc=NULL;
-static FARPROC lpTopHookProc = NULL;
+static FARPROC lpTopHookProc=NULL;
 extern HINSTANCE _hInstance;  /* nice global CRT provides */
 
 static LONG FAR PASCAL topHookProc(HWND hwnd, UINT message, WPARAM wParam,
 	     LPARAM lParam)
-{
+	{
-    if (hwnd == topWnd) {
+	if (hwnd == topWnd)
-        switch (message) {
+		{
+		switch(message)
+			{
 		case WM_DESTROY:
 		case WM_CLOSE:
-            SetWindowLong(topWnd, GWL_WNDPROC, (LONG) lpTopWndProc);
+			SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopWndProc);
 			ssl_sock_cleanup();
 			break;
 			}
 		}
-    return CallWindowProc(lpTopWndProc, hwnd, message, wParam, lParam);
+	return CallWindowProc(lpTopWndProc,hwnd,message,wParam,lParam);
-}
+	}
 
-static BOOL CALLBACK enumproc(HWND hwnd, LPARAM lParam)
+static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam)
-{
+	{
-    topWnd = hwnd;
+	topWnd=hwnd;
-    return (FALSE);
+	return(FALSE);
-}
+	}
 
-#  endif                        /* OPENSSL_SYS_WIN32 */
+#endif /* OPENSSL_SYS_WIN32 */
-# endif                         /* OPENSSL_SYS_WINDOWS */
+#endif /* OPENSSL_SYS_WINDOWS */
 
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 static void ssl_sock_cleanup(void)
-{
+	{
-    if (wsa_init_done) {
+	if (wsa_init_done)
-        wsa_init_done = 0;
+		{
-#  ifndef OPENSSL_SYS_WINCE
+		wsa_init_done=0;
+#ifndef OPENSSL_SYS_WINCE
 		WSACancelBlockingCall();
-#  endif
+#endif
 		WSACleanup();
 		}
-}
+	}
-# elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
+#elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
 static void sock_cleanup(void)
-{
+    {
-    if (wsa_init_done) {
+    if (wsa_init_done)
-        wsa_init_done = 0;
+        {
+        wsa_init_done=0;
 		WSACleanup();
 		}
-}
+	}
-# endif
+#endif
 
 static int ssl_sock_init(void)
-{
+	{
-# ifdef WATT32
+#ifdef WATT32
 	extern int _watt_do_exit;
 	_watt_do_exit = 0;
 	if (sock_init())
 		return (0);
-# elif defined(OPENSSL_SYS_WINDOWS)
+#elif defined(OPENSSL_SYS_WINDOWS)
-    if (!wsa_init_done) {
+	if (!wsa_init_done)
+		{
 		int err;
 	  
-#  ifdef SIGINT
+#ifdef SIGINT
-        signal(SIGINT, (void (*)(int))ssl_sock_cleanup);
+		signal(SIGINT,(void (*)(int))ssl_sock_cleanup);
-#  endif
+#endif
-        wsa_init_done = 1;
+		wsa_init_done=1;
-        memset(&wsa_state, 0, sizeof(wsa_state));
+		memset(&wsa_state,0,sizeof(wsa_state));
-        if (WSAStartup(0x0101, &wsa_state) != 0) {
+		if (WSAStartup(0x0101,&wsa_state)!=0)
-            err = WSAGetLastError();
+			{
-            BIO_printf(bio_err, "unable to start WINSOCK, error code=%d\n",
+			err=WSAGetLastError();
-                       err);
+			BIO_printf(bio_err,"unable to start WINSOCK, error code=%d\n",err);
-            return (0);
+			return(0);
 			}
-#  ifdef OPENSSL_SYS_WIN16
-        EnumTaskWindows(GetCurrentTask(), enumproc, 0L);
-        lpTopWndProc = (FARPROC) GetWindowLong(topWnd, GWL_WNDPROC);
-        lpTopHookProc = MakeProcInstance((FARPROC) topHookProc, _hInstance);
 
-        SetWindowLong(topWnd, GWL_WNDPROC, (LONG) lpTopHookProc);
+#ifdef OPENSSL_SYS_WIN16
-#  endif                        /* OPENSSL_SYS_WIN16 */
+		EnumTaskWindows(GetCurrentTask(),enumproc,0L);
+		lpTopWndProc=(FARPROC)GetWindowLong(topWnd,GWL_WNDPROC);
+		lpTopHookProc=MakeProcInstance((FARPROC)topHookProc,_hInstance);
+
+		SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopHookProc);
+#endif /* OPENSSL_SYS_WIN16 */
 		}
-# elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
+#elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
    WORD wVerReq;
    WSADATA wsaData;
    int err;
 
-    if (!wsa_init_done) {
+   if (!wsa_init_done)
+      {
    
 # ifdef SIGINT
-        signal(SIGINT, (void (*)(int))sock_cleanup);
+      signal(SIGINT,(void (*)(int))sock_cleanup);
 # endif
 
-        wsa_init_done = 1;
+      wsa_init_done=1;
-        wVerReq = MAKEWORD(2, 0);
+      wVerReq = MAKEWORD( 2, 0 );
-        err = WSAStartup(wVerReq, &wsaData);
+      err = WSAStartup(wVerReq,&wsaData);
-        if (err != 0) {
+      if (err != 0)
-            BIO_printf(bio_err, "unable to start WINSOCK2, error code=%d\n",
+         {
-                       err);
+         BIO_printf(bio_err,"unable to start WINSOCK2, error code=%d\n",err);
-            return (0);
+         return(0);
          }
       }
-# endif                         /* OPENSSL_SYS_WINDOWS */
+#endif /* OPENSSL_SYS_WINDOWS */
-    return (1);
+	return(1);
-}
+	}
 
 int init_client(int *sock, char *host, int port, int type)
-{
+	{
 	unsigned char ip[4];
-    short p = 0;
+	short p=0;
 
-    if (!host_ip(host, &(ip[0]))) {
+	if (!host_ip(host,&(ip[0])))
-        return (0);
+		{
+		return(0);
+		}
+	if (p != 0) port=p;
+	return(init_client_ip(sock,ip,port,type));
 	}
-    if (p != 0)
-        port = p;
-    return (init_client_ip(sock, ip, port, type));
-}
 
 static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
-{
+	{
 	unsigned long addr;
 	struct sockaddr_in them;
-    int s, i;
+	int s,i;
 
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
-        return (0);
 
-    memset((char *)&them, 0, sizeof(them));
+	memset((char *)&them,0,sizeof(them));
-    them.sin_family = AF_INET;
+	them.sin_family=AF_INET;
-    them.sin_port = htons((unsigned short)port);
+	them.sin_port=htons((unsigned short)port);
-    addr = (unsigned long)
+	addr=(unsigned long)
-        ((unsigned long)ip[0] << 24L) |
+		((unsigned long)ip[0]<<24L)|
-        ((unsigned long)ip[1] << 16L) |
+		((unsigned long)ip[1]<<16L)|
-        ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
+		((unsigned long)ip[2]<< 8L)|
-    them.sin_addr.s_addr = htonl(addr);
+		((unsigned long)ip[3]);
+	them.sin_addr.s_addr=htonl(addr);
 
 	if (type == SOCK_STREAM)
-        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
+		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
 	else /* ( type == SOCK_DGRAM) */
-        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
 			
-    if (s == INVALID_SOCKET) {
+	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
-        perror("socket");
-        return (0);
-    }
-# ifndef OPENSSL_SYS_MPE
-    if (type == SOCK_STREAM) {
-        i = 0;
-        i = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&i, sizeof(i));
-        if (i < 0) {
-            perror("keepalive");
-            return (0);
-        }
-    }
-# endif
 
-    if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
+#ifndef OPENSSL_SYS_MPE
-        close(s);
+	if (type == SOCK_STREAM)
-        perror("connect");
+		{
-        return (0);
+		i=0;
+		i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
+		if (i < 0) { perror("keepalive"); return(0); }
 		}
-    *sock = s;
+#endif
-    return (1);
-}
 
-int do_server(int port, int type, int *ret,
+	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-              int (*cb) (char *hostname, int s, unsigned char *context),
+		{ close(s); perror("connect"); return(0); }
-              unsigned char *context)
+	*sock=s;
-{
+	return(1);
+	}
+
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+	{
 	int sock;
 	char *name = NULL;
 	int accept_socket;
 	int i;
 
-    if (!init_server(&accept_socket, port, type))
+	if (!init_server(&accept_socket,port,type)) return(0);
-        return (0);
 
-    if (ret != NULL) {
+	if (ret != NULL)
-        *ret = accept_socket;
+		{
-        /* return(1); */
+		*ret=accept_socket;
+		/* return(1);*/
 		}
-    for (;;) {
+  	for (;;)
-        if (type == SOCK_STREAM) {
+  		{
-            if (do_accept(accept_socket, &sock, &name) == 0) {
+		if (type==SOCK_STREAM)
+			{
+			if (do_accept(accept_socket,&sock,&name) == 0)
+				{
 				SHUTDOWN(accept_socket);
-                return (0);
+				return(0);
 				}
-        } else
+			}
+		else
 			sock = accept_socket;
-        i = (*cb) (name, sock, context);
+		i=(*cb)(name,sock, context);
-        if (name != NULL)
+		if (name != NULL) OPENSSL_free(name);
-            OPENSSL_free(name);
+		if (type==SOCK_STREAM)
-        if (type == SOCK_STREAM)
 			SHUTDOWN2(sock);
-        if (i < 0) {
+		if (i < 0)
+			{
 			SHUTDOWN2(accept_socket);
-            return (i);
+			return(i);
+			}
 		}
 	}
-}
 
 static int init_server_long(int *sock, int port, char *ip, int type)
-{
+	{
-    int ret = 0;
+	int ret=0;
 	struct sockaddr_in server;
-    int s = -1;
+	int s= -1,i;
 
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
-        return (0);
 
-    memset((char *)&server, 0, sizeof(server));
+	memset((char *)&server,0,sizeof(server));
-    server.sin_family = AF_INET;
+	server.sin_family=AF_INET;
-    server.sin_port = htons((unsigned short)port);
+	server.sin_port=htons((unsigned short)port);
 	if (ip == NULL)
-        server.sin_addr.s_addr = INADDR_ANY;
+		server.sin_addr.s_addr=INADDR_ANY;
 	else
 /* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
-# ifndef BIT_FIELD_LIMITS
+#ifndef BIT_FIELD_LIMITS
-        memcpy(&server.sin_addr.s_addr, ip, 4);
+		memcpy(&server.sin_addr.s_addr,ip,4);
-# else
+#else
-        memcpy(&server.sin_addr, ip, 4);
+		memcpy(&server.sin_addr,ip,4);
-# endif
+#endif
 	
 		if (type == SOCK_STREAM)
-        s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
+			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
 		else /* type == SOCK_DGRAM */
-        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
 
-    if (s == INVALID_SOCKET)
+	if (s == INVALID_SOCKET) goto err;
-        goto err;
+#if defined SOL_SOCKET && defined SO_REUSEADDR
-# if defined SOL_SOCKET && defined SO_REUSEADDR
 		{
 		int j = 1;
-        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
+		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+			   (void *) &j, sizeof j);
 		}
-# endif
+#endif
-    if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
+	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
-# ifndef OPENSSL_SYS_WINDOWS
+		{
+#ifndef OPENSSL_SYS_WINDOWS
 		perror("bind");
-# endif
+#endif
 		goto err;
 		}
 	/* Make it 128 for linux */
-    if (type == SOCK_STREAM && listen(s, 128) == -1)
+	if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
-        goto err;
+	i=0;
-    *sock = s;
+	*sock=s;
-    ret = 1;
+	ret=1;
- err:
+err:
-    if ((ret == 0) && (s != -1)) {
+	if ((ret == 0) && (s != -1))
+		{
 		SHUTDOWN(s);
 		}
-    return (ret);
+	return(ret);
-}
+	}
 
 static int init_server(int *sock, int port, int type)
-{
+	{
-    return (init_server_long(sock, port, NULL, type));
+	return(init_server_long(sock, port, NULL, type));
-}
+	}
 
 static int do_accept(int acc_sock, int *sock, char **host)
-{
+	{
-    int ret;
+	int ret,i;
-    struct hostent *h1, *h2;
+	struct hostent *h1,*h2;
 	static struct sockaddr_in from;
 	int len;
 /*	struct linger ling; */
 
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
-        return (0);
 
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
- redoit:
+redoit:
-# endif
+#endif
 
-    memset((char *)&from, 0, sizeof(from));
+	memset((char *)&from,0,sizeof(from));
-    len = sizeof(from);
+	len=sizeof(from);
-    /*
+	/* Note: under VMS with SOCKETSHR the fourth parameter is currently
-     * Note: under VMS with SOCKETSHR the fourth parameter is currently of
+	 * of type (int *) whereas under other systems it is (void *) if
-     * type (int *) whereas under other systems it is (void *) if you don't
+	 * you don't have a cast it will choke the compiler: if you do
-     * have a cast it will choke the compiler: if you do have a cast then you
+	 * have a cast then you can either go for (int *) or (void *).
-     * can either go for (int *) or (void *).
-     */
-    ret = accept(acc_sock, (struct sockaddr *)&from, (void *)&len);
-    if (ret == INVALID_SOCKET) {
-# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
-        int i;
-        i = WSAGetLastError();
-        BIO_printf(bio_err, "accept error %d\n", i);
-# else
-        if (errno == EINTR) {
-            /*
-             * check_timeout();
 	 */
+	ret=accept(acc_sock,(struct sockaddr *)&from,(void *)&len);
+	if (ret == INVALID_SOCKET)
+		{
+#if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+		i=WSAGetLastError();
+		BIO_printf(bio_err,"accept error %d\n",i);
+#else
+		if (errno == EINTR)
+			{
+			/*check_timeout(); */
 			goto redoit;
 			}
-        fprintf(stderr, "errno=%d ", errno);
+		fprintf(stderr,"errno=%d ",errno);
 		perror("accept");
-# endif
+#endif
-        return (0);
+		return(0);
 		}
 
-/*-
+/*
 	ling.l_onoff=1;
 	ling.l_linger=0;
 	i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling));
@@ -437,173 +427,191 @@ static int do_accept(int acc_sock, int *sock, char **host)
 	if (i < 0) { perror("keepalive"); return(0); }
 */
 
-    if (host == NULL)
+	if (host == NULL) goto end;
-        goto end;
+#ifndef BIT_FIELD_LIMITS
-# ifndef BIT_FIELD_LIMITS
 	/* I should use WSAAsyncGetHostByName() under windows */
-    h1 = gethostbyaddr((char *)&from.sin_addr.s_addr,
+	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
-                       sizeof(from.sin_addr.s_addr), AF_INET);
+		sizeof(from.sin_addr.s_addr),AF_INET);
-# else
+#else
-    h1 = gethostbyaddr((char *)&from.sin_addr,
+	h1=gethostbyaddr((char *)&from.sin_addr,
-                       sizeof(struct in_addr), AF_INET);
+		sizeof(struct in_addr),AF_INET);
-# endif
+#endif
-    if (h1 == NULL) {
+	if (h1 == NULL)
-        BIO_printf(bio_err, "bad gethostbyaddr\n");
+		{
-        *host = NULL;
+		BIO_printf(bio_err,"bad gethostbyaddr\n");
+		*host=NULL;
 		/* return(0); */
-    } else {
+		}
-        if ((*host = (char *)OPENSSL_malloc(strlen(h1->h_name) + 1)) == NULL) {
+	else
+		{
+		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
+			{
 			perror("OPENSSL_malloc");
-            return (0);
+			return(0);
 			}
-        BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
+		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
 
-        h2 = GetHostByName(*host);
+		h2=GetHostByName(*host);
-        if (h2 == NULL) {
+		if (h2 == NULL)
-            BIO_printf(bio_err, "gethostbyname failure\n");
+			{
-            return (0);
+			BIO_printf(bio_err,"gethostbyname failure\n");
+			return(0);
 			}
-        if (h2->h_addrtype != AF_INET) {
+		i=0;
-            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
+		if (h2->h_addrtype != AF_INET)
-            return (0);
+			{
+			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+			return(0);
 			}
 		}
- end:
+end:
-    *sock = ret;
+	*sock=ret;
-    return (1);
+	return(1);
-}
+	}
 
 int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
 	     short *port_ptr)
-{
+	{
-    char *h, *p;
+	char *h,*p;
 
-    h = str;
+	h=str;
-    p = strchr(str, ':');
+	p=strchr(str,':');
-    if (p == NULL) {
+	if (p == NULL)
-        BIO_printf(bio_err, "no port defined\n");
+		{
-        return (0);
+		BIO_printf(bio_err,"no port defined\n");
+		return(0);
 		}
-    *(p++) = '\0';
+	*(p++)='\0';
 
-    if ((ip != NULL) && !host_ip(str, ip))
+	if ((ip != NULL) && !host_ip(str,ip))
 		goto err;
-    if (host_ptr != NULL)
+	if (host_ptr != NULL) *host_ptr=h;
-        *host_ptr = h;
 
-    if (!extract_port(p, port_ptr))
+	if (!extract_port(p,port_ptr))
 		goto err;
-    return (1);
+	return(1);
- err:
+err:
-    return (0);
+	return(0);
-}
+	}
 
 static int host_ip(char *str, unsigned char ip[4])
-{
+	{
 	unsigned int in[4]; 
 	int i;
 
-    if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
+	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-        4) {
+		{
-        for (i = 0; i < 4; i++)
+		for (i=0; i<4; i++)
-            if (in[i] > 255) {
+			if (in[i] > 255)
-                BIO_printf(bio_err, "invalid IP address\n");
+				{
+				BIO_printf(bio_err,"invalid IP address\n");
 				goto err;
 				}
-        ip[0] = in[0];
+		ip[0]=in[0];
-        ip[1] = in[1];
+		ip[1]=in[1];
-        ip[2] = in[2];
+		ip[2]=in[2];
-        ip[3] = in[3];
+		ip[3]=in[3];
-    } else {                    /* do a gethostbyname */
+		}
+	else
+		{ /* do a gethostbyname */
 		struct hostent *he;
 
-        if (!ssl_sock_init())
+		if (!ssl_sock_init()) return(0);
-            return (0);
 
-        he = GetHostByName(str);
+		he=GetHostByName(str);
-        if (he == NULL) {
+		if (he == NULL)
-            BIO_printf(bio_err, "gethostbyname failure\n");
+			{
+			BIO_printf(bio_err,"gethostbyname failure\n");
 			goto err;
 			}
 		/* cast to short because of win16 winsock definition */
-        if ((short)he->h_addrtype != AF_INET) {
+		if ((short)he->h_addrtype != AF_INET)
-            BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
+			{
-            return (0);
+			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
+			return(0);
 			}
-        ip[0] = he->h_addr_list[0][0];
+		ip[0]=he->h_addr_list[0][0];
-        ip[1] = he->h_addr_list[0][1];
+		ip[1]=he->h_addr_list[0][1];
-        ip[2] = he->h_addr_list[0][2];
+		ip[2]=he->h_addr_list[0][2];
-        ip[3] = he->h_addr_list[0][3];
+		ip[3]=he->h_addr_list[0][3];
+		}
+	return(1);
+err:
+	return(0);
 	}
-    return (1);
- err:
-    return (0);
-}
 
 int extract_port(char *str, short *port_ptr)
-{
+	{
 	int i;
 	struct servent *s;
 
-    i = atoi(str);
+	i=atoi(str);
 	if (i != 0)
-        *port_ptr = (unsigned short)i;
+		*port_ptr=(unsigned short)i;
-    else {
+	else
-        s = getservbyname(str, "tcp");
+		{
-        if (s == NULL) {
+		s=getservbyname(str,"tcp");
-            BIO_printf(bio_err, "getservbyname failure for %s\n", str);
+		if (s == NULL)
-            return (0);
+			{
+			BIO_printf(bio_err,"getservbyname failure for %s\n",str);
+			return(0);
 			}
-        *port_ptr = ntohs((unsigned short)s->s_port);
+		*port_ptr=ntohs((unsigned short)s->s_port);
+		}
+	return(1);
 	}
-    return (1);
-}
 
-# define GHBN_NUM        4
+#define GHBN_NUM	4
-static struct ghbn_cache_st {
+static struct ghbn_cache_st
+	{
 	char name[128];
 	struct hostent ent;
 	unsigned long order;
-} ghbn_cache[GHBN_NUM];
+	} ghbn_cache[GHBN_NUM];
 
-static unsigned long ghbn_hits = 0L;
+static unsigned long ghbn_hits=0L;
-static unsigned long ghbn_miss = 0L;
+static unsigned long ghbn_miss=0L;
 
 static struct hostent *GetHostByName(char *name)
-{
+	{
 	struct hostent *ret;
-    int i, lowi = 0;
+	int i,lowi=0;
-    unsigned long low = (unsigned long)-1;
+	unsigned long low= (unsigned long)-1;
 
-    for (i = 0; i < GHBN_NUM; i++) {
+	for (i=0; i<GHBN_NUM; i++)
-        if (low > ghbn_cache[i].order) {
+		{
-            low = ghbn_cache[i].order;
+		if (low > ghbn_cache[i].order)
-            lowi = i;
+			{
+			low=ghbn_cache[i].order;
+			lowi=i;
 			}
-        if (ghbn_cache[i].order > 0) {
+		if (ghbn_cache[i].order > 0)
-            if (strncmp(name, ghbn_cache[i].name, 128) == 0)
+			{
+			if (strncmp(name,ghbn_cache[i].name,128) == 0)
 				break;
 			}
 		}
-    if (i == GHBN_NUM) {        /* no hit */
+	if (i == GHBN_NUM) /* no hit*/
+		{
 		ghbn_miss++;
-        ret = gethostbyname(name);
+		ret=gethostbyname(name);
-        if (ret == NULL)
+		if (ret == NULL) return(NULL);
-            return (NULL);
 		/* else add to cache */
-        if (strlen(name) < sizeof ghbn_cache[0].name) {
+		if(strlen(name) < sizeof ghbn_cache[0].name)
-            strcpy(ghbn_cache[lowi].name, name);
+			{
-            memcpy((char *)&(ghbn_cache[lowi].ent), ret,
+			strcpy(ghbn_cache[lowi].name,name);
-                   sizeof(struct hostent));
+			memcpy((char *)&(ghbn_cache[lowi].ent),ret,sizeof(struct hostent));
-            ghbn_cache[lowi].order = ghbn_miss + ghbn_hits;
+			ghbn_cache[lowi].order=ghbn_miss+ghbn_hits;
 			}
-        return (ret);
+		return(ret);
-    } else {
+		}
+	else
+		{
 		ghbn_hits++;
-        ret = &(ghbn_cache[i].ent);
+		ret= &(ghbn_cache[i].ent);
-        ghbn_cache[i].order = ghbn_miss + ghbn_hits;
+		ghbn_cache[i].order=ghbn_miss+ghbn_hits;
-        return (ret);
+		return(ret);
+		}
 	}
-}
 
 #endif

apps/s_time.c

@@ -58,7 +58,7 @@
 
 #define NO_SHUTDOWN
 
-/* ----------------------------------------
+/*-----------------------------------------
    s_time - SSL client connection timer program
    Written and donated by Larry Streepy <streepy@healthcare.com>
   -----------------------------------------*/
@@ -70,7 +70,7 @@
 #define USE_SOCKETS
 #include "apps.h"
 #ifdef OPENSSL_NO_STDIO
-# define APPS_WIN16
+#define APPS_WIN16
 #endif
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
@@ -78,48 +78,45 @@
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef WIN32_STUFF
-# include "winmain.h"
+#include "winmain.h"
-# include "wintext.h"
+#include "wintext.h"
 #endif
 #if !defined(OPENSSL_SYS_MSDOS)
-# include OPENSSL_UNISTD
+#include OPENSSL_UNISTD
 #endif
 
 #if !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
-# define TIMES
+#define TIMES
 #endif
 
 #ifndef _IRIX
-# include <time.h>
+#include <time.h>
 #endif
 #ifdef TIMES
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/times.h>
+#include <sys/times.h>
 #endif
 
-/*
+/* Depending on the VMS version, the tms structure is perhaps defined.
- * Depending on the VMS version, the tms structure is perhaps defined. The
+   The __TMS macro will show if it was.  If it wasn't defined, we should
- * __TMS macro will show if it was.  If it wasn't defined, we should undefine
+   undefine TIMES, since that tells the rest of the program how things
- * TIMES, since that tells the rest of the program how things should be
+   should be handled.				-- Richard Levitte */
- * handled.  -- Richard Levitte
- */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
-# undef TIMES
+#undef TIMES
 #endif
 
 #if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
-# include <sys/timeb.h>
+#include <sys/timeb.h>
 #endif
 
 #if defined(sun) || defined(__ultrix)
-# define _POSIX_SOURCE
+#define _POSIX_SOURCE
-# include <limits.h>
+#include <limits.h>
-# include <sys/param.h>
+#include <sys/param.h>
 #endif
 
-/*
+/* The following if from times(3) man page.  It may need to be changed
- * The following if from times(3) man page.  It may need to be changed
+*/
- */
 #ifndef HZ
 # ifdef _SC_CLK_TCK
 #  define HZ ((double)sysconf(_SC_CLK_TCK))
@@ -144,10 +141,7 @@
 
 #define SSL_CONNECT_NAME	"localhost:4433"
 
-/* no default cert. */
+/*#define TEST_CERT "client.pem" */ /* no default cert. */
-/*
- * #define TEST_CERT "client.pem"
- */
 
 #undef BUFSIZZ
 #define BUFSIZZ 1024*10
@@ -165,8 +159,8 @@ extern int verify_depth;
 extern int verify_error;
 
 static void s_time_usage(void);
-static int parseArgs(int argc, char **argv);
+static int parseArgs( int argc, char **argv );
-static SSL *doConnection(SSL *scon);
+static SSL *doConnection( SSL *scon );
 static void s_time_init(void);
 
 /***********************************************************************
@@ -174,51 +168,51 @@ static void s_time_init(void);
  */
 
 /* static char *port=PORT_STR;*/
-static char *host = SSL_CONNECT_NAME;
+static char *host=SSL_CONNECT_NAME;
-static char *t_cert_file = NULL;
+static char *t_cert_file=NULL;
-static char *t_key_file = NULL;
+static char *t_key_file=NULL;
-static char *CApath = NULL;
+static char *CApath=NULL;
-static char *CAfile = NULL;
+static char *CAfile=NULL;
-static char *tm_cipher = NULL;
+static char *tm_cipher=NULL;
 static int tm_verify = SSL_VERIFY_NONE;
 static int maxTime = SECONDS;
-static SSL_CTX *tm_ctx = NULL;
+static SSL_CTX *tm_ctx=NULL;
-static SSL_METHOD *s_time_meth = NULL;
+static SSL_METHOD *s_time_meth=NULL;
-static char *s_www_path = NULL;
+static char *s_www_path=NULL;
-static long bytes_read = 0;
+static long bytes_read=0; 
-static int st_bugs = 0;
+static int st_bugs=0;
-static int perform = 0;
+static int perform=0;
 #ifdef FIONBIO
-static int t_nbio = 0;
+static int t_nbio=0;
 #endif
 #ifdef OPENSSL_SYS_WIN32
 static int exitNow = 0;		/* Set when it's time to exit main */
 #endif
 
 static void s_time_init(void)
-{
+	{
-    host = SSL_CONNECT_NAME;
+	host=SSL_CONNECT_NAME;
-    t_cert_file = NULL;
+	t_cert_file=NULL;
-    t_key_file = NULL;
+	t_key_file=NULL;
-    CApath = NULL;
+	CApath=NULL;
-    CAfile = NULL;
+	CAfile=NULL;
-    tm_cipher = NULL;
+	tm_cipher=NULL;
 	tm_verify = SSL_VERIFY_NONE;
 	maxTime = SECONDS;
-    tm_ctx = NULL;
+	tm_ctx=NULL;
-    s_time_meth = NULL;
+	s_time_meth=NULL;
-    s_www_path = NULL;
+	s_www_path=NULL;
-    bytes_read = 0;
+	bytes_read=0; 
-    st_bugs = 0;
+	st_bugs=0;
-    perform = 0;
+	perform=0;
 
 #ifdef FIONBIO
-    t_nbio = 0;
+	t_nbio=0;
 #endif
 #ifdef OPENSSL_SYS_WIN32
 	exitNow = 0;		/* Set when it's time to exit main */
 #endif
-}
+	}
 
 /***********************************************************************
  * usage - display usage message
@@ -235,10 +229,9 @@ static void s_time_usage(void)
 -CAfile arg   - PEM format file of CA's\n\
 -cipher       - preferred cipher to use, play with 'openssl ciphers'\n\n";
 
-    printf("usage: s_time <args>\n\n");
+	printf( "usage: s_time <args>\n\n" );
 
-    printf("-connect host:port - host:port to connect to (default is %s)\n",
+	printf("-connect host:port - host:port to connect to (default is %s)\n",SSL_CONNECT_NAME);
-           SSL_CONNECT_NAME);
 #ifdef FIONBIO
 	printf("-nbio         - Run with non-blocking IO\n");
 	printf("-ssl2         - Just use SSLv2\n");
@@ -248,7 +241,7 @@ static void s_time_usage(void)
 	printf("-reuse        - Just time connection reuse\n");
 	printf("-www page     - Retrieve 'page' from the site\n");
 #endif
-    printf(umsg, SECONDS);
+	printf( umsg,SECONDS );
 }
 
 /***********************************************************************
@@ -260,102 +253,99 @@ static int parseArgs(int argc, char **argv)
 {
     int badop = 0;
 
-    verify_depth = 0;
+    verify_depth=0;
-    verify_error = X509_V_OK;
+    verify_error=X509_V_OK;
 
     argc--;
     argv++;
 
     while (argc >= 1) {
-        if (strcmp(*argv, "-connect") == 0) {
+	if (strcmp(*argv,"-connect") == 0)
-            if (--argc < 1)
+		{
-                goto bad;
+		if (--argc < 1) goto bad;
-            host = *(++argv);
+		host= *(++argv);
 		}
 #if 0
-        else if (strcmp(*argv, "-host") == 0) {
+	else if( strcmp(*argv,"-host") == 0)
-            if (--argc < 1)
+		{
-                goto bad;
+		if (--argc < 1) goto bad;
-            host = *(++argv);
+		host= *(++argv);
-        } else if (strcmp(*argv, "-port") == 0) {
+		}
-            if (--argc < 1)
+	else if( strcmp(*argv,"-port") == 0)
-                goto bad;
+		{
-            port = *(++argv);
+		if (--argc < 1) goto bad;
+		port= *(++argv);
 		}
 #endif
-        else if (strcmp(*argv, "-reuse") == 0)
+	else if (strcmp(*argv,"-reuse") == 0)
-            perform = 2;
+		perform=2;
-        else if (strcmp(*argv, "-new") == 0)
+	else if (strcmp(*argv,"-new") == 0)
-            perform = 1;
+		perform=1;
-        else if (strcmp(*argv, "-verify") == 0) {
+	else if( strcmp(*argv,"-verify") == 0) {
 
-            tm_verify = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
+	    tm_verify=SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE;
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    verify_depth=atoi(*(++argv));
-            verify_depth = atoi(*(++argv));
+	    BIO_printf(bio_err,"verify depth is %d\n",verify_depth);
-            BIO_printf(bio_err, "verify depth is %d\n", verify_depth);
 
-        } else if (strcmp(*argv, "-cert") == 0) {
+	} else if( strcmp(*argv,"-cert") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    t_cert_file= *(++argv);
-            t_cert_file = *(++argv);
 
-        } else if (strcmp(*argv, "-key") == 0) {
+	} else if( strcmp(*argv,"-key") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    t_key_file= *(++argv);
-            t_key_file = *(++argv);
 
-        } else if (strcmp(*argv, "-CApath") == 0) {
+	} else if( strcmp(*argv,"-CApath") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    CApath= *(++argv);
-            CApath = *(++argv);
 
-        } else if (strcmp(*argv, "-CAfile") == 0) {
+	} else if( strcmp(*argv,"-CAfile") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    CAfile= *(++argv);
-            CAfile = *(++argv);
 
-        } else if (strcmp(*argv, "-cipher") == 0) {
+	} else if( strcmp(*argv,"-cipher") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    tm_cipher= *(++argv);
-            tm_cipher = *(++argv);
 	}
 #ifdef FIONBIO
-        else if (strcmp(*argv, "-nbio") == 0) {
+	else if(strcmp(*argv,"-nbio") == 0) {
-            t_nbio = 1;
+	    t_nbio=1;
 	}
 #endif
-        else if (strcmp(*argv, "-www") == 0) {
+	else if(strcmp(*argv,"-www") == 0)
-            if (--argc < 1)
+		{
-                goto bad;
+		if (--argc < 1) goto bad;
-            s_www_path = *(++argv);
+		s_www_path= *(++argv);
-            if (strlen(s_www_path) > MYBUFSIZ - 100) {
+		if(strlen(s_www_path) > MYBUFSIZ-100)
-                BIO_printf(bio_err, "-www option too long\n");
+			{
-                badop = 1;
+			BIO_printf(bio_err,"-www option too long\n");
+			badop=1;
 			}
-        } else if (strcmp(*argv, "-bugs") == 0)
+		}
-            st_bugs = 1;
+	else if(strcmp(*argv,"-bugs") == 0)
+	    st_bugs=1;
 #ifndef OPENSSL_NO_SSL2
-        else if (strcmp(*argv, "-ssl2") == 0)
+	else if(strcmp(*argv,"-ssl2") == 0)
-            s_time_meth = SSLv2_client_method();
+	    s_time_meth=SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
-        else if (strcmp(*argv, "-ssl3") == 0)
+	else if(strcmp(*argv,"-ssl3") == 0)
-            s_time_meth = SSLv3_client_method();
+	    s_time_meth=SSLv3_client_method();
 #endif
-        else if (strcmp(*argv, "-time") == 0) {
+	else if( strcmp(*argv,"-time") == 0) {
 
-            if (--argc < 1)
+	    if (--argc < 1) goto bad;
-                goto bad;
+	    maxTime= atoi(*(++argv));
-            maxTime = atoi(*(++argv));
+	}
-        } else {
+	else {
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+	    BIO_printf(bio_err,"unknown option %s\n",*argv);
-            badop = 1;
+	    badop=1;
 	    break;
 	}
 
@@ -363,11 +353,10 @@ static int parseArgs(int argc, char **argv)
 	argv++;
     }
 
-    if (perform == 0)
+    if (perform == 0) perform=3;
-        perform = 3;
 
-    if (badop) {
+    if(badop) {
- bad:
+bad:
 		s_time_usage();
 		return -1;
     }
@@ -382,55 +371,61 @@ static int parseArgs(int argc, char **argv)
 #define STOP	1
 
 static double tm_Time_F(int s)
-{
+	{
 	static double ret;
 #ifdef TIMES
-    static struct tms tstart, tend;
+	static struct tms tstart,tend;
 
-    if (s == START) {
+	if(s == START) {
 		times(&tstart);
-        return (0);
+		return(0);
 	} else {
 		times(&tend);
-        ret = ((double)(tend.tms_utime - tstart.tms_utime)) / HZ;
+		ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-        return ((ret == 0.0) ? 1e-6 : ret);
+		return((ret == 0.0)?1e-6:ret);
 	}
 #elif defined(OPENSSL_SYS_NETWARE)
-    static clock_t tstart, tend;
+    static clock_t tstart,tend;
 
-    if (s == START) {
+    if (s == START)
-        tstart = clock();
+    {
-        return (0);
+        tstart=clock();
-    } else {
+        return(0);
-        tend = clock();
+    }
-        ret = (double)((double)(tend) - (double)(tstart));
+    else
-        return ((ret < 0.001) ? 0.001 : ret);
+    {
+        tend=clock();
+        ret=(double)((double)(tend)-(double)(tstart));
+        return((ret < 0.001)?0.001:ret);
     }
 #elif defined(OPENSSL_SYS_VXWORKS)
         {
 	static unsigned long tick_start, tick_end;
 
-        if (s == START) {
+	if( s == START )
+		{
 		tick_start = tickGet();
 		return 0;
-        } else {
+		}
+	else
+		{
 		tick_end = tickGet();
 		ret = (double)(tick_end - tick_start) / (double)sysClkRateGet();
-            return ((ret == 0.0) ? 1e-6 : ret);
+		return((ret == 0.0)?1e-6:ret);
 		}
         }
 #else /* !times() */
-    static struct timeb tstart, tend;
+	static struct timeb tstart,tend;
 	long i;
 
-    if (s == START) {
+	if(s == START) {
 		ftime(&tstart);
-        return (0);
+		return(0);
 	} else {
 		ftime(&tend);
-        i = (long)tend.millitm - (long)tstart.millitm;
+		i=(long)tend.millitm-(long)tstart.millitm;
-        ret = ((double)(tend.time - tstart.time)) + ((double)i) / 1000.0;
+		ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-        return ((ret == 0.0) ? 1e-6 : ret);
+		return((ret == 0.0)?1e-6:ret);
 	}
 #endif
 }
@@ -442,52 +437,49 @@ static double tm_Time_F(int s)
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	double totalTime = 0.0;
 	int nConn = 0;
-    SSL *scon = NULL;
+	SSL *scon=NULL;
-    long finishtime = 0;
+	long finishtime=0;
-    int ret = 1, i;
+	int ret=1,i;
-    MS_STATIC char buf[1024 * 8];
+	MS_STATIC char buf[1024*8];
 	int ver;
 
 	apps_startup();
 	s_time_init();
 
 	if (bio_err == NULL)
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-    s_time_meth = SSLv23_client_method();
+	s_time_meth=SSLv23_client_method();
 #elif !defined(OPENSSL_NO_SSL3)
-    s_time_meth = SSLv3_client_method();
+	s_time_meth=SSLv3_client_method();
 #elif !defined(OPENSSL_NO_SSL2)
-    s_time_meth = SSLv2_client_method();
+	s_time_meth=SSLv2_client_method();
 #endif
 
 	/* parse the command line arguments */
-    if (parseArgs(argc, argv) < 0)
+	if( parseArgs( argc, argv ) < 0 )
 		goto end;
 
 	OpenSSL_add_ssl_algorithms();
-    if ((tm_ctx = SSL_CTX_new(s_time_meth)) == NULL)
+	if ((tm_ctx=SSL_CTX_new(s_time_meth)) == NULL) return(1);
-        return (1);
 
-    SSL_CTX_set_quiet_shutdown(tm_ctx, 1);
+	SSL_CTX_set_quiet_shutdown(tm_ctx,1);
 
-    if (st_bugs)
+	if (st_bugs) SSL_CTX_set_options(tm_ctx,SSL_OP_ALL);
-        SSL_CTX_set_options(tm_ctx, SSL_OP_ALL);
+	SSL_CTX_set_cipher_list(tm_ctx,tm_cipher);
-    SSL_CTX_set_cipher_list(tm_ctx, tm_cipher);
+	if(!set_cert_stuff(tm_ctx,t_cert_file,t_key_file)) 
-    if (!set_cert_stuff(tm_ctx, t_cert_file, t_key_file))
 		goto end;
 
 	SSL_load_error_strings();
 
-    if ((!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath)) ||
+	if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
-        (!SSL_CTX_set_default_verify_paths(tm_ctx))) {
+		(!SSL_CTX_set_default_verify_paths(tm_ctx)))
-        /*
+		{
-         * BIO_printf(bio_err,"error setting default verify locations\n");
+		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
-         */
 		ERR_print_errors(bio_err);
 		/* goto end; */
 		}
@@ -495,43 +487,43 @@ int MAIN(int argc, char **argv)
 	if (tm_cipher == NULL)
 		tm_cipher = getenv("SSL_CIPHER");
 
-    if (tm_cipher == NULL) {
+	if (tm_cipher == NULL ) {
-        fprintf(stderr, "No CIPHER specified\n");
+		fprintf( stderr, "No CIPHER specified\n" );
 	}
 
-    if (!(perform & 1))
+	if (!(perform & 1)) goto next;
-        goto next;
+	printf( "Collecting connection statistics for %d seconds\n", maxTime );
-    printf("Collecting connection statistics for %d seconds\n", maxTime);
 
 	/* Loop and time how long it takes to make connections */
 
-    bytes_read = 0;
+	bytes_read=0;
-    finishtime = (long)time(NULL) + maxTime;
+	finishtime=(long)time(NULL)+maxTime;
 	tm_Time_F(START);
-    for (;;) {
+	for (;;)
-        if (finishtime < (long)time(NULL))
+		{
-            break;
+		if (finishtime < (long)time(NULL)) break;
 #ifdef WIN32_STUFF
 
-        if (flushWinMsgs(0) == -1)
+		if( flushWinMsgs(0) == -1 )
 			goto end;
 
-        if (waitingToDie || exitNow) /* we're dead */
+		if( waitingToDie || exitNow )		/* we're dead */
 			goto end;
 #endif
 
-        if ((scon = doConnection(NULL)) == NULL)
+		if( (scon = doConnection( NULL )) == NULL )
 			goto end;
 
-        if (s_www_path != NULL) {
+		if (s_www_path != NULL)
-            BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
+			{
-                         s_www_path);
+			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
-            SSL_write(scon, buf, strlen(buf));
+			SSL_write(scon,buf,strlen(buf));
-            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+			while ((i=SSL_read(scon,buf,sizeof(buf))) > 0)
-                bytes_read += i;
+				bytes_read+=i;
 			}
+
 #ifdef NO_SHUTDOWN
-        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
+		SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
 #else
 		SSL_shutdown(scon);
 #endif
@@ -539,56 +531,53 @@ int MAIN(int argc, char **argv)
 
 		nConn += 1;
 		if (SSL_session_reused(scon))
-            ver = 'r';
+			ver='r';
-        else {
-            ver = SSL_version(scon);
-            if (ver == TLS1_VERSION)
-                ver = 't';
-            else if (ver == SSL3_VERSION)
-                ver = '3';
-            else if (ver == SSL2_VERSION)
-                ver = '2';
 		else
-                ver = '*';
+			{
+			ver=SSL_version(scon);
+			if (ver == TLS1_VERSION)
+				ver='t';
+			else if (ver == SSL3_VERSION)
+				ver='3';
+			else if (ver == SSL2_VERSION)
+				ver='2';
+			else
+				ver='*';
 			}
-        fputc(ver, stdout);
+		fputc(ver,stdout);
 		fflush(stdout);
 
-        SSL_free(scon);
+		SSL_free( scon );
-        scon = NULL;
+		scon=NULL;
 		}
 	totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
-    i = (int)((long)time(NULL) - finishtime + maxTime);
+	i=(int)((long)time(NULL)-finishtime+maxTime);
-    printf
+	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
-        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
-         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
-    printf
-        ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
 
-    /*
+	/* Now loop and time connections using the same session id over and over */
-     * Now loop and time connections using the same session id over and over
-     */
 
- next:
+next:
-    if (!(perform & 2))
+	if (!(perform & 2)) goto end;
-        goto end;
+	printf( "\n\nNow timing with session id reuse.\n" );
-    printf("\n\nNow timing with session id reuse.\n");
 
 	/* Get an SSL object so we can reuse the session id */
-    if ((scon = doConnection(NULL)) == NULL) {
+	if( (scon = doConnection( NULL )) == NULL )
-        fprintf(stderr, "Unable to get connection\n");
+		{
+		fprintf( stderr, "Unable to get connection\n" );
 		goto end;
 		}
 
-    if (s_www_path != NULL) {
+	if (s_www_path != NULL)
-        BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n", s_www_path);
+		{
-        SSL_write(scon, buf, strlen(buf));
+		BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
-        while (SSL_read(scon, buf, sizeof(buf)) > 0) ;
+		SSL_write(scon,buf,strlen(buf));
+		while (SSL_read(scon,buf,sizeof(buf)) > 0)
+			;
 		}
 #ifdef NO_SHUTDOWN
-    SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
+	SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
 #else
 	SSL_shutdown(scon);
 #endif
@@ -597,36 +586,37 @@ int MAIN(int argc, char **argv)
 	nConn = 0;
 	totalTime = 0.0;
 
-    finishtime = (long)time(NULL) + maxTime;
+	finishtime=(long)time(NULL)+maxTime;
 
-    printf("starting\n");
+	printf( "starting\n" );
-    bytes_read = 0;
+	bytes_read=0;
 	tm_Time_F(START);
 		
-    for (;;) {
+	for (;;)
-        if (finishtime < (long)time(NULL))
+		{
-            break;
+		if (finishtime < (long)time(NULL)) break;
 
 #ifdef WIN32_STUFF
-        if (flushWinMsgs(0) == -1)
+		if( flushWinMsgs(0) == -1 )
 			goto end;
 
-        if (waitingToDie || exitNow) /* we're dead */
+		if( waitingToDie || exitNow )	/* we're dead */
 			goto end;
 #endif
 
-        if ((doConnection(scon)) == NULL)
+	 	if( (doConnection( scon )) == NULL )
 			goto end;
 
-        if (s_www_path) {
+		if (s_www_path)
-            BIO_snprintf(buf, sizeof buf, "GET %s HTTP/1.0\r\n\r\n",
+			{
-                         s_www_path);
+			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
-            SSL_write(scon, buf, strlen(buf));
+			SSL_write(scon,buf,strlen(buf));
-            while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
+			while ((i=SSL_read(scon,buf,sizeof(buf))) > 0)
-                bytes_read += i;
+				bytes_read+=i;
 			}
+
 #ifdef NO_SHUTDOWN
-        SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
+		SSL_set_shutdown(scon,SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
 #else
 		SSL_shutdown(scon);
 #endif
@@ -634,44 +624,42 @@ int MAIN(int argc, char **argv)
 	
 		nConn += 1;
 		if (SSL_session_reused(scon))
-            ver = 'r';
+			ver='r';
-        else {
-            ver = SSL_version(scon);
-            if (ver == TLS1_VERSION)
-                ver = 't';
-            else if (ver == SSL3_VERSION)
-                ver = '3';
-            else if (ver == SSL2_VERSION)
-                ver = '2';
 		else
-                ver = '*';
+			{
+			ver=SSL_version(scon);
+			if (ver == TLS1_VERSION)
+				ver='t';
+			else if (ver == SSL3_VERSION)
+				ver='3';
+			else if (ver == SSL2_VERSION)
+				ver='2';
+			else
+				ver='*';
 			}
-        fputc(ver, stdout);
+		fputc(ver,stdout);
 		fflush(stdout);
 		}
-    totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
+	totalTime += tm_Time_F(STOP); /* Add the time for this iteration*/
 
-    printf
-        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
-         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
-    printf
-        ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn);
 
-    ret = 0;
+	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
- end:
+	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
-    if (scon != NULL)
-        SSL_free(scon);
 
-    if (tm_ctx != NULL) {
+	ret=0;
+end:
+	if (scon != NULL) SSL_free(scon);
+
+	if (tm_ctx != NULL)
+		{
 		SSL_CTX_free(tm_ctx);
-        tm_ctx = NULL;
+		tm_ctx=NULL;
 		}
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
-/*-
+/***********************************************************************
  * doConnection - make a connection
  * Args:
  *		scon	= earlier ssl connection for session id, or NULL
@@ -679,57 +667,60 @@ int MAIN(int argc, char **argv)
  *		SSL *	= the connection pointer.
  */
 static SSL *doConnection(SSL *scon)
-{
+	{
 	BIO *conn;
 	SSL *serverCon;
 	int width, i;
 	fd_set readfds;
 
-    if ((conn = BIO_new(BIO_s_connect())) == NULL)
+	if ((conn=BIO_new(BIO_s_connect())) == NULL)
-        return (NULL);
+		return(NULL);
 
 /*	BIO_set_conn_port(conn,port);*/
-    BIO_set_conn_hostname(conn, host);
+	BIO_set_conn_hostname(conn,host);
 
 	if (scon == NULL)
-        serverCon = SSL_new(tm_ctx);
+		serverCon=SSL_new(tm_ctx);
-    else {
+	else
-        serverCon = scon;
+		{
+		serverCon=scon;
 		SSL_set_connect_state(serverCon);
 		}
 
-    SSL_set_bio(serverCon, conn, conn);
+	SSL_set_bio(serverCon,conn,conn);
 
 #if 0
-    if (scon != NULL)
+	if( scon != NULL )
-        SSL_set_session(serverCon, SSL_get_session(scon));
+		SSL_set_session(serverCon,SSL_get_session(scon));
 #endif
 
 	/* ok, lets connect */
-    for (;;) {
+	for(;;) {
-        i = SSL_connect(serverCon);
+		i=SSL_connect(serverCon);
-        if (BIO_sock_should_retry(i)) {
+		if (BIO_sock_should_retry(i))
-            BIO_printf(bio_err, "DELAY\n");
+			{
+			BIO_printf(bio_err,"DELAY\n");
 
-            i = SSL_get_fd(serverCon);
+			i=SSL_get_fd(serverCon);
-            width = i + 1;
+			width=i+1;
 			FD_ZERO(&readfds);
-            FD_SET(i, &readfds);
+			FD_SET(i,&readfds);
-            /*
+			/* Note: under VMS with SOCKETSHR the 2nd parameter
-             * Note: under VMS with SOCKETSHR the 2nd parameter is currently
+			 * is currently of type (int *) whereas under other
-             * of type (int *) whereas under other systems it is (void *) if
+			 * systems it is (void *) if you don't have a cast it
-             * you don't have a cast it will choke the compiler: if you do
+			 * will choke the compiler: if you do have a cast then
-             * have a cast then you can either go for (int *) or (void *).
+			 * you can either go for (int *) or (void *).
 			 */
-            select(width, (void *)&readfds, NULL, NULL, NULL);
+			select(width,(void *)&readfds,NULL,NULL,NULL);
 			continue;
 			}
 		break;
 		}
-    if (i <= 0) {
+	if(i <= 0)
-        BIO_printf(bio_err, "ERROR\n");
+		{
+		BIO_printf(bio_err,"ERROR\n");
 		if (verify_error != X509_V_OK)
-            BIO_printf(bio_err, "verify error:%s\n",
+			BIO_printf(bio_err,"verify error:%s\n",
 				X509_verify_cert_error_string(verify_error));
 		else
 			ERR_print_errors(bio_err);
@@ -739,4 +730,6 @@ static SSL *doConnection(SSL *scon)
 		}
 
 	return serverCon;
-}
+	}
+
+

apps/sess_id.c

@@ -69,18 +69,18 @@
 #undef PROG
 #define PROG	sess_id_main
 
-static const char *sess_id_usage[] = {
+static const char *sess_id_usage[]={
-    "usage: sess_id args\n",
+"usage: sess_id args\n",
-    "\n",
+"\n",
-    " -inform arg     - input format - default PEM (DER or PEM)\n",
+" -inform arg     - input format - default PEM (DER or PEM)\n",
-    " -outform arg    - output format - default PEM\n",
+" -outform arg    - output format - default PEM\n",
-    " -in arg         - input file - default stdin\n",
+" -in arg         - input file - default stdin\n",
-    " -out arg        - output file - default stdout\n",
+" -out arg        - output file - default stdout\n",
-    " -text           - print ssl session id details\n",
+" -text           - print ssl session id details\n",
-    " -cert           - output certificate \n",
+" -cert           - output certificate \n",
-    " -noout          - no CRL output\n",
+" -noout          - no CRL output\n",
-    " -context arg    - set the session ID context\n",
+" -context arg    - set the session ID context\n",
-    NULL
+NULL
 };
 
 static SSL_SESSION *load_sess_id(char *file, int format);
@@ -88,211 +88,233 @@ static SSL_SESSION *load_sess_id(char *file, int format);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    SSL_SESSION *x = NULL;
+	SSL_SESSION *x=NULL;
-    int ret = 1, i, num, badops = 0;
+	int ret=1,i,num,badops=0;
-    BIO *out = NULL;
+	BIO *out=NULL;
-    int informat, outformat;
+	int informat,outformat;
-    char *infile = NULL, *outfile = NULL, *context = NULL;
+	char *infile=NULL,*outfile=NULL,*context=NULL;
-    int cert = 0, noout = 0, text = 0;
+	int cert=0,noout=0,text=0;
 	const char **pp;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-    informat = FORMAT_PEM;
+	informat=FORMAT_PEM;
-    outformat = FORMAT_PEM;
+	outformat=FORMAT_PEM;
 
 	argc--;
 	argv++;
-    num = 0;
+	num=0;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
-            informat = str2fmt(*(++argv));
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-outform") == 0) {
+			informat=str2fmt(*(++argv));
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-outform") == 0)
-            outformat = str2fmt(*(++argv));
+			{
-        } else if (strcmp(*argv, "-in") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outformat=str2fmt(*(++argv));
-                goto bad;
+			}
-            infile = *(++argv);
+		else if (strcmp(*argv,"-in") == 0)
-        } else if (strcmp(*argv, "-out") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			infile= *(++argv);
-            outfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-text") == 0)
+		else if (strcmp(*argv,"-out") == 0)
-            text = ++num;
+			{
-        else if (strcmp(*argv, "-cert") == 0)
+			if (--argc < 1) goto bad;
-            cert = ++num;
+			outfile= *(++argv);
-        else if (strcmp(*argv, "-noout") == 0)
+			}
-            noout = ++num;
+		else if (strcmp(*argv,"-text") == 0)
-        else if (strcmp(*argv, "-context") == 0) {
+			text= ++num;
-            if (--argc < 1)
+		else if (strcmp(*argv,"-cert") == 0)
-                goto bad;
+			cert= ++num;
-            context = *++argv;
+		else if (strcmp(*argv,"-noout") == 0)
-        } else {
+			noout= ++num;
-            BIO_printf(bio_err, "unknown option %s\n", *argv);
+		else if (strcmp(*argv,"-context") == 0)
-            badops = 1;
+		    {
+		    if(--argc < 1) goto bad;
+		    context=*++argv;
+		    }
+		else
+			{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        for (pp = sess_id_usage; (*pp != NULL); pp++)
+bad:
-            BIO_printf(bio_err, "%s", *pp);
+		for (pp=sess_id_usage; (*pp != NULL); pp++)
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
-    x = load_sess_id(infile, informat);
+	x=load_sess_id(infile,informat);
-    if (x == NULL) {
+	if (x == NULL) { goto end; }
+
+	if(context)
+	    {
+	    x->sid_ctx_length=strlen(context);
+	    if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
+		{
+		BIO_printf(bio_err,"Context too long\n");
 		goto end;
 		}
+	    memcpy(x->sid_ctx,context,x->sid_ctx_length);
+	    }
 
-    if (context) {
-        x->sid_ctx_length = strlen(context);
-        if (x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH) {
-            BIO_printf(bio_err, "Context too long\n");
-            goto end;
-        }
-        memcpy(x->sid_ctx, context, x->sid_ctx_length);
-    }
 #ifdef undef
 	/* just testing for memory leaks :-) */
 	{
 	SSL_SESSION *s;
-        char buf[1024 * 10], *p;
+	char buf[1024*10],*p;
 	int i;
 
-        s = SSL_SESSION_new();
+	s=SSL_SESSION_new();
 
-        p = &buf;
+	p= &buf;
-        i = i2d_SSL_SESSION(x, &p);
+	i=i2d_SSL_SESSION(x,&p);
-        p = &buf;
+	p= &buf;
-        d2i_SSL_SESSION(&s, &p, (long)i);
+	d2i_SSL_SESSION(&s,&p,(long)i);
-        p = &buf;
+	p= &buf;
-        d2i_SSL_SESSION(&s, &p, (long)i);
+	d2i_SSL_SESSION(&s,&p,(long)i);
-        p = &buf;
+	p= &buf;
-        d2i_SSL_SESSION(&s, &p, (long)i);
+	d2i_SSL_SESSION(&s,&p,(long)i);
 	SSL_SESSION_free(s);
 	}
 #endif
 
-    if (!noout || text) {
+	if (!noout || text)
-        out = BIO_new(BIO_s_file());
+		{
-        if (out == NULL) {
+		out=BIO_new(BIO_s_file());
+		if (out == NULL)
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 
-        if (outfile == NULL) {
+		if (outfile == NULL)
-            BIO_set_fp(out, stdout, BIO_NOCLOSE);
+			{
+			BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
 			}
 #endif
-        } else {
+			}
-            if (BIO_write_filename(out, outfile) <= 0) {
+		else
+			{
+			if (BIO_write_filename(out,outfile) <= 0)
+				{
 				perror(outfile);
 				goto end;
 				}
 			}
 		}
 
-    if (text) {
+	if (text)
-        SSL_SESSION_print(out, x);
+		{
+		SSL_SESSION_print(out,x);
 
-        if (cert) {
+		if (cert)
+			{
 			if (x->peer == NULL)
-                BIO_puts(out, "No certificate present\n");
+				BIO_puts(out,"No certificate present\n");
 			else
-                X509_print(out, x->peer);
+				X509_print(out,x->peer);
 			}
 		}
 
-    if (!noout && !cert) {
+	if (!noout && !cert)
+		{
 		if 	(outformat == FORMAT_ASN1)
-            i = i2d_SSL_SESSION_bio(out, x);
+			i=i2d_SSL_SESSION_bio(out,x);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_SSL_SESSION(out, x);
+			i=PEM_write_bio_SSL_SESSION(out,x);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		if (!i) {
-            BIO_printf(bio_err, "unable to write SSL_SESSION\n");
+			BIO_printf(bio_err,"unable to write SSL_SESSION\n");
 			goto end;
 			}
-    } else if (!noout && (x->peer != NULL)) { /* just print the certificate */
+		}
+	else if (!noout && (x->peer != NULL)) /* just print the certificate */
+		{
 		if 	(outformat == FORMAT_ASN1)
-            i = (int)i2d_X509_bio(out, x->peer);
+			i=(int)i2d_X509_bio(out,x->peer);
 		else if (outformat == FORMAT_PEM)
-            i = PEM_write_bio_X509(out, x->peer);
+			i=PEM_write_bio_X509(out,x->peer);
 		else	{
-            BIO_printf(bio_err, "bad output format specified for outfile\n");
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		if (!i) {
-            BIO_printf(bio_err, "unable to write X509\n");
+			BIO_printf(bio_err,"unable to write X509\n");
 			goto end;
 			}
 		}
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (out != NULL)
+	if (out != NULL) BIO_free_all(out);
-        BIO_free_all(out);
+	if (x != NULL) SSL_SESSION_free(x);
-    if (x != NULL)
-        SSL_SESSION_free(x);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
 static SSL_SESSION *load_sess_id(char *infile, int format)
-{
+	{
-    SSL_SESSION *x = NULL;
+	SSL_SESSION *x=NULL;
-    BIO *in = NULL;
+	BIO *in=NULL;
 
-    in = BIO_new(BIO_s_file());
+	in=BIO_new(BIO_s_file());
-    if (in == NULL) {
+	if (in == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 
 	if (infile == NULL)
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-    else {
+	else
-        if (BIO_read_filename(in, infile) <= 0) {
+		{
+		if (BIO_read_filename(in,infile) <= 0)
+			{
 			perror(infile);
 			goto end;
 			}
 		}
 	if 	(format == FORMAT_ASN1)
-        x = d2i_SSL_SESSION_bio(in, NULL);
+		x=d2i_SSL_SESSION_bio(in,NULL);
 	else if (format == FORMAT_PEM)
-        x = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
+		x=PEM_read_bio_SSL_SESSION(in,NULL,NULL,NULL);
 	else	{
-        BIO_printf(bio_err, "bad input format specified for input crl\n");
+		BIO_printf(bio_err,"bad input format specified for input crl\n");
 		goto end;
 		}
-    if (x == NULL) {
+	if (x == NULL)
-        BIO_printf(bio_err, "unable to load SSL_SESSION\n");
+		{
+		BIO_printf(bio_err,"unable to load SSL_SESSION\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	
- end:
+end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	return(x);
-    return (x);
+	}
-}
+

apps/smime.c

@@ -1,6 +1,5 @@
 /* smime.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
@@ -83,7 +82,7 @@ static int smime_cb(int ok, X509_STORE_CTX *ctx);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
 	int operation = 0;
 	int ret = 0;
@@ -91,7 +90,7 @@ int MAIN(int argc, char **argv)
 	const char *inmode = "r", *outmode = "w";
 	char *infile = NULL, *outfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
-    char *certfile = NULL, *keyfile = NULL, *contfile = NULL;
+	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
 	const EVP_CIPHER *cipher = NULL;
 	PKCS7 *p7 = NULL;
 	X509_STORE *store = NULL;
@@ -109,7 +108,7 @@ int MAIN(int argc, char **argv)
 	int informat = FORMAT_SMIME, outformat = FORMAT_SMIME;
         int keyform = FORMAT_PEM;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
 
 	X509_VERIFY_PARAM *vpm = NULL;
@@ -119,322 +118,382 @@ int MAIN(int argc, char **argv)
 
 	apps_startup();
 
-    if (bio_err == NULL) {
+	if (bio_err == NULL)
+		{
 		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 		}
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    while (!badarg && *args && *args[0] == '-') {
+	while (!badarg && *args && *args[0] == '-')
-        if (!strcmp(*args, "-encrypt"))
+		{
+		if (!strcmp (*args, "-encrypt"))
 			operation = SMIME_ENCRYPT;
-        else if (!strcmp(*args, "-decrypt"))
+		else if (!strcmp (*args, "-decrypt"))
 			operation = SMIME_DECRYPT;
-        else if (!strcmp(*args, "-sign"))
+		else if (!strcmp (*args, "-sign"))
 			operation = SMIME_SIGN;
-        else if (!strcmp(*args, "-verify"))
+		else if (!strcmp (*args, "-verify"))
 			operation = SMIME_VERIFY;
-        else if (!strcmp(*args, "-pk7out"))
+		else if (!strcmp (*args, "-pk7out"))
 			operation = SMIME_PK7OUT;
 #ifndef OPENSSL_NO_DES
-        else if (!strcmp(*args, "-des3"))
+		else if (!strcmp (*args, "-des3")) 
 				cipher = EVP_des_ede3_cbc();
-        else if (!strcmp(*args, "-des"))
+		else if (!strcmp (*args, "-des")) 
 				cipher = EVP_des_cbc();
 #endif
 #ifndef OPENSSL_NO_SEED
-        else if (!strcmp(*args, "-seed"))
+		else if (!strcmp (*args, "-seed")) 
 				cipher = EVP_seed_cbc();
 #endif
 #ifndef OPENSSL_NO_RC2
-        else if (!strcmp(*args, "-rc2-40"))
+		else if (!strcmp (*args, "-rc2-40")) 
 				cipher = EVP_rc2_40_cbc();
-        else if (!strcmp(*args, "-rc2-128"))
+		else if (!strcmp (*args, "-rc2-128")) 
 				cipher = EVP_rc2_cbc();
-        else if (!strcmp(*args, "-rc2-64"))
+		else if (!strcmp (*args, "-rc2-64")) 
 				cipher = EVP_rc2_64_cbc();
 #endif
 #ifndef OPENSSL_NO_AES
-        else if (!strcmp(*args, "-aes128"))
+		else if (!strcmp(*args,"-aes128"))
 				cipher = EVP_aes_128_cbc();
-        else if (!strcmp(*args, "-aes192"))
+		else if (!strcmp(*args,"-aes192"))
 				cipher = EVP_aes_192_cbc();
-        else if (!strcmp(*args, "-aes256"))
+		else if (!strcmp(*args,"-aes256"))
 				cipher = EVP_aes_256_cbc();
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-        else if (!strcmp(*args, "-camellia128"))
+		else if (!strcmp(*args,"-camellia128"))
 				cipher = EVP_camellia_128_cbc();
-        else if (!strcmp(*args, "-camellia192"))
+		else if (!strcmp(*args,"-camellia192"))
 				cipher = EVP_camellia_192_cbc();
-        else if (!strcmp(*args, "-camellia256"))
+		else if (!strcmp(*args,"-camellia256"))
 				cipher = EVP_camellia_256_cbc();
 #endif
-        else if (!strcmp(*args, "-text"))
+		else if (!strcmp (*args, "-text")) 
 				flags |= PKCS7_TEXT;
-        else if (!strcmp(*args, "-nointern"))
+		else if (!strcmp (*args, "-nointern")) 
 				flags |= PKCS7_NOINTERN;
-        else if (!strcmp(*args, "-noverify"))
+		else if (!strcmp (*args, "-noverify")) 
 				flags |= PKCS7_NOVERIFY;
-        else if (!strcmp(*args, "-nochain"))
+		else if (!strcmp (*args, "-nochain")) 
 				flags |= PKCS7_NOCHAIN;
-        else if (!strcmp(*args, "-nocerts"))
+		else if (!strcmp (*args, "-nocerts")) 
 				flags |= PKCS7_NOCERTS;
-        else if (!strcmp(*args, "-noattr"))
+		else if (!strcmp (*args, "-noattr")) 
 				flags |= PKCS7_NOATTR;
-        else if (!strcmp(*args, "-nodetach"))
+		else if (!strcmp (*args, "-nodetach")) 
 				flags &= ~PKCS7_DETACHED;
-        else if (!strcmp(*args, "-nosmimecap"))
+		else if (!strcmp (*args, "-nosmimecap"))
 				flags |= PKCS7_NOSMIMECAP;
-        else if (!strcmp(*args, "-binary"))
+		else if (!strcmp (*args, "-binary"))
 				flags |= PKCS7_BINARY;
-        else if (!strcmp(*args, "-nosigs"))
+		else if (!strcmp (*args, "-nosigs"))
 				flags |= PKCS7_NOSIGS;
-        else if (!strcmp(*args, "-nooldmime"))
+		else if (!strcmp (*args, "-nooldmime"))
 				flags |= PKCS7_NOOLDMIMETYPE;
-        else if (!strcmp(*args, "-crlfeol"))
+		else if (!strcmp (*args, "-crlfeol"))
 				flags |= PKCS7_CRLFEOL;
-        else if (!strcmp(*args, "-rand")) {
+		else if (!strcmp(*args,"-rand"))
-            if (args[1]) {
+			{
+			if (args[1])
+				{
 				args++;
 				inrand = *args;
-            } else
+				}
+			else
 				badarg = 1;
 			need_rand = 1;
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (!strcmp(*args, "-engine")) {
+		else if (!strcmp(*args,"-engine"))
-            if (args[1]) {
+			{
+			if (args[1])
+				{
 				args++;
 				engine = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
 			}
 #endif
-        else if (!strcmp(*args, "-passin")) {
+		else if (!strcmp(*args,"-passin"))
-            if (args[1]) {
+			{
+			if (args[1])
+				{
 				args++;
 				passargin = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-to")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-to"))
+			{
+			if (args[1])
+				{
 				args++;
 				to = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-from")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-from"))
+			{
+			if (args[1])
+				{
 				args++;
 				from = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-subject")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-subject"))
+			{
+			if (args[1])
+				{
 				args++;
 				subject = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-signer")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-signer"))
+			{
+			if (args[1])
+				{
 				args++;
 				signerfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-recip")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-recip"))
+			{
+			if (args[1])
+				{
 				args++;
 				recipfile = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-inkey")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-inkey"))
+			{
+			if (args[1])
+				{
 				args++;
 				keyfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-keyform")) {
+		}
-            if (args[1]) {
+		else if (!strcmp (*args, "-keyform"))
+			{
+			if (args[1])
+				{
 				args++;
 				keyform = str2fmt(*args);
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-certfile")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-certfile"))
+			{
+			if (args[1])
+				{
 				args++;
 				certfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-CAfile")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-CAfile"))
+			{
+			if (args[1])
+				{
 				args++;
 				CAfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-CApath")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-CApath"))
+			{
+			if (args[1])
+				{
 				args++;
 				CApath = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-in")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-in"))
+			{
+			if (args[1])
+				{
 				args++;
 				infile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-inform")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-inform"))
+			{
+			if (args[1])
+				{
 				args++;
 				informat = str2fmt(*args);
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-outform")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-outform"))
+			{
+			if (args[1])
+				{
 				args++;
 				outformat = str2fmt(*args);
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-out")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-out"))
+			{
+			if (args[1])
+				{
 				args++;
 				outfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (!strcmp(*args, "-content")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-content"))
+			{
+			if (args[1])
+				{
 				args++;
 				contfile = *args;
-            } else
+				}
+			else
 				badarg = 1;
-        } else if (args_verify(&args, NULL, &badarg, bio_err, &vpm))
+			}
+		else if (args_verify(&args, NULL, &badarg, bio_err, &vpm))
 			continue;
 		else
 			badarg = 1;
 		args++;
 		}
 
-    if (operation == SMIME_SIGN) {
+
-        if (!signerfile) {
+	if (operation == SMIME_SIGN)
+		{
+		if (!signerfile)
+			{
 			BIO_printf(bio_err, "No signer certificate specified\n");
 			badarg = 1;
 			}
 		need_rand = 1;
-    } else if (operation == SMIME_DECRYPT) {
+		}
-        if (!recipfile && !keyfile) {
+	else if (operation == SMIME_DECRYPT)
-            BIO_printf(bio_err,
+		{
-                       "No recipient certificate or key specified\n");
+		if (!recipfile && !keyfile)
+			{
+			BIO_printf(bio_err, "No recipient certificate or key specified\n");
 			badarg = 1;
 			}
-    } else if (operation == SMIME_ENCRYPT) {
+		}
-        if (!*args) {
+	else if (operation == SMIME_ENCRYPT)
+		{
+		if (!*args)
+			{
 			BIO_printf(bio_err, "No recipient(s) certificate(s) specified\n");
 			badarg = 1;
 			}
 		need_rand = 1;
-    } else if (!operation)
+		}
+	else if (!operation)
 		badarg = 1;
 
-    if (badarg) {
+	if (badarg)
-        BIO_printf(bio_err, "Usage smime [options] cert.pem ...\n");
+		{
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf (bio_err, "Usage smime [options] cert.pem ...\n");
-        BIO_printf(bio_err, "-encrypt       encrypt message\n");
+		BIO_printf (bio_err, "where options are\n");
-        BIO_printf(bio_err, "-decrypt       decrypt encrypted message\n");
+		BIO_printf (bio_err, "-encrypt       encrypt message\n");
-        BIO_printf(bio_err, "-sign          sign message\n");
+		BIO_printf (bio_err, "-decrypt       decrypt encrypted message\n");
-        BIO_printf(bio_err, "-verify        verify signed message\n");
+		BIO_printf (bio_err, "-sign          sign message\n");
-        BIO_printf(bio_err, "-pk7out        output PKCS#7 structure\n");
+		BIO_printf (bio_err, "-verify        verify signed message\n");
+		BIO_printf (bio_err, "-pk7out        output PKCS#7 structure\n");
 #ifndef OPENSSL_NO_DES
-        BIO_printf(bio_err, "-des3          encrypt with triple DES\n");
+		BIO_printf (bio_err, "-des3          encrypt with triple DES\n");
-        BIO_printf(bio_err, "-des           encrypt with DES\n");
+		BIO_printf (bio_err, "-des           encrypt with DES\n");
 #endif
 #ifndef OPENSSL_NO_SEED
-        BIO_printf(bio_err, "-seed          encrypt with SEED\n");
+		BIO_printf (bio_err, "-seed          encrypt with SEED\n");
 #endif
 #ifndef OPENSSL_NO_RC2
-        BIO_printf(bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
+		BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
-        BIO_printf(bio_err, "-rc2-64        encrypt with RC2-64\n");
+		BIO_printf (bio_err, "-rc2-64        encrypt with RC2-64\n");
-        BIO_printf(bio_err, "-rc2-128       encrypt with RC2-128\n");
+		BIO_printf (bio_err, "-rc2-128       encrypt with RC2-128\n");
 #endif
 #ifndef OPENSSL_NO_AES
-        BIO_printf(bio_err, "-aes128, -aes192, -aes256\n");
+		BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "               encrypt PEM output with cbc aes\n");
-                   "               encrypt PEM output with cbc aes\n");
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
-        BIO_printf(bio_err, "-camellia128, -camellia192, -camellia256\n");
+		BIO_printf (bio_err, "-camellia128, -camellia192, -camellia256\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "               encrypt PEM output with cbc camellia\n");
-                   "               encrypt PEM output with cbc camellia\n");
 #endif
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-nointern      don't search certificates in message for signer\n");
-                   "-nointern      don't search certificates in message for signer\n");
+		BIO_printf (bio_err, "-nosigs        don't verify message signature\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-noverify      don't verify signers certificate\n");
-                   "-nosigs        don't verify message signature\n");
+		BIO_printf (bio_err, "-nocerts       don't include signers certificate when signing\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-nodetach      use opaque signing\n");
-                   "-noverify      don't verify signers certificate\n");
+		BIO_printf (bio_err, "-noattr        don't include any signed attributes\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-binary        don't translate message to text\n");
-                   "-nocerts       don't include signers certificate when signing\n");
+		BIO_printf (bio_err, "-certfile file other certificates file\n");
-        BIO_printf(bio_err, "-nodetach      use opaque signing\n");
+		BIO_printf (bio_err, "-signer file   signer certificate file\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-recip  file   recipient certificate file for decryption\n");
-                   "-noattr        don't include any signed attributes\n");
+		BIO_printf (bio_err, "-in file       input file\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
-                   "-binary        don't translate message to text\n");
+		BIO_printf (bio_err, "-inkey file    input private key (if not signer or recipient)\n");
-        BIO_printf(bio_err, "-certfile file other certificates file\n");
+		BIO_printf (bio_err, "-keyform arg   input private key format (PEM or ENGINE)\n");
-        BIO_printf(bio_err, "-signer file   signer certificate file\n");
+		BIO_printf (bio_err, "-out file      output file\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
-                   "-recip  file   recipient certificate file for decryption\n");
+		BIO_printf (bio_err, "-content file  supply or override content for detached signature\n");
-        BIO_printf(bio_err, "-in file       input file\n");
+		BIO_printf (bio_err, "-to addr       to address\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-from ad       from address\n");
-                   "-inform arg    input format SMIME (default), PEM or DER\n");
+		BIO_printf (bio_err, "-subject s     subject\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
-                   "-inkey file    input private key (if not signer or recipient)\n");
+		BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
-                   "-keyform arg   input private key format (PEM or ENGINE)\n");
+		BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
-        BIO_printf(bio_err, "-out file      output file\n");
+		BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
-        BIO_printf(bio_err,
-                   "-outform arg   output format SMIME (default), PEM or DER\n");
-        BIO_printf(bio_err,
-                   "-content file  supply or override content for detached signature\n");
-        BIO_printf(bio_err, "-to addr       to address\n");
-        BIO_printf(bio_err, "-from ad       from address\n");
-        BIO_printf(bio_err, "-subject s     subject\n");
-        BIO_printf(bio_err,
-                   "-text          include or delete text MIME headers\n");
-        BIO_printf(bio_err,
-                   "-CApath dir    trusted certificates directory\n");
-        BIO_printf(bio_err, "-CAfile file   trusted certificates file\n");
-        BIO_printf(bio_err,
-                   "-crl_check     check revocation status of signer's certificate using CRLs\n");
-        BIO_printf(bio_err,
-                   "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "-engine e      use engine e, possibly a hardware device.\n");
-                   "-engine e      use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, "-passin arg    input file pass phrase source\n");
+		BIO_printf (bio_err, "-passin arg    input file pass phrase source\n");
-        BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err,  "               load the file (or the files in the directory) into\n");
-        BIO_printf(bio_err,
-                   "               load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,  "               the random number generator\n");
-        BIO_printf(bio_err,
+		BIO_printf (bio_err, "cert.pem       recipient certificate(s) for encryption\n");
-                   "cert.pem       recipient certificate(s) for encryption\n");
 		goto end;
 		}
+
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
 #endif
 
-    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+	if (!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+		{
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 		}
 
-    if (need_rand) {
+	if (need_rand)
+		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 		if (inrand != NULL)
-            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 		}
 
@@ -443,35 +502,40 @@ int MAIN(int argc, char **argv)
 	if (operation != SMIME_SIGN)
 		flags &= ~PKCS7_DETACHED;
 
-    if (operation & SMIME_OP) {
+	if (operation & SMIME_OP)
+		{
 		if (flags & PKCS7_BINARY)
 			inmode = "rb";
 		if (outformat == FORMAT_ASN1)
 			outmode = "wb";
-    } else {
+		}
+	else
+		{
 		if (flags & PKCS7_BINARY)
 			outmode = "wb";
 		if (informat == FORMAT_ASN1)
 			inmode = "rb";
 		}
 
-    if (operation == SMIME_ENCRYPT) {
+	if (operation == SMIME_ENCRYPT)
-        if (!cipher) {
+		{
-#ifndef OPENSSL_NO_DES
+		if (!cipher)
-            cipher = EVP_des_ede3_cbc();
+			{
+#ifndef OPENSSL_NO_RC2			
+			cipher = EVP_rc2_40_cbc();
 #else
 			BIO_printf(bio_err, "No cipher selected\n");
 			goto end;
 #endif
 			}
 		encerts = sk_X509_new_null();
-        while (*args) {
+		while (*args)
-            if (!(cert = load_cert(bio_err, *args, FORMAT_PEM,
+			{
-                                   NULL, e, "recipient certificate file"))) {
+			if (!(cert = load_cert(bio_err,*args,FORMAT_PEM,
+				NULL, e, "recipient certificate file")))
+				{
 #if 0				/* An appropriate message is already printed */
-                BIO_printf(bio_err,
+				BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
-                           "Can't read recipient certificate file %s\n",
-                           *args);
 #endif
 				goto end;
 				}
@@ -481,23 +545,24 @@ int MAIN(int argc, char **argv)
 			}
 		}
 
-    if (signerfile && (operation == SMIME_SIGN)) {
+	if (signerfile && (operation == SMIME_SIGN))
-        if (!(signer = load_cert(bio_err, signerfile, FORMAT_PEM, NULL,
+		{
-                                 e, "signer certificate"))) {
+		if (!(signer = load_cert(bio_err,signerfile,FORMAT_PEM, NULL,
-#if 0                           /* An appropri message has already been
+			e, "signer certificate")))
-                                 * printed */
+			{
-            BIO_printf(bio_err, "Can't read signer certificate file %s\n",
+#if 0			/* An appropri message has already been printed */
-                       signerfile);
+			BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile);
 #endif
 			goto end;
 			}
 		}
 
-    if (certfile) {
+	if (certfile)
-        if (!(other = load_certs(bio_err, certfile, FORMAT_PEM, NULL,
+		{
-                                 e, "certificate file"))) {
+		if (!(other = load_certs(bio_err,certfile,FORMAT_PEM, NULL,
-#if 0                           /* An appropriate message has already been
+			e, "certificate file")))
-                                 * printed */
+			{
+#if 0			/* An appropriate message has already been printed */
 			BIO_printf(bio_err, "Can't read certificate file %s\n", certfile);
 #endif
 			ERR_print_errors(bio_err);
@@ -505,49 +570,62 @@ int MAIN(int argc, char **argv)
 			}
 		}
 
-    if (recipfile && (operation == SMIME_DECRYPT)) {
+	if (recipfile && (operation == SMIME_DECRYPT))
-        if (!(recip = load_cert(bio_err, recipfile, FORMAT_PEM, NULL,
+		{
-                                e, "recipient certificate file"))) {
+		if (!(recip = load_cert(bio_err,recipfile,FORMAT_PEM,NULL,
-#if 0                           /* An appropriate message has alrady been
+			e, "recipient certificate file")))
-                                 * printed */
+			{
-            BIO_printf(bio_err, "Can't read recipient certificate file %s\n",
+#if 0			/* An appropriate message has alrady been printed */
-                       recipfile);
+			BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile);
 #endif
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 
-    if (operation == SMIME_DECRYPT) {
+	if (operation == SMIME_DECRYPT)
+		{
 		if (!keyfile)
 			keyfile = recipfile;
-    } else if (operation == SMIME_SIGN) {
+		}
+	else if (operation == SMIME_SIGN)
+		{
 		if (!keyfile)
 			keyfile = signerfile;
-    } else
+		}
-        keyfile = NULL;
+	else keyfile = NULL;
 
-    if (keyfile) {
+	if (keyfile)
+		{
 		key = load_key(bio_err, keyfile, keyform, 0, passin, e,
 			       "signing key file");
 		if (!key)
 			goto end;
 		}
 
-    if (infile) {
+	if (infile)
-        if (!(in = BIO_new_file(infile, inmode))) {
+		{
-            BIO_printf(bio_err, "Can't open input file %s\n", infile);
+		if (!(in = BIO_new_file(infile, inmode)))
+			{
+			BIO_printf (bio_err,
+				 "Can't open input file %s\n", infile);
 			goto end;
 			}
-    } else
+		}
+	else
 		in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-    if (outfile) {
+	if (outfile)
-        if (!(out = BIO_new_file(outfile, outmode))) {
+		{
-            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
+		if (!(out = BIO_new_file(outfile, outmode)))
+			{
+			BIO_printf (bio_err,
+				 "Can't open output file %s\n", outfile);
 			goto end;
 			}
-    } else {
+		}
+	else
+		{
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -557,7 +635,8 @@ int MAIN(int argc, char **argv)
 #endif
 		}
 
-    if (operation == SMIME_VERIFY) {
+	if (operation == SMIME_VERIFY)
+		{
 		if (!(store = setup_verify(bio_err, CAfile, CApath)))
 			goto end;
 		X509_STORE_set_verify_cb_func(store, smime_cb);
@@ -565,71 +644,89 @@ int MAIN(int argc, char **argv)
 			X509_STORE_set1_param(store, vpm);
 		}
 
+
 	ret = 3;
 
 	if (operation == SMIME_ENCRYPT)
 		p7 = PKCS7_encrypt(encerts, in, cipher, flags);
-    else if (operation == SMIME_SIGN) {
+	else if (operation == SMIME_SIGN)
-        /*
+		{
-         * If detached data and SMIME output enable partial signing.
+		/* If detached data and SMIME output enable partial
+		 * signing.
 		 */
 		if ((flags & PKCS7_DETACHED) && (outformat == FORMAT_SMIME))
 			flags |= PKCS7_STREAM;
 		p7 = PKCS7_sign(signer, key, other, in, flags);
-    } else {
+		}
+	else
+		{
 		if (informat == FORMAT_SMIME) 
 			p7 = SMIME_read_PKCS7(in, &indata);
 		else if (informat == FORMAT_PEM) 
 			p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
 		else if (informat == FORMAT_ASN1) 
 			p7 = d2i_PKCS7_bio(in, NULL);
-        else {
+		else
+			{
 			BIO_printf(bio_err, "Bad input format for PKCS#7 file\n");
 			goto end;
 			}
 
-        if (!p7) {
+		if (!p7)
+			{
 			BIO_printf(bio_err, "Error reading S/MIME message\n");
 			goto end;
 			}
-        if (contfile) {
+		if (contfile)
+			{
 			BIO_free(indata);
-            if (!(indata = BIO_new_file(contfile, "rb"))) {
+			if (!(indata = BIO_new_file(contfile, "rb")))
+				{
 				BIO_printf(bio_err, "Can't read content file %s\n", contfile);
 				goto end;
 				}
 			}
 		}
 
-    if (!p7) {
+	if (!p7)
+		{
 		BIO_printf(bio_err, "Error creating PKCS#7 structure\n");
 		goto end;
 		}
 
 	ret = 4;
-    if (operation == SMIME_DECRYPT) {
+	if (operation == SMIME_DECRYPT)
-        if (!PKCS7_decrypt(p7, key, recip, out, flags)) {
+		{
+		if (!PKCS7_decrypt(p7, key, recip, out, flags))
+			{
 			BIO_printf(bio_err, "Error decrypting PKCS#7 structure\n");
 			goto end;
 			}
-    } else if (operation == SMIME_VERIFY) {
+		}
+	else if (operation == SMIME_VERIFY)
+		{
 		STACK_OF(X509) *signers;
 		if (PKCS7_verify(p7, other, store, indata, out, flags))
 			BIO_printf(bio_err, "Verification successful\n");
-        else {
+		else
+			{
 			BIO_printf(bio_err, "Verification failure\n");
 			goto end;
 			}
 		signers = PKCS7_get0_signers(p7, other, flags);
-        if (!save_certs(signerfile, signers)) {
+		if (!save_certs(signerfile, signers))
-            BIO_printf(bio_err, "Error writing signers to %s\n", signerfile);
+			{
+			BIO_printf(bio_err, "Error writing signers to %s\n",
+								signerfile);
 			ret = 5;
 			goto end;
 			}
 		sk_X509_free(signers);
-    } else if (operation == SMIME_PK7OUT)
+		}
+	else if (operation == SMIME_PK7OUT)
 		PEM_write_bio_PKCS7(out, p7);
-    else {
+	else
+		{
 		if (to)
 			BIO_printf(out, "To: %s\n", to);
 		if (from)
@@ -639,20 +736,20 @@ int MAIN(int argc, char **argv)
 		if (outformat == FORMAT_SMIME) 
 			SMIME_write_PKCS7(out, p7, in, flags);
 		else if (outformat == FORMAT_PEM) 
-            PEM_write_bio_PKCS7(out, p7);
+			PEM_write_bio_PKCS7(out,p7);
 		else if (outformat == FORMAT_ASN1) 
-            i2d_PKCS7_bio(out, p7);
+			i2d_PKCS7_bio(out,p7);
-        else {
+		else
+			{
 			BIO_printf(bio_err, "Bad output format for PKCS#7 file\n");
 			goto end;
 			}
 		}
 	ret = 0;
- end:
+end:
 	if (need_rand)
 		app_RAND_write_file(NULL, bio_err);
-    if (ret)
+	if (ret) ERR_print_errors(bio_err);
-        ERR_print_errors(bio_err);
 	sk_X509_pop_free(encerts, X509_free);
 	sk_X509_pop_free(other, X509_free);
 	if (vpm)
@@ -666,30 +763,29 @@ int MAIN(int argc, char **argv)
 	BIO_free(in);
 	BIO_free(indata);
 	BIO_free_all(out);
-    if (passin)
+	if (passin) OPENSSL_free(passin);
-        OPENSSL_free(passin);
 	return (ret);
 }
 
 static int save_certs(char *signerfile, STACK_OF(X509) *signers)
-{
+	{
 	int i;
 	BIO *tmp;
 	if (!signerfile)
 		return 1;
 	tmp = BIO_new_file(signerfile, "w");
-    if (!tmp)
+	if (!tmp) return 0;
-        return 0;
+	for(i = 0; i < sk_X509_num(signers); i++)
-    for (i = 0; i < sk_X509_num(signers); i++)
 		PEM_write_bio_X509(tmp, sk_X509_value(signers, i));
 	BIO_free(tmp);
 	return 1;
-}
+	}
+	
 
 /* Minimal callback just to output policy info (if any) */
 
 static int smime_cb(int ok, X509_STORE_CTX *ctx)
-{
+	{
 	int error;
 
 	error = X509_STORE_CTX_get_error(ctx);
@@ -702,4 +798,4 @@ static int smime_cb(int ok, X509_STORE_CTX *ctx)
 
 	return ok;
 
-}
+	}

apps/spkac.c

@@ -1,8 +1,8 @@
 /* apps/spkac.c */
 
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 1999. Based on an original idea by Massimiliano Pala
- * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org).
+ * (madwolf@openca.org).
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -73,20 +73,19 @@
 #undef PROG
 #define PROG	spkac_main
 
-/*-
+/* -in arg	- input file - default stdin
- * -in arg      - input file - default stdin
  * -out arg	- output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
-    int i, badops = 0, ret = 1;
+	int i,badops=0, ret = 1;
-    BIO *in = NULL, *out = NULL;
+	BIO *in = NULL,*out = NULL;
-    int verify = 0, noout = 0, pubkey = 0;
+	int verify=0,noout=0,pubkey=0;
-    char *infile = NULL, *outfile = NULL, *prog;
+	char *infile = NULL,*outfile = NULL,*prog;
 	char *passargin = NULL, *passin = NULL;
 	const char *spkac = "SPKAC", *spksect = "default";
 	char *spkstr = NULL;
@@ -95,117 +94,119 @@ int MAIN(int argc, char **argv)
 	NETSCAPE_SPKI *spki = NULL;
 	EVP_PKEY *pkey = NULL;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
 
 	apps_startup();
 
-    if (!bio_err)
+	if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
-    prog = argv[0];
+	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-in") == 0) {
+		{
-            if (--argc < 1)
+		if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
-            infile = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-out") == 0) {
+			infile= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-out") == 0)
-            outfile = *(++argv);
+			{
-        } else if (strcmp(*argv, "-passin") == 0) {
+			if (--argc < 1) goto bad;
-            if (--argc < 1)
+			outfile= *(++argv);
-                goto bad;
+			}
-            passargin = *(++argv);
+		else if (strcmp(*argv,"-passin") == 0)
-        } else if (strcmp(*argv, "-key") == 0) {
+			{
-            if (--argc < 1)
+			if (--argc < 1) goto bad;
-                goto bad;
+			passargin= *(++argv);
-            keyfile = *(++argv);
+			}
-        } else if (strcmp(*argv, "-challenge") == 0) {
+		else if (strcmp(*argv,"-key") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            challenge = *(++argv);
+			keyfile= *(++argv);
-        } else if (strcmp(*argv, "-spkac") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-challenge") == 0)
-                goto bad;
+			{
-            spkac = *(++argv);
+			if (--argc < 1) goto bad;
-        } else if (strcmp(*argv, "-spksect") == 0) {
+			challenge= *(++argv);
-            if (--argc < 1)
+			}
-                goto bad;
+		else if (strcmp(*argv,"-spkac") == 0)
-            spksect = *(++argv);
+			{
+			if (--argc < 1) goto bad;
+			spkac= *(++argv);
+			}
+		else if (strcmp(*argv,"-spksect") == 0)
+			{
+			if (--argc < 1) goto bad;
+			spksect= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            engine = *(++argv);
+			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-noout") == 0)
+		else if (strcmp(*argv,"-noout") == 0)
-            noout = 1;
+			noout=1;
-        else if (strcmp(*argv, "-pubkey") == 0)
+		else if (strcmp(*argv,"-pubkey") == 0)
-            pubkey = 1;
+			pubkey=1;
-        else if (strcmp(*argv, "-verify") == 0)
+		else if (strcmp(*argv,"-verify") == 0)
-            verify = 1;
+			verify=1;
-        else
+		else badops = 1;
-            badops = 1;
 		argc--;
 		argv++;
 		}
 
-    if (badops) {
+	if (badops)
- bad:
+		{
-        BIO_printf(bio_err, "%s [options]\n", prog);
+bad:
-        BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err,"%s [options]\n",prog);
-        BIO_printf(bio_err, " -in arg        input file\n");
+		BIO_printf(bio_err,"where options are\n");
-        BIO_printf(bio_err, " -out arg       output file\n");
+		BIO_printf(bio_err," -in arg        input file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -out arg       output file\n");
-                   " -key arg       create SPKAC using private key\n");
+		BIO_printf(bio_err," -key arg       create SPKAC using private key\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passin arg    input file pass phrase source\n");
-                   " -passin arg    input file pass phrase source\n");
+		BIO_printf(bio_err," -challenge arg challenge string\n");
-        BIO_printf(bio_err, " -challenge arg challenge string\n");
+		BIO_printf(bio_err," -spkac arg     alternative SPKAC name\n");
-        BIO_printf(bio_err, " -spkac arg     alternative SPKAC name\n");
+		BIO_printf(bio_err," -noout         don't print SPKAC\n");
-        BIO_printf(bio_err, " -noout         don't print SPKAC\n");
+		BIO_printf(bio_err," -pubkey        output public key\n");
-        BIO_printf(bio_err, " -pubkey        output public key\n");
+		BIO_printf(bio_err," -verify        verify SPKAC signature\n");
-        BIO_printf(bio_err, " -verify        verify SPKAC signature\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
-                   " -engine e      use engine e, possibly a hardware device.\n");
 #endif
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
-    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 	}
+
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
 #endif
 
-    if (keyfile) {
+	if(keyfile) {
 		pkey = load_key(bio_err,
 				strcmp(keyfile, "-") ? keyfile : NULL,
 				FORMAT_PEM, 1, passin, e, "private key");
-        if (!pkey) {
+		if(!pkey) {
 			goto end;
 		}
 		spki = NETSCAPE_SPKI_new();
-        if (challenge)
+		if(challenge) ASN1_STRING_set(spki->spkac->challenge,
-            ASN1_STRING_set(spki->spkac->challenge,
 						 challenge, (int)strlen(challenge));
 		NETSCAPE_SPKI_set_pubkey(spki, pkey);
 		NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
 		spkstr = NETSCAPE_SPKI_b64_encode(spki);
 
-        if (outfile)
+		if (outfile) out = BIO_new_file(outfile, "w");
-            out = BIO_new_file(outfile, "w");
 		else {
 			out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -216,7 +217,7 @@ int MAIN(int argc, char **argv)
 #endif
 		}
 
-        if (!out) {
+		if(!out) {
 			BIO_printf(bio_err, "Error opening output file\n");
 			ERR_print_errors(bio_err);
 			goto end;
@@ -227,12 +228,12 @@ int MAIN(int argc, char **argv)
 		goto end;
 	}
 
-    if (infile)
-        in = BIO_new_file(infile, "r");
-    else
-        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 	
-    if (!in) {
+
+	if (infile) in = BIO_new_file(infile, "r");
+	else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+
+	if(!in) {
 		BIO_printf(bio_err, "Error opening input file\n");
 		ERR_print_errors(bio_err);
 		goto end;
@@ -241,7 +242,7 @@ int MAIN(int argc, char **argv)
 	conf = NCONF_new(NULL);
 	i = NCONF_load_bio(conf, in, NULL);
 
-    if (!i) {
+	if(!i) {
 		BIO_printf(bio_err, "Error parsing config file\n");
 		ERR_print_errors(bio_err);
 		goto end;
@@ -249,7 +250,7 @@ int MAIN(int argc, char **argv)
 
 	spkstr = NCONF_get_string(conf, spksect, spkac);
 		
-    if (!spkstr) {
+	if(!spkstr) {
 		BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
 		ERR_print_errors(bio_err);
 		goto end;
@@ -257,14 +258,13 @@ int MAIN(int argc, char **argv)
 
 	spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
 	
-    if (!spki) {
+	if(!spki) {
 		BIO_printf(bio_err, "Error loading SPKAC\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-    if (outfile)
+	if (outfile) out = BIO_new_file(outfile, "w");
-        out = BIO_new_file(outfile, "w");
 	else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -275,38 +275,34 @@ int MAIN(int argc, char **argv)
 #endif
 	}
 
-    if (!out) {
+	if(!out) {
 		BIO_printf(bio_err, "Error opening output file\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-    if (!noout)
+	if(!noout) NETSCAPE_SPKI_print(out, spki);
-        NETSCAPE_SPKI_print(out, spki);
 	pkey = NETSCAPE_SPKI_get_pubkey(spki);
-    if (verify) {
+	if(verify) {
 		i = NETSCAPE_SPKI_verify(spki, pkey);
-        if (i > 0)
+		if(i) BIO_printf(bio_err, "Signature OK\n");
-            BIO_printf(bio_err, "Signature OK\n");
 		else {
 			BIO_printf(bio_err, "Signature Failure\n");
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
-    if (pubkey)
+	if(pubkey) PEM_write_bio_PUBKEY(out, pkey);
-        PEM_write_bio_PUBKEY(out, pkey);
 
 	ret = 0;
 
- end:
+end:
 	NCONF_free(conf);
 	NETSCAPE_SPKI_free(spki);
 	BIO_free(in);
 	BIO_free_all(out);
 	EVP_PKEY_free(pkey);
-    if (passin)
+	if(passin) OPENSSL_free(passin);
-        OPENSSL_free(passin);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}

apps/testdsa.h

@@ -1,233 +1,217 @@
 /* NOCW */
 /* used by apps/speed.c */
-DSA *get_dsa512(void);
+DSA *get_dsa512(void );
-DSA *get_dsa1024(void);
+DSA *get_dsa1024(void );
-DSA *get_dsa2048(void);
+DSA *get_dsa2048(void );
 static unsigned char dsa512_priv[] = {
-    0x65, 0xe5, 0xc7, 0x38, 0x60, 0x24, 0xb5, 0x89, 0xd4, 0x9c, 0xeb, 0x4c,
+	0x65,0xe5,0xc7,0x38,0x60,0x24,0xb5,0x89,0xd4,0x9c,0xeb,0x4c,
-    0x9c, 0x1d, 0x7a, 0x22, 0xbd, 0xd1, 0xc2, 0xd2,
+	0x9c,0x1d,0x7a,0x22,0xbd,0xd1,0xc2,0xd2,
-};
+	};
-
 static unsigned char dsa512_pub[] = {
-    0x00, 0x95, 0xa7, 0x0d, 0xec, 0x93, 0x68, 0xba, 0x5f, 0xf7, 0x5f, 0x07,
+	0x00,0x95,0xa7,0x0d,0xec,0x93,0x68,0xba,0x5f,0xf7,0x5f,0x07,
-    0xf2, 0x3b, 0xad, 0x6b, 0x01, 0xdc, 0xbe, 0xec, 0xde, 0x04, 0x7a, 0x3a,
+	0xf2,0x3b,0xad,0x6b,0x01,0xdc,0xbe,0xec,0xde,0x04,0x7a,0x3a,
-    0x27, 0xb3, 0xec, 0x49, 0xfd, 0x08, 0x43, 0x3d, 0x7e, 0xa8, 0x2c, 0x5e,
+	0x27,0xb3,0xec,0x49,0xfd,0x08,0x43,0x3d,0x7e,0xa8,0x2c,0x5e,
-    0x7b, 0xbb, 0xfc, 0xf4, 0x6e, 0xeb, 0x6c, 0xb0, 0x6e, 0xf8, 0x02, 0x12,
+	0x7b,0xbb,0xfc,0xf4,0x6e,0xeb,0x6c,0xb0,0x6e,0xf8,0x02,0x12,
-    0x8c, 0x38, 0x5d, 0x83, 0x56, 0x7d, 0xee, 0x53, 0x05, 0x3e, 0x24, 0x84,
+	0x8c,0x38,0x5d,0x83,0x56,0x7d,0xee,0x53,0x05,0x3e,0x24,0x84,
-    0xbe, 0xba, 0x0a, 0x6b, 0xc8,
+	0xbe,0xba,0x0a,0x6b,0xc8,
-};
+	};
-
+static unsigned char dsa512_p[]={
-static unsigned char dsa512_p[] = {
+	0x9D,0x1B,0x69,0x8E,0x26,0xDB,0xF2,0x2B,0x11,0x70,0x19,0x86,
-    0x9D, 0x1B, 0x69, 0x8E, 0x26, 0xDB, 0xF2, 0x2B, 0x11, 0x70, 0x19, 0x86,
+	0xF6,0x19,0xC8,0xF8,0x19,0xF2,0x18,0x53,0x94,0x46,0x06,0xD0,
-    0xF6, 0x19, 0xC8, 0xF8, 0x19, 0xF2, 0x18, 0x53, 0x94, 0x46, 0x06, 0xD0,
+	0x62,0x50,0x33,0x4B,0x02,0x3C,0x52,0x30,0x03,0x8B,0x3B,0xF9,
-    0x62, 0x50, 0x33, 0x4B, 0x02, 0x3C, 0x52, 0x30, 0x03, 0x8B, 0x3B, 0xF9,
+	0x5F,0xD1,0x24,0x06,0x4F,0x7B,0x4C,0xBA,0xAA,0x40,0x9B,0xFD,
-    0x5F, 0xD1, 0x24, 0x06, 0x4F, 0x7B, 0x4C, 0xBA, 0xAA, 0x40, 0x9B, 0xFD,
+	0x96,0xE4,0x37,0x33,0xBB,0x2D,0x5A,0xD7,0x5A,0x11,0x40,0x66,
-    0x96, 0xE4, 0x37, 0x33, 0xBB, 0x2D, 0x5A, 0xD7, 0x5A, 0x11, 0x40, 0x66,
+	0xA2,0x76,0x7D,0x31,
-    0xA2, 0x76, 0x7D, 0x31,
+	};
-};
+static unsigned char dsa512_q[]={
-
+	0xFB,0x53,0xEF,0x50,0xB4,0x40,0x92,0x31,0x56,0x86,0x53,0x7A,
-static unsigned char dsa512_q[] = {
+	0xE8,0x8B,0x22,0x9A,0x49,0xFB,0x71,0x8F,
-    0xFB, 0x53, 0xEF, 0x50, 0xB4, 0x40, 0x92, 0x31, 0x56, 0x86, 0x53, 0x7A,
+	};
-    0xE8, 0x8B, 0x22, 0x9A, 0x49, 0xFB, 0x71, 0x8F,
+static unsigned char dsa512_g[]={
-};
+	0x83,0x3E,0x88,0xE5,0xC5,0x89,0x73,0xCE,0x3B,0x6C,0x01,0x49,
-
+	0xBF,0xB3,0xC7,0x9F,0x0A,0xEA,0x44,0x91,0xE5,0x30,0xAA,0xD9,
-static unsigned char dsa512_g[] = {
+	0xBE,0x5B,0x5F,0xB7,0x10,0xD7,0x89,0xB7,0x8E,0x74,0xFB,0xCF,
-    0x83, 0x3E, 0x88, 0xE5, 0xC5, 0x89, 0x73, 0xCE, 0x3B, 0x6C, 0x01, 0x49,
+	0x29,0x1E,0xEB,0xA8,0x2C,0x54,0x51,0xB8,0x10,0xDE,0xA0,0xCE,
-    0xBF, 0xB3, 0xC7, 0x9F, 0x0A, 0xEA, 0x44, 0x91, 0xE5, 0x30, 0xAA, 0xD9,
+	0x2F,0xCC,0x24,0x6B,0x90,0x77,0xDE,0xA2,0x68,0xA6,0x52,0x12,
-    0xBE, 0x5B, 0x5F, 0xB7, 0x10, 0xD7, 0x89, 0xB7, 0x8E, 0x74, 0xFB, 0xCF,
+	0xA2,0x03,0x9D,0x20,
-    0x29, 0x1E, 0xEB, 0xA8, 0x2C, 0x54, 0x51, 0xB8, 0x10, 0xDE, 0xA0, 0xCE,
+	};
-    0x2F, 0xCC, 0x24, 0x6B, 0x90, 0x77, 0xDE, 0xA2, 0x68, 0xA6, 0x52, 0x12,
-    0xA2, 0x03, 0x9D, 0x20,
-};
 
 DSA *get_dsa512()
-{
+	{
 	DSA *dsa;
 
-    if ((dsa = DSA_new()) == NULL)
+	if ((dsa=DSA_new()) == NULL) return(NULL);
-        return (NULL);
+	dsa->priv_key=BN_bin2bn(dsa512_priv,sizeof(dsa512_priv),NULL);
-    dsa->priv_key = BN_bin2bn(dsa512_priv, sizeof(dsa512_priv), NULL);
+	dsa->pub_key=BN_bin2bn(dsa512_pub,sizeof(dsa512_pub),NULL);
-    dsa->pub_key = BN_bin2bn(dsa512_pub, sizeof(dsa512_pub), NULL);
+	dsa->p=BN_bin2bn(dsa512_p,sizeof(dsa512_p),NULL);
-    dsa->p = BN_bin2bn(dsa512_p, sizeof(dsa512_p), NULL);
+	dsa->q=BN_bin2bn(dsa512_q,sizeof(dsa512_q),NULL);
-    dsa->q = BN_bin2bn(dsa512_q, sizeof(dsa512_q), NULL);
+	dsa->g=BN_bin2bn(dsa512_g,sizeof(dsa512_g),NULL);
-    dsa->g = BN_bin2bn(dsa512_g, sizeof(dsa512_g), NULL);
+	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
+				(dsa->q == NULL) || (dsa->g == NULL))
-        || (dsa->q == NULL) || (dsa->g == NULL))
+		return(NULL);
-        return (NULL);
+	return(dsa);
-    return (dsa);
+	}
-}
 
-static unsigned char dsa1024_priv[] = {
+static unsigned char dsa1024_priv[]={
-    0x7d, 0x21, 0xda, 0xbb, 0x62, 0x15, 0x47, 0x36, 0x07, 0x67, 0x12, 0xe8,
+	0x7d,0x21,0xda,0xbb,0x62,0x15,0x47,0x36,0x07,0x67,0x12,0xe8,
-    0x8c, 0xaa, 0x1c, 0xcd, 0x38, 0x12, 0x61, 0x18,
+	0x8c,0xaa,0x1c,0xcd,0x38,0x12,0x61,0x18,
-};
+	};
-
+static unsigned char dsa1024_pub[]={
-static unsigned char dsa1024_pub[] = {
+	0x3c,0x4e,0x9c,0x2a,0x7f,0x16,0xc1,0x25,0xeb,0xac,0x78,0x63,
-    0x3c, 0x4e, 0x9c, 0x2a, 0x7f, 0x16, 0xc1, 0x25, 0xeb, 0xac, 0x78, 0x63,
+	0x90,0x14,0x8c,0x8b,0xf4,0x68,0x43,0x3c,0x2d,0xee,0x65,0x50,
-    0x90, 0x14, 0x8c, 0x8b, 0xf4, 0x68, 0x43, 0x3c, 0x2d, 0xee, 0x65, 0x50,
+	0x7d,0x9c,0x8f,0x8c,0x8a,0x51,0xd6,0x11,0x2b,0x99,0xaf,0x1e,
-    0x7d, 0x9c, 0x8f, 0x8c, 0x8a, 0x51, 0xd6, 0x11, 0x2b, 0x99, 0xaf, 0x1e,
+	0x90,0x97,0xb5,0xd3,0xa6,0x20,0x25,0xd6,0xfe,0x43,0x02,0xd5,
-    0x90, 0x97, 0xb5, 0xd3, 0xa6, 0x20, 0x25, 0xd6, 0xfe, 0x43, 0x02, 0xd5,
+	0x91,0x7d,0xa7,0x8c,0xdb,0xc9,0x85,0xa3,0x36,0x48,0xf7,0x68,
-    0x91, 0x7d, 0xa7, 0x8c, 0xdb, 0xc9, 0x85, 0xa3, 0x36, 0x48, 0xf7, 0x68,
+	0xaa,0x60,0xb1,0xf7,0x05,0x68,0x3a,0xa3,0x3f,0xd3,0x19,0x82,
-    0xaa, 0x60, 0xb1, 0xf7, 0x05, 0x68, 0x3a, 0xa3, 0x3f, 0xd3, 0x19, 0x82,
+	0xd8,0x82,0x7a,0x77,0xfb,0xef,0xf4,0x15,0x0a,0xeb,0x06,0x04,
-    0xd8, 0x82, 0x7a, 0x77, 0xfb, 0xef, 0xf4, 0x15, 0x0a, 0xeb, 0x06, 0x04,
+	0x7f,0x53,0x07,0x0c,0xbc,0xcb,0x2d,0x83,0xdb,0x3e,0xd1,0x28,
-    0x7f, 0x53, 0x07, 0x0c, 0xbc, 0xcb, 0x2d, 0x83, 0xdb, 0x3e, 0xd1, 0x28,
+	0xa5,0xa1,0x31,0xe0,0x67,0xfa,0x50,0xde,0x9b,0x07,0x83,0x7e,
-    0xa5, 0xa1, 0x31, 0xe0, 0x67, 0xfa, 0x50, 0xde, 0x9b, 0x07, 0x83, 0x7e,
+	0x2c,0x0b,0xc3,0x13,0x50,0x61,0xe5,0xad,0xbd,0x36,0xb8,0x97,
-    0x2c, 0x0b, 0xc3, 0x13, 0x50, 0x61, 0xe5, 0xad, 0xbd, 0x36, 0xb8, 0x97,
+	0x4e,0x40,0x7d,0xe8,0x83,0x0d,0xbc,0x4b
-    0x4e, 0x40, 0x7d, 0xe8, 0x83, 0x0d, 0xbc, 0x4b
+	};
-};
+static unsigned char dsa1024_p[]={
-
+	0xA7,0x3F,0x6E,0x85,0xBF,0x41,0x6A,0x29,0x7D,0xF0,0x9F,0x47,
-static unsigned char dsa1024_p[] = {
+	0x19,0x30,0x90,0x9A,0x09,0x1D,0xDA,0x6A,0x33,0x1E,0xC5,0x3D,
-    0xA7, 0x3F, 0x6E, 0x85, 0xBF, 0x41, 0x6A, 0x29, 0x7D, 0xF0, 0x9F, 0x47,
+	0x86,0x96,0xB3,0x15,0xE0,0x53,0x2E,0x8F,0xE0,0x59,0x82,0x73,
-    0x19, 0x30, 0x90, 0x9A, 0x09, 0x1D, 0xDA, 0x6A, 0x33, 0x1E, 0xC5, 0x3D,
+	0x90,0x3E,0x75,0x31,0x99,0x47,0x7A,0x52,0xFB,0x85,0xE4,0xD9,
-    0x86, 0x96, 0xB3, 0x15, 0xE0, 0x53, 0x2E, 0x8F, 0xE0, 0x59, 0x82, 0x73,
+	0xA6,0x7B,0x38,0x9B,0x68,0x8A,0x84,0x9B,0x87,0xC6,0x1E,0xB5,
-    0x90, 0x3E, 0x75, 0x31, 0x99, 0x47, 0x7A, 0x52, 0xFB, 0x85, 0xE4, 0xD9,
+	0x7E,0x86,0x4B,0x53,0x5B,0x59,0xCF,0x71,0x65,0x19,0x88,0x6E,
-    0xA6, 0x7B, 0x38, 0x9B, 0x68, 0x8A, 0x84, 0x9B, 0x87, 0xC6, 0x1E, 0xB5,
+	0xCE,0x66,0xAE,0x6B,0x88,0x36,0xFB,0xEC,0x28,0xDC,0xC2,0xD7,
-    0x7E, 0x86, 0x4B, 0x53, 0x5B, 0x59, 0xCF, 0x71, 0x65, 0x19, 0x88, 0x6E,
+	0xA5,0xBB,0xE5,0x2C,0x39,0x26,0x4B,0xDA,0x9A,0x70,0x18,0x95,
-    0xCE, 0x66, 0xAE, 0x6B, 0x88, 0x36, 0xFB, 0xEC, 0x28, 0xDC, 0xC2, 0xD7,
+	0x37,0x95,0x10,0x56,0x23,0xF6,0x15,0xED,0xBA,0x04,0x5E,0xDE,
-    0xA5, 0xBB, 0xE5, 0x2C, 0x39, 0x26, 0x4B, 0xDA, 0x9A, 0x70, 0x18, 0x95,
+	0x39,0x4F,0xFD,0xB7,0x43,0x1F,0xB5,0xA4,0x65,0x6F,0xCD,0x80,
-    0x37, 0x95, 0x10, 0x56, 0x23, 0xF6, 0x15, 0xED, 0xBA, 0x04, 0x5E, 0xDE,
+	0x11,0xE4,0x70,0x95,0x5B,0x50,0xCD,0x49,
-    0x39, 0x4F, 0xFD, 0xB7, 0x43, 0x1F, 0xB5, 0xA4, 0x65, 0x6F, 0xCD, 0x80,
+	};
-    0x11, 0xE4, 0x70, 0x95, 0x5B, 0x50, 0xCD, 0x49,
+static unsigned char dsa1024_q[]={
-};
+	0xF7,0x07,0x31,0xED,0xFA,0x6C,0x06,0x03,0xD5,0x85,0x8A,0x1C,
-
+	0xAC,0x9C,0x65,0xE7,0x50,0x66,0x65,0x6F,
-static unsigned char dsa1024_q[] = {
+	};
-    0xF7, 0x07, 0x31, 0xED, 0xFA, 0x6C, 0x06, 0x03, 0xD5, 0x85, 0x8A, 0x1C,
+static unsigned char dsa1024_g[]={
-    0xAC, 0x9C, 0x65, 0xE7, 0x50, 0x66, 0x65, 0x6F,
+	0x4D,0xDF,0x4C,0x03,0xA6,0x91,0x8A,0xF5,0x19,0x6F,0x50,0x46,
-};
+	0x25,0x99,0xE5,0x68,0x6F,0x30,0xE3,0x69,0xE1,0xE5,0xB3,0x5D,
-
+	0x98,0xBB,0x28,0x86,0x48,0xFC,0xDE,0x99,0x04,0x3F,0x5F,0x88,
-static unsigned char dsa1024_g[] = {
+	0x0C,0x9C,0x73,0x24,0x0D,0x20,0x5D,0xB9,0x2A,0x9A,0x3F,0x18,
-    0x4D, 0xDF, 0x4C, 0x03, 0xA6, 0x91, 0x8A, 0xF5, 0x19, 0x6F, 0x50, 0x46,
+	0x96,0x27,0xE4,0x62,0x87,0xC1,0x7B,0x74,0x62,0x53,0xFC,0x61,
-    0x25, 0x99, 0xE5, 0x68, 0x6F, 0x30, 0xE3, 0x69, 0xE1, 0xE5, 0xB3, 0x5D,
+	0x27,0xA8,0x7A,0x91,0x09,0x9D,0xB6,0xF1,0x4D,0x9C,0x54,0x0F,
-    0x98, 0xBB, 0x28, 0x86, 0x48, 0xFC, 0xDE, 0x99, 0x04, 0x3F, 0x5F, 0x88,
+	0x58,0x06,0xEE,0x49,0x74,0x07,0xCE,0x55,0x7E,0x23,0xCE,0x16,
-    0x0C, 0x9C, 0x73, 0x24, 0x0D, 0x20, 0x5D, 0xB9, 0x2A, 0x9A, 0x3F, 0x18,
+	0xF6,0xCA,0xDC,0x5A,0x61,0x01,0x7E,0xC9,0x71,0xB5,0x4D,0xF6,
-    0x96, 0x27, 0xE4, 0x62, 0x87, 0xC1, 0x7B, 0x74, 0x62, 0x53, 0xFC, 0x61,
+	0xDC,0x34,0x29,0x87,0x68,0xF6,0x5E,0x20,0x93,0xB3,0xDB,0xF5,
-    0x27, 0xA8, 0x7A, 0x91, 0x09, 0x9D, 0xB6, 0xF1, 0x4D, 0x9C, 0x54, 0x0F,
+	0xE4,0x09,0x6C,0x41,0x17,0x95,0x92,0xEB,0x01,0xB5,0x73,0xA5,
-    0x58, 0x06, 0xEE, 0x49, 0x74, 0x07, 0xCE, 0x55, 0x7E, 0x23, 0xCE, 0x16,
+	0x6A,0x7E,0xD8,0x32,0xED,0x0E,0x02,0xB8,
-    0xF6, 0xCA, 0xDC, 0x5A, 0x61, 0x01, 0x7E, 0xC9, 0x71, 0xB5, 0x4D, 0xF6,
+	};
-    0xDC, 0x34, 0x29, 0x87, 0x68, 0xF6, 0x5E, 0x20, 0x93, 0xB3, 0xDB, 0xF5,
-    0xE4, 0x09, 0x6C, 0x41, 0x17, 0x95, 0x92, 0xEB, 0x01, 0xB5, 0x73, 0xA5,
-    0x6A, 0x7E, 0xD8, 0x32, 0xED, 0x0E, 0x02, 0xB8,
-};
 
 DSA *get_dsa1024()
-{
+	{
 	DSA *dsa;
 
-    if ((dsa = DSA_new()) == NULL)
+	if ((dsa=DSA_new()) == NULL) return(NULL);
-        return (NULL);
+	dsa->priv_key=BN_bin2bn(dsa1024_priv,sizeof(dsa1024_priv),NULL);
-    dsa->priv_key = BN_bin2bn(dsa1024_priv, sizeof(dsa1024_priv), NULL);
+	dsa->pub_key=BN_bin2bn(dsa1024_pub,sizeof(dsa1024_pub),NULL);
-    dsa->pub_key = BN_bin2bn(dsa1024_pub, sizeof(dsa1024_pub), NULL);
+	dsa->p=BN_bin2bn(dsa1024_p,sizeof(dsa1024_p),NULL);
-    dsa->p = BN_bin2bn(dsa1024_p, sizeof(dsa1024_p), NULL);
+	dsa->q=BN_bin2bn(dsa1024_q,sizeof(dsa1024_q),NULL);
-    dsa->q = BN_bin2bn(dsa1024_q, sizeof(dsa1024_q), NULL);
+	dsa->g=BN_bin2bn(dsa1024_g,sizeof(dsa1024_g),NULL);
-    dsa->g = BN_bin2bn(dsa1024_g, sizeof(dsa1024_g), NULL);
+	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
+				(dsa->q == NULL) || (dsa->g == NULL))
-        || (dsa->q == NULL) || (dsa->g == NULL))
+		return(NULL);
-        return (NULL);
+	return(dsa);
-    return (dsa);
+	}
-}
 
-static unsigned char dsa2048_priv[] = {
+static unsigned char dsa2048_priv[]={
-    0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
+	0x32,0x67,0x92,0xf6,0xc4,0xe2,0xe2,0xe8,0xa0,0x8b,0x6b,0x45,
-    0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
+	0x0c,0x8a,0x76,0xb0,0xee,0xcf,0x91,0xa7,
-};
+	};
-
+static unsigned char dsa2048_pub[]={
-static unsigned char dsa2048_pub[] = {
+	0x17,0x8f,0xa8,0x11,0x84,0x92,0xec,0x83,0x47,0xc7,0x6a,0xb0,
-    0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
+	0x92,0xaf,0x5a,0x20,0x37,0xa3,0x64,0x79,0xd2,0xd0,0x3d,0xcd,
-    0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
+	0xe0,0x61,0x88,0x88,0x21,0xcc,0x74,0x5d,0xce,0x4c,0x51,0x47,
-    0xe0, 0x61, 0x88, 0x88, 0x21, 0xcc, 0x74, 0x5d, 0xce, 0x4c, 0x51, 0x47,
+	0xf0,0xc5,0x5c,0x4c,0x82,0x7a,0xaf,0x72,0xad,0xb9,0xe0,0x53,
-    0xf0, 0xc5, 0x5c, 0x4c, 0x82, 0x7a, 0xaf, 0x72, 0xad, 0xb9, 0xe0, 0x53,
+	0xf2,0x78,0xb7,0xf0,0xb5,0x48,0x7f,0x8a,0x3a,0x18,0xd1,0x9f,
-    0xf2, 0x78, 0xb7, 0xf0, 0xb5, 0x48, 0x7f, 0x8a, 0x3a, 0x18, 0xd1, 0x9f,
+	0x8b,0x7d,0xa5,0x47,0xb7,0x95,0xab,0x98,0xf8,0x7b,0x74,0x50,
-    0x8b, 0x7d, 0xa5, 0x47, 0xb7, 0x95, 0xab, 0x98, 0xf8, 0x7b, 0x74, 0x50,
+	0x56,0x8e,0x57,0xf0,0xee,0xf5,0xb7,0xba,0xab,0x85,0x86,0xf9,
-    0x56, 0x8e, 0x57, 0xf0, 0xee, 0xf5, 0xb7, 0xba, 0xab, 0x85, 0x86, 0xf9,
+	0x2b,0xef,0x41,0x56,0xa0,0xa4,0x9f,0xb7,0x38,0x00,0x46,0x0a,
-    0x2b, 0xef, 0x41, 0x56, 0xa0, 0xa4, 0x9f, 0xb7, 0x38, 0x00, 0x46, 0x0a,
+	0xa6,0xf1,0xfc,0x1f,0xd8,0x4e,0x85,0x44,0x92,0x43,0x21,0x5d,
-    0xa6, 0xf1, 0xfc, 0x1f, 0xd8, 0x4e, 0x85, 0x44, 0x92, 0x43, 0x21, 0x5d,
+	0x6e,0xcc,0xc2,0xcb,0x26,0x31,0x0d,0x21,0xc4,0xbd,0x8d,0x24,
-    0x6e, 0xcc, 0xc2, 0xcb, 0x26, 0x31, 0x0d, 0x21, 0xc4, 0xbd, 0x8d, 0x24,
+	0xbc,0xd9,0x18,0x19,0xd7,0xdc,0xf1,0xe7,0x93,0x50,0x48,0x03,
-    0xbc, 0xd9, 0x18, 0x19, 0xd7, 0xdc, 0xf1, 0xe7, 0x93, 0x50, 0x48, 0x03,
+	0x2c,0xae,0x2e,0xe7,0x49,0x88,0x5f,0x93,0x57,0x27,0x99,0x36,
-    0x2c, 0xae, 0x2e, 0xe7, 0x49, 0x88, 0x5f, 0x93, 0x57, 0x27, 0x99, 0x36,
+	0xb4,0x20,0xab,0xfc,0xa7,0x2b,0xf2,0xd9,0x98,0xd7,0xd4,0x34,
-    0xb4, 0x20, 0xab, 0xfc, 0xa7, 0x2b, 0xf2, 0xd9, 0x98, 0xd7, 0xd4, 0x34,
+	0x9d,0x96,0x50,0x58,0x9a,0xea,0x54,0xf3,0xee,0xf5,0x63,0x14,
-    0x9d, 0x96, 0x50, 0x58, 0x9a, 0xea, 0x54, 0xf3, 0xee, 0xf5, 0x63, 0x14,
+	0xee,0x85,0x83,0x74,0x76,0xe1,0x52,0x95,0xc3,0xf7,0xeb,0x04,
-    0xee, 0x85, 0x83, 0x74, 0x76, 0xe1, 0x52, 0x95, 0xc3, 0xf7, 0xeb, 0x04,
+	0x04,0x7b,0xa7,0x28,0x1b,0xcc,0xea,0x4a,0x4e,0x84,0xda,0xd8,
-    0x04, 0x7b, 0xa7, 0x28, 0x1b, 0xcc, 0xea, 0x4a, 0x4e, 0x84, 0xda, 0xd8,
+	0x9c,0x79,0xd8,0x9b,0x66,0x89,0x2f,0xcf,0xac,0xd7,0x79,0xf9,
-    0x9c, 0x79, 0xd8, 0x9b, 0x66, 0x89, 0x2f, 0xcf, 0xac, 0xd7, 0x79, 0xf9,
+	0xa9,0xd8,0x45,0x13,0x78,0xb9,0x00,0x14,0xc9,0x7e,0x22,0x51,
-    0xa9, 0xd8, 0x45, 0x13, 0x78, 0xb9, 0x00, 0x14, 0xc9, 0x7e, 0x22, 0x51,
+	0x86,0x67,0xb0,0x9f,0x26,0x11,0x23,0xc8,0x38,0xd7,0x70,0x1d,
-    0x86, 0x67, 0xb0, 0x9f, 0x26, 0x11, 0x23, 0xc8, 0x38, 0xd7, 0x70, 0x1d,
+	0x15,0x8e,0x4d,0x4f,0x95,0x97,0x40,0xa1,0xc2,0x7e,0x01,0x18,
-    0x15, 0x8e, 0x4d, 0x4f, 0x95, 0x97, 0x40, 0xa1, 0xc2, 0x7e, 0x01, 0x18,
+	0x72,0xf4,0x10,0xe6,0x8d,0x52,0x16,0x7f,0xf2,0xc9,0xf8,0x33,
-    0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
+	0x8b,0x33,0xb7,0xce,
-    0x8b, 0x33, 0xb7, 0xce,
+	};
-};
+static unsigned char dsa2048_p[]={
-
+	0xA0,0x25,0xFA,0xAD,0xF4,0x8E,0xB9,0xE5,0x99,0xF3,0x5D,0x6F,
-static unsigned char dsa2048_p[] = {
+	0x4F,0x83,0x34,0xE2,0x7E,0xCF,0x6F,0xBF,0x30,0xAF,0x6F,0x81,
-    0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
+	0xEB,0xF8,0xC4,0x13,0xD9,0xA0,0x5D,0x8B,0x5C,0x8E,0xDC,0xC2,
-    0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
+	0x1D,0x0B,0x41,0x32,0xB0,0x1F,0xFE,0xEF,0x0C,0xC2,0xA2,0x7E,
-    0xEB, 0xF8, 0xC4, 0x13, 0xD9, 0xA0, 0x5D, 0x8B, 0x5C, 0x8E, 0xDC, 0xC2,
+	0x68,0x5C,0x28,0x21,0xE9,0xF5,0xB1,0x58,0x12,0x63,0x4C,0x19,
-    0x1D, 0x0B, 0x41, 0x32, 0xB0, 0x1F, 0xFE, 0xEF, 0x0C, 0xC2, 0xA2, 0x7E,
+	0x4E,0xFF,0x02,0x4B,0x92,0xED,0xD2,0x07,0x11,0x4D,0x8C,0x58,
-    0x68, 0x5C, 0x28, 0x21, 0xE9, 0xF5, 0xB1, 0x58, 0x12, 0x63, 0x4C, 0x19,
+	0x16,0x5C,0x55,0x8E,0xAD,0xA3,0x67,0x7D,0xB9,0x86,0x6E,0x0B,
-    0x4E, 0xFF, 0x02, 0x4B, 0x92, 0xED, 0xD2, 0x07, 0x11, 0x4D, 0x8C, 0x58,
+	0xE6,0x54,0x6F,0x40,0xAE,0x0E,0x67,0x4C,0xF9,0x12,0x5B,0x3C,
-    0x16, 0x5C, 0x55, 0x8E, 0xAD, 0xA3, 0x67, 0x7D, 0xB9, 0x86, 0x6E, 0x0B,
+	0x08,0x7A,0xF7,0xFC,0x67,0x86,0x69,0xE7,0x0A,0x94,0x40,0xBF,
-    0xE6, 0x54, 0x6F, 0x40, 0xAE, 0x0E, 0x67, 0x4C, 0xF9, 0x12, 0x5B, 0x3C,
+	0x8B,0x76,0xFE,0x26,0xD1,0xF2,0xA1,0x1A,0x84,0xA1,0x43,0x56,
-    0x08, 0x7A, 0xF7, 0xFC, 0x67, 0x86, 0x69, 0xE7, 0x0A, 0x94, 0x40, 0xBF,
+	0x28,0xBC,0x9A,0x5F,0xD7,0x3B,0x69,0x89,0x8A,0x36,0x2C,0x51,
-    0x8B, 0x76, 0xFE, 0x26, 0xD1, 0xF2, 0xA1, 0x1A, 0x84, 0xA1, 0x43, 0x56,
+	0xDF,0x12,0x77,0x2F,0x57,0x7B,0xA0,0xAA,0xDD,0x7F,0xA1,0x62,
-    0x28, 0xBC, 0x9A, 0x5F, 0xD7, 0x3B, 0x69, 0x89, 0x8A, 0x36, 0x2C, 0x51,
+	0x3B,0x40,0x7B,0x68,0x1A,0x8F,0x0D,0x38,0xBB,0x21,0x5D,0x18,
-    0xDF, 0x12, 0x77, 0x2F, 0x57, 0x7B, 0xA0, 0xAA, 0xDD, 0x7F, 0xA1, 0x62,
+	0xFC,0x0F,0x46,0xF7,0xA3,0xB0,0x1D,0x23,0xC3,0xD2,0xC7,0x72,
-    0x3B, 0x40, 0x7B, 0x68, 0x1A, 0x8F, 0x0D, 0x38, 0xBB, 0x21, 0x5D, 0x18,
+	0x51,0x18,0xDF,0x46,0x95,0x79,0xD9,0xBD,0xB5,0x19,0x02,0x2C,
-    0xFC, 0x0F, 0x46, 0xF7, 0xA3, 0xB0, 0x1D, 0x23, 0xC3, 0xD2, 0xC7, 0x72,
+	0x87,0xDC,0xE7,0x57,0x82,0x7E,0xF1,0x8B,0x06,0x3D,0x00,0xA5,
-    0x51, 0x18, 0xDF, 0x46, 0x95, 0x79, 0xD9, 0xBD, 0xB5, 0x19, 0x02, 0x2C,
+	0x7B,0x6B,0x26,0x27,0x91,0x0F,0x6A,0x77,0xE4,0xD5,0x04,0xE4,
-    0x87, 0xDC, 0xE7, 0x57, 0x82, 0x7E, 0xF1, 0x8B, 0x06, 0x3D, 0x00, 0xA5,
+	0x12,0x2C,0x42,0xFF,0xD2,0x88,0xBB,0xD3,0x92,0xA0,0xF9,0xC8,
-    0x7B, 0x6B, 0x26, 0x27, 0x91, 0x0F, 0x6A, 0x77, 0xE4, 0xD5, 0x04, 0xE4,
+	0x51,0x64,0x14,0x5C,0xD8,0xF9,0x6C,0x47,0x82,0xB4,0x1C,0x7F,
-    0x12, 0x2C, 0x42, 0xFF, 0xD2, 0x88, 0xBB, 0xD3, 0x92, 0xA0, 0xF9, 0xC8,
+	0x09,0xB8,0xF0,0x25,0x83,0x1D,0x3F,0x3F,0x05,0xB3,0x21,0x0A,
-    0x51, 0x64, 0x14, 0x5C, 0xD8, 0xF9, 0x6C, 0x47, 0x82, 0xB4, 0x1C, 0x7F,
+	0x5D,0xA7,0xD8,0x54,0xC3,0x65,0x7D,0xC3,0xB0,0x1D,0xBF,0xAE,
-    0x09, 0xB8, 0xF0, 0x25, 0x83, 0x1D, 0x3F, 0x3F, 0x05, 0xB3, 0x21, 0x0A,
+	0xF8,0x68,0xCF,0x9B,
-    0x5D, 0xA7, 0xD8, 0x54, 0xC3, 0x65, 0x7D, 0xC3, 0xB0, 0x1D, 0xBF, 0xAE,
+	};
-    0xF8, 0x68, 0xCF, 0x9B,
+static unsigned char dsa2048_q[]={
-};
+	0x97,0xE7,0x33,0x4D,0xD3,0x94,0x3E,0x0B,0xDB,0x62,0x74,0xC6,
-
+	0xA1,0x08,0xDD,0x19,0xA3,0x75,0x17,0x1B,
-static unsigned char dsa2048_q[] = {
+	};
-    0x97, 0xE7, 0x33, 0x4D, 0xD3, 0x94, 0x3E, 0x0B, 0xDB, 0x62, 0x74, 0xC6,
+static unsigned char dsa2048_g[]={
-    0xA1, 0x08, 0xDD, 0x19, 0xA3, 0x75, 0x17, 0x1B,
+	0x2C,0x78,0x16,0x59,0x34,0x63,0xF4,0xF3,0x92,0xFC,0xB5,0xA5,
-};
+	0x4F,0x13,0xDE,0x2F,0x1C,0xA4,0x3C,0xAE,0xAD,0x38,0x3F,0x7E,
-
+	0x90,0xBF,0x96,0xA6,0xAE,0x25,0x90,0x72,0xF5,0x8E,0x80,0x0C,
-static unsigned char dsa2048_g[] = {
+	0x39,0x1C,0xD9,0xEC,0xBA,0x90,0x5B,0x3A,0xE8,0x58,0x6C,0x9E,
-    0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
+	0x30,0x42,0x37,0x02,0x31,0x82,0xBC,0x6A,0xDF,0x6A,0x09,0x29,
-    0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
+	0xE3,0xC0,0x46,0xD1,0xCB,0x85,0xEC,0x0C,0x30,0x5E,0xEA,0xC8,
-    0x90, 0xBF, 0x96, 0xA6, 0xAE, 0x25, 0x90, 0x72, 0xF5, 0x8E, 0x80, 0x0C,
+	0x39,0x8E,0x22,0x9F,0x22,0x10,0xD2,0x34,0x61,0x68,0x37,0x3D,
-    0x39, 0x1C, 0xD9, 0xEC, 0xBA, 0x90, 0x5B, 0x3A, 0xE8, 0x58, 0x6C, 0x9E,
+	0x2E,0x4A,0x5B,0x9A,0xF5,0xC1,0x48,0xC6,0xF6,0xDC,0x63,0x1A,
-    0x30, 0x42, 0x37, 0x02, 0x31, 0x82, 0xBC, 0x6A, 0xDF, 0x6A, 0x09, 0x29,
+	0xD3,0x96,0x64,0xBA,0x34,0xC9,0xD1,0xA0,0xD1,0xAE,0x6C,0x2F,
-    0xE3, 0xC0, 0x46, 0xD1, 0xCB, 0x85, 0xEC, 0x0C, 0x30, 0x5E, 0xEA, 0xC8,
+	0x48,0x17,0x93,0x14,0x43,0xED,0xF0,0x21,0x30,0x19,0xC3,0x1B,
-    0x39, 0x8E, 0x22, 0x9F, 0x22, 0x10, 0xD2, 0x34, 0x61, 0x68, 0x37, 0x3D,
+	0x5F,0xDE,0xA3,0xF0,0x70,0x78,0x18,0xE1,0xA8,0xE4,0xEE,0x2E,
-    0x2E, 0x4A, 0x5B, 0x9A, 0xF5, 0xC1, 0x48, 0xC6, 0xF6, 0xDC, 0x63, 0x1A,
+	0x00,0xA5,0xE4,0xB3,0x17,0xC8,0x0C,0x7D,0x6E,0x42,0xDC,0xB7,
-    0xD3, 0x96, 0x64, 0xBA, 0x34, 0xC9, 0xD1, 0xA0, 0xD1, 0xAE, 0x6C, 0x2F,
+	0x46,0x00,0x36,0x4D,0xD4,0x46,0xAA,0x3D,0x3C,0x46,0x89,0x40,
-    0x48, 0x17, 0x93, 0x14, 0x43, 0xED, 0xF0, 0x21, 0x30, 0x19, 0xC3, 0x1B,
+	0xBF,0x1D,0x84,0x77,0x0A,0x75,0xF3,0x87,0x1D,0x08,0x4C,0xA6,
-    0x5F, 0xDE, 0xA3, 0xF0, 0x70, 0x78, 0x18, 0xE1, 0xA8, 0xE4, 0xEE, 0x2E,
+	0xD1,0xA9,0x1C,0x1E,0x12,0x1E,0xE1,0xC7,0x30,0x28,0x76,0xA5,
-    0x00, 0xA5, 0xE4, 0xB3, 0x17, 0xC8, 0x0C, 0x7D, 0x6E, 0x42, 0xDC, 0xB7,
+	0x7F,0x6C,0x85,0x96,0x2B,0x6F,0xDB,0x80,0x66,0x26,0xAE,0xF5,
-    0x46, 0x00, 0x36, 0x4D, 0xD4, 0x46, 0xAA, 0x3D, 0x3C, 0x46, 0x89, 0x40,
+	0x93,0xC7,0x8E,0xAE,0x9A,0xED,0xE4,0xCA,0x04,0xEA,0x3B,0x72,
-    0xBF, 0x1D, 0x84, 0x77, 0x0A, 0x75, 0xF3, 0x87, 0x1D, 0x08, 0x4C, 0xA6,
+	0xEF,0xDC,0x87,0xED,0x0D,0xA5,0x4C,0x4A,0xDD,0x71,0x22,0x64,
-    0xD1, 0xA9, 0x1C, 0x1E, 0x12, 0x1E, 0xE1, 0xC7, 0x30, 0x28, 0x76, 0xA5,
+	0x59,0x69,0x4E,0x8E,0xBF,0x43,0xDC,0xAB,0x8E,0x66,0xBB,0x01,
-    0x7F, 0x6C, 0x85, 0x96, 0x2B, 0x6F, 0xDB, 0x80, 0x66, 0x26, 0xAE, 0xF5,
+	0xB6,0xF4,0xE7,0xFD,0xD2,0xAD,0x9F,0x36,0xC1,0xA0,0x29,0x99,
-    0x93, 0xC7, 0x8E, 0xAE, 0x9A, 0xED, 0xE4, 0xCA, 0x04, 0xEA, 0x3B, 0x72,
+	0xD1,0x96,0x70,0x59,0x06,0x78,0x35,0xBD,0x65,0x55,0x52,0x9E,
-    0xEF, 0xDC, 0x87, 0xED, 0x0D, 0xA5, 0x4C, 0x4A, 0xDD, 0x71, 0x22, 0x64,
+	0xF8,0xB2,0xE5,0x38,
-    0x59, 0x69, 0x4E, 0x8E, 0xBF, 0x43, 0xDC, 0xAB, 0x8E, 0x66, 0xBB, 0x01,
+	};
-    0xB6, 0xF4, 0xE7, 0xFD, 0xD2, 0xAD, 0x9F, 0x36, 0xC1, 0xA0, 0x29, 0x99,
-    0xD1, 0x96, 0x70, 0x59, 0x06, 0x78, 0x35, 0xBD, 0x65, 0x55, 0x52, 0x9E,
-    0xF8, 0xB2, 0xE5, 0x38,
-};
  
 DSA *get_dsa2048()
-{
+	{
 	DSA *dsa;
  
-    if ((dsa = DSA_new()) == NULL)
+	if ((dsa=DSA_new()) == NULL) return(NULL);
-        return (NULL);
+	dsa->priv_key=BN_bin2bn(dsa2048_priv,sizeof(dsa2048_priv),NULL);
-    dsa->priv_key = BN_bin2bn(dsa2048_priv, sizeof(dsa2048_priv), NULL);
+	dsa->pub_key=BN_bin2bn(dsa2048_pub,sizeof(dsa2048_pub),NULL);
-    dsa->pub_key = BN_bin2bn(dsa2048_pub, sizeof(dsa2048_pub), NULL);
+	dsa->p=BN_bin2bn(dsa2048_p,sizeof(dsa2048_p),NULL);
-    dsa->p = BN_bin2bn(dsa2048_p, sizeof(dsa2048_p), NULL);
+	dsa->q=BN_bin2bn(dsa2048_q,sizeof(dsa2048_q),NULL);
-    dsa->q = BN_bin2bn(dsa2048_q, sizeof(dsa2048_q), NULL);
+	dsa->g=BN_bin2bn(dsa2048_g,sizeof(dsa2048_g),NULL);
-    dsa->g = BN_bin2bn(dsa2048_g, sizeof(dsa2048_g), NULL);
+	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-    if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL)
+				(dsa->q == NULL) || (dsa->g == NULL))
-        || (dsa->q == NULL) || (dsa->g == NULL))
+		return(NULL);
-        return (NULL);
+	return(dsa);
-    return (dsa);
+	}
-}
 
-static const char rnd_seed[] =
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-    "string to make the random number generator think it has entropy";
 static int rnd_fake = 0;

apps/testrsa.h

@@ -57,462 +57,462 @@
  * [including the GNU Public Licence.]
  */
 
-static unsigned char test512[] = {
+static unsigned char test512[]={
-    0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00,
+	0x30,0x82,0x01,0x3a,0x02,0x01,0x00,0x02,0x41,0x00,
-    0xd6, 0x33, 0xb9, 0xc8, 0xfb, 0x4f, 0x3c, 0x7d, 0xc0, 0x01,
+	0xd6,0x33,0xb9,0xc8,0xfb,0x4f,0x3c,0x7d,0xc0,0x01,
-    0x86, 0xd0, 0xe7, 0xa0, 0x55, 0xf2, 0x95, 0x93, 0xcc, 0x4f,
+	0x86,0xd0,0xe7,0xa0,0x55,0xf2,0x95,0x93,0xcc,0x4f,
-    0xb7, 0x5b, 0x67, 0x5b, 0x94, 0x68, 0xc9, 0x34, 0x15, 0xde,
+	0xb7,0x5b,0x67,0x5b,0x94,0x68,0xc9,0x34,0x15,0xde,
-    0xa5, 0x2e, 0x1c, 0x33, 0xc2, 0x6e, 0xfc, 0x34, 0x5e, 0x71,
+	0xa5,0x2e,0x1c,0x33,0xc2,0x6e,0xfc,0x34,0x5e,0x71,
-    0x13, 0xb7, 0xd6, 0xee, 0xd8, 0xa5, 0x65, 0x05, 0x72, 0x87,
+	0x13,0xb7,0xd6,0xee,0xd8,0xa5,0x65,0x05,0x72,0x87,
-    0xa8, 0xb0, 0x77, 0xfe, 0x57, 0xf5, 0xfc, 0x5f, 0x55, 0x83,
+	0xa8,0xb0,0x77,0xfe,0x57,0xf5,0xfc,0x5f,0x55,0x83,
-    0x87, 0xdd, 0x57, 0x49, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+	0x87,0xdd,0x57,0x49,0x02,0x03,0x01,0x00,0x01,0x02,
-    0x41, 0x00, 0xa7, 0xf7, 0x91, 0xc5, 0x0f, 0x84, 0x57, 0xdc,
+	0x41,0x00,0xa7,0xf7,0x91,0xc5,0x0f,0x84,0x57,0xdc,
-    0x07, 0xf7, 0x6a, 0x7f, 0x60, 0x52, 0xb3, 0x72, 0xf1, 0x66,
+	0x07,0xf7,0x6a,0x7f,0x60,0x52,0xb3,0x72,0xf1,0x66,
-    0x1f, 0x7d, 0x97, 0x3b, 0x9e, 0xb6, 0x0a, 0x8f, 0x8c, 0xcf,
+	0x1f,0x7d,0x97,0x3b,0x9e,0xb6,0x0a,0x8f,0x8c,0xcf,
-    0x42, 0x23, 0x00, 0x04, 0xd4, 0x28, 0x0e, 0x1c, 0x90, 0xc4,
+	0x42,0x23,0x00,0x04,0xd4,0x28,0x0e,0x1c,0x90,0xc4,
-    0x11, 0x25, 0x25, 0xa5, 0x93, 0xa5, 0x2f, 0x70, 0x02, 0xdf,
+	0x11,0x25,0x25,0xa5,0x93,0xa5,0x2f,0x70,0x02,0xdf,
-    0x81, 0x9c, 0x49, 0x03, 0xa0, 0xf8, 0x6d, 0x54, 0x2e, 0x26,
+	0x81,0x9c,0x49,0x03,0xa0,0xf8,0x6d,0x54,0x2e,0x26,
-    0xde, 0xaa, 0x85, 0x59, 0xa8, 0x31, 0x02, 0x21, 0x00, 0xeb,
+	0xde,0xaa,0x85,0x59,0xa8,0x31,0x02,0x21,0x00,0xeb,
-    0x47, 0xd7, 0x3b, 0xf6, 0xc3, 0xdd, 0x5a, 0x46, 0xc5, 0xb9,
+	0x47,0xd7,0x3b,0xf6,0xc3,0xdd,0x5a,0x46,0xc5,0xb9,
-    0x2b, 0x9a, 0xa0, 0x09, 0x8f, 0xa6, 0xfb, 0xf3, 0x78, 0x7a,
+	0x2b,0x9a,0xa0,0x09,0x8f,0xa6,0xfb,0xf3,0x78,0x7a,
-    0x33, 0x70, 0x9d, 0x0f, 0x42, 0x6b, 0x13, 0x68, 0x24, 0xd3,
+	0x33,0x70,0x9d,0x0f,0x42,0x6b,0x13,0x68,0x24,0xd3,
-    0x15, 0x02, 0x21, 0x00, 0xe9, 0x10, 0xb0, 0xb3, 0x0d, 0xe2,
+	0x15,0x02,0x21,0x00,0xe9,0x10,0xb0,0xb3,0x0d,0xe2,
-    0x82, 0x68, 0x77, 0x8a, 0x6e, 0x7c, 0xda, 0xbc, 0x3e, 0x53,
+	0x82,0x68,0x77,0x8a,0x6e,0x7c,0xda,0xbc,0x3e,0x53,
-    0x83, 0xfb, 0xd6, 0x22, 0xe7, 0xb5, 0xae, 0x6e, 0x80, 0xda,
+	0x83,0xfb,0xd6,0x22,0xe7,0xb5,0xae,0x6e,0x80,0xda,
-    0x00, 0x55, 0x97, 0xc1, 0xd0, 0x65, 0x02, 0x20, 0x4c, 0xf8,
+	0x00,0x55,0x97,0xc1,0xd0,0x65,0x02,0x20,0x4c,0xf8,
-    0x73, 0xb1, 0x6a, 0x49, 0x29, 0x61, 0x1f, 0x46, 0x10, 0x0d,
+	0x73,0xb1,0x6a,0x49,0x29,0x61,0x1f,0x46,0x10,0x0d,
-    0xf3, 0xc7, 0xe7, 0x58, 0xd7, 0x88, 0x15, 0x5e, 0x94, 0x9b,
+	0xf3,0xc7,0xe7,0x58,0xd7,0x88,0x15,0x5e,0x94,0x9b,
-    0xbf, 0x7b, 0xa2, 0x42, 0x58, 0x45, 0x41, 0x0c, 0xcb, 0x01,
+	0xbf,0x7b,0xa2,0x42,0x58,0x45,0x41,0x0c,0xcb,0x01,
-    0x02, 0x20, 0x12, 0x11, 0xba, 0x31, 0x57, 0x9d, 0x3d, 0x11,
+	0x02,0x20,0x12,0x11,0xba,0x31,0x57,0x9d,0x3d,0x11,
-    0x0e, 0x5b, 0x8c, 0x2f, 0x5f, 0xe2, 0x02, 0x4f, 0x05, 0x47,
+	0x0e,0x5b,0x8c,0x2f,0x5f,0xe2,0x02,0x4f,0x05,0x47,
-    0x8c, 0x15, 0x8e, 0xb3, 0x56, 0x3f, 0xb8, 0xfb, 0xad, 0xd4,
+	0x8c,0x15,0x8e,0xb3,0x56,0x3f,0xb8,0xfb,0xad,0xd4,
-    0xf4, 0xfc, 0x10, 0xc5, 0x02, 0x20, 0x18, 0xa1, 0x29, 0x99,
+	0xf4,0xfc,0x10,0xc5,0x02,0x20,0x18,0xa1,0x29,0x99,
-    0x5b, 0xd9, 0xc8, 0xd4, 0xfc, 0x49, 0x7a, 0x2a, 0x21, 0x2c,
+	0x5b,0xd9,0xc8,0xd4,0xfc,0x49,0x7a,0x2a,0x21,0x2c,
-    0x49, 0xe4, 0x4f, 0xeb, 0xef, 0x51, 0xf1, 0xab, 0x6d, 0xfb,
+	0x49,0xe4,0x4f,0xeb,0xef,0x51,0xf1,0xab,0x6d,0xfb,
-    0x4b, 0x14, 0xe9, 0x4b, 0x52, 0xb5, 0x82, 0x2c,
+	0x4b,0x14,0xe9,0x4b,0x52,0xb5,0x82,0x2c,
-};
+	};
 
-static unsigned char test1024[] = {
+static unsigned char test1024[]={
-    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
+	0x30,0x82,0x02,0x5c,0x02,0x01,0x00,0x02,0x81,0x81,
-    0x00, 0xdc, 0x98, 0x43, 0xe8, 0x3d, 0x43, 0x5b, 0xe4, 0x05,
+	0x00,0xdc,0x98,0x43,0xe8,0x3d,0x43,0x5b,0xe4,0x05,
-    0xcd, 0xd0, 0xa9, 0x3e, 0xcb, 0x83, 0x75, 0xf6, 0xb5, 0xa5,
+	0xcd,0xd0,0xa9,0x3e,0xcb,0x83,0x75,0xf6,0xb5,0xa5,
-    0x9f, 0x6b, 0xe9, 0x34, 0x41, 0x29, 0x18, 0xfa, 0x6a, 0x55,
+	0x9f,0x6b,0xe9,0x34,0x41,0x29,0x18,0xfa,0x6a,0x55,
-    0x4d, 0x70, 0xfc, 0xec, 0xae, 0x87, 0x38, 0x0a, 0x20, 0xa9,
+	0x4d,0x70,0xfc,0xec,0xae,0x87,0x38,0x0a,0x20,0xa9,
-    0xc0, 0x45, 0x77, 0x6e, 0x57, 0x60, 0x57, 0xf4, 0xed, 0x96,
+	0xc0,0x45,0x77,0x6e,0x57,0x60,0x57,0xf4,0xed,0x96,
-    0x22, 0xcb, 0x8f, 0xe1, 0x33, 0x3a, 0x17, 0x1f, 0xed, 0x37,
+	0x22,0xcb,0x8f,0xe1,0x33,0x3a,0x17,0x1f,0xed,0x37,
-    0xa5, 0x6f, 0xeb, 0xa6, 0xbc, 0x12, 0x80, 0x1d, 0x53, 0xbd,
+	0xa5,0x6f,0xeb,0xa6,0xbc,0x12,0x80,0x1d,0x53,0xbd,
-    0x70, 0xeb, 0x21, 0x76, 0x3e, 0xc9, 0x2f, 0x1a, 0x45, 0x24,
+	0x70,0xeb,0x21,0x76,0x3e,0xc9,0x2f,0x1a,0x45,0x24,
-    0x82, 0xff, 0xcd, 0x59, 0x32, 0x06, 0x2e, 0x12, 0x3b, 0x23,
+	0x82,0xff,0xcd,0x59,0x32,0x06,0x2e,0x12,0x3b,0x23,
-    0x78, 0xed, 0x12, 0x3d, 0xe0, 0x8d, 0xf9, 0x67, 0x4f, 0x37,
+	0x78,0xed,0x12,0x3d,0xe0,0x8d,0xf9,0x67,0x4f,0x37,
-    0x4e, 0x47, 0x02, 0x4c, 0x2d, 0xc0, 0x4f, 0x1f, 0xb3, 0x94,
+	0x4e,0x47,0x02,0x4c,0x2d,0xc0,0x4f,0x1f,0xb3,0x94,
-    0xe1, 0x41, 0x2e, 0x2d, 0x90, 0x10, 0xfc, 0x82, 0x91, 0x8b,
+	0xe1,0x41,0x2e,0x2d,0x90,0x10,0xfc,0x82,0x91,0x8b,
-    0x0f, 0x22, 0xd4, 0xf2, 0xfc, 0x2c, 0xab, 0x53, 0x55, 0x02,
+	0x0f,0x22,0xd4,0xf2,0xfc,0x2c,0xab,0x53,0x55,0x02,
-    0x03, 0x01, 0x00, 0x01, 0x02, 0x81, 0x80, 0x2b, 0xcc, 0x3f,
+	0x03,0x01,0x00,0x01,0x02,0x81,0x80,0x2b,0xcc,0x3f,
-    0x8f, 0x58, 0xba, 0x8b, 0x00, 0x16, 0xf6, 0xea, 0x3a, 0xf0,
+	0x8f,0x58,0xba,0x8b,0x00,0x16,0xf6,0xea,0x3a,0xf0,
-    0x30, 0xd0, 0x05, 0x17, 0xda, 0xb0, 0xeb, 0x9a, 0x2d, 0x4f,
+	0x30,0xd0,0x05,0x17,0xda,0xb0,0xeb,0x9a,0x2d,0x4f,
-    0x26, 0xb0, 0xd6, 0x38, 0xc1, 0xeb, 0xf5, 0xd8, 0x3d, 0x1f,
+	0x26,0xb0,0xd6,0x38,0xc1,0xeb,0xf5,0xd8,0x3d,0x1f,
-    0x70, 0xf7, 0x7f, 0xf4, 0xe2, 0xcf, 0x51, 0x51, 0x79, 0x88,
+	0x70,0xf7,0x7f,0xf4,0xe2,0xcf,0x51,0x51,0x79,0x88,
-    0xfa, 0xe8, 0x32, 0x0e, 0x7b, 0x2d, 0x97, 0xf2, 0xfa, 0xba,
+	0xfa,0xe8,0x32,0x0e,0x7b,0x2d,0x97,0xf2,0xfa,0xba,
-    0x27, 0xc5, 0x9c, 0xd9, 0xc5, 0xeb, 0x8a, 0x79, 0x52, 0x3c,
+	0x27,0xc5,0x9c,0xd9,0xc5,0xeb,0x8a,0x79,0x52,0x3c,
-    0x64, 0x34, 0x7d, 0xc2, 0xcf, 0x28, 0xc7, 0x4e, 0xd5, 0x43,
+	0x64,0x34,0x7d,0xc2,0xcf,0x28,0xc7,0x4e,0xd5,0x43,
-    0x0b, 0xd1, 0xa6, 0xca, 0x6d, 0x03, 0x2d, 0x72, 0x23, 0xbc,
+	0x0b,0xd1,0xa6,0xca,0x6d,0x03,0x2d,0x72,0x23,0xbc,
-    0x6d, 0x05, 0xfa, 0x16, 0x09, 0x2f, 0x2e, 0x5c, 0xb6, 0xee,
+	0x6d,0x05,0xfa,0x16,0x09,0x2f,0x2e,0x5c,0xb6,0xee,
-    0x74, 0xdd, 0xd2, 0x48, 0x8e, 0x36, 0x0c, 0x06, 0x3d, 0x4d,
+	0x74,0xdd,0xd2,0x48,0x8e,0x36,0x0c,0x06,0x3d,0x4d,
-    0xe5, 0x10, 0x82, 0xeb, 0x6a, 0xf3, 0x4b, 0x9f, 0xd6, 0xed,
+	0xe5,0x10,0x82,0xeb,0x6a,0xf3,0x4b,0x9f,0xd6,0xed,
-    0x11, 0xb1, 0x6e, 0xec, 0xf4, 0xfe, 0x8e, 0x75, 0x94, 0x20,
+	0x11,0xb1,0x6e,0xec,0xf4,0xfe,0x8e,0x75,0x94,0x20,
-    0x2f, 0xcb, 0xac, 0x46, 0xf1, 0x02, 0x41, 0x00, 0xf9, 0x8c,
+	0x2f,0xcb,0xac,0x46,0xf1,0x02,0x41,0x00,0xf9,0x8c,
-    0xa3, 0x85, 0xb1, 0xdd, 0x29, 0xaf, 0x65, 0xc1, 0x33, 0xf3,
+	0xa3,0x85,0xb1,0xdd,0x29,0xaf,0x65,0xc1,0x33,0xf3,
-    0x95, 0xc5, 0x52, 0x68, 0x0b, 0xd4, 0xf1, 0xe5, 0x0e, 0x02,
+	0x95,0xc5,0x52,0x68,0x0b,0xd4,0xf1,0xe5,0x0e,0x02,
-    0x9f, 0x4f, 0xfa, 0x77, 0xdc, 0x46, 0x9e, 0xc7, 0xa6, 0xe4,
+	0x9f,0x4f,0xfa,0x77,0xdc,0x46,0x9e,0xc7,0xa6,0xe4,
-    0x16, 0x29, 0xda, 0xb0, 0x07, 0xcf, 0x5b, 0xa9, 0x12, 0x8a,
+	0x16,0x29,0xda,0xb0,0x07,0xcf,0x5b,0xa9,0x12,0x8a,
-    0xdd, 0x63, 0x0a, 0xde, 0x2e, 0x8c, 0x66, 0x8b, 0x8c, 0xdc,
+	0xdd,0x63,0x0a,0xde,0x2e,0x8c,0x66,0x8b,0x8c,0xdc,
-    0x19, 0xa3, 0x7e, 0xf4, 0x3b, 0xd0, 0x1a, 0x8c, 0xa4, 0xc2,
+	0x19,0xa3,0x7e,0xf4,0x3b,0xd0,0x1a,0x8c,0xa4,0xc2,
-    0xe1, 0xd3, 0x02, 0x41, 0x00, 0xe2, 0x4c, 0x05, 0xf2, 0x04,
+	0xe1,0xd3,0x02,0x41,0x00,0xe2,0x4c,0x05,0xf2,0x04,
-    0x86, 0x4e, 0x61, 0x43, 0xdb, 0xb0, 0xb9, 0x96, 0x86, 0x52,
+	0x86,0x4e,0x61,0x43,0xdb,0xb0,0xb9,0x96,0x86,0x52,
-    0x2c, 0xca, 0x8d, 0x7b, 0xab, 0x0b, 0x13, 0x0d, 0x7e, 0x38,
+	0x2c,0xca,0x8d,0x7b,0xab,0x0b,0x13,0x0d,0x7e,0x38,
-    0x5b, 0xe2, 0x2e, 0x7b, 0x0e, 0xe7, 0x19, 0x99, 0x38, 0xe7,
+	0x5b,0xe2,0x2e,0x7b,0x0e,0xe7,0x19,0x99,0x38,0xe7,
-    0xf2, 0x21, 0xbd, 0x85, 0x85, 0xe3, 0xfd, 0x28, 0x77, 0x20,
+	0xf2,0x21,0xbd,0x85,0x85,0xe3,0xfd,0x28,0x77,0x20,
-    0x31, 0x71, 0x2c, 0xd0, 0xff, 0xfb, 0x2e, 0xaf, 0x85, 0xb4,
+	0x31,0x71,0x2c,0xd0,0xff,0xfb,0x2e,0xaf,0x85,0xb4,
-    0x86, 0xca, 0xf3, 0xbb, 0xca, 0xaa, 0x0f, 0x95, 0x37, 0x02,
+	0x86,0xca,0xf3,0xbb,0xca,0xaa,0x0f,0x95,0x37,0x02,
-    0x40, 0x0e, 0x41, 0x9a, 0x95, 0xe8, 0xb3, 0x59, 0xce, 0x4b,
+	0x40,0x0e,0x41,0x9a,0x95,0xe8,0xb3,0x59,0xce,0x4b,
-    0x61, 0xde, 0x35, 0xec, 0x38, 0x79, 0x9c, 0xb8, 0x10, 0x52,
+	0x61,0xde,0x35,0xec,0x38,0x79,0x9c,0xb8,0x10,0x52,
-    0x41, 0x63, 0xab, 0x82, 0xae, 0x6f, 0x00, 0xa9, 0xf4, 0xde,
+	0x41,0x63,0xab,0x82,0xae,0x6f,0x00,0xa9,0xf4,0xde,
-    0xdd, 0x49, 0x0b, 0x7e, 0xb8, 0xa5, 0x65, 0xa9, 0x0c, 0x8f,
+	0xdd,0x49,0x0b,0x7e,0xb8,0xa5,0x65,0xa9,0x0c,0x8f,
-    0x8f, 0xf9, 0x1f, 0x35, 0xc6, 0x92, 0xb8, 0x5e, 0xb0, 0x66,
+	0x8f,0xf9,0x1f,0x35,0xc6,0x92,0xb8,0x5e,0xb0,0x66,
-    0xab, 0x52, 0x40, 0xc0, 0xb6, 0x36, 0x6a, 0x7d, 0x80, 0x46,
+	0xab,0x52,0x40,0xc0,0xb6,0x36,0x6a,0x7d,0x80,0x46,
-    0x04, 0x02, 0xe5, 0x9f, 0x41, 0x02, 0x41, 0x00, 0xc0, 0xad,
+	0x04,0x02,0xe5,0x9f,0x41,0x02,0x41,0x00,0xc0,0xad,
-    0xcc, 0x4e, 0x21, 0xee, 0x1d, 0x24, 0x91, 0xfb, 0xa7, 0x80,
+	0xcc,0x4e,0x21,0xee,0x1d,0x24,0x91,0xfb,0xa7,0x80,
-    0x8d, 0x9a, 0xb6, 0xb3, 0x2e, 0x8f, 0xc2, 0xe1, 0x82, 0xdf,
+	0x8d,0x9a,0xb6,0xb3,0x2e,0x8f,0xc2,0xe1,0x82,0xdf,
-    0x69, 0x18, 0xb4, 0x71, 0xff, 0xa6, 0x65, 0xde, 0xed, 0x84,
+	0x69,0x18,0xb4,0x71,0xff,0xa6,0x65,0xde,0xed,0x84,
-    0x8d, 0x42, 0xb7, 0xb3, 0x21, 0x69, 0x56, 0x1c, 0x07, 0x60,
+	0x8d,0x42,0xb7,0xb3,0x21,0x69,0x56,0x1c,0x07,0x60,
-    0x51, 0x29, 0x04, 0xff, 0x34, 0x06, 0xdd, 0xb9, 0x67, 0x2c,
+	0x51,0x29,0x04,0xff,0x34,0x06,0xdd,0xb9,0x67,0x2c,
-    0x7c, 0x04, 0x93, 0x0e, 0x46, 0x15, 0xbb, 0x2a, 0xb7, 0x1b,
+	0x7c,0x04,0x93,0x0e,0x46,0x15,0xbb,0x2a,0xb7,0x1b,
-    0xe7, 0x87, 0x02, 0x40, 0x78, 0xda, 0x5d, 0x07, 0x51, 0x0c,
+	0xe7,0x87,0x02,0x40,0x78,0xda,0x5d,0x07,0x51,0x0c,
-    0x16, 0x7a, 0x9f, 0x29, 0x20, 0x84, 0x0d, 0x42, 0xfa, 0xd7,
+	0x16,0x7a,0x9f,0x29,0x20,0x84,0x0d,0x42,0xfa,0xd7,
-    0x00, 0xd8, 0x77, 0x7e, 0xb0, 0xb0, 0x6b, 0xd6, 0x5b, 0x53,
+	0x00,0xd8,0x77,0x7e,0xb0,0xb0,0x6b,0xd6,0x5b,0x53,
-    0xb8, 0x9b, 0x7a, 0xcd, 0xc7, 0x2b, 0xb8, 0x6a, 0x63, 0xa9,
+	0xb8,0x9b,0x7a,0xcd,0xc7,0x2b,0xb8,0x6a,0x63,0xa9,
-    0xfb, 0x6f, 0xa4, 0x72, 0xbf, 0x4c, 0x5d, 0x00, 0x14, 0xba,
+	0xfb,0x6f,0xa4,0x72,0xbf,0x4c,0x5d,0x00,0x14,0xba,
-    0xfa, 0x59, 0x88, 0xed, 0xe4, 0xe0, 0x8c, 0xa2, 0xec, 0x14,
+	0xfa,0x59,0x88,0xed,0xe4,0xe0,0x8c,0xa2,0xec,0x14,
-    0x7e, 0x2d, 0xe2, 0xf0, 0x46, 0x49, 0x95, 0x45,
+	0x7e,0x2d,0xe2,0xf0,0x46,0x49,0x95,0x45,
-};
+	};
 
-static unsigned char test2048[] = {
+static unsigned char test2048[]={
-    0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
+	0x30,0x82,0x04,0xa3,0x02,0x01,0x00,0x02,0x82,0x01,
-    0x01, 0x00, 0xc0, 0xc0, 0xce, 0x3e, 0x3c, 0x53, 0x67, 0x3f,
+	0x01,0x00,0xc0,0xc0,0xce,0x3e,0x3c,0x53,0x67,0x3f,
-    0x4f, 0xc5, 0x2f, 0xa4, 0xc2, 0x5a, 0x2f, 0x58, 0xfd, 0x27,
+	0x4f,0xc5,0x2f,0xa4,0xc2,0x5a,0x2f,0x58,0xfd,0x27,
-    0x52, 0x6a, 0xe8, 0xcf, 0x4a, 0x73, 0x47, 0x8d, 0x25, 0x0f,
+	0x52,0x6a,0xe8,0xcf,0x4a,0x73,0x47,0x8d,0x25,0x0f,
-    0x5f, 0x03, 0x26, 0x78, 0xef, 0xf0, 0x22, 0x12, 0xd3, 0xde,
+	0x5f,0x03,0x26,0x78,0xef,0xf0,0x22,0x12,0xd3,0xde,
-    0x47, 0xb2, 0x1c, 0x0b, 0x38, 0x63, 0x1a, 0x6c, 0x85, 0x7a,
+	0x47,0xb2,0x1c,0x0b,0x38,0x63,0x1a,0x6c,0x85,0x7a,
-    0x80, 0xc6, 0x8f, 0xa0, 0x41, 0xaf, 0x62, 0xc4, 0x67, 0x32,
+	0x80,0xc6,0x8f,0xa0,0x41,0xaf,0x62,0xc4,0x67,0x32,
-    0x88, 0xf8, 0xa6, 0x9c, 0xf5, 0x23, 0x1d, 0xe4, 0xac, 0x3f,
+	0x88,0xf8,0xa6,0x9c,0xf5,0x23,0x1d,0xe4,0xac,0x3f,
-    0x29, 0xf9, 0xec, 0xe1, 0x8b, 0x26, 0x03, 0x2c, 0xb2, 0xab,
+	0x29,0xf9,0xec,0xe1,0x8b,0x26,0x03,0x2c,0xb2,0xab,
-    0xf3, 0x7d, 0xb5, 0xca, 0x49, 0xc0, 0x8f, 0x1c, 0xdf, 0x33,
+	0xf3,0x7d,0xb5,0xca,0x49,0xc0,0x8f,0x1c,0xdf,0x33,
-    0x3a, 0x60, 0xda, 0x3c, 0xb0, 0x16, 0xf8, 0xa9, 0x12, 0x8f,
+	0x3a,0x60,0xda,0x3c,0xb0,0x16,0xf8,0xa9,0x12,0x8f,
-    0x64, 0xac, 0x23, 0x0c, 0x69, 0x64, 0x97, 0x5d, 0x99, 0xd4,
+	0x64,0xac,0x23,0x0c,0x69,0x64,0x97,0x5d,0x99,0xd4,
-    0x09, 0x83, 0x9b, 0x61, 0xd3, 0xac, 0xf0, 0xde, 0xdd, 0x5e,
+	0x09,0x83,0x9b,0x61,0xd3,0xac,0xf0,0xde,0xdd,0x5e,
-    0x9f, 0x44, 0x94, 0xdb, 0x3a, 0x4d, 0x97, 0xe8, 0x52, 0x29,
+	0x9f,0x44,0x94,0xdb,0x3a,0x4d,0x97,0xe8,0x52,0x29,
-    0xf7, 0xdb, 0x94, 0x07, 0x45, 0x90, 0x78, 0x1e, 0x31, 0x0b,
+	0xf7,0xdb,0x94,0x07,0x45,0x90,0x78,0x1e,0x31,0x0b,
-    0x80, 0xf7, 0x57, 0xad, 0x1c, 0x79, 0xc5, 0xcb, 0x32, 0xb0,
+	0x80,0xf7,0x57,0xad,0x1c,0x79,0xc5,0xcb,0x32,0xb0,
-    0xce, 0xcd, 0x74, 0xb3, 0xe2, 0x94, 0xc5, 0x78, 0x2f, 0x34,
+	0xce,0xcd,0x74,0xb3,0xe2,0x94,0xc5,0x78,0x2f,0x34,
-    0x1a, 0x45, 0xf7, 0x8c, 0x52, 0xa5, 0xbc, 0x8d, 0xec, 0xd1,
+	0x1a,0x45,0xf7,0x8c,0x52,0xa5,0xbc,0x8d,0xec,0xd1,
-    0x2f, 0x31, 0x3b, 0xf0, 0x49, 0x59, 0x5e, 0x88, 0x9d, 0x15,
+	0x2f,0x31,0x3b,0xf0,0x49,0x59,0x5e,0x88,0x9d,0x15,
-    0x92, 0x35, 0x32, 0xc1, 0xe7, 0x61, 0xec, 0x50, 0x48, 0x7c,
+	0x92,0x35,0x32,0xc1,0xe7,0x61,0xec,0x50,0x48,0x7c,
-    0xba, 0x05, 0xf9, 0xf8, 0xf8, 0xa7, 0x8c, 0x83, 0xe8, 0x66,
+	0xba,0x05,0xf9,0xf8,0xf8,0xa7,0x8c,0x83,0xe8,0x66,
-    0x5b, 0xeb, 0xfe, 0xd8, 0x4f, 0xdd, 0x6d, 0x36, 0xc0, 0xb2,
+	0x5b,0xeb,0xfe,0xd8,0x4f,0xdd,0x6d,0x36,0xc0,0xb2,
-    0x90, 0x0f, 0xb8, 0x52, 0xf9, 0x04, 0x9b, 0x40, 0x2c, 0x27,
+	0x90,0x0f,0xb8,0x52,0xf9,0x04,0x9b,0x40,0x2c,0x27,
-    0xd6, 0x36, 0x8e, 0xc2, 0x1b, 0x44, 0xf3, 0x92, 0xd5, 0x15,
+	0xd6,0x36,0x8e,0xc2,0x1b,0x44,0xf3,0x92,0xd5,0x15,
-    0x9e, 0x9a, 0xbc, 0xf3, 0x7d, 0x03, 0xd7, 0x02, 0x14, 0x20,
+	0x9e,0x9a,0xbc,0xf3,0x7d,0x03,0xd7,0x02,0x14,0x20,
-    0xe9, 0x10, 0x92, 0xfd, 0xf9, 0xfc, 0x8f, 0xe5, 0x18, 0xe1,
+	0xe9,0x10,0x92,0xfd,0xf9,0xfc,0x8f,0xe5,0x18,0xe1,
-    0x95, 0xcc, 0x9e, 0x60, 0xa6, 0xfa, 0x38, 0x4d, 0x02, 0x03,
+	0x95,0xcc,0x9e,0x60,0xa6,0xfa,0x38,0x4d,0x02,0x03,
-    0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x00, 0xc3, 0xc3,
+	0x01,0x00,0x01,0x02,0x82,0x01,0x00,0x00,0xc3,0xc3,
-    0x0d, 0xb4, 0x27, 0x90, 0x8d, 0x4b, 0xbf, 0xb8, 0x84, 0xaa,
+	0x0d,0xb4,0x27,0x90,0x8d,0x4b,0xbf,0xb8,0x84,0xaa,
-    0xd0, 0xb8, 0xc7, 0x5d, 0x99, 0xbe, 0x55, 0xf6, 0x3e, 0x7c,
+	0xd0,0xb8,0xc7,0x5d,0x99,0xbe,0x55,0xf6,0x3e,0x7c,
-    0x49, 0x20, 0xcb, 0x8a, 0x8e, 0x19, 0x0e, 0x66, 0x24, 0xac,
+	0x49,0x20,0xcb,0x8a,0x8e,0x19,0x0e,0x66,0x24,0xac,
-    0xaf, 0x03, 0x33, 0x97, 0xeb, 0x95, 0xd5, 0x3b, 0x0f, 0x40,
+	0xaf,0x03,0x33,0x97,0xeb,0x95,0xd5,0x3b,0x0f,0x40,
-    0x56, 0x04, 0x50, 0xd1, 0xe6, 0xbe, 0x84, 0x0b, 0x25, 0xd3,
+	0x56,0x04,0x50,0xd1,0xe6,0xbe,0x84,0x0b,0x25,0xd3,
-    0x9c, 0xe2, 0x83, 0x6c, 0xf5, 0x62, 0x5d, 0xba, 0x2b, 0x7d,
+	0x9c,0xe2,0x83,0x6c,0xf5,0x62,0x5d,0xba,0x2b,0x7d,
-    0x3d, 0x7a, 0x6c, 0xe1, 0xd2, 0x0e, 0x54, 0x93, 0x80, 0x01,
+	0x3d,0x7a,0x6c,0xe1,0xd2,0x0e,0x54,0x93,0x80,0x01,
-    0x91, 0x51, 0x09, 0xe8, 0x5b, 0x8e, 0x47, 0xbd, 0x64, 0xe4,
+	0x91,0x51,0x09,0xe8,0x5b,0x8e,0x47,0xbd,0x64,0xe4,
-    0x0e, 0x03, 0x83, 0x55, 0xcf, 0x5a, 0x37, 0xf0, 0x25, 0xb5,
+	0x0e,0x03,0x83,0x55,0xcf,0x5a,0x37,0xf0,0x25,0xb5,
-    0x7d, 0x21, 0xd7, 0x69, 0xdf, 0x6f, 0xc2, 0xcf, 0x10, 0xc9,
+	0x7d,0x21,0xd7,0x69,0xdf,0x6f,0xc2,0xcf,0x10,0xc9,
-    0x8a, 0x40, 0x9f, 0x7a, 0x70, 0xc0, 0xe8, 0xe8, 0xc0, 0xe6,
+	0x8a,0x40,0x9f,0x7a,0x70,0xc0,0xe8,0xe8,0xc0,0xe6,
-    0x9a, 0x15, 0x0a, 0x8d, 0x4e, 0x46, 0xcb, 0x7a, 0xdb, 0xb3,
+	0x9a,0x15,0x0a,0x8d,0x4e,0x46,0xcb,0x7a,0xdb,0xb3,
-    0xcb, 0x83, 0x02, 0xc4, 0xf0, 0xab, 0xeb, 0x02, 0x01, 0x0e,
+	0xcb,0x83,0x02,0xc4,0xf0,0xab,0xeb,0x02,0x01,0x0e,
-    0x23, 0xfc, 0x1d, 0xc4, 0xbd, 0xd4, 0xaa, 0x5d, 0x31, 0x46,
+	0x23,0xfc,0x1d,0xc4,0xbd,0xd4,0xaa,0x5d,0x31,0x46,
-    0x99, 0xce, 0x9e, 0xf8, 0x04, 0x75, 0x10, 0x67, 0xc4, 0x53,
+	0x99,0xce,0x9e,0xf8,0x04,0x75,0x10,0x67,0xc4,0x53,
-    0x47, 0x44, 0xfa, 0xc2, 0x25, 0x73, 0x7e, 0xd0, 0x8e, 0x59,
+	0x47,0x44,0xfa,0xc2,0x25,0x73,0x7e,0xd0,0x8e,0x59,
-    0xd1, 0xb2, 0x5a, 0xf4, 0xc7, 0x18, 0x92, 0x2f, 0x39, 0xab,
+	0xd1,0xb2,0x5a,0xf4,0xc7,0x18,0x92,0x2f,0x39,0xab,
-    0xcd, 0xa3, 0xb5, 0xc2, 0xb9, 0xc7, 0xb9, 0x1b, 0x9f, 0x48,
+	0xcd,0xa3,0xb5,0xc2,0xb9,0xc7,0xb9,0x1b,0x9f,0x48,
-    0xfa, 0x13, 0xc6, 0x98, 0x4d, 0xca, 0x84, 0x9c, 0x06, 0xca,
+	0xfa,0x13,0xc6,0x98,0x4d,0xca,0x84,0x9c,0x06,0xca,
-    0xe7, 0x89, 0x01, 0x04, 0xc4, 0x6c, 0xfd, 0x29, 0x59, 0x35,
+	0xe7,0x89,0x01,0x04,0xc4,0x6c,0xfd,0x29,0x59,0x35,
-    0xe7, 0xf3, 0xdd, 0xce, 0x64, 0x59, 0xbf, 0x21, 0x13, 0xa9,
+	0xe7,0xf3,0xdd,0xce,0x64,0x59,0xbf,0x21,0x13,0xa9,
-    0x9f, 0x0e, 0xc5, 0xff, 0xbd, 0x33, 0x00, 0xec, 0xac, 0x6b,
+	0x9f,0x0e,0xc5,0xff,0xbd,0x33,0x00,0xec,0xac,0x6b,
-    0x11, 0xef, 0x51, 0x5e, 0xad, 0x07, 0x15, 0xde, 0xb8, 0x5f,
+	0x11,0xef,0x51,0x5e,0xad,0x07,0x15,0xde,0xb8,0x5f,
-    0xc6, 0xb9, 0xa3, 0x22, 0x65, 0x46, 0x83, 0x14, 0xdf, 0xd0,
+	0xc6,0xb9,0xa3,0x22,0x65,0x46,0x83,0x14,0xdf,0xd0,
-    0xf1, 0x44, 0x8a, 0xe1, 0x9c, 0x23, 0x33, 0xb4, 0x97, 0x33,
+	0xf1,0x44,0x8a,0xe1,0x9c,0x23,0x33,0xb4,0x97,0x33,
-    0xe6, 0x6b, 0x81, 0x02, 0x81, 0x81, 0x00, 0xec, 0x12, 0xa7,
+	0xe6,0x6b,0x81,0x02,0x81,0x81,0x00,0xec,0x12,0xa7,
-    0x59, 0x74, 0x6a, 0xde, 0x3e, 0xad, 0xd8, 0x36, 0x80, 0x50,
+	0x59,0x74,0x6a,0xde,0x3e,0xad,0xd8,0x36,0x80,0x50,
-    0xa2, 0xd5, 0x21, 0x81, 0x07, 0xf1, 0xd0, 0x91, 0xf2, 0x6c,
+	0xa2,0xd5,0x21,0x81,0x07,0xf1,0xd0,0x91,0xf2,0x6c,
-    0x12, 0x2f, 0x9d, 0x1a, 0x26, 0xf8, 0x30, 0x65, 0xdf, 0xe8,
+	0x12,0x2f,0x9d,0x1a,0x26,0xf8,0x30,0x65,0xdf,0xe8,
-    0xc0, 0x9b, 0x6a, 0x30, 0x98, 0x82, 0x87, 0xec, 0xa2, 0x56,
+	0xc0,0x9b,0x6a,0x30,0x98,0x82,0x87,0xec,0xa2,0x56,
-    0x87, 0x62, 0x6f, 0xe7, 0x9f, 0xf6, 0x56, 0xe6, 0x71, 0x8f,
+	0x87,0x62,0x6f,0xe7,0x9f,0xf6,0x56,0xe6,0x71,0x8f,
-    0x49, 0x86, 0x93, 0x5a, 0x4d, 0x34, 0x58, 0xfe, 0xd9, 0x04,
+	0x49,0x86,0x93,0x5a,0x4d,0x34,0x58,0xfe,0xd9,0x04,
-    0x13, 0xaf, 0x79, 0xb7, 0xad, 0x11, 0xd1, 0x30, 0x9a, 0x14,
+	0x13,0xaf,0x79,0xb7,0xad,0x11,0xd1,0x30,0x9a,0x14,
-    0x06, 0xa0, 0xfa, 0xb7, 0x55, 0xdc, 0x6c, 0x5a, 0x4c, 0x2c,
+	0x06,0xa0,0xfa,0xb7,0x55,0xdc,0x6c,0x5a,0x4c,0x2c,
-    0x59, 0x56, 0xf6, 0xe8, 0x9d, 0xaf, 0x0a, 0x78, 0x99, 0x06,
+	0x59,0x56,0xf6,0xe8,0x9d,0xaf,0x0a,0x78,0x99,0x06,
-    0x06, 0x9e, 0xe7, 0x9c, 0x51, 0x55, 0x43, 0xfc, 0x3b, 0x6c,
+	0x06,0x9e,0xe7,0x9c,0x51,0x55,0x43,0xfc,0x3b,0x6c,
-    0x0b, 0xbf, 0x2d, 0x41, 0xa7, 0xaf, 0xb7, 0xe0, 0xe8, 0x28,
+	0x0b,0xbf,0x2d,0x41,0xa7,0xaf,0xb7,0xe0,0xe8,0x28,
-    0x18, 0xb4, 0x13, 0xd1, 0xe6, 0x97, 0xd0, 0x9f, 0x6a, 0x80,
+	0x18,0xb4,0x13,0xd1,0xe6,0x97,0xd0,0x9f,0x6a,0x80,
-    0xca, 0xdd, 0x1a, 0x7e, 0x15, 0x02, 0x81, 0x81, 0x00, 0xd1,
+	0xca,0xdd,0x1a,0x7e,0x15,0x02,0x81,0x81,0x00,0xd1,
-    0x06, 0x0c, 0x1f, 0xe3, 0xd0, 0xab, 0xd6, 0xca, 0x7c, 0xbc,
+	0x06,0x0c,0x1f,0xe3,0xd0,0xab,0xd6,0xca,0x7c,0xbc,
-    0x7d, 0x13, 0x35, 0xce, 0x27, 0xcd, 0xd8, 0x49, 0x51, 0x63,
+	0x7d,0x13,0x35,0xce,0x27,0xcd,0xd8,0x49,0x51,0x63,
-    0x64, 0x0f, 0xca, 0x06, 0x12, 0xfc, 0x07, 0x3e, 0xaf, 0x61,
+	0x64,0x0f,0xca,0x06,0x12,0xfc,0x07,0x3e,0xaf,0x61,
-    0x6d, 0xe2, 0x53, 0x39, 0x27, 0xae, 0xc3, 0x11, 0x9e, 0x94,
+	0x6d,0xe2,0x53,0x39,0x27,0xae,0xc3,0x11,0x9e,0x94,
-    0x01, 0x4f, 0xe3, 0xf3, 0x67, 0xf9, 0x77, 0xf9, 0xe7, 0x95,
+	0x01,0x4f,0xe3,0xf3,0x67,0xf9,0x77,0xf9,0xe7,0x95,
-    0x3a, 0x6f, 0xe2, 0x20, 0x73, 0x3e, 0xa4, 0x7a, 0x28, 0xd4,
+	0x3a,0x6f,0xe2,0x20,0x73,0x3e,0xa4,0x7a,0x28,0xd4,
-    0x61, 0x97, 0xf6, 0x17, 0xa0, 0x23, 0x10, 0x2b, 0xce, 0x84,
+	0x61,0x97,0xf6,0x17,0xa0,0x23,0x10,0x2b,0xce,0x84,
-    0x57, 0x7e, 0x25, 0x1f, 0xf4, 0xa8, 0x54, 0xd2, 0x65, 0x94,
+	0x57,0x7e,0x25,0x1f,0xf4,0xa8,0x54,0xd2,0x65,0x94,
-    0xcc, 0x95, 0x0a, 0xab, 0x30, 0xc1, 0x59, 0x1f, 0x61, 0x8e,
+	0xcc,0x95,0x0a,0xab,0x30,0xc1,0x59,0x1f,0x61,0x8e,
-    0xb9, 0x6b, 0xd7, 0x4e, 0xb9, 0x83, 0x43, 0x79, 0x85, 0x11,
+	0xb9,0x6b,0xd7,0x4e,0xb9,0x83,0x43,0x79,0x85,0x11,
-    0xbc, 0x0f, 0xae, 0x25, 0x20, 0x05, 0xbc, 0xd2, 0x48, 0xa1,
+	0xbc,0x0f,0xae,0x25,0x20,0x05,0xbc,0xd2,0x48,0xa1,
-    0x68, 0x09, 0x84, 0xf6, 0x12, 0x9a, 0x66, 0xb9, 0x2b, 0xbb,
+	0x68,0x09,0x84,0xf6,0x12,0x9a,0x66,0xb9,0x2b,0xbb,
-    0x76, 0x03, 0x17, 0x46, 0x4e, 0x97, 0x59, 0x02, 0x81, 0x80,
+	0x76,0x03,0x17,0x46,0x4e,0x97,0x59,0x02,0x81,0x80,
-    0x09, 0x4c, 0xfa, 0xd6, 0xe5, 0x65, 0x48, 0x78, 0x43, 0xb5,
+	0x09,0x4c,0xfa,0xd6,0xe5,0x65,0x48,0x78,0x43,0xb5,
-    0x1f, 0x00, 0x93, 0x2c, 0xb7, 0x24, 0xe8, 0xc6, 0x7d, 0x5a,
+	0x1f,0x00,0x93,0x2c,0xb7,0x24,0xe8,0xc6,0x7d,0x5a,
-    0x70, 0x45, 0x92, 0xc8, 0x6c, 0xa3, 0xcd, 0xe1, 0xf7, 0x29,
+	0x70,0x45,0x92,0xc8,0x6c,0xa3,0xcd,0xe1,0xf7,0x29,
-    0x40, 0xfa, 0x3f, 0x5b, 0x47, 0x44, 0x39, 0xc1, 0xe8, 0x72,
+	0x40,0xfa,0x3f,0x5b,0x47,0x44,0x39,0xc1,0xe8,0x72,
-    0x9e, 0x7a, 0x0e, 0xda, 0xaa, 0xa0, 0x2a, 0x09, 0xfd, 0x54,
+	0x9e,0x7a,0x0e,0xda,0xaa,0xa0,0x2a,0x09,0xfd,0x54,
-    0x93, 0x23, 0xaa, 0x37, 0x85, 0x5b, 0xcc, 0xd4, 0xf9, 0xd8,
+	0x93,0x23,0xaa,0x37,0x85,0x5b,0xcc,0xd4,0xf9,0xd8,
-    0xff, 0xc1, 0x61, 0x0d, 0xbd, 0x7e, 0x18, 0x24, 0x73, 0x6d,
+	0xff,0xc1,0x61,0x0d,0xbd,0x7e,0x18,0x24,0x73,0x6d,
-    0x40, 0x72, 0xf1, 0x93, 0x09, 0x48, 0x97, 0x6c, 0x84, 0x90,
+	0x40,0x72,0xf1,0x93,0x09,0x48,0x97,0x6c,0x84,0x90,
-    0xa8, 0x46, 0x14, 0x01, 0x39, 0x11, 0xe5, 0x3c, 0x41, 0x27,
+	0xa8,0x46,0x14,0x01,0x39,0x11,0xe5,0x3c,0x41,0x27,
-    0x32, 0x75, 0x24, 0xed, 0xa1, 0xd9, 0x12, 0x29, 0x8a, 0x28,
+	0x32,0x75,0x24,0xed,0xa1,0xd9,0x12,0x29,0x8a,0x28,
-    0x71, 0x89, 0x8d, 0xca, 0x30, 0xb0, 0x01, 0xc4, 0x2f, 0x82,
+	0x71,0x89,0x8d,0xca,0x30,0xb0,0x01,0xc4,0x2f,0x82,
-    0x19, 0x14, 0x4c, 0x70, 0x1c, 0xb8, 0x23, 0x2e, 0xe8, 0x90,
+	0x19,0x14,0x4c,0x70,0x1c,0xb8,0x23,0x2e,0xe8,0x90,
-    0x49, 0x97, 0x92, 0x97, 0x6b, 0x7a, 0x9d, 0xb9, 0x02, 0x81,
+	0x49,0x97,0x92,0x97,0x6b,0x7a,0x9d,0xb9,0x02,0x81,
-    0x80, 0x0f, 0x0e, 0xa1, 0x76, 0xf6, 0xa1, 0x44, 0x8f, 0xaf,
+	0x80,0x0f,0x0e,0xa1,0x76,0xf6,0xa1,0x44,0x8f,0xaf,
-    0x7c, 0x76, 0xd3, 0x87, 0xbb, 0xbb, 0x83, 0x10, 0x88, 0x01,
+	0x7c,0x76,0xd3,0x87,0xbb,0xbb,0x83,0x10,0x88,0x01,
-    0x18, 0x14, 0xd1, 0xd3, 0x75, 0x59, 0x24, 0xaa, 0xf5, 0x16,
+	0x18,0x14,0xd1,0xd3,0x75,0x59,0x24,0xaa,0xf5,0x16,
-    0xa5, 0xe9, 0x9d, 0xd1, 0xcc, 0xee, 0xf4, 0x15, 0xd9, 0xc5,
+	0xa5,0xe9,0x9d,0xd1,0xcc,0xee,0xf4,0x15,0xd9,0xc5,
-    0x7e, 0x27, 0xe9, 0x44, 0x49, 0x06, 0x72, 0xb9, 0xfc, 0xd3,
+	0x7e,0x27,0xe9,0x44,0x49,0x06,0x72,0xb9,0xfc,0xd3,
-    0x8a, 0xc4, 0x2c, 0x36, 0x7d, 0x12, 0x9b, 0x5a, 0xaa, 0xdc,
+	0x8a,0xc4,0x2c,0x36,0x7d,0x12,0x9b,0x5a,0xaa,0xdc,
-    0x85, 0xee, 0x6e, 0xad, 0x54, 0xb3, 0xf4, 0xfc, 0x31, 0xa1,
+	0x85,0xee,0x6e,0xad,0x54,0xb3,0xf4,0xfc,0x31,0xa1,
-    0x06, 0x3a, 0x70, 0x57, 0x0c, 0xf3, 0x95, 0x5b, 0x3e, 0xe8,
+	0x06,0x3a,0x70,0x57,0x0c,0xf3,0x95,0x5b,0x3e,0xe8,
-    0xfd, 0x1a, 0x4f, 0xf6, 0x78, 0x93, 0x46, 0x6a, 0xd7, 0x31,
+	0xfd,0x1a,0x4f,0xf6,0x78,0x93,0x46,0x6a,0xd7,0x31,
-    0xb4, 0x84, 0x64, 0x85, 0x09, 0x38, 0x89, 0x92, 0x94, 0x1c,
+	0xb4,0x84,0x64,0x85,0x09,0x38,0x89,0x92,0x94,0x1c,
-    0xbf, 0xe2, 0x3c, 0x2a, 0xe0, 0xff, 0x99, 0xa3, 0xf0, 0x2b,
+	0xbf,0xe2,0x3c,0x2a,0xe0,0xff,0x99,0xa3,0xf0,0x2b,
-    0x31, 0xc2, 0x36, 0xcd, 0x60, 0xbf, 0x9d, 0x2d, 0x74, 0x32,
+	0x31,0xc2,0x36,0xcd,0x60,0xbf,0x9d,0x2d,0x74,0x32,
-    0xe8, 0x9c, 0x93, 0x6e, 0xbb, 0x91, 0x7b, 0xfd, 0xd9, 0x02,
+	0xe8,0x9c,0x93,0x6e,0xbb,0x91,0x7b,0xfd,0xd9,0x02,
-    0x81, 0x81, 0x00, 0xa2, 0x71, 0x25, 0x38, 0xeb, 0x2a, 0xe9,
+	0x81,0x81,0x00,0xa2,0x71,0x25,0x38,0xeb,0x2a,0xe9,
-    0x37, 0xcd, 0xfe, 0x44, 0xce, 0x90, 0x3f, 0x52, 0x87, 0x84,
+	0x37,0xcd,0xfe,0x44,0xce,0x90,0x3f,0x52,0x87,0x84,
-    0x52, 0x1b, 0xae, 0x8d, 0x22, 0x94, 0xce, 0x38, 0xe6, 0x04,
+	0x52,0x1b,0xae,0x8d,0x22,0x94,0xce,0x38,0xe6,0x04,
-    0x88, 0x76, 0x85, 0x9a, 0xd3, 0x14, 0x09, 0xe5, 0x69, 0x9a,
+	0x88,0x76,0x85,0x9a,0xd3,0x14,0x09,0xe5,0x69,0x9a,
-    0xff, 0x58, 0x92, 0x02, 0x6a, 0x7d, 0x7c, 0x1e, 0x2c, 0xfd,
+	0xff,0x58,0x92,0x02,0x6a,0x7d,0x7c,0x1e,0x2c,0xfd,
-    0xa8, 0xca, 0x32, 0x14, 0x4f, 0x0d, 0x84, 0x0d, 0x37, 0x43,
+	0xa8,0xca,0x32,0x14,0x4f,0x0d,0x84,0x0d,0x37,0x43,
-    0xbf, 0xe4, 0x5d, 0x12, 0xc8, 0x24, 0x91, 0x27, 0x8d, 0x46,
+	0xbf,0xe4,0x5d,0x12,0xc8,0x24,0x91,0x27,0x8d,0x46,
-    0xd9, 0x54, 0x53, 0xe7, 0x62, 0x71, 0xa8, 0x2b, 0x71, 0x41,
+	0xd9,0x54,0x53,0xe7,0x62,0x71,0xa8,0x2b,0x71,0x41,
-    0x8d, 0x75, 0xf8, 0x3a, 0xa0, 0x61, 0x29, 0x46, 0xa6, 0xe5,
+	0x8d,0x75,0xf8,0x3a,0xa0,0x61,0x29,0x46,0xa6,0xe5,
-    0x82, 0xfa, 0x3a, 0xd9, 0x08, 0xfa, 0xfc, 0x63, 0xfd, 0x6b,
+	0x82,0xfa,0x3a,0xd9,0x08,0xfa,0xfc,0x63,0xfd,0x6b,
-    0x30, 0xbc, 0xf4, 0x4e, 0x9e, 0x8c, 0x25, 0x0c, 0xb6, 0x55,
+	0x30,0xbc,0xf4,0x4e,0x9e,0x8c,0x25,0x0c,0xb6,0x55,
-    0xe7, 0x3c, 0xd4, 0x4e, 0x0b, 0xfd, 0x8b, 0xc3, 0x0e, 0x1d,
+	0xe7,0x3c,0xd4,0x4e,0x0b,0xfd,0x8b,0xc3,0x0e,0x1d,
-    0x9c, 0x44, 0x57, 0x8f, 0x1f, 0x86, 0xf7, 0xd5, 0x1b, 0xe4,
+	0x9c,0x44,0x57,0x8f,0x1f,0x86,0xf7,0xd5,0x1b,0xe4,
 	0x95,
-};
+	};
 
-static unsigned char test4096[] = {
+static unsigned char test4096[]={
-    0x30, 0x82, 0x09, 0x29, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02,
+	0x30,0x82,0x09,0x29,0x02,0x01,0x00,0x02,0x82,0x02,
-    0x01, 0x00, 0xc0, 0x71, 0xac, 0x1a, 0x13, 0x88, 0x82, 0x43,
+	0x01,0x00,0xc0,0x71,0xac,0x1a,0x13,0x88,0x82,0x43,
-    0x3b, 0x51, 0x57, 0x71, 0x8d, 0xb6, 0x2b, 0x82, 0x65, 0x21,
+	0x3b,0x51,0x57,0x71,0x8d,0xb6,0x2b,0x82,0x65,0x21,
-    0x53, 0x5f, 0x28, 0x29, 0x4f, 0x8d, 0x7c, 0x8a, 0xb9, 0x44,
+	0x53,0x5f,0x28,0x29,0x4f,0x8d,0x7c,0x8a,0xb9,0x44,
-    0xb3, 0x28, 0x41, 0x4f, 0xd3, 0xfa, 0x6a, 0xf8, 0xb9, 0x28,
+	0xb3,0x28,0x41,0x4f,0xd3,0xfa,0x6a,0xf8,0xb9,0x28,
-    0x50, 0x39, 0x67, 0x53, 0x2c, 0x3c, 0xd7, 0xcb, 0x96, 0x41,
+	0x50,0x39,0x67,0x53,0x2c,0x3c,0xd7,0xcb,0x96,0x41,
-    0x40, 0x32, 0xbb, 0xeb, 0x70, 0xae, 0x1f, 0xb0, 0x65, 0xf7,
+	0x40,0x32,0xbb,0xeb,0x70,0xae,0x1f,0xb0,0x65,0xf7,
-    0x3a, 0xd9, 0x22, 0xfd, 0x10, 0xae, 0xbd, 0x02, 0xe2, 0xdd,
+	0x3a,0xd9,0x22,0xfd,0x10,0xae,0xbd,0x02,0xe2,0xdd,
-    0xf3, 0xc2, 0x79, 0x3c, 0xc6, 0xfc, 0x75, 0xbb, 0xaf, 0x4e,
+	0xf3,0xc2,0x79,0x3c,0xc6,0xfc,0x75,0xbb,0xaf,0x4e,
-    0x3a, 0x36, 0xc2, 0x4f, 0xea, 0x25, 0xdf, 0x13, 0x16, 0x4b,
+	0x3a,0x36,0xc2,0x4f,0xea,0x25,0xdf,0x13,0x16,0x4b,
-    0x20, 0xfe, 0x4b, 0x69, 0x16, 0xc4, 0x7f, 0x1a, 0x43, 0xa6,
+	0x20,0xfe,0x4b,0x69,0x16,0xc4,0x7f,0x1a,0x43,0xa6,
-    0x17, 0x1b, 0xb9, 0x0a, 0xf3, 0x09, 0x86, 0x28, 0x89, 0xcf,
+	0x17,0x1b,0xb9,0x0a,0xf3,0x09,0x86,0x28,0x89,0xcf,
-    0x2c, 0xd0, 0xd4, 0x81, 0xaf, 0xc6, 0x6d, 0xe6, 0x21, 0x8d,
+	0x2c,0xd0,0xd4,0x81,0xaf,0xc6,0x6d,0xe6,0x21,0x8d,
-    0xee, 0xef, 0xea, 0xdc, 0xb7, 0xc6, 0x3b, 0x63, 0x9f, 0x0e,
+	0xee,0xef,0xea,0xdc,0xb7,0xc6,0x3b,0x63,0x9f,0x0e,
-    0xad, 0x89, 0x78, 0x23, 0x18, 0xbf, 0x70, 0x7e, 0x84, 0xe0,
+	0xad,0x89,0x78,0x23,0x18,0xbf,0x70,0x7e,0x84,0xe0,
-    0x37, 0xec, 0xdb, 0x8e, 0x9c, 0x3e, 0x6a, 0x19, 0xcc, 0x99,
+	0x37,0xec,0xdb,0x8e,0x9c,0x3e,0x6a,0x19,0xcc,0x99,
-    0x72, 0xe6, 0xb5, 0x7d, 0x6d, 0xfa, 0xe5, 0xd3, 0xe4, 0x90,
+	0x72,0xe6,0xb5,0x7d,0x6d,0xfa,0xe5,0xd3,0xe4,0x90,
-    0xb5, 0xb2, 0xb2, 0x12, 0x70, 0x4e, 0xca, 0xf8, 0x10, 0xf8,
+	0xb5,0xb2,0xb2,0x12,0x70,0x4e,0xca,0xf8,0x10,0xf8,
-    0xa3, 0x14, 0xc2, 0x48, 0x19, 0xeb, 0x60, 0x99, 0xbb, 0x2a,
+	0xa3,0x14,0xc2,0x48,0x19,0xeb,0x60,0x99,0xbb,0x2a,
-    0x1f, 0xb1, 0x7a, 0xb1, 0x3d, 0x24, 0xfb, 0xa0, 0x29, 0xda,
+	0x1f,0xb1,0x7a,0xb1,0x3d,0x24,0xfb,0xa0,0x29,0xda,
-    0xbd, 0x1b, 0xd7, 0xa4, 0xbf, 0xef, 0x60, 0x2d, 0x22, 0xca,
+	0xbd,0x1b,0xd7,0xa4,0xbf,0xef,0x60,0x2d,0x22,0xca,
-    0x65, 0x98, 0xf1, 0xc4, 0xe1, 0xc9, 0x02, 0x6b, 0x16, 0x28,
+	0x65,0x98,0xf1,0xc4,0xe1,0xc9,0x02,0x6b,0x16,0x28,
-    0x2f, 0xa1, 0xaa, 0x79, 0x00, 0xda, 0xdc, 0x7c, 0x43, 0xf7,
+	0x2f,0xa1,0xaa,0x79,0x00,0xda,0xdc,0x7c,0x43,0xf7,
-    0x42, 0x3c, 0xa0, 0xef, 0x68, 0xf7, 0xdf, 0xb9, 0x69, 0xfb,
+	0x42,0x3c,0xa0,0xef,0x68,0xf7,0xdf,0xb9,0x69,0xfb,
-    0x8e, 0x01, 0xed, 0x01, 0x42, 0xb5, 0x4e, 0x57, 0xa6, 0x26,
+	0x8e,0x01,0xed,0x01,0x42,0xb5,0x4e,0x57,0xa6,0x26,
-    0xb8, 0xd0, 0x7b, 0x56, 0x6d, 0x03, 0xc6, 0x40, 0x8c, 0x8c,
+	0xb8,0xd0,0x7b,0x56,0x6d,0x03,0xc6,0x40,0x8c,0x8c,
-    0x2a, 0x55, 0xd7, 0x9c, 0x35, 0x00, 0x94, 0x93, 0xec, 0x03,
+	0x2a,0x55,0xd7,0x9c,0x35,0x00,0x94,0x93,0xec,0x03,
-    0xeb, 0x22, 0xef, 0x77, 0xbb, 0x79, 0x13, 0x3f, 0x15, 0xa1,
+	0xeb,0x22,0xef,0x77,0xbb,0x79,0x13,0x3f,0x15,0xa1,
-    0x8f, 0xca, 0xdf, 0xfd, 0xd3, 0xb8, 0xe1, 0xd4, 0xcc, 0x09,
+	0x8f,0xca,0xdf,0xfd,0xd3,0xb8,0xe1,0xd4,0xcc,0x09,
-    0x3f, 0x3c, 0x2c, 0xdb, 0xd1, 0x49, 0x7f, 0x38, 0x07, 0x83,
+	0x3f,0x3c,0x2c,0xdb,0xd1,0x49,0x7f,0x38,0x07,0x83,
-    0x6d, 0xeb, 0x08, 0x66, 0xe9, 0x06, 0x44, 0x12, 0xac, 0x95,
+	0x6d,0xeb,0x08,0x66,0xe9,0x06,0x44,0x12,0xac,0x95,
-    0x22, 0x90, 0x23, 0x67, 0xd4, 0x08, 0xcc, 0xf4, 0xb7, 0xdc,
+	0x22,0x90,0x23,0x67,0xd4,0x08,0xcc,0xf4,0xb7,0xdc,
-    0xcc, 0x87, 0xd4, 0xac, 0x69, 0x35, 0x4c, 0xb5, 0x39, 0x36,
+	0xcc,0x87,0xd4,0xac,0x69,0x35,0x4c,0xb5,0x39,0x36,
-    0xcd, 0xa4, 0xd2, 0x95, 0xca, 0x0d, 0xc5, 0xda, 0xc2, 0xc5,
+	0xcd,0xa4,0xd2,0x95,0xca,0x0d,0xc5,0xda,0xc2,0xc5,
-    0x22, 0x32, 0x28, 0x08, 0xe3, 0xd2, 0x8b, 0x38, 0x30, 0xdc,
+	0x22,0x32,0x28,0x08,0xe3,0xd2,0x8b,0x38,0x30,0xdc,
-    0x8c, 0x75, 0x4f, 0x6a, 0xec, 0x7a, 0xac, 0x16, 0x3e, 0xa8,
+	0x8c,0x75,0x4f,0x6a,0xec,0x7a,0xac,0x16,0x3e,0xa8,
-    0xd4, 0x6a, 0x45, 0xe1, 0xa8, 0x4f, 0x2e, 0x80, 0x34, 0xaa,
+	0xd4,0x6a,0x45,0xe1,0xa8,0x4f,0x2e,0x80,0x34,0xaa,
-    0x54, 0x1b, 0x02, 0x95, 0x7d, 0x8a, 0x6d, 0xcc, 0x79, 0xca,
+	0x54,0x1b,0x02,0x95,0x7d,0x8a,0x6d,0xcc,0x79,0xca,
-    0xf2, 0xa4, 0x2e, 0x8d, 0xfb, 0xfe, 0x15, 0x51, 0x10, 0x0e,
+	0xf2,0xa4,0x2e,0x8d,0xfb,0xfe,0x15,0x51,0x10,0x0e,
-    0x4d, 0x88, 0xb1, 0xc7, 0xf4, 0x79, 0xdb, 0xf0, 0xb4, 0x56,
+	0x4d,0x88,0xb1,0xc7,0xf4,0x79,0xdb,0xf0,0xb4,0x56,
-    0x44, 0x37, 0xca, 0x5a, 0xc1, 0x8c, 0x48, 0xac, 0xae, 0x48,
+	0x44,0x37,0xca,0x5a,0xc1,0x8c,0x48,0xac,0xae,0x48,
-    0x80, 0x83, 0x01, 0x3f, 0xde, 0xd9, 0xd3, 0x2c, 0x51, 0x46,
+	0x80,0x83,0x01,0x3f,0xde,0xd9,0xd3,0x2c,0x51,0x46,
-    0xb1, 0x41, 0xb6, 0xc6, 0x91, 0x72, 0xf9, 0x83, 0x55, 0x1b,
+	0xb1,0x41,0xb6,0xc6,0x91,0x72,0xf9,0x83,0x55,0x1b,
-    0x8c, 0xba, 0xf3, 0x73, 0xe5, 0x2c, 0x74, 0x50, 0x3a, 0xbe,
+	0x8c,0xba,0xf3,0x73,0xe5,0x2c,0x74,0x50,0x3a,0xbe,
-    0xc5, 0x2f, 0xa7, 0xb2, 0x6d, 0x8c, 0x9e, 0x13, 0x77, 0xa3,
+	0xc5,0x2f,0xa7,0xb2,0x6d,0x8c,0x9e,0x13,0x77,0xa3,
-    0x13, 0xcd, 0x6d, 0x8c, 0x45, 0xe1, 0xfc, 0x0b, 0xb7, 0x69,
+	0x13,0xcd,0x6d,0x8c,0x45,0xe1,0xfc,0x0b,0xb7,0x69,
-    0xe9, 0x27, 0xbc, 0x65, 0xc3, 0xfa, 0x9b, 0xd0, 0xef, 0xfe,
+	0xe9,0x27,0xbc,0x65,0xc3,0xfa,0x9b,0xd0,0xef,0xfe,
-    0xe8, 0x1f, 0xb3, 0x5e, 0x34, 0xf4, 0x8c, 0xea, 0xfc, 0xd3,
+	0xe8,0x1f,0xb3,0x5e,0x34,0xf4,0x8c,0xea,0xfc,0xd3,
-    0x81, 0xbf, 0x3d, 0x30, 0xb2, 0xb4, 0x01, 0xe8, 0x43, 0x0f,
+	0x81,0xbf,0x3d,0x30,0xb2,0xb4,0x01,0xe8,0x43,0x0f,
-    0xba, 0x02, 0x23, 0x42, 0x76, 0x82, 0x31, 0x73, 0x91, 0xed,
+	0xba,0x02,0x23,0x42,0x76,0x82,0x31,0x73,0x91,0xed,
-    0x07, 0x46, 0x61, 0x0d, 0x39, 0x83, 0x40, 0xce, 0x7a, 0xd4,
+	0x07,0x46,0x61,0x0d,0x39,0x83,0x40,0xce,0x7a,0xd4,
-    0xdb, 0x80, 0x2c, 0x1f, 0x0d, 0xd1, 0x34, 0xd4, 0x92, 0xe3,
+	0xdb,0x80,0x2c,0x1f,0x0d,0xd1,0x34,0xd4,0x92,0xe3,
-    0xd4, 0xf1, 0xc2, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+	0xd4,0xf1,0xc2,0x01,0x02,0x03,0x01,0x00,0x01,0x02,
-    0x82, 0x02, 0x01, 0x00, 0x97, 0x6c, 0xda, 0x6e, 0xea, 0x4f,
+	0x82,0x02,0x01,0x00,0x97,0x6c,0xda,0x6e,0xea,0x4f,
-    0xcf, 0xaf, 0xf7, 0x4c, 0xd9, 0xf1, 0x90, 0x00, 0x77, 0xdb,
+	0xcf,0xaf,0xf7,0x4c,0xd9,0xf1,0x90,0x00,0x77,0xdb,
-    0xf2, 0x97, 0x76, 0x72, 0xb9, 0xb7, 0x47, 0xd1, 0x9c, 0xdd,
+	0xf2,0x97,0x76,0x72,0xb9,0xb7,0x47,0xd1,0x9c,0xdd,
-    0xcb, 0x4a, 0x33, 0x6e, 0xc9, 0x75, 0x76, 0xe6, 0xe4, 0xa5,
+	0xcb,0x4a,0x33,0x6e,0xc9,0x75,0x76,0xe6,0xe4,0xa5,
-    0x31, 0x8c, 0x77, 0x13, 0xb4, 0x29, 0xcd, 0xf5, 0x52, 0x17,
+	0x31,0x8c,0x77,0x13,0xb4,0x29,0xcd,0xf5,0x52,0x17,
-    0xef, 0xf3, 0x08, 0x00, 0xe3, 0xbd, 0x2e, 0xbc, 0xd4, 0x52,
+	0xef,0xf3,0x08,0x00,0xe3,0xbd,0x2e,0xbc,0xd4,0x52,
-    0x88, 0xe9, 0x30, 0x75, 0x0b, 0x02, 0xf5, 0xcd, 0x89, 0x0c,
+	0x88,0xe9,0x30,0x75,0x0b,0x02,0xf5,0xcd,0x89,0x0c,
-    0x6c, 0x57, 0x19, 0x27, 0x3d, 0x1e, 0x85, 0xb4, 0xc1, 0x2f,
+	0x6c,0x57,0x19,0x27,0x3d,0x1e,0x85,0xb4,0xc1,0x2f,
-    0x1d, 0x92, 0x00, 0x5c, 0x76, 0x29, 0x4b, 0xa4, 0xe1, 0x12,
+	0x1d,0x92,0x00,0x5c,0x76,0x29,0x4b,0xa4,0xe1,0x12,
-    0xb3, 0xc8, 0x09, 0xfe, 0x0e, 0x78, 0x72, 0x61, 0xcb, 0x61,
+	0xb3,0xc8,0x09,0xfe,0x0e,0x78,0x72,0x61,0xcb,0x61,
-    0x6f, 0x39, 0x91, 0x95, 0x4e, 0xd5, 0x3e, 0xc7, 0x8f, 0xb8,
+	0x6f,0x39,0x91,0x95,0x4e,0xd5,0x3e,0xc7,0x8f,0xb8,
-    0xf6, 0x36, 0xfe, 0x9c, 0x93, 0x9a, 0x38, 0x25, 0x7a, 0xf4,
+	0xf6,0x36,0xfe,0x9c,0x93,0x9a,0x38,0x25,0x7a,0xf4,
-    0x4a, 0x12, 0xd4, 0xa0, 0x13, 0xbd, 0xf9, 0x1d, 0x12, 0x3e,
+	0x4a,0x12,0xd4,0xa0,0x13,0xbd,0xf9,0x1d,0x12,0x3e,
-    0x21, 0x39, 0xfb, 0x72, 0xe0, 0x05, 0x3d, 0xc3, 0xe5, 0x50,
+	0x21,0x39,0xfb,0x72,0xe0,0x05,0x3d,0xc3,0xe5,0x50,
-    0xa8, 0x5d, 0x85, 0xa3, 0xea, 0x5f, 0x1c, 0xb2, 0x3f, 0xea,
+	0xa8,0x5d,0x85,0xa3,0xea,0x5f,0x1c,0xb2,0x3f,0xea,
-    0x6d, 0x03, 0x91, 0x55, 0xd8, 0x19, 0x0a, 0x21, 0x12, 0x16,
+	0x6d,0x03,0x91,0x55,0xd8,0x19,0x0a,0x21,0x12,0x16,
-    0xd9, 0x12, 0xc4, 0xe6, 0x07, 0x18, 0x5b, 0x26, 0xa4, 0xae,
+	0xd9,0x12,0xc4,0xe6,0x07,0x18,0x5b,0x26,0xa4,0xae,
-    0xed, 0x2b, 0xb7, 0xa6, 0xed, 0xf8, 0xad, 0xec, 0x77, 0xe6,
+	0xed,0x2b,0xb7,0xa6,0xed,0xf8,0xad,0xec,0x77,0xe6,
-    0x7f, 0x4f, 0x76, 0x00, 0xc0, 0xfa, 0x15, 0x92, 0xb4, 0x2c,
+	0x7f,0x4f,0x76,0x00,0xc0,0xfa,0x15,0x92,0xb4,0x2c,
-    0x22, 0xc2, 0xeb, 0x6a, 0xad, 0x14, 0x05, 0xb2, 0xe5, 0x8a,
+	0x22,0xc2,0xeb,0x6a,0xad,0x14,0x05,0xb2,0xe5,0x8a,
-    0x9e, 0x85, 0x83, 0xcc, 0x04, 0xf1, 0x56, 0x78, 0x44, 0x5e,
+	0x9e,0x85,0x83,0xcc,0x04,0xf1,0x56,0x78,0x44,0x5e,
-    0xde, 0xe0, 0x60, 0x1a, 0x65, 0x79, 0x31, 0x23, 0x05, 0xbb,
+	0xde,0xe0,0x60,0x1a,0x65,0x79,0x31,0x23,0x05,0xbb,
-    0x01, 0xff, 0xdd, 0x2e, 0xb7, 0xb3, 0xaa, 0x74, 0xe0, 0xa5,
+	0x01,0xff,0xdd,0x2e,0xb7,0xb3,0xaa,0x74,0xe0,0xa5,
-    0x94, 0xaf, 0x4b, 0xde, 0x58, 0x0f, 0x55, 0xde, 0x33, 0xf6,
+	0x94,0xaf,0x4b,0xde,0x58,0x0f,0x55,0xde,0x33,0xf6,
-    0xe3, 0xd6, 0x34, 0x36, 0x57, 0xd6, 0x79, 0x91, 0x2e, 0xbe,
+	0xe3,0xd6,0x34,0x36,0x57,0xd6,0x79,0x91,0x2e,0xbe,
-    0x3b, 0xd9, 0x4e, 0xb6, 0x9d, 0x21, 0x5c, 0xd3, 0x48, 0x14,
+	0x3b,0xd9,0x4e,0xb6,0x9d,0x21,0x5c,0xd3,0x48,0x14,
-    0x7f, 0x4a, 0xc4, 0x60, 0xa9, 0x29, 0xf8, 0x53, 0x7f, 0x88,
+	0x7f,0x4a,0xc4,0x60,0xa9,0x29,0xf8,0x53,0x7f,0x88,
-    0x11, 0x2d, 0xb5, 0xc5, 0x2d, 0x6f, 0xee, 0x85, 0x0b, 0xf7,
+	0x11,0x2d,0xb5,0xc5,0x2d,0x6f,0xee,0x85,0x0b,0xf7,
-    0x8d, 0x9a, 0xbe, 0xb0, 0x42, 0xf2, 0x2e, 0x71, 0xaf, 0x19,
+	0x8d,0x9a,0xbe,0xb0,0x42,0xf2,0x2e,0x71,0xaf,0x19,
-    0x31, 0x6d, 0xec, 0xcd, 0x6f, 0x2b, 0x23, 0xdf, 0xb4, 0x40,
+	0x31,0x6d,0xec,0xcd,0x6f,0x2b,0x23,0xdf,0xb4,0x40,
-    0xaf, 0x2c, 0x0a, 0xc3, 0x1b, 0x7d, 0x7d, 0x03, 0x1d, 0x4b,
+	0xaf,0x2c,0x0a,0xc3,0x1b,0x7d,0x7d,0x03,0x1d,0x4b,
-    0xf3, 0xb5, 0xe0, 0x85, 0xd8, 0xdf, 0x91, 0x6b, 0x0a, 0x69,
+	0xf3,0xb5,0xe0,0x85,0xd8,0xdf,0x91,0x6b,0x0a,0x69,
-    0xf7, 0xf2, 0x69, 0x66, 0x5b, 0xf1, 0xcf, 0x46, 0x7d, 0xe9,
+	0xf7,0xf2,0x69,0x66,0x5b,0xf1,0xcf,0x46,0x7d,0xe9,
-    0x70, 0xfa, 0x6d, 0x7e, 0x75, 0x4e, 0xa9, 0x77, 0xe6, 0x8c,
+	0x70,0xfa,0x6d,0x7e,0x75,0x4e,0xa9,0x77,0xe6,0x8c,
-    0x02, 0xf7, 0x14, 0x4d, 0xa5, 0x41, 0x8f, 0x3f, 0xc1, 0x62,
+	0x02,0xf7,0x14,0x4d,0xa5,0x41,0x8f,0x3f,0xc1,0x62,
-    0x1e, 0x71, 0x5e, 0x38, 0xb4, 0xd6, 0xe6, 0xe1, 0x4b, 0xc2,
+	0x1e,0x71,0x5e,0x38,0xb4,0xd6,0xe6,0xe1,0x4b,0xc2,
-    0x2c, 0x30, 0x83, 0x81, 0x6f, 0x49, 0x2e, 0x96, 0xe6, 0xc9,
+	0x2c,0x30,0x83,0x81,0x6f,0x49,0x2e,0x96,0xe6,0xc9,
-    0x9a, 0xf7, 0x5d, 0x09, 0xa0, 0x55, 0x02, 0xa5, 0x3a, 0x25,
+	0x9a,0xf7,0x5d,0x09,0xa0,0x55,0x02,0xa5,0x3a,0x25,
-    0x23, 0xd0, 0x92, 0xc3, 0xa3, 0xe3, 0x0e, 0x12, 0x2f, 0x4d,
+	0x23,0xd0,0x92,0xc3,0xa3,0xe3,0x0e,0x12,0x2f,0x4d,
-    0xef, 0xf3, 0x55, 0x5a, 0xbe, 0xe6, 0x19, 0x86, 0x31, 0xab,
+	0xef,0xf3,0x55,0x5a,0xbe,0xe6,0x19,0x86,0x31,0xab,
-    0x75, 0x9a, 0xd3, 0xf0, 0x2c, 0xc5, 0x41, 0x92, 0xd9, 0x1f,
+	0x75,0x9a,0xd3,0xf0,0x2c,0xc5,0x41,0x92,0xd9,0x1f,
-    0x5f, 0x11, 0x8c, 0x75, 0x1c, 0x63, 0xd0, 0x02, 0x80, 0x2c,
+	0x5f,0x11,0x8c,0x75,0x1c,0x63,0xd0,0x02,0x80,0x2c,
-    0x68, 0xcb, 0x93, 0xfb, 0x51, 0x73, 0x49, 0xb4, 0x60, 0xda,
+	0x68,0xcb,0x93,0xfb,0x51,0x73,0x49,0xb4,0x60,0xda,
-    0xe2, 0x26, 0xaf, 0xa9, 0x46, 0x12, 0xb8, 0xec, 0x50, 0xdd,
+	0xe2,0x26,0xaf,0xa9,0x46,0x12,0xb8,0xec,0x50,0xdd,
-    0x12, 0x06, 0x5f, 0xce, 0x59, 0xe6, 0xf6, 0x1c, 0xe0, 0x54,
+	0x12,0x06,0x5f,0xce,0x59,0xe6,0xf6,0x1c,0xe0,0x54,
-    0x10, 0xad, 0xf6, 0xcd, 0x98, 0xcc, 0x0f, 0xfb, 0xcb, 0x41,
+	0x10,0xad,0xf6,0xcd,0x98,0xcc,0x0f,0xfb,0xcb,0x41,
-    0x14, 0x9d, 0xed, 0xe4, 0xb4, 0x74, 0x5f, 0x09, 0x60, 0xc7,
+	0x14,0x9d,0xed,0xe4,0xb4,0x74,0x5f,0x09,0x60,0xc7,
-    0x12, 0xf6, 0x7b, 0x3c, 0x8f, 0xa7, 0x20, 0xbc, 0xe4, 0xb1,
+	0x12,0xf6,0x7b,0x3c,0x8f,0xa7,0x20,0xbc,0xe4,0xb1,
-    0xef, 0xeb, 0xa4, 0x93, 0xc5, 0x06, 0xca, 0x9a, 0x27, 0x9d,
+	0xef,0xeb,0xa4,0x93,0xc5,0x06,0xca,0x9a,0x27,0x9d,
-    0x87, 0xf3, 0xde, 0xca, 0xe5, 0xe7, 0xf6, 0x1c, 0x01, 0x65,
+	0x87,0xf3,0xde,0xca,0xe5,0xe7,0xf6,0x1c,0x01,0x65,
-    0x5b, 0xfb, 0x19, 0x79, 0x6e, 0x08, 0x26, 0xc5, 0xc8, 0x28,
+	0x5b,0xfb,0x19,0x79,0x6e,0x08,0x26,0xc5,0xc8,0x28,
-    0x0e, 0xb6, 0x3b, 0x07, 0x08, 0xc1, 0x02, 0x82, 0x01, 0x01,
+	0x0e,0xb6,0x3b,0x07,0x08,0xc1,0x02,0x82,0x01,0x01,
-    0x00, 0xe8, 0x1c, 0x73, 0xa6, 0xb8, 0xe0, 0x0e, 0x6d, 0x8d,
+	0x00,0xe8,0x1c,0x73,0xa6,0xb8,0xe0,0x0e,0x6d,0x8d,
-    0x1b, 0xb9, 0x53, 0xed, 0x58, 0x94, 0xe6, 0x1d, 0x60, 0x14,
+	0x1b,0xb9,0x53,0xed,0x58,0x94,0xe6,0x1d,0x60,0x14,
-    0x5c, 0x76, 0x43, 0xc4, 0x58, 0x19, 0xc4, 0x24, 0xe8, 0xbc,
+	0x5c,0x76,0x43,0xc4,0x58,0x19,0xc4,0x24,0xe8,0xbc,
-    0x1b, 0x3b, 0x0b, 0x13, 0x24, 0x45, 0x54, 0x0e, 0xcc, 0x37,
+	0x1b,0x3b,0x0b,0x13,0x24,0x45,0x54,0x0e,0xcc,0x37,
-    0xf0, 0xe0, 0x63, 0x7d, 0xc3, 0xf7, 0xfb, 0x81, 0x74, 0x81,
+	0xf0,0xe0,0x63,0x7d,0xc3,0xf7,0xfb,0x81,0x74,0x81,
-    0xc4, 0x0f, 0x1a, 0x21, 0x48, 0xaf, 0xce, 0xc1, 0xc4, 0x94,
+	0xc4,0x0f,0x1a,0x21,0x48,0xaf,0xce,0xc1,0xc4,0x94,
-    0x18, 0x06, 0x44, 0x8d, 0xd3, 0xd2, 0x22, 0x2d, 0x2d, 0x3e,
+	0x18,0x06,0x44,0x8d,0xd3,0xd2,0x22,0x2d,0x2d,0x3e,
-    0x5a, 0x31, 0xdc, 0x95, 0x8e, 0xf4, 0x41, 0xfc, 0x58, 0xc9,
+	0x5a,0x31,0xdc,0x95,0x8e,0xf4,0x41,0xfc,0x58,0xc9,
-    0x40, 0x92, 0x17, 0x5f, 0xe3, 0xda, 0xac, 0x9e, 0x3f, 0x1c,
+	0x40,0x92,0x17,0x5f,0xe3,0xda,0xac,0x9e,0x3f,0x1c,
-    0x2a, 0x6b, 0x58, 0x5f, 0x48, 0x78, 0x20, 0xb1, 0xaf, 0x24,
+	0x2a,0x6b,0x58,0x5f,0x48,0x78,0x20,0xb1,0xaf,0x24,
-    0x9b, 0x3c, 0x20, 0x8b, 0x93, 0x25, 0x9e, 0xe6, 0x6b, 0xbc,
+	0x9b,0x3c,0x20,0x8b,0x93,0x25,0x9e,0xe6,0x6b,0xbc,
-    0x13, 0x42, 0x14, 0x6c, 0x36, 0x31, 0xff, 0x7a, 0xd1, 0xc1,
+	0x13,0x42,0x14,0x6c,0x36,0x31,0xff,0x7a,0xd1,0xc1,
-    0x1a, 0x26, 0x14, 0x7f, 0xa9, 0x76, 0xa7, 0x0c, 0xf8, 0xcc,
+	0x1a,0x26,0x14,0x7f,0xa9,0x76,0xa7,0x0c,0xf8,0xcc,
-    0xed, 0x07, 0x6a, 0xd2, 0xdf, 0x62, 0xee, 0x0a, 0x7c, 0x84,
+	0xed,0x07,0x6a,0xd2,0xdf,0x62,0xee,0x0a,0x7c,0x84,
-    0xcb, 0x49, 0x90, 0xb2, 0x03, 0x0d, 0xa2, 0x82, 0x06, 0x77,
+	0xcb,0x49,0x90,0xb2,0x03,0x0d,0xa2,0x82,0x06,0x77,
-    0xf1, 0xcd, 0x67, 0xf2, 0x47, 0x21, 0x02, 0x3f, 0x43, 0x21,
+	0xf1,0xcd,0x67,0xf2,0x47,0x21,0x02,0x3f,0x43,0x21,
-    0xf0, 0x46, 0x30, 0x62, 0x51, 0x72, 0xb1, 0xe7, 0x48, 0xc6,
+	0xf0,0x46,0x30,0x62,0x51,0x72,0xb1,0xe7,0x48,0xc6,
-    0x67, 0x12, 0xcd, 0x9e, 0xd6, 0x15, 0xe5, 0x21, 0xed, 0xfa,
+	0x67,0x12,0xcd,0x9e,0xd6,0x15,0xe5,0x21,0xed,0xfa,
-    0x8f, 0x30, 0xa6, 0x41, 0xfe, 0xb6, 0xfa, 0x8f, 0x34, 0x14,
+	0x8f,0x30,0xa6,0x41,0xfe,0xb6,0xfa,0x8f,0x34,0x14,
-    0x19, 0xe8, 0x11, 0xf7, 0xa5, 0x77, 0x3e, 0xb7, 0xf9, 0x39,
+	0x19,0xe8,0x11,0xf7,0xa5,0x77,0x3e,0xb7,0xf9,0x39,
-    0x07, 0x8c, 0x67, 0x2a, 0xab, 0x7b, 0x08, 0xf8, 0xb0, 0x06,
+	0x07,0x8c,0x67,0x2a,0xab,0x7b,0x08,0xf8,0xb0,0x06,
-    0xa8, 0xea, 0x2f, 0x8f, 0xfa, 0xcc, 0xcc, 0x40, 0xce, 0xf3,
+	0xa8,0xea,0x2f,0x8f,0xfa,0xcc,0xcc,0x40,0xce,0xf3,
-    0x70, 0x4f, 0x3f, 0x7f, 0xe2, 0x0c, 0xea, 0x76, 0x4a, 0x35,
+	0x70,0x4f,0x3f,0x7f,0xe2,0x0c,0xea,0x76,0x4a,0x35,
-    0x4e, 0x47, 0xad, 0x2b, 0xa7, 0x97, 0x5d, 0x74, 0x43, 0x97,
+	0x4e,0x47,0xad,0x2b,0xa7,0x97,0x5d,0x74,0x43,0x97,
-    0x90, 0xd2, 0xfb, 0xd9, 0xf9, 0x96, 0x01, 0x33, 0x05, 0xed,
+	0x90,0xd2,0xfb,0xd9,0xf9,0x96,0x01,0x33,0x05,0xed,
-    0x7b, 0x03, 0x05, 0xad, 0xf8, 0x49, 0x03, 0x02, 0x82, 0x01,
+	0x7b,0x03,0x05,0xad,0xf8,0x49,0x03,0x02,0x82,0x01,
-    0x01, 0x00, 0xd4, 0x40, 0x17, 0x66, 0x10, 0x92, 0x95, 0xc8,
+	0x01,0x00,0xd4,0x40,0x17,0x66,0x10,0x92,0x95,0xc8,
-    0xec, 0x62, 0xa9, 0x7a, 0xcb, 0x93, 0x8e, 0xe6, 0x53, 0xd4,
+	0xec,0x62,0xa9,0x7a,0xcb,0x93,0x8e,0xe6,0x53,0xd4,
-    0x80, 0x48, 0x27, 0x4b, 0x41, 0xce, 0x61, 0xdf, 0xbf, 0x94,
+	0x80,0x48,0x27,0x4b,0x41,0xce,0x61,0xdf,0xbf,0x94,
-    0xa4, 0x3d, 0x71, 0x03, 0x0b, 0xed, 0x25, 0x71, 0x98, 0xa4,
+	0xa4,0x3d,0x71,0x03,0x0b,0xed,0x25,0x71,0x98,0xa4,
-    0xd6, 0xd5, 0x4a, 0x57, 0xf5, 0x6c, 0x1b, 0xda, 0x21, 0x7d,
+	0xd6,0xd5,0x4a,0x57,0xf5,0x6c,0x1b,0xda,0x21,0x7d,
-    0x35, 0x45, 0xb3, 0xf3, 0x6a, 0xd9, 0xd3, 0x43, 0xe8, 0x5c,
+	0x35,0x45,0xb3,0xf3,0x6a,0xd9,0xd3,0x43,0xe8,0x5c,
-    0x54, 0x1c, 0x83, 0x1b, 0xb4, 0x5f, 0xf2, 0x97, 0x24, 0x2e,
+	0x54,0x1c,0x83,0x1b,0xb4,0x5f,0xf2,0x97,0x24,0x2e,
-    0xdc, 0x40, 0xde, 0x92, 0x23, 0x59, 0x8e, 0xbc, 0xd2, 0xa1,
+	0xdc,0x40,0xde,0x92,0x23,0x59,0x8e,0xbc,0xd2,0xa1,
-    0xf2, 0xe0, 0x4c, 0xdd, 0x0b, 0xd1, 0xe7, 0xae, 0x65, 0xbc,
+	0xf2,0xe0,0x4c,0xdd,0x0b,0xd1,0xe7,0xae,0x65,0xbc,
-    0xb5, 0xf5, 0x5b, 0x98, 0xe9, 0xd7, 0xc2, 0xb7, 0x0e, 0x55,
+	0xb5,0xf5,0x5b,0x98,0xe9,0xd7,0xc2,0xb7,0x0e,0x55,
-    0x71, 0x0e, 0x3c, 0x0a, 0x24, 0x6b, 0xa6, 0xe6, 0x14, 0x61,
+	0x71,0x0e,0x3c,0x0a,0x24,0x6b,0xa6,0xe6,0x14,0x61,
-    0x11, 0xfd, 0x33, 0x42, 0x99, 0x2b, 0x84, 0x77, 0x74, 0x92,
+	0x11,0xfd,0x33,0x42,0x99,0x2b,0x84,0x77,0x74,0x92,
-    0x91, 0xf5, 0x79, 0x79, 0xcf, 0xad, 0x8e, 0x04, 0xef, 0x80,
+	0x91,0xf5,0x79,0x79,0xcf,0xad,0x8e,0x04,0xef,0x80,
-    0x1e, 0x57, 0xf4, 0x14, 0xf5, 0x35, 0x09, 0x74, 0xb2, 0x13,
+	0x1e,0x57,0xf4,0x14,0xf5,0x35,0x09,0x74,0xb2,0x13,
-    0x71, 0x58, 0x6b, 0xea, 0x32, 0x5d, 0xf3, 0xd3, 0x76, 0x48,
+	0x71,0x58,0x6b,0xea,0x32,0x5d,0xf3,0xd3,0x76,0x48,
-    0x39, 0x10, 0x23, 0x84, 0x9d, 0xbe, 0x92, 0x77, 0x4a, 0xed,
+	0x39,0x10,0x23,0x84,0x9d,0xbe,0x92,0x77,0x4a,0xed,
-    0x70, 0x3e, 0x1a, 0xa2, 0x6c, 0xb3, 0x81, 0x00, 0xc3, 0xc9,
+	0x70,0x3e,0x1a,0xa2,0x6c,0xb3,0x81,0x00,0xc3,0xc9,
-    0xe4, 0x52, 0xc8, 0x24, 0x88, 0x0c, 0x41, 0xad, 0x87, 0x5a,
+	0xe4,0x52,0xc8,0x24,0x88,0x0c,0x41,0xad,0x87,0x5a,
-    0xea, 0xa3, 0x7a, 0x85, 0x1c, 0x5e, 0x31, 0x7f, 0xc3, 0x35,
+	0xea,0xa3,0x7a,0x85,0x1c,0x5e,0x31,0x7f,0xc3,0x35,
-    0xc6, 0xfa, 0x10, 0xc8, 0x75, 0x10, 0xc4, 0x96, 0x99, 0xe7,
+	0xc6,0xfa,0x10,0xc8,0x75,0x10,0xc4,0x96,0x99,0xe7,
-    0xfe, 0x01, 0xb4, 0x74, 0xdb, 0xb4, 0x11, 0xc3, 0xc8, 0x8c,
+	0xfe,0x01,0xb4,0x74,0xdb,0xb4,0x11,0xc3,0xc8,0x8c,
-    0xf6, 0xf7, 0x3b, 0x66, 0x50, 0xfc, 0xdb, 0xeb, 0xca, 0x47,
+	0xf6,0xf7,0x3b,0x66,0x50,0xfc,0xdb,0xeb,0xca,0x47,
-    0x85, 0x89, 0xe1, 0x65, 0xd9, 0x62, 0x34, 0x3c, 0x70, 0xd8,
+	0x85,0x89,0xe1,0x65,0xd9,0x62,0x34,0x3c,0x70,0xd8,
-    0x2e, 0xb4, 0x2f, 0x65, 0x3c, 0x4a, 0xa6, 0x2a, 0xe7, 0xc7,
+	0x2e,0xb4,0x2f,0x65,0x3c,0x4a,0xa6,0x2a,0xe7,0xc7,
-    0xd8, 0x41, 0x8f, 0x8a, 0x43, 0xbf, 0x42, 0xf2, 0x4d, 0xbc,
+	0xd8,0x41,0x8f,0x8a,0x43,0xbf,0x42,0xf2,0x4d,0xbc,
-    0xfc, 0x9e, 0x27, 0x95, 0xfb, 0x75, 0xff, 0xab, 0x02, 0x82,
+	0xfc,0x9e,0x27,0x95,0xfb,0x75,0xff,0xab,0x02,0x82,
-    0x01, 0x00, 0x41, 0x2f, 0x44, 0x57, 0x6d, 0x12, 0x17, 0x5b,
+	0x01,0x00,0x41,0x2f,0x44,0x57,0x6d,0x12,0x17,0x5b,
-    0x32, 0xc6, 0xb7, 0x6c, 0x57, 0x7a, 0x8a, 0x0e, 0x79, 0xef,
+	0x32,0xc6,0xb7,0x6c,0x57,0x7a,0x8a,0x0e,0x79,0xef,
-    0x72, 0xa8, 0x68, 0xda, 0x2d, 0x38, 0xe4, 0xbb, 0x8d, 0xf6,
+	0x72,0xa8,0x68,0xda,0x2d,0x38,0xe4,0xbb,0x8d,0xf6,
-    0x02, 0x65, 0xcf, 0x56, 0x13, 0xe1, 0x1a, 0xcb, 0x39, 0x80,
+	0x02,0x65,0xcf,0x56,0x13,0xe1,0x1a,0xcb,0x39,0x80,
-    0xa6, 0xb1, 0x32, 0x03, 0x1e, 0xdd, 0xbb, 0x35, 0xd9, 0xac,
+	0xa6,0xb1,0x32,0x03,0x1e,0xdd,0xbb,0x35,0xd9,0xac,
-    0x43, 0x89, 0x31, 0x08, 0x90, 0x92, 0x5e, 0x35, 0x3d, 0x7b,
+	0x43,0x89,0x31,0x08,0x90,0x92,0x5e,0x35,0x3d,0x7b,
-    0x9c, 0x6f, 0x86, 0xcb, 0x17, 0xdd, 0x85, 0xe4, 0xed, 0x35,
+	0x9c,0x6f,0x86,0xcb,0x17,0xdd,0x85,0xe4,0xed,0x35,
-    0x08, 0x8e, 0xc1, 0xf4, 0x05, 0xd8, 0x68, 0xc6, 0x63, 0x3c,
+	0x08,0x8e,0xc1,0xf4,0x05,0xd8,0x68,0xc6,0x63,0x3c,
-    0xf7, 0xff, 0xf7, 0x47, 0x33, 0x39, 0xc5, 0x3e, 0xb7, 0x0e,
+	0xf7,0xff,0xf7,0x47,0x33,0x39,0xc5,0x3e,0xb7,0x0e,
-    0x58, 0x35, 0x9d, 0x81, 0xea, 0xf8, 0x6a, 0x2c, 0x1c, 0x5a,
+	0x58,0x35,0x9d,0x81,0xea,0xf8,0x6a,0x2c,0x1c,0x5a,
-    0x68, 0x78, 0x64, 0x11, 0x6b, 0xc1, 0x3e, 0x4e, 0x7a, 0xbd,
+	0x68,0x78,0x64,0x11,0x6b,0xc1,0x3e,0x4e,0x7a,0xbd,
-    0x84, 0xcb, 0x0f, 0xc2, 0xb6, 0x85, 0x1d, 0xd3, 0x76, 0xc5,
+	0x84,0xcb,0x0f,0xc2,0xb6,0x85,0x1d,0xd3,0x76,0xc5,
-    0x93, 0x6a, 0x69, 0x89, 0x56, 0x34, 0xdc, 0x4a, 0x9b, 0xbc,
+	0x93,0x6a,0x69,0x89,0x56,0x34,0xdc,0x4a,0x9b,0xbc,
-    0xff, 0xa8, 0x0d, 0x6e, 0x35, 0x9c, 0x60, 0xa7, 0x23, 0x30,
+	0xff,0xa8,0x0d,0x6e,0x35,0x9c,0x60,0xa7,0x23,0x30,
-    0xc7, 0x06, 0x64, 0x39, 0x8b, 0x94, 0x89, 0xee, 0xba, 0x7f,
+	0xc7,0x06,0x64,0x39,0x8b,0x94,0x89,0xee,0xba,0x7f,
-    0x60, 0x8d, 0xfa, 0xb6, 0x97, 0x76, 0xdc, 0x51, 0x4a, 0x3c,
+	0x60,0x8d,0xfa,0xb6,0x97,0x76,0xdc,0x51,0x4a,0x3c,
-    0xeb, 0x3a, 0x14, 0x2c, 0x20, 0x60, 0x69, 0x4a, 0x86, 0xfe,
+	0xeb,0x3a,0x14,0x2c,0x20,0x60,0x69,0x4a,0x86,0xfe,
-    0x8c, 0x21, 0x84, 0x49, 0x54, 0xb3, 0x20, 0xe1, 0x01, 0x7f,
+	0x8c,0x21,0x84,0x49,0x54,0xb3,0x20,0xe1,0x01,0x7f,
-    0x58, 0xdf, 0x7f, 0xb5, 0x21, 0x51, 0x8c, 0x47, 0x9f, 0x91,
+	0x58,0xdf,0x7f,0xb5,0x21,0x51,0x8c,0x47,0x9f,0x91,
-    0xeb, 0x97, 0x3e, 0xf2, 0x54, 0xcf, 0x16, 0x46, 0xf9, 0xd9,
+	0xeb,0x97,0x3e,0xf2,0x54,0xcf,0x16,0x46,0xf9,0xd9,
-    0xb6, 0xe7, 0x64, 0xc9, 0xd0, 0x54, 0xea, 0x2f, 0xa1, 0xcf,
+	0xb6,0xe7,0x64,0xc9,0xd0,0x54,0xea,0x2f,0xa1,0xcf,
-    0xa5, 0x7f, 0x28, 0x8d, 0x84, 0xec, 0xd5, 0x39, 0x03, 0x76,
+	0xa5,0x7f,0x28,0x8d,0x84,0xec,0xd5,0x39,0x03,0x76,
-    0x5b, 0x2d, 0x8e, 0x43, 0xf2, 0x01, 0x24, 0xc9, 0x6f, 0xc0,
+	0x5b,0x2d,0x8e,0x43,0xf2,0x01,0x24,0xc9,0x6f,0xc0,
-    0xf5, 0x69, 0x6f, 0x7d, 0xb5, 0x85, 0xd2, 0x5f, 0x7f, 0x78,
+	0xf5,0x69,0x6f,0x7d,0xb5,0x85,0xd2,0x5f,0x7f,0x78,
-    0x40, 0x07, 0x7f, 0x09, 0x15, 0xb5, 0x1f, 0x28, 0x65, 0x10,
+	0x40,0x07,0x7f,0x09,0x15,0xb5,0x1f,0x28,0x65,0x10,
-    0xe4, 0x19, 0xa8, 0xc6, 0x9e, 0x8d, 0xdc, 0xcb, 0x02, 0x82,
+	0xe4,0x19,0xa8,0xc6,0x9e,0x8d,0xdc,0xcb,0x02,0x82,
-    0x01, 0x00, 0x13, 0x01, 0xee, 0x56, 0x80, 0x93, 0x70, 0x00,
+	0x01,0x00,0x13,0x01,0xee,0x56,0x80,0x93,0x70,0x00,
-    0x7f, 0x52, 0xd2, 0x94, 0xa1, 0x98, 0x84, 0x4a, 0x92, 0x25,
+	0x7f,0x52,0xd2,0x94,0xa1,0x98,0x84,0x4a,0x92,0x25,
-    0x4c, 0x9b, 0xa9, 0x91, 0x2e, 0xc2, 0x79, 0xb7, 0x5c, 0xe3,
+	0x4c,0x9b,0xa9,0x91,0x2e,0xc2,0x79,0xb7,0x5c,0xe3,
-    0xc5, 0xd5, 0x8e, 0xc2, 0x54, 0x16, 0x17, 0xad, 0x55, 0x9b,
+	0xc5,0xd5,0x8e,0xc2,0x54,0x16,0x17,0xad,0x55,0x9b,
-    0x25, 0x76, 0x12, 0x63, 0x50, 0x22, 0x2f, 0x58, 0x58, 0x79,
+	0x25,0x76,0x12,0x63,0x50,0x22,0x2f,0x58,0x58,0x79,
-    0x6b, 0x04, 0xe3, 0xf9, 0x9f, 0x8f, 0x04, 0x41, 0x67, 0x94,
+	0x6b,0x04,0xe3,0xf9,0x9f,0x8f,0x04,0x41,0x67,0x94,
-    0xa5, 0x1f, 0xac, 0x8a, 0x15, 0x9c, 0x26, 0x10, 0x6c, 0xf8,
+	0xa5,0x1f,0xac,0x8a,0x15,0x9c,0x26,0x10,0x6c,0xf8,
-    0x19, 0x57, 0x61, 0xd7, 0x3a, 0x7d, 0x31, 0xb0, 0x2d, 0x38,
+	0x19,0x57,0x61,0xd7,0x3a,0x7d,0x31,0xb0,0x2d,0x38,
-    0xbd, 0x94, 0x62, 0xad, 0xc4, 0xfa, 0x36, 0x42, 0x42, 0xf0,
+	0xbd,0x94,0x62,0xad,0xc4,0xfa,0x36,0x42,0x42,0xf0,
-    0x24, 0x67, 0x65, 0x9d, 0x8b, 0x0b, 0x7c, 0x6f, 0x82, 0x44,
+	0x24,0x67,0x65,0x9d,0x8b,0x0b,0x7c,0x6f,0x82,0x44,
-    0x1a, 0x8c, 0xc8, 0xc9, 0xab, 0xbb, 0x4c, 0x45, 0xfc, 0x7b,
+	0x1a,0x8c,0xc8,0xc9,0xab,0xbb,0x4c,0x45,0xfc,0x7b,
-    0x38, 0xee, 0x30, 0xe1, 0xfc, 0xef, 0x8d, 0xbc, 0x58, 0xdf,
+	0x38,0xee,0x30,0xe1,0xfc,0xef,0x8d,0xbc,0x58,0xdf,
-    0x2b, 0x5d, 0x0d, 0x54, 0xe0, 0x49, 0x4d, 0x97, 0x99, 0x8f,
+	0x2b,0x5d,0x0d,0x54,0xe0,0x49,0x4d,0x97,0x99,0x8f,
-    0x22, 0xa8, 0x83, 0xbe, 0x40, 0xbb, 0x50, 0x2e, 0x78, 0x28,
+	0x22,0xa8,0x83,0xbe,0x40,0xbb,0x50,0x2e,0x78,0x28,
-    0x0f, 0x95, 0x78, 0x8c, 0x8f, 0x98, 0x24, 0x56, 0xc2, 0x97,
+	0x0f,0x95,0x78,0x8c,0x8f,0x98,0x24,0x56,0xc2,0x97,
-    0xf3, 0x2c, 0x43, 0xd2, 0x03, 0x82, 0x66, 0x81, 0x72, 0x5f,
+	0xf3,0x2c,0x43,0xd2,0x03,0x82,0x66,0x81,0x72,0x5f,
-    0x53, 0x16, 0xec, 0xb1, 0xb1, 0x04, 0x5e, 0x40, 0x20, 0x48,
+	0x53,0x16,0xec,0xb1,0xb1,0x04,0x5e,0x40,0x20,0x48,
-    0x7b, 0x3f, 0x02, 0x97, 0x6a, 0xeb, 0x96, 0x12, 0x21, 0x35,
+	0x7b,0x3f,0x02,0x97,0x6a,0xeb,0x96,0x12,0x21,0x35,
-    0xfe, 0x1f, 0x47, 0xc0, 0x95, 0xea, 0xc5, 0x8a, 0x08, 0x84,
+	0xfe,0x1f,0x47,0xc0,0x95,0xea,0xc5,0x8a,0x08,0x84,
-    0x4f, 0x5e, 0x63, 0x94, 0x60, 0x0f, 0x71, 0x5b, 0x7f, 0x4a,
+	0x4f,0x5e,0x63,0x94,0x60,0x0f,0x71,0x5b,0x7f,0x4a,
-    0xec, 0x4f, 0x60, 0xc6, 0xba, 0x4a, 0x24, 0xf1, 0x20, 0x8b,
+	0xec,0x4f,0x60,0xc6,0xba,0x4a,0x24,0xf1,0x20,0x8b,
-    0xa7, 0x2e, 0x3a, 0xce, 0x8d, 0xe0, 0x27, 0x1d, 0xb5, 0x8e,
+	0xa7,0x2e,0x3a,0xce,0x8d,0xe0,0x27,0x1d,0xb5,0x8e,
-    0xb4, 0x21, 0xc5, 0xe2, 0xa6, 0x16, 0x0a, 0x51, 0x83, 0x55,
+	0xb4,0x21,0xc5,0xe2,0xa6,0x16,0x0a,0x51,0x83,0x55,
-    0x88, 0xd1, 0x30, 0x11, 0x63, 0xd5, 0xd7, 0x8d, 0xae, 0x16,
+	0x88,0xd1,0x30,0x11,0x63,0xd5,0xd7,0x8d,0xae,0x16,
-    0x12, 0x82, 0xc4, 0x85, 0x00, 0x4e, 0x27, 0x83, 0xa5, 0x7c,
+	0x12,0x82,0xc4,0x85,0x00,0x4e,0x27,0x83,0xa5,0x7c,
-    0x90, 0x2e, 0xe5, 0xa2, 0xa3, 0xd3, 0x4c, 0x63, 0x02, 0x82,
+	0x90,0x2e,0xe5,0xa2,0xa3,0xd3,0x4c,0x63,0x02,0x82,
-    0x01, 0x01, 0x00, 0x86, 0x08, 0x98, 0x98, 0xa5, 0x00, 0x05,
+	0x01,0x01,0x00,0x86,0x08,0x98,0x98,0xa5,0x00,0x05,
-    0x39, 0x77, 0xd9, 0x66, 0xb3, 0xcf, 0xca, 0xa0, 0x71, 0xb3,
+	0x39,0x77,0xd9,0x66,0xb3,0xcf,0xca,0xa0,0x71,0xb3,
-    0x50, 0xce, 0x3d, 0xb1, 0x93, 0x95, 0x35, 0xc4, 0xd4, 0x2e,
+	0x50,0xce,0x3d,0xb1,0x93,0x95,0x35,0xc4,0xd4,0x2e,
-    0x90, 0xdf, 0x0f, 0xfc, 0x60, 0xc1, 0x94, 0x68, 0x61, 0x43,
+	0x90,0xdf,0x0f,0xfc,0x60,0xc1,0x94,0x68,0x61,0x43,
-    0xca, 0x9a, 0x23, 0x4a, 0x1e, 0x45, 0x72, 0x99, 0xb5, 0x1e,
+	0xca,0x9a,0x23,0x4a,0x1e,0x45,0x72,0x99,0xb5,0x1e,
-    0x61, 0x8d, 0x77, 0x0f, 0xa0, 0xbb, 0xd7, 0x77, 0xb4, 0x2a,
+	0x61,0x8d,0x77,0x0f,0xa0,0xbb,0xd7,0x77,0xb4,0x2a,
-    0x15, 0x11, 0x88, 0x2d, 0xb3, 0x56, 0x61, 0x5e, 0x6a, 0xed,
+	0x15,0x11,0x88,0x2d,0xb3,0x56,0x61,0x5e,0x6a,0xed,
-    0xa4, 0x46, 0x4a, 0x3f, 0x50, 0x11, 0xd6, 0xba, 0xb6, 0xd7,
+	0xa4,0x46,0x4a,0x3f,0x50,0x11,0xd6,0xba,0xb6,0xd7,
-    0x95, 0x65, 0x53, 0xc3, 0xa1, 0x8f, 0xe0, 0xa3, 0xf5, 0x1c,
+	0x95,0x65,0x53,0xc3,0xa1,0x8f,0xe0,0xa3,0xf5,0x1c,
-    0xfd, 0xaf, 0x6e, 0x43, 0xd7, 0x17, 0xa7, 0xd3, 0x81, 0x1b,
+	0xfd,0xaf,0x6e,0x43,0xd7,0x17,0xa7,0xd3,0x81,0x1b,
-    0xa4, 0xdf, 0xe0, 0x97, 0x8a, 0x46, 0x03, 0xd3, 0x46, 0x0e,
+	0xa4,0xdf,0xe0,0x97,0x8a,0x46,0x03,0xd3,0x46,0x0e,
-    0x83, 0x48, 0x4e, 0xd2, 0x02, 0xcb, 0xc0, 0xad, 0x79, 0x95,
+	0x83,0x48,0x4e,0xd2,0x02,0xcb,0xc0,0xad,0x79,0x95,
-    0x8c, 0x96, 0xba, 0x40, 0x34, 0x11, 0x71, 0x5e, 0xe9, 0x11,
+	0x8c,0x96,0xba,0x40,0x34,0x11,0x71,0x5e,0xe9,0x11,
-    0xf9, 0xc5, 0x4a, 0x5e, 0x91, 0x9d, 0xf5, 0x92, 0x4f, 0xeb,
+	0xf9,0xc5,0x4a,0x5e,0x91,0x9d,0xf5,0x92,0x4f,0xeb,
-    0xc6, 0x70, 0x02, 0x2d, 0x3d, 0x04, 0xaa, 0xe9, 0x3a, 0x8e,
+	0xc6,0x70,0x02,0x2d,0x3d,0x04,0xaa,0xe9,0x3a,0x8e,
-    0xd5, 0xa8, 0xad, 0xf7, 0xce, 0x0d, 0x16, 0xb2, 0xec, 0x0a,
+	0xd5,0xa8,0xad,0xf7,0xce,0x0d,0x16,0xb2,0xec,0x0a,
-    0x9c, 0xf5, 0x94, 0x39, 0xb9, 0x8a, 0xfc, 0x1e, 0xf9, 0xcc,
+	0x9c,0xf5,0x94,0x39,0xb9,0x8a,0xfc,0x1e,0xf9,0xcc,
-    0xf2, 0x5f, 0x21, 0x31, 0x74, 0x72, 0x6b, 0x64, 0xae, 0x35,
+	0xf2,0x5f,0x21,0x31,0x74,0x72,0x6b,0x64,0xae,0x35,
-    0x61, 0x8d, 0x0d, 0xcb, 0xe7, 0xda, 0x39, 0xca, 0xf3, 0x21,
+	0x61,0x8d,0x0d,0xcb,0xe7,0xda,0x39,0xca,0xf3,0x21,
-    0x66, 0x0b, 0x95, 0xd7, 0x0a, 0x7c, 0xca, 0xa1, 0xa9, 0x5a,
+	0x66,0x0b,0x95,0xd7,0x0a,0x7c,0xca,0xa1,0xa9,0x5a,
-    0xe8, 0xac, 0xe0, 0x71, 0x54, 0xaf, 0x28, 0xcf, 0xd5, 0x70,
+	0xe8,0xac,0xe0,0x71,0x54,0xaf,0x28,0xcf,0xd5,0x70,
-    0x89, 0xe0, 0xf3, 0x9e, 0x43, 0x6c, 0x8d, 0x7b, 0x99, 0x01,
+	0x89,0xe0,0xf3,0x9e,0x43,0x6c,0x8d,0x7b,0x99,0x01,
-    0x68, 0x4d, 0xa1, 0x45, 0x46, 0x0c, 0x43, 0xbc, 0xcc, 0x2c,
+	0x68,0x4d,0xa1,0x45,0x46,0x0c,0x43,0xbc,0xcc,0x2c,
-    0xdd, 0xc5, 0x46, 0xc8, 0x4e, 0x0e, 0xbe, 0xed, 0xb9, 0x26,
+	0xdd,0xc5,0x46,0xc8,0x4e,0x0e,0xbe,0xed,0xb9,0x26,
-    0xab, 0x2e, 0xdb, 0xeb, 0x8f, 0xff, 0xdb, 0xb0, 0xc6, 0x55,
+	0xab,0x2e,0xdb,0xeb,0x8f,0xff,0xdb,0xb0,0xc6,0x55,
-    0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
+	0xaf,0xf8,0x2a,0x91,0x9d,0x50,0x44,0x21,0x17,
-};
+	};

apps/timeouts.h

@@ -58,10 +58,10 @@
  */
 
 #ifndef INCLUDED_TIMEOUTS_H
-# define INCLUDED_TIMEOUTS_H
+#define INCLUDED_TIMEOUTS_H
 
 /* numbers in us */
-# define DGRAM_RCV_TIMEOUT         250000
+#define DGRAM_RCV_TIMEOUT         250000
-# define DGRAM_SND_TIMEOUT         250000
+#define DGRAM_SND_TIMEOUT         250000
 
 #endif /* ! INCLUDED_TIMEOUTS_H */

apps/verify.c

@@ -70,87 +70,94 @@
 #define PROG	verify_main
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
-static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e);
-                 STACK_OF(X509) *tchain, int purpose, ENGINE *e);
 static STACK_OF(X509) *load_untrusted(char *file);
-static int v_verbose = 0, vflags = 0;
+static int v_verbose=0, vflags = 0;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
 	ENGINE *e = NULL;
-    int i, ret = 1, badarg = 0;
+	int i,ret=1, badarg = 0;
 	int purpose = -1;
-    char *CApath = NULL, *CAfile = NULL;
+	char *CApath=NULL,*CAfile=NULL;
 	char *untfile = NULL, *trustfile = NULL;
 	STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
-    X509_STORE *cert_ctx = NULL;
+	X509_STORE *cert_ctx=NULL;
-    X509_LOOKUP *lookup = NULL;
+	X509_LOOKUP *lookup=NULL;
 	X509_VERIFY_PARAM *vpm = NULL;
 #ifndef OPENSSL_NO_ENGINE
-    char *engine = NULL;
+	char *engine=NULL;
 #endif
 
-    cert_ctx = X509_STORE_new();
+	cert_ctx=X509_STORE_new();
-    if (cert_ctx == NULL)
+	if (cert_ctx == NULL) goto end;
-        goto end;
+	X509_STORE_set_verify_cb_func(cert_ctx,cb);
-    X509_STORE_set_verify_cb_func(cert_ctx, cb);
 
 	ERR_load_crypto_strings();
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
 	if (!load_config(bio_err, NULL))
 		goto end;
 
 	argc--;
 	argv++;
-    for (;;) {
+	for (;;)
-        if (argc >= 1) {
+		{
-            if (strcmp(*argv, "-CApath") == 0) {
+		if (argc >= 1)
-                if (argc-- < 1)
+			{
-                    goto end;
+			if (strcmp(*argv,"-CApath") == 0)
-                CApath = *(++argv);
+				{
-            } else if (strcmp(*argv, "-CAfile") == 0) {
+				if (argc-- < 1) goto end;
-                if (argc-- < 1)
+				CApath= *(++argv);
-                    goto end;
+				}
-                CAfile = *(++argv);
+			else if (strcmp(*argv,"-CAfile") == 0)
-            } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {
+				{
+				if (argc-- < 1) goto end;
+				CAfile= *(++argv);
+				}
+			else if (args_verify(&argv, &argc, &badarg, bio_err,
+									&vpm))
+				{
 				if (badarg)
 					goto end;
 				continue;
-            } else if (strcmp(*argv, "-untrusted") == 0) {
+				}
-                if (argc-- < 1)
+			else if (strcmp(*argv,"-untrusted") == 0)
-                    goto end;
+				{
-                untfile = *(++argv);
+				if (argc-- < 1) goto end;
-            } else if (strcmp(*argv, "-trusted") == 0) {
+				untfile= *(++argv);
-                if (argc-- < 1)
+				}
-                    goto end;
+			else if (strcmp(*argv,"-trusted") == 0)
-                trustfile = *(++argv);
+				{
+				if (argc-- < 1) goto end;
+				trustfile= *(++argv);
 				}
 #ifndef OPENSSL_NO_ENGINE
-            else if (strcmp(*argv, "-engine") == 0) {
+			else if (strcmp(*argv,"-engine") == 0)
-                if (--argc < 1)
+				{
-                    goto end;
+				if (--argc < 1) goto end;
-                engine = *(++argv);
+				engine= *(++argv);
 				}
 #endif
-            else if (strcmp(*argv, "-help") == 0)
+			else if (strcmp(*argv,"-help") == 0)
 				goto end;
-            else if (strcmp(*argv, "-verbose") == 0)
+			else if (strcmp(*argv,"-verbose") == 0)
-                v_verbose = 1;
+				v_verbose=1;
 			else if (argv[0][0] == '-')
 				goto end;
 			else
 				break;
 			argc--;
 			argv++;
-        } else
+			}
+		else
 			break;
 		}
 
@@ -161,207 +168,193 @@ int MAIN(int argc, char **argv)
 	if (vpm)
 		X509_STORE_set1_param(cert_ctx, vpm);
 
-    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
+	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
-    if (lookup == NULL)
+	if (lookup == NULL) abort();
-        abort();
 	if (CAfile) {
-        i = X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM);
+		i=X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM);
-        if (!i) {
+		if(!i) {
 			BIO_printf(bio_err, "Error loading file %s\n", CAfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
-    } else
+	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-        X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 		
-    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
+	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir());
-    if (lookup == NULL)
+	if (lookup == NULL) abort();
-        abort();
 	if (CApath) {
-        i = X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM);
+		i=X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM);
-        if (!i) {
+		if(!i) {
 			BIO_printf(bio_err, "Error loading directory %s\n", CApath);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
-    } else
+	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-        X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
 
 	ERR_clear_error();
 
-    if (untfile) {
+	if(untfile) {
-        if (!(untrusted = load_untrusted(untfile))) {
+		if(!(untrusted = load_untrusted(untfile))) {
 			BIO_printf(bio_err, "Error loading untrusted file %s\n", untfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 
-    if (trustfile) {
+	if(trustfile) {
-        if (!(trusted = load_untrusted(trustfile))) {
+		if(!(trusted = load_untrusted(trustfile))) {
-            BIO_printf(bio_err, "Error loading untrusted file %s\n",
+			BIO_printf(bio_err, "Error loading untrusted file %s\n", trustfile);
-                       trustfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 
-    if (argc < 1)
+	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose, e);
-        check(cert_ctx, NULL, untrusted, trusted, purpose, e);
 	else
-        for (i = 0; i < argc; i++)
+		for (i=0; i<argc; i++)
-            check(cert_ctx, argv[i], untrusted, trusted, purpose, e);
+			check(cert_ctx,argv[i], untrusted, trusted, purpose, e);
-    ret = 0;
+	ret=0;
- end:
+end:
 	if (ret == 1) {
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
-                   "usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err, " [-engine e]");
+		BIO_printf(bio_err," [-engine e]");
 #endif
-        BIO_printf(bio_err, " cert1 cert2 ...\n");
+		BIO_printf(bio_err," cert1 cert2 ...\n");
-        BIO_printf(bio_err, "recognized usages:\n");
+		BIO_printf(bio_err,"recognized usages:\n");
-        for (i = 0; i < X509_PURPOSE_get_count(); i++) {
+		for(i = 0; i < X509_PURPOSE_get_count(); i++) {
 			X509_PURPOSE *ptmp;
 			ptmp = X509_PURPOSE_get0(i);
-            BIO_printf(bio_err, "\t%-10s\t%s\n",
+			BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
-                       X509_PURPOSE_get0_sname(ptmp),
 								X509_PURPOSE_get0_name(ptmp));
 		}
 	}
-    if (vpm)
+	if (vpm) X509_VERIFY_PARAM_free(vpm);
-        X509_VERIFY_PARAM_free(vpm);
+	if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
-    if (cert_ctx != NULL)
-        X509_STORE_free(cert_ctx);
 	sk_X509_pop_free(untrusted, X509_free);
 	sk_X509_pop_free(trusted, X509_free);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}
 
-static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e)
-                 STACK_OF(X509) *tchain, int purpose, ENGINE *e)
+	{
-{
+	X509 *x=NULL;
-    X509 *x = NULL;
+	int i=0,ret=0;
-    int i = 0, ret = 0;
 	X509_STORE_CTX *csc;
 
 	x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
 	if (x == NULL)
 		goto end;
-    fprintf(stdout, "%s: ", (file == NULL) ? "stdin" : file);
+	fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);
 
 	csc = X509_STORE_CTX_new();
-    if (csc == NULL) {
+	if (csc == NULL)
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	X509_STORE_set_flags(ctx, vflags);
-    if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) {
+	if(!X509_STORE_CTX_init(csc,ctx,x,uchain))
+		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    if (tchain)
+	if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
-        X509_STORE_CTX_trusted_stack(csc, tchain);
+	if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
-    if (purpose >= 0)
+	i=X509_verify_cert(csc);
-        X509_STORE_CTX_set_purpose(csc, purpose);
-    i = X509_verify_cert(csc);
 	X509_STORE_CTX_free(csc);
 
-    ret = 0;
+	ret=0;
- end:
+end:
-    if (i > 0) {
+	if (i)
-        fprintf(stdout, "OK\n");
+		{
-        ret = 1;
+		fprintf(stdout,"OK\n");
-    } else
+		ret=1;
+		}
+	else
 		ERR_print_errors(bio_err);
-    if (x != NULL)
+	if (x != NULL) X509_free(x);
-        X509_free(x);
 
-    return (ret);
+	return(ret);
-}
+	}
 
 static STACK_OF(X509) *load_untrusted(char *certfile)
 {
-    STACK_OF(X509_INFO) *sk = NULL;
+	STACK_OF(X509_INFO) *sk=NULL;
-    STACK_OF(X509) *stack = NULL, *ret = NULL;
+	STACK_OF(X509) *stack=NULL, *ret=NULL;
-    BIO *in = NULL;
+	BIO *in=NULL;
 	X509_INFO *xi;
 
-    if (!(stack = sk_X509_new_null())) {
+	if(!(stack = sk_X509_new_null())) {
-        BIO_printf(bio_err, "memory allocation failure\n");
+		BIO_printf(bio_err,"memory allocation failure\n");
 		goto end;
 	}
 
-    if (!(in = BIO_new_file(certfile, "r"))) {
+	if(!(in=BIO_new_file(certfile, "r"))) {
-        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
+		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
 		goto end;
 	}
 
 	/* This loads from a file, a stack of x509/crl/pkey sets */
-    if (!(sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL))) {
+	if(!(sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL))) {
-        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
+		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
 		goto end;
 	}
 
 	/* scan over it and pull out the certs */
-    while (sk_X509_INFO_num(sk)) {
+	while (sk_X509_INFO_num(sk))
-        xi = sk_X509_INFO_shift(sk);
+		{
-        if (xi->x509 != NULL) {
+		xi=sk_X509_INFO_shift(sk);
-            sk_X509_push(stack, xi->x509);
+		if (xi->x509 != NULL)
-            xi->x509 = NULL;
+			{
+			sk_X509_push(stack,xi->x509);
+			xi->x509=NULL;
 			}
 		X509_INFO_free(xi);
 		}
-    if (!sk_X509_num(stack)) {
+	if(!sk_X509_num(stack)) {
-        BIO_printf(bio_err, "no certificates in file, %s\n", certfile);
+		BIO_printf(bio_err,"no certificates in file, %s\n",certfile);
 		sk_X509_free(stack);
 		goto end;
 	}
-    ret = stack;
+	ret=stack;
- end:
+end:
 	BIO_free(in);
 	sk_X509_INFO_free(sk);
-    return (ret);
+	return(ret);
-}
+	}
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
-{
+	{
 	char buf[256];
 
-    if (!ok) {
+	if (!ok)
-        if (ctx->current_cert) {
+		{
-            X509_NAME_oneline(X509_get_subject_name(ctx->current_cert), buf,
+		if (ctx->current_cert)
+			{
+			X509_NAME_oneline(
+				X509_get_subject_name(ctx->current_cert),buf,
 				sizeof buf);
-            printf("%s\n", buf);
+			printf("%s\n",buf);
 			}
-        printf("error %d at %d depth lookup:%s\n", ctx->error,
+		printf("error %d at %d depth lookup:%s\n",ctx->error,
-               ctx->error_depth, X509_verify_cert_error_string(ctx->error));
+			ctx->error_depth,
-        if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED)
+			X509_verify_cert_error_string(ctx->error));
-            ok = 1;
+		if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED) ok=1;
-        /*
+		/* since we are just checking the certificates, it is
-         * since we are just checking the certificates, it is ok if they are
+		 * ok if they are self signed. But we should still warn
-         * self signed. But we should still warn the user.
+		 * the user.
  		 */
-        if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
+		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
-            ok = 1;
 		/* Continue after extension errors too */
-        if (ctx->error == X509_V_ERR_INVALID_CA)
+		if (ctx->error == X509_V_ERR_INVALID_CA) ok=1;
-            ok = 1;
+		if (ctx->error == X509_V_ERR_INVALID_NON_CA) ok=1;
-        if (ctx->error == X509_V_ERR_INVALID_NON_CA)
+		if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED) ok=1;
-            ok = 1;
+		if (ctx->error == X509_V_ERR_INVALID_PURPOSE) ok=1;
-        if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED)
+		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
-            ok = 1;
+		if (ctx->error == X509_V_ERR_CRL_HAS_EXPIRED) ok=1;
-        if (ctx->error == X509_V_ERR_INVALID_PURPOSE)
+		if (ctx->error == X509_V_ERR_CRL_NOT_YET_VALID) ok=1;
-            ok = 1;
+		if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION) ok=1;
-        if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
-            ok = 1;
-        if (ctx->error == X509_V_ERR_CRL_HAS_EXPIRED)
-            ok = 1;
-        if (ctx->error == X509_V_ERR_CRL_NOT_YET_VALID)
-            ok = 1;
-        if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION)
-            ok = 1;
 
 		if (ctx->error == X509_V_ERR_NO_EXPLICIT_POLICY)
 			policies_print(NULL, ctx);
@@ -372,5 +365,6 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
 		policies_print(NULL, ctx);
 	if (!v_verbose)
 		ERR_clear_error();
-    return (ok);
+	return(ok);
-}
+	}
+

apps/version.c

@@ -138,77 +138,80 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-{
+	{
-    int i, ret = 0;
+	int i,ret=0;
-    int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
+	int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
 
 	apps_startup();
 
 	if (bio_err == NULL)
-        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-    if (argc == 1)
+	if (argc == 1) version=1;
-        version = 1;
+	for (i=1; i<argc; i++)
-    for (i = 1; i < argc; i++) {
+		{
-        if (strcmp(argv[i], "-v") == 0)
+		if (strcmp(argv[i],"-v") == 0)
-            version = 1;
+			version=1;	
-        else if (strcmp(argv[i], "-b") == 0)
+		else if (strcmp(argv[i],"-b") == 0)
-            date = 1;
+			date=1;
-        else if (strcmp(argv[i], "-f") == 0)
+		else if (strcmp(argv[i],"-f") == 0)
-            cflags = 1;
+			cflags=1;
-        else if (strcmp(argv[i], "-o") == 0)
+		else if (strcmp(argv[i],"-o") == 0)
-            options = 1;
+			options=1;
-        else if (strcmp(argv[i], "-p") == 0)
+		else if (strcmp(argv[i],"-p") == 0)
-            platform = 1;
+			platform=1;
-        else if (strcmp(argv[i], "-d") == 0)
+		else if (strcmp(argv[i],"-d") == 0)
-            dir = 1;
+			dir=1;
-        else if (strcmp(argv[i], "-a") == 0)
+		else if (strcmp(argv[i],"-a") == 0)
-            date = version = cflags = options = platform = dir = 1;
+			date=version=cflags=options=platform=dir=1;
-        else {
+		else
-            BIO_printf(bio_err, "usage:version -[avbofpd]\n");
+			{
-            ret = 1;
+			BIO_printf(bio_err,"usage:version -[avbofp]\n");
+			ret=1;
 			goto end;
 			}
 		}
 
-    if (version) {
+	if (version)
-        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
+		{
-            printf("%s\n", SSLeay_version(SSLEAY_VERSION));
+		if (SSLeay() == SSLEAY_VERSION_NUMBER)
-        } else {
+			{
+			printf("%s\n",SSLeay_version(SSLEAY_VERSION));
+			}
+		else
+			{
 			printf("%s (Library: %s)\n",
-                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
+				OPENSSL_VERSION_TEXT,
+				SSLeay_version(SSLEAY_VERSION));
 			}
 		}
-    if (date)
+	if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
-        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
+	if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
-    if (platform)
+	if (options) 
-        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
+		{
-    if (options) {
 		printf("options:  ");
-        printf("%s ", BN_options());
+		printf("%s ",BN_options());
 #ifndef OPENSSL_NO_MD2
-        printf("%s ", MD2_options());
+		printf("%s ",MD2_options());
 #endif
 #ifndef OPENSSL_NO_RC4
-        printf("%s ", RC4_options());
+		printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-        printf("%s ", DES_options());
+		printf("%s ",DES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
-        printf("%s ", idea_options());
+		printf("%s ",idea_options());
 #endif
 #ifndef OPENSSL_NO_BF
-        printf("%s ", BF_options());
+		printf("%s ",BF_options());
 #endif
 		printf("\n");
 		}
-    if (cflags)
+	if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
-        printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
+	if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
-    if (dir)
+end:
-        printf("%s\n", SSLeay_version(SSLEAY_DIR));
- end:
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
-}
+	}

apps/winrand.c

@@ -53,8 +53,7 @@
  *
  */
 
-/*-
+/* Usage: winrand [filename]
- * Usage: winrand [filename]
  *
  * Collects entropy from mouse movements and other events and writes
  * random data to filename or .rnd
@@ -69,7 +68,7 @@ const char *filename;
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         PSTR cmdline, int iCmdShow)
-{
+	{
 	static char appname[] = "OpenSSL";
 	HWND hwnd;
 	MSG msg;
@@ -99,28 +98,30 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
         hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
 		WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
-                        CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance,
+		CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
-                        NULL);
 
 	ShowWindow(hwnd, iCmdShow);
 	UpdateWindow(hwnd);
 
-    while (GetMessage(&msg, NULL, 0, 0)) {
+
+	while (GetMessage(&msg, NULL, 0, 0))
+		{
 		TranslateMessage(&msg);
 		DispatchMessage(&msg);
 		}
 
 	return msg.wParam;
-}
+	}
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
-{
+	{
         HDC hdc;
 	PAINTSTRUCT ps;
         RECT rect;
         static int seeded = 0;
 
-    switch (iMsg) {
+	switch (iMsg)
+		{
 	case WM_PAINT:
 		hdc = BeginPaint(hwnd, &ps);
 		GetClientRect(hwnd, &rect);
@@ -134,7 +135,8 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
                 return 0;
                 }
 
-    if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0) {
+        if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0)
+                {
                 seeded = 1;
                 if (RAND_write_file(filename) <= 0)
                         MessageBox(hwnd, "Couldn't write random file!",
@@ -143,4 +145,4 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
                 }
 
 	return DefWindowProc(hwnd, iMsg, wParam, lParam);
-}
+	}

bugs/alpha.c

@@ -56,13 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/*
+/* while not exactly a bug (ASN1 C leaves this undefined) it is
- * while not exactly a bug (ASN1 C leaves this undefined) it is something to
+ * something to watch out for.  This was fine on linux/NT/Solaris but not
- * watch out for.  This was fine on linux/NT/Solaris but not Alpha
+ * Alpha */
- */
 
-/*-
+/* it is basically an example of
- * it is basically an example of
  * func(*(a++),*(a++))
  * which parameter is evaluated first?  It is not defined in ASN1 C.
  */
@@ -71,22 +69,23 @@
 
 #define TYPE    unsigned int
 
-void func(a, b)
+void func(a,b)
 TYPE *a;
 TYPE b;
-{
+        {
-    printf("%ld -1 == %ld\n", a[0], b);
+        printf("%ld -1 == %ld\n",a[0],b);
-}
+        }
 
 main()
-{
+        {
-    TYPE data[5] = { 1L, 2L, 3L, 4L, 5L };
+        TYPE data[5]={1L,2L,3L,4L,5L};
         TYPE *p;
         int i;
 
-    p = data;
+        p=data;
 
-    for (i = 0; i < 4; i++) {
+        for (i=0; i<4; i++)
-        func(p, *(p++));
+                {
+                func(p,*(p++));
+                }
         }
-}

bugs/dggccbug.c

@@ -4,18 +4,17 @@
 
 #include <stdio.h>
 
-/*
+/* There is a bug in
- * There is a bug in gcc version 2.5.8 (88open OCS/BCS, DG-2.5.8.3, Oct 14
+ * gcc version 2.5.8 (88open OCS/BCS, DG-2.5.8.3, Oct 14 1994)
- * 1994) as shipped with DGUX 5.4R3.10 that can be bypassed by defining
+ * as shipped with DGUX 5.4R3.10 that can be bypassed by defining
- * DG_GCC_BUG in my code. The bug manifests itself by the vaule of a pointer
+ * DG_GCC_BUG in my code.
- * that is used only by reference, not having it's value change when it is
+ * The bug manifests itself by the vaule of a pointer that is
- * used to check for exiting the loop.  Probably caused by there being 2
+ * used only by reference, not having it's value change when it is used
- * copies of the valiable, one in a register and one being an address that is
+ * to check for exiting the loop.  Probably caused by there being 2
- * passed.
+ * copies of the valiable, one in a register and one being an address
- */
+ * that is passed. */
 
-/*-
+/* compare the out put from
- * compare the out put from
  * gcc dggccbug.c; ./a.out
  * and
  * gcc -O dggccbug.c; ./a.out
@@ -24,22 +23,23 @@
 
 void inc(a)
 int *a;
-{
+	{
 	(*a)++;
-}
+	}
 
 main()
-{
+	{
-    int p = 0;
+	int p=0;
 #ifdef FIXBUG
 	int dummy;
 #endif
 
-    while (p < 3) {
+	while (p<3)
-        fprintf(stderr, "%08X\n", p);
+		{
+		fprintf(stderr,"%08X\n",p);
 		inc(&p);
 #ifdef FIXBUG
-        dummy += p;
+		dummy+=p;
 #endif
 		}
-}
+	}

bugs/sgiccbug.c

@@ -4,57 +4,54 @@
 
 #include <stdio.h>
 
-/*
+/* This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are
- * This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are the
+ * the only versions of IRIX I have access to.
- * only versions of IRIX I have access to. defining FIXBUG removes the bug.
+ * defining FIXBUG removes the bug.
- * (bug is still present in IRIX 6.3 according to Gage
+ * (bug is still present in IRIX 6.3 according to
- * <agage@forgetmenot.Mines.EDU>
+ * Gage <agage@forgetmenot.Mines.EDU>
  */
  
-/*-
+/* Compare the output from
- * Compare the output from
  * cc sgiccbug.c; ./a.out
  * and
  * cc -O sgiccbug.c; ./a.out
  */
 
-static unsigned long a[4] =
+static unsigned long a[4]={0x01234567,0x89ABCDEF,0xFEDCBA98,0x76543210};
-    { 0x01234567, 0x89ABCDEF, 0xFEDCBA98, 0x76543210 };
+static unsigned long b[4]={0x89ABCDEF,0xFEDCBA98,0x76543210,0x01234567};
-static unsigned long b[4] =
+static unsigned long c[4]={0x77777778,0x8ACF1357,0x88888888,0x7530ECA9};
-    { 0x89ABCDEF, 0xFEDCBA98, 0x76543210, 0x01234567 };
-static unsigned long c[4] =
-    { 0x77777778, 0x8ACF1357, 0x88888888, 0x7530ECA9 };
 
 main()
-{
+	{
 	unsigned long r[4];
-    sub(r, a, b);
+	sub(r,a,b);
-    fprintf(stderr, "input a= %08X %08X %08X %08X\n", a[3], a[2], a[1], a[0]);
+	fprintf(stderr,"input a= %08X %08X %08X %08X\n",a[3],a[2],a[1],a[0]);
-    fprintf(stderr, "input b= %08X %08X %08X %08X\n", b[3], b[2], b[1], b[0]);
+	fprintf(stderr,"input b= %08X %08X %08X %08X\n",b[3],b[2],b[1],b[0]);
-    fprintf(stderr, "output = %08X %08X %08X %08X\n", r[3], r[2], r[1], r[0]);
+	fprintf(stderr,"output = %08X %08X %08X %08X\n",r[3],r[2],r[1],r[0]);
-    fprintf(stderr, "correct= %08X %08X %08X %08X\n", c[3], c[2], c[1], c[0]);
+	fprintf(stderr,"correct= %08X %08X %08X %08X\n",c[3],c[2],c[1],c[0]);
-}
+	}
 
-int sub(r, a, b)
+int sub(r,a,b)
-unsigned long *r, *a, *b;
+unsigned long *r,*a,*b;
-{
+	{
-    register unsigned long t1, t2, *ap, *bp, *rp;
+	register unsigned long t1,t2,*ap,*bp,*rp;
-    int i, carry;
+	int i,carry;
 #ifdef FIXBUG
 	unsigned long dummy;
 #endif
 
-    ap = a;
+	ap=a;
-    bp = b;
+	bp=b;
-    rp = r;
+	rp=r;
-    carry = 0;
+	carry=0;
-    for (i = 0; i < 4; i++) {
+	for (i=0; i<4; i++)
-        t1 = *(ap++);
+		{
-        t2 = *(bp++);
+		t1= *(ap++);
-        t1 = (t1 - t2);
+		t2= *(bp++);
+		t1=(t1-t2);
 #ifdef FIXBUG
-        dummy = t1;
+		dummy=t1;
 #endif
-        *(rp++) = t1 & 0xffffffff;
+		*(rp++)=t1&0xffffffff;
+		}
 	}
-}

bugs/stream.c

@@ -59,74 +59,73 @@
 #include <stdio.h>
 #include <openssl/rc4.h>
 #ifdef OPENSSL_NO_DES
-# include <des.h>
+#include <des.h>
 #else
-# include <openssl/des.h>
+#include <openssl/des.h>
 #endif
 
-/*
+/* show how stream ciphers are not very good.  The mac has no affect
- * show how stream ciphers are not very good.  The mac has no affect on RC4
+ * on RC4 while it does for cfb DES
- * while it does for cfb DES
  */
 
 main()
-{
+	{
-    fprintf(stderr, "rc4\n");
+	fprintf(stderr,"rc4\n");
 	rc4();
-    fprintf(stderr, "cfb des\n");
+	fprintf(stderr,"cfb des\n");
 	des();
-}
+	}
 
 int des()
-{
+	{
 	des_key_schedule ks;
-    des_cblock iv, key;
+	des_cblock iv,key;
 	int num;
-    static char *keystr = "01234567";
+	static char *keystr="01234567";
-    static char *in1 = "0123456789ABCEDFdata 12345";
+	static char *in1="0123456789ABCEDFdata 12345";
-    static char *in2 = "9876543210abcdefdata 12345";
+	static char *in2="9876543210abcdefdata 12345";
 	unsigned char out[100];
 	int i;
 
-    des_set_key((des_cblock *)keystr, ks);
+	des_set_key((des_cblock *)keystr,ks);
 
-    num = 0;
+	num=0;
-    memset(iv, 0, 8);
+	memset(iv,0,8);
-    des_cfb64_encrypt(in1, out, 26, ks, (des_cblock *)iv, &num, 1);
+	des_cfb64_encrypt(in1,out,26,ks,(des_cblock *)iv,&num,1);
-    for (i = 0; i < 26; i++)
+	for (i=0; i<26; i++)
-        fprintf(stderr, "%02X ", out[i]);
+		fprintf(stderr,"%02X ",out[i]);
-    fprintf(stderr, "\n");
+	fprintf(stderr,"\n");
 
-    num = 0;
+	num=0;
-    memset(iv, 0, 8);
+	memset(iv,0,8);
-    des_cfb64_encrypt(in2, out, 26, ks, (des_cblock *)iv, &num, 1);
+	des_cfb64_encrypt(in2,out,26,ks,(des_cblock *)iv,&num,1);
-    for (i = 0; i < 26; i++)
+	for (i=0; i<26; i++)
-        fprintf(stderr, "%02X ", out[i]);
+		fprintf(stderr,"%02X ",out[i]);
-    fprintf(stderr, "\n");
+	fprintf(stderr,"\n");
-}
+	}
 
 int rc4()
-{
+	{
-    static char *keystr = "0123456789abcdef";
+	static char *keystr="0123456789abcdef";
 	RC4_KEY key;
-    unsigned char in[100], out[100];
+	unsigned char in[100],out[100];
 	int i;
 
-    RC4_set_key(&key, 16, keystr);
+	RC4_set_key(&key,16,keystr);
-    in[0] = '\0';
+	in[0]='\0';
-    strcpy(in, "0123456789ABCEDFdata 12345");
+	strcpy(in,"0123456789ABCEDFdata 12345");
-    RC4(key, 26, in, out);
+	RC4(key,26,in,out);
 
-    for (i = 0; i < 26; i++)
+	for (i=0; i<26; i++)
-        fprintf(stderr, "%02X ", out[i]);
+		fprintf(stderr,"%02X ",out[i]);
-    fprintf(stderr, "\n");
+	fprintf(stderr,"\n");
 
-    RC4_set_key(&key, 16, keystr);
+	RC4_set_key(&key,16,keystr);
-    in[0] = '\0';
+	in[0]='\0';
-    strcpy(in, "9876543210abcdefdata 12345");
+	strcpy(in,"9876543210abcdefdata 12345");
-    RC4(key, 26, in, out);
+	RC4(key,26,in,out);
 
-    for (i = 0; i < 26; i++)
+	for (i=0; i<26; i++)
-        fprintf(stderr, "%02X ", out[i]);
+		fprintf(stderr,"%02X ",out[i]);
-    fprintf(stderr, "\n");
+	fprintf(stderr,"\n");
-}
+	}

bugs/ultrixcc.c

@@ -1,7 +1,6 @@
 #include <stdio.h>
 
-/*-
+/* This is a cc optimiser bug for ultrix 4.3, mips CPU.
- * This is a cc optimiser bug for ultrix 4.3, mips CPU.
  * What happens is that the compiler, due to the (a)&7,
  * does
  * i=a&7;
@@ -13,15 +12,16 @@
  */
 
 main()
-{
+	{
 	f(5);
 	f(0);
-}
+	}
 
 int f(a)
 int a;
-{
+	{
-    switch (a & 7) {
+	switch(a&7)
+		{
 	case 7:
 		printf("7\n");
 	case 6:
@@ -41,4 +41,5 @@ int a;
 		;
 #endif
 		}
-}
+	}	
+

certs/README.RootCerts

@@ -1,4 +0,0 @@
-The OpenSSL project does not (any longer) include root CA certificates.
-
-Please check out the FAQ:
-  * How can I set up a bundle of commercial root CA certificates?

certs/RegTP-5R.pem

@@ -0,0 +1,19 @@
+issuer= CN=5R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
+notBefore=Mar 22 08:55:51 2000 GMT
+notAfter=Mar 22 08:55:51 2005 GMT
+subject= CN=5R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
+-----BEGIN CERTIFICATE-----
+MIICaDCCAdSgAwIBAgIDDIOqMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w
+OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0
+aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE4w
+IhgPMjAwMDAzMjIwODU1NTFaGA8yMDA1MDMyMjA4NTU1MVowbzELMAkGA1UEBhMC
+REUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11
+bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNVItQ0Eg
+MTpQTjCBoTANBgkqhkiG9w0BAQEFAAOBjwAwgYsCgYEAih5BUycfBpqKhU8RDsaS
+vV5AtzWeXQRColL9CH3t0DKnhjKAlJ8iccFtJNv+d3bh8bb9sh0maRSo647xP7hs
+HTjKgTE4zM5BYNfXvST79OtcMgAzrnDiGjQIIWv8xbfV1MqxxdtZJygrwzRMb9jG
+CAGoJEymoyzAMNG7tSdBWnUCBQDAAAABoxIwEDAOBgNVHQ8BAf8EBAMCAQYwCgYG
+KyQDAwECBQADgYEAOaK8ihVSBUcL2IdVBxZYYUKwMz5m7H3zqhN8W9w+iafWudH6
+b+aahkbENEwzg3C3v5g8nze7v7ssacQze657LHjP+e7ksUDIgcS4R1pU2eN16bjS
+P/qGPF3rhrIEHoK5nJULkjkZYTtNiOvmQ/+G70TXDi3Os/TwLlWRvu+7YLM=
+-----END CERTIFICATE-----