Prepare for 0.9.8zi-dev

Reviewed-by: Richard Levitte <levitte@openssl.org>

.cvsignore

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

.gitignore

@@ -0,0 +1,108 @@
+# Object files
+*.o
+*.obj
+
+# editor artefacts
+*.swp
+.#*
+#*#
+*~
+/.dir-locals.el
+
+# 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

.travis.yml

@@ -0,0 +1,44 @@
+language: c
+
+addons:
+    apt_packages:
+        - binutils-mingw-w64
+        - gcc-mingw-w64
+
+os:
+    - linux
+    - osx
+
+compiler:
+    - clang
+    - gcc
+    - i686-w64-mingw32-gcc
+
+env:
+    - CONFIG_OPTS=""
+    - CONFIG_OPTS="shared"
+    - CONFIG_OPTS="-d"
+
+matrix:
+    exclude:
+        - os: osx
+          compiler: i686-w64-mingw32-gcc
+
+before_script:
+    - if [ "$CC" == i686-w64-mingw32-gcc ]; then
+          export CROSS_COMPILE=${CC%%gcc}; unset CC;
+          ./Configure mingw $CONFIG_OPTS;
+      else
+          ./config $CONFIG_OPTS;
+      fi
+
+script:
+    - make
+    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
+
+notifications:
+    recipient:
+        - openssl-commits@openssl.org
+    email:
+        on_success: change
+        on_failure: always

ACKNOWLEDGMENTS

@@ -0,0 +1,30 @@
+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

@@ -1,163 +0,0 @@
-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.
-

FAQ

@@ -1,833 +1,2 @@
-OpenSSL  -  Frequently Asked Questions
+The FAQ is now maintained on the web:
---------------------------------------
+        https://www.openssl.org/docs/faq.html
-
-[MISC] Miscellaneous questions
-
-* Which is the current version of OpenSSL?
-* Where is the documentation?
-* How can I contact the OpenSSL developers?
-* Where can I get a compiled version of OpenSSL?
-* Why aren't tools like 'autoconf' and 'libtool' used?
-* What is an 'engine' version?
-* How do I check the authenticity of the OpenSSL distribution?
-
-[LEGAL] Legal questions
-
-* Do I need patent licenses to use OpenSSL?
-* Can I use OpenSSL with GPL software? 
-
-[USER] Questions on using the OpenSSL applications
-
-* Why do I get a "PRNG not seeded" error message?
-* Why do I get an "unable to write 'random state'" error message?
-* How do I create certificates or certificate requests?
-* Why can't I create certificate requests?
-* Why does <SSL program> fail with a certificate verify error?
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-* How can I create DSA certificates?
-* Why can't I make an SSL connection using a DSA certificate?
-* How can I remove the passphrase on a private key?
-* Why can't I use OpenSSL certificates with SSL client authentication?
-* Why does my browser give a warning about a mismatched hostname?
-* How do I install a CA certificate into a browser?
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-
-[BUILD] Questions about building and testing OpenSSL
-
-* Why does the linker complain about undefined symbols?
-* Why does the OpenSSL test fail with "bc: command not found"?
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-* Why does the OpenSSL test fail with "bc: stack empty"?
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-* What is special about OpenSSL on Redhat?
-* Why does the OpenSSL compilation fail on MacOS X?
-* Why does the OpenSSL test suite fail on MacOS X?
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-
-[PROG] Questions about programming with OpenSSL
-
-* Is OpenSSL thread-safe?
-* I've compiled a program under Windows and it crashes: why?
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-* I've called <some function> and it fails, why?
-* I just get a load of numbers for the error output, what do they mean?
-* Why do I get errors about unknown algorithms?
-* Why can't the OpenSSH configure script detect OpenSSL?
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-* 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?
-
-===============================================================================
-
-[MISC] ========================================================================
-
-* Which is the current version of OpenSSL?
-
-The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.7g was released on April 11, 2005.
-
-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 CVS access.
-
-
-* Where is the documentation?
-
-OpenSSL is a library that provides cryptographic functionality to
-applications such as secure web servers.  Be sure to read the
-documentation of the application you want to use.  The INSTALL file
-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.  A
-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/>.
-
-For information on parts of libcrypto that are not yet documented, you
-might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
-predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
-of this still applies to OpenSSL.
-
-There is some documentation about certificate extensions and PKCS#12
-in doc/openssl.txt
-
-The original SSLeay documentation is included in OpenSSL as
-doc/ssleay.txt.  It may be useful when none of the other resources
-help, but please note that it reflects the obsolete version SSLeay
-0.6.6.
-
-
-* How can I contact the OpenSSL developers?
-
-The README file describes how to submit bug reports and patches to
-OpenSSL.  Information on the OpenSSL mailing lists is available from
-<URL: http://www.openssl.org>.
-
-
-* Where can I get a compiled version of OpenSSL?
-
-You can finder pointers to binary distributions in
-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
-yourself; the application will include the required parts (e.g. DLLs).
-
-If you want to build OpenSSL on a Windows system and you don't have
-a C compiler, read the "Mingw32" section of INSTALL.W32 for information
-on how to obtain and install the free GNU C compiler.
-
-A number of Linux and *BSD distributions include OpenSSL.
-
-
-* Why aren't tools like 'autoconf' and 'libtool' used?
-
-autoconf will probably be used in future OpenSSL versions. If it was
-less Unix-centric, it might have been used much earlier.
-
-* What is an 'engine' version?
-
-With version 0.9.6 OpenSSL was extended to interface to external crypto
-hardware. This was realized in a special release '0.9.6-engine'. With
-version 0.9.7 (not yet released) the changes were merged into the main
-development line, so that the special release is no longer necessary.
-
-* How do I check the authenticity of the OpenSSL distribution?
-
-We provide MD5 digests and ASC signatures of each tarball.
-Use MD5 to check that a tarball from a mirror site is identical:
-
-   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
-
-You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server, see a
-list of keys at <URL: http://www.openssl.org/about/>). Then
-just do:
-
-   pgp TARBALL.asc
-
-[LEGAL] =======================================================================
-
-* Do I need patent licenses to use OpenSSL?
-
-The patents section of the README file lists patents that may apply to
-you if you want to use OpenSSL.  For information on intellectual
-property rights, please consult a lawyer.  The OpenSSL team does not
-offer legal advice.
-
-You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
- ./config no-idea no-mdc2 no-rc5
-
-
-* Can I use OpenSSL with GPL software?
-
-On many systems including the major Linux and BSD distributions, yes (the
-GPL does not place restrictions on using libraries that are part of the
-normal operating system distribution).
-
-On other systems, the situation is less clear. Some GPL software copyright
-holders claim that you infringe on their rights if you use OpenSSL with
-their software on operating systems that don't normally include OpenSSL.
-
-If you develop open source software that uses OpenSSL, you may find it
-useful to choose an other license than the GPL, or state explicitly that
-"This program is released under the GPL with the additional exemption that
-compiling, linking, and/or using OpenSSL is allowed."  If you are using
-GPL software developed by others, you may want to ask the copyright holder
-for permission to use their software with OpenSSL.
-
-
-[USER] ========================================================================
-
-* Why do I get a "PRNG not seeded" error message?
-
-Cryptographic software needs a source of unpredictable data to work
-correctly.  Many open source operating systems provide a "randomness
-device" (/dev/urandom or /dev/random) that serves this purpose.
-All OpenSSL versions try to use /dev/urandom by default; starting with
-version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
-available.
-
-On other systems, applications have to call the RAND_add() or
-RAND_seed() function with appropriate data before generating keys or
-performing public key encryption. (These functions initialize the
-pseudo-random number generator, PRNG.)  Some broken applications do
-not do this.  As of version 0.9.5, the OpenSSL functions that need
-randomness report an error if the random number generator has not been
-seeded with at least 128 bits of randomness.  If this error occurs and
-is not discussed in the documentation of the application you are
-using, please contact the author of that application; it is likely
-that it never worked correctly.  OpenSSL 0.9.5 and later make the
-error visible by refusing to perform potentially insecure encryption.
-
-If you are using Solaris 8, you can add /dev/urandom and /dev/random
-devices by installing patch 112438 (Sparc) or 112439 (x86), which are
-available via the Patchfinder at <URL: http://sunsolve.sun.com>
-(Solaris 9 includes these devices by default). For /dev/random support
-for earlier Solaris versions, see Sun's statement at
-<URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
-(the SUNWski package is available in patch 105710).
-
-On systems without /dev/urandom and /dev/random, it is a good idea to
-use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
-details.  Starting with version 0.9.7, OpenSSL will automatically look
-for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
-/etc/entropy.
-
-Most components of the openssl command line utility automatically try
-to seed the random number generator from a file.  The name of the
-default seeding file is determined as follows: If environment variable
-RANDFILE is set, then it names the seeding file.  Otherwise if
-environment variable HOME is set, then the seeding file is $HOME/.rnd.
-If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
-use file .rnd in the current directory while OpenSSL 0.9.6a uses no
-default seeding file at all.  OpenSSL 0.9.6b and later will behave
-similarly to 0.9.6a, but will use a default of "C:\" for HOME on
-Windows systems if the environment variable has not been set.
-
-If the default seeding file does not exist or is too short, the "PRNG
-not seeded" error message may occur.
-
-The openssl command line utility will write back a new state to the
-default seeding file (and create this file if necessary) unless
-there was no sufficient seeding.
-
-Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
-Use the "-rand" option of the OpenSSL command line tools instead.
-The $RANDFILE environment variable and $HOME/.rnd are only used by the
-OpenSSL command line tools. Applications using the OpenSSL library
-provide their own configuration options to specify the entropy source,
-please check out the documentation coming the with application.
-
-
-* Why do I get an "unable to write 'random state'" error message?
-
-
-Sometimes the openssl command line utility does not abort with
-a "PRNG not seeded" error message, but complains that it is
-"unable to write 'random state'".  This message refers to the
-default seeding file (see previous answer).  A possible reason
-is that no default filename is known because neither RANDFILE
-nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
-current directory in this case, but this has changed with 0.9.6a.)
-
-
-* How do I create certificates or certificate requests?
-
-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 (currently in doc/openssl.txt).
-
-
-* Why can't I create certificate requests?
-
-You typically get the error:
-
-	unable to find 'distinguished_name' in config
-	problems making Certificate Request
-
-This is because it can't find the configuration file. Check out the
-DIAGNOSTICS section of req(1) for more information.
-
-
-* Why does <SSL program> fail with a certificate verify error?
-
-This problem is usually indicated by log messages saying something like
-"unable to get local issuer certificate" or "self signed certificate".
-When a certificate is verified its root CA must be "trusted" by OpenSSL
-this typically means that the CA certificate must be placed in a directory
-or file and the relevant program configured to read it. The OpenSSL program
-'verify' behaves in a similar way and issues similar error messages: check
-the verify(1) program manual page for more information.
-
-
-* Why can I only use weak ciphers when I connect to a server using OpenSSL?
-
-This is almost certainly because you are using an old "export grade" browser
-which only supports weak encryption. Upgrade your browser to support 128 bit
-ciphers.
-
-
-* How can I create DSA certificates?
-
-Check the CA.pl(1) manual page for a DSA certificate example.
-
-
-* Why can't I make an SSL connection to a server using a DSA certificate?
-
-Typically you'll see a message saying there are no shared ciphers when
-the same setup works fine with an RSA certificate. There are two possible
-causes. The client may not support connections to DSA servers most web
-browsers (including Netscape and MSIE) only support connections to servers
-supporting RSA cipher suites. The other cause is that a set of DH parameters
-has not been supplied to the server. DH parameters can be created with the
-dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
-check the source to s_server in apps/s_server.c for an example.
-
-
-* How can I remove the passphrase on a private key?
-
-Firstly you should be really *really* sure you want to do this. Leaving
-a private key unencrypted is a major security risk. If you decide that
-you do have to do this check the EXAMPLES sections of the rsa(1) and
-dsa(1) manual pages.
-
-
-* Why can't I use OpenSSL certificates with SSL client authentication?
-
-What will typically happen is that when a server requests authentication
-it will either not include your certificate or tell you that you have
-no client certificates (Netscape) or present you with an empty list box
-(MSIE). The reason for this is that when a server requests a client
-certificate it includes a list of CAs names which it will accept. Browsers
-will only let you select certificates from the list on the grounds that
-there is little point presenting a certificate which the server will
-reject.
-
-The solution is to add the relevant CA certificate to your servers "trusted
-CA list". How you do this depends on the server software in uses. You can
-print out the servers list of acceptable CAs using the OpenSSL s_client tool:
-
-openssl s_client -connect www.some.host:443 -prexit
-
-If your server only requests certificates on certain URLs then you may need
-to manually issue an HTTP GET command to get the list when s_client connects:
-
-GET /some/page/needing/a/certificate.html
-
-If your CA does not appear in the list then this confirms the problem.
-
-
-* Why does my browser give a warning about a mismatched hostname?
-
-Browsers expect the server's hostname to match the value in the commonName
-(CN) field of the certificate. If it does not then you get a warning.
-
-
-* How do I install a CA certificate into a browser?
-
-The usual way is to send the DER encoded certificate to the browser as
-MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
-link. On MSIE certain extensions such as .der or .cacert may also work, or you
-can import the certificate using the certificate import wizard.
-
-You can convert a certificate to DER form using the command:
-
-openssl x509 -in ca.pem -outform DER -out ca.der
-
-Occasionally someone suggests using a command such as:
-
-openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
-
-DO NOT DO THIS! This command will give away your CAs private key and
-reduces its security to zero: allowing anyone to forge certificates in
-whatever name they choose.
-
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-
-The ways to print out the oneline format of the DN (Distinguished Name) have
-been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
-interface, the "-nameopt" option could be introduded. See the manual
-page of the "openssl x509" commandline tool for details. The old behaviour
-has however been left as default for the sake of compatibility.
-
-[BUILD] =======================================================================
-
-* Why does the linker complain about undefined symbols?
-
-Maybe the compilation was interrupted, and make doesn't notice that
-something is missing.  Run "make clean; make".
-
-If you used ./Configure instead of ./config, make sure that you
-selected the right target.  File formats may differ slightly between
-OS versions (for example sparcv8/sparcv9, or a.out/elf).
-
-In case you get errors about the following symbols, use the config
-option "no-asm", as described in INSTALL:
-
- BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
- CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
- RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
- bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
- bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
- des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
- des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
-
-If none of these helps, you may want to try using the current snapshot.
-If the problem persists, please submit a bug report.
-
-
-* Why does the OpenSSL test fail with "bc: command not found"?
-
-You didn't install "bc", the Unix calculator.  If you want to run the
-tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
-
-
-* Why does the OpenSSL test fail with "bc: 1 no implemented"?
-
-On some SCO installations or versions, bc has a bug that gets triggered
-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 http://www.gnu.org/software/software.html
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL test fail with "bc: stack empty"?
-
-On some DG/ux versions, bc seems to have a too small stack for calculations
-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 http://www.gnu.org/software/software.html
-for download instructions) can be safely used, for example.
-
-
-* Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
-
-On some Alpha installations running Tru64 Unix and Compaq C, the compilation
-of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
-memory to continue compilation.'  As far as the tests have shown, this may be
-a compiler bug.  What happens is that it eats up a lot of resident memory
-to build something, probably a table.  The problem is clearly in the
-optimization code, because if one eliminates optimization completely (-O0),
-the compilation goes through (and the compiler consumes about 2MB of resident
-memory instead of 240MB or whatever one's limit is currently).
-
-There are three options to solve this problem:
-
-1. set your current data segment size soft limit higher.  Experience shows
-that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
-this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
-kbytes to set the limit to.
-
-2. If you have a hard limit that is lower than what you need and you can't
-get it changed, you can compile all of OpenSSL with -O0 as optimization
-level.  This is however not a very nice thing to do for those who expect to
-get the best result from OpenSSL.  A bit more complicated solution is the
-following:
-
------ snip:start -----
-  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
-       sed -e 's/ -O[0-9] / -O0 /'`"
-  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
-  make
------ snip:end -----
-
-This will only compile sha_dgst.c with -O0, the rest with the optimization
-level chosen by the configuration process.  When the above is done, do the
-test and installation and you're set.
-
-3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It 
-should not be used and is not used in SSL/TLS nor any other recognized
-protocol in either case.
-
-
-* Why does the OpenSSL compilation fail with "ar: command not found"?
-
-Getting this message is quite usual on Solaris 2, because Sun has hidden
-away 'ar' and other development commands in directories that aren't in
-$PATH by default.  One of those directories is '/usr/ccs/bin'.  The
-quickest way to fix this is to do the following (it assumes you use sh
-or any sh-compatible shell):
-
------ snip:start -----
-  PATH=${PATH}:/usr/ccs/bin; export PATH
------ snip:end -----
-
-and then redo the compilation.  What you should really do is make sure
-'/usr/ccs/bin' is permanently in your $PATH, for example through your
-'.profile' (again, assuming you use a sh-compatible shell).
-
-
-* Why does the OpenSSL compilation fail on Win32 with VC++?
-
-Sometimes, you may get reports from VC++ command line (cl) that it
-can't find standard include files like stdio.h and other weirdnesses.
-One possible cause is that the environment isn't correctly set up.
-To solve that problem for VC++ versions up to 6, one should run
-VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
-installation directory (somewhere under 'Program Files').  For VC++
-version 7 (and up?), which is also called VS.NET, the file is called
-VSVARS32.BAT instead.
-This needs to be done prior to running NMAKE, and the changes are only
-valid for the current DOS session.
-
-
-* What is special about OpenSSL on Redhat?
-
-Red Hat Linux (release 7.0 and later) include a preinstalled limited
-version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
-is disabled in this version. The same may apply to other Linux distributions.
-Users may therefore wish to install more or all of the features left out.
-
-To do this you MUST ensure that you do not overwrite the openssl that is in
-/usr/bin on your Red Hat machine. Several packages depend on this file,
-including sendmail and ssh. /usr/local/bin is a good alternative choice. The
-libraries that come with Red Hat 7.0 onwards have different names and so are
-not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
-/lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
-/lib/libcrypto.so.2 respectively).
-
-Please note that we have been advised by Red Hat attempting to recompile the
-openssl rpm with all the cryptography enabled will not work. All other
-packages depend on the original Red Hat supplied openssl package. It is also
-worth noting that due to the way Red Hat supplies its packages, updates to
-openssl on each distribution never change the package version, only the
-build number. For example, on Red Hat 7.1, the latest openssl package has
-version number 0.9.6 and build number 9 even though it contains all the
-relevant updates in packages up to and including 0.9.6b.
-
-A possible way around this is to persuade Red Hat to produce a non-US
-version of Red Hat Linux.
-
-FYI: Patent numbers and expiry dates of US patents:
-MDC-2: 4,908,861 13/03/2007
-IDEA:  5,214,703 25/05/2010
-RC5:   5,724,428 03/03/2015
-
-
-* Why does the OpenSSL compilation fail on MacOS X?
-
-If the failure happens when trying to build the "openssl" binary, with
-a large number of undefined symbols, it's very probable that you have
-OpenSSL 0.9.6b delivered with the operating system (you can find out by
-running '/usr/bin/openssl version') and that you were trying to build
-OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
-MacOS X has a misfeature that's quite difficult to go around.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-
-* Why does the OpenSSL test suite fail on MacOS X?
-
-If the failure happens when running 'make test' and the RC4 test fails,
-it's very probable that you have OpenSSL 0.9.6b delivered with the
-operating system (you can find out by running '/usr/bin/openssl version')
-and that you were trying to build OpenSSL 0.9.6d.  The problem is that
-the loader ('ld') in MacOS X has a misfeature that's quite difficult to
-go around and has linked the programs "openssl" and the test programs
-with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
-libraries you just built.
-Look in the file PROBLEMS for a more detailed explanation and for possible
-solutions.
-
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-
-Failure in BN_sqr test is most likely caused by a failure to configure the
-toolkit for current platform or lack of support for the platform in question.
-Run './config -t' and './apps/openssl version -p'. Do these platform
-identifiers match? If they don't, then you most likely failed to run
-./config and you're hereby advised to do so before filing a bug report.
-If ./config itself fails to run, then it's most likely problem with your
-local environment and you should turn to your system administrator (or
-similar). If identifiers match (and/or no alternative identifier is
-suggested by ./config script), then the platform is unsupported. There might
-or might not be a workaround. Most notably on SPARC64 platforms with GNU
-C compiler you should be able to produce a working build by running
-'./config -m32'. I understand that -m32 might not be what you want/need,
-but the build should be operational. For further details turn to
-<openssl-dev@openssl.org>.
-
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
-
-As of 0.9.7 assembler routines were overhauled for position independence
-of the machine code, which is essential for shared library support. For
-some reason OpenBSD is equipped with an out-of-date GNU assembler which
-finds the new code offensive. To work around the problem, configure with
-no-asm (and sacrifice a great deal of performance) or patch your assembler
-according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
-For your convenience a pre-compiled replacement binary is provided at
-<URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
-Reportedly elder *BSD a.out platforms also suffer from this problem and
-remedy should be same. Provided binary is statically linked and should be
-working across wider range of *BSD branches, not just OpenBSD.
-
-* Why does the OpenSSL test suite fail in sha512t on x86 CPU?
-
-If the test program in question fails withs SIGILL, Illegal Instruction
-exception, then you more than likely to run SSE2-capable CPU, such as
-Intel P4, under control of kernel which does not support SSE2
-instruction extentions. See accompanying INSTALL file and
-OPENSSL_ia32cap(3) documentation page for further information.
-
-[PROG] ========================================================================
-
-* Is OpenSSL thread-safe?
-
-Yes (with limitations: an SSL connection may not concurrently be used
-by multiple threads).  On Windows and many Unix systems, OpenSSL
-automatically uses the multi-threaded versions of the standard
-libraries.  If your platform is not one of these, consult the INSTALL
-file.
-
-Multi-threaded applications must provide two callback functions to
-OpenSSL.  This is described in the threads(3) manpage.
-
-
-* I've compiled a program under Windows and it crashes: why?
-
-This is usually because you've missed the comment in INSTALL.W32.
-Your application must link against the same version of the Win32
-C-Runtime against which your openssl libraries were linked.  The
-default version for OpenSSL is /MD - "Multithreaded DLL".
-
-If you are using Microsoft Visual C++'s IDE (Visual Studio), in
-many cases, your new project most likely defaulted to "Debug
-Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
-program will crash, typically on the first BIO related read or write
-operation.
-
-For each of the six possible link stage configurations within Win32,
-your application must link  against the same by which OpenSSL was
-built.  If you are using MS Visual C++ (Studio) this can be changed
-by:
-
-1.  Select Settings... from the Project Menu.
-2.  Select the C/C++ Tab.
-3.  Select "Code Generation from the "Category" drop down list box
-4.  Select the Appropriate library (see table below) from the "Use
-    run-time library" drop down list box.  Perform this step for both
-    your debug and release versions of your application (look at the
-    top left of the settings panel to change between the two)
-
-    Single Threaded           /ML        -  MS VC++ often defaults to
-                                            this for the release
-                                            version of a new project.
-    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
-                                            this for the debug version
-                                            of a new project.
-    Multithreaded             /MT
-    Debug Multithreaded       /MTd
-    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
-    Debug Multithreaded DLL   /MDd
-
-Note that debug and release libraries are NOT interchangeable.  If you
-built OpenSSL with /MD your application must use /MD and cannot use /MDd.
-
-As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL
-.DLLs compiled with some specific run-time option [we recommend the
-default /MD] can be deployed with application compiled with different
-option or even different compiler. But there is a catch! Instead of
-re-compiling OpenSSL toolkit, as you would have to with prior versions,
-you have to compile small C snippet with compiler and/or options of
-your choice. The snippet gets installed as
-<install-root>/include/openssl/applink.c and should be either added to
-your project or simply #include-d in one [and only one] of your source
-files. Failure to do either manifests itself as fatal "no
-OPENSSL_Applink" error.
-
-* How do I read or write a DER encoded buffer using the ASN1 functions?
-
-You have two options. You can either use a memory BIO in conjunction
-with the i2d_*_bio() or d2i_*_bio() functions or you can use the
-i2d_*(), d2i_*() functions directly. Since these are often the
-cause of grief here are some code fragments using PKCS7 as an example:
-
- unsigned char *buf, *p;
- int len;
-
- len = i2d_PKCS7(p7, NULL);
- buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
- p = buf;
- i2d_PKCS7(p7, &p);
-
-At this point buf contains the len bytes of the DER encoding of
-p7.
-
-The opposite assumes we already have len bytes in buf:
-
- unsigned char *p;
- p = buf;
- p7 = d2i_PKCS7(NULL, &p, len);
-
-At this point p7 contains a valid PKCS7 structure of NULL if an error
-occurred. If an error occurred ERR_print_errors(bio) should give more
-information.
-
-The reason for the temporary variable 'p' is that the ASN1 functions
-increment the passed pointer so it is ready to read or write the next
-structure. This is often a cause of problems: without the temporary
-variable the buffer pointer is changed to point just after the data
-that has been read or written. This may well be uninitialized data
-and attempts to free the buffer will have unpredictable results
-because it no longer points to the same address.
-
-
-* OpenSSL uses DER but I need BER format: does OpenSSL support BER?
-
-The short answer is yes, because DER is a special case of BER and OpenSSL
-ASN1 decoders can process BER.
-
-The longer answer is that ASN1 structures can be encoded in a number of
-different ways. One set of ways is the Basic Encoding Rules (BER) with various
-permissible encodings. A restriction of BER is the Distinguished Encoding
-Rules (DER): these uniquely specify how a given structure is encoded.
-
-Therefore, because DER is a special case of BER, DER is an acceptable encoding
-for BER.
-
-
-* I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
-
-This usually happens when you try compiling something using the PKCS#12
-macros with a C++ compiler. There is hardly ever any need to use the
-PKCS#12 macros in a program, it is much easier to parse and create
-PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
-documented in doc/openssl.txt and with examples in demos/pkcs12. The
-'pkcs12' application has to use the macros because it prints out 
-debugging information.
-
-
-* I've called <some function> and it fails, why?
-
-Before submitting a report or asking in one of the mailing lists, you
-should try to determine the cause. In particular, you should call
-ERR_print_errors() or ERR_print_errors_fp() after the failed call
-and see if the message helps. Note that the problem may occur earlier
-than you think -- you should check for errors after every call where
-it is possible, otherwise the actual problem may be hidden because
-some OpenSSL functions clear the error state.
-
-
-* I just get a load of numbers for the error output, what do they mean?
-
-The actual format is described in the ERR_print_errors() manual page.
-You should call the function ERR_load_crypto_strings() before hand and
-the message will be output in text form. If you can't do this (for example
-it is a pre-compiled binary) you can use the errstr utility on the error
-code itself (the hex digits after the second colon).
-
-
-* Why do I get errors about unknown algorithms?
-
-This can happen under several circumstances such as reading in an
-encrypted private key or attempting to decrypt a PKCS#12 file. The cause
-is forgetting to load OpenSSL's table of algorithms with
-OpenSSL_add_all_algorithms(). See the manual page for more information.
-
-
-* Why can't the OpenSSH configure script detect OpenSSL?
-
-Several reasons for problems with the automatic detection exist.
-OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
-Sometimes the distribution has installed an older version in the system
-locations that is detected instead of a new one installed. The OpenSSL
-library might have been compiled for another CPU or another mode (32/64 bits).
-Permissions might be wrong.
-
-The general answer is to check the config.log file generated when running
-the OpenSSH configure script. It should contain the detailed information
-on why the OpenSSL library was not detected or considered incompatible.
-
-
-* Can I use OpenSSL's SSL library with non-blocking I/O?
-
-Yes; make sure to read the SSL_get_error(3) manual page!
-
-A pitfall to avoid: Don't assume that SSL_read() will just read from
-the underlying transport or that SSL_write() will just write to it --
-it is also possible that SSL_write() cannot do any useful work until
-there is data to read, or that SSL_read() cannot do anything until it
-is possible to send data.  One reason for this is that the peer may
-request a new TLS/SSL handshake at any time during the protocol,
-requiring a bi-directional message exchange; both SSL_read() and
-SSL_write() will try to continue any pending handshake.
-
-
-* Why doesn't my server application receive a client certificate?
-
-Due to the TLS protocol definition, a client will only send a certificate,
-if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
-SSL_CTX_set_verify() function to enable the use of client certificates.
-
-
-* Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
-
-For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
-versions, uniqueIdentifier was incorrectly used for X.509 certificates.
-The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
-Change your code to use the new name when compiling against OpenSSL 0.9.7.
-
-
-* I think I've detected a memory leak, is this a bug?
-
-In most cases the cause of an apparent memory leak is an OpenSSL internal table
-that is allocated when an application starts up. Since such tables do not grow
-in size over time they are harmless.
-
-These internal tables can be freed up when an application closes using various
-functions.  Currently these include following:
-
-Thread-local cleanup functions:
-
-  ERR_remove_state()
-
-Application-global cleanup functions that are aware of usage (and therefore
-thread-safe):
-
-  ENGINE_cleanup() and CONF_modules_unload()
-
-"Brutal" (thread-unsafe) Application-global cleanup functions:
-
-  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
-
-
-===============================================================================
-

INSTALL

@@ -75,7 +75,9 @@
   no-asm        Do not use assembler code.
 
   386           Use the 80386 instruction set only (the default x86 code is
-                more efficient, but requires at least a 486).
+                more efficient, but requires at least a 486). Note: Use
+                compiler flags for any other CPU specific configuration,
+                e.g. "-m32" to build x86 code on an x64 system.
 
   no-sse2	Exclude SSE2 code pathes. Normally SSE2 extention is
 		detected at run-time, but the decision whether or not the
@@ -96,7 +98,7 @@
                 The crypto/<cipher> directory can be removed after running
                 "make depend".
 
-  -Dxxx, -lxxx, -Lxxx, -fxxx, -Kxxx These system specific options will
+  -Dxxx, -lxxx, -Lxxx, -fxxx, -mxxx, -Kxxx These system specific options will
                 be passed through to the compiler to allow you to
                 define preprocessor symbols, specify additional libraries,
                 library directories or other compiler options.
@@ -156,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/rt2.html and will be forwarded to a
+     via http://www.openssl.org/support/rt.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.
@@ -178,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/rt2.html.
+     http://www.openssl.org/support/rt.html.
 
   4. If everything tests ok, install OpenSSL with
 
@@ -300,10 +302,10 @@
  Note on shared libraries
  ------------------------
 
- Shared library is currently an experimental feature.  The only reason to
+ Shared libraries have certain caveats.  Binary backward compatibility
- have them would be to conserve memory on systems where several program
+ can't be guaranteed before OpenSSL version 1.0.  The only reason to
- are using OpenSSL.  Binary backward compatibility can't be guaranteed
+ use them would be to conserve memory on systems where several programs
- before OpenSSL version 1.0.
+ are using OpenSSL.
 
  For some systems, the OpenSSL Configure script knows what is needed to
  build shared libraries for libcrypto and libssl.  On these systems,
@@ -328,7 +330,7 @@
  Note on support for multiple builds
  -----------------------------------
 
- OpenSSL is usually built in it's source tree.  Unfortunately, this doesn't
+ OpenSSL is usually built in its source tree.  Unfortunately, this doesn't
  support building for multiple platforms from the same source tree very well.
  It is however possible to build in a separate tree through the use of lots
  of symbolic links, which should be prepared like this:

INSTALL.NW

@@ -8,54 +8,62 @@ 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
+tested on W2K.  The scripts should run fine on other Windows platforms
-platforms (NT, Win9x, WinXP) but they haven't been tested.  They may require 
+(NT, Win9x, WinXP) but they have not been tested.  They may require some
-some modifications.
+modifications.
 
 
 Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
-------------------------------------------
+-------------------------------------------------------
-OpenSSL uses the WinSock interfaces introduced in NetWare 5.  Therefore,
+OpenSSL can either use the WinSock interfaces introduced in NetWare 5,
-previous versions of NetWare, 4.x and 3.x, are not supported.
+or the BSD socket interface.  Previous versions of NetWare, 4.x and 3.x,
+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 configured to build using CLIB or LibC.  The 
+The NetWare port of OpenSSL can be configured to build using CLIB or LIBC.
-CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LibC 
+The 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.
+build (NetWare 5.1 SP8 is known to work).
 
+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 - required:
+   Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare (commercial):
       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
@@ -75,11 +83,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.
 
-   gmake.exe - GNU make for Windows (version 3.75 used for development)
+   make.exe - GNU make for Windows (version 3.75 used for development)
-         http://www.gnu.org/software/make/make.html
+         http://gnuwin32.sourceforge.net/packages/make.htm
 
    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)
 
@@ -95,7 +103,12 @@ following tools may be required:
          Microsoft SDK.  Note: The winsock2.h support headers may change
          with various versions of winsock2.h.  Check the dependencies
          section on the NDK WinSock2 download page for the latest
-         information on dependencies.
+         information on dependencies. These components are unsupported by
+         Novell. They are provided as a courtesy, but it is strongly
+         suggested that all development be done using LIBC, not CLIB.
+
+         As of June 2005, the WinSock2 components are available at:
+         http://forgeftp.novell.com//ws2comp/
 
 
       NLM and NetWare libraries for C (including CLIB and XPlat):
@@ -114,14 +127,15 @@ 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.  It
+         NOTE: The LIBC SDK includes the necessary WinSock2 support.
-         It is not necessary to download the WinSock2 Developer when building
+         It is not necessary to download the WinSock2 NDK when building for
-         for LibC.
+         LIBC. The LIBC SDK also includes the appropriate BSD socket support
+         if configuring to use BSD sockets.
 
 
 BUILDING:
@@ -133,33 +147,36 @@ 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]
+   netware\set_env.bat <target> [compiler]
 
-      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.
 
-   MWCIncludes - The location of the NDK include files.
+   INCLUDE - The location of the NDK include files.
          
-            CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
+            CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm
-            LibC ex: set MWCIncludes=c:\ndk\libc\include
+            LIBC ex: set INCLUDE=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
@@ -172,8 +189,10 @@ 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
+      target        - "netware-clib" - CLIB NetWare build (WinSock Sockets)
-                    - "netware-libc" - LibC NetWare build
+                    - "netware-clib-bsdsock" - CLIB NetWare build (BSD Sockets)
+                    - "netware-libc" - LIBC NetWare build (WinSock Sockets)
+                    - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets)
  
       debug opts    - "debug"  - build debug
 
@@ -182,35 +201,41 @@ 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
+                      perl 'configure' script. See that script for
+                      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:
+      LIBC build, non-debug, using NASM assembly, add mdc2 support:
-         netware\build.bat netware-libc nw-nasm
+         netware\build.bat netware-libc nw-nasm enable-mdc2
+
+      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.mak 
+   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 
 
 
 You can also run the build scripts manually if you do not want to use the
 build.bat file.  Run the following scripts in the "\openssl"
 subdirectory (in the order listed below):
 
-   perl configure no-asm [other config opts] [netware-clib|netware-libc]
+   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)
 
-   perl util\mk1mf.pl no-asm [other config opts] [netware-clib|netware-libc >netware\nlm.mak
+   perl util\mk1mf.pl no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock >netware\nlm.mak
       generates the makefile for NetWare
 
    gmake -f netware\nlm.mak
@@ -235,12 +260,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
@@ -266,7 +291,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
@@ -288,13 +313,6 @@ The do_tests.pl script generates a log file "\openssl\test_out\tests.log"
 which should be reviewed for errors.  Any errors will be denoted by the word
 "ERROR" in the log.
 
-NOTE:  Currently (11/2002), the LibC test nlms report an error while loading
-       when launched from the perl script (do_tests.pl).  The problems are 
-       being addressed by the LibC development team and should be fixed in the
-       next release.  Until the problems are corrected, the LibC test nlms 
-       will have to be executed manually.  
-
-
 DEVELOPING WITH THE OPENSSL SDK:
 --------------------------------
 Now that everything is built and tested, you are ready to use the OpenSSL
@@ -348,9 +366,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\crypto\threads\mttest.c"
+is described in doc\threads.doc.  The file "openssl-x.x.x\crypto\threads\mttest.c"
 is a multi-threaded test program and demonstrates the locking functions.
 
 
@@ -420,7 +438,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.mak vclean) and retry.
+experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry.
 
 
 "Undefined Symbol" Linker errors

INSTALL.W32

@@ -3,6 +3,7 @@
  ----------------------------------
 
  [Instructions for building for Windows CE can be found in INSTALL.WCE]
+ [Instructions for building for Win64 can be found in INSTALL.W64]
 
  Heres a few comments about building OpenSSL in Windows environments.  Most
  of this is tested on Win32 but it may also work in Win 3.1 with some
@@ -17,7 +18,7 @@
   * Borland C
   * GNU C (Cygwin or MinGW)
 
- If you are compiling from a tarball or a CVS snapshot then the Win32 files
+ If you are compiling from a tarball or a Git 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.
@@ -48,7 +49,9 @@
 
  Firstly you should run Configure:
 
- > perl Configure VC-WIN32
+ > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir
+
+Where the prefix argument specifies where OpenSSL will be installed to.
 
  Next you need to build the Makefiles and optionally the assembly language
  files:
@@ -76,8 +79,12 @@
  If all is well it should compile and you will have some DLLs and executables
  in out32dll. If you want to try the tests then do:
  
- > cd out32dll
+ > nmake -f ms\ntdll.mak test
- > ..\ms\test
+
+
+To install OpenSSL to the specified location do:
+
+> nmake -f ms\ntdll.mak install
 
  Tweaks:
 
@@ -87,6 +94,12 @@
  compiled in. Note that mk1mf.pl expects the platform to be the last argument
  on the command line, so 'debug' must appear before that, as all other options.
 
+
+ By default in 0.9.8 OpenSSL will compile builtin ENGINES into the libeay32.dll
+ shared library. If you specify the "no-static-engine" option on the command
+ line to Configure the shared library build (ms\ntdll.mak) will compile the
+ engines as separate DLLs.
+
  The default Win32 environment is to leave out any Windows NT specific
  features.
 
@@ -97,6 +110,8 @@
  You can also build a static version of the library using the Makefile
  ms\nt.mak
 
+
+
  Borland C++ builder 5
  ---------------------
 
@@ -249,7 +264,7 @@
 
  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 CVS tree: so anything linked against this version of the
+ assigned in the Git 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
@@ -286,3 +301,21 @@
  (e.g. fopen()), and OpenSSL cannot change these; so in general you cannot
  rely on CRYPTO_malloc_init() solving your problem, and you should
  consistently use the multithreaded library.
+
+ Linking your application
+ ------------------------
+
+ If you link with static OpenSSL libraries [those built with ms/nt.mak],
+ then you're expected to additionally link your application with
+ WSOCK32.LIB, ADVAPI32.LIB, GDI32.LIB and USER32.LIB. Those developing
+ non-interactive service applications might feel concerned about linking
+ with latter two, as they are justly associated with interactive desktop,
+ which is not available to service processes. The toolkit is designed
+ to detect in which context it's currently executed, GUI, console app
+ or service, and act accordingly, namely whether or not to actually make
+ GUI calls.
+
+ If you link with OpenSSL .DLLs, then you're expected to include into
+ your application code small "shim" snippet, which provides glue between
+ OpenSSL BIO layer and your compiler run-time. Look up OPENSSL_Applink
+ reference page for further details.

INSTALL.W64

@@ -0,0 +1,66 @@
+
+ INSTALLATION ON THE WIN64 PLATFORM
+ ----------------------------------
+
+ Caveat lector
+ -------------
+
+ As of moment of this writing Win64 support is classified "initial"
+ for the following reasons.
+
+ - No assembler modules are engaged upon initial 0.9.8 release.
+ - API might change within 0.9.8 life-span, *but* in a manner which
+   doesn't break backward binary compatibility. Or in other words,
+   application programs compiled with initial 0.9.8 headers will
+   be expected to work with future minor release .DLL without need
+   to re-compile, even if future minor release features modified API.
+ - Above mentioned API modifications have everything to do with
+   elimination of a number of limitations, which are normally
+   considered inherent to 32-bit platforms. Which in turn is why they
+   are treated as limitations on 64-bit platform such as Win64:-)
+   The current list comprises [but not necessarily limited to]:
+
+   - null-terminated strings may not be longer than 2G-1 bytes,
+     longer strings are treated as zero-length;
+   - dynamically and *internally* allocated chunks can't be larger
+     than 2G-1 bytes;
+   - inability to encrypt/decrypt chunks of data larger than 4GB
+     [it's possibly to *hash* chunks of arbitrary size through];
+
+   Neither of these is actually big deal and hardly encountered
+   in real-life applications.
+
+ Compiling procedure
+ -------------------
+
+ You will need Perl. You can run under Cygwin or you can download
+ ActiveState Perl from http://www.activestate.com/ActivePerl.
+
+ You will need Microsoft Platform SDK, available for download at
+ http://www.microsoft.com/msdownload/platformsdk/sdkupdate/. As per
+ April 2005 Platform SDK is equipped with Win64 compilers, as well
+ as assemblers, but it might change in the future.
+
+ To build for Win64/x64:
+
+ > perl Configure VC-WIN64A
+ > ms\do_win64a
+ > nmake -f ms\ntdll.mak
+ > cd out32dll
+ > ..\ms\test
+
+ To build for Win64/IA64:
+
+ > perl Configure VC-WIN64I
+ > ms\do_win64i
+ > nmake -f ms\ntdll.mak
+ > cd out32dll
+ > ..\ms\test
+
+ Naturally test-suite itself has to be executed on the target platform.
+
+ Installation
+ ------------
+
+ TBD, for now see INSTALL.W32.
+

INSTALL.WCE

@@ -11,8 +11,11 @@
  You also need Perl for Win32.  You will need ActiveState Perl, available
  from http://www.activestate.com/ActivePerl.
 
- Windows CE support in OpenSSL relies on wcecompat.  All Windows CE specific
+ Windows CE support in OpenSSL relies on wcecompat and therefore it's
- issues should be directed to www.essemer.com.au.
+ appropriate to check http://www.essemer.com.au/windowsce/ for updates in
+ case of compilation problems. As for the moment of this writing version
+ 1.1 is available and actually required for WCE 4.2 and newer platforms.
+ All Windows CE specific issues should be directed to www.essemer.com.au.
 
  The C Runtime Library implementation for Windows CE that is included with
  Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places

LICENSE

@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2011 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 uneccessary if I were always using C++ !
+//	A bunch of evil macros that would be unnecessary if I were always using C++ !
 
 #define SetErrorMessageAndBailIfNil(theArg,theMessage)								\
 {																					\

MacOS/GetHTTPS.src/MacSocket.h

@@ -5,97 +5,98 @@
 extern "C" {
 #endif
 
-
+enum {
-
-enum
-{
     kMacSocket_TimeoutErr = -2
 };
 
-
 // Since MacSocket does busy waiting, I do a callback while waiting
 
 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
-//	Call this to allocate a "socket" (reference number is returned in outSocketNum)
+// outSocketNum)
-//	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
+// Note that inDoThreadSwitching is pretty much irrelevant right now, since I
+// ignore it
 // The inTimeoutTicks parameter is applied during reads/writes of data
-//	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
+// The inIdleWaitCallback parameter specifies a callback which is called
+// during busy-waiting periods
 // The inUserRefPtr parameter is passed back to the idle-wait callback
 
-OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
+OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
-
+                       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. 10.1.1.1:123
+// Note that inTargetAddressAndPort is in "IP:port" format-- e.g.
+// 10.1.1.1:123
 
 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!) incoming request when I listen
+// Since this a low-performance implementation, I allow a maximum of 1 (one!)
+// incoming request when I listen
 
 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
+// 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);
 
+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 inBuffLength);
+int MacSocket_send(const int inSocketNum, const void *inBuff,
+                   int inBuffLength);
 
-
+// If zero bytes were read in a call to MacSocket_recv(), it may be that the
-//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
+// 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
-//	Call this to see if the listen has completed after a call to MacSocket_listen()
+// 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
-//	You may wish to change the userRefPtr for a socket callback-- use this to do it
+// 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,const int inIPAndPortLength);
+void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
-void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
+                                 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,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
+void MacSocket_GetSocketErrorInfo(const int inSocketNum,
+                                  int *outSocketErrCode,
+                                  char *outSocketErrString,
+                                  const int inSocketErrStringMaxLength);
 
 
 #ifdef __cplusplus

MacOS/Randomizer.h

@@ -4,8 +4,7 @@
 
 #include <MacTypes.h>
 
-class CRandomizer
+class CRandomizer {
-{
  public:
     CRandomizer(void);
     void PeriodicAction(void);

MacOS/opensslconf.h

@@ -21,9 +21,11 @@
 
 #if defined(HEADER_RC4_H)
 # 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;
@@ -40,8 +42,10 @@
 #endif
 
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+/*
- * %20 speed up (longs are 8 bytes, int's are 4). */
+ * If this is set to 'unsigned int' on a DEC Alpha, this gives about a %20
+ * speed up (longs are 8 bytes, int's are 4).
+ */
 # ifndef DES_LONG
 #  define DES_LONG unsigned long
 # endif
@@ -58,9 +62,10 @@
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
+/*
- * EIGHT_BIT but I don't care since I've only used this mode
+ * The prime number generation stuff may not work when EIGHT_BIT but I don't
- * for debuging the bignum libraries */
+ * care since I've only used this mode for debuging the bignum libraries
+ */
 # undef SIXTY_FOUR_BIT_LONG
 # undef SIXTY_FOUR_BIT
 # define THIRTY_TWO_BIT
@@ -70,8 +75,10 @@
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(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
+/*
- * speedup on x86 */
+ * if this is defined data[i] is used instead of *data, this is a %20 speedup
+ * on x86
+ */
 # undef RC4_INDEX
 #endif
 
@@ -82,15 +89,19 @@
 
 #if defined(HEADER_DES_LOCL_H) && !defined(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
+/*
- * protected undef/define */
+ * the following is tweaked from a config script, that is why it is a
+ * protected undef/define
+ */
 # ifndef DES_PTR
 #  define DES_PTR
 # endif
 
-/* This helps C compiler generate the correct code for multiple functional
+/*
+ * This helps C compiler generate the correct code for multiple functional
  * units.  It reduces register dependancies at the expense of 2 more
- * registers */
+ * registers
+ */
 # ifndef DES_RISC1
 #  define DES_RISC1
 # endif
@@ -102,15 +113,14 @@
 # if defined(DES_RISC1) && defined(DES_RISC2)
 YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED ! !!!!
 # endif
-
+/*
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Unroll the inner loop, this sometimes helps, sometimes hinders. Very mucy
- * Very mucy CPU dependant */
+ * CPU dependant
+ */
 # ifndef DES_UNROLL
 #  define DES_UNROLL
 # endif
-
 #endif                          /* HEADER_DES_LOCL_H */
-
 #ifndef __POWERPC__
 # define MD32_XARRAY
 #endif

Makefile.org

@@ -65,11 +65,13 @@ EX_LIBS=
 EXE_EXT= 
 ARFLAGS=
 AR=ar $(ARFLAGS) r
+ARD=ar $(ARFLAGS) d
 RANLIB= ranlib
 PERL= perl
 TAR= tar
-TARFLAGS= --no-recursion
+TARFLAGS= --no-recursion --record-size=10240
 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
@@ -100,18 +102,50 @@ RMD160_ASM_OBJ=
 KRB5_INCLUDES=
 LIBKRB5=
 
-DIRS=   crypto ssl engines apps test tools
+# Zlib stuff
-SHLIBDIRS= crypto ssl
+ZLIB_INCLUDE=
+LIBZLIB=
+
+# This is the location of fipscanister.o and friends.
+# The FIPS module build will place it $(INSTALLTOP)/lib
+# but since $(INSTALLTOP) can only take the default value
+# when the module is built it will be in /usr/local/ssl/lib
+# $(INSTALLTOP) for this build make be different so hard
+# code the path.
+
+FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
+
+# This is set to "y" if fipscanister.o is compiled internally as
+# opposed to coming from an external validated location.
+
+FIPSCANISTERINTERNAL=n
+
+# The location of the library which contains fipscanister.o
+# normally it will be libcrypto unless fipsdso is set in which
+# case it will be libfips. If not compiling in FIPS mode at all
+# this is empty making it a useful test for a FIPS compile.
+
+FIPSCANLIB=
+
+# Shared library base address. Currently only used on Windows.
+#
+
+BASEADDR=
+
+DIRS=   crypto fips ssl engines apps test tools
+SHLIBDIRS= crypto ssl fips
 
 # dirs in crypto to build
 SDIRS=  \
 	objects \
 	md2 md4 md5 sha mdc2 hmac ripemd \
-	des aes rc2 rc4 rc5 idea bf cast \
+	des aes rc2 rc4 rc5 idea bf cast camellia seed \
 	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 pqueue
+	store cms pqueue jpake
+# keep in mind that the above list is adjusted by ./Configure
+# according to no-xxx arguments...
 
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
@@ -132,6 +166,7 @@ WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
+SHARED_FIPS=
 SHARED_LIBS=
 SHARED_LIBS_LINK_EXTS=
 SHARED_LDFLAGS=
@@ -144,18 +179,36 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
-all: Makefile build_all openssl.pc
+all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
+
+# as we stick to -e, CLEARENV ensures that local variables in lower
+# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
+# shell, which [annoyingly enough] terminates unset with error if VAR
+# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh,
+# which terminates unset with error if no variable was present:-(
+CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
+		$${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}	\
+		$${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}		\
+		$${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL}	\
+		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
+		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
+		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
+		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
+		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
+		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
 BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 		CC='${CC}' CFLAG='${CFLAG}' 			\
 		AS='${CC}' ASFLAG='${CFLAG} -c'			\
 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
-		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'		\
+		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
+		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
 		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
-		MAKEDEPEND='$$(TOP)/util/domd $$(TOP) -MD $(MAKEDEPPROG)'\
+		LIBDIR='${LIBDIR}' \
+		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
 		MAKEDEPPROG='${MAKEDEPPROG}'			\
-		LDFLAGS="$(LDFLAGS)" SHARED_LDFLAGS="$(SHARED_LDFLAGS)"	\
+		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
 		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
 		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
 		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\
@@ -168,44 +221,149 @@ BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
 		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\
 		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\
 		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\
-		THIS=$${THIS:-$@}
+		FIPSLIBDIR='${FIPSLIBDIR}'			\
+		FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"	\
+		FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'	\
+		FIPS_EX_OBJ='${FIPS_EX_OBJ}'	\
+		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
+# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
+# which in turn eliminates ambiguities in variable treatment with -e.
 
-BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
+# BUILD_CMD is a generic macro to build a given target in a given
-	if [ -d "$$dir" ]; then \
+# subdirectory.  The target must be given through the shell variable
-		(cd $$dir && echo "making $$target in $$dir..." && \
+# `target' and the subdirectory to build in must be given through `dir'.
-		$(MAKE) $(BUILDENV) $$target ) || exit 1; \
+# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
-	else \
+# BUILD_ONE_CMD instead.
-		$(MAKE) $$dir; \
+#
-	fi; fi
+# BUILD_ONE_CMD is a macro to build a given target in a given
+# subdirectory if that subdirectory is part of $(DIRS).  It requires
+# exactly the same shell variables as BUILD_CMD.
+#
+# RECURSIVE_BUILD_CMD is a macro to build a given target in all
+# 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..." && \
+		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
+	    ) || exit 1; \
+	    fi
+RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
+BUILD_ONE_CMD=\
+	if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
+		$(BUILD_CMD); \
+	fi
 
 reflect:
-	@[ -n "$(THIS)" ] && $(MAKE) $(THIS) $(BUILDENV)
+	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+
+FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
+	../crypto/aes/aes_ecb.o \
+	../crypto/aes/aes_ofb.o \
+	../crypto/bn/bn_add.o \
+	../crypto/bn/bn_blind.o \
+	../crypto/bn/bn_ctx.o \
+	../crypto/bn/bn_div.o \
+	../crypto/bn/bn_exp2.o \
+	../crypto/bn/bn_exp.o \
+	../crypto/bn/bn_gcd.o \
+	../crypto/bn/bn_lib.o \
+	../crypto/bn/bn_mod.o \
+	../crypto/bn/bn_mont.o \
+	../crypto/bn/bn_mul.o \
+	../crypto/bn/bn_prime.o \
+	../crypto/bn/bn_rand.o \
+	../crypto/bn/bn_recp.o \
+	../crypto/bn/bn_shift.o \
+	../crypto/bn/bn_sqr.o \
+	../crypto/bn/bn_word.o \
+	../crypto/bn/bn_x931p.o \
+	../crypto/buffer/buf_str.o \
+	../crypto/cryptlib.o \
+	../crypto/des/cfb64ede.o \
+	../crypto/des/cfb64enc.o \
+	../crypto/des/cfb_enc.o \
+	../crypto/des/ecb3_enc.o \
+	../crypto/des/ecb_enc.o \
+	../crypto/des/ofb64ede.o \
+	../crypto/des/ofb64enc.o \
+	../crypto/des/fcrypt.o \
+	../crypto/des/set_key.o \
+	../crypto/dsa/dsa_utl.o \
+	../crypto/dsa/dsa_sign.o \
+	../crypto/dsa/dsa_vrf.o \
+	../crypto/err/err.o \
+	../crypto/evp/digest.o \
+	../crypto/evp/enc_min.o \
+	../crypto/evp/e_aes.o \
+	../crypto/evp/e_des3.o \
+	../crypto/evp/p_sign.o \
+	../crypto/evp/p_verify.o \
+	../crypto/mem_clr.o \
+	../crypto/mem.o \
+	../crypto/rand/md_rand.o \
+	../crypto/rand/rand_egd.o \
+	../crypto/rand/randfile.o \
+	../crypto/rand/rand_lib.o \
+	../crypto/rand/rand_os2.o \
+	../crypto/rand/rand_unix.o \
+	../crypto/rand/rand_win.o \
+	../crypto/rsa/rsa_lib.o \
+	../crypto/rsa/rsa_none.o \
+	../crypto/rsa/rsa_oaep.o \
+	../crypto/rsa/rsa_pk1.o \
+	../crypto/rsa/rsa_pss.o \
+	../crypto/rsa/rsa_ssl.o \
+	../crypto/rsa/rsa_x931.o \
+	../crypto/sha/sha1dgst.o \
+	../crypto/sha/sha256.o \
+	../crypto/sha/sha512.o \
+	../crypto/uid.o
 
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
 
-build_libs: build_crypto build_ssl build_engines
+build_libs: build_crypto build_fips build_ssl build_shared build_engines
 
 build_crypto:
-	@dir=crypto; target=all; $(BUILD_CMD)
+	if [ -n "$(FIPSCANLIB)" ]; then \
-build_ssl:
+		EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
-	@dir=ssl; target=all; $(BUILD_CMD)
+		ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
-build_engines:
+	else \
-	@dir=engines; target=all; $(BUILD_CMD)
+		ARX='${AR}' ; \
-build_apps:
+	fi ; export ARX ; \
-	@dir=apps; target=all; $(BUILD_CMD)
+		dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_tests:
+build_fips:
-	@dir=test; target=all; $(BUILD_CMD)
+	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
-build_tools:
+build_ssl: build_crypto
-	@dir=tools; target=all; $(BUILD_CMD)
+	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+build_engines: build_crypto
+	@dir=engines; target=all; $(BUILD_ONE_CMD)
+build_apps: build_libs
+	@dir=apps; target=all; $(BUILD_ONE_CMD)
+build_tests: build_libs
+	@dir=test; target=all; $(BUILD_ONE_CMD)
+build_tools: build_libs
+	@dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps
 build_testapps:
-	@dir=crypto; target=testapps; $(BUILD_CMD)
+	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+build_shared:	$(SHARED_LIBS)
+libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		$(MAKE) SHLIBDIRS=crypto build-shared; \
+		if [ "$(FIPSCANLIB)" = "libfips" ]; then \
+			$(ARD) libcrypto.a fipscanister.o ; \
+			$(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
+			$(AR) libcrypto.a fips/fipscanister.o ; \
+		else \
+			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+				FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+				export CC FIPSLD_CC; \
+			fi; \
+			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
+		fi \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \
@@ -213,12 +371,32 @@ libcrypto$(SHLIB_EXT): libcrypto.a
 
 libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
+		shlibdeps=-lcrypto; \
+		[ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
+		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2 ; \
 		exit 1; \
 	fi
 
+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; \
+		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
+			CC=$${CC} LIBNAME=fips THIS=$@ \
+			LIBEXTRAS=fips/fipscanister.o \
+			LIBDEPS="$(EX_LIBS)" \
+			LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
+			link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \
+	else \
+		echo "There's no support for shared libraries on this platform" >&2; \
+		exit 1; \
+	fi
+
+libfips.a:
+	dir=fips; target=all; $(BUILD_ONE_CMD)
+
 clean-shared:
 	@set -e; for i in $(SHLIBDIRS); do \
 		if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
@@ -235,7 +413,7 @@ clean-shared:
 
 link-shared:
 	@ set -e; for i in ${SHLIBDIRS}; do \
-		$(MAKE) -f $(HERE)/Makefile.shared \
+		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
 			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			symlink.$(SHLIB_TARGET); \
@@ -249,7 +427,7 @@ do_$(SHLIB_TARGET):
 		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
-		$(MAKE) -f Makefile.shared $(BUILDENV) \
+		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
 			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			LIBDEPS="$$libs $(EX_LIBS)" \
@@ -257,10 +435,36 @@ do_$(SHLIB_TARGET):
 		libs="-l$$i $$libs"; \
 	done
 
+libcrypto.pc: Makefile
+	@ ( echo 'prefix=$(INSTALLTOP)'; \
+	    echo 'exec_prefix=$${prefix}'; \
+	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'includedir=$${prefix}/include'; \
+	    echo ''; \
+	    echo 'Name: OpenSSL-libcrypto'; \
+	    echo 'Description: OpenSSL cryptography library'; \
+	    echo 'Version: '$(VERSION); \
+	    echo 'Requires: '; \
+	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
+	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+
+libssl.pc: Makefile
+	@ ( echo 'prefix=$(INSTALLTOP)'; \
+	    echo 'exec_prefix=$${prefix}'; \
+	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'includedir=$${prefix}/include'; \
+	    echo ''; \
+	    echo 'Name: OpenSSL'; \
+	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+	    echo 'Version: '$(VERSION); \
+	    echo 'Requires: '; \
+	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+
 openssl.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/lib'; \
+	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL'; \
@@ -280,15 +484,9 @@ libclean:
 
 clean:	libclean
 	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
-	do \
+	rm -f $(LIBS)
-	if [ -d "$$i" ]; then \
+	rm -f openssl.pc libssl.pc libcrypto.pc
-		(cd $$i && echo "making clean in $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \
-		rm -f $(LIBS); \
-	fi; \
-	done;
-	rm -f openssl.pc
 	rm -f speed.* .pure
 	rm -f $(TARFILE)
 	@set -e; for i in $(ONEDIRS) ;\
@@ -302,68 +500,49 @@ makefile.one: files
 
 files:
 	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
-	do \
-	if [ -d "$$i" ]; then \
-		(cd $$i && echo "making 'files' in $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' files ) || exit 1; \
-	fi; \
-	done;
 
 links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-	@set -e; target=links; for dir in $(DIRS); do $(BUILD_CMD); done
+	@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)..." && \
-	$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:
 	rm -f *.bak
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
-	do \
-	if [ -d "$$i" ]; then \
-		(cd $$i && echo "making dclean in $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \
-	fi; \
-	done;
 
 rehash: rehash.time
-rehash.time: certs
+rehash.time: certs apps
-	@(OPENSSL="`pwd`/util/opensslwrap.sh"; \
+	@if [ -z "$(CROSS_COMPILE)" ]; then \
+		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 		OPENSSL_DEBUG_MEMORY=on; \
 		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-	  $(PERL) tools/c_rehash certs)
+		$(PERL) tools/c_rehash certs) && \
-	touch rehash.time
+		touch rehash.time; \
+	fi
 
 test:   tests
 
 tests: rehash
 	@(cd test && echo "testing..." && \
-	$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
 	util/opensslwrap.sh version -a
 
 report:
 	@$(PERL) util/selftest.pl
 
 depend:
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
-	do \
-	if [ -d "$$i" ]; then \
-		(cd $$i && echo "making dependencies $$i..." && \
-		$(MAKE) $(BUILDENV) depend ) || exit 1; \
-	fi; \
-	done;
 
 lint:
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
-	do \
-	if [ -d "$$i" ]; then \
-		(cd $$i && echo "making lint $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' lint ) || exit 1; \
-	fi; \
-	done;
 
 tags:
 	rm -f TAGS
@@ -391,36 +570,43 @@ crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt c
 apps/openssl-vms.cnf: apps/openssl.cnf
 	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
 
+crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
+	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
+
+
 TABLE: Configure
 	(echo 'Output of `Configure TABLE'"':"; \
 	$(PERL) Configure TABLE) > TABLE
 
-update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h apps/openssl-vms.cnf TABLE
+update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
 
 # Build distribution tar-file. As the list of files returned by "find" is
 # pretty long, on several platforms a "too many arguments" error or similar
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-tar:
+TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \
+	                       --owner openssl:0 --group openssl:0 \
+			       --transform 's|^|openssl-$(VERSION)/|' \
+			       -cvf -
+
+../$(TARFILE).list:
+	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
+	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
+	       \! -name '*test' \! -name '.#*' \! -name '*~' \
+	    | sort > ../$(TARFILE).list
+
+tar: ../$(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
+	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
+	rm -f ../$(TARFILE).list
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - |\
-	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
 	ls -l ../$(TARFILE).gz
 
-tar-snap:
+tar-snap: ../$(TARFILE).list
-	@$(TAR) $(TARFLAGS) -cvf - \
+	$(TAR_COMMAND) > ../$(TARFILE)
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
+	rm -f ../$(TARFILE).list
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
 	ls -l ../$(TARFILE)
 
 dist:   
@@ -430,15 +616,15 @@ dist:
 	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
 
 dist_pem_h:
-	(cd crypto/pem; $(MAKE) $(BUILDENV) pem.h; $(MAKE) clean)
+	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 
 install: all install_docs install_sw
 
 install_sw:
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
@@ -448,21 +634,15 @@ install_sw:
 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
-	@set -e; for i in $(DIRS) ;\
+	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-	do \
-	if [ -d "$$i" ]; then \
-		(cd $$i; echo "installing $$i..."; \
-		$(MAKE) $(BUILDENV) install ); \
-	fi; \
-	done
 	@set -e; for i in $(LIBS) ;\
 	do \
 		if [ -f "$$i" ]; then \
 		(       echo installing $$i; \
-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
+			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
 		fi; \
 	done;
 	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -472,22 +652,22 @@ install_sw:
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 			(       echo installing $$i; \
 				if [ "$(PLATFORM)" != "Cygwin" ]; then \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$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)/lib/$$i.new; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 				fi ); \
 			fi; \
 		done; \
 		(	here="`pwd`"; \
-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
+			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
 			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
 			echo 'OpenSSL shared libraries have been installed in:'; \
@@ -496,8 +676,12 @@ install_sw:
 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
 		fi; \
 	fi
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
+	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
+	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
 
 install_docs:
 	@$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -505,7 +689,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 \
@@ -521,8 +705,8 @@ install_docs:
 			--release=$(VERSION) `basename $$i`") \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
-			grep -v $$filecase "^$$fn\$$" | \
+			(grep -v $$filecase "^$$fn\$$"; true) | \
-			grep -v "[	]" | \
+			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
 				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
@@ -538,8 +722,8 @@ install_docs:
 			--release=$(VERSION) `basename $$i`") \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
-			grep -v $$filecase "^$$fn\$$" | \
+			(grep -v $$filecase "^$$fn\$$"; true) | \
-			grep -v "[	]" | \
+			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
 				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

Makefile.shared

@@ -89,25 +89,25 @@ CALC_VERSIONS=	\
 
 LINK_APP=	\
   ( $(SET_X);   \
-    LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
     LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $${LDCMD:=$(CC)} $${LDFLAGS:=$(CFLAGS)} \
+    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
-	-o $${APPNAME:=$(APPNAME)} $(OBJECTS) $$LIBDEPS )
 
 LINK_SO=	\
   ( $(SET_X);   \
-    LIBDEPS=$${LIBDEPS:-$(LIBDEPS)}; \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
-    nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
+    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
     LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-    $${SHAREDCMD:=$(CC)} $${SHAREDFLAGS:=$(CFLAGS) $(SHARED_LDFLAGS)} \
+    $${SHAREDCMD} $${SHAREDFLAGS} \
 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
 	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
-  ) && $(SYMLINK_SO); \
+  ) && $(SYMLINK_SO)
-  ( $(SET_X); rm -f lib$(LIBNAME).exp )
 
 SYMLINK_SO=	\
 	if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
@@ -194,12 +194,19 @@ link_app.bsd:
 	fi; $(LINK_APP)
 
 # For Darwin AKA Mac OS/X (dyld)
+# link_o.darwin produces .so, because we let it use dso_dlfcn module,
+# which has .so extension hard-coded. One can argue that one should
+# develop special dso module for MacOS X. At least manual encourages
+# to use native NSModule(3) API and refers to dlfcn as termporary hack.
 link_o.darwin:
 	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME); \
+	SHLIB=`expr "$$THIS" : '.*/\([^/\.]*\)\.'`; \
-	SHLIB_SUFFIX=.dylib; \
+	SHLIB=$${SHLIB:-lib$(LIBNAME)}; \
+	SHLIB_SUFFIX=`expr "$$THIS" : '.*\(\.[^\.]*\)$$'`; \
+	SHLIB_SUFFIX=$${SHLIB_SUFFIX:-.so}; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
@@ -213,12 +220,14 @@ link_a.darwin:
 	SHLIB_SUFFIX=.dylib; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
 	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 	fi; \
+	SHAREDFLAGS="$$SHAREDFLAGS -install_name ${INSTALLTOP}/lib/$$SHLIB${SHLIB_EXT}"; \
 	$(LINK_SO_A)
 link_app.darwin:	# is there run-path on darwin?
 	$(LINK_APP)
@@ -227,24 +236,30 @@ link_o.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
 	SHLIB=cyg$(LIBNAME); \
-	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+	base=-Wl,--enable-auto-image-base; \
+	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+		SHLIB=$(LIBNAME)eay32; base=; \
+	fi; \
 	SHLIB_SUFFIX=.dll; \
 	LIBVERSION="$(LIBVERSION)"; \
 	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
 	$(LINK_SO_O)
 link_a.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
 	SHLIB=cyg$(LIBNAME); \
-	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+	base=-Wl,--enable-auto-image-base; \
+	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+		SHLIB=$(LIBNAME)eay32; \
+		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+	fi; \
 	SHLIB_SUFFIX=.dll; \
 	SHLIB_SOVER=-$(LIBVERSION); \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
 	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
 	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
@@ -269,9 +284,9 @@ link_o.alpha-osf1:
 		SHLIB_SOVER=; \
 		ALLSYMSFLAGS='-all'; \
 		NOALLSYMSFLAGS='-none'; \
-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
+		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 		if [ -n "$$SHLIB_HIST" ]; then \
-			SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 		fi; \
 	fi; \
 	$(LINK_SO_O)
@@ -290,9 +305,9 @@ link_a.alpha-osf1:
 		SHLIB_SOVER=; \
 		ALLSYMSFLAGS='-all'; \
 		NOALLSYMSFLAGS='-none'; \
-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared"; \
+		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 		if [ -n "$$SHLIB_HIST" ]; then \
-			SHAREDFLAGS="$$SHAREDFLAGS -set_version \"$$SHLIB_HIST\""; \
+			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 		fi; \
 	fi; \
 	$(LINK_SO_A)
@@ -413,7 +428,7 @@ link_o.irix:
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.irix:
@@ -427,7 +442,7 @@ link_a.irix:
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
-		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 	fi; \
 	$(LINK_SO_A)
 link_app.irix:
@@ -446,13 +461,14 @@ link_o.hpux:
 	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).sl; \
-	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+	expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,-Fl'; \
 	NOALLSYMSFLAGS=''; \
 	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 	fi; \
+	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 	$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux:
 	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
@@ -463,8 +479,9 @@ link_a.hpux:
 	ALLSYMSFLAGS='-Wl,-Fl'; \
 	NOALLSYMSFLAGS=''; \
 	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 	fi; \
+	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 	$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
 	@if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
@@ -474,26 +491,26 @@ link_app.hpux:
 
 link_o.aix:
 	@ $(CALC_VERSIONS); \
-	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \
+	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'; \
+	ALLSYMSFLAGS=''; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
-	$(LINK_SO_O); rm -rf lib$(LIBNAME).exp
+	$(LINK_SO_O);
 link_a.aix:
 	@ $(CALC_VERSIONS); \
-	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \
+	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) -G -bE:lib$(LIBNAME).exp -bM:SRE'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_A_VIA_O)
 link_app.aix:
-	LDFLAGS="$(CFLAGS) -blibpath:$(LIBRPATH)"; \
+	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
 	$(LINK_APP)
 
 link_o.reliantunix:
@@ -532,7 +549,7 @@ symlink.hpux:
 	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 	$(SYMLINK_SO)
 # The following lines means those specific architectures do no symlinks
-symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
+symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
 
 # Compatibility targets
 link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu

NEWS

@@ -5,7 +5,323 @@
   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.7f and OpenSSL 0.9.7g:
+  Major changes between OpenSSL 0.9.8zh and OpenSSL 0.9.8zi [under development]
+
+      o
+
+  Major changes between OpenSSL 0.9.8zg and OpenSSL 0.9.8zh [3 Dec 2015]
+
+      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
+
+  Major changes between OpenSSL 0.9.8zf and OpenSSL 0.9.8zg [11 Jun 2015]
+
+      o Malformed ECParameters causes infinite loop (CVE-2015-1788)
+      o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
+      o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
+      o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
+      o Race condition handling NewSessionTicket (CVE-2015-1791)
+
+  Major changes between OpenSSL 0.9.8ze and OpenSSL 0.9.8zf [19 Mar 2015]
+
+      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]:
+
+      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]:
+
+      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]:
+
+      o Cipher string fixes.
+      o Fixes for VC++ 2005.
+      o Updated ECC cipher suite support.
+      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
+      o Zlib compression usage fixes.
+      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]:
+
+      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]:
+
+      o Major work on the BIGNUM library for higher efficiency and to
+        make operations more streamlined and less contradictory.  This
+        is the result of a major audit of the BIGNUM library.
+      o Addition of BIGNUM functions for fields GF(2^m) and NIST
+        curves, to support the Elliptic Crypto functions.
+      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
+        the use through EVP, X509 and ENGINE.
+      o New ASN.1 mini-compiler that's usable through the OpenSSL
+        configuration file.
+      o Added support for ASN.1 indefinite length constructed encoding.
+      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
+      o Complete rework of shared library construction and linking
+        programs with shared or static libraries, through a separate
+        Makefile.shared.
+      o Rework of the passing of parameters from one Makefile to another.
+      o Changed ENGINE framework to load dynamic engine modules
+        automatically from specifically given directories.
+      o New structure and ASN.1 functions for CertificatePair.
+      o Changed the ZLIB compression method to be stateful.
+      o Changed the key-generation and primality testing "progress"
+        mechanism to take a structure that contains the ticker
+        function and an argument.
+      o New engine module: GMP (performs private key exponentiation).
+      o New engine module: VIA PadLOck ACE extension in VIA C3
+        Nehemiah processors.
+      o Added support for IPv6 addresses in certificate extensions.
+        See RFC 1884, section 2.2.
+      o Added support for certificate policy mappings, policy
+        constraints and name constraints.
+      o Added support for multi-valued AVAs in the OpenSSL
+        configuration file.
+      o Added support for multiple certificates with the same subject
+        in the 'openssl ca' index file.
+      o Make it possible to create self-signed certificates using
+        'openssl ca -selfsign'.
+      o Make it possible to generate a serial number file with
+        'openssl ca -create_serial'.
+      o New binary search functions with extended functionality.
+      o New BUF functions.
+      o New STORE structure and library to provide an interface to all
+        sorts of data repositories.  Supports storage of public and
+        private keys, certificates, CRLs, numbers and arbitrary blobs.
+	This library is unfortunately unfinished and unused withing
+	OpenSSL.
+      o New control functions for the error stack.
+      o Changed the PKCS#7 library to support one-pass S/MIME
+        processing.
+      o Added the possibility to compile without old deprecated
+        functionality with the OPENSSL_NO_DEPRECATED macro or the
+        'no-deprecated' argument to the config and Configure scripts.
+      o Constification of all ASN.1 conversion functions, and other
+        affected functions.
+      o Improved platform support for PowerPC.
+      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
+      o New X509_VERIFY_PARAM structure to support parametrisation
+        of X.509 path validation.
+      o Major overhaul of RC4 performance on Intel P4, IA-64 and
+        AMD64.
+      o Changed the Configure script to have some algorithms disabled
+        by default.  Those can be explicitely enabled with the new
+        argument form 'enable-xxx'.
+      o Change the default digest in 'openssl' commands from MD5 to
+        SHA-1.
+      o Added support for DTLS.
+      o New BIGNUM blinding.
+      o Added support for the RSA-PSS encryption scheme
+      o Added support for the RSA X.931 padding.
+      o Added support for BSD sockets on NetWare.
+      o Added support for files larger than 2GB.
+      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]:
+
+      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]:
+
+      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]:
+
+      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]:
+
+      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]:
+
+      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]:
 
       o More compilation issues fixed.
       o Adaptation to more modern Kerberos API.
@@ -14,7 +330,7 @@
       o More constification.
       o Added processing of proxy certificates (RFC 3820).
 
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
 
       o Several compilation issues fixed.
       o Many memory allocation failure checks added.
@@ -22,12 +338,12 @@
       o Mandatory basic checks on certificates.
       o Performance improvements.
 
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
 
       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:
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
 
       o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
       o Security: Fix null-pointer assignment in do_change_cipher_spec()
@@ -35,14 +351,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:
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
 
       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:
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
 
       o Security: counter the Klima-Pokorny-Rosa extension of
         Bleichbacher's attack 
@@ -53,7 +369,7 @@
       o ASN.1: treat domainComponent correctly.
       o Documentation: fixes and additions.
 
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
 
       o Security: Important security related bugfixes.
       o Enhanced compatibility with MIT Kerberos.
@@ -64,7 +380,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:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
 
       o New library section OCSP.
       o Complete rewrite of ASN1 code.
@@ -110,23 +426,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:
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
 
       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:
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
 
       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:
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
 
       o Important security related bugfixes.
 
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
 
       o New configuration targets for Tandem OSS and A/UX.
       o New OIDs for Microsoft attributes.
@@ -140,25 +456,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:
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g [9 Aug 2002]:
 
       o Important building fixes on Unix.
 
-  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
+  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f [8 Aug 2002]:
 
       o Various important bugfixes.
 
-  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
+  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e [30 Jul 2002]:
 
       o Important security related bugfixes.
       o Various SSL/TLS library bugfixes.
 
-  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
+  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d [9 May 2002]:
 
       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:
+  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c [21 Dec 2001]:
 
       o Various SSL/TLS library bugfixes.
       o BIGNUM library fixes.
@@ -171,7 +487,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:
+  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b [9 Jul 2001]:
 
       o Security fix: PRNG improvements.
       o Security fix: RSA OAEP check.
@@ -188,7 +504,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:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a [5 Apr 2001]:
 
       o Security fix: change behavior of OpenSSL to avoid using
         environment variables when running as root.
@@ -213,7 +529,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:
+  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6 [10 Oct 2000]:
 
       o Some documentation for BIO and SSL libraries.
       o Enhanced chain verification using key identifiers.
@@ -228,7 +544,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:
+  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a [1 Apr 2000]:
 
       o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
       o Shared library support for HPUX and Solaris-gcc
@@ -237,7 +553,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:
+  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5 [25 May 2000]:
 
       o S/MIME support in new 'smime' command
       o Documentation for the OpenSSL command line application
@@ -273,7 +589,7 @@
       o Enhanced support for Alpha Linux
       o Experimental MacOS support
 
-  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4:
+  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4 [9 Aug 1999]:
 
       o Transparent support for PKCS#8 format private keys: these are used
         by several software packages and are more secure than the standard
@@ -284,7 +600,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:
+  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3 [24 May 1999]:
       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
@@ -298,7 +614,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:
+  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b [22 Mar 1999]:
       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"
@@ -320,7 +636,7 @@
       o Lots of memory leak fixes.
       o Lots of bug fixes.
 
-  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c:
+  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c [23 Dec 1998]:
       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

@@ -6,14 +6,16 @@ rem
 rem   usage:
 rem      build [target] [debug opts] [assembly opts] [configure opts]
 rem
-rem      target        - "netware-clib" - CLib NetWare build
+rem      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
-rem                    - "netware-libc" - LibC NKS NetWare build
+rem                    - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
+rem                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
+rem                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 rem 
 rem      debug opts    - "debug"  - build debug
 rem
 rem      assembly opts - "nw-mwasm" - use Metrowerks assembler
-rem      "nw-nasm"  - use NASM assembler
+rem                    - "nw-nasm"  - use NASM assembler
-rem      "no-asm"   - don't use assembly
+rem                    - "no-asm"   - don't use assembly
 rem
 rem      configure opts- all unrecognized arguments are passed to the
 rem                       perl configure script
@@ -74,8 +76,12 @@ 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
+if "%1" == "netware-libc-bsdsock" set ARG_PROCESSED=YES
 
 rem   If we didn't recognize the argument, consider it an option for config
 if "%ARG_PROCESSED%" == "NO" set CONFIG_OPTS=%CONFIG_OPTS% %1
@@ -91,7 +97,9 @@ 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
 if "%DEBUG%" == "debug" set NLM_MAKE=%NLM_MAKE%_dbg.mak
 
@@ -106,7 +114,14 @@ echo Generating x86 for %ASSEMBLER% assembler
 
 echo Bignum
 cd crypto\bn\asm
-perl x86.pl %ASM_MODE% > bn-nw.asm
+rem 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
@@ -156,6 +171,11 @@ 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
@@ -172,8 +192,10 @@ 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: gmake -f %NLM_MAKE%)
+echo build (ex: make -f %NLM_MAKE%)
 goto end
 
 rem ===============================================================
@@ -184,8 +206,10 @@ echo .  No build target specified!!!
 echo .
 echo .  usage: build [target] [debug opts] [assembly opts] [configure opts]
 echo .
-echo .     target        - "netware-clib" - CLib NetWare build
+echo .     target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
-echo .                   - "netware-libc" - LibC NKS NetWare build
+echo .                   - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
+echo .                   - "netware-libc" - LibC NetWare build (WinSock Sockets)
+echo .                   - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 echo .
 echo .     debug opts    - "debug"  - build debug
 echo .

Netware/cpy_tests.bat

@@ -73,6 +73,7 @@ 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,13 +37,18 @@ 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();
-   ssl_tests();
    ca_tests();
+   ssl_tests();
 
    close(OUT);
 
@@ -56,9 +61,10 @@ sub algorithm_tests
 {
    my $i;
    my $outFile;
-   my @tests = ( rsa_test, destest, ideatest, bftest, shatest, sha1test,
+   my @tests = ( rsa_test, destest, ideatest, bftest, bntest, shatest, sha1test,
-                 md5test, dsatest, md2test, mdc2test, rc2test, rc4test, randtest,
+                 sha256t, sha512t, dsatest, md2test, md4test, md5test, mdc2test,
-                 dhtest, exptest );
+                 rc2test, rc4test, rc5test, randtest, rmdtest, dhtest, ecdhtest,
+                 ecdsatest, ectest, exptest, casttest, hmactest );
 
    print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n");
 
@@ -66,12 +72,19 @@ sub algorithm_tests
    print( OUT "CRYPTO ALGORITHM TESTS:\n\n");
 
    foreach $i (@tests)
+   {
+      if (-e "$base_path\\$i.nlm")
       {
          $outFile = "$output_path\\$i.out";
-      system("$i > $outFile");
+         system("$i (CLIB_OPT)/>$outFile");
          log_desc("Test: $i\.nlm:");
          log_output("", $outFile );
       }
+      else
+      {
+         log_desc("Test: $i\.nlm: file not found");
+      }
+   }
 }
 
 ############################################################################
@@ -102,24 +115,24 @@ sub encryption_tests
 
       # do encryption
       $outFile = "$output_path\\enc.out";
-      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher > $outFile" );
+      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$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 > $outFile");
+      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
       log_output("Decrypting: $cipher --> $clear", $outFile);
 
       # compare files
       $x = compare_files( $input, $clear, 1);
       if ( $x == 0 )
       {
-         print( "SUCCESS - files match: $input, $clear\n");
+         print( "\rSUCCESS - files match: $input, $clear\n");
          print( OUT "SUCCESS - files match: $input, $clear\n");
       }
       else
       {
-         print( "ERROR: files don't match\n");
+         print( "\rERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
 
@@ -129,24 +142,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 > $outFile");
+      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$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 > $outFile");
+      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
       log_output("Decrypting(B64): $cipher --> $clear", $outFile);
 
       # compare files
       $x = compare_files( $input, $clear, 1);
       if ( $x == 0 )
       {
-         print( "SUCCESS - files match: $input, $clear\n");
+         print( "\rSUCCESS - files match: $input, $clear\n");
          print( OUT "SUCCESS - files match: $input, $clear\n");
       }
       else
       {
-         print( "ERROR: files don't match\n");
+         print( "\rERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
 
@@ -192,24 +205,24 @@ sub pem_tests
 
       if ($i ne "req" )
       {
-         system("openssl2 $i -in $input -out $tmp_out > $outFile");
+         system("openssl2 $i -in $input -out $tmp_out (CLIB_OPT)/>$outFile");
          log_output( "openssl2 $i -in $input -out $tmp_out", $outFile);
       }
       else
       {
-         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config > $outFile");
+         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config (CLIB_OPT)/>$outFile");
          log_output( "openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config", $outFile );
       }
 
       $x = compare_files( $input, $tmp_out);
       if ( $x == 0 )
       {
-         print( "SUCCESS - files match: $input, $tmp_out\n");
+         print( "\rSUCCESS - files match: $input, $tmp_out\n");
          print( OUT "SUCCESS - files match: $input, $tmp_out\n");
       }
       else
       {
-         print( "ERROR: files don't match\n");
+         print( "\rERROR: files don't match\n");
          print( OUT "ERROR: files don't match\n");
       }
       do_wait();
@@ -224,7 +237,8 @@ sub verify_tests
    my $i;
    my $outFile = "$output_path\\verify.out";
 
-   my @cert_files = <$cert_path\\*.pem>;
+   $cert_path =~ s/\\/\//g;
+   my @cert_files = <$cert_path/*.pem>;
 
    print( "\nRUNNING VERIFY TESTS:\n\n");
 
@@ -235,7 +249,7 @@ sub verify_tests
 
    foreach $i (@cert_files)
    {
-      system("openssl2 verify -CAfile $tmp_cert $i >$outFile");
+      system("openssl2 verify -CAfile $tmp_cert $i (CLIB_OPT)/>$outFile");
       log_desc("Verifying cert: $i");
       log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile);
    }
@@ -246,113 +260,115 @@ sub verify_tests
 sub ssl_tests
 {
    my $outFile = "$output_path\\ssl_tst.out";
+   my($CAcert) = "$output_path\\certCA.ss";
+   my($Ukey)   = "$output_path\\keyU.ss";
+   my($Ucert)  = "$output_path\\certU.ss";
+   my($ssltest)= "ssltest -key $Ukey -cert $Ucert -c_key $Ukey -c_cert $Ucert -CAfile $CAcert";
 
    print( "\nRUNNING SSL TESTS:\n\n");
 
    print( OUT "\n========================================================\n");
    print( OUT "SSL TESTS:\n\n");
 
-   make_tmp_cert_file();
+   system("ssltest -ssl2 (CLIB_OPT)/>$outFile");
-
-   system("ssltest -ssl2 >$outFile");
    log_desc("Testing sslv2:");
    log_output("ssltest -ssl2", $outFile);
 
-   system("ssltest -ssl2 -server_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl2 -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with server authentication:");
-   log_output("ssltest -ssl2 -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl2 -server_auth", $outFile);
 
-   system("ssltest -ssl2 -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl2 -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with client authentication:");
-   log_output("ssltest -ssl2 -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl2 -client_auth", $outFile);
 
-   system("ssltest -ssl2 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with both client and server authentication:");
-   log_output("ssltest -ssl2 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
 
-   system("ssltest -ssl3 >$outFile");
+   system("ssltest -ssl3 (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3:");
    log_output("ssltest -ssl3", $outFile);
 
-   system("ssltest -ssl3 -server_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl3 -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with server authentication:");
-   log_output("ssltest -ssl3 -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl3 -server_auth", $outFile);
 
-   system("ssltest -ssl3 -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl3 -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with client authentication:");
-   log_output("ssltest -ssl3 -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl3 -client_auth", $outFile);
 
-   system("ssltest -ssl3 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with both client and server authentication:");
-   log_output("ssltest -ssl3 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile);
 
-   system("ssltest >$outFile");
+   system("ssltest (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3:");
    log_output("ssltest", $outFile);
 
-   system("ssltest -server_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with server authentication:");
-   log_output("ssltest -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -server_auth", $outFile);
 
-   system("ssltest -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with client authentication:");
-   log_output("ssltest -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -client_auth ", $outFile);
 
-   system("ssltest -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with both client and server authentication:");
-   log_output("ssltest -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl2 >$outFile");
+   system("ssltest -bio_pair -ssl2 (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 via BIO pair:");
    log_output("ssltest -bio_pair -ssl2", $outFile);
 
-   system("ssltest -bio_pair -dhe1024dsa -v >$outFile");
+   system("ssltest -bio_pair -dhe1024dsa -v (CLIB_OPT)/>$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 -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl2 -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -ssl2 -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl2 -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl2 -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with client authentication via BIO pair:");
-   log_output("ssltest -bio_pair -ssl2 -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl3 >$outFile");
+   system("ssltest -bio_pair -ssl3 (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 via BIO pair:");
    log_output("ssltest -bio_pair -ssl3", $outFile);
 
-   system("ssltest -bio_pair -ssl3 -server_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl3 -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -ssl3 -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl3 -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl3 -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with client authentication  via BIO pair:");
-   log_output("ssltest -bio_pair -ssl3 -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair >$outFile");
+   system("ssltest -bio_pair (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 via BIO pair:");
    log_output("ssltest -bio_pair", $outFile);
 
-   system("ssltest -bio_pair -server_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -server_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -server_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -server_auth", $outFile);
 
-   system("ssltest -bio_pair -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
-   log_output("ssltest -bio_pair -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -client_auth", $outFile);
 
-   system("ssltest -bio_pair -server_auth -client_auth -CAfile $tmp_cert >$outFile");
+   system("$ssltest -bio_pair -server_auth -client_auth (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
-   log_output("ssltest -bio_pair -server_auth -client_auth -CAfile $tmp_cert", $outFile);
+   log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile);
 }
 
 
@@ -380,39 +396,39 @@ sub ca_tests
    print( OUT "\n========================================================\n");
    print( OUT "CA TESTS:\n");
 
-   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new >$outFile");
+   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new (CLIB_OPT)/>$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 >$outFile");
+   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey (CLIB_OPT)/>$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 >$outFile");
+   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 (CLIB_OPT)/>$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 >$outFile");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout (CLIB_OPT)/>$outFile");
    log_output("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout", $outFile);
 
-   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout >$outFile");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout (CLIB_OPT)/>$outFile");
    log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile);
 
-   system("openssl2 verify -CAfile $CAcert $CAcert >$outFile");
+   system("openssl2 verify -CAfile $CAcert $CAcert (CLIB_OPT)/>$outFile");
    log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile);
 
-   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new >$outFile");
+   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new (CLIB_OPT)/>$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 >$outFile");
+   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial (CLIB_OPT)/>$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 >$outFile");
+   system("openssl2 verify -CAfile $CAcert $Ucert (CLIB_OPT)/>$outFile");
    log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile);
 
-   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert >$outFile");
+   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert (CLIB_OPT)/>$outFile");
    log_desc("Certificate details");
    log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile);
 
@@ -426,6 +442,29 @@ 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( $ $ )
 {
@@ -436,7 +475,7 @@ sub log_output( $ $ )
 
    if ($desc)
    {
-      print("$desc\n");
+      print("\r$desc\n");
       print(OUT "$desc\n");
    }
 
@@ -553,7 +592,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,6 +16,7 @@ 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=
@@ -23,68 +24,89 @@ 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)
-set TOOLS=d:\i_drive\tools
+if "%NDKBASE%" == "" set NDKBASE=c:\Novell
 
 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)
-set METROWERKS_PATH=%TOOLS%\codewar\pdk_21\tools\command line tools
+if "%GNUC%" == "Y" set COMPILER_PATH=c:\usr\i586-netware\bin;c:\usr\bin
-rem set METROWERKS_PATH=%TOOLS%\codewar\PDK_40\Other Metrowerks Tools\Command Line Tools
+if "%GNUC%" == "" set COMPILER_PATH=c:\prg\cwcmdl40
 
 rem   If using gnu make define path to utility
-set GNU_MAKE_PATH=%TOOLS%\gnu
+rem set GNU_MAKE_PATH=%NDKBASE%\gnu
+set GNU_MAKE_PATH=c:\prg\tools
 
 rem   If using ms nmake define path to nmake
-set MS_NMAKE_PATH=%TOOLS%\msvc\600\bin
+rem set MS_NMAKE_PATH=%NDKBASE%\msvc\600\bin
 
 rem   If using NASM assembler define path
-set NASM_PATH=%TOOLS%\nasm
+rem set NASM_PATH=%NDKBASE%\nasm
+set NASM_PATH=c:\prg\tools
 
 rem   Update path to include tool paths
-set path=%path%;%METROWERKS_PATH%
+set path=%path%;%COMPILER_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 MWCIncludes to location of Novell NDK includes
+rem   Set INCLUDES to location of Novell NDK includes
-if "%LIBC_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\libc\include;%TOOLS%\ndk\libc\include\winsock;.\engines
+if "%LIBC_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\libc\include;%NDKBASE%\ndk\libc\include\winsock
-if "%CLIB_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\nwsdk\include\nlm;.\engines
+if "%CLIB_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\nwsdk\include\nlm;%NDKBASE%\ws295sdk\include
-set include=
 
 rem   Set Imports to location of Novell NDK import files
-if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports
+if "%LIBC_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\libc\imports
-if "%CLIB_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\nwsdk\imports
+if "%CLIB_BUILD%" == "Y" set IMPORTS=%NDKBASE%\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
-if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o
+rem 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 . No target build specified!
+echo No target build specified!
 echo.
-echo . usage: set_env [target]
+echo usage: set_env [target] [compiler]
 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 compiler    - "gnuc"         - GNU GCC Compiler
+echo             - "codewarrior"  - MetroWerks CodeWarrior (default)
 echo.
-
-
 
 :end
+echo.
+
 

PROBLEMS

@@ -12,8 +12,8 @@ along the whole library path before it bothers looking for .a libraries.  This
 means that -L switches won't matter unless OpenSSL is built with shared
 library support.
 
-The workaround may be to change the following lines in apps/Makefile.ssl and
+The workaround may be to change the following lines in apps/Makefile and
-test/Makefile.ssl:
+test/Makefile:
 
   LIBCRYPTO=-L.. -lcrypto
   LIBSSL=-L.. -lssl
@@ -36,7 +36,9 @@ may differ on your machine.
 
 
 As long as Apple doesn't fix the problem with ld, this problem building
-OpenSSL will remain as is.
+OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by
+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
@@ -48,9 +50,9 @@ will interfere with each other and lead to test failure.
 The solution is simple for now: don't run parallell make when testing.
 
 
-* Bugs in gcc 3.0 triggered
+* Bugs in gcc triggered
 
-According to a problem report, there are bugs in gcc 3.0 that are
+- According to a problem report, there are bugs in gcc 3.0 that are
   triggered by some of the code in OpenSSL, more specifically in
   PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
 
@@ -63,6 +65,20 @@ you end up with an extra incrementation when *header != '4'.
 
   We recommend that you upgrade gcc to as high a 3.x version as you can.
 
+- According to multiple problem reports, some of our message digest
+  implementations trigger bug[s] in code optimizer in gcc 3.3 for sparc64
+  and gcc 2.96 for ppc. Former fails to complete RIPEMD160 test, while
+  latter - SHA one.
+
+  The recomendation is to upgrade your compiler. This naturally applies to
+  other similar cases.
+
+- There is a subtle Solaris x86-specific gcc run-time environment bug, which
+  "falls between" OpenSSL [0.9.8 and later], Solaris ld and GCC. The bug
+  manifests itself as Segmentation Fault upon early application start-up.
+  The problem can be worked around by patching the environment according to
+  http://www.openssl.org/~appro/values.c.
+
 * solaris64-sparcv9-cc SHA-1 performance with WorkShop 6 compiler.
 
 As subject suggests SHA-1 might perform poorly (4 times slower)
@@ -120,3 +136,64 @@ Any information helping to solve this issue would be deeply
 appreciated.
 
 NOTE: building non-shared doesn't come with this problem.
+
+* ULTRIX build fails with shell errors, such as "bad substitution"
+  and "test: argument expected"
+
+The problem is caused by ULTRIX /bin/sh supporting only original
+Bourne shell syntax/semantics, and the trouble is that the vast
+majority is so accustomed to more modern syntax, that very few
+people [if any] would recognize the ancient syntax even as valid.
+This inevitably results in non-trivial scripts breaking on ULTRIX,
+and OpenSSL isn't an exclusion. Fortunately there is workaround,
+hire /bin/ksh to do the job /bin/sh fails to do.
+
+1. Trick make(1) to use /bin/ksh by setting up following environ-
+   ment variables *prior* you execute ./Configure and make:
+
+	PROG_ENV=POSIX
+	MAKESHELL=/bin/ksh
+	export PROG_ENV MAKESHELL
+
+   or if your shell is csh-compatible:
+
+	setenv PROG_ENV POSIX
+	setenv MAKESHELL /bin/ksh
+
+2. Trick /bin/sh to use alternative expression evaluator. Create
+   following 'test' script for example in /tmp:
+
+	#!/bin/ksh
+	${0##*/} "$@"
+
+   Then 'chmod a+x /tmp/test; ln /tmp/test /tmp/[' and *prepend*
+   your $PATH with chosen location, e.g. PATH=/tmp:$PATH. Alter-
+   natively just replace system /bin/test and /bin/[ with the
+   above script.
+
+* hpux64-ia64-cc fails blowfish test.
+
+Compiler bug, presumably at particular patch level. It should be noted
+that same compiler generates correct 32-bit code, a.k.a. hpux-ia64-cc
+target. Drop optimization level to +O2 when compiling 64-bit bf_skey.o.
+
+* no-engines generates errors.
+
+Unfortunately, the 'no-engines' configuration option currently doesn't
+work properly.  Use 'no-hw' and you'll will at least get no hardware
+support.  We'll see how we fix that on OpenSSL versions past 0.9.8.
+
+* 'make test' fails in BN_sqr [commonly with "error 139" denoting SIGSEGV]
+  if elder GNU binutils were deployed to link shared libcrypto.so.
+
+As subject suggests the failure is caused by a bug in elder binutils,
+either as or ld, and was observed on FreeBSD and Linux. There are two
+options. First is naturally to upgrade binutils, the second one - to
+reconfigure with additional no-sse2 [or 386] option passed to ./config.
+
+* If configured with ./config no-dso, toolkit still gets linked with -ldl,
+  which most notably poses a problem when linking with dietlibc.
+
+We don't have framework to associate -ldl with no-dso, therefore the only
+way is to edit Makefile right after ./config no-dso and remove -ldl from
+EX_LIBS line.

README

@@ -1,7 +1,7 @@
 
- OpenSSL 0.9.9-dev XX xxx XXXX
+ OpenSSL 0.9.8zi-dev
 
- Copyright (c) 1998-2005 The OpenSSL Project
+ Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
@@ -36,12 +36,13 @@
      actually logically part of it. It includes routines for the following:
 
      Ciphers
-        libdes - EAY's libdes DES encryption package which has been floating
+        libdes - EAY's libdes DES encryption package which was floating
-                 around the net for a few years.  It includes 15
+                 around the net for a few years, and was then relicensed by
-                 'modes/variations' of DES (1, 2 and 3 key versions of ecb,
+                 him as part of SSLeay.  It includes 15 'modes/variations'
-                 cbc, cfb and ofb; pcbc and a more general form of cfb and
+                 of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb;
-                 ofb) including desx in cbc mode, a fast crypt(3), and
+                 pcbc and a more general form of cfb and ofb) including desx
-                 routines to read passwords from the keyboard.
+                 in cbc mode, a fast crypt(3), and routines to read
+                 passwords from the keyboard.
         RC4 encryption,
         RC2 encryption      - 4 different modes, ecb, cbc, cfb and ofb.
         Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb.
@@ -111,7 +112,9 @@
  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
 
  INSTALLATION
  ------------
@@ -134,6 +137,9 @@
  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:
 
@@ -156,24 +162,46 @@
     - Stack Traceback (if the application dumps core)
 
  Report the bug to the OpenSSL project via the Request Tracker
- (http://www.openssl.org/support/rt2.html) by mail to:
+ (http://www.openssl.org/support/rt.html) by mail to:
 
-    openssl-bugs@openssl.org
+    rt@openssl.org
 
- Note that mail to openssl-bugs@openssl.org is recorded in the publicly
+ In order to avoid spam, this is a moderated mailing list, and it might
- readable request tracker database and is forwarded to a public
+ take a day for the ticket to show up.  (We also scan posts to make sure
- mailing list. Confidential mail may be sent to openssl-security@openssl.org
+ that security disclosures aren't publically posted by mistake.) Mail to
- (PGP key available from the key servers).
+ this address is recorded in the public RT (request tracker) database (see
+ https://www.openssl.org/support/rt.html for details) and also forwarded
+ the public openssl-dev mailing list.  Confidential mail may be sent to
+ openssl-security@openssl.org (PGP key available from the key servers).
+
+ Please do NOT use this 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.
+
+ You can also make GitHub pull requests. If you do this, please also send
+ mail to rt@openssl.org with a link to the PR so that we can more easily
+ keep track of it.
 
  HOW TO CONTRIBUTE TO OpenSSL
  ----------------------------
 
  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-dev@openssl.org with
+ would like to submit a patch, send it to openssl-bugs@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 our coding style
+ (see http://openssl.org/about/codingstyle.txt) and compile without
+ warnings using the --strict-warnings flag.  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;

STATUS

@@ -1,117 +0,0 @@
-
-  OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2005/05/19 19:43:28 $
-
-  DEVELOPMENT STATE
-
-    o  OpenSSL 0.9.9:  Under development...
-    o  OpenSSL 0.9.8-beta1:  Released on May 19th, 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 
-
-  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,6 +12,14 @@ $	    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") -
@@ -19,13 +27,7 @@ $	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]
@@ -39,7 +41,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 0.9.2-RL 15-Mar-1999"
+$	WRITE SF "$! Startup file for Openssl"
 $	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"
@@ -47,8 +49,13 @@ $	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 "$	ARCH = ""VAX"""
+$	WRITE SF "$	IF (F$GETSYI(""CPU"").LT.128)"
-$	WRITE SF "$	IF F$GETSYI(""CPU"") .GE. 128 THEN ARCH = ""ALPHA"""
+$	WRITE SF "$	THEN"
+$	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,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
+$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB
-$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
+$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]LIBSSL.OLB
-$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
+$! Output:	[.xxx.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
-$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
+$!		[.xxx.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
 $!
 $! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
 $! ===========================================================================
@@ -19,31 +19,41 @@ $   write sys$error "ERROR: Couldn't find any library version info..."
 $   exit
 $ endif
 $
-$ if f$getsyi("CPU") .ge. 128
+$ 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
+$
+$ if arch .nes. "VAX"
+$ then
+$   arch_vax = 0
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.AXP.EXE.CRYPTO]"
+$   libdir = "[.''ARCH'.EXE.CRYPTO]"
 $   libolb = "''libdir'LIBCRYPTO.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
 $   libmap = "''libdir'LIBCRYPTO.MAP"
 $   libgoal= "''libdir'LIBCRYPTO.EXE"
 $   libref = ""
-$   gosub create_axp_shr
+$   gosub create_nonvax_shr
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.AXP.EXE.SSL]"
+$   libdir = "[.''ARCH'.EXE.SSL]"
 $   libolb = "''libdir'LIBSSL.OLB"
 $   libopt = "''libdir'LIBSSL.OPT"
 $   libmap = "''libdir'LIBSSL.MAP"
 $   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.AXP.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
-$   gosub create_axp_shr
+$   gosub create_nonvax_shr
 $ else
+$   arch_vax = 1
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.VAX.EXE.CRYPTO]"
+$   libdir = "[.''ARCH'.EXE.CRYPTO]"
 $   libmar = "''libdir'LIBCRYPTO.MAR"
 $   libolb = "''libdir'LIBCRYPTO.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
@@ -56,22 +66,22 @@ $   gosub create_vax_shr
 $   libtit = "SSL_TRANSFER_VECTOR"
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.VAX.EXE.SSL]"
+$   libdir = "[.''ARCH'.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 = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"
 $   libvec = "LIBSSL"
 $   gosub create_vax_shr
 $ endif
 $ exit
 $
-$! ----- Soubroutines to actually build the shareable libraries
+$! ----- Soubroutines to build the shareable libraries
-$! The way things work, there's a main shareable library creator for each
+$! For each supported architecture, there's a main shareable library
-$! supported architecture, which is called from the main code above.
+$! creator, 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
@@ -97,10 +107,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 AXP
+$! ----- Subroutines for non-VAX
 $! -----
 $! The creator routine
-$ create_axp_shr:
+$ create_nonvax_shr:
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
 $   write opt libolb,"/lib"
@@ -108,7 +118,7 @@ $   if libref .nes. "" then write opt libref,"/SHARE"
 $   write opt "SYMBOL_VECTOR=(-"
 $   libfirstentry := true
 $   libwrch   := opt
-$   libwriter := write_axp_transfer_entry
+$   libwriter := write_nonvax_transfer_entry
 $   textcount = 0
 $   gosub read_func_num
 $   write opt ")"
@@ -118,7 +128,7 @@ $   link/map='libmap'/full/share='libgoal' 'libopt'/option
 $   return
 $
 $! The record writer routine
-$ write_axp_transfer_entry:
+$ write_nonvax_transfer_entry:
 $   if libentry .eqs. ".dummy" then return
 $   if info_kind .eqs. "VARIABLE"
 $   then
@@ -144,7 +154,7 @@ $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for AXP
+$! ----- Subroutines for VAX
 $! -----
 $! The creator routine
 $ create_vax_shr:
@@ -264,8 +274,15 @@ $             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" then falsesum = falsesum + 1
+$         if ((plat_entry .eqs. "VMS") .or. -
+            (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,10 +8,17 @@ $!
 $!
 $! 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      :== $SSLEXE:OPENSSL REQ
+$! REQ could conflict with REQUEST.
+$     OREQ     :== $SSLEXE:OPENSSL REQ
 $     DGST     :== $SSLEXE:OPENSSL DGST
 $     DH       :== $SSLEXE:OPENSSL DH
 $     ENC      :== $SSLEXE:OPENSSL ENC
@@ -36,3 +43,4 @@ $ 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 -
-	   /PROMT="CA certificate filename (or enter to create)"
+	   /PROMPT="CA certificate filename (or enter to create): "
-$     IF F$SEARCH(FILE) .NES. ""
+$     IF (FILE .NES. "") .AND. (F$SEARCH(FILE) .NES. "")
 $     THEN
 $       COPY 'FILE' 'CATOP'.private'CAKEY'
 $	RET=$STATUS

apps/CA.pl.in

@@ -68,19 +68,19 @@ foreach (@ARGV) {
 	    exit 0;
 	} elsif (/^-newcert$/) {
 	    # create a certificate
-	    system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
+	    system ("$REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS");
 	    $RET=$?;
-	    print "Certificate (and private key) is in newreq.pem\n"
+	    print "Certificate is in newcert.pem, private key is in newkey.pem\n"
 	} elsif (/^-newreq$/) {
 	    # create a certificate request
-	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
+	    system ("$REQ -new -keyout newkey.pem -out newreq.pem $DAYS");
 	    $RET=$?;
-	    print "Request (and private key) is in newreq.pem\n";
+	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 	} elsif (/^-newreq-nodes$/) {
 	    # create a certificate request
-	    system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");
+	    system ("$REQ -new -nodes -keyout newkey.pem -out newreq.pem $DAYS");
 	    $RET=$?;
-	    print "Request (and private key) is in newreq.pem\n";
+	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 	} elsif (/^-newca$/) {
 		# if explicitly asked for or it doesn't exist then setup the
 		# directory structure that Eric likes to manage things 
@@ -94,6 +94,9 @@ foreach (@ARGV) {
 		mkdir "${CATOP}/private", $DIRMODE;
 		open OUT, ">${CATOP}/index.txt";
 		close OUT;
+		open OUT, ">${CATOP}/crlnumber";
+		print OUT "01\n";
+		close OUT;
 	    }
 	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
 		print "CA certificate filename (or enter to create)\n";
@@ -113,6 +116,7 @@ foreach (@ARGV) {
 		    system ("$CA -create_serial " .
 			"-out ${CATOP}/$CACERT $CADAYS -batch " . 
 			"-keyfile ${CATOP}/private/$CAKEY -selfsign " .
+			"-extensions v3_ca " .
 			"-infiles ${CATOP}/$CAREQ ");
 		    $RET=$?;
 		}
@@ -120,10 +124,11 @@ foreach (@ARGV) {
 	} elsif (/^-pkcs12$/) {
 	    my $cname = $ARGV[1];
 	    $cname = "My Certificate" unless defined $cname;
-	    system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .
+	    system ("$PKCS12 -in newcert.pem -inkey newkey.pem " .
 			"-certfile ${CATOP}/$CACERT -out newcert.p12 " .
 			"-export -name \"$cname\"");
 	    $RET=$?;
+	    print "PKCS #12 file is in newcert.p12\n";
 	    exit $RET;
 	} elsif (/^-xsign$/) {
 	    system ("$CA -policy policy_anything -infiles newreq.pem");

apps/CA.sh

@@ -29,37 +29,73 @@
 
 # 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
 
-DAYS="-days 365"	# 1 year
+if [ -z "$DAYS" ] ; then DAYS="-days 365" ; fi	# 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"
 
-CATOP=./demoCA
+if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
 
-for i
+RET=0
-do
+
-case $i in
+while [ "$1" != "" ] ; do
+case $1 in
 -\?|-h|-help)
-    echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" >&2
+    usage
     exit 0
     ;;
 -newcert)
     # create a certificate
-    $REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS
+    $REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS
     RET=$?
-    echo "Certificate (and private key) is in newreq.pem"
+    echo "Certificate is in newcert.pem, private key is in newkey.pem"
     ;;
 -newreq)
     # create a certificate request
-    $REQ -new -keyout newreq.pem -out newreq.pem $DAYS
+    $REQ -new -keyout newkey.pem -out newreq.pem $DAYS
+    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"
     ;;
@@ -69,12 +105,11 @@ case $i in
     NEW="1"
     if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
 	# create the directory hierarchy
-	mkdir ${CATOP} 
+	mkdir -p ${CATOP}
-	mkdir ${CATOP}/certs 
+	mkdir -p ${CATOP}/certs
-	mkdir ${CATOP}/crl 
+	mkdir -p ${CATOP}/crl
-	mkdir ${CATOP}/newcerts
+	mkdir -p ${CATOP}/newcerts
-	mkdir ${CATOP}/private
+	mkdir -p ${CATOP}/private
-	echo "00" > ${CATOP}/serial
 	touch ${CATOP}/index.txt
     fi
     if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@ -83,14 +118,20 @@ case $i in
 
 	# ask user for existing CA certificate
 	if [ "$FILE" ]; then
-	    cp $FILE ${CATOP}/private/$CAKEY
+	    cp_pem $FILE ${CATOP}/private/$CAKEY PRIVATE
+	    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 -out ${CATOP}/$CACERT $CADAYS -batch \
+	    $CA -create_serial -out ${CATOP}/$CACERT $CADAYS -batch \
 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
+			   -extensions v3_ca \
 			   -infiles ${CATOP}/$CAREQ
 	    RET=$?
 	fi
@@ -100,16 +141,33 @@ case $i 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"
     ;;
@@ -127,13 +185,14 @@ case $i in
 	    fi
 	done
     fi
-    exit 0
+    exit $RET
     ;;
 *)
-    echo "Unknown arg $i";
+    echo "Unknown arg $i" >&2
+    usage
     exit 1
     ;;
 esac
+shift
 done
 exit $RET
-

apps/app_rand.c

@@ -115,7 +115,6 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
-
 static int seeded = 0;
 static int egdsocket = 0;
 
@@ -133,26 +132,27 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 
     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.
+         * we try if the given filename is an EGD socket. if it is, we don't
-		   if it is, we don't write anything back to the file. */
+         * 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 (RAND_status() == 0)
+            if (!dont_warn) {
-			{
-			if (!dont_warn)
-				{
                 BIO_printf(bio_e, "unable to load 'random state'\n");
-				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
+                BIO_printf(bio_e,
+                           "This means that the random number generator has not been seeded\n");
                 BIO_printf(bio_e, "with much random data.\n");
-				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
+                if (consider_randfile) { /* explanation does not apply when a
-					{
+                                          * file is explicitly named */
-					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
+                    BIO_printf(bio_e,
-					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
+                               "Consider setting the RANDFILE environment variable to point at a file that\n");
+                    BIO_printf(bio_e,
+                               "'random' data can be kept in (the file will be overwritten).\n");
                 }
             }
             return 0;
@@ -169,22 +169,24 @@ long app_RAND_load_files(char *name)
     long tot = 0;
     int egd;
 
-	for (;;)
+    for (;;) {
-		{
         last = 0;
         for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-		if (*p == '\0') last=1;
+        if (*p == '\0')
+            last = 1;
         *p = '\0';
         n = name;
         name = p + 1;
-		if (*n == '\0') break;
+        if (*n == '\0')
+            break;
 
         egd = RAND_egd(n);
         if (egd > 0)
             tot += egd;
         else
             tot += RAND_load_file(n, -1);
-		if (last) break;
+        if (last)
+            break;
     }
     if (tot > 512)
         app_RAND_allow_write_file();
@@ -196,16 +198,16 @@ 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,
+        /*
-		 * we should not write a low-entropy seed file back --
+         * If we did not manage to read the seed file, we should not write a
-		 * it would suppress a crucial warning the next time
+         * low-entropy seed file back -- it would suppress a crucial warning
-		 * we want to use it. */
+         * the next time 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");
         return 0;
     }

apps/apps.h

@@ -122,12 +122,16 @@
 # ifndef OPENSSL_NO_ENGINE
 #  include <openssl/engine.h>
 # endif
+# ifndef OPENSSL_NO_OCSP
+#  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.
+/*
- * `bio_e' is for error messages. */
+ * When `file' is NULL, use defaults. `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
@@ -146,9 +150,11 @@ int WIN32_rename(const char *oldname,const char *newname);
 #  ifndef NON_MAIN
 CONF *config = NULL;
 BIO *bio_err = NULL;
+int in_FIPS_mode = 0;
 #  else
 extern CONF *config;
 extern BIO *bio_err;
+extern int in_FIPS_mode;
 #  endif
 
 # else
@@ -157,6 +163,7 @@ extern BIO *bio_err;
 extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
+extern int in_FIPS_mode;
 
 # endif
 
@@ -228,21 +235,24 @@ extern BIO *bio_err;
 #  endif
 # endif
 
-typedef struct args_st
+# ifdef OPENSSL_SYSNAME_WIN32
-	{
+#  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;
 
 # 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;
 
-int password_callback(char *buf, int bufsiz, int verify,
+int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
-	PW_CB_DATA *cb_data);
 
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -254,7 +264,8 @@ void program_name(char *in,char *out,int size);
 int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]);
 # ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
+void print_name(BIO *out, const char *title, X509_NAME *nm,
+                unsigned long lflags);
 # endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
@@ -269,12 +280,19 @@ 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 *cert_descrip);
+                           const char *pass, ENGINE *e,
+                           const char *cert_descrip);
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 # ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
 # 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);
 
@@ -287,31 +305,32 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 # define DB_rev_date     2
 # define DB_serial       3      /* index - unique */
 # define DB_file         4
-#define DB_name         5       /* index - unique when active and not disabled */
+# define DB_name         5      /* index - unique when active and not
+                                 * disabled */
 # define DB_NUMBER       6
 
 # define DB_TYPE_REV     'R'
 # define DB_TYPE_EXP     'E'
 # define DB_TYPE_VAL     'V'
 
-typedef struct db_attr_st
+typedef struct db_attr_st {
-	{
     int unique_subject;
 } DB_ATTR;
-typedef struct ca_db_st
+typedef struct ca_db_st {
-	{
     DB_ATTR attributes;
     TXT_DB *db;
 } CA_DB;
 
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
+                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, const char *old_suffix);
+int rotate_index(const char *dbfile, const char *new_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);
@@ -320,6 +339,10 @@ 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_ASN1     1

apps/asn1pars.c

@@ -56,8 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-/* A nice addition from Dr Stephen Henson <shenson@bigfoot.com> to 
+/*
- * add the -strparse option which parses nested binary structures
+ * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * -strparse option which parses nested binary structures
  */
 
 #include <stdio.h>
@@ -69,7 +70,8 @@
 #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
@@ -113,76 +115,62 @@ int MAIN(int argc, char **argv)
     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");
         goto end;
     }
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             derfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-i") == 0) {
-		else if (strcmp(*argv,"-i") == 0)
-			{
             indent = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-noout") == 0) noout = 1;
+            noout = 1;
-		else if (strcmp(*argv,"-oid") == 0)
+        else if (strcmp(*argv, "-oid") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             oidfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-offset") == 0) {
-		else if (strcmp(*argv,"-offset") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             offset = atoi(*(++argv));
-			}
+        } else if (strcmp(*argv, "-length") == 0) {
-		else if (strcmp(*argv,"-length") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             length = atoi(*(++argv));
-			if (length == 0) goto bad;
+            if (length == 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-dump") == 0)
+        } else if (strcmp(*argv, "-dump") == 0) {
-			{
             dump = -1;
-			}
+        } else if (strcmp(*argv, "-dlimit") == 0) {
-		else if (strcmp(*argv,"-dlimit") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             dump = atoi(*(++argv));
-			if (dump <= 0) goto bad;
+            if (dump <= 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-strparse") == 0)
+        } else if (strcmp(*argv, "-strparse") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             sk_push(osk, *(++argv));
-			}
+        } else if (strcmp(*argv, "-genstr") == 0) {
-		else if (strcmp(*argv,"-genstr") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             genstr = *(++argv);
-			}
+        } else if (strcmp(*argv, "-genconf") == 0) {
-		else if (strcmp(*argv,"-genconf") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             genconf = *(++argv);
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -191,26 +179,30 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile\n", prog);
         BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
+        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -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, " -offset arg   offset into 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, " -dump         dump unknown data in hex form\n");
-		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
+        BIO_printf(bio_err,
+                   " -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, " -strparse offset\n");
-		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
+        BIO_printf(bio_err,
+                   "               a series of these can be used to 'dig' into multiple\n");
         BIO_printf(bio_err, "               ASN1 blob wrappings\n");
-		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
+                   " -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
+                   " -genconf file file to generate ASN1 structure from\n");
         goto end;
     }
 
@@ -218,8 +210,7 @@ bad:
 
     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;
     }
@@ -231,10 +222,8 @@ bad:
     }
 #endif
 
-	if (oidfile != NULL)
+    if (oidfile != NULL) {
-		{
+        if (BIO_read_filename(in, oidfile) <= 0) {
-		if (BIO_read_filename(in,oidfile) <= 0)
-			{
             BIO_printf(bio_err, "problems opening %s\n", oidfile);
             ERR_print_errors(bio_err);
             goto end;
@@ -244,10 +233,8 @@ bad:
 
     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;
         }
@@ -261,24 +248,22 @@ bad:
         }
     }
 
-	if ((buf=BUF_MEM_new()) == NULL) goto end;
+    if ((buf = BUF_MEM_new()) == NULL)
-	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
+        goto end;
+    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)
@@ -290,11 +275,12 @@ bad:
         }
 
         num = 0;
-		for (;;)
+        for (;;) {
-			{
+            if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
-			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
+                goto end;
             i = BIO_read(in, &(buf->data[num]), BUFSIZ);
-			if (i <= 0) break;
+            if (i <= 0)
+                break;
             num += i;
         }
     }
@@ -302,18 +288,16 @@ bad:
 
     /* If any structs to parse go through in sequence */
 
-	if (sk_num(osk))
+    if (sk_num(osk)) {
-		{
         tmpbuf = (unsigned char *)str;
         tmplen = num;
-		for (i=0; i<sk_num(osk); i++)
+        for (i = 0; i < sk_num(osk); i++) {
-			{
             ASN1_TYPE *atmp;
             int typ;
             j = atoi(sk_value(osk, i));
-			if (j == 0)
+            if (j == 0) {
-				{
+                BIO_printf(bio_err, "'%s' is an invalid number\n",
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_value(osk,i));
+                           sk_value(osk, i));
                 continue;
             }
             tmpbuf += j;
@@ -322,18 +306,16 @@ bad:
             ctmpbuf = tmpbuf;
             at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
             ASN1_TYPE_free(atmp);
-			if(!at)
+            if (!at) {
-				{
                 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_BOOLEAN)
-				{
+                || (typ == V_ASN1_NULL)) {
-				BIO_printf(bio_err, "Can't parse %s type\n",
+                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
-					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
                 ERR_print_errors(bio_err);
                 goto end;
             }
@@ -345,15 +327,15 @@ bad:
         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)) length=(unsigned int)num;
+    if ((length == 0) || ((long)length > num))
+        length = (unsigned int)num;
     if (derout) {
         if (BIO_write(derout, str + offset, length) != (int)length) {
             BIO_printf(bio_err, "Error writing output\n");
@@ -363,22 +345,27 @@ bad:
     }
     if (!noout &&
         !ASN1_parse_dump(out, (unsigned char *)&(str[offset]), length,
-		    indent,dump))
+                         indent, dump)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
     ret = 0;
  end:
     BIO_free(derout);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (b64 != NULL) BIO_free(b64);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (b64 != NULL)
+        BIO_free(b64);
     if (ret != 0)
         ERR_print_errors(bio_err);
-	if (buf != NULL) BUF_MEM_free(buf);
+    if (buf != NULL)
-	if (at != NULL) ASN1_TYPE_free(at);
+        BUF_MEM_free(buf);
-	if (osk != NULL) sk_free(osk);
+    if (at != NULL)
+        ASN1_TYPE_free(at);
+    if (osk != NULL)
+        sk_free(osk);
     OBJ_cleanup();
     apps_shutdown();
     OPENSSL_EXIT(ret);
@@ -392,15 +379,13 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
     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;
         }
@@ -408,6 +393,7 @@ 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;

apps/ciphers.c

@@ -117,8 +117,7 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
         if (strcmp(*argv, "-v") == 0)
             verbose = 1;
 #ifndef OPENSSL_NO_SSL2
@@ -133,22 +132,17 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-tls1") == 0)
             meth = TLSv1_client_method();
 #endif
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
-			 (strcmp(*argv,"-?") == 0))
-			{
             badops = 1;
             break;
-			}
+        } else {
-		else
-			{
             ciphers = *argv;
         }
         argc--;
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
         for (pp = ciphers_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
         goto end;
@@ -157,7 +151,8 @@ int MAIN(int argc, char **argv)
     OpenSSL_add_ssl_algorithms();
 
     ctx = SSL_CTX_new(meth);
-	if (ctx == NULL) goto err;
+    if (ctx == NULL)
+        goto err;
     if (ciphers != NULL) {
         if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
             BIO_printf(bio_err, "Error in cipher list\n");
@@ -165,44 +160,42 @@ int MAIN(int argc, char **argv)
         }
     }
     ssl = SSL_new(ctx);
-	if (ssl == NULL) goto err;
+    if (ssl == NULL)
+        goto err;
 
-
+    if (!verbose) {
-	if (!verbose)
+        for (i = 0;; i++) {
-		{
-		for (i=0; ; i++)
-			{
             p = SSL_get_cipher_list(ssl, i);
-			if (p == NULL) break;
+            if (p == NULL)
-			if (i != 0) BIO_printf(STDout,":");
+                break;
+            if (i != 0)
+                BIO_printf(STDout, ":");
             BIO_printf(STDout, "%s", p);
         }
         BIO_printf(STDout, "\n");
-		}
+    } else {
-	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,
-			BIO_puts(STDout,SSL_CIPHER_description(
+                     SSL_CIPHER_description(sk_SSL_CIPHER_value(sk, i), buf,
-				sk_SSL_CIPHER_value(sk,i),
+                                            sizeof buf));
-				buf,sizeof buf));
         }
     }
 
     ret = 0;
-	if (0)
+    if (0) {
-		{
  err:
         SSL_load_error_strings();
         ERR_print_errors(bio_err);
     }
  end:
-	if (ctx != NULL) SSL_CTX_free(ctx);
+    if (ctx != NULL)
-	if (ssl != NULL) SSL_free(ssl);
+        SSL_CTX_free(ctx);
-	if (STDout != NULL) BIO_free_all(STDout);
+    if (ssl != NULL)
+        SSL_free(ssl);
+    if (STDout != NULL)
+        BIO_free_all(STDout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
-

apps/crl.c

@@ -85,6 +85,7 @@ static const char *crl_usage[]={
     " -issuer         - print issuer DN\n",
     " -lastupdate     - lastUpdate field\n",
     " -nextupdate     - nextUpdate field\n",
+    " -crlnumber      - print CRL number\n",
     " -noout          - no CRL output\n",
     " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
     " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
@@ -106,8 +107,9 @@ int MAIN(int argc, char **argv)
     BIO *out = NULL;
     int informat, outformat;
     char *infile = NULL, *outfile = NULL;
-	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
+    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
-	int fingerprint = 0;
+        0, text = 0;
+    int fingerprint = 0, crlnumber = 0;
     const char **pp;
     X509_STORE *store = NULL;
     X509_STORE_CTX ctx;
@@ -127,8 +129,7 @@ int MAIN(int argc, char **argv)
         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);
 #ifdef OPENSSL_SYS_VMS
             {
@@ -144,59 +145,54 @@ int MAIN(int argc, char **argv)
     argc--;
     argv++;
     num = 0;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
 #ifdef undef
-		if	(strcmp(*argv,"-p") == 0)
+        if (strcmp(*argv, "-p") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
+            if (!args_from_file(++argv, Nargc, Nargv)) {
+                goto end;
             }
+        */}
 #endif
-		if 	(strcmp(*argv,"-inform") == 0)
+        if (strcmp(*argv, "-inform") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-CApath") == 0) {
-		else if (strcmp(*argv,"-CApath") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             CApath = *(++argv);
             do_ver = 1;
-			}
+        } else if (strcmp(*argv, "-CAfile") == 0) {
-		else if (strcmp(*argv,"-CAfile") == 0)
+            if (--argc < 1)
-			{
+                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)
             text = 1;
         else if (strcmp(*argv, "-hash") == 0)
             hash = ++num;
-		else if (strcmp(*argv,"-nameopt") == 0)
+        else if (strcmp(*argv, "-nameopt") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+            if (!set_name_ex(&nmflag, *(++argv)))
-			}
+                goto bad;
-		else if (strcmp(*argv,"-issuer") == 0)
+        } else if (strcmp(*argv, "-issuer") == 0)
             issuer = ++num;
         else if (strcmp(*argv, "-lastupdate") == 0)
             lastupdate = ++num;
@@ -206,13 +202,12 @@ int MAIN(int argc, char **argv)
             noout = ++num;
         else if (strcmp(*argv, "-fingerprint") == 0)
             fingerprint = ++num;
-		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
+        else if (strcmp(*argv, "-crlnumber") == 0)
-			{
+            crlnumber = ++num;
+        else if ((md_alg = EVP_get_digestbyname(*argv + 1))) {
             /* ok */
             digest = md_alg;
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -221,8 +216,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         for (pp = crl_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
@@ -231,96 +225,99 @@ bad:
 
     ERR_load_crypto_strings();
     x = load_crl(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
+        goto end;
+    }
 
     if (do_ver) {
         store = X509_STORE_new();
         lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
+            goto end;
         if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM))
             X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 
         lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
+            goto end;
         if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM))
             X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
         ERR_clear_error();
 
         if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error initialising X509 store\n");
-				"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) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
-				"Error getting CRL issuer certificate\n");
             goto end;
         }
         pkey = X509_get_pubkey(xobj.data.x509);
         X509_OBJECT_free_contents(&xobj);
         if (!pkey) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
-				"Error getting CRL issuer public key\n");
             goto end;
         }
         i = X509_CRL_verify(x, pkey);
         EVP_PKEY_free(pkey);
-		if(i < 0) goto end;
+        if (i < 0)
-		if(i == 0) BIO_printf(bio_err, "verify failure\n");
+            goto end;
-		else BIO_printf(bio_err, "verify OK\n");
+        if (i == 0)
+            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++) {
-		for (i=1; i<=num; i++)
+            if (issuer == i) {
-			{
+                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
-			if (issuer == i)
+                           nmflag);
-				{
-				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
             }
-
+            if (crlnumber == i) {
-			if (hash == i)
+                ASN1_INTEGER *crlnum;
-				{
+                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
+                BIO_printf(bio_out, "crlNumber=");
+                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,
+                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
-						X509_CRL_get_lastUpdate(x));
                 BIO_printf(bio_out, "\n");
             }
-			if (nextupdate == i)
+            if (nextupdate == i) {
-				{
                 BIO_printf(bio_out, "nextUpdate=");
                 if (X509_CRL_get_nextUpdate(x))
-					ASN1_TIME_print(bio_out,
+                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
-						X509_CRL_get_nextUpdate(x));
                 else
                     BIO_printf(bio_out, "NONE");
                 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");
                     goto end;
                 }
                 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)
-					BIO_printf(bio_out,"%02X%c",md[j],
-						(j+1 == (int)n)
                                ? '\n' : ':');
                 }
             }
@@ -328,14 +325,12 @@ bad:
     }
 
     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
         {
@@ -343,20 +338,17 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
-	if (text) X509_CRL_print(out, x);
+    if (text)
+        X509_CRL_print(out, x);
 
-	if (noout) 
+    if (noout) {
-		{
         ret = 0;
         goto end;
     }
@@ -365,12 +357,14 @@ bad:
         i = (int)i2d_X509_CRL_bio(out, x);
     else if (outformat == FORMAT_PEM)
         i = PEM_write_bio_X509_CRL(out, x);
-	else	
+    else {
-		{
         BIO_printf(bio_err, "bad output format specified for outfile\n");
         goto end;
     }
-	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
+    if (!i) {
+        BIO_printf(bio_err, "unable to write CRL\n");
+        goto end;
+    }
     ret = 0;
  end:
     BIO_free_all(out);
@@ -391,18 +385,15 @@ static X509_CRL *load_crl(char *infile, int format)
     BIO *in = NULL;
 
     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);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
@@ -415,8 +406,7 @@ static X509_CRL *load_crl(char *infile, int format)
         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");
         ERR_print_errors(bio_err);
         goto end;
@@ -426,4 +416,3 @@ end:
     BIO_free(in);
     return (x);
 }
-

apps/crl2p7.c

@@ -56,9 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
+/*
- * and donated 'to the cause' along with lots and lots of other fixes to
+ * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
- * the library. */
+ * donated 'to the cause' along with lots and lots of other fixes to the
+ * library.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -76,7 +78,8 @@ 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
@@ -112,40 +115,37 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-nocrl") == 0) {
-		else if (strcmp(*argv,"-nocrl") == 0)
-			{
             nocrl = 1;
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			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 if (strcmp(*argv,"-certfile") == 0)
+        } else {
-			{
-			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;
@@ -154,8 +154,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -163,9 +162,11 @@ bad:
         BIO_printf(bio_err, " -outform arg   output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg        input file\n");
         BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -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," -nocrl         no crl to load, just certs from '-certfile'\n");
+        BIO_printf(bio_err,
+                   " -nocrl         no crl to load, just certs from '-certfile'\n");
         ret = 1;
         goto end;
     }
@@ -174,20 +175,16 @@ bad:
 
     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 (!nocrl)
+    if (!nocrl) {
-		{
         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;
             }
@@ -201,36 +198,39 @@ bad:
             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");
             ERR_print_errors(bio_err);
             goto end;
         }
     }
 
-	if ((p7=PKCS7_new()) == NULL) goto end;
+    if ((p7 = PKCS7_new()) == NULL)
-	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
+        goto end;
+    if ((p7s = PKCS7_SIGNED_new()) == NULL)
+        goto end;
     p7->type = OBJ_nid2obj(NID_pkcs7_signed);
     p7->d.sign = p7s;
     p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
 
-	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
+    if (!ASN1_INTEGER_set(p7s->version, 1))
-	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
+        goto end;
+    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+        goto end;
     p7s->crl = crl_stack;
-	if (crl != NULL)
+    if (crl != NULL) {
-		{
         sk_X509_CRL_push(crl_stack, crl);
         crl = NULL;             /* now part of p7 for OPENSSL_freeing */
     }
 
-	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
+    if ((cert_stack = sk_X509_new_null()) == NULL)
+        goto end;
     p7s->cert = cert_stack;
 
-	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
+    if (certflst)
+        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,8 +239,7 @@ bad:
 
     sk_free(certflst);
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -248,11 +247,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -266,24 +262,27 @@ bad:
         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");
         ERR_print_errors(bio_err);
         goto end;
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (p7 != NULL) PKCS7_free(p7);
+    if (out != NULL)
-	if (crl != NULL) X509_CRL_free(crl);
+        BIO_free_all(out);
+    if (p7 != NULL)
+        PKCS7_free(p7);
+    if (crl != NULL)
+        X509_CRL_free(crl);
 
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
 
-/*
+/*-
  *----------------------------------------------------------------------
  * int add_certs_from_file
  *
@@ -302,15 +301,13 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     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);
         goto end;
     }
 
     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);
         goto end;
     }
@@ -323,11 +320,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     }
 
     /* 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)
+        if (xi->x509 != NULL) {
-			{
             sk_X509_push(stack, xi->x509);
             xi->x509 = NULL;
             count++;
@@ -338,8 +333,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     ret = count;
  end:
     /* never need to OPENSSL_free x */
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (sk != NULL) sk_X509_INFO_free(sk);
+        BIO_free(in);
+    if (sk != NULL)
+        sk_X509_INFO_free(sk);
     return (ret);
 }
-

apps/dgst.c

@@ -66,6 +66,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/hmac.h>
 
 #undef BUFSIZE
 #define BUFSIZE 1024*8
@@ -75,7 +76,8 @@
 
 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);
+          const char *file, BIO *bmd, const char *hmac_key,
+          int non_fips_allow);
 
 int MAIN(int, char **);
 
@@ -83,7 +85,7 @@ int MAIN(int argc, char **argv)
 {
     ENGINE *e = NULL;
     unsigned char *buf = NULL;
-	int i,err=0;
+    int i, err = 1;
     const EVP_MD *md = NULL, *m;
     BIO *in = NULL, *inp;
     BIO *bmd = NULL;
@@ -100,15 +102,17 @@ int MAIN(int argc, char **argv)
     EVP_PKEY *sigkey = NULL;
     unsigned char *sigbuf = NULL;
     int siglen = 0;
+    unsigned int sig_flags = 0;
     char *passargin = NULL, *passin = NULL;
 #ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
 #endif
+    char *hmac_key = NULL;
+    int non_fips_allow = 0;
 
     apps_startup();
-
+    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");
         goto end;
     }
@@ -126,59 +130,69 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc > 0)
+    while (argc > 0) {
-		{
+        if ((*argv)[0] != '-')
-		if ((*argv)[0] != '-') break;
+            break;
         if (strcmp(*argv, "-c") == 0)
             separator = 1;
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) break;
+                break;
             randfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-sign") == 0) {
-		else if (strcmp(*argv,"-sign") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
-			}
+        } else if (!strcmp(*argv, "-passin")) {
-		else if (!strcmp(*argv,"-passin"))
-			{
             if (--argc < 1)
                 break;
             passargin = *++argv;
-			}
+        } else if (strcmp(*argv, "-verify") == 0) {
-		else if (strcmp(*argv,"-verify") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
             want_pub = 1;
             do_verify = 1;
-			}
+        } else if (strcmp(*argv, "-prverify") == 0) {
-		else if (strcmp(*argv,"-prverify") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
             do_verify = 1;
-			}
+        } else if (strcmp(*argv, "-x931") == 0)
-		else if (strcmp(*argv,"-signature") == 0)
+            sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
-			{
+        else if (strcmp(*argv, "-pss_saltlen") == 0) {
-			if (--argc < 1) break;
+            int saltlen;
+            if (--argc < 1)
+                break;
+            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) {
+                BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
+                goto end;
+            } else
+                sig_flags = saltlen;
+            sig_flags <<= 16;
+            sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
+        } else if (strcmp(*argv, "-signature") == 0) {
+            if (--argc < 1)
+                break;
             sigfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-keyform") == 0) {
-		else if (strcmp(*argv,"-keyform") == 0)
+            if (--argc < 1)
-			{
+                break;
-			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)
-			if (--argc < 1) break;
+                break;
             engine = *(++argv);
         }
 #endif
@@ -188,7 +202,15 @@ int MAIN(int argc, char **argv)
             out_bin = 1;
         else if (strcmp(*argv, "-d") == 0)
             debug = 1;
-		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+        else if (strcmp(*argv, "-non-fips-allow") == 0)
+            non_fips_allow = 1;
+        else if (!strcmp(*argv, "-fips-fingerprint"))
+            hmac_key = "etaonrishdlcupfm";
+        else if (!strcmp(*argv, "-hmac")) {
+            if (--argc < 1)
+                break;
+            hmac_key = *++argv;
+        } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL)
             md = m;
         else
             break;
@@ -200,85 +222,95 @@ int MAIN(int argc, char **argv)
         md = EVP_md5();
 
     if (do_verify && !sigfile) {
-		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
+        BIO_printf(bio_err,
+                   "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,"-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, "-hex            output as hex dump\n");
         BIO_printf(bio_err, "-binary         output in binary form\n");
-		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
+                   "-sign   file    sign digest using private key in file\n");
-		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
+                   "-verify file    verify a signature using public key in file\n");
+        BIO_printf(bio_err,
+                   "-prverify file  verify a signature using private key in file\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,"-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
 
-		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
+        BIO_printf(bio_err,
+                   "-%-14s to use the %s message digest algorithm (default)\n",
                    LN_md5, LN_md5);
-		BIO_printf(bio_err,"-%3s 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);
-		BIO_printf(bio_err,"-%3s 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);
 #ifndef OPENSSL_NO_SHA
-		BIO_printf(bio_err,"-%3s 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);
-		BIO_printf(bio_err,"-%3s 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);
 # ifndef OPENSSL_NO_SHA256
-		BIO_printf(bio_err,"-%3s 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);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
                    LN_sha256, LN_sha256);
 # endif
 # ifndef OPENSSL_NO_SHA512
-		BIO_printf(bio_err,"-%3s 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);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
                    LN_sha512, LN_sha512);
 # endif
 #endif
-		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
                    LN_mdc2, LN_mdc2);
-		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+        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());
     bmd = BIO_new(BIO_f_md());
-	if (debug)
+    if (debug) {
-		{
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
-		BIO_set_callback_arg(in,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(keyfile) out_bin = 1;
+        if (keyfile)
-		else out_bin = 0;
+            out_bin = 1;
+        else
+            out_bin = 0;
     }
 
     if (randfile)
@@ -287,7 +319,8 @@ int MAIN(int argc, char **argv)
     if (outfile) {
         if (out_bin)
             out = BIO_new_file(outfile, "wb");
-		else    out = BIO_new_file(outfile, "w");
+        else
+            out = BIO_new_file(outfile, "w");
     } else {
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -305,18 +338,17 @@ int MAIN(int argc, char **argv)
         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
+             * load_[pub]key() has already printed an appropriate message
-			   message */
+             */
             goto end;
         }
     }
@@ -327,26 +359,33 @@ int MAIN(int argc, char **argv)
         siglen = EVP_PKEY_size(sigkey);
         sigbuf = OPENSSL_malloc(siglen);
         if (!sigbio) {
-			BIO_printf(bio_err, "Error opening signature file %s\n",
+            BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
-								sigfile);
             ERR_print_errors(bio_err);
             goto end;
         }
         siglen = BIO_read(sigbio, sigbuf, siglen);
         BIO_free(sigbio);
         if (siglen <= 0) {
-			BIO_printf(bio_err, "Error reading signature file %s\n",
+            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
-								sigfile);
             ERR_print_errors(bio_err);
             goto end;
         }
     }
 
+    if (non_fips_allow) {
+        EVP_MD_CTX *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) {
+        EVP_MD_CTX *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;
@@ -354,36 +393,32 @@ int MAIN(int argc, char **argv)
 
     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,
-			  siglen,"","(stdin)");
+                    siglen, "", "(stdin)", bmd, hmac_key, non_fips_allow);
-		}
+    } else {
-	else
-		{
         name = OBJ_nid2sn(md->type);
-		for (i=0; i<argc; i++)
+        err = 0;
-			{
+        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 =
-				size_t len = strlen(name)+strlen(argv[i])+5;
+                    strlen(name) + strlen(argv[i]) + (hmac_key ? 5 : 0) + 5;
                 tmp = tofree = OPENSSL_malloc(len);
-				BIO_snprintf(tmp,len,"%s(%s)= ",name,argv[i]);
+                BIO_snprintf(tmp, len, "%s%s(%s)= ",
-				}
+                             hmac_key ? "HMAC-" : "", name, argv[i]);
-			else
+            } else
                 tmp = "";
             r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
-				siglen,tmp,argv[i]);
+                      siglen, tmp, argv[i], bmd, hmac_key, non_fips_allow);
             if (r)
                 err = r;
             if (tofree)
@@ -392,86 +427,96 @@ int MAIN(int argc, char **argv)
         }
     }
  end:
-	if (buf != NULL)
+    if (buf != NULL) {
-		{
         OPENSSL_cleanse(buf, BUFSIZE);
         OPENSSL_free(buf);
     }
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
+        BIO_free(in);
     if (passin)
         OPENSSL_free(passin);
     BIO_free_all(out);
     EVP_PKEY_free(sigkey);
-	if(sigbuf) OPENSSL_free(sigbuf);
+    if (sigbuf)
-	if (bmd != NULL) BIO_free(bmd);
+        OPENSSL_free(sigbuf);
+    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)
+          const char *file, BIO *bmd, const char *hmac_key,
+          int non_fips_allow)
 {
-	int len;
+    unsigned int len;
     int i;
+    EVP_MD_CTX *md_ctx;
+    HMAC_CTX hmac_ctx;
 
-	for (;;)
+    if (hmac_key) {
-		{
+        EVP_MD *md;
+
+        BIO_get_md(bmd, &md);
+        HMAC_CTX_init(&hmac_ctx);
+        HMAC_Init_ex(&hmac_ctx, hmac_key, strlen(hmac_key), md, NULL);
+        BIO_get_md_ctx(bmd, &md_ctx);
+        BIO_set_md_ctx(bmd, &hmac_ctx.md_ctx);
+    }
+    for (;;) {
         i = BIO_read(bp, (char *)buf, BUFSIZE);
-		if(i < 0)
+        if (i < 0) {
-			{
             BIO_printf(bio_err, "Read Error in %s\n", file);
             ERR_print_errors(bio_err);
             return 1;
         }
-		if (i == 0) break;
+        if (i == 0)
+            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)
             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) {
-	else
+        HMAC_Final(&hmac_ctx, buf, &len);
+        HMAC_CTX_cleanup(&hmac_ctx);
+    } else
         len = BIO_gets(bp, (char *)buf, BUFSIZE);
 
-	if(binout) BIO_write(out, buf, len);
+    if (binout)
-	else 
+        BIO_write(out, buf, len);
-		{
+    else {
         BIO_write(out, title, strlen(title));
-		for (i=0; i<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, "\n");
     }
+    if (hmac_key) {
+        BIO_set_md_ctx(bmd, md_ctx);
+    }
     return 0;
 }
-

apps/dh.c

@@ -57,6 +57,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
 # include <stdio.h>
 # include <stdlib.h>
@@ -73,7 +74,8 @@
 # undef PROG
 # 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
@@ -87,9 +89,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DH *dh = NULL;
     int i, badops = 0, text = 0;
     BIO *in = NULL, *out = NULL;
@@ -119,32 +118,28 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -156,8 +151,7 @@ int MAIN(int argc, char **argv)
             C = 1;
         else if (strcmp(*argv, "-noout") == 0)
             noout = 1;
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -166,21 +160,23 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  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 - one of DER PEM\n");
-		BIO_printf(bio_err," -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, " -out arg      output file\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,
+                   " -text         print a text form of the DH parameters\n");
         BIO_printf(bio_err, " -C            Output C code\n");
         BIO_printf(bio_err, " -noout        no output\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 # endif
         goto end;
     }
@@ -188,29 +184,25 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     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;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -218,11 +210,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -232,22 +221,17 @@ bad:
         dh = d2i_DHparams_bio(in, NULL);
     else if (informat == FORMAT_PEM)
         dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
-	else
+    else {
-		{
         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");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	
+    if (text) {
-
-	if (text)
-		{
         DHparams_print(out, dh);
 # ifdef undef
         printf("p=");
@@ -260,10 +244,8 @@ bad:
 # endif
     }
 
-	if (check)
+    if (check) {
-		{
+        if (!DH_check(dh, &i)) {
-		if (!DH_check(dh,&i))
-			{
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -278,33 +260,31 @@ bad:
         if (i == 0)
             printf("DH parameters appear to be ok.\n");
     }
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
         int len, l, bits;
 
         len = BN_num_bytes(dh->p);
         bits = BN_num_bits(dh->p);
         data = (unsigned char *)OPENSSL_malloc(len);
-		if (data == NULL)
+        if (data == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
         l = BN_bn2bin(dh->p, data);
         printf("static unsigned char dh%d_p[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dh->g, data);
         printf("static unsigned char dh%d_g[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n\n");
@@ -322,9 +302,7 @@ bad:
         OPENSSL_free(data);
     }
 
-
+    if (!noout) {
-	if (!noout)
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_DHparams_bio(out, dh);
         else if (outformat == FORMAT_PEM)
@@ -333,8 +311,7 @@ bad:
             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");
             ERR_print_errors(bio_err);
             goto end;
@@ -342,9 +319,12 @@ bad:
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dh != NULL) DH_free(dh);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dh != NULL)
+        DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/dhparam.c

@@ -109,6 +109,7 @@
  *
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
 # include <stdio.h>
 # include <stdlib.h>
@@ -131,7 +132,8 @@
 
 # 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
@@ -148,9 +150,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DH *dh = NULL;
     int i, badops = 0, text = 0;
 # ifndef OPENSSL_NO_DSA
@@ -182,32 +181,28 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -227,40 +222,47 @@ int MAIN(int argc, char **argv)
             g = 2;
         else if (strcmp(*argv, "-5") == 0)
             g = 5;
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
-			}
+        } else if (((sscanf(*argv, "%d", &num) == 0) || (num <= 0)))
-		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);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -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, " -out arg      output file\n");
 # ifndef OPENSSL_NO_DSA
-		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
+        BIO_printf(bio_err,
+                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
 # endif
         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,
+                   " -text         print a text form of the DH parameters\n");
         BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
+                   " -2            generate parameters using  2 as the generator value\n");
-		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
+        BIO_printf(bio_err,
+                   " -5            generate parameters using  5 as the generator value\n");
+        BIO_printf(bio_err,
+                   " numbits       number of bits in to generate (default 512)\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        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, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\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");
         BIO_printf(bio_err, " -noout        no output\n");
         goto end;
@@ -269,22 +271,20 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     if (g && !num)
         num = DEFBITS;
 
 # ifndef OPENSSL_NO_DSA
-	if (dsaparam)
+    if (dsaparam) {
-		{
+        if (g) {
-		if (g)
+            BIO_printf(bio_err,
-			{
+                       "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
-	else
 # endif
     {
         /* DH parameters */
@@ -296,45 +296,44 @@ bad:
 
         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,
-			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                       "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",
                        app_RAND_load_files(inrand));
 
 # ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
             DSA *dsa = DSA_new();
 
-			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+            BIO_printf(bio_err,
-			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
+                       "Generating DSA parameters, %d bit long prime\n", num);
-						NULL, 0, NULL, NULL, &cb))
+            if (!dsa
-				{
+                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
-				if(dsa) DSA_free(dsa);
+                                               &cb)) {
+                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
-		else
 # endif
         {
             dh = DH_new();
-			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
+            BIO_printf(bio_err,
+                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
+                       num, g);
             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_generate_parameters_ex(dh, num, g, &cb)) {
-				{
-				if(dh) DH_free(dh);
                 ERR_print_errors(bio_err);
                 goto end;
             }
@@ -344,31 +343,25 @@ bad:
     } else {
 
         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);
-		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");
             goto end;
         }
-
 # ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
             DSA *dsa;
 
             if (informat == FORMAT_ASN1)
@@ -376,8 +369,7 @@ bad:
             else                /* informat == FORMAT_PEM */
                 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");
                 ERR_print_errors(bio_err);
                 goto end;
@@ -385,13 +377,11 @@ bad:
 
             dh = DSA_dup_DH(dsa);
             DSA_free(dsa);
-			if (dh == NULL)
+            if (dh == NULL) {
-				{
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else
-		else
 # endif
         {
             if (informat == FORMAT_ASN1)
@@ -399,8 +389,7 @@ bad:
             else                /* informat == FORMAT_PEM */
                 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");
                 ERR_print_errors(bio_err);
                 goto end;
@@ -411,13 +400,11 @@ bad:
     }
 
     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
         {
@@ -425,26 +412,19 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
-
+    if (text) {
-	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;
         }
@@ -459,38 +439,35 @@ bad:
         if (i == 0)
             printf("DH parameters appear to be ok.\n");
     }
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
         int len, l, bits;
 
         len = BN_num_bytes(dh->p);
         bits = BN_num_bits(dh->p);
         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"
+               "#include <openssl/dh.h>\n" "#endif\n");
-		       "#endif\n");
         printf("DH *get_dh%d()\n\t{\n", bits);
 
         l = BN_bn2bin(dh->p, data);
         printf("\tstatic unsigned char dh%d_p[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t\t");
+                printf("\n\t\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t\t};\n");
 
         l = BN_bn2bin(dh->g, data);
         printf("\tstatic unsigned char dh%d_g[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t\t");
+                printf("\n\t\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t\t};\n");
@@ -509,9 +486,7 @@ bad:
         OPENSSL_free(data);
     }
 
-
+    if (!noout) {
-	if (!noout)
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_DHparams_bio(out, dh);
         else if (outformat == FORMAT_PEM)
@@ -520,8 +495,7 @@ bad:
             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");
             ERR_print_errors(bio_err);
             goto end;
@@ -529,9 +503,12 @@ bad:
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dh != NULL) DH_free(dh);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dh != NULL)
+        DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -541,10 +518,14 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
     BIO_write(cb->arg, &c, 1);
     (void)BIO_flush(cb->arg);
 # ifdef LINT

apps/dsa.c

@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 # include <stdio.h>
 # include <stdlib.h>
@@ -64,16 +65,17 @@
 # include "apps.h"
 # include <openssl/bio.h>
 # include <openssl/err.h>
-#include <openssl/dsa.h>
 # include <openssl/evp.h>
 # include <openssl/x509.h>
 # include <openssl/pem.h>
 # include <openssl/bn.h>
+# include <openssl/dsa.h>
 
 # undef PROG
 # 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
@@ -83,6 +85,10 @@
  * -aes128      - encrypt output if PEM format
  * -aes192      - encrypt output if PEM format
  * -aes256      - encrypt output if PEM format
+ * -camellia128 - encrypt output if PEM format
+ * -camellia192 - encrypt output if PEM format
+ * -camellia256 - encrypt output if PEM format
+ * -seed        - encrypt output if PEM format
  * -text        - print a text version
  * -modulus     - print the DSA public key
  */
@@ -91,9 +97,7 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
     ENGINE *e = NULL;
-#endif
     int ret = 1;
     DSA *dsa = NULL;
     int i, badops = 0;
@@ -129,42 +133,36 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -178,8 +176,7 @@ int MAIN(int argc, char **argv)
             pubin = 1;
         else if (strcmp(*argv, "-pubout") == 0)
             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;
             break;
@@ -188,28 +185,43 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  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 - DER or PEM\n");
         BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg         input file\n");
-		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, " -out arg        output file\n");
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   " -passout arg    output file pass phrase source\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 # endif
-		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");
+                   " -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err,
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
+                   " -idea           encrypt PEM output with cbc idea\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
+# endif
+# ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\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");
@@ -228,46 +240,33 @@ bad:
         goto end;
     }
 
-	in=BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if (out == NULL) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-	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");
+        EVP_PKEY *pkey;
-		goto end;
+        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)
+    if (dsa == NULL) {
-		{
         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
         {
@@ -275,58 +274,60 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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, "\n");
     }
 
-	if (noout) goto end;
+    if (noout)
+        goto end;
     BIO_printf(bio_err, "writing DSA key\n");
     if (outformat == FORMAT_ASN1) {
-		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
+        if (pubin || pubout)
-		else i=i2d_DSAPrivateKey_bio(out,dsa);
+            i = i2d_DSA_PUBKEY_bio(out, dsa);
+        else
+            i = i2d_DSAPrivateKey_bio(out, dsa);
     } else if (outformat == FORMAT_PEM) {
         if (pubin || pubout)
             i = PEM_write_bio_DSA_PUBKEY(out, dsa);
-		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
+        else
+            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
                                             NULL, 0, NULL, passout);
     } 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
-	else
         ret = 0;
  end:
-	if(in != NULL) BIO_free(in);
+    if (in != NULL)
-	if(out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if(dsa != NULL) DSA_free(dsa);
+    if (out != NULL)
-	if(passin) OPENSSL_free(passin);
+        BIO_free_all(out);
-	if(passout) OPENSSL_free(passout);
+    if (dsa != NULL)
+        DSA_free(dsa);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/dsaparam.c

@@ -56,8 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
- * deprecated functions for openssl-internal code */
+/*
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
 # undef OPENSSL_NO_DEPRECATED
 #endif
@@ -79,7 +82,8 @@
 # undef PROG
 # 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
@@ -110,9 +114,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DSA *dsa = NULL;
     int i, badops = 0, text = 0;
     BIO *in = NULL, *out = NULL;
@@ -144,39 +145,35 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if(strcmp(*argv, "-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
 # ifdef GENCB_TEST
-		else if(strcmp(*argv, "-timebomb") == 0)
+        else if (strcmp(*argv, "-timebomb") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             timebomb = atoi(*(++argv));
         }
 # endif
@@ -184,27 +181,21 @@ int MAIN(int argc, char **argv)
             text = 1;
         else if (strcmp(*argv, "-C") == 0)
             C = 1;
-		else if (strcmp(*argv,"-genkey") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			{
             genkey = 1;
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             inrand = *(++argv);
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-noout") == 0)
             noout = 1;
-		else if (sscanf(*argv,"%d",&num) == 1)
+        else if (sscanf(*argv, "%d", &num) == 1) {
-			{
             /* generate a key */
             numbits = num;
             need_rand = 1;
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -213,8 +204,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] [bits] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -226,14 +216,18 @@ bad:
         BIO_printf(bio_err, " -C            Output C code\n");
         BIO_printf(bio_err, " -noout        no output\n");
         BIO_printf(bio_err, " -genkey       generate a DSA key\n");
-		BIO_printf(bio_err," -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
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 # endif
 # ifdef GENCB_TEST
-		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
+        BIO_printf(bio_err,
+                   " -timebomb n   interrupt keygen after <n> seconds\n");
 # endif
-		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
+        BIO_printf(bio_err,
+                   " number        number of bits to use for generating private key\n");
         goto end;
     }
 
@@ -241,24 +235,20 @@ bad:
 
     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;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -266,62 +256,54 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # 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",
                        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");
             goto end;
         }
-		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+        BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
+                   num);
         BIO_printf(bio_err, "This could take some time\n");
 # 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,"(though I'll stop it if not done within %d secs)\n",
+            BIO_printf(bio_err,
+                       "(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");
                 goto end;
             }
             alarm(timebomb);
         }
 # 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)
+            if (stop_keygen_flag) {
-				{
                 BIO_printf(bio_err, "DSA key generation time-stopped\n");
                 /* This is an asked-for behaviour! */
                 ret = 0;
@@ -331,66 +313,58 @@ bad:
             BIO_printf(bio_err, "Error, DSA key generation failed\n");
             goto end;
         }
-		}
+    } else if (informat == FORMAT_ASN1)
-	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);
-	else
+    else {
-		{
         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");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (text)
+    if (text) {
-		{
         DSAparams_print(out, dsa);
     }
 
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
-		int l,len,bits_p,bits_q,bits_g;
+        int l, len, bits_p;
 
         len = BN_num_bytes(dsa->p);
         bits_p = BN_num_bits(dsa->p);
-		bits_q=BN_num_bits(dsa->q);
-		bits_g=BN_num_bits(dsa->g);
         data = (unsigned char *)OPENSSL_malloc(len + 20);
-		if (data == NULL)
+        if (data == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
         l = BN_bn2bin(dsa->p, data);
         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)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dsa->q, data);
         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)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dsa->g, data);
         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)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n\n");
@@ -404,14 +378,13 @@ bad:
                bits_p, bits_p);
         printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
                bits_p, bits_p);
-		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
+        printf
+            ("\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);
         else if (outformat == FORMAT_PEM)
@@ -420,24 +393,25 @@ bad:
             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");
             ERR_print_errors(bio_err);
             goto end;
         }
     }
-	if (genkey)
+    if (genkey) {
-		{
         DSA *dsakey;
 
         assert(need_rand);
-		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
+        if ((dsakey = DSAparams_dup(dsa)) == NULL)
-		if (!DSA_generate_key(dsakey)) goto end;
+            goto end;
+        if (!DSA_generate_key(dsakey))
+            goto end;
         if (outformat == FORMAT_ASN1)
             i = i2d_DSAPrivateKey_bio(out, dsakey);
         else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
+            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
+                                            NULL);
         else {
             BIO_printf(bio_err, "bad output format specified for outfile\n");
             goto end;
@@ -448,9 +422,12 @@ bad:
         app_RAND_write_file(NULL, bio_err);
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dsa != NULL) DSA_free(dsa);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dsa != NULL)
+        DSA_free(dsa);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -459,10 +436,14 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
     BIO_write(cb->arg, &c, 1);
     (void)BIO_flush(cb->arg);
 # ifdef LINT
@@ -474,4 +455,10 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 # endif
     return 1;
 }
+#else                           /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/ec.c

@@ -56,6 +56,7 @@
  *
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
 # include <stdio.h>
 # include <stdlib.h>
@@ -69,7 +70,8 @@
 # undef PROG
 # 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
@@ -84,9 +86,6 @@ 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;
@@ -121,49 +120,40 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if (strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
-			}
+        } else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv, "-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             engine = *(++argv);
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		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;
@@ -176,9 +166,7 @@ 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;
@@ -189,15 +177,13 @@ 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;
         else if (strcmp(*argv, "-pubout") == 0)
             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;
             break;
@@ -206,8 +192,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -237,13 +222,11 @@ bad:
                    " compressed\n");
         BIO_printf(bio_err, "                                 "
                    " uncompressed (default)\n");
-		BIO_printf(bio_err, "                                  "
+        BIO_printf(bio_err, "                                  " " hybrid\n");
-				" 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 "
+        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
-				"encoding\n");
+        BIO_printf(bio_err, "                 possible values:"
-		BIO_printf(bio_err, "                 possilbe values:"
                    " named_curve (default)\n");
         BIO_printf(bio_err, "                                  "
                    "explicit\n");
@@ -253,65 +236,52 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    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");
         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, 
+            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-				NULL);
         else
-			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
+            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
-				passin);
+    } else {
-		} 
-	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");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -319,11 +289,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out, outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -338,28 +305,26 @@ bad:
         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)
@@ -367,20 +332,15 @@ bad:
         else
             i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
                                            NULL, 0, NULL, passout);
-		} 
+    } 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 private key\n");
         ERR_print_errors(bio_err);
-		}
+    } else
-	else
         ret = 0;
  end:
     if (in)

apps/ecparam.c

@@ -68,6 +68,8 @@
  * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
  *
  */
+
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
 # include <assert.h>
 # include <stdio.h>
@@ -85,7 +87,8 @@
 # undef PROG
 # 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
@@ -109,8 +112,8 @@
  * -engine e        - use engine e, possibly a hardware device
  */
 
-
+static int ecparam_print_var(BIO *, BIGNUM *, const char *, int,
-static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
+                             unsigned char *);
 
 int MAIN(int, char **);
 
@@ -127,9 +130,6 @@ 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,
@@ -151,44 +151,36 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-text") == 0)
-		else if (strcmp(*argv,"-text") == 0)
             text = 1;
         else if (strcmp(*argv, "-C") == 0)
             C = 1;
         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;
@@ -201,9 +193,7 @@ 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;
@@ -214,29 +204,23 @@ 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;
-		else if (strcmp(*argv,"-genkey") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			{
             genkey = 1;
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv, "-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             inrand = *(++argv);
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-engine") == 0) {
-		else if(strcmp(*argv, "-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             engine = *(++argv);
-			}	
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -245,8 +229,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -287,10 +270,8 @@ bad:
         BIO_printf(bio_err, "                                   "
                    " explicit\n");
         BIO_printf(bio_err, " -no_seed          if 'explicit'"
-				" parameters are choosen do not"
+                   " parameters are choosen do not" " use the seed\n");
-				" use the seed\n");
+        BIO_printf(bio_err, " -genkey           generate ec" " key\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, "
@@ -302,24 +283,20 @@ bad:
 
     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;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -327,22 +304,18 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
 # ifndef OPENSSL_NO_ENGINE
-	e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
-	if (list_curves)
+    if (list_curves) {
-		{
         EC_builtin_curve *curves = NULL;
         size_t crv_len = 0;
         size_t n = 0;
@@ -354,15 +327,12 @@ bad:
         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;
@@ -381,64 +351,48 @@ bad:
         goto end;
     }
 
-	if (curve_name != NULL)
+    if (curve_name != NULL) {
-		{
         int nid;
 
-		/* workaround for the SECG curve names secp192r1
+        /*
-		 * and secp256r1 (which are the same as the curves
+         * workaround for the SECG curve names secp192r1 and secp256r1 (which
-		 * prime192v1 and prime256v1 defined in X9.62)
+         * are the same as the curves prime192v1 and prime256v1 defined in
+         * 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) {
-	else if (informat == FORMAT_PEM)
-		{
         group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
-		}
+    } else {
-	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;
     }
@@ -449,34 +403,28 @@ bad:
     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;
@@ -485,23 +433,17 @@ bad:
         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) == 
+        is_prime = (EC_METHOD_get_field_type(meth) == NID_X9_62_prime_field);
-			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;
         }
@@ -509,16 +451,15 @@ bad:
         if ((point = EC_GROUP_get0_generator(group)) == NULL)
             goto end;
         if (!EC_POINT_point2bn(group, point,
-			EC_GROUP_get_point_conversion_form(group), ec_gen, 
+                               EC_GROUP_get_point_conversion_form(group),
-			NULL))
+                               ec_gen, 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 || 
+        if (!ec_p || !ec_a || !ec_b || !ec_gen || !ec_order || !ec_cofactor)
-			!ec_order || !ec_cofactor)
             goto end;
 
         len = BN_num_bits(ec_order);
@@ -538,8 +479,7 @@ bad:
 
         buffer = (unsigned char *)OPENSSL_malloc(buf_len);
 
-		if (buffer == NULL)
+        if (buffer == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
@@ -549,8 +489,7 @@ bad:
         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, 
+        ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
-			buffer);
 
         BIO_printf(out, "\n\n");
 
@@ -569,14 +508,11 @@ bad:
         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;
         }
@@ -609,20 +545,17 @@ bad:
         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"
                        " outfile\n");
             goto end;
         }
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write elliptic "
                        "curve parameters\n");
             ERR_print_errors(bio_err);
@@ -630,16 +563,14 @@ bad:
         }
     }
 
-	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",
                        app_RAND_load_files(inrand));
     }
 
-	if (genkey)
+    if (genkey) {
-		{
         EC_KEY *eckey = EC_KEY_new();
 
         if (eckey == NULL)
@@ -650,8 +581,7 @@ bad:
         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;
         }
@@ -660,8 +590,7 @@ bad:
         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);
@@ -705,13 +634,11 @@ static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
     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)
                 BIO_printf(out, "\n\t");
             BIO_printf(out, "0x%02X,", buffer[i]);

apps/enc.c

@@ -87,12 +87,10 @@ static void show_ciphers(const OBJ_NAME *name,void *bio_)
         return;
 
     BIO_printf(bio, "-%-25s", name->name);
-	if(++n == 3)
+    if (++n == 3) {
-		{
         BIO_printf(bio, "\n");
         n = 0;
-		}
+    } else
-	else
         BIO_printf(bio, " ");
 }
 
@@ -100,9 +98,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     static const char magic[] = "Salted__";
     char mbuf[sizeof magic - 1];
     char *strbuf = NULL;
@@ -120,13 +115,15 @@ int MAIN(int argc, char **argv)
     const EVP_CIPHER *cipher = NULL, *c;
     EVP_CIPHER_CTX *ctx = NULL;
     char *inf = NULL, *outf = NULL;
-	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
+    BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
+        NULL, *wbio = NULL;
 #define PROG_NAME_SIZE  39
     char pname[PROG_NAME_SIZE + 1];
 #ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
 #endif
     const EVP_MD *dgst = NULL;
+    int non_fips_allow = 0;
 
     apps_startup();
 
@@ -143,37 +140,33 @@ int MAIN(int argc, char **argv)
         base64 = 1;
 
     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);
         goto bad;
     }
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
         if (strcmp(*argv, "-e") == 0)
             enc = 1;
-		else if (strcmp(*argv,"-in") == 0)
+        else if (strcmp(*argv, "-in") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inf = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outf = *(++argv);
-			}
+        } else if (strcmp(*argv, "-pass") == 0) {
-		else if (strcmp(*argv,"-pass") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			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)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 #endif
@@ -199,77 +192,67 @@ int MAIN(int argc, char **argv)
             base64 = 1;
         else if (strcmp(*argv, "-base64") == 0)
             base64 = 1;
-		else if (strcmp(*argv,"-bufsize") == 0)
+        else if (strcmp(*argv, "-bufsize") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             bufsize = (unsigned char *)*(++argv);
-			}
+        } else if (strcmp(*argv, "-k") == 0) {
-		else if (strcmp(*argv,"-k") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             str = *(++argv);
-			}
+        } else if (strcmp(*argv, "-kfile") == 0) {
-		else if (strcmp(*argv,"-kfile") == 0)
-			{
             static char buf[128];
             FILE *infile;
             char *file;
 
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             file = *(++argv);
             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",
-					file);
                 goto bad;
             }
             buf[0] = '\0';
-			fgets(buf,sizeof buf,infile);
+            if (!fgets(buf, sizeof buf, infile)) {
+                BIO_printf(bio_err, "unable to read key from '%s'\n", file);
+                goto bad;
+            }
             fclose(infile);
             i = strlen(buf);
-			if ((i > 0) &&
+            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
-				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
                 buf[--i] = '\0';
-			if ((i > 0) &&
+            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
-				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
                 buf[--i] = '\0';
-			if (i < 1)
+            if (i < 1) {
-				{
                 BIO_printf(bio_err, "zero length password\n");
                 goto bad;
             }
             str = buf;
-			}
+        } else if (strcmp(*argv, "-K") == 0) {
-		else if (strcmp(*argv,"-K") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hkey = *(++argv);
-			}
+        } else if (strcmp(*argv, "-S") == 0) {
-		else if (strcmp(*argv,"-S") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hsalt = *(++argv);
-			}
+        } else if (strcmp(*argv, "-iv") == 0) {
-		else if (strcmp(*argv,"-iv") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hiv = *(++argv);
-			}
+        } else if (strcmp(*argv, "-md") == 0) {
-		else if (strcmp(*argv,"-md") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			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)
-		else if (strcmp(*argv,"-none") == 0)
             cipher = NULL;
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option '%s'\n", *argv);
  bad:
             BIO_printf(bio_err, "options are\n");
@@ -278,22 +261,34 @@ bad:
             BIO_printf(bio_err, "%-14s pass phrase source\n", "-pass <arg>");
             BIO_printf(bio_err, "%-14s encrypt\n", "-e");
             BIO_printf(bio_err, "%-14s decrypt\n", "-d");
-			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
+            BIO_printf(bio_err,
-			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
+                       "%-14s base64 encode/decode, depending on encryption flag\n",
-			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
+                       "-a/-base64");
-			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
+            BIO_printf(bio_err, "%-14s passphrase is the next argument\n",
-			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
+                       "-k");
-			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
+            BIO_printf(bio_err,
-			BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
+                       "%-14s passphrase is the first line of the file argument\n",
+                       "-kfile");
+            BIO_printf(bio_err,
+                       "%-14s the next argument is the md to use to create a key\n",
+                       "-md");
+            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,"%-14s use engine e, possibly a hardware device.\n","-engine e");
+            BIO_printf(bio_err,
+                       "%-14s use engine e, possibly a hardware device.\n",
+                       "-engine e");
 #endif
 
             BIO_printf(bio_err, "Cipher Types\n");
             OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-					       show_ciphers,
+                                   show_ciphers, bio_err);
-					       bio_err);
             BIO_printf(bio_err, "\n");
 
             goto end;
@@ -303,78 +298,75 @@ bad:
     }
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    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);
         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;
             if ((i <= '9') && (i >= '0'))
                 n = n * 10 + i - '0';
-			else if (i == 'k')
+            else if (i == 'k') {
-				{
                 n *= 1024;
                 bufsize++;
                 break;
             }
         }
-		if (*bufsize != '\0')
+        if (*bufsize != '\0') {
-			{
             BIO_printf(bio_err, "invalid 'bufsize' specified.\n");
             goto end;
         }
 
         /* It must be large enough for a base64 encoded line */
-		if (n < 80) n=80;
+        if (base64 && n < 80)
+            n = 80;
 
         bsize = (int)n;
-		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
+        if (verbose)
+            BIO_printf(bio_err, "bufsize=%d\n", bsize);
     }
 
     strbuf = OPENSSL_malloc(SIZE);
     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",
-		BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
+                   (long)EVP_ENCODE_LENGTH(bsize));
         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 (debug)
+    if (debug) {
-		{
         BIO_set_callback(in, BIO_debug_callback);
         BIO_set_callback(out, BIO_debug_callback);
-		BIO_set_callback_arg(in,bio_err);
+        BIO_set_callback_arg(in, (char *)bio_err);
-		BIO_set_callback_arg(out,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);
-	else
+    } else {
-		{
+        if (BIO_read_filename(in, inf) <= 0) {
-		if (BIO_read_filename(in,inf) <= 0)
-			{
             perror(inf);
             goto end;
         }
@@ -388,10 +380,8 @@ bad:
         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:",
@@ -399,39 +389,33 @@ bad:
                          (enc) ? "encryption" : "decryption");
             strbuf[0] = '\0';
             i = EVP_read_pw_string((char *)strbuf, SIZE, buf, enc);
-			if (i == 0)
+            if (i == 0) {
-				{
+                if (strbuf[0] == '\0') {
-				if (strbuf[0] == '\0')
-					{
                     ret = 1;
                     goto end;
                 }
                 str = strbuf;
                 break;
             }
-			if (i < 0)
+            if (i < 0) {
-				{
                 BIO_printf(bio_err, "bad password read\n");
                 goto end;
             }
         }
     }
 
-
+    if (outf == NULL) {
-	if (outf == NULL)
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
+        if (bufsize != NULL)
+            setvbuf(stdout, (char *)NULL, _IONBF, 0);
 #ifdef OPENSSL_SYS_VMS
         {
             BIO *tmpbio = BIO_new(BIO_f_linebuffer());
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outf) <= 0) {
-		{
-		if (BIO_write_filename(out,outf) <= 0)
-			{
             perror(outf);
             goto end;
         }
@@ -440,14 +424,12 @@ bad:
     rbio = in;
     wbio = out;
 
-	if (base64)
+    if (base64) {
-		{
         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,bio_err);
+            BIO_set_callback_arg(b64, (char *)bio_err);
         }
         if (olb64)
             BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
@@ -457,30 +439,31 @@ bad:
             rbio = BIO_push(b64, rbio);
     }
 
-	if (cipher != NULL)
+    if (cipher != NULL) {
-		{
+        /*
-		/* Note that str is NULL if a key was passed on the command
+         * Note that str is NULL if a key was passed on the command line, so
-		 * line, so we get no salt in that case. Is this a bug?
+         * 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
+             * Salt handling: if encrypting generate a salt and write to
-			 * write to output BIO. If decrypting read salt from
+             * output BIO. If decrypting read salt from input BIO.
-			 * input BIO.
              */
             unsigned char *sptr;
-			if(nosalt) sptr = NULL;
+            if (nosalt)
+                sptr = NULL;
             else {
                 if (enc) {
                     if (hsalt) {
                         if (!set_hex(hsalt, salt, sizeof salt)) {
-							BIO_printf(bio_err,
+                            BIO_printf(bio_err, "invalid hex salt value\n");
-								"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,
                                       sizeof magic - 1) != sizeof magic - 1
@@ -505,32 +488,31 @@ bad:
             }
 
             EVP_BytesToKey(cipher, dgst, sptr,
-				(unsigned char *)str,
+                           (unsigned char *)str, strlen(str), 1, key, iv);
-				strlen(str),1,key,iv);
+            /*
-			/* zero the complete buffer or the string
+             * zero the complete buffer or the string passed from the command
-			 * passed from the command line
+             * line bug picked up by Larry J. Hughes Jr. <hughes@indiana.edu>
-			 * bug picked up by
+             */
-			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
             if (str == strbuf)
                 OPENSSL_cleanse(str, SIZE);
             else
                 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");
             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
+            /*
-			 * during EVP_BytesToKey. Hence the IV is undefined,
+             * No IV was explicitly set and no IV was generated during
-			 * making correct decryption impossible. */
+             * EVP_BytesToKey. Hence the IV is undefined, making correct
+             * 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");
             goto end;
         }
@@ -538,13 +520,17 @@ bad:
         if ((benc = BIO_new(BIO_f_cipher())) == NULL)
             goto end;
 
-		/* Since we may be changing parameters work on the encryption
+        /*
-		 * context rather than calling BIO_set_cipher().
+         * Since we may be changing parameters work on the encryption context
+         * rather than calling BIO_set_cipher().
          */
 
         BIO_get_cipher_ctx(benc, &ctx);
-		if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
+
-			{
+        if (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)) {
             BIO_printf(bio_err, "Error setting cipher %s\n",
                        EVP_CIPHER_name(cipher));
             ERR_print_errors(bio_err);
@@ -554,45 +540,38 @@ bad:
         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,bio_err);
+            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++)
                     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++)
                     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++)
                     printf("%02X", iv[i]);
                 printf("\n");
             }
-			if (printkey == 2)
+            if (printkey == 2) {
-				{
                 ret = 0;
                 goto end;
             }
@@ -603,37 +582,41 @@ bad:
     if (benc != NULL)
         wbio = BIO_push(benc, wbio);
 
-	for (;;)
+    for (;;) {
-		{
         inl = BIO_read(rbio, (char *)buff, bsize);
-		if (inl <= 0) break;
+        if (inl <= 0)
-		if (BIO_write(wbio,(char *)buff,inl) != inl)
+            break;
-			{
+        if (BIO_write(wbio, (char *)buff, inl) != inl) {
             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");
         goto end;
     }
 
     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));
     }
  end:
     ERR_print_errors(bio_err);
-	if (strbuf != NULL) OPENSSL_free(strbuf);
+    if (strbuf != NULL)
-	if (buff != NULL) OPENSSL_free(buff);
+        OPENSSL_free(strbuf);
-	if (in != NULL) BIO_free(in);
+    if (buff != NULL)
-	if (out != NULL) BIO_free_all(out);
+        OPENSSL_free(buff);
-	if (benc != NULL) BIO_free(benc);
+    if (in != NULL)
-	if (b64 != NULL) BIO_free(b64);
+        BIO_free(in);
-	if(pass) OPENSSL_free(pass);
+    if (out != NULL)
+        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);
 }
@@ -644,25 +627,23 @@ int set_hex(char *in, unsigned char *out, int size)
     unsigned char j;
 
     n = strlen(in);
-	if (n > (size*2))
+    if (n > (size * 2)) {
-		{
         BIO_printf(bio_err, "hex string is too long\n");
         return (0);
     }
     memset(out, 0, size);
-	for (i=0; i<n; i++)
+    for (i = 0; i < n; i++) {
-		{
         j = (unsigned char)*in;
         *(in++) = '\0';
-		if (j == 0) break;
+        if (j == 0)
+            break;
         if ((j >= '0') && (j <= '9'))
             j -= '0';
         else if ((j >= 'A') && (j <= 'F'))
             j = j - 'A' + 10;
         else if ((j >= 'a') && (j <= 'f'))
             j = j - 'a' + 10;
-		else
+        else {
-			{
             BIO_printf(bio_err, "non-hex digit\n");
             return (0);
         }

apps/engine.c

@@ -1,6 +1,7 @@
 /* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
+/*
- * project 2000.
+ * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -56,8 +57,6 @@
  *
  */
 
-#ifndef OPENSSL_NO_ENGINE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -66,6 +65,7 @@
 #endif
 #include "apps.h"
 #include <openssl/err.h>
+#ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 # include <openssl/ssl.h>
 
@@ -101,8 +101,7 @@ 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)
@@ -113,8 +112,7 @@ 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);
     }
@@ -134,46 +132,42 @@ 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
+    /*
-         * having it part of all the other flags, even if it really is. */
+     * If the object is internal, mark it in a way that shows instead of
-	if(flags & ENGINE_CMD_FLAG_INTERNAL)
+     * having it part of all the other flags, even if it really is.
-		{
+     */
+    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;
         }
@@ -183,11 +177,10 @@ 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_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
-			~ENGINE_CMD_FLAG_INTERNAL;
+    if (flags) {
-	if(flags)
+        if (started)
-		{
+            BIO_printf(bio_out, "|");
-		if(started) BIO_printf(bio_out, "|");
         BIO_printf(bio_out, "<0x%04X>", flags);
     }
     if (err)
@@ -196,7 +189,8 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
     return 1;
 }
 
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
+                        const char *indent)
 {
     static const int line_wrap = 78;
     int num;
@@ -208,8 +202,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
     STACK *cmds = 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
         BIO_printf(bio_out, "%s<no control commands>\n", indent);
 # endif
@@ -226,8 +219,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
         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,
                                    NULL, NULL)) <= 0)
@@ -241,8 +233,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
             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)
                     goto err;
                 if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
@@ -252,73 +243,71 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
             /* Now decide on the output */
             if (xpos == 0)
                 /* Do an indent */
-                                xpos = BIO_printf(bio_out, indent);
+                xpos = BIO_puts(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)) &&
-					(xpos + (int)strlen(name) > line_wrap))
+                    (xpos + (int)strlen(name) > line_wrap)) {
-                                        {
                     BIO_printf(bio_out, "\n");
-                                        xpos = BIO_printf(bio_out, indent);
+                    xpos = BIO_puts(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,
+                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
-                                        indent))
                     goto err;
                 xpos = 0;
             }
         }
-		OPENSSL_free(name); name = NULL;
+        OPENSSL_free(name);
-		if(desc) { OPENSSL_free(desc); desc = NULL; }
+        name = NULL;
+        if (desc) {
+            OPENSSL_free(desc);
+            desc = NULL;
+        }
         /* Move to the next command */
-		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
+        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
-					num, NULL, NULL);
     } while (num > 0);
     if (xpos > 0)
         BIO_printf(bio_out, "\n");
     ret = 1;
  err:
-	if(cmds) sk_pop_free(cmds, identity);
+    if (cmds)
-	if(name) OPENSSL_free(name);
+        sk_pop_free(cmds, identity);
-	if(desc) OPENSSL_free(desc);
+    if (name)
+        OPENSSL_free(name);
+    if (desc)
+        OPENSSL_free(desc);
     return ret;
 }
 
-static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
+static void util_do_cmds(ENGINE *e, STACK * cmds, BIO *bio_out,
+                         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))
                 res = 0;
-			}
+        } else {
-		else
+            if ((int)(arg - cmd) > 254) {
-			{
-			if((int)(arg - cmd) > 254)
-				{
                 BIO_printf(bio_out, "[Error]: command name too long\n");
                 return;
             }
@@ -331,8 +320,7 @@ static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *inden
         }
         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);
         }
@@ -372,40 +360,33 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strncmp(*argv, "-v", 2) == 0) {
-		if (strncmp(*argv,"-v",2) == 0)
-			{
             if (strspn(*argv + 1, "v") < strlen(*argv + 1))
                 goto skip_arg_loop;
             if ((verbose = strlen(*argv + 1)) > 4)
                 goto skip_arg_loop;
-			}
+        } else if (strcmp(*argv, "-c") == 0)
-		else if (strcmp(*argv,"-c") == 0)
             list_cap = 1;
-		else if (strncmp(*argv,"-t",2) == 0)
+        else if (strncmp(*argv, "-t", 2) == 0) {
-			{
             test_avail = 1;
             if (strspn(*argv + 1, "t") < strlen(*argv + 1))
                 goto skip_arg_loop;
             if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
                 goto skip_arg_loop;
-			}
+        } else if (strcmp(*argv, "-pre") == 0) {
-		else if (strcmp(*argv,"-pre") == 0)
+            argc--;
-			{
+            argv++;
-			argc--; argv++;
             if (argc == 0)
                 goto skip_arg_loop;
             sk_push(pre_cmds, *argv);
-			}
+        } else if (strcmp(*argv, "-post") == 0) {
-		else if (strcmp(*argv,"-post") == 0)
+            argc--;
-			{
+            argv++;
-			argc--; argv++;
             if (argc == 0)
                 goto skip_arg_loop;
             sk_push(post_cmds, *argv);
-			}
+        } else if ((strncmp(*argv, "-h", 2) == 0) ||
-		else if ((strncmp(*argv,"-h",2) == 0) ||
                    (strcmp(*argv, "-?") == 0))
             goto skip_arg_loop;
         else
@@ -417,37 +398,32 @@ int MAIN(int argc, char **argv)
     badops = 0;
  skip_arg_loop:
 
-	if (badops)
+    if (badops) {
-		{
         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)) {
-		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)
+        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;
@@ -456,39 +432,35 @@ skip_arg_loop:
                 ENGINE_DIGESTS_PTR fn_d;
 
                 if (ENGINE_get_RSA(e) != NULL
-					&& !append_buf(&cap_buf, "RSA",
+                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_DSA(e) != NULL
-					&& !append_buf(&cap_buf, "DSA",
+                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_DH(e) != NULL
-					&& !append_buf(&cap_buf, "DH",
+                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_RAND(e) != NULL
-					&& !append_buf(&cap_buf, "RAND",
+                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
 
                 fn_c = ENGINE_get_ciphers(e);
-				if(!fn_c) goto skip_ciphers;
+                if (!fn_c)
+                    goto skip_ciphers;
                 n = fn_c(e, NULL, &nids, 0);
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						       &cap_size, 256))
                         goto end;
 
  skip_ciphers:
                 fn_d = ENGINE_get_digests(e);
-				if(!fn_d) goto skip_digests;
+                if (!fn_d)
+                    goto skip_digests;
                 n = fn_d(e, NULL, &nids, 0);
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						       &cap_size, 256))
                         goto end;
 
  skip_digests:
@@ -497,17 +469,13 @@ skip_digests:
 
                 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)
                         ERR_print_errors_fp(stdout);
@@ -517,8 +485,7 @@ skip_digests:
             if ((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
                 goto end;
             ENGINE_free(e);
-			}
+        } else
-		else
             ERR_print_errors(bio_err);
     }
 
@@ -529,7 +496,8 @@ end:
     sk_pop_free(engines, identity);
     sk_pop_free(pre_cmds, identity);
     sk_pop_free(post_cmds, identity);
-	if (bio_out != NULL) BIO_free_all(bio_out);
+    if (bio_out != NULL)
+        BIO_free_all(bio_out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/errstr.c

@@ -84,13 +84,11 @@ int MAIN(int argc, char **argv)
 
     SSL_load_error_strings();
 
-	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
+    if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
-		{
         BIO *out = NULL;
 
         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());
@@ -102,20 +100,17 @@ int MAIN(int argc, char **argv)
             lh_node_usage_stats_bio((LHASH *)
                                     ERR_get_string_table(), out);
         }
-		if (out != NULL) BIO_free_all(out);
+        if (out != NULL)
+            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);
-			}
+        } else {
-		else
-			{
             printf("%s: bad error code\n", argv[i]);
             printf("usage: errstr [-stats] <errno> ...\n");
             ret++;

apps/gendh.c

@@ -57,8 +57,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+#include <openssl/opensslconf.h>
- * deprecated functions for openssl-internal code */
+/*
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
 # undef OPENSSL_NO_DEPRECATED
 #endif
@@ -88,9 +91,6 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
     BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DH *dh = NULL;
     int ret = 1, num = DEFBITS;
     int g = 2;
@@ -113,67 +113,66 @@ int MAIN(int argc, char **argv)
 
     argv++;
     argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-2") == 0)
-		else if (strcmp(*argv,"-2") == 0)
             g = 2;
-	/*	else if (strcmp(*argv,"-3") == 0)
+/*-     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)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++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: gendh [args] [numbits]\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");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+        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, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\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
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     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
         {
@@ -181,28 +180,28 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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,
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                   "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",
                    app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
+    BIO_printf(bio_err,
+               "Generating DH parameters, %d bit long safe prime, generator %d\n",
+               num, g);
     BIO_printf(bio_err, "This is going to take a long time\n");
 
-	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
+    if (((dh = DH_new()) == NULL)
+        || !DH_generate_parameters_ex(dh, num, g, &cb))
         goto end;
 
     app_RAND_write_file(NULL, bio_err);
@@ -213,8 +212,10 @@ bad:
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
-	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);
 }
@@ -223,10 +224,14 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
     BIO_write(cb->arg, &c, 1);
     (void)BIO_flush(cb->arg);
 # ifdef LINT

apps/gendsa.c

@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 # include <stdio.h>
 # include <string.h>
@@ -77,9 +78,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DSA *dsa = NULL;
     int ret = 1;
     char *outfile = NULL;
@@ -102,32 +100,30 @@ int MAIN(int argc, char **argv)
 
     argv++;
     argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
-			}
+        } else if (strcmp(*argv, "-") == 0)
-		else if (strcmp(*argv,"-") == 0)
             goto bad;
 # ifndef OPENSSL_NO_DES
         else if (strcmp(*argv, "-des") == 0)
@@ -139,6 +135,10 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-idea") == 0)
             enc = EVP_idea_cbc();
 # endif
+# ifndef OPENSSL_NO_SEED
+        else if (strcmp(*argv, "-seed") == 0)
+            enc = EVP_seed_cbc();
+# endif
 # ifndef OPENSSL_NO_AES
         else if (strcmp(*argv, "-aes128") == 0)
             enc = EVP_aes_128_cbc();
@@ -147,45 +147,67 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-aes256") == 0)
             enc = EVP_aes_256_cbc();
 # endif
-		else if (**argv != '-' && dsaparams == NULL)
+# ifndef OPENSSL_NO_CAMELLIA
-			{
+        else if (strcmp(*argv, "-camellia128") == 0)
+            enc = EVP_camellia_128_cbc();
+        else if (strcmp(*argv, "-camellia192") == 0)
+            enc = EVP_camellia_192_cbc();
+        else if (strcmp(*argv, "-camellia256") == 0)
+            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");
         BIO_printf(bio_err, " -out file - output the key to 'file'\n");
 # ifndef OPENSSL_NO_DES
-		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");
+                   " -des      - encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 # endif
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
+# endif
+# ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err, " -seed\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc seed\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
+# endif
+# ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\n");
 # endif
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+        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, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\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");
         BIO_printf(bio_err, " dsaparam-file\n");
-		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
+        BIO_printf(bio_err,
+                   "           - a DSA parameter file as generated by the dsaparam command\n");
         goto end;
     }
-
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
@@ -193,16 +215,13 @@ bad:
         goto end;
     }
 
-
     in = BIO_new(BIO_s_file());
-	if (!(BIO_read_filename(in,dsaparams)))
+    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");
         goto end;
     }
@@ -210,10 +229,10 @@ bad:
     in = NULL;
 
     out = BIO_new(BIO_s_file());
-	if (out == NULL) goto end;
+    if (out == NULL)
+        goto end;
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -221,27 +240,24 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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,
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                   "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",
                    app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
+    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
-							BN_num_bits(dsa->p));
+    if (!DSA_generate_key(dsa))
-	if (!DSA_generate_key(dsa)) goto end;
+        goto end;
 
     app_RAND_write_file(NULL, bio_err);
 
@@ -251,11 +267,21 @@ bad:
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dsa != NULL) DSA_free(dsa);
+    if (out != NULL)
-	if(passout) OPENSSL_free(passout);
+        BIO_free_all(out);
+    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

@@ -56,8 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+#include <openssl/opensslconf.h>
- * deprecated functions for openssl-internal code */
+/*
+ * Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code
+ */
 #ifdef OPENSSL_NO_DEPRECATED
 # undef OPENSSL_NO_DEPRECATED
 #endif
@@ -88,12 +91,10 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
     BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     int ret = 1;
     int i, num = DEFBITS;
     long l;
+    int use_x931 = 0;
     const EVP_CIPHER *enc = NULL;
     unsigned long f4 = RSA_F4;
     char *outfile = NULL;
@@ -104,9 +105,10 @@ int MAIN(int argc, char **argv)
     char *inrand = NULL;
     BIO *out = NULL;
     BIGNUM *bn = BN_new();
-	RSA *rsa = RSA_new();
+    RSA *rsa = NULL;
 
-	if(!bn || !rsa) goto err;
+    if (!bn)
+        goto err;
 
     apps_startup();
     BN_GENCB_set(&cb, genrsa_cb, bio_err);
@@ -117,36 +119,36 @@ int MAIN(int argc, char **argv)
 
     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");
         goto err;
     }
 
     argv++;
     argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-3") == 0)
-		else if (strcmp(*argv,"-3") == 0)
             f4 = 3;
         else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
             f4 = RSA_F4;
+        else if (strcmp(*argv, "-x931") == 0)
+            use_x931 = 1;
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
         }
 # ifndef OPENSSL_NO_DES
@@ -159,6 +161,10 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-idea") == 0)
             enc = EVP_idea_cbc();
 # endif
+# ifndef OPENSSL_NO_SEED
+        else if (strcmp(*argv, "-seed") == 0)
+            enc = EVP_seed_cbc();
+# endif
 # ifndef OPENSSL_NO_AES
         else if (strcmp(*argv, "-aes128") == 0)
             enc = EVP_aes_128_cbc();
@@ -167,38 +173,63 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-aes256") == 0)
             enc = EVP_aes_256_cbc();
 # endif
-		else if (strcmp(*argv,"-passout") == 0)
+# ifndef OPENSSL_NO_CAMELLIA
-			{
+        else if (strcmp(*argv, "-camellia128") == 0)
-			if (--argc < 1) goto bad;
+            enc = EVP_camellia_128_cbc();
+        else if (strcmp(*argv, "-camellia192") == 0)
+            enc = EVP_camellia_192_cbc();
+        else if (strcmp(*argv, "-camellia256") == 0)
+            enc = EVP_camellia_256_cbc();
+# endif
+        else if (strcmp(*argv, "-passout") == 0) {
+            if (--argc < 1)
+                goto bad;
             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");
-		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");
+                   " -des            encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
+# endif
+# ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err, " -seed\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc seed\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
+# endif
+# ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\n");
 # endif
         BIO_printf(bio_err, " -out file       output the key to 'file\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");
+                   " -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   " -f4             use F4 (0x10001) for the E value\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");
+        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, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\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 err;
     }
@@ -209,13 +240,11 @@ bad:
         BIO_printf(bio_err, "Error getting password\n");
         goto err;
     }
-
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -223,20 +252,17 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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,
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                   "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",
@@ -245,16 +271,30 @@ bad:
     BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
                num);
 
-	if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+    rsa = RSA_new();
+    if (!rsa)
+        goto err;
+
+    if (use_x931) {
+        BIGNUM *pubexp;
+        pubexp = BN_new();
+        if (!BN_set_word(pubexp, f4))
+            goto err;
+        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))
         goto err;
 
     app_RAND_write_file(NULL, bio_err);
 
-	/* We need to do the following for when the base number size is <
+    /*
-	 * long, esp windows 3.1 :-(. */
+     * We need to do the following for when the base number size is < long,
+     * esp windows 3.1 :-(.
+     */
     l = 0L;
-	for (i=0; i<rsa->e->top; i++)
+    for (i = 0; i < rsa->e->top; i++) {
-		{
 # ifndef SIXTY_FOUR_BIT
         l <<= BN_BITS4;
         l <<= BN_BITS4;
@@ -267,16 +307,21 @@ bad:
         cb_data.password = passout;
         cb_data.prompt_info = outfile;
         if (!PEM_write_bio_RSAPrivateKey(out, rsa, enc, NULL, 0,
-		(pem_password_cb *)password_callback,&cb_data))
+                                         (pem_password_cb *)password_callback,
+                                         &cb_data))
             goto err;
     }
 
     ret = 0;
  err:
-	if (bn) BN_free(bn);
+    if (bn)
-	if (rsa) RSA_free(rsa);
+        BN_free(bn);
-	if (out) BIO_free_all(out);
+    if (rsa)
-	if(passout) OPENSSL_free(passout);
+        RSA_free(rsa);
+    if (out)
+        BIO_free_all(out);
+    if (passout)
+        OPENSSL_free(passout);
     if (ret != 0)
         ERR_print_errors(bio_err);
     apps_shutdown();
@@ -287,10 +332,14 @@ static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
     BIO_write(cb->arg, &c, 1);
     (void)BIO_flush(cb->arg);
 # ifdef LINT

apps/install.com

@@ -5,13 +5,23 @@ $! 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 "Should be the directory where you want things installed."
+$	    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") -
@@ -19,23 +29,16 @@ $	ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
 $	ROOT = ROOT_DEV + "[" + ROOT_DIR
 $
 $	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLVEXE WRK_SSLROOT:[VAX_EXE]
+$	DEFINE/NOLOG WRK_SSLEXE WRK_SSLROOT:['ARCH'_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_SSLVEXE:") .EQS. "" THEN -
+$	IF F$PARSE("WRK_SSLEXE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLVEXE:
+	   CREATE/DIR/LOG WRK_SSLEXE:
-$	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
 $
-$	VEXE_DIR := [-.VAX.EXE.APPS]
+$	EXE_DIR := [-.'ARCH'.EXE.APPS]
-$	AEXE_DIR := [-.AXP.EXE.APPS]
 $
 $	I = 0
 $ LOOP_EXE: 
@@ -43,25 +46,18 @@ $	E = F$EDIT(F$ELEMENT(I, ",", EXE),"TRIM")
 $	I = I + 1
 $	IF E .EQS. "," THEN GOTO LOOP_EXE_END
 $	SET NOON
-$	IF F$SEARCH(VEXE_DIR+E+".EXE") .NES. ""
+$	IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""
 $	THEN
-$	  COPY 'VEXE_DIR''E'.EXE WRK_SSLVEXE:'E'.EXE/log
+$	  COPY 'EXE_DIR''E'.EXE WRK_SSLEXE:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLVEXE:'E'.EXE
+$	  SET FILE/PROT=W:RE WRK_SSLEXE:'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_SSLAEXE:CA.COM/LOG
+$	COPY CA.COM WRK_SSLEXE:CA.COM/LOG
-$	SET FILE/PROT=W:RE WRK_SSLAEXE:CA.COM
+$	SET FILE/PROT=W:RE WRK_SSLEXE: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,11 +6,12 @@ $!               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
-$!  either AXP or VAX depending on your machine architecture.
+$!  ALPHA, IA64 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.
@@ -46,20 +47,21 @@ $ TCPIP_LIB = ""
 $!
 $! Check What Architecture We Are Using.
 $!
-$ IF (F$GETSYI("CPU").GE.128)
+$ IF (F$GETSYI("CPU").LT.128)
 $ THEN
 $!
-$!  The Architecture Is AXP.
+$!  The Architecture Is VAX.
 $!
-$   ARCH := AXP
+$   ARCH := VAX
 $!
 $! Else...
 $!
 $ ELSE
 $!
-$!  The Architecture Is VAX.
+$!  The Architecture Is Alpha, IA64 or whatever comes in the future.
 $!
-$   ARCH := VAX
+$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
+$   IF (ARCH .EQS. "") THEN ARCH = "UNK"
 $!
 $! End The Architecture Check.
 $!
@@ -68,22 +70,6 @@ $!
 $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
-$!$ PROGRAMS := VERIFY,ASN1PARS,REQ,DGST,DH,ENC,PASSWD,GENDH,ERRSTR,CA,CRL,-
-$!	      RSA,DSA,DSAPARAM,-
-$!	      X509,GENRSA,GENDSA,S_SERVER,S_CLIENT,SPEED,-
-$!	      S_TIME,VERSION,PKCS7,CRL2P7,SESS_ID,CIPHERS,NSEQ,
-$!
-$! Check To Make Sure We Have Valid Command Line Parameters.
-$!
-$ GOSUB CHECK_OPTIONS
-$!
-$! Initialise logical names and such
-$!
-$ GOSUB INITIALISE
-$!
-$! Tell The User What Kind of Machine We Run On.
-$!
-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
 $!
 $! Define The CRYPTO Library.
 $!
@@ -97,6 +83,22 @@ $! 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.
+$!
+$ GOSUB CHECK_OPTIONS
+$!
+$! Initialise logical names and such
+$!
+$ GOSUB INITIALISE
+$!
+$! Tell The User What Kind of Machine We Run On.
+$!
+$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
+$!
 $! Check To See If The OBJ Directory Exists.
 $!
 $ IF (F$PARSE(OBJ_DIR).EQS."")
@@ -110,10 +112,6 @@ $! 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."")
@@ -136,81 +134,101 @@ $!
 $ 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_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
+$ LIB_OPENSSL = "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;OCSP;PRIME"
+		"CIPHERS,NSEQ,PKCS12,PKCS8,SPKAC,SMIME,RAND,ENGINE,"+-
-$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
+		"OCSP,PRIME,CMS"
-	       CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
-	       RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,EC.OBJ,ECPARAM.OBJ,-
-	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
-	       S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
-	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ,ENGINE.OBJ,OCSP.OBJ,PRIME.OBJ
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"
-$!$ APP_FILES := VERIFY;ASN1PARS;REQ;DGST;DH;ENC;GENDH;ERRSTR;CA;-
-$!	       PKCS7;CRL2P7;CRL;-
-$!	       RSA;DSA;DSAPARAM;-
-$!	       X509;GENRSA;GENDSA;-
-$!	       S_SERVER,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
-$!	       S_CLIENT,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
-$!	       SPEED;-
-$!	       S_TIME,'OBJ_DIR'S_CB.OBJ;VERSION;SESS_ID;CIPHERS;NSEQ
-$!$ TCPIP_PROGRAMS = ",,"
-$!$ IF COMPILER .EQS. "VAXC" THEN -
-$!     TCPIP_PROGRAMS = ",S_SERVER,S_CLIENT,SESS_ID,CIPHERS,S_TIME,"
 $!
 $! Setup exceptional compilations
 $!
-$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
 $!
 $ PHASE := LIB
 $!
 $ RESTART: 
 $!
-$!  Define A File Counter And Set It To "0".
+$!  Define An App Counter And Set It To "0".
 $!
-$ FILE_COUNTER = 0
+$ APP_COUNTER = 0
 $!
-$! Top Of The File Loop.
+$!  Top Of The App Loop.
 $!
-$ NEXT_FILE:
+$ NEXT_APP:
 $!
-$! O.K, Extract The File Name From The File List.
+$!  Make The Application File Name
 $!
-$ FILE_NAME0 = F$EDIT(F$ELEMENT(FILE_COUNTER,";",'PHASE'_FILES),"TRIM")
+$ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
-$ FILE_NAME = F$EDIT(F$ELEMENT(0,",",FILE_NAME0),"TRIM")
+$!
-$ EXTRA_OBJ = FILE_NAME0 - FILE_NAME
+$!  Create The Executable File Name.
+$!
+$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
 $!
 $!  Check To See If We Are At The End Of The File List.
 $!
-$ IF (FILE_NAME0.EQS.";")
+$ IF (CURRENT_APP.EQS.",")
 $ THEN
 $   IF (PHASE.EQS."LIB")
 $   THEN
 $     PHASE := APP
 $     GOTO RESTART
 $   ELSE
-$     GOTO FILE_DONE
+$     GOTO APP_DONE
 $   ENDIF
 $ ENDIF
 $!
 $!  Increment The Counter.
 $!
-$ FILE_COUNTER = FILE_COUNTER + 1
+$ APP_COUNTER = APP_COUNTER + 1
 $!
-$! Check to see if this program should actually be compiled
+$!  Decide if we're building the object files or not.
 $!
-$ IF PHASE .EQS. "APP" .AND. -
+$ IF (PHASE.EQS."LIB")
-     ","+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"
@@ -218,11 +236,7 @@ $!
 $!  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.
 $!
@@ -254,39 +268,38 @@ $ ENDIF
 $!
 $!  Compile The File.
 $!
-$ ON ERROR THEN GOTO NEXT_FILE
+$   ON ERROR THEN GOTO NEXT_LIB
 $   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
 $!
-$ ON WARNING THEN GOTO NEXT_FILE
+$   GOTO NEXT_LIB
-$!
-$ 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 - FILE_NAME .NES. TCPIP_PROGRAMS
+$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - CURRENT_APP .NES. TCPIP_PROGRAMS
 $ THEN
-$   WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library.  Can't link.  Skipping..."
+$   WRITE SYS$OUTPUT CURRENT_APP," needs a TCP/IP library.  Can't link.  Skipping..."
-$   GOTO NEXT_FILE
+$   GOTO NEXT_APP
 $ 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' -
-	'OBJECT_FILE''EXTRA_OBJ', -
+	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'TCPIP_LIB','OPT_FILE'/OPTION
 $!
@@ -297,7 +310,7 @@ $!
 $! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'OBJECT_FILE''EXTRA_OBJ', -
+	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
         'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
         'OPT_FILE'/OPTION
 $!
@@ -307,11 +320,11 @@ $ ENDIF
 $!
 $! Go Back And Do It Again.
 $!
-$ GOTO NEXT_FILE
+$ GOTO NEXT_APP
 $!
 $! All Done With This File.
 $!
-$ FILE_DONE:
+$ APP_DONE:
 $ EXIT:
 $!
 $! All Done, Time To Clean Up And Exit.
@@ -412,19 +425,19 @@ $!    Else...
 $!
 $     ELSE
 $!
-$!      Create The AXP Linker Option File.
+$!      Create The non-VAX Linker Option File.
 $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File For AXP To Link Agianst 
+! Default System Options File For non-VAX To Link Agianst 
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
 SYS$SHARE:CMA$OPEN_RTL/SHARE
 $EOD
 $!
-$!    End The VAX/AXP DEC C Option File Check.
+$!    End The DEC C Option File Check.
 $!
 $     ENDIF
 $!
@@ -573,7 +586,7 @@ $   ELSE
 $!
 $!  Check To See If We Have VAXC Or DECC.
 $!
-$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
+$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
 $     THEN 
 $!
 $!      Looks Like DECC, Set To Use DECC.
@@ -683,7 +696,7 @@ $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -704,9 +717,9 @@ $!
 $!    Compile Using VAXC.
 $!
 $     CC = "CC"
-$     IF ARCH.EQS."AXP"
+$     IF ARCH.NES."VAX"
 $     THEN
-$	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
+$	WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"
 $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
@@ -720,7 +733,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -747,7 +760,7 @@ $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!

apps/nseq.c

@@ -1,6 +1,7 @@
 /* nseq.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/*
- * project 1999.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -76,22 +77,27 @@ int MAIN(int argc, char **argv)
     NETSCAPE_CERT_SEQUENCE *seq = NULL;
     int i, ret = 1;
     int badarg = 0;
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
     ERR_load_crypto_strings();
     args = argv + 1;
     while (!badarg && *args && *args[0] == '-') {
-		if (!strcmp (*args, "-toseq")) toseq = 1;
+        if (!strcmp(*args, "-toseq"))
+            toseq = 1;
         else if (!strcmp(*args, "-in")) {
             if (args[1]) {
                 args++;
                 infile = *args;
-			} else badarg = 1;
+            } else
+                badarg = 1;
         } else if (!strcmp(*args, "-out")) {
             if (args[1]) {
                 args++;
                 outfile = *args;
-			} else badarg = 1;
+            } else
-		} else badarg = 1;
+                badarg = 1;
+        } else
+            badarg = 1;
         args++;
     }
 
@@ -107,16 +113,15 @@ int MAIN(int argc, char **argv)
 
     if (infile) {
         if (!(in = BIO_new_file(infile, "r"))) {
-			BIO_printf (bio_err,
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-				 "Can't open input file %s\n", infile);
             goto end;
         }
-	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    } else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
     if (outfile) {
         if (!(out = BIO_new_file(outfile, "w"))) {
-			BIO_printf (bio_err,
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-				 "Can't open output file %s\n", outfile);
             goto end;
         }
     } else {
@@ -134,8 +139,7 @@ int MAIN(int argc, char **argv)
         while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
             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);
             ERR_print_errors(bio_err);
             goto end;
@@ -164,4 +168,3 @@ end:
 
     OPENSSL_EXIT(ret);
 }
-

apps/openssl-vms.cnf

@@ -141,7 +141,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (e.g. server FQDN or YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address
@@ -188,7 +188,7 @@ nsComment			= "OpenSSL Generated Certificate"
 
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
+authorityKeyIdentifier=keyid,issuer
 
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.

apps/openssl.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 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
@@ -109,11 +109,11 @@
  *
  */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
+#define OPENSSL_C               /* tells apps.h to use complete
+                                 * apps_startup() */
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
@@ -125,15 +125,18 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
-#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#define USE_SOCKETS             /* needed for the _O_BINARY defs in the MS
+                                 * world */
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
 
-/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
+/*
- * base prototypes (we cast each variable inside the function to the required
+ * The LHASH callbacks ("hash" & "cmp") have been replaced by functions with
- * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
+ * the base prototypes (we cast each variable inside the function to the
- * functions. */
+ * required type of "FUNCTION*"). This removes the necessity for
+ * macro-generated wrapper functions.
+ */
 
 /* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
 static unsigned long MS_CALLBACK hash(const void *a_void);
@@ -147,9 +150,9 @@ char *default_config_file=NULL;
 #ifdef MONOLITH
 CONF *config = NULL;
 BIO *bio_err = NULL;
+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, ... } */
@@ -157,63 +160,53 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
     int rw;
 
     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
+            /*
-			 * (would deadlock) */
+             * must not happen in a single-threaded program (would deadlock)
+             */
             goto err;
         }
 
         modes[type] = rw;
-		}
+    } else if (mode & CRYPTO_UNLOCK) {
-	else if (mode & CRYPTO_UNLOCK)
+        if (!modes[type]) {
-		{
-		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, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
+        fprintf(stderr,
+                "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;
@@ -232,19 +225,33 @@ int main(int Argc, char *Argv[])
     arg.data = NULL;
     arg.count = 0;
 
+    in_FIPS_mode = 0;
+
+    if (getenv("OPENSSL_FIPS")) {
+#ifdef OPENSSL_FIPS
+        if (!FIPS_mode_set(1)) {
+            ERR_load_crypto_strings();
+            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
+    }
+
     if (bio_err == NULL)
         if ((bio_err = BIO_new(BIO_s_file())) != NULL)
             BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
+    if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) { /* if not defined, use
-		{
+                                                   * compiled-in library
-		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
+                                                   * defaults */
-			{
+        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);
         }
@@ -271,8 +278,7 @@ int main(int Argc, char *Argv[])
 
     config = NCONF_new(NULL);
     i = NCONF_load(config, p, &errline);
-	if (i == 0)
+    if (i == 0) {
-		{
         NCONF_free(config);
         config = NULL;
         ERR_clear_error();
@@ -285,54 +291,58 @@ int main(int Argc, char *Argv[])
 
     f.name = pname;
     fp = (FUNCTION *) lh_retrieve(prog, &f);
-	if (fp != NULL)
+    if (fp != NULL) {
-		{
         Argv[0] = pname;
         ret = fp->func(Argc, Argv);
         goto end;
     }
 
-	/* ok, now check that there are not arguments, if there are,
+    /*
-	 * run with them, shifting the ssleay off the front */
+     * ok, now check that there are not arguments, if there are, run with
-	if (Argc != 1)
+     * them, shifting the ssleay off the front
-		{
+     */
+    if (Argc != 1) {
         Argc--;
         Argv++;
         ret = do_cmd(prog, Argc, Argv);
-		if (ret < 0) ret=0;
+        if (ret < 0)
+            ret = 0;
         goto end;
     }
 
     /* ok, lets enter the old 'OpenSSL>' mode */
 
-	for (;;)
+    for (;;) {
-		{
         ret = 0;
         p = buf;
         n = sizeof buf;
         i = 0;
-		for (;;)
+        for (;;) {
-			{
             p[0] = '\0';
             if (i++)
                 prompt = ">";
-			else	prompt="OpenSSL> ";
+            else
+                prompt = "OpenSSL> ";
             fputs(prompt, stdout);
             fflush(stdout);
-			fgets(p,n,stdin);
+            if (!fgets(p, n, stdin))
-			if (p[0] == '\0') goto end;
+                goto end;
+            if (p[0] == '\0')
+                goto end;
             i = strlen(p);
-			if (i <= 1) break;
+            if (i <= 1)
-			if (p[i-2] != '\\') break;
+                break;
+            if (p[i - 2] != '\\')
+                break;
             i -= 2;
             p += i;
             n -= i;
         }
-		if (!chopup_args(&arg,buf,&argc,&argv)) break;
+        if (!chopup_args(&arg, buf, &argc, &argv))
+            break;
 
         ret = do_cmd(prog, argc, argv);
-		if (ret < 0)
+        if (ret < 0) {
-			{
             ret = 0;
             goto end;
         }
@@ -345,19 +355,19 @@ int main(int Argc, char *Argv[])
  end:
     if (to_free)
         OPENSSL_free(to_free);
-	if (config != NULL)
+    if (config != NULL) {
-		{
         NCONF_free(config);
         config = NULL;
     }
-	if (prog != NULL) lh_free(prog);
+    if (prog != NULL)
-	if (arg.data != NULL) OPENSSL_free(arg.data);
+        lh_free(prog);
+    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;
     }
@@ -373,16 +383,15 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
     FUNCTION f, *fp;
     int i, ret = 1, tp, nl;
 
-	if ((argc <= 0) || (argv[0] == NULL))
+    if ((argc <= 0) || (argv[0] == NULL)) {
-		{ ret=0; goto end; }
+        ret = 0;
+        goto end;
+    }
     f.name = argv[0];
     fp = (FUNCTION *) lh_retrieve(prog, &f);
-	if (fp != NULL)
+    if (fp != NULL) {
-		{
         ret = fp->func(argc, argv);
-		}
+    } else if ((strncmp(argv[0], "no-", 3)) == 0) {
-	else if ((strncmp(argv[0],"no-",3)) == 0)
-		{
         BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -398,19 +407,15 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
             BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
         BIO_free_all(bio_stdout);
         goto end;
-		}
+    } else if ((strcmp(argv[0], "quit") == 0) ||
-	else if ((strcmp(argv[0],"quit") == 0) ||
                (strcmp(argv[0], "q") == 0) ||
                (strcmp(argv[0], "exit") == 0) ||
-		(strcmp(argv[0],"bye") == 0))
+               (strcmp(argv[0], "bye") == 0)) {
-		{
         ret = -1;
         goto end;
-		}
+    } else if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
-	else if ((strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0) ||
                (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
-		(strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0))
+               (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0)) {
-		{
         int list_type;
         BIO *bio_stdout;
 
@@ -434,39 +439,42 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
         BIO_free_all(bio_stdout);
         ret = 0;
         goto end;
-		}
+    } else {
-	else
-		{
         BIO_printf(bio_err, "openssl:Error: '%s' is an invalid command.\n",
                    argv[0]);
         BIO_printf(bio_err, "\nStandard commands");
         i = 0;
         tp = 0;
-		for (fp=functions; fp->name != NULL; fp++)
+        for (fp = functions; fp->name != NULL; fp++) {
-			{
             nl = 0;
+#ifdef OPENSSL_NO_CAMELLIA
             if (((i++) % 5) == 0)
+#else
+            if (((i++) % 4) == 0)
+#endif
             {
                 BIO_printf(bio_err, "\n");
                 nl = 1;
             }
-			if (fp->type != tp)
+            if (fp->type != tp) {
-				{
                 tp = fp->type;
-				if (!nl) BIO_printf(bio_err,"\n");
+                if (!nl)
-				if (tp == FUNC_TYPE_MD)
+                    BIO_printf(bio_err, "\n");
-					{
+                if (tp == FUNC_TYPE_MD) {
                     i = 1;
                     BIO_printf(bio_err,
                                "\nMessage Digest commands (see the `dgst' command for more details)\n");
-					}
+                } else if (tp == FUNC_TYPE_CIPHER) {
-				else if (tp == FUNC_TYPE_CIPHER)
-					{
                     i = 1;
-					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
+                    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);
+#else
+            BIO_printf(bio_err, "%-18s", fp->name);
+#endif
         }
         BIO_printf(bio_err, "\n\n");
         ret = 0;
@@ -492,8 +500,7 @@ static LHASH *prog_init(void)
     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);
 
     if ((ret = lh_new(hash, cmp)) == NULL)

apps/openssl.cnf

@@ -141,7 +141,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (eg, YOUR name)
+commonName			= Common Name (e.g. server FQDN or YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address
@@ -188,7 +188,7 @@ nsComment			= "OpenSSL Generated Certificate"
 
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
+authorityKeyIdentifier=keyid,issuer
 
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.

apps/passwd.c

@@ -22,11 +22,9 @@
 #  include <openssl/md5.h>
 # endif
 
-
 # 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,
@@ -40,10 +38,12 @@ static unsigned const char cov_2char[64]={
 };
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out, int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+                     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
@@ -94,45 +94,32 @@ int MAIN(int argc, char **argv)
 
     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) {
-		else if (strcmp(argv[i], "-in") == 0)
+            if ((argv[i + 1] != NULL) && !pw_source_defined) {
-			{
-			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) {
-		else if (strcmp(argv[i], "-stdin") == 0)
+            if (!pw_source_defined) {
-			{
-			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;
@@ -148,8 +135,7 @@ int MAIN(int argc, char **argv)
             pw_source_defined = 1;
             passwds = &argv[i];
             opt_done = 1;
-			}
+        } else
-		else
             badopt = 1;
     }
 
@@ -160,27 +146,32 @@ int MAIN(int argc, char **argv)
 
     /* reject unsupported algorithms */
 # ifdef OPENSSL_NO_DES
-	if (usecrypt) badopt = 1;
+    if (usecrypt)
+        badopt = 1;
 # endif
 # ifdef NO_MD5CRYPT_1
-	if (use1 || useapr1) badopt = 1;
+    if (use1 || useapr1)
+        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
-		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
+        BIO_printf(bio_err,
+                   "-crypt             standard Unix password algorithm (default)\n");
 # endif
 # 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");
+        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, "-noverify          never verify when reading password from terminal\n");
+        BIO_printf(bio_err,
+                   "-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");
@@ -188,19 +179,15 @@ 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);
         }
@@ -209,61 +196,59 @@ 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 passwords */
+        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
+                                 * 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 };
 
         passwds = passwds_static;
         if (in == NULL)
-			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
+            if (EVP_read_pw_string
+                (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, useapr1))
+                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
+                           useapr1))
                 goto err;
         }
         while (*passwds != NULL);
-		}
+    } else
-	else
         /* in != NULL */
     {
         int done;
 
         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'));
                 if (c != NULL)
                     *c = 0;     /* truncate at newline */
-				else
+                else {
-					{
                     /* ignore rest of line */
                     char trash[BUFSIZ];
                     do
@@ -272,7 +257,8 @@ int MAIN(int argc, char **argv)
                 }
 
                 if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                               quiet, table, reverse, pw_maxlen, usecrypt,
+                               use1, useapr1))
                     goto err;
             }
             done = (r <= 0);
@@ -295,21 +281,20 @@ err:
     OPENSSL_EXIT(ret);
 }
 
-
 # ifndef NO_MD5CRYPT_1
-/* MD5-based password algorithm (should probably be available as a library
+/*
- * function; then the static buffer would not be acceptable).
+ * MD5-based password algorithm (should probably be available as a library
- * For magic string "1", this should be compatible to the MD5-based BSD
+ * function; then the static buffer would not be acceptable). For magic
- * password algorithm.
+ * string "1", this should be compatible to the MD5-based BSD password
- * For 'magic' string "apr1", this is compatible to the MD5-based Apache
+ * algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
- * password algorithm.
+ * Apache password algorithm. (Apparently, the Apache password algorithm is
- * (Apparently, the Apache password algorithm is identical except that the
+ * identical except that the 'magic' string was changed -- the laziest
- * 'magic' string was changed -- the laziest application of the NIH principle
+ * application of the NIH principle I've ever encountered.)
- * I've ever encountered.)
  */
 static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 {
-	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
+    /* "$apr1$..salt..$.......md5hash..........\0" */
+    static char out_buf[6 + 9 + 24 + 2];
     unsigned char buf[MD5_DIGEST_LENGTH];
     char *salt_out;
     int n;
@@ -349,15 +334,13 @@ 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,
                          (i & 1) ? passwd_len : sizeof buf);
@@ -379,11 +362,13 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         char *output;
 
         /* silly output permutation */
-		for (dest = 0, source = 0; dest < 14; dest++, source = (source + 6) % 17)
+        for (dest = 0, source = 0; dest < 14;
+             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 effect" warning */
+#  ifndef PEDANTIC              /* Unfortunately, this generates a "no
+                                 * effect" warning */
         assert(16 == sizeof buf_perm);
 #  endif
 
@@ -392,8 +377,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 
         *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) |
                                   (buf_perm[i + 2] >> 6)];
@@ -413,10 +397,10 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 }
 # endif
 
-
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out,	int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+                     int useapr1)
 {
     char *hash = NULL;
 
@@ -424,13 +408,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     assert(salt_malloc_p != NULL);
 
     /* first make sure we have a salt */
-	if (!passed_salt)
+    if (!passed_salt) {
-		{
 # ifndef OPENSSL_NO_DES
-		if (usecrypt)
+        if (usecrypt) {
-			{
+            if (*salt_malloc_p == NULL) {
-			if (*salt_malloc_p == NULL)
-				{
                 *salt_p = *salt_malloc_p = OPENSSL_malloc(3);
                 if (*salt_malloc_p == NULL)
                     goto err;
@@ -441,19 +422,17 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
             (*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
             (*salt_p)[2] = 0;
 #  ifdef CHARSET_EBCDIC
-			ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert
+            ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert back
-			                                    * back to ASCII */
+                                                * to ASCII */
 #  endif
         }
 # endif                         /* !OPENSSL_NO_DES */
 
 # 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;
@@ -471,10 +450,14 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     assert(*salt_p != NULL);
 
     /* truncate password if necessary */
-	if ((strlen(passwd) > pw_maxlen))
+    if ((strlen(passwd) > pw_maxlen)) {
-		{
         if (!quiet)
-			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);
+            /*
+             * 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);
         passwd[pw_maxlen] = 0;
     }
     assert(strlen(passwd) <= pw_maxlen);

apps/pkcs12.c

@@ -1,11 +1,10 @@
 /* pkcs12.c */
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+/*
-
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project.
  */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2006 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
@@ -58,6 +57,9 @@
  *
  */
 
+#include <openssl/opensslconf.h>
+#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
@@ -67,11 +69,16 @@
 # include <openssl/pem.h>
 # include <openssl/pkcs12.h>
 
+# ifdef OPENSSL_SYS_NETWARE
+/* Rename these functions to avoid name clashes on NetWare OS */
+#  define uni2asc OPENSSL_uni2asc
+#  define asc2uni OPENSSL_asc2uni
+# endif
+
 # define PROG pkcs12_main
 
 const EVP_CIPHER *enc;
 
-
 # define NOKEYS          0x1
 # define NOCERTS         0x2
 # define INFO            0x4
@@ -79,11 +86,15 @@ const EVP_CIPHER *enc;
 # define CACERTS         0x10
 
 int get_cert_chain(X509 *cert, X509_STORE *store, STACK_OF(X509) **chain);
-int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options, char *pempass);
+int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen,
-int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, char *pass,
+                        int options, char *pempass);
+int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
+                          char *pass, int passlen, int options,
+                          char *pempass);
+int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass,
                          int passlen, int options, char *pempass);
-int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options, char *pempass);
+int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,
-int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name);
+                  const char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
@@ -99,6 +110,7 @@ int MAIN(int argc, char **argv)
     char **args;
     char *name = NULL;
     char *csp_name = NULL;
+    int add_lmk = 0;
     PKCS12 *p12 = NULL;
     char pass[50], macpass[50];
     int export_cert = 0;
@@ -109,7 +121,7 @@ int MAIN(int argc, char **argv)
     int maciter = PKCS12_DEFAULT_ITER;
     int twopass = 0;
     int keytype = 0;
-    int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
+    int cert_pbe;
     int key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
     int ret = 1;
     int macver = 1;
@@ -126,61 +138,102 @@ int MAIN(int argc, char **argv)
 
     apps_startup();
 
+# ifdef OPENSSL_FIPS
+    if (FIPS_mode())
+        cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
+    else
+# endif
+        cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
+
     enc = EVP_des_ede3_cbc();
-    if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
 
     args = argv + 1;
 
-
     while (*args) {
         if (*args[0] == '-') {
-		if (!strcmp (*args, "-nokeys")) options |= NOKEYS;
+            if (!strcmp(*args, "-nokeys"))
-		else if (!strcmp (*args, "-keyex")) keytype = KEY_EX;
+                options |= NOKEYS;
-		else if (!strcmp (*args, "-keysig")) keytype = KEY_SIG;
+            else if (!strcmp(*args, "-keyex"))
-		else if (!strcmp (*args, "-nocerts")) options |= NOCERTS;
+                keytype = KEY_EX;
-		else if (!strcmp (*args, "-clcerts")) options |= CLCERTS;
+            else if (!strcmp(*args, "-keysig"))
-		else if (!strcmp (*args, "-cacerts")) options |= CACERTS;
+                keytype = KEY_SIG;
-		else if (!strcmp (*args, "-noout")) options |= (NOKEYS|NOCERTS);
+            else if (!strcmp(*args, "-nocerts"))
-		else if (!strcmp (*args, "-info")) options |= INFO;
+                options |= NOCERTS;
-		else if (!strcmp (*args, "-chain")) chain = 1;
+            else if (!strcmp(*args, "-clcerts"))
-		else if (!strcmp (*args, "-twopass")) twopass = 1;
+                options |= CLCERTS;
-		else if (!strcmp (*args, "-nomacver")) macver = 0;
+            else if (!strcmp(*args, "-cacerts"))
+                options |= CACERTS;
+            else if (!strcmp(*args, "-noout"))
+                options |= (NOKEYS | NOCERTS);
+            else if (!strcmp(*args, "-info"))
+                options |= INFO;
+            else if (!strcmp(*args, "-chain"))
+                chain = 1;
+            else if (!strcmp(*args, "-twopass"))
+                twopass = 1;
+            else if (!strcmp(*args, "-nomacver"))
+                macver = 0;
             else if (!strcmp(*args, "-descert"))
                 cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-		else if (!strcmp (*args, "-export")) export_cert = 1;
+            else if (!strcmp(*args, "-export"))
-		else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
+                export_cert = 1;
+            else if (!strcmp(*args, "-des"))
+                enc = EVP_des_cbc();
+            else if (!strcmp(*args, "-des3"))
+                enc = EVP_des_ede3_cbc();
 # ifndef OPENSSL_NO_IDEA
-		else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
+            else if (!strcmp(*args, "-idea"))
+                enc = EVP_idea_cbc();
+# endif
+# ifndef OPENSSL_NO_SEED
+            else if (!strcmp(*args, "-seed"))
+                enc = EVP_seed_cbc();
 # endif
-		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 # ifndef OPENSSL_NO_AES
-		else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
+            else if (!strcmp(*args, "-aes128"))
-		else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
+                enc = EVP_aes_128_cbc();
-		else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
+            else if (!strcmp(*args, "-aes192"))
+                enc = EVP_aes_192_cbc();
+            else if (!strcmp(*args, "-aes256"))
+                enc = EVP_aes_256_cbc();
 # endif
-		else if (!strcmp (*args, "-noiter")) iter = 1;
+# ifndef OPENSSL_NO_CAMELLIA
+            else if (!strcmp(*args, "-camellia128"))
+                enc = EVP_camellia_128_cbc();
+            else if (!strcmp(*args, "-camellia192"))
+                enc = EVP_camellia_192_cbc();
+            else if (!strcmp(*args, "-camellia256"))
+                enc = EVP_camellia_256_cbc();
+# endif
+            else if (!strcmp(*args, "-noiter"))
+                iter = 1;
             else if (!strcmp(*args, "-maciter"))
                 maciter = PKCS12_DEFAULT_ITER;
             else if (!strcmp(*args, "-nomaciter"))
                 maciter = 1;
             else if (!strcmp(*args, "-nomac"))
                 maciter = -1;
-		else if (!strcmp (*args, "-nodes")) enc=NULL;
+            else if (!strcmp(*args, "-nodes"))
+                enc = NULL;
             else if (!strcmp(*args, "-certpbe")) {
                 if (args[1]) {
                     args++;
                     if (!strcmp(*args, "NONE"))
                         cert_pbe = -1;
+                    else
                         cert_pbe = OBJ_txt2nid(*args);
                     if (cert_pbe == NID_undef) {
                         BIO_printf(bio_err,
                                    "Unknown PBE algorithm %s\n", *args);
                         badarg = 1;
                     }
-			} else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-keypbe")) {
                 if (args[1]) {
                     args++;
@@ -193,84 +246,104 @@ int MAIN(int argc, char **argv)
                                    "Unknown PBE algorithm %s\n", *args);
                         badarg = 1;
                     }
-			} else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-rand")) {
                 if (args[1]) {
                     args++;
                     inrand = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-inkey")) {
                 if (args[1]) {
                     args++;
                     keyname = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-certfile")) {
                 if (args[1]) {
                     args++;
                     certfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-name")) {
                 if (args[1]) {
                     args++;
                     name = *args;
-		    } else badarg = 1;
+                } else
-		} else if (!strcmp (*args, "-CSP")) {
+                    badarg = 1;
+            } else if (!strcmp(*args, "-LMK"))
+                add_lmk = 1;
+            else if (!strcmp(*args, "-CSP")) {
                 if (args[1]) {
                     args++;
                     csp_name = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-caname")) {
                 if (args[1]) {
                     args++;
-			if (!canames) canames = sk_new_null();
+                    if (!canames)
+                        canames = sk_new_null();
                     sk_push(canames, *args);
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-in")) {
                 if (args[1]) {
                     args++;
                     infile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-out")) {
                 if (args[1]) {
                     args++;
                     outfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-passin")) {
                 if (args[1]) {
                     args++;
                     passargin = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-passout")) {
                 if (args[1]) {
                     args++;
                     passargout = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-password")) {
                 if (args[1]) {
                     args++;
                     passarg = *args;
                     noprompt = 1;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-CApath")) {
                 if (args[1]) {
                     args++;
                     CApath = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-CAfile")) {
                 if (args[1]) {
                     args++;
                     CAfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
 # ifndef OPENSSL_NO_ENGINE
             } else if (!strcmp(*args, "-engine")) {
                 if (args[1]) {
                     args++;
                     engine = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
 # endif
-		} else badarg = 1;
+            } else
+                badarg = 1;
 
-	} else badarg = 1;
+        } else
+            badarg = 1;
         args++;
     }
 
@@ -284,53 +357,79 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_err, "-CApath arg   - PEM format directory of CA's\n");
         BIO_printf(bio_err, "-CAfile arg   - PEM format file of CA's\n");
         BIO_printf(bio_err, "-name \"name\"  use name as friendly name\n");
-	BIO_printf (bio_err, "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
+        BIO_printf(bio_err,
+                   "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
         BIO_printf(bio_err, "-in  infile   input filename\n");
         BIO_printf(bio_err, "-out outfile  output filename\n");
-	BIO_printf (bio_err, "-noout        don't output anything, just verify.\n");
+        BIO_printf(bio_err,
+                   "-noout        don't output anything, just verify.\n");
         BIO_printf(bio_err, "-nomacver     don't verify MAC.\n");
         BIO_printf(bio_err, "-nocerts      don't output certificates.\n");
-	BIO_printf (bio_err, "-clcerts      only output client certificates.\n");
+        BIO_printf(bio_err,
+                   "-clcerts      only output client certificates.\n");
         BIO_printf(bio_err, "-cacerts      only output CA certificates.\n");
         BIO_printf(bio_err, "-nokeys       don't output private keys.\n");
-	BIO_printf (bio_err, "-info         give info about PKCS#12 structure.\n");
+        BIO_printf(bio_err,
+                   "-info         give info about PKCS#12 structure.\n");
         BIO_printf(bio_err, "-des          encrypt private keys with DES\n");
-	BIO_printf (bio_err, "-des3         encrypt private keys with triple DES (default)\n");
+        BIO_printf(bio_err,
+                   "-des3         encrypt private keys with triple DES (default)\n");
 # ifndef OPENSSL_NO_IDEA
         BIO_printf(bio_err, "-idea         encrypt private keys with idea\n");
 # endif
+# ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err, "-seed         encrypt private keys with seed\n");
+# endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, "-aes128, -aes192, -aes256\n");
-	BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "              encrypt PEM output with cbc aes\n");
+# endif
+# ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, "-camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
+                   "              encrypt PEM output with cbc camellia\n");
 # endif
         BIO_printf(bio_err, "-nodes        don't encrypt private keys\n");
         BIO_printf(bio_err, "-noiter       don't use encryption iteration\n");
         BIO_printf(bio_err, "-maciter      use MAC iteration\n");
-	BIO_printf (bio_err, "-twopass      separate MAC, encryption passwords\n");
+        BIO_printf(bio_err,
-	BIO_printf (bio_err, "-descert      encrypt PKCS#12 certificates with triple DES (default RC2-40)\n");
+                   "-twopass      separate MAC, encryption passwords\n");
-	BIO_printf (bio_err, "-certpbe alg  specify certificate PBE algorithm (default RC2-40)\n");
+        BIO_printf(bio_err,
-	BIO_printf (bio_err, "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
+                   "-descert      encrypt PKCS#12 certificates with triple DES (default RC2-40)\n");
+        BIO_printf(bio_err,
+                   "-certpbe alg  specify certificate PBE algorithm (default RC2-40)\n");
+        BIO_printf(bio_err,
+                   "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
         BIO_printf(bio_err, "-keyex        set MS key exchange type\n");
         BIO_printf(bio_err, "-keysig       set MS key signature type\n");
-	BIO_printf (bio_err, "-password p   set import/export password source\n");
+        BIO_printf(bio_err,
+                   "-password p   set import/export password source\n");
         BIO_printf(bio_err, "-passin p     input file pass phrase source\n");
         BIO_printf(bio_err, "-passout p    output file pass phrase source\n");
 # ifndef OPENSSL_NO_ENGINE
-	BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
+        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, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-	BIO_printf(bio_err,  "              load the file (or the files in the directory) into\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");
+        BIO_printf(bio_err, "-CSP name     Microsoft CSP name\n");
+        BIO_printf(bio_err,
+                   "-LMK          Add local machine keyset attribute to private key\n");
         goto end;
     }
-
 # ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 # endif
 
     if (passarg) {
-	if(export_cert) passargout = passarg;
+        if (export_cert)
-	else passargin = passarg;
+            passargout = passarg;
+        else
+            passargin = passarg;
     }
 
     if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
@@ -339,8 +438,10 @@ int MAIN(int argc, char **argv)
     }
 
     if (!cpass) {
-    	if(export_cert) cpass = passout;
+        if (export_cert)
-    	else cpass = passin;
+            cpass = passout;
+        else
+            cpass = passin;
     }
 
     if (cpass) {
@@ -363,15 +464,16 @@ int MAIN(int argc, char **argv)
     CRYPTO_push_info("read files");
 # endif
 
-    if (!infile) in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    if (!infile)
-    else in = BIO_new_file(infile, "rb");
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    else
+        in = BIO_new_file(infile, "rb");
     if (!in) {
         BIO_printf(bio_err, "Error opening input file %s\n",
                    infile ? infile : "<stdin>");
         perror(infile);
         goto end;
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
     CRYPTO_push_info("write files");
@@ -385,7 +487,8 @@ int MAIN(int argc, char **argv)
             out = BIO_push(tmpbio, out);
         }
 # endif
-    } else out = BIO_new_file(outfile, "wb");
+    } else
+        out = BIO_new_file(outfile, "wb");
     if (!out) {
         BIO_printf(bio_err, "Error opening output file %s\n",
                    outfile ? outfile : "<stdout>");
@@ -396,8 +499,8 @@ int MAIN(int argc, char **argv)
 # ifdef CRYPTO_MDEBUG
         CRYPTO_push_info("read MAC password");
 # endif
-	if(EVP_read_pw_string (macpass, sizeof macpass, "Enter MAC Password:", export_cert))
+        if (EVP_read_pw_string
-	{
+            (macpass, sizeof macpass, "Enter MAC Password:", export_cert)) {
             BIO_printf(bio_err, "Can't read Password\n");
             goto end;
         }
@@ -413,8 +516,7 @@ int MAIN(int argc, char **argv)
         unsigned char *catmp = NULL;
         int i;
 
-	if ((options & (NOCERTS|NOKEYS)) == (NOCERTS|NOKEYS))
+        if ((options & (NOCERTS | NOKEYS)) == (NOCERTS | NOKEYS)) {
-		{	
             BIO_printf(bio_err, "Nothing to do!\n");
             goto export_end;
         }
@@ -426,61 +528,53 @@ int MAIN(int argc, char **argv)
         CRYPTO_push_info("process -export_cert");
         CRYPTO_push_info("reading private key");
 # endif
-	if (!(options & NOKEYS))
+        if (!(options & NOKEYS)) {
-		{
             key = load_key(bio_err, keyname ? keyname : infile,
                            FORMAT_PEM, 1, passin, e, "private key");
             if (!key)
                 goto export_end;
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from input");
 # endif
 
         /* Load in all certs in input file */
-	if(!(options & NOCERTS))
+        if (!(options & NOCERTS)) {
-		{
             certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
                                "certificates");
             if (!certs)
                 goto export_end;
 
-		if (key)
+            if (key) {
-			{
                 /* Look for matching private key */
-			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(X509_check_private_key(x, key))
+                    if (X509_check_private_key(x, key)) {
-					{
                         ucert = x;
                         /* Zero keyid and alias */
                         X509_keyid_set1(ucert, NULL, 0);
                         X509_alias_set1(ucert, NULL, 0);
                         /* Remove from list */
-					sk_X509_delete(certs, i);
+                        (void)sk_X509_delete(certs, i);
                         break;
                     }
                 }
-			if (!ucert)
+                if (!ucert) {
-				{
+                    BIO_printf(bio_err,
-				BIO_printf(bio_err, "No certificate matches private key\n");
+                               "No certificate matches private key\n");
                     goto export_end;
                 }
             }
 
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from input 2");
 # endif
 
         /* Add any more certificates asked for */
-	if(certfile)
+        if (certfile) {
-		{
             STACK_OF(X509) *morecerts = NULL;
             if (!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
                                          NULL, e,
@@ -490,7 +584,6 @@ int MAIN(int argc, char **argv)
                 sk_X509_push(certs, sk_X509_shift(morecerts));
             sk_X509_free(morecerts);
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from certfile");
@@ -506,8 +599,7 @@ int MAIN(int argc, char **argv)
             int vret;
             STACK_OF(X509) *chain2;
             X509_STORE *store = X509_STORE_new();
-		if (!store)
+            if (!store) {
-			{
                 BIO_printf(bio_err, "Memory allocation error\n");
                 goto export_end;
             }
@@ -525,24 +617,29 @@ int MAIN(int argc, char **argv)
                 X509_free(sk_X509_value(chain2, 0));
                 sk_X509_free(chain2);
             } else {
+                if (vret >= 0)
                     BIO_printf(bio_err, "Error %s getting chain.\n",
                                X509_verify_cert_error_string(vret));
+                else
+                    ERR_print_errors(bio_err);
                 goto export_end;
             }
         }
 
         /* Add any CA names */
 
-	for (i = 0; i < sk_num(canames); i++)
+        for (i = 0; i < sk_num(canames); i++) {
-		{
             catmp = (unsigned char *)sk_value(canames, i);
             X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
         }
 
         if (csp_name && key)
             EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
-				MBSTRING_ASC, (unsigned char *)csp_name, -1);
+                                      MBSTRING_ASC, (unsigned char *)csp_name,
+                                      -1);
 
+        if (add_lmk && key)
+            EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
 
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
@@ -550,12 +647,13 @@ int MAIN(int argc, char **argv)
 # endif
 
         if (!noprompt &&
-		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
+            EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:",
-		{
+                               1)) {
             BIO_printf(bio_err, "Can't read Password\n");
             goto export_end;
         }
-	if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+        if (!twopass)
+            BUF_strlcpy(macpass, pass, sizeof macpass);
 
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
@@ -565,8 +663,7 @@ int MAIN(int argc, char **argv)
         p12 = PKCS12_create(cpass, name, key, ucert, certs,
                             key_pbe, cert_pbe, iter, -1, keytype);
 
-	if (!p12)
+        if (!p12) {
-		{
             ERR_print_errors(bio_err);
             goto export_end;
         }
@@ -590,9 +687,12 @@ int MAIN(int argc, char **argv)
         CRYPTO_push_info("process -export_cert: freeing");
 # endif
 
-	if (key) EVP_PKEY_free(key);
+        if (key)
-	if (certs) sk_X509_pop_free(certs, X509_free);
+            EVP_PKEY_free(key);
-	if (ucert) X509_free(ucert);
+        if (certs)
+            sk_X509_pop_free(certs, X509_free);
+        if (ucert)
+            X509_free(ucert);
 
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
@@ -605,11 +705,12 @@ int MAIN(int argc, char **argv)
         ERR_print_errors(bio_err);
         goto end;
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("read import password");
 # endif
-    if(!noprompt && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:", 0)) {
+    if (!noprompt
+        && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:",
+                              0)) {
         BIO_printf(bio_err, "Can't read Password\n");
         goto end;
     }
@@ -617,9 +718,12 @@ int MAIN(int argc, char **argv)
     CRYPTO_pop_info();
 # endif
 
-    if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+    if (!twopass)
+        BUF_strlcpy(macpass, pass, sizeof macpass);
 
-    if (options & INFO) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1);
+    if ((options & INFO) && p12->mac)
+        BIO_printf(bio_err, "MAC Iteration %ld\n",
+                   p12->mac->iter ? ASN1_INTEGER_get(p12->mac->iter) : 1);
     if (macver) {
 # ifdef CRYPTO_MDEBUG
         CRYPTO_push_info("verify MAC");
@@ -627,7 +731,8 @@ int MAIN(int argc, char **argv)
         /* If we enter empty password try no password first */
         if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
             /* If mac and crypto pass the same set it to NULL too */
-		if(!twopass) cpass = NULL;
+            if (!twopass)
+                cpass = NULL;
         } else if (!PKCS12_verify_mac(p12, mpass, -1)) {
             BIO_printf(bio_err, "Mac verify error: invalid password?\n");
             ERR_print_errors(bio_err);
@@ -638,7 +743,6 @@ int MAIN(int argc, char **argv)
         CRYPTO_pop_info();
 # endif
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("output keys and certificates");
 # endif
@@ -652,16 +756,21 @@ int MAIN(int argc, char **argv)
 # endif
     ret = 0;
  end:
-    if (p12) PKCS12_free(p12);
+    if (p12)
-    if(export_cert || inrand) app_RAND_write_file(NULL, bio_err);
+        PKCS12_free(p12);
+    if (export_cert || inrand)
+        app_RAND_write_file(NULL, bio_err);
 # ifdef CRYPTO_MDEBUG
     CRYPTO_remove_all_info();
 # endif
     BIO_free(in);
     BIO_free_all(out);
-    if (canames) sk_free(canames);
+    if (canames)
-    if(passin) OPENSSL_free(passin);
+        sk_free(canames);
-    if(passout) OPENSSL_free(passout);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -675,22 +784,25 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
     int ret = 0;
     PKCS7 *p7;
 
-	if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
+    if (!(asafes = PKCS12_unpack_authsafes(p12)))
+        return 0;
     for (i = 0; i < sk_PKCS7_num(asafes); i++) {
         p7 = sk_PKCS7_value(asafes, i);
         bagnid = OBJ_obj2nid(p7->type);
         if (bagnid == NID_pkcs7_data) {
             bags = PKCS12_unpack_p7data(p7);
-			if (options & INFO) BIO_printf (bio_err, "PKCS7 Data\n");
+            if (options & INFO)
+                BIO_printf(bio_err, "PKCS7 Data\n");
         } else if (bagnid == NID_pkcs7_encrypted) {
             if (options & INFO) {
                 BIO_printf(bio_err, "PKCS7 Encrypted data: ");
-				alg_print(bio_err, 
+                alg_print(bio_err, p7->d.encrypted->enc_data->algorithm);
-					p7->d.encrypted->enc_data->algorithm);
             }
             bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
-		} else continue;
+        } else
-		if (!bags) goto err;
+            continue;
+        if (!bags)
+            goto err;
         if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
                                    options, pempass)) {
             sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
@@ -715,8 +827,7 @@ int dump_certs_pkeys_bags (BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
     for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
         if (!dump_certs_pkeys_bag(out,
                                   sk_PKCS12_SAFEBAG_value(bags, i),
-					   pass, passlen,
+                                  pass, passlen, options, pempass))
-					   options, pempass))
             return 0;
     }
     return 1;
@@ -729,14 +840,16 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
     PKCS8_PRIV_KEY_INFO *p8;
     X509 *x509;
 
-	switch (M_PKCS12_bag_type(bag))
+    switch (M_PKCS12_bag_type(bag)) {
-	{
     case NID_keyBag:
-		if (options & INFO) BIO_printf (bio_err, "Key bag\n");
+        if (options & INFO)
-		if (options & NOKEYS) return 1;
+            BIO_printf(bio_err, "Key bag\n");
+        if (options & NOKEYS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         p8 = bag->value.keybag;
-		if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
+        if (!(pkey = EVP_PKCS82PKEY(p8)))
+            return 0;
         print_attribs(out, p8->attributes, "Key Attributes");
         PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
         EVP_PKEY_free(pkey);
@@ -747,7 +860,8 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
             BIO_printf(bio_err, "Shrouded Keybag: ");
             alg_print(bio_err, bag->value.shkeybag->algor);
         }
-		if (options & NOKEYS) return 1;
+        if (options & NOKEYS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
             return 0;
@@ -762,22 +876,28 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
         break;
 
     case NID_certBag:
-		if (options & INFO) BIO_printf (bio_err, "Certificate bag\n");
+        if (options & INFO)
-		if (options & NOCERTS) return 1;
+            BIO_printf(bio_err, "Certificate bag\n");
+        if (options & NOCERTS)
+            return 1;
         if (PKCS12_get_attr(bag, NID_localKeyID)) {
-			if (options & CACERTS) return 1;
+            if (options & CACERTS)
-		} else if (options & CLCERTS) return 1;
+                return 1;
+        } else if (options & CLCERTS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate)
             return 1;
-		if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
+        if (!(x509 = PKCS12_certbag2x509(bag)))
+            return 0;
         dump_cert_text(out, x509);
         PEM_write_bio_X509(out, x509);
         X509_free(x509);
         break;
 
     case NID_safeContentsBag:
-		if (options & INFO) BIO_printf (bio_err, "Safe Contents bag\n");
+        if (options & INFO)
+            BIO_printf(bio_err, "Safe Contents bag\n");
         print_attribs(out, bag->attrib, "Bag Attributes");
         return dump_certs_pkeys_bags(out, bag->value.safes, pass,
                                      passlen, options, pempass);
@@ -800,21 +920,29 @@ int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 {
     X509_STORE_CTX store_ctx;
     STACK_OF(X509) *chn;
-	int i;
+    int i = 0;
 
-	/* FIXME: Should really check the return status of X509_STORE_CTX_init
+    /*
-	 * for an error, but how that fits into the return value of this
+     * FIXME: Should really check the return status of X509_STORE_CTX_init
-	 * function is less obvious. */
+     * for an error, but how that fits into the return value of this function
+     * is less obvious.
+     */
     X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
     if (X509_verify_cert(&store_ctx) <= 0) {
         i = X509_STORE_CTX_get_error(&store_ctx);
+        if (i == 0)
+            /*
+             * avoid returning 0 if X509_verify_cert() did not set an
+             * appropriate error value in the context
+             */
+            i = -1;
+        chn = NULL;
         goto err;
-	}
+    } else
         chn = X509_STORE_CTX_get1_chain(&store_ctx);
-	i = 0;
-	*chain = chn;
  err:
     X509_STORE_CTX_cleanup(&store_ctx);
+    *chain = chn;
 
     return i;
 }
@@ -825,11 +953,13 @@ int alg_print (BIO *x, X509_ALGOR *alg)
     const unsigned char *p;
     p = alg->parameter->value.sequence->data;
     pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
+    if (!pbe)
+        return 1;
     BIO_printf(bio_err, "%s, Iteration %ld\n",
                OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
                ASN1_INTEGER_get(pbe->iter));
     PBEPARAM_free(pbe);
-	return 0;
+    return 1;
 }
 
 /* Load all certificates from a given file */
@@ -855,13 +985,15 @@ int cert_load(BIO *in, STACK_OF(X509) *sk)
 # ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
 # endif
-	if(ret) ERR_clear_error();
+    if (ret)
+        ERR_clear_error();
     return ret;
 }
 
 /* Generalised attribute print: handle PKCS#8 and bag attributes */
 
-int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
+int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,
+                  const char *name)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *av;
@@ -883,7 +1015,8 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
         if (attr_nid == NID_undef) {
             i2a_ASN1_OBJECT(out, attr->object);
             BIO_printf(out, ": ");
-		} else BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
+        } else
+            BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
 
         if (sk_ASN1_TYPE_num(attr->value.set)) {
             av = sk_ASN1_TYPE_value(attr->value.set, 0);
@@ -911,7 +1044,8 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
                 BIO_printf(out, "<Unsupported tag %d>\n", av->type);
                 break;
             }
-		} else BIO_printf(out, "<No Values>\n");
+        } else
+            BIO_printf(out, "<No Values>\n");
     }
     return 1;
 }
@@ -919,7 +1053,8 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
 void hex_prin(BIO *out, unsigned char *buf, int len)
 {
     int i;
-	for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]);
+    for (i = 0; i < len; i++)
+        BIO_printf(out, "%02X ", buf[i]);
 }
 
 #endif

apps/pkcs7.c

@@ -71,7 +71,8 @@
 #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,9 +83,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     PKCS7 *p7 = NULL;
     int i, badops = 0;
     BIO *in = NULL, *out = NULL;
@@ -113,43 +111,37 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		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)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 #endif
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -158,8 +150,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -167,11 +158,14 @@ bad:
         BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
         BIO_printf(bio_err, " -out arg      output file\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");
+                   " -print_certs  print any certs or crl in the input\n");
+        BIO_printf(bio_err,
+                   " -text         print full details of certificates\n");
         BIO_printf(bio_err, " -noout        don't output encoded data\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
         ret = 1;
         goto end;
@@ -180,24 +174,21 @@ bad:
     ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
     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 (in == NULL)
+            if (in == NULL) {
-			{
                 perror(infile);
                 goto end;
             }
@@ -207,20 +198,17 @@ bad:
         p7 = d2i_PKCS7_bio(in, NULL);
     else if (informat == FORMAT_PEM)
         p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
-	else
+    else {
-		{
         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");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -228,24 +216,19 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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;
 
         i = OBJ_obj2nid(p7->type);
-		switch (i)
+        switch (i) {
-			{
         case NID_pkcs7_signed:
             certs = p7->d.sign->cert;
             crls = p7->d.sign->crl;
@@ -258,31 +241,31 @@ bad:
             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) X509_print(out, x);
+                if (text)
-				else dump_cert_text(out, x);
+                    X509_print(out, x);
+                else
+                    dump_cert_text(out, x);
 
-				if(!noout) PEM_write_bio_X509(out,x);
+                if (!noout)
+                    PEM_write_bio_X509(out, x);
                 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);
 
                 X509_CRL_print(out, crl);
 
-				if(!noout)PEM_write_bio_X509_CRL(out,crl);
+                if (!noout)
+                    PEM_write_bio_X509_CRL(out, crl);
                 BIO_puts(out, "\n");
             }
         }
@@ -301,8 +284,7 @@ bad:
             goto end;
         }
 
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write pkcs7 object\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -310,9 +292,12 @@ bad:
     }
     ret = 0;
  end:
-	if (p7 != NULL) PKCS7_free(p7);
+    if (p7 != NULL)
-	if (in != NULL) BIO_free(in);
+        PKCS7_free(p7);
-	if (out != NULL) BIO_free_all(out);
+    if (in != NULL)
+        BIO_free(in);
+    if (out != NULL)
+        BIO_free_all(out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/pkcs8.c

@@ -1,6 +1,7 @@
 /* pkcs8.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/*
- * project 1999-2004.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999-2004.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -89,7 +90,8 @@ int MAIN(int argc, char **argv)
     char *engine = NULL;
 #endif
 
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
@@ -100,59 +102,40 @@ int MAIN(int argc, char **argv)
     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 (!strcmp(*args,"-v2"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 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
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-v1")) {
-		else if (!strcmp(*args,"-v1"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 pbe_nid = OBJ_txt2nid(*args);
-				if (pbe_nid == NID_undef)
+                if (pbe_nid == NID_undef) {
-					{
+                    BIO_printf(bio_err, "Unknown PBE algorithm %s\n", *args);
-					BIO_printf(bio_err,
-						 "Unknown PBE algorithm %s\n", *args);
                     badarg = 1;
                 }
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-inform")) {
-		else if (!strcmp(*args,"-inform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 informat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-outform")) {
-		else if (!strcmp(*args,"-outform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outformat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-topk8"))
-		else if (!strcmp (*args, "-topk8"))
             topk8 = 1;
         else if (!strcmp(*args, "-noiter"))
             iter = 1;
@@ -164,76 +147,76 @@ int MAIN(int argc, char **argv)
             p8_broken = PKCS8_NS_DB;
         else if (!strcmp(*args, "-embed"))
             p8_broken = PKCS8_EMBEDDED_PARAM;
-		else if (!strcmp(*args,"-passin"))
+        else if (!strcmp(*args, "-passin")) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
             passargin = *(++args);
-			}
+        } else if (!strcmp(*args, "-passout")) {
-		else if (!strcmp(*args,"-passout"))
+            if (!args[1])
-			{
+                goto bad;
-			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])
-			if (!args[1]) goto bad;
+                goto bad;
             engine = *(++args);
         }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			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]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else
-		else badarg = 1;
+            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, "-passin arg     input file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-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, "-passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passout arg    output file pass phrase source\n");
         BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
+                   "-nooct          use (nonstandard) no octet format\n");
-		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+        BIO_printf(bio_err,
+                   "-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, "-nocrypt        use or expect unencrypted private key\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+                   "-nocrypt        use or expect unencrypted private key\n");
-		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
+                   "-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," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -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;
     }
@@ -241,29 +224,20 @@ 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"))) {
-		if (!(in = BIO_new_file(infile, "rb")))
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open input file %s\n", infile);
             return (1);
         }
-		}
+    } else
-	else
         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, "Can't open output file %s\n", outfile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open output file %s\n", outfile);
             return (1);
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -272,48 +246,39 @@ 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,
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-			passin, e, "key");
+        if (!pkey) {
-		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(pass, sizeof pass, "Enter Encryption Password:", 1))
+                if (EVP_read_pw_string
-					{
+                    (pass, sizeof pass, "Enter Encryption Password:", 1)) {
                     PKCS8_PRIV_KEY_INFO_free(p8inf);
                     EVP_PKEY_free(pkey);
                     BIO_free_all(out);
@@ -323,8 +288,7 @@ 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);
@@ -337,8 +301,7 @@ 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);
@@ -358,40 +321,33 @@ 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);
         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");
             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);
         }
@@ -399,25 +355,21 @@ 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;
@@ -441,8 +393,7 @@ 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);
     }

apps/prime.c

@@ -52,7 +52,6 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
-
 #undef PROG
 #define PROG prime_main
 
@@ -73,8 +72,7 @@ int MAIN(int argc, char **argv)
 
     --argc;
     ++argv;
-    while (argc >= 1 && **argv == '-')
+    while (argc >= 1 && **argv == '-') {
-	{
         if (!strcmp(*argv, "-hex"))
             hex = 1;
         else if (!strcmp(*argv, "-checks"))
@@ -82,8 +80,7 @@ int MAIN(int argc, char **argv)
                 goto bad;
             else
                 checks = atoi(*++argv);
-	else
+        else {
-	    {
             BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
             goto bad;
         }
@@ -91,14 +88,12 @@ int MAIN(int argc, char **argv)
         ++argv;
     }
 
-    if (argv[0] == NULL)
+    if (argv[0] == NULL) {
-	{
         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);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -115,7 +110,7 @@ int MAIN(int argc, char **argv)
 
     BN_print(bio_out, bn);
     BIO_printf(bio_out, " is %sprime\n",
-	       BN_is_prime(bn,checks,NULL,NULL,NULL) ? "" : "not ");
+               BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
 
     BN_free(bn);
     BIO_free_all(bio_out);

apps/progs.h

@@ -28,6 +28,7 @@ extern int speed_main(int argc,char *argv[]);
 extern int s_time_main(int argc, char *argv[]);
 extern int version_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 sess_id_main(int argc, char *argv[]);
 extern int ciphers_main(int argc, char *argv[]);
@@ -109,6 +110,9 @@ FUNCTION functions[] = {
 #endif
     {FUNC_TYPE_GENERAL, "version", version_main},
     {FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main},
+#ifndef OPENSSL_NO_CMS
+    {FUNC_TYPE_GENERAL, "cms", cms_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))
@@ -165,6 +169,24 @@ FUNCTION functions[] = {
 #endif
 #ifndef OPENSSL_NO_AES
     {FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main},
 #endif
     {FUNC_TYPE_CIPHER, "base64", enc_main},
 #ifndef OPENSSL_NO_DES
@@ -179,6 +201,9 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_IDEA
     {FUNC_TYPE_CIPHER, "idea", enc_main},
 #endif
+#ifndef OPENSSL_NO_SEED
+    {FUNC_TYPE_CIPHER, "seed", enc_main},
+#endif
 #ifndef OPENSSL_NO_RC4
     {FUNC_TYPE_CIPHER, "rc4", enc_main},
 #endif
@@ -245,6 +270,18 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_IDEA
     {FUNC_TYPE_CIPHER, "idea-ofb", enc_main},
 #endif
+#ifndef OPENSSL_NO_SEED
+    {FUNC_TYPE_CIPHER, "seed-cbc", enc_main},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FUNC_TYPE_CIPHER, "seed-ecb", enc_main},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FUNC_TYPE_CIPHER, "seed-cfb", enc_main},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FUNC_TYPE_CIPHER, "seed-ofb", enc_main},
+#endif
 #ifndef OPENSSL_NO_RC2
     {FUNC_TYPE_CIPHER, "rc2-cbc", enc_main},
 #endif

apps/progs.pl

@@ -43,6 +43,8 @@ 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; }
 	}
@@ -57,14 +59,18 @@ foreach (
 	"aes-128-cbc", "aes-128-ecb",
 	"aes-192-cbc", "aes-192-ecb",
 	"aes-256-cbc", "aes-256-ecb",
+	"camellia-128-cbc", "camellia-128-ecb",
+	"camellia-192-cbc", "camellia-192-ecb",
+	"camellia-256-cbc", "camellia-256-ecb",
 	"base64",
-	"des", "des3", "desx", "idea", "rc4", "rc4-40",
+	"des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
 	"rc2", "bf", "cast", "rc5",
 	"des-ecb", "des-ede",    "des-ede3",
 	"des-cbc", "des-ede-cbc","des-ede3-cbc",
 	"des-cfb", "des-ede-cfb","des-ede3-cfb",
 	"des-ofb", "des-ede-ofb","des-ede3-ofb",
 	"idea-cbc","idea-ecb",    "idea-cfb", "idea-ofb",
+	"seed-cbc","seed-ecb",    "seed-cfb", "seed-ofb",
 	"rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
 	"bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",
 	"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
@@ -75,7 +81,9 @@ foreach (
 	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
 	if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }
 	elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }
+	elsif ($_ =~ /camellia/)  { $t="#ifndef OPENSSL_NO_CAMELLIA\n${t}#endif\n"; }
 	elsif ($_ =~ /idea/) { $t="#ifndef OPENSSL_NO_IDEA\n${t}#endif\n"; }
+	elsif ($_ =~ /seed/) { $t="#ifndef OPENSSL_NO_SEED\n${t}#endif\n"; }
 	elsif ($_ =~ /rc4/)  { $t="#ifndef OPENSSL_NO_RC4\n${t}#endif\n"; }
 	elsif ($_ =~ /rc2/)  { $t="#ifndef OPENSSL_NO_RC2\n${t}#endif\n"; }
 	elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }

apps/rand.c

@@ -66,9 +66,11 @@
 #undef PROG
 #define PROG rand_main
 
-/* -out file         - write to file
+/*-
+ * -out file         - write to file
  * -rand file:file   - PRNG seed files
- * -base64           - encode output
+ * -base64           - base64 encode output
+ * -hex              - hex encode output
  * num               - write 'num' bytes
  */
 
@@ -76,14 +78,12 @@ 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
@@ -101,71 +101,69 @@ int MAIN(int argc, char **argv)
 
     badopt = 0;
     i = 0;
-	while (!badopt && argv[++i] != NULL)
+    while (!badopt && argv[++i] != NULL) {
-		{
+        if (strcmp(argv[i], "-out") == 0) {
-		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))
                 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))
                 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) {
-		else if (isdigit((unsigned char)argv[i][0]))
+            if (!hex)
-			{
+                hex = 1;
-			if (num < 0)
+            else
-				{
+                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
-			else
+                badopt = 1;
+        } 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, "-engine e             - use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n",
-		BIO_printf(bio_err, "-base64               - encode output\n");
+                   LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-base64               - base64 encode output\n");
+        BIO_printf(bio_err, "-hex                  - hex encode output\n");
         goto err;
     }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
     app_RAND_load_file(NULL, bio_err, (inrand != NULL));
@@ -178,8 +176,7 @@ 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
         {
@@ -191,16 +188,14 @@ 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;
 
@@ -210,10 +205,17 @@ 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;
     }
-	BIO_flush(out);
+    if (hex)
+        BIO_puts(out, "\n");
+    (void)BIO_flush(out);
 
     app_RAND_write_file(NULL, bio_err);
     ret = 0;

apps/rsa.c

@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 # include <stdio.h>
 # include <stdlib.h>
@@ -73,16 +74,21 @@
 # undef PROG
 # 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
  * -des         - encrypt output if PEM format with DES in cbc mode
  * -des3        - encrypt output if PEM format
  * -idea        - encrypt output if PEM format
+ * -seed        - encrypt output if PEM format
  * -aes128      - encrypt output if PEM format
  * -aes192      - encrypt output if PEM format
  * -aes256      - encrypt output if PEM format
+ * -camellia128 - encrypt output if PEM format
+ * -camellia192 - encrypt output if PEM format
+ * -camellia256 - encrypt output if PEM format
  * -text        - print a text version
  * -modulus     - print the RSA key modulus
  * -check       - verify key consistency
@@ -127,42 +133,36 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -180,8 +180,7 @@ int MAIN(int argc, char **argv)
             modulus = 1;
         else if (strcmp(*argv, "-check") == 0)
             check = 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;
             break;
@@ -190,35 +189,53 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  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 - one of DER NET PEM\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -outform arg    output format - one of DER NET PEM\n");
+                   " -inform arg     input format - one of DER NET PEM\n");
+        BIO_printf(bio_err,
+                   " -outform arg    output format - one of DER NET PEM\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," -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," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+                   " -passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+        BIO_printf(bio_err,
+                   " -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err,
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
+                   " -idea           encrypt PEM output with cbc idea\n");
+# endif
+# ifndef OPENSSL_NO_SEED
+        BIO_printf(bio_err,
+                   " -seed           encrypt PEM output with cbc seed\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
+# endif
+# ifndef OPENSSL_NO_CAMELLIA
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\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 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,
+                   " -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");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 # endif
         goto end;
     }
@@ -260,14 +277,12 @@ bad:
         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
         {
@@ -275,78 +290,70 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		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, "\n");
     }
 
-	if (check)
+    if (check) {
-		{
         int r = RSA_check_key(rsa);
 
         if (r == 1)
             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",
-				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
+                           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 == -1 */
+        if (r == -1 || ERR_peek_error() != 0) { /* should happen only if r ==
-			{
+                                                 * -1 */
             ERR_print_errors(bio_err);
             goto end;
         }
     }
 
-	if (noout)
+    if (noout) {
-		{
         ret = 0;
         goto end;
     }
     BIO_printf(bio_err, "writing RSA key\n");
     if (outformat == FORMAT_ASN1) {
-		if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
+        if (pubout || pubin)
-		else i=i2d_RSAPrivateKey_bio(out,rsa);
+            i = i2d_RSA_PUBKEY_bio(out, rsa);
+        else
+            i = i2d_RSAPrivateKey_bio(out, rsa);
     }
 # ifndef OPENSSL_NO_RC4
-	else if (outformat == FORMAT_NETSCAPE)
+    else if (outformat == FORMAT_NETSCAPE) {
-		{
         unsigned char *p, *pp;
         int size;
 
         i = 1;
         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");
             goto end;
         }
@@ -359,24 +366,27 @@ bad:
     else if (outformat == FORMAT_PEM) {
         if (pubout || pubin)
             i = PEM_write_bio_RSA_PUBKEY(out, rsa);
-		else i=PEM_write_bio_RSAPrivateKey(out,rsa,
+        else
+            i = PEM_write_bio_RSAPrivateKey(out, rsa,
                                             enc, NULL, 0, NULL, passout);
     } 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 key\n");
         ERR_print_errors(bio_err);
-		}
+    } else
-	else
         ret = 0;
  end:
-	if(out != NULL) BIO_free_all(out);
+    if (out != NULL)
-	if(rsa != NULL) RSA_free(rsa);
+        BIO_free_all(out);
-	if(passin) OPENSSL_free(passin);
+    if (rsa != NULL)
-	if(passout) OPENSSL_free(passout);
+        RSA_free(rsa);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/rsautl.c

@@ -1,6 +1,7 @@
 /* rsautl.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/*
- * project 2000.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -56,6 +57,7 @@
  *
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 
 # include "apps.h"
@@ -107,7 +109,8 @@ int MAIN(int argc, char **argv)
     argc--;
     argv++;
 
-	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
@@ -115,50 +118,71 @@ 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) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 infile = *(++argv);
         } else if (!strcmp(*argv, "-out")) {
-			if (--argc < 1) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 outfile = *(++argv);
         } else if (!strcmp(*argv, "-inkey")) {
-			if (--argc < 1) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 keyfile = *(++argv);
         } else if (!strcmp(*argv, "-passin")) {
-			if (--argc < 1) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 passargin = *(++argv);
         } else if (strcmp(*argv, "-keyform") == 0) {
-			if (--argc < 1) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 keyform = str2fmt(*(++argv));
 # ifndef OPENSSL_NO_ENGINE
         } else if (!strcmp(*argv, "-engine")) {
-			if (--argc < 1) badarg = 1;
+            if (--argc < 1)
+                badarg = 1;
+            else
                 engine = *(++argv);
 # endif
         } else if (!strcmp(*argv, "-pubin")) {
             key_type = KEY_PUBKEY;
         } else if (!strcmp(*argv, "-certin")) {
             key_type = KEY_CERT;
-		} 
+        } else if (!strcmp(*argv, "-asn1parse"))
-		else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
+            asn1parse = 1;
-		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
+        else if (!strcmp(*argv, "-hexdump"))
-		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
+            hexdump = 1;
-		else if(!strcmp(*argv, "-oaep")) pad = RSA_PKCS1_OAEP_PADDING;
+        else if (!strcmp(*argv, "-raw"))
-		else if(!strcmp(*argv, "-ssl")) pad = RSA_SSLV23_PADDING;
+            pad = RSA_NO_PADDING;
-		else if(!strcmp(*argv, "-pkcs")) pad = RSA_PKCS1_PADDING;
+        else if (!strcmp(*argv, "-oaep"))
-		else if(!strcmp(*argv, "-x931")) pad = RSA_X931_PADDING;
+            pad = RSA_PKCS1_OAEP_PADDING;
+        else if (!strcmp(*argv, "-ssl"))
+            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")) rsa_mode = RSA_VERIFY;
+        } else if (!strcmp(*argv, "-verify"))
-		else if(!strcmp(*argv, "-rev")) rev = 1;
+            rsa_mode = RSA_VERIFY;
-		else if(!strcmp(*argv, "-encrypt")) rsa_mode = RSA_ENCRYPT;
+        else if (!strcmp(*argv, "-rev"))
+            rev = 1;
+        else if (!strcmp(*argv, "-encrypt"))
+            rsa_mode = RSA_ENCRYPT;
         else if (!strcmp(*argv, "-decrypt")) {
             rsa_mode = RSA_DECRYPT;
             need_priv = 1;
-		} else badarg = 1;
+        } else
+            badarg = 1;
         if (badarg) {
             usage();
             goto end;
@@ -171,7 +195,6 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_err, "A private key is needed for this operation\n");
         goto end;
     }
-
 # ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 # endif
@@ -195,8 +218,7 @@ int MAIN(int argc, char **argv)
         break;
 
     case KEY_CERT:
-		x = load_cert(bio_err, keyfile, keyform,
+        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
-			NULL, e, "Certificate");
         if (x) {
             pkey = X509_get_pubkey(x);
             X509_free(x);
@@ -217,14 +239,14 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-
     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 in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    } else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
     if (outfile) {
         if (!(out = BIO_new_file(outfile, "wb"))) {
@@ -269,7 +291,8 @@ int MAIN(int argc, char **argv)
         break;
 
     case RSA_SIGN:
-			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
+            RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
         break;
 
     case RSA_ENCRYPT:
@@ -277,7 +300,8 @@ int MAIN(int argc, char **argv)
         break;
 
     case RSA_DECRYPT:
-			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
+            RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
         break;
 
     }
@@ -292,15 +316,20 @@ int MAIN(int argc, char **argv)
         if (!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
             ERR_print_errors(bio_err);
         }
-	} else if(hexdump) BIO_dump(out, (char *)rsa_out, rsa_outlen);
+    } else if (hexdump)
-	else BIO_write(out, rsa_out, rsa_outlen);
+        BIO_dump(out, (char *)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) OPENSSL_free(rsa_in);
+    if (rsa_in)
-	if(rsa_out) OPENSSL_free(rsa_out);
+        OPENSSL_free(rsa_in);
-	if(passin) OPENSSL_free(passin);
+    if (rsa_out)
+        OPENSSL_free(rsa_out);
+    if (passin)
+        OPENSSL_free(passin);
     return ret;
 }
 
@@ -312,10 +341,12 @@ 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, "-certin         input is a certificate carrying an RSA public key\n");
+    BIO_printf(bio_err,
+               "-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, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
+    BIO_printf(bio_err,
+               "-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");
@@ -323,7 +354,8 @@ static void usage()
     BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
     BIO_printf(bio_err, "-hexdump        hex dump output\n");
 # ifndef OPENSSL_NO_ENGINE
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err,
+               "-engine e       use engine e, possibly a hardware device.\n");
     BIO_printf(bio_err, "-passin arg    pass phrase source\n");
 # endif
 

apps/s_apps.h

@@ -108,7 +108,8 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
+/* conflicts with winsock2 stuff on netware */
+#if !defined(OPENSSL_SYS_NETWARE)
 # include <sys/types.h>
 #endif
 #include <openssl/opensslconf.h>
@@ -122,7 +123,9 @@
 #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 NBBY             8     /* number of bits in a byte */
@@ -148,7 +151,9 @@ typedef fd_mask fd_set;
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(int port, int type, int *ret,
+              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
@@ -159,12 +164,21 @@ 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,short *p);
+int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
+                      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, 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);
+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,12 +117,17 @@
 #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;
+unsigned char cookie_secret[COOKIE_SECRET_LENGTH];
+int cookie_initialized = 0;
 
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
 {
@@ -136,25 +141,21 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
 
     X509_NAME_oneline(X509_get_subject_name(err_cert), buf, sizeof 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,
                    X509_verify_cert_error_string(err));
-		if (verify_depth >= depth)
+        if (verify_depth >= depth) {
-			{
             ok = 1;
             verify_error = X509_V_OK;
-			}
+        } else {
-		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,sizeof buf);
+        X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf,
+                          sizeof buf);
         BIO_printf(bio_err, "issuer= %s\n", buf);
         break;
     case X509_V_ERR_CERT_NOT_YET_VALID:
@@ -176,30 +177,29 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
 
 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,
-			SSL_FILETYPE_PEM) <= 0)
+                                         SSL_FILETYPE_PEM) <= 0) {
-			{
+            BIO_printf(bio_err, "unable to get certificate from '%s'\n",
-			BIO_printf(bio_err,"unable to get certificate from '%s'\n",cert_file);
+                       cert_file);
             ERR_print_errors(bio_err);
             return (0);
         }
-		if (key_file == NULL) key_file=cert_file;
+        if (key_file == NULL)
-		if (SSL_CTX_use_PrivateKey_file(ctx,key_file,
+            key_file = cert_file;
-			SSL_FILETYPE_PEM) <= 0)
+        if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
-			{
+            BIO_printf(bio_err, "unable to get private key from '%s'\n",
-			BIO_printf(bio_err,"unable to get private key from '%s'\n",key_file);
+                       key_file);
             ERR_print_errors(bio_err);
             return (0);
         }
 
-		/*
+        /*-
         In theory this is no longer needed
         ssl=SSL_new(ctx);
         x509=SSL_get_certificate(ssl);
@@ -214,15 +214,18 @@ 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
+        /*
-		 * the private key */
+         * If we are using DSA, we can copy the parameters from the private
+         * key
+         */
 
-		
+        /*
-		/* Now we know that a key and cert have been set against
+         * Now we know that a key and cert have been set against the SSL
-		 * the SSL context */
+         * 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);
         }
     }
@@ -233,25 +236,23 @@ 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");
         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");
         ERR_print_errors(bio_err);
         return 0;
     }
 
-		
+    /*
-		/* Now we know that a key and cert have been set against
+     * Now we know that a key and cert have been set against the SSL 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 1;
@@ -263,17 +264,15 @@ long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
     BIO *out;
 
     out = (BIO *)BIO_get_callback_arg(bio);
-	if (out == NULL) return(ret);
+    if (out == NULL)
+        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_dump(out, argp, (int)ret);
         return (ret);
-		}
+    } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
-	else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
-		{
         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);
@@ -288,45 +287,42 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
 
     w = where & ~SSL_ST_MASK;
 
-	if (w & SSL_ST_CONNECT) str="SSL_connect";
+    if (w & SSL_ST_CONNECT)
-	else if (w & SSL_ST_ACCEPT) str="SSL_accept";
+        str = "SSL_connect";
-	else str="undefined";
+    else if (w & SSL_ST_ACCEPT)
+        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) {
-	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",
                        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));
         }
     }
 }
 
-
+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)
 {
     BIO *bio = arg;
-	const char *str_write_p, *str_version, *str_content_type = "", *str_details1 = "", *str_details2= "";
+    const char *str_write_p, *str_version, *str_content_type =
+        "", *str_details1 = "", *str_details2 = "";
 
     str_write_p = write_p ? ">>>" : "<<<";
 
-	switch (version)
+    switch (version) {
-		{
     case SSL2_VERSION:
         str_version = "SSL 2.0";
         break;
@@ -338,25 +334,28 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         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 =
-						unsigned err = (((const unsigned char*)buf)[1]<<8) + ((const unsigned char*)buf)[2];
+                        (((const unsigned char *)buf)[1] << 8) +
+                        ((const unsigned char *)buf)[2];
 
-						switch (err)
+                    switch (err) {
-							{
                     case 0x0001:
                         str_details2 = " NO-CIPHER-ERROR";
                         break;
@@ -401,10 +400,10 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         }
     }
 
-	if (version == SSL3_VERSION || version == TLS1_VERSION)
+    if (version == SSL3_VERSION ||
-		{
+        version == TLS1_VERSION ||
-		switch (content_type)
+        version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
-			{
+        switch (content_type) {
         case 20:
             str_content_type = "ChangeCipherSpec";
             break;
@@ -416,14 +415,11 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
             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;
@@ -433,8 +429,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                 }
 
                 str_details2 = " ???";
-				switch (((const unsigned char*)buf)[1])
+                switch (((const unsigned char *)buf)[1]) {
-					{
                 case 0:
                     str_details2 = " close_notify";
                     break;
@@ -504,18 +499,33 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                 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;
@@ -540,6 +550,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                 case 15:
                     str_details1 = ", CertificateVerify";
                     break;
+                case 3:
+                    str_details1 = ", HelloVerifyRequest";
+                    break;
                 case 16:
                     str_details1 = ", ClientKeyExchange";
                     break;
@@ -551,10 +564,11 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         }
     }
 
-	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);
+    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);
 
-	if (len > 0)
+    if (len > 0) {
-		{
         size_t num, i;
 
         BIO_printf(bio, "   ");
@@ -563,8 +577,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         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]);
@@ -573,5 +586,148 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
             BIO_printf(bio, " ...");
         BIO_printf(bio, "\n");
     }
-	BIO_flush(bio);
+    (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,4 +1,6 @@
-/* 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.
  *
@@ -62,10 +64,18 @@
 #include <errno.h>
 #include <signal.h>
 
-/* With IPv6, it looks like Digital has mixed up the proper order of
+#ifdef FLAT_INC
-   recursive header file inclusion, resulting in the compiler complaining
+# include "e_os2.h"
-   that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
+#else
-   is needed to have fileno() declared correctly...  So let's define u_int */
+# include "../e_os2.h"
+#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
 typedef unsigned int u_int;
@@ -87,8 +97,12 @@ typedef unsigned int u_int;
 
 #ifndef OPENSSL_NO_SOCK
 
+# if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
+#  include "netdb.h"
+# endif
+
 static struct hostent *GetHostByName(char *name);
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
+# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
 static void ssl_sock_cleanup(void);
 # endif
 static int ssl_sock_init(void);
@@ -104,7 +118,7 @@ static int host_ip(char *str, unsigned char ip[4]);
 #  define SOCKET_PROTOCOL IPPROTO_TCP
 # endif
 
-#ifdef OPENSSL_SYS_NETWARE
+# if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
 static int wsa_init_done = 0;
 # endif
 
@@ -121,10 +135,8 @@ 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);
@@ -147,8 +159,7 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam)
 # 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
         WSACancelBlockingCall();
@@ -156,11 +167,10 @@ static void ssl_sock_cleanup(void)
         WSACleanup();
     }
 }
-#elif defined(OPENSSL_SYS_NETWARE)
+# 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;
         WSACleanup();
     }
@@ -175,8 +185,7 @@ static int ssl_sock_init(void)
     if (sock_init())
         return (0);
 # elif defined(OPENSSL_SYS_WINDOWS)
-	if (!wsa_init_done)
+    if (!wsa_init_done) {
-		{
         int err;
 
 #  ifdef SIGINT
@@ -184,13 +193,12 @@ static int ssl_sock_init(void)
 #  endif
         wsa_init_done = 1;
         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);
+            BIO_printf(bio_err, "unable to start WINSOCK, error code=%d\n",
+                       err);
             return (0);
         }
-
 #  ifdef OPENSSL_SYS_WIN16
         EnumTaskWindows(GetCurrentTask(), enumproc, 0L);
         lpTopWndProc = (FARPROC) GetWindowLong(topWnd, GWL_WNDPROC);
@@ -199,13 +207,12 @@ static int ssl_sock_init(void)
         SetWindowLong(topWnd, GWL_WNDPROC, (LONG) lpTopHookProc);
 #  endif                        /* OPENSSL_SYS_WIN16 */
     }
-#elif defined(OPENSSL_SYS_NETWARE)
+# 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);
@@ -214,9 +221,9 @@ static int ssl_sock_init(void)
         wsa_init_done = 1;
         wVerReq = MAKEWORD(2, 0);
         err = WSAStartup(wVerReq, &wsaData);
-      if (err != 0)
+        if (err != 0) {
-         {
+            BIO_printf(bio_err, "unable to start WINSOCK2, error code=%d\n",
-         BIO_printf(bio_err,"unable to start WINSOCK2, error code=%d\n",err);
+                       err);
             return (0);
         }
     }
@@ -229,11 +236,11 @@ int init_client(int *sock, char *host, int port, int type)
     unsigned char ip[4];
     short p = 0;
 
-	if (!host_ip(host,&(ip[0])))
+    if (!host_ip(host, &(ip[0]))) {
-		{
         return (0);
     }
-	if (p != 0) port=p;
+    if (p != 0)
+        port = p;
     return (init_client_ip(sock, ip, port, type));
 }
 
@@ -243,7 +250,8 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
     struct sockaddr_in them;
     int s, i;
 
-	if (!ssl_sock_init()) return(0);
+    if (!ssl_sock_init())
+        return (0);
 
     memset((char *)&them, 0, sizeof(them));
     them.sin_family = AF_INET;
@@ -251,8 +259,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
     addr = (unsigned long)
         ((unsigned long)ip[0] << 24L) |
         ((unsigned long)ip[1] << 16L) |
-		((unsigned long)ip[2]<< 8L)|
+        ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
-		((unsigned long)ip[3]);
     them.sin_addr.s_addr = htonl(addr);
 
     if (type == SOCK_STREAM)
@@ -260,55 +267,60 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
     else                        /* ( type == SOCK_DGRAM) */
         s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
-	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+    if (s == INVALID_SOCKET) {
-
+        perror("socket");
+        return (0);
+    }
 # ifndef OPENSSL_SYS_MPE
-	if (type == SOCK_STREAM)
+    if (type == SOCK_STREAM) {
-		{
         i = 0;
         i = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&i, sizeof(i));
-		if (i < 0) { perror("keepalive"); return(0); }
+        if (i < 0) {
+            perror("keepalive");
+            return (0);
+        }
     }
 # endif
 
-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
+    if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
-		{ close(s); perror("connect"); return(0); }
+        close(s);
+        perror("connect");
+        return (0);
+    }
     *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 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)) return(0);
+    if (!init_server(&accept_socket, port, type))
+        return (0);
 
-	if (ret != NULL)
+    if (ret != NULL) {
-		{
         *ret = accept_socket;
         /* return(1); */
     }
-  	for (;;)
+    for (;;) {
-  		{
+        if (type == SOCK_STREAM) {
-		if (type==SOCK_STREAM)
+            if (do_accept(accept_socket, &sock, &name) == 0) {
-			{
-			if (do_accept(accept_socket,&sock,&name) == 0)
-				{
                 SHUTDOWN(accept_socket);
                 return (0);
             }
-			}
+        } else
-		else
             sock = accept_socket;
         i = (*cb) (name, sock, context);
-		if (name != NULL) OPENSSL_free(name);
+        if (name != NULL)
+            OPENSSL_free(name);
         if (type == SOCK_STREAM)
             SHUTDOWN2(sock);
-		if (i < 0)
+        if (i < 0) {
-			{
             SHUTDOWN2(accept_socket);
             return (i);
         }
@@ -319,9 +331,10 @@ static int init_server_long(int *sock, int port, char *ip, int type)
 {
     int ret = 0;
     struct sockaddr_in server;
-	int s= -1,i;
+    int s = -1;
 
-	if (!ssl_sock_init()) return(0);
+    if (!ssl_sock_init())
+        return (0);
 
     memset((char *)&server, 0, sizeof(server));
     server.sin_family = AF_INET;
@@ -341,29 +354,27 @@ static int init_server_long(int *sock, int port, char *ip, int type)
     else                        /* type == SOCK_DGRAM */
         s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
-	if (s == INVALID_SOCKET) goto err;
+    if (s == INVALID_SOCKET)
+        goto err;
 # if defined SOL_SOCKET && defined SO_REUSEADDR
     {
         int j = 1;
-		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
-			   (void *) &j, sizeof j);
     }
 # endif
-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
+    if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
-		{
 # ifndef OPENSSL_SYS_WINDOWS
         perror("bind");
 # endif
         goto err;
     }
     /* Make it 128 for linux */
-	if (type==SOCK_STREAM && listen(s,128) == -1) goto err;
+    if (type == SOCK_STREAM && listen(s, 128) == -1)
-	i=0;
+        goto err;
     *sock = s;
     ret = 1;
  err:
-	if ((ret == 0) && (s != -1))
+    if ((ret == 0) && (s != -1)) {
-		{
         SHUTDOWN(s);
     }
     return (ret);
@@ -376,13 +387,14 @@ static int init_server(int *sock, int port, int type)
 
 static int do_accept(int acc_sock, int *sock, char **host)
 {
-	int ret,i;
+    int ret;
     struct hostent *h1, *h2;
     static struct sockaddr_in from;
     int len;
 /*      struct linger ling; */
 
-	if (!ssl_sock_init()) return(0);
+    if (!ssl_sock_init())
+        return (0);
 
 # ifndef OPENSSL_SYS_WINDOWS
  redoit:
@@ -390,21 +402,23 @@ redoit:
 
     memset((char *)&from, 0, sizeof(from));
     len = sizeof(from);
-	/* Note: under VMS with SOCKETSHR the fourth parameter is currently
+    /*
-	 * of type (int *) whereas under other systems it is (void *) if
+     * Note: under VMS with SOCKETSHR the fourth parameter is currently of
-	 * you don't have a cast it will choke the compiler: if you do
+     * type (int *) whereas under other systems it is (void *) if you don't
-	 * have a cast then you can either go for (int *) or (void *).
+     * have a cast it will choke the compiler: if you do have a cast then you
+     * can either go for (int *) or (void *).
      */
     ret = accept(acc_sock, (struct sockaddr *)&from, (void *)&len);
-	if (ret == INVALID_SOCKET)
+    if (ret == INVALID_SOCKET) {
-		{
+# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
+        int i;
         i = WSAGetLastError();
         BIO_printf(bio_err, "accept error %d\n", i);
 # else
-		if (errno == EINTR)
+        if (errno == EINTR) {
-			{
+            /*
-			/*check_timeout(); */
+             * check_timeout();
+             */
             goto redoit;
         }
         fprintf(stderr, "errno=%d ", errno);
@@ -413,7 +427,7 @@ redoit:
         return (0);
     }
 
-/*
+/*-
     ling.l_onoff=1;
     ling.l_linger=0;
     i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling));
@@ -423,7 +437,8 @@ redoit:
     if (i < 0) { perror("keepalive"); return(0); }
 */
 
-	if (host == NULL) goto end;
+    if (host == NULL)
+        goto end;
 # ifndef BIT_FIELD_LIMITS
     /* I should use WSAAsyncGetHostByName() under windows */
     h1 = gethostbyaddr((char *)&from.sin_addr.s_addr,
@@ -432,30 +447,23 @@ redoit:
     h1 = gethostbyaddr((char *)&from.sin_addr,
                        sizeof(struct in_addr), AF_INET);
 # endif
-	if (h1 == NULL)
+    if (h1 == NULL) {
-		{
         BIO_printf(bio_err, "bad gethostbyaddr\n");
         *host = NULL;
         /* return(0); */
-		}
+    } else {
-	else
+        if ((*host = (char *)OPENSSL_malloc(strlen(h1->h_name) + 1)) == NULL) {
-		{
-		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
-			{
             perror("OPENSSL_malloc");
             return (0);
         }
         BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
 
         h2 = GetHostByName(*host);
-		if (h2 == NULL)
+        if (h2 == NULL) {
-			{
             BIO_printf(bio_err, "gethostbyname failure\n");
             return (0);
         }
-		i=0;
+        if (h2->h_addrtype != AF_INET) {
-		if (h2->h_addrtype != AF_INET)
-			{
             BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
             return (0);
         }
@@ -472,8 +480,7 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
 
     h = str;
     p = strchr(str, ':');
-	if (p == NULL)
+    if (p == NULL) {
-		{
         BIO_printf(bio_err, "no port defined\n");
         return (0);
     }
@@ -481,7 +488,8 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
 
     if ((ip != NULL) && !host_ip(str, ip))
         goto err;
-	if (host_ptr != NULL) *host_ptr=h;
+    if (host_ptr != NULL)
+        *host_ptr = h;
 
     if (!extract_port(p, port_ptr))
         goto err;
@@ -495,11 +503,10 @@ 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])) == 4)
+    if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
-		{
+        4) {
         for (i = 0; i < 4; i++)
-			if (in[i] > 255)
+            if (in[i] > 255) {
-				{
                 BIO_printf(bio_err, "invalid IP address\n");
                 goto err;
             }
@@ -507,22 +514,19 @@ static int host_ip(char *str, unsigned char ip[4])
         ip[1] = in[1];
         ip[2] = in[2];
         ip[3] = in[3];
-		}
+    } else {                    /* do a gethostbyname */
-	else
-		{ /* do a gethostbyname */
         struct hostent *he;
 
-		if (!ssl_sock_init()) return(0);
+        if (!ssl_sock_init())
+            return (0);
 
         he = GetHostByName(str);
-		if (he == NULL)
+        if (he == NULL) {
-			{
             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);
         }
@@ -544,11 +548,9 @@ int extract_port(char *str, short *port_ptr)
     i = atoi(str);
     if (i != 0)
         *port_ptr = (unsigned short)i;
-	else
+    else {
-		{
         s = getservbyname(str, "tcp");
-		if (s == NULL)
+        if (s == NULL) {
-			{
             BIO_printf(bio_err, "getservbyname failure for %s\n", str);
             return (0);
         }
@@ -558,8 +560,7 @@ int extract_port(char *str, short *port_ptr)
 }
 
 # define GHBN_NUM        4
-static struct ghbn_cache_st
+static struct ghbn_cache_st {
-	{
     char name[128];
     struct hostent ent;
     unsigned long order;
@@ -574,35 +575,30 @@ static struct hostent *GetHostByName(char *name)
     int i, lowi = 0;
     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) {
-		if (low > ghbn_cache[i].order)
-			{
             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)
                 break;
         }
     }
-	if (i == GHBN_NUM) /* no hit*/
+    if (i == GHBN_NUM) {        /* no hit */
-		{
         ghbn_miss++;
         ret = gethostbyname(name);
-		if (ret == NULL) return(NULL);
+        if (ret == 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,sizeof(struct hostent));
+            memcpy((char *)&(ghbn_cache[lowi].ent), ret,
+                   sizeof(struct hostent));
             ghbn_cache[lowi].order = ghbn_miss + ghbn_hits;
         }
         return (ret);
-		}
+    } else {
-	else
-		{
         ghbn_hits++;
         ret = &(ghbn_cache[i].ent);
         ghbn_cache[i].order = ghbn_miss + ghbn_hits;

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>
   -----------------------------------------*/
@@ -97,10 +97,12 @@
 # include <sys/times.h>
 #endif
 
-/* Depending on the VMS version, the tms structure is perhaps defined.
+/*
-   The __TMS macro will show if it was.  If it wasn't defined, we should
+ * Depending on the VMS version, the tms structure is perhaps defined. The
-   undefine TIMES, since that tells the rest of the program how things
+ * __TMS macro will show if it was.  If it wasn't defined, we should undefine
-   should be handled.				-- Richard Levitte */
+ * TIMES, since that tells the rest of the program how things should be
+ * handled.  -- Richard Levitte
+ */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
 # undef TIMES
 #endif
@@ -115,7 +117,8 @@
 # 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
@@ -141,7 +144,10 @@
 
 #define SSL_CONNECT_NAME        "localhost:4433"
 
-/*#define TEST_CERT "client.pem" */ /* no default cert. */
+/* no default cert. */
+/*
+ * #define TEST_CERT "client.pem"
+ */
 
 #undef BUFSIZZ
 #define BUFSIZZ 1024*10
@@ -231,7 +237,8 @@ static void s_time_usage(void)
 
     printf("usage: s_time <args>\n\n");
 
-	printf("-connect host:port - host:port to connect to (default is %s)\n",SSL_CONNECT_NAME);
+    printf("-connect host:port - host:port to connect to (default is %s)\n",
+           SSL_CONNECT_NAME);
 #ifdef FIONBIO
     printf("-nbio         - Run with non-blocking IO\n");
     printf("-ssl2         - Just use SSLv2\n");
@@ -260,20 +267,19 @@ static int parseArgs(int argc, char **argv)
     argv++;
 
     while (argc >= 1) {
-	if (strcmp(*argv,"-connect") == 0)
+        if (strcmp(*argv, "-connect") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
             host = *(++argv);
         }
 #if 0
-	else if( strcmp(*argv,"-host") == 0)
+        else if (strcmp(*argv, "-host") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
             host = *(++argv);
-		}
+        } else if (strcmp(*argv, "-port") == 0) {
-	else if( strcmp(*argv,"-port") == 0)
+            if (--argc < 1)
-		{
+                goto bad;
-		if (--argc < 1) goto bad;
             port = *(++argv);
         }
 #endif
@@ -284,33 +290,39 @@ static int parseArgs(int argc, char **argv)
         else if (strcmp(*argv, "-verify") == 0) {
 
             tm_verify = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             verify_depth = atoi(*(++argv));
             BIO_printf(bio_err, "verify depth is %d\n", verify_depth);
 
         } else if (strcmp(*argv, "-cert") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             t_cert_file = *(++argv);
 
         } else if (strcmp(*argv, "-key") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             t_key_file = *(++argv);
 
         } else if (strcmp(*argv, "-CApath") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             CApath = *(++argv);
 
         } else if (strcmp(*argv, "-CAfile") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             CAfile = *(++argv);
 
         } else if (strcmp(*argv, "-cipher") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             tm_cipher = *(++argv);
         }
 #ifdef FIONBIO
@@ -318,17 +330,15 @@ static int parseArgs(int argc, char **argv)
             t_nbio = 1;
         }
 #endif
-	else if(strcmp(*argv,"-www") == 0)
+        else if (strcmp(*argv, "-www") == 0) {
-		{
+            if (--argc < 1)
-		if (--argc < 1) goto bad;
+                goto bad;
             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;
             }
-		}
+        } else if (strcmp(*argv, "-bugs") == 0)
-	else if(strcmp(*argv,"-bugs") == 0)
             st_bugs = 1;
 #ifndef OPENSSL_NO_SSL2
         else if (strcmp(*argv, "-ssl2") == 0)
@@ -340,10 +350,10 @@ static int parseArgs(int argc, char **argv)
 #endif
         else if (strcmp(*argv, "-time") == 0) {
 
-	    if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             maxTime = atoi(*(++argv));
-	}
+        } else {
-	else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badop = 1;
             break;
@@ -353,7 +363,8 @@ static int parseArgs(int argc, char **argv)
         argv++;
     }
 
-    if (perform == 0) perform=3;
+    if (perform == 0)
+        perform = 3;
 
     if (badop) {
  bad:
@@ -387,13 +398,10 @@ static double tm_Time_F(int s)
 #elif defined(OPENSSL_SYS_NETWARE)
     static clock_t tstart, tend;
 
-    if (s == START)
+    if (s == START) {
-    {
         tstart = clock();
         return (0);
-    }
+    } else {
-    else
-    {
         tend = clock();
         ret = (double)((double)(tend) - (double)(tstart));
         return ((ret < 0.001) ? 0.001 : ret);
@@ -402,13 +410,10 @@ static double tm_Time_F(int s)
     {
         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);
@@ -465,11 +470,13 @@ int MAIN(int argc, char **argv)
         goto end;
 
     OpenSSL_add_ssl_algorithms();
-	if ((tm_ctx=SSL_CTX_new(s_time_meth)) == NULL) return(1);
+    if ((tm_ctx = SSL_CTX_new(s_time_meth)) == NULL)
+        return (1);
 
     SSL_CTX_set_quiet_shutdown(tm_ctx, 1);
 
-	if (st_bugs) SSL_CTX_set_options(tm_ctx,SSL_OP_ALL);
+    if (st_bugs)
+        SSL_CTX_set_options(tm_ctx, SSL_OP_ALL);
     SSL_CTX_set_cipher_list(tm_ctx, tm_cipher);
     if (!set_cert_stuff(tm_ctx, t_cert_file, t_key_file))
         goto end;
@@ -477,9 +484,10 @@ int MAIN(int argc, char **argv)
     SSL_load_error_strings();
 
     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; */
     }
@@ -491,7 +499,8 @@ int MAIN(int argc, char **argv)
         fprintf(stderr, "No CIPHER specified\n");
     }
 
-	if (!(perform & 1)) goto next;
+    if (!(perform & 1))
+        goto next;
     printf("Collecting connection statistics for %d seconds\n", maxTime);
 
     /* Loop and time how long it takes to make connections */
@@ -499,9 +508,9 @@ int MAIN(int argc, char **argv)
     bytes_read = 0;
     finishtime = (long)time(NULL) + maxTime;
     tm_Time_F(START);
-	for (;;)
+    for (;;) {
-		{
+        if (finishtime < (long)time(NULL))
-		if (finishtime < (long)time(NULL)) break;
+            break;
 #ifdef WIN32_STUFF
 
         if (flushWinMsgs(0) == -1)
@@ -514,14 +523,13 @@ int MAIN(int argc, char **argv)
         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",
-			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
+                         s_www_path);
             SSL_write(scon, buf, strlen(buf));
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
-
 #ifdef NO_SHUTDOWN
         SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 #else
@@ -532,8 +540,7 @@ int MAIN(int argc, char **argv)
         nConn += 1;
         if (SSL_session_reused(scon))
             ver = 'r';
-		else
+        else {
-			{
             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';
@@ -553,28 +560,32 @@ int MAIN(int argc, char **argv)
     totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
     i = (int)((long)time(NULL) - finishtime + maxTime);
-	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
+    printf
-	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
+        ("\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);
 
-	/* 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:
-	if (!(perform & 2)) goto end;
+    if (!(perform & 2))
+        goto end;
     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");
         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));
-		while (SSL_read(scon,buf,sizeof(buf)) > 0)
+        while (SSL_read(scon, buf, sizeof(buf)) > 0) ;
-			;
     }
 #ifdef NO_SHUTDOWN
     SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
@@ -592,9 +603,9 @@ next:
     bytes_read = 0;
     tm_Time_F(START);
 
-	for (;;)
+    for (;;) {
-		{
+        if (finishtime < (long)time(NULL))
-		if (finishtime < (long)time(NULL)) break;
+            break;
 
 #ifdef WIN32_STUFF
         if (flushWinMsgs(0) == -1)
@@ -607,14 +618,13 @@ next:
         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",
-			BIO_snprintf(buf,sizeof buf,"GET %s HTTP/1.0\r\n\r\n",s_www_path);
+                         s_www_path);
             SSL_write(scon, buf, strlen(buf));
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
                 bytes_read += i;
         }
-
 #ifdef NO_SHUTDOWN
         SSL_set_shutdown(scon, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
 #else
@@ -625,8 +635,7 @@ next:
         nConn += 1;
         if (SSL_session_reused(scon))
             ver = 'r';
-		else
+        else {
-			{
             ver = SSL_version(scon);
             if (ver == TLS1_VERSION)
                 ver = 't';
@@ -642,16 +651,19 @@ next:
     }
     totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
-
+    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);
 
     ret = 0;
  end:
-	if (scon != NULL) SSL_free(scon);
+    if (scon != NULL)
+        SSL_free(scon);
 
-	if (tm_ctx != NULL)
+    if (tm_ctx != NULL) {
-		{
         SSL_CTX_free(tm_ctx);
         tm_ctx = NULL;
     }
@@ -659,7 +671,7 @@ end:
     OPENSSL_EXIT(ret);
 }
 
-/***********************************************************************
+/*-
  * doConnection - make a connection
  * Args:
  *              scon    = earlier ssl connection for session id, or NULL
@@ -681,8 +693,7 @@ static SSL *doConnection(SSL *scon)
 
     if (scon == NULL)
         serverCon = SSL_new(tm_ctx);
-	else
+    else {
-		{
         serverCon = scon;
         SSL_set_connect_state(serverCon);
     }
@@ -697,27 +708,25 @@ static SSL *doConnection(SSL *scon)
     /* ok, lets connect */
     for (;;) {
         i = SSL_connect(serverCon);
-		if (BIO_sock_should_retry(i))
+        if (BIO_sock_should_retry(i)) {
-			{
             BIO_printf(bio_err, "DELAY\n");
 
             i = SSL_get_fd(serverCon);
             width = i + 1;
             FD_ZERO(&readfds);
             FD_SET(i, &readfds);
-			/* Note: under VMS with SOCKETSHR the 2nd parameter
+            /*
-			 * is currently of type (int *) whereas under other
+             * Note: under VMS with SOCKETSHR the 2nd parameter is currently
-			 * systems it is (void *) if you don't have a cast it
+             * of type (int *) whereas under other systems it is (void *) if
-			 * will choke the compiler: if you do have a cast then
+             * you don't have a cast it will choke the compiler: if you do
-			 * you can either go for (int *) or (void *).
+             * have a cast then you can either go for (int *) or (void *).
              */
             select(width, (void *)&readfds, NULL, NULL, NULL);
             continue;
         }
         break;
     }
-	if(i <= 0)
+    if (i <= 0) {
-		{
         BIO_printf(bio_err, "ERROR\n");
         if (verify_error != X509_V_OK)
             BIO_printf(bio_err, "verify error:%s\n",
@@ -731,5 +740,3 @@ static SSL *doConnection(SSL *scon)
 
     return serverCon;
 }
-
-

apps/sess_id.c

@@ -109,41 +109,34 @@ int MAIN(int argc, char **argv)
     argc--;
     argv++;
     num = 0;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-text") == 0)
-		else if (strcmp(*argv,"-text") == 0)
             text = ++num;
         else if (strcmp(*argv, "-cert") == 0)
             cert = ++num;
         else if (strcmp(*argv, "-noout") == 0)
             noout = ++num;
-		else if (strcmp(*argv,"-context") == 0)
+        else if (strcmp(*argv, "-context") == 0) {
-		    {
+            if (--argc < 1)
-		    if(--argc < 1) goto bad;
+                goto bad;
             context = *++argv;
-		    }
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -152,8 +145,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         for (pp = sess_id_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
@@ -162,19 +154,18 @@ bad:
 
     ERR_load_crypto_strings();
     x = load_sess_id(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
+        goto end;
+    }
 
-	if(context)
+    if (context) {
-	    {
         x->sid_ctx_length = strlen(context);
-	    if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
+        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 :-) */
     {
@@ -196,17 +187,14 @@ bad:
     }
 #endif
 
-	if (!noout || text)
+    if (!noout || text) {
-		{
         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
             {
@@ -214,23 +202,18 @@ bad:
                 out = BIO_push(tmpbio, out);
             }
 #endif
-			}
+        } else {
-		else
+            if (BIO_write_filename(out, outfile) <= 0) {
-			{
-			if (BIO_write_filename(out,outfile) <= 0)
-				{
                 perror(outfile);
                 goto end;
             }
         }
     }
 
-	if (text)
+    if (text) {
-		{
         SSL_SESSION_print(out, x);
 
-		if (cert)
+        if (cert) {
-			{
             if (x->peer == NULL)
                 BIO_puts(out, "No certificate present\n");
             else
@@ -238,8 +221,7 @@ bad:
         }
     }
 
-	if (!noout && !cert)
+    if (!noout && !cert) {
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_SSL_SESSION_bio(out, x);
         else if (outformat == FORMAT_PEM)
@@ -252,9 +234,7 @@ bad:
             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);
         else if (outformat == FORMAT_PEM)
@@ -270,8 +250,10 @@ bad:
     }
     ret = 0;
  end:
-	if (out != NULL) BIO_free_all(out);
+    if (out != NULL)
-	if (x != NULL) SSL_SESSION_free(x);
+        BIO_free_all(out);
+    if (x != NULL)
+        SSL_SESSION_free(x);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -282,18 +264,15 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
     BIO *in = NULL;
 
     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);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
@@ -306,15 +285,14 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
         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");
         ERR_print_errors(bio_err);
         goto end;
     }
 
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
+        BIO_free(in);
     return (x);
 }
-

apps/smime.c

@@ -1,5 +1,6 @@
 /* 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.
  */
 /* ====================================================================
@@ -118,8 +119,7 @@ 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);
     }
@@ -127,8 +127,7 @@ int MAIN(int argc, char **argv)
     if (!load_config(bio_err, NULL))
         goto end;
 
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
         if (!strcmp(*args, "-encrypt"))
             operation = SMIME_ENCRYPT;
         else if (!strcmp(*args, "-decrypt"))
@@ -145,6 +144,10 @@ int MAIN(int argc, char **argv)
         else if (!strcmp(*args, "-des"))
             cipher = EVP_des_cbc();
 #endif
+#ifndef OPENSSL_NO_SEED
+        else if (!strcmp(*args, "-seed"))
+            cipher = EVP_seed_cbc();
+#endif
 #ifndef OPENSSL_NO_RC2
         else if (!strcmp(*args, "-rc2-40"))
             cipher = EVP_rc2_40_cbc();
@@ -160,6 +163,14 @@ int MAIN(int argc, char **argv)
             cipher = EVP_aes_192_cbc();
         else if (!strcmp(*args, "-aes256"))
             cipher = EVP_aes_256_cbc();
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+        else if (!strcmp(*args, "-camellia128"))
+            cipher = EVP_camellia_128_cbc();
+        else if (!strcmp(*args, "-camellia192"))
+            cipher = EVP_camellia_192_cbc();
+        else if (!strcmp(*args, "-camellia256"))
+            cipher = EVP_camellia_256_cbc();
 #endif
         else if (!strcmp(*args, "-text"))
             flags |= PKCS7_TEXT;
@@ -185,225 +196,148 @@ int MAIN(int argc, char **argv)
             flags |= PKCS7_NOOLDMIMETYPE;
         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
-			else badarg = 1;
+                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")) {
-		else if (!strcmp (*args, "-to"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 to = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-from")) {
-		else if (!strcmp (*args, "-from"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 from = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-subject")) {
-		else if (!strcmp (*args, "-subject"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 subject = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-signer")) {
-		else if (!strcmp (*args, "-signer"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 signerfile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-recip")) {
-		else if (!strcmp (*args, "-recip"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 recipfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-inkey")) {
-		else if (!strcmp (*args, "-inkey"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 keyfile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-		}
+        } else if (!strcmp(*args, "-keyform")) {
-		else if (!strcmp (*args, "-keyform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 keyform = str2fmt(*args);
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-certfile")) {
-		else if (!strcmp (*args, "-certfile"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 certfile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-CAfile")) {
-		else if (!strcmp (*args, "-CAfile"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 CAfile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-CApath")) {
-		else if (!strcmp (*args, "-CApath"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 CApath = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-in")) {
-		else if (!strcmp (*args, "-in"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 infile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-inform")) {
-		else if (!strcmp (*args, "-inform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 informat = str2fmt(*args);
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-outform")) {
-		else if (!strcmp (*args, "-outform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outformat = str2fmt(*args);
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-out")) {
-		else if (!strcmp (*args, "-out"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-content")) {
-		else if (!strcmp (*args, "-content"))
+            if (args[1]) {
-			{
-			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 (operation == SMIME_SIGN)
+        if (!signerfile) {
-		{
-		if (!signerfile)
-			{
             BIO_printf(bio_err, "No signer certificate specified\n");
             badarg = 1;
         }
         need_rand = 1;
-		}
+    } else if (operation == SMIME_DECRYPT) {
-	else if (operation == SMIME_DECRYPT)
+        if (!recipfile && !keyfile) {
-		{
+            BIO_printf(bio_err,
-		if (!recipfile)
+                       "No recipient certificate or key specified\n");
-			{
-			BIO_printf(bio_err, "No recipient certificate and key specified\n");
             badarg = 1;
         }
-		}
+    } else if (operation == SMIME_ENCRYPT) {
-	else if (operation == SMIME_ENCRYPT)
+        if (!*args) {
-		{
-		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, "-encrypt       encrypt message\n");
@@ -415,6 +349,9 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_err, "-des3          encrypt with triple 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");
+#endif
 #ifndef OPENSSL_NO_RC2
         BIO_printf(bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
         BIO_printf(bio_err, "-rc2-64        encrypt with RC2-64\n");
@@ -422,56 +359,79 @@ int MAIN(int argc, char **argv)
 #endif
 #ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, "-aes128, -aes192, -aes256\n");
-		BIO_printf (bio_err, "               encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "               encrypt PEM output with cbc aes\n");
 #endif
-		BIO_printf (bio_err, "-nointern      don't search certificates in message for signer\n");
+#ifndef OPENSSL_NO_CAMELLIA
-		BIO_printf (bio_err, "-nosigs        don't verify message signature\n");
+        BIO_printf(bio_err, "-camellia128, -camellia192, -camellia256\n");
-		BIO_printf (bio_err, "-noverify      don't verify signers certificate\n");
+        BIO_printf(bio_err,
-		BIO_printf (bio_err, "-nocerts       don't include signers certificate when signing\n");
+                   "               encrypt PEM output with cbc camellia\n");
+#endif
+        BIO_printf(bio_err,
+                   "-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,
+                   "-noverify      don't verify signers certificate\n");
+        BIO_printf(bio_err,
+                   "-nocerts       don't include signers certificate when signing\n");
         BIO_printf(bio_err, "-nodetach      use opaque signing\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");
+                   "-noattr        don't include any signed attributes\n");
+        BIO_printf(bio_err,
+                   "-binary        don't translate message to text\n");
         BIO_printf(bio_err, "-certfile file other certificates file\n");
         BIO_printf(bio_err, "-signer file   signer certificate file\n");
-		BIO_printf (bio_err, "-recip  file   recipient certificate file for decryption\n");
+        BIO_printf(bio_err,
+                   "-recip  file   recipient certificate file for decryption\n");
         BIO_printf(bio_err, "-in file       input file\n");
-		BIO_printf (bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
+        BIO_printf(bio_err,
-		BIO_printf (bio_err, "-inkey file    input private key (if not signer or recipient)\n");
+                   "-inform arg    input format SMIME (default), PEM or DER\n");
-		BIO_printf (bio_err, "-keyform arg   input private key format (PEM or ENGINE)\n");
+        BIO_printf(bio_err,
+                   "-inkey file    input private key (if not signer or recipient)\n");
+        BIO_printf(bio_err,
+                   "-keyform arg   input private key format (PEM or ENGINE)\n");
         BIO_printf(bio_err, "-out file      output file\n");
-		BIO_printf (bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
+        BIO_printf(bio_err,
-		BIO_printf (bio_err, "-content file  supply or override content for detached signature\n");
+                   "-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,
-		BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
+                   "-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,
-		BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
+                   "-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, "-engine e      use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-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,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,  "               load the file (or the files in the directory) into\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");
-		BIO_printf (bio_err, "cert.pem       recipient certificate(s) for encryption\n");
+        BIO_printf(bio_err,
+                   "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",
@@ -483,40 +443,35 @@ 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) {
-		if (!cipher)
+#ifndef OPENSSL_NO_DES
-			{
+            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")))
+                                   NULL, e, "recipient certificate file"))) {
-				{
 #if 0                           /* An appropriate message is already printed */
-				BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
+                BIO_printf(bio_err,
+                           "Can't read recipient certificate file %s\n",
+                           *args);
 #endif
                 goto end;
             }
@@ -526,24 +481,23 @@ 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")))
+                                 e, "signer certificate"))) {
-			{
+#if 0                           /* An appropri message has already been
-#if 0			/* An appropri message has already been printed */
+                                 * printed */
-			BIO_printf(bio_err, "Can't read signer certificate file %s\n", 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")))
+                                 e, "certificate file"))) {
-			{
+#if 0                           /* An appropriate message has already been
-#if 0			/* An appropriate message has already been printed */
+                                 * printed */
             BIO_printf(bio_err, "Can't read certificate file %s\n", certfile);
 #endif
             ERR_print_errors(bio_err);
@@ -551,62 +505,49 @@ 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")))
+                                e, "recipient certificate file"))) {
-			{
+#if 0                           /* An appropriate message has alrady been
-#if 0			/* An appropriate message has alrady been printed */
+                                 * printed */
-			BIO_printf(bio_err, "Can't read recipient certificate file %s\n", 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
-	else keyfile = NULL;
+        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))) {
-		if (!(in = BIO_new_file(infile, inmode)))
+            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);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, outmode))) {
-		if (!(out = BIO_new_file(outfile, outmode)))
+            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 {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -616,8 +557,7 @@ 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);
@@ -625,95 +565,71 @@ 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
+         * If detached data and SMIME output enable partial signing.
-		 * signing.
          */
         if ((flags & PKCS7_DETACHED) && (outformat == FORMAT_SMIME))
             flags |= PKCS7_STREAM;
         p7 = PKCS7_sign(signer, key, other, in, flags);
-		/* Don't need to rewind for partial signing */
+    } else {
-		if (!(flags & PKCS7_STREAM) && (BIO_reset(in) != 0))
-			{
-			BIO_printf(bio_err, "Can't rewind input file\n");
-			goto end;
-			}
-		}
-	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)
@@ -726,8 +642,7 @@ int MAIN(int argc, char **argv)
             PEM_write_bio_PKCS7(out, p7);
         else if (outformat == FORMAT_ASN1)
             i2d_PKCS7_bio(out, p7);
-		else
+        else {
-			{
             BIO_printf(bio_err, "Bad output format for PKCS#7 file\n");
             goto end;
         }
@@ -736,7 +651,8 @@ int MAIN(int argc, char **argv)
  end:
     if (need_rand)
         app_RAND_write_file(NULL, bio_err);
-	if (ret) ERR_print_errors(bio_err);
+    if (ret)
+        ERR_print_errors(bio_err);
     sk_X509_pop_free(encerts, X509_free);
     sk_X509_pop_free(other, X509_free);
     if (vpm)
@@ -750,7 +666,8 @@ end:
     BIO_free(in);
     BIO_free(indata);
     BIO_free_all(out);
-	if (passin) OPENSSL_free(passin);
+    if (passin)
+        OPENSSL_free(passin);
     return (ret);
 }
 
@@ -761,14 +678,14 @@ static int save_certs(char *signerfile, STACK_OF(X509) *signers)
     if (!signerfile)
         return 1;
     tmp = BIO_new_file(signerfile, "w");
-	if (!tmp) return 0;
+    if (!tmp)
+        return 0;
     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)

apps/spkac.c

@@ -1,8 +1,8 @@
 /* apps/spkac.c */
 
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/*
- * project 1999. Based on an original idea by Massimiliano Pala
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * (madwolf@openca.org).
+ * 1999. Based on an original idea by Massimiliano Pala (madwolf@openca.org).
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -73,7 +73,8 @@
 #undef PROG
 #define PROG    spkac_main
 
-/* -in arg	- input file - default stdin
+/*-
+ * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
  */
 
@@ -99,7 +100,8 @@ int MAIN(int argc, char **argv)
 
     apps_startup();
 
-	if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
@@ -107,47 +109,40 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-in") == 0) {
-		if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-key") == 0) {
-		else if (strcmp(*argv,"-key") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             keyfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-challenge") == 0) {
-		else if (strcmp(*argv,"-challenge") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             challenge = *(++argv);
-			}
+        } else if (strcmp(*argv, "-spkac") == 0) {
-		else if (strcmp(*argv,"-spkac") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             spkac = *(++argv);
-			}
+        } else if (strcmp(*argv, "-spksect") == 0) {
-		else if (strcmp(*argv,"-spksect") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			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)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 #endif
@@ -157,27 +152,30 @@ int MAIN(int argc, char **argv)
             pubkey = 1;
         else if (strcmp(*argv, "-verify") == 0)
             verify = 1;
-		else badops = 1;
+        else
+            badops = 1;
         argc--;
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options]\n", prog);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -in arg        input file\n");
         BIO_printf(bio_err, " -out arg       output file\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");
+                   " -key arg       create SPKAC using private key\n");
+        BIO_printf(bio_err,
+                   " -passin arg    input file pass phrase source\n");
         BIO_printf(bio_err, " -challenge arg challenge string\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, " -pubkey        output public key\n");
         BIO_printf(bio_err, " -verify        verify SPKAC signature\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e      use engine e, possibly a hardware device.\n");
 #endif
         goto end;
     }
@@ -187,7 +185,6 @@ bad:
         BIO_printf(bio_err, "Error getting password\n");
         goto end;
     }
-
 #ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 #endif
@@ -200,13 +197,15 @@ bad:
             goto end;
         }
         spki = NETSCAPE_SPKI_new();
-		if(challenge) ASN1_STRING_set(spki->spkac->challenge,
+        if (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) out = BIO_new_file(outfile, "w");
+        if (outfile)
+            out = BIO_new_file(outfile, "w");
         else {
             out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -228,10 +227,10 @@ bad:
         goto end;
     }
 
-	
+    if (infile)
-
+        in = BIO_new_file(infile, "r");
-	if (infile) in = BIO_new_file(infile, "r");
+    else
-	else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
     if (!in) {
         BIO_printf(bio_err, "Error opening input file\n");
@@ -264,7 +263,8 @@ bad:
         goto end;
     }
 
-	if (outfile) out = BIO_new_file(outfile, "w");
+    if (outfile)
+        out = BIO_new_file(outfile, "w");
     else {
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -281,18 +281,21 @@ bad:
         goto end;
     }
 
-	if(!noout) NETSCAPE_SPKI_print(out, spki);
+    if (!noout)
+        NETSCAPE_SPKI_print(out, spki);
     pkey = NETSCAPE_SPKI_get_pubkey(spki);
     if (verify) {
         i = NETSCAPE_SPKI_verify(spki, pkey);
-		if(i) BIO_printf(bio_err, "Signature OK\n");
+        if (i > 0)
+            BIO_printf(bio_err, "Signature OK\n");
         else {
             BIO_printf(bio_err, "Signature Failure\n");
             ERR_print_errors(bio_err);
             goto end;
         }
     }
-	if(pubkey) PEM_write_bio_PUBKEY(out, pkey);
+    if (pubkey)
+        PEM_write_bio_PUBKEY(out, pkey);
 
     ret = 0;
 
@@ -302,7 +305,8 @@ end:
     BIO_free(in);
     BIO_free_all(out);
     EVP_PKEY_free(pkey);
-	if(passin) OPENSSL_free(passin);
+    if (passin)
+        OPENSSL_free(passin);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/testdsa.h

@@ -7,6 +7,7 @@ static unsigned char dsa512_priv[] = {
     0x65, 0xe5, 0xc7, 0x38, 0x60, 0x24, 0xb5, 0x89, 0xd4, 0x9c, 0xeb, 0x4c,
     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,
     0xf2, 0x3b, 0xad, 0x6b, 0x01, 0xdc, 0xbe, 0xec, 0xde, 0x04, 0x7a, 0x3a,
@@ -15,6 +16,7 @@ static unsigned char dsa512_pub[] = {
     0x8c, 0x38, 0x5d, 0x83, 0x56, 0x7d, 0xee, 0x53, 0x05, 0x3e, 0x24, 0x84,
     0xbe, 0xba, 0x0a, 0x6b, 0xc8,
 };
+
 static unsigned char dsa512_p[] = {
     0x9D, 0x1B, 0x69, 0x8E, 0x26, 0xDB, 0xF2, 0x2B, 0x11, 0x70, 0x19, 0x86,
     0xF6, 0x19, 0xC8, 0xF8, 0x19, 0xF2, 0x18, 0x53, 0x94, 0x46, 0x06, 0xD0,
@@ -23,10 +25,12 @@ static unsigned char dsa512_p[]={
     0x96, 0xE4, 0x37, 0x33, 0xBB, 0x2D, 0x5A, 0xD7, 0x5A, 0x11, 0x40, 0x66,
     0xA2, 0x76, 0x7D, 0x31,
 };
+
 static unsigned char dsa512_q[] = {
     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,
@@ -40,14 +44,15 @@ DSA *get_dsa512()
 {
     DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
+        return (NULL);
     dsa->priv_key = BN_bin2bn(dsa512_priv, sizeof(dsa512_priv), NULL);
     dsa->pub_key = BN_bin2bn(dsa512_pub, sizeof(dsa512_pub), NULL);
     dsa->p = BN_bin2bn(dsa512_p, sizeof(dsa512_p), NULL);
     dsa->q = BN_bin2bn(dsa512_q, sizeof(dsa512_q), 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 (dsa);
 }
@@ -56,6 +61,7 @@ static unsigned char dsa1024_priv[]={
     0x7d, 0x21, 0xda, 0xbb, 0x62, 0x15, 0x47, 0x36, 0x07, 0x67, 0x12, 0xe8,
     0x8c, 0xaa, 0x1c, 0xcd, 0x38, 0x12, 0x61, 0x18,
 };
+
 static unsigned char dsa1024_pub[] = {
     0x3c, 0x4e, 0x9c, 0x2a, 0x7f, 0x16, 0xc1, 0x25, 0xeb, 0xac, 0x78, 0x63,
     0x90, 0x14, 0x8c, 0x8b, 0xf4, 0x68, 0x43, 0x3c, 0x2d, 0xee, 0x65, 0x50,
@@ -69,6 +75,7 @@ static unsigned char dsa1024_pub[]={
     0x2c, 0x0b, 0xc3, 0x13, 0x50, 0x61, 0xe5, 0xad, 0xbd, 0x36, 0xb8, 0x97,
     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,
     0x19, 0x30, 0x90, 0x9A, 0x09, 0x1D, 0xDA, 0x6A, 0x33, 0x1E, 0xC5, 0x3D,
@@ -82,10 +89,12 @@ static unsigned char dsa1024_p[]={
     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_g[] = {
     0x4D, 0xDF, 0x4C, 0x03, 0xA6, 0x91, 0x8A, 0xF5, 0x19, 0x6F, 0x50, 0x46,
     0x25, 0x99, 0xE5, 0x68, 0x6F, 0x30, 0xE3, 0x69, 0xE1, 0xE5, 0xB3, 0x5D,
@@ -104,14 +113,15 @@ DSA *get_dsa1024()
 {
     DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
+        return (NULL);
     dsa->priv_key = BN_bin2bn(dsa1024_priv, sizeof(dsa1024_priv), NULL);
     dsa->pub_key = BN_bin2bn(dsa1024_pub, sizeof(dsa1024_pub), NULL);
     dsa->p = BN_bin2bn(dsa1024_p, sizeof(dsa1024_p), NULL);
     dsa->q = BN_bin2bn(dsa1024_q, sizeof(dsa1024_q), 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 (dsa);
 }
@@ -120,6 +130,7 @@ static unsigned char dsa2048_priv[]={
     0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
     0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
 };
+
 static unsigned char dsa2048_pub[] = {
     0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
     0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
@@ -144,6 +155,7 @@ static unsigned char dsa2048_pub[]={
     0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
     0x8b, 0x33, 0xb7, 0xce,
 };
+
 static unsigned char dsa2048_p[] = {
     0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
     0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
@@ -168,10 +180,12 @@ static unsigned char dsa2048_p[]={
     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_g[] = {
     0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
     0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
@@ -201,17 +215,19 @@ DSA *get_dsa2048()
 {
     DSA *dsa;
 
-	if ((dsa=DSA_new()) == NULL) return(NULL);
+    if ((dsa = DSA_new()) == NULL)
+        return (NULL);
     dsa->priv_key = BN_bin2bn(dsa2048_priv, sizeof(dsa2048_priv), NULL);
     dsa->pub_key = BN_bin2bn(dsa2048_pub, sizeof(dsa2048_pub), NULL);
     dsa->p = BN_bin2bn(dsa2048_p, sizeof(dsa2048_p), NULL);
     dsa->q = BN_bin2bn(dsa2048_q, sizeof(dsa2048_q), 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 (dsa);
 }
 
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+static const char rnd_seed[] =
+    "string to make the random number generator think it has entropy";
 static int rnd_fake = 0;

apps/verify.c

@@ -70,7 +70,8 @@
 #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, STACK_OF(X509) *tchain, int purpose, ENGINE *e);
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
+                 STACK_OF(X509) *tchain, int purpose, ENGINE *e);
 static STACK_OF(X509) *load_untrusted(char *file);
 static int v_verbose = 0, vflags = 0;
 
@@ -92,7 +93,8 @@ int MAIN(int argc, char **argv)
 #endif
 
     cert_ctx = X509_STORE_new();
-	if (cert_ctx == NULL) goto end;
+    if (cert_ctx == NULL)
+        goto end;
     X509_STORE_set_verify_cb_func(cert_ctx, cb);
 
     ERR_load_crypto_strings();
@@ -108,41 +110,33 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	for (;;)
+    for (;;) {
-		{
+        if (argc >= 1) {
-		if (argc >= 1)
+            if (strcmp(*argv, "-CApath") == 0) {
-			{
+                if (argc-- < 1)
-			if (strcmp(*argv,"-CApath") == 0)
+                    goto end;
-				{
-				if (argc-- < 1) goto end;
                 CApath = *(++argv);
-				}
+            } else if (strcmp(*argv, "-CAfile") == 0) {
-			else if (strcmp(*argv,"-CAfile") == 0)
+                if (argc-- < 1)
-				{
+                    goto end;
-				if (argc-- < 1) goto end;
                 CAfile = *(++argv);
-				}
+            } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {
-			else if (args_verify(&argv, &argc, &badarg, bio_err,
-									&vpm))
-				{
                 if (badarg)
                     goto end;
                 continue;
-				}
+            } else if (strcmp(*argv, "-untrusted") == 0) {
-			else if (strcmp(*argv,"-untrusted") == 0)
+                if (argc-- < 1)
-				{
+                    goto end;
-				if (argc-- < 1) goto end;
                 untfile = *(++argv);
-				}
+            } else if (strcmp(*argv, "-trusted") == 0) {
-			else if (strcmp(*argv,"-trusted") == 0)
+                if (argc-- < 1)
-				{
+                    goto end;
-				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)
-				if (--argc < 1) goto end;
+                    goto end;
                 engine = *(++argv);
             }
 #endif
@@ -156,8 +150,7 @@ int MAIN(int argc, char **argv)
                 break;
             argc--;
             argv++;
-			}
+        } else
-		else
             break;
     }
 
@@ -169,7 +162,8 @@ int MAIN(int argc, char **argv)
         X509_STORE_set1_param(cert_ctx, vpm);
 
     lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
-	if (lookup == NULL) abort();
+    if (lookup == NULL)
+        abort();
     if (CAfile) {
         i = X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM);
         if (!i) {
@@ -177,10 +171,12 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
-	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+    } else
+        X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 
     lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
-	if (lookup == NULL) abort();
+    if (lookup == NULL)
+        abort();
     if (CApath) {
         i = X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM);
         if (!i) {
@@ -188,7 +184,8 @@ int MAIN(int argc, char **argv)
             ERR_print_errors(bio_err);
             goto end;
         }
-	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+    } else
+        X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
 
     ERR_clear_error();
 
@@ -202,20 +199,23 @@ int MAIN(int argc, char **argv)
 
     if (trustfile) {
         if (!(trusted = load_untrusted(trustfile))) {
-			BIO_printf(bio_err, "Error loading untrusted file %s\n", trustfile);
+            BIO_printf(bio_err, "Error loading untrusted file %s\n",
+                       trustfile);
             ERR_print_errors(bio_err);
             goto end;
         }
     }
 
-	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose, e);
+    if (argc < 1)
+        check(cert_ctx, NULL, untrusted, trusted, purpose, e);
     else
         for (i = 0; i < argc; i++)
             check(cert_ctx, argv[i], untrusted, trusted, purpose, e);
     ret = 0;
  end:
     if (ret == 1) {
-		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+        BIO_printf(bio_err,
+                   "usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
 #ifndef OPENSSL_NO_ENGINE
         BIO_printf(bio_err, " [-engine e]");
 #endif
@@ -224,19 +224,23 @@ end:
         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", X509_PURPOSE_get0_sname(ptmp),
+            BIO_printf(bio_err, "\t%-10s\t%s\n",
+                       X509_PURPOSE_get0_sname(ptmp),
                        X509_PURPOSE_get0_name(ptmp));
         }
     }
-	if (vpm) X509_VERIFY_PARAM_free(vpm);
+    if (vpm)
-	if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
+        X509_VERIFY_PARAM_free(vpm);
+    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, STACK_OF(X509) *tchain, int purpose, ENGINE *e)
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
+                 STACK_OF(X509) *tchain, int purpose, ENGINE *e)
 {
     X509 *x = NULL;
     int i = 0, ret = 0;
@@ -248,32 +252,31 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X
     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) X509_STORE_CTX_trusted_stack(csc, tchain);
+    if (tchain)
-	if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
+        X509_STORE_CTX_trusted_stack(csc, tchain);
+    if (purpose >= 0)
+        X509_STORE_CTX_set_purpose(csc, purpose);
     i = X509_verify_cert(csc);
     X509_STORE_CTX_free(csc);
 
     ret = 0;
  end:
-	if (i)
+    if (i > 0) {
-		{
         fprintf(stdout, "OK\n");
         ret = 1;
-		}
+    } else
-	else
         ERR_print_errors(bio_err);
-	if (x != NULL) X509_free(x);
+    if (x != NULL)
+        X509_free(x);
 
     return (ret);
 }
@@ -302,11 +305,9 @@ static STACK_OF(X509) *load_untrusted(char *certfile)
     }
 
     /* 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)
+        if (xi->x509 != NULL) {
-			{
             sk_X509_push(stack, xi->x509);
             xi->x509 = NULL;
         }
@@ -328,33 +329,39 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
 {
     char buf[256];
 
-	if (!ok)
+    if (!ok) {
-		{
+        if (ctx->current_cert) {
-		if (ctx->current_cert)
+            X509_NAME_oneline(X509_get_subject_name(ctx->current_cert), buf,
-			{
-			X509_NAME_oneline(
-				X509_get_subject_name(ctx->current_cert),buf,
                               sizeof buf);
             printf("%s\n", buf);
         }
         printf("error %d at %d depth lookup:%s\n", ctx->error,
-			ctx->error_depth,
+               ctx->error_depth, X509_verify_cert_error_string(ctx->error));
-			X509_verify_cert_error_string(ctx->error));
+        if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED)
-		if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED) ok=1;
+            ok = 1;
-		/* since we are just checking the certificates, it is
+        /*
-		 * ok if they are self signed. But we should still warn
+         * since we are just checking the certificates, it is ok if they are
-		 * the user.
+         * self signed. But we should still warn the user.
          */
-		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
+        if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
+            ok = 1;
         /* Continue after extension errors too */
-		if (ctx->error == X509_V_ERR_INVALID_CA) ok=1;
+        if (ctx->error == X509_V_ERR_INVALID_CA)
-		if (ctx->error == X509_V_ERR_INVALID_NON_CA) ok=1;
+            ok = 1;
-		if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED) ok=1;
+        if (ctx->error == X509_V_ERR_INVALID_NON_CA)
-		if (ctx->error == X509_V_ERR_INVALID_PURPOSE) ok=1;
+            ok = 1;
-		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
+        if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED)
-		if (ctx->error == X509_V_ERR_CRL_HAS_EXPIRED) ok=1;
+            ok = 1;
-		if (ctx->error == X509_V_ERR_CRL_NOT_YET_VALID) ok=1;
+        if (ctx->error == X509_V_ERR_INVALID_PURPOSE)
-		if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION) ok=1;
+            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);
@@ -367,4 +374,3 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
         ERR_clear_error();
     return (ok);
 }
-

apps/version.c

@@ -148,9 +148,9 @@ int MAIN(int argc, char **argv)
         if ((bio_err = BIO_new(BIO_s_file())) != NULL)
             BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (argc == 1) version=1;
+    if (argc == 1)
-	for (i=1; i<argc; i++)
+        version = 1;
-		{
+    for (i = 1; i < argc; i++) {
         if (strcmp(argv[i], "-v") == 0)
             version = 1;
         else if (strcmp(argv[i], "-b") == 0)
@@ -165,31 +165,26 @@ int MAIN(int argc, char **argv)
             dir = 1;
         else if (strcmp(argv[i], "-a") == 0)
             date = version = cflags = options = platform = dir = 1;
-		else
+        else {
-			{
+            BIO_printf(bio_err, "usage:version -[avbofpd]\n");
-			BIO_printf(bio_err,"usage:version -[avbofp]\n");
             ret = 1;
             goto end;
         }
     }
 
-	if (version)
+    if (version) {
-		{
+        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-		if (SSLeay() == SSLEAY_VERSION_NUMBER)
-			{
             printf("%s\n", SSLeay_version(SSLEAY_VERSION));
-			}
+        } else {
-		else
-			{
             printf("%s (Library: %s)\n",
-				OPENSSL_VERSION_TEXT,
+                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
-				SSLeay_version(SSLEAY_VERSION));
         }
     }
-	if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
+    if (date)
-	if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
+        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-	if (options) 
+    if (platform)
-		{
+        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
+    if (options) {
         printf("options:  ");
         printf("%s ", BN_options());
 #ifndef OPENSSL_NO_MD2
@@ -209,8 +204,10 @@ int MAIN(int argc, char **argv)
 #endif
         printf("\n");
     }
-	if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
+    if (cflags)
-	if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
+        printf("%s\n", SSLeay_version(SSLEAY_CFLAGS));
+    if (dir)
+        printf("%s\n", SSLeay_version(SSLEAY_DIR));
  end:
     apps_shutdown();
     OPENSSL_EXIT(ret);

apps/winrand.c

@@ -53,7 +53,8 @@
  *
  */
 
-/* Usage: winrand [filename]
+/*-
+ * Usage: winrand [filename]
  *
  * Collects entropy from mouse movements and other events and writes
  * random data to filename or .rnd
@@ -98,14 +99,13 @@ 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, NULL);
+                        CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance,
+                        NULL);
 
     ShowWindow(hwnd, iCmdShow);
     UpdateWindow(hwnd);
 
-
+    while (GetMessage(&msg, NULL, 0, 0)) {
-	while (GetMessage(&msg, NULL, 0, 0))
-		{
         TranslateMessage(&msg);
         DispatchMessage(&msg);
     }
@@ -120,8 +120,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
     RECT rect;
     static int seeded = 0;
 
-	switch (iMsg)
+    switch (iMsg) {
-		{
     case WM_PAINT:
         hdc = BeginPaint(hwnd, &ps);
         GetClientRect(hwnd, &rect);
@@ -135,8 +134,7 @@ 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!",

bugs/alpha.c

@@ -56,11 +56,13 @@
  * [including the GNU Public Licence.]
  */
 
-/* while not exactly a bug (ASN1 C leaves this undefined) it is
+/*
- * something to watch out for.  This was fine on linux/NT/Solaris but not
+ * while not exactly a bug (ASN1 C leaves this undefined) it is something to
- * Alpha */
+ * watch out for.  This was fine on linux/NT/Solaris but not 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.
  */
@@ -84,8 +86,7 @@ main()
 
     p = data;
 
-        for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-                {
         func(p, *(p++));
     }
 }

bugs/dggccbug.c

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

bugs/sgiccbug.c

@@ -4,22 +4,26 @@
 
 #include <stdio.h>
 
-/* This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are
+/*
- * the only versions of IRIX I have access to.
+ * This compiler bug it present on IRIX 5.3, 5.1 and 4.0.5 (these are the
- * defining FIXBUG removes the bug.
+ * only versions of IRIX I have access to. defining FIXBUG removes the bug.
- * (bug is still present in IRIX 6.3 according to
+ * (bug is still present in IRIX 6.3 according to Gage
- * Gage <agage@forgetmenot.Mines.EDU>
+ * <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]={0x01234567,0x89ABCDEF,0xFEDCBA98,0x76543210};
+static unsigned long a[4] =
-static unsigned long b[4]={0x89ABCDEF,0xFEDCBA98,0x76543210,0x01234567};
+    { 0x01234567, 0x89ABCDEF, 0xFEDCBA98, 0x76543210 };
-static unsigned long c[4]={0x77777778,0x8ACF1357,0x88888888,0x7530ECA9};
+static unsigned long b[4] =
+    { 0x89ABCDEF, 0xFEDCBA98, 0x76543210, 0x01234567 };
+static unsigned long c[4] =
+    { 0x77777778, 0x8ACF1357, 0x88888888, 0x7530ECA9 };
 
 main()
 {
@@ -44,8 +48,7 @@ unsigned long *r,*a,*b;
     bp = b;
     rp = r;
     carry = 0;
-	for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-		{
         t1 = *(ap++);
         t2 = *(bp++);
         t1 = (t1 - t2);

bugs/stream.c

@@ -64,8 +64,9 @@
 # include <openssl/des.h>
 #endif
 
-/* show how stream ciphers are not very good.  The mac has no affect
+/*
- * on RC4 while it does for cfb DES
+ * show how stream ciphers are not very good.  The mac has no affect on RC4
+ * while it does for cfb DES
  */
 
 main()

bugs/ultrixcc.c

@@ -1,6 +1,7 @@
 #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;
@@ -20,8 +21,7 @@ main()
 int f(a)
 int a;
 {
-	switch(a&7)
+    switch (a & 7) {
-		{
     case 7:
         printf("7\n");
     case 6:
@@ -42,4 +42,3 @@ int a;
 #endif
     }
 }
-

certs/README.RootCerts

@@ -0,0 +1,4 @@
+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

@@ -1,19 +0,0 @@
-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-----

certs/RegTP-6R.pem

@@ -1,19 +0,0 @@
-issuer= CN=6R-Ca 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
-notBefore=Feb  1 09:52:17 2001 GMT
-notAfter=Jun  1 09:52:17 2005 GMT
-subject= CN=6R-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-----
-MIICaDCCAdSgAwIBAgIDMtGNMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w
-OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0
-aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNhIDE6UE4w
-IhgPMjAwMTAyMDEwOTUyMTdaGA8yMDA1MDYwMTA5NTIxN1owbzELMAkGA1UEBhMC
-REUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11
-bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNlItQ2Eg
-MTpQTjCBoTANBgkqhkiG9w0BAQEFAAOBjwAwgYsCgYEAg6KrFSTNXKqe+2GKGeW2
-wTmbVeflNkp5H/YxA9K1zmEn5XjKm0S0jH4Wfms6ipPlURVaFwTfnB1s++AnJAWf
-mayaE9BP/pdIY6WtZGgW6aZc32VDMCMKPWyBNyagsJVDmzlakIA5cXBVa7Xqqd3P
-ew8i2feMnQXcqHfDv02CW88CBQDAAAABoxIwEDAOBgNVHQ8BAf8EBAMCAQYwCgYG
-KyQDAwECBQADgYEAOkqkUwdaTCt8wcJLA2zLuOwL5ADHMWLhv6gr5zEF+VckA6qe
-IVLVf8e7fYlRmzQd+5OJcGglCQJLGT+ZplI3Mjnrd4plkoTNKV4iOzBcvJD7K4tn
-XPvs9wCFcC7QU7PLvc1FDsAlr7e4wyefZRDL+wbqNfI7QZTSF1ubLd9AzeQ=
------END CERTIFICATE-----