Prepare for 0.9.8zg release

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

ACKNOWLEDGMENTS

@@ -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

@@ -10,6 +10,7 @@ OpenSSL  -  Frequently Asked Questions
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
+* How does the versioning scheme work?
 
 [LEGAL] Legal questions
 
@@ -31,6 +32,9 @@ OpenSSL  -  Frequently Asked Questions
 * 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?
+* What is a "128 bit certificate"? Can I create one with OpenSSL?
+* Why does OpenSSL set the authority key identifier extension incorrectly?
+* How can I set up a bundle of commercial root CA certificates?
 
 [BUILD] Questions about building and testing OpenSSL
 
@@ -47,6 +51,11 @@ OpenSSL  -  Frequently Asked Questions
 * 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?
+* Why does compiler fail to compile sha512.c?
+* Test suite still fails, what to do?
+* I think I've found a bug, what should I do?
+* I'm SURE I've found a bug, how do I report it?
+* I've found a security issue, how do I report it?
 
 [PROG] Questions about programming with OpenSSL
 
@@ -63,6 +72,9 @@ OpenSSL  -  Frequently Asked Questions
 * Why doesn't my server application receive a client certificate?
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 * I think I've detected a memory leak, is this a bug?
+* Why does Valgrind complain about the use of uninitialized data?
+* Why doesn't a memory BIO work when a file does?
+* Where are the declarations and implementations of d2i_X509() etc?
 
 ===============================================================================
 
@@ -71,11 +83,11 @@ OpenSSL  -  Frequently Asked Questions
 * 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.
+OpenSSL 1.0.1d was released on Feb 5th, 2013.
 
 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.
+ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access.
 
 
 * Where is the documentation?
@@ -87,19 +99,19 @@ explains how to install this library.
 
 OpenSSL includes a command line utility that can be used to perform a
 variety of cryptographic functions.  It is described in the openssl(1)
-manpage.  Documentation for developers is currently being written.  A
+manpage.  Documentation for developers is currently being written. Many
-few manual pages already are available; overviews over libcrypto and
+manual pages 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/>.
+<URL: http://www.openssl.org/docs/>. Note that the online documents refer
-
+to the very latest development versions of OpenSSL and may include features
-For information on parts of libcrypto that are not yet documented, you
+not present in released versions. If in doubt refer to the documentation
-might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
+that came with the version of OpenSSL you are using. The pod format
-predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
+documentation is included in each OpenSSL distribution under the docs
-of this still applies to OpenSSL.
+directory.
 
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
@@ -120,7 +132,7 @@ OpenSSL.  Information on the OpenSSL mailing lists is available from
 * Where can I get a compiled version of OpenSSL?
 
 You can finder pointers to binary distributions in
-http://www.openssl.org/related/binaries.html .
+<URL: 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
@@ -142,8 +154,8 @@ less Unix-centric, it might have been used much earlier.
 
 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
+version 0.9.7 the changes were merged into the main development line,
-development line, so that the special release is no longer necessary.
+so that the special release is no longer necessary.
 
 * How do I check the authenticity of the OpenSSL distribution?
 
@@ -159,6 +171,19 @@ just do:
 
    pgp TARBALL.asc
 
+* How does the versioning scheme work?
+
+After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter 
+releases (e.g. 1.0.1a) can only contain bug and security fixes and no
+new features. Minor releases change the last number (e.g. 1.0.2) and 
+can contain new features that retain binary compatibility. Changes to
+the middle number are considered major releases and neither source nor
+binary compatibility is guaranteed.
+
+Therefore the answer to the common question "when will feature X be
+backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear
+in the next minor release.
+
 [LEGAL] =======================================================================
 
 * Do I need patent licenses to use OpenSSL?
@@ -270,7 +295,7 @@ current directory in this case, but this has changed with 0.9.6a.)
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
-extensions documentation (currently in doc/openssl.txt).
+extensions documentation (in ca(1), req(1), x509v3_config(5) )
 
 
 * Why can't I create certificate requests?
@@ -385,6 +410,76 @@ 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.
 
+* What is a "128 bit certificate"? Can I create one with OpenSSL?
+
+The term "128 bit certificate" is a highly misleading marketing term. It does
+*not* refer to the size of the public key in the certificate! A certificate
+containing a 128 bit RSA key would have negligible security.
+
+There were various other names such as "magic certificates", "SGC
+certificates", "step up certificates" etc.
+
+You can't generally create such a certificate using OpenSSL but there is no
+need to any more. Nowadays web browsers using unrestricted strong encryption
+are generally available.
+
+When there were tight restrictions on the export of strong encryption
+software from the US only weak encryption algorithms could be freely exported
+(initially 40 bit and then 56 bit). It was widely recognised that this was
+inadequate. A relaxation of the rules allowed the use of strong encryption but
+only to an authorised server.
+
+Two slighly different techniques were developed to support this, one used by
+Netscape was called "step up", the other used by MSIE was called "Server Gated
+Cryptography" (SGC). When a browser initially connected to a server it would
+check to see if the certificate contained certain extensions and was issued by
+an authorised authority. If these test succeeded it would reconnect using
+strong encryption.
+
+Only certain (initially one) certificate authorities could issue the
+certificates and they generally cost more than ordinary certificates.
+
+Although OpenSSL can create certificates containing the appropriate extensions
+the certificate would not come from a permitted authority and so would not
+be recognized.
+
+The export laws were later changed to allow almost unrestricted use of strong
+encryption so these certificates are now obsolete.
+
+
+* Why does OpenSSL set the authority key identifier (AKID) extension incorrectly?
+
+It doesn't: this extension is often the cause of confusion.
+
+Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose
+certificate C contains AKID.
+
+The purpose of this extension is to identify the authority certificate B. This
+can be done either by including the subject key identifier of B or its issuer
+name and serial number.
+
+In this latter case because it is identifying certifcate B it must contain the
+issuer name and serial number of B.
+
+It is often wrongly assumed that it should contain the subject name of B. If it
+did this would be redundant information because it would duplicate the issuer
+name of C.
+
+
+* How can I set up a bundle of commercial root CA certificates?
+
+The OpenSSL software is shipped without any root CA certificate as the
+OpenSSL project does not have any policy on including or excluding
+any specific CA and does not intend to set up such a policy. Deciding
+about which CAs to support is up to application developers or
+administrators.
+
+Other projects do have other policies so you can for example extract the CA
+bundle used by Mozilla and/or modssl as described in this article:
+
+  <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html>
+
+
 [BUILD] =======================================================================
 
 * Why does the linker complain about undefined symbols?
@@ -424,7 +519,7 @@ when you run the test suite (using "make test").  The message returned is
 "bc: 1 not implemented".
 
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
+and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
 for download instructions) can be safely used, for example.
 
 
@@ -435,7 +530,7 @@ that the OpenSSL bntest throws at it.  This gets triggered when you run the
 test suite (using "make test").  The message returned is "bc: stack empty".
 
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
+and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
 for download instructions) can be safely used, for example.
 
 
@@ -607,6 +702,70 @@ 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.
 
+* Why does compiler fail to compile sha512.c?
+
+OpenSSL SHA-512 implementation depends on compiler support for 64-bit
+integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
+couple] lack support for this and therefore are incapable of compiling
+the module in question. The recommendation is to disable SHA-512 by
+adding no-sha512 to ./config [or ./Configure] command line. Another
+possible alternative might be to switch to GCC.
+
+* Test suite still fails, what to do?
+
+Another common reason for failure to complete some particular test is
+simply bad code generated by a buggy component in toolchain or deficiency
+in run-time environment. There are few cases documented in PROBLEMS file,
+consult it for possible workaround before you beat the drum. Even if you
+don't find solution or even mention there, do reserve for possibility of
+a compiler bug. Compiler bugs might appear in rather bizarre ways, they
+never make sense, and tend to emerge when you least expect them. In order
+to identify one, drop optimization level, e.g. by editing CFLAG line in
+top-level Makefile, recompile and re-run the test.
+
+* I think I've found a bug, what should I do?
+
+If you are a new user then it is quite likely you haven't found a bug and
+something is happening you aren't familiar with. Check this FAQ, the associated
+documentation and the mailing lists for similar queries. If you are still
+unsure whether it is a bug or not submit a query to the openssl-users mailing
+list.
+
+
+* I'm SURE I've found a bug, how do I report it?
+
+Bug reports with no security implications should be sent to the request
+tracker. This can be done by mailing the report to <rt@openssl.org> (or its
+alias <openssl-bugs@openssl.org>), please note that messages sent to the
+request tracker also appear in the public openssl-dev mailing list.
+
+The report should be in plain text. Any patches should be sent as
+plain text attachments because some mailers corrupt patches sent inline.
+If your issue affects multiple versions of OpenSSL check any patches apply
+cleanly and, if possible include patches to each affected version.
+
+The report should be given a meaningful subject line briefly summarising the
+issue. Just "bug in OpenSSL" or "bug in OpenSSL 0.9.8n" is not very helpful.
+
+By sending reports to the request tracker the bug can then be given a priority
+and assigned to the appropriate maintainer. The history of discussions can be
+accessed and if the issue has been addressed or a reason why not. If patches
+are only sent to openssl-dev they can be mislaid if a team member has to
+wade through months of old messages to review the discussion.
+
+See also <URL: http://www.openssl.org/support/rt.html>
+
+
+* I've found a security issue, how do I report it?
+
+If you think your bug has security implications then please send it to
+openssl-security@openssl.org if you don't get a prompt reply at least 
+acknowledging receipt then resend or mail it directly to one of the
+more active team members (e.g. Steve).
+
+Note that bugs only present in the openssl utility are not in general
+considered to be security issues. 
+
 [PROG] ========================================================================
 
 * Is OpenSSL thread-safe?
@@ -618,8 +777,11 @@ 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.
+OpenSSL by calling CRYPTO_set_locking_callback() and
-
+CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
+including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
+and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
+and friends. This is described in the threads(3) manpage.
 
 * I've compiled a program under Windows and it crashes: why?
 
@@ -639,10 +801,10 @@ 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.
+ 1. Select Settings... from the Project Menu.
-2.  Select the C/C++ Tab.
+ 2. Select the C/C++ Tab.
-3.  Select "Code Generation from the "Category" drop down list box
+ 3. Select "Code Generation from the "Category" drop down list box
-4.  Select the Appropriate library (see table below) from the "Use
+ 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)
@@ -662,16 +824,19 @@ 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
+.DLLs compiled with some specific run-time option [we insist on 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
+your application project or simply #include-d in one [and only one]
-files. Failure to do either manifests itself as fatal "no
+of your application source files. Failure to link this shim module
-OPENSSL_Applink" error.
+into your application manifests itself as fatal "no OPENSSL_Applink"
+run-time error. An explicit reminder is due that in this situation
+[mixing compiler options] it is as important to add CRYPTO_malloc_init
+prior first call to OpenSSL.
 
 * How do I read or write a DER encoded buffer using the ASN1 functions?
 
@@ -757,11 +922,11 @@ 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
+The cause is forgetting to load OpenSSL's table of algorithms with
-encrypted private key or attempting to decrypt a PKCS#12 file. The cause
+OpenSSL_add_all_algorithms(). See the manual page for more information. This
-is forgetting to load OpenSSL's table of algorithms with
+can cause several problems such as being unable to read in an encrypted
-OpenSSL_add_all_algorithms(). See the manual page for more information.
+PEM file, unable to decrypt a PKCS#12 file or signature failure when
-
+verifying certificates.
 
 * Why can't the OpenSSH configure script detect OpenSSL?
 
@@ -829,5 +994,46 @@ thread-safe):
   ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
 
 
-===============================================================================
+* Why does Valgrind complain about the use of uninitialized data?
 
+When OpenSSL's PRNG routines are called to generate random numbers the supplied
+buffer contents are mixed into the entropy pool: so it technically does not
+matter whether the buffer is initialized at this point or not.  Valgrind (and
+other test tools) will complain about this. When using Valgrind, make sure the
+OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY)
+to get rid of these warnings.
+
+
+* Why doesn't a memory BIO work when a file does?
+
+This can occur in several cases for example reading an S/MIME email message.
+The reason is that a memory BIO can do one of two things when all the data
+has been read from it.
+
+The default behaviour is to indicate that no more data is available and that
+the call should be retried, this is to allow the application to fill up the BIO
+again if necessary.
+
+Alternatively it can indicate that no more data is available and that EOF has
+been reached.
+
+If a memory BIO is to behave in the same way as a file this second behaviour
+is needed. This must be done by calling:
+
+   BIO_set_mem_eof_return(bio, 0);
+
+See the manual pages for more details.
+
+
+* Where are the declarations and implementations of d2i_X509() etc?
+
+These are defined and implemented by macros of the form:
+
+
+ DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509)
+
+The implementation passes an ASN1 "template" defining the structure into an
+ASN1 interpreter using generalised functions such as ASN1_item_d2i().
+
+
+===============================================================================

INSTALL

@@ -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 (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)
 
-* Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare - required:
+   gcc / nlmconv Cross-Compiler, available from Novell Forge (free):
-   Provides command line tools used for building.
+         http://forge.novell.com/modules/xfmod/project/?aunixnw
-
-   Tools:
-   mwccnlm.exe  - C/C++ Compiler for NetWare
-   mwldnlm.exe  - Linker for NetWare
-   mwasmnlm.exe - x86 assembler for NetWare (if using assembly option)
-
 
 * 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 {
-
+    kMacSocket_TimeoutErr = -2
-enum
-{
-	kMacSocket_TimeoutErr = -2
 };
 
+// Since MacSocket does busy waiting, I do a callback while waiting
 
-//	Since MacSocket does busy waiting, I do a callback while waiting
+typedef OSErr(*MacSocket_IdleWaitCallback) (void *);
 
-typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
+// Call this before anything else!
-
-
-//	Call this before anything else!
 
 OSErr MacSocket_Startup(void);
 
-
+// Call this to cleanup before quitting
-//	Call this to cleanup before quitting
 
 OSErr MacSocket_Shutdown(void);
 
+// Call this to allocate a "socket" (reference number is returned in
+// outSocketNum)
+// 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 inUserRefPtr parameter is passed back to the idle-wait callback
 
-//	Call this to allocate a "socket" (reference number is returned in outSocketNum)
+OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
-//	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
+                       const long inTimeoutTicks,
-//	The inTimeoutTicks parameter is applied during reads/writes of data
+                       MacSocket_IdleWaitCallback inIdleWaitCallback,
-//	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
+                       void *inUserRefPtr);
-//	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);
+// Call this to connect to an IP/DNS address
+// 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 connect to an IP/DNS address
+// Call this to listen on a port
-//	Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
+// Since this a low-performance implementation, I allow a maximum of 1 (one!)
+// incoming request when I listen
 
-OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
+OSErr MacSocket_listen(const int inSocketNum, const int inPortNum);
 
-
+// Call this to close a socket
-//	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
-
-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
 
-//	Call this to receive data on a socket
+int MacSocket_recv(const int inSocketNum, void *outBuff, int outBuffLength,
-//	Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
+                   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);
 
-//	Call this to send data on a socket
+// If zero bytes were read in a call to MacSocket_recv(), it may be that the
-
+// remote end has done a half-close
-int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
+// This function will let you check whether that's true or not
-
-
-//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
-//	This function will let you check whether that's true or not
 
 Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
 
-
+// Call this to see if the listen has completed after a call to
-//	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
-//	These really aren't very useful anymore
 
 Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
 Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
 
+// You may wish to change the userRefPtr for a socket callback-- use this to
+// do it
 
-//	You may wish to change the userRefPtr for a socket callback-- use this to do it
+void MacSocket_SetUserRefPtr(const int inSocketNum, void *inNewRefPtr);
 
-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_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
+                                  const int inIPAndPortLength);
 
-//	Call these to get the socket's IP:port descriptor
+// Call this to get error info from a socket
 
-void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
+void MacSocket_GetSocketErrorInfo(const int inSocketNum,
-void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
+                                  int *outSocketErrCode,
-
+                                  char *outSocketErrString,
-
+                                  const int inSocketErrStringMaxLength);
-//	Call this to get error info from a socket
-
-void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
 
 
 #ifdef __cplusplus

MacOS/Randomizer.h

@@ -1,43 +1,42 @@
 
-//	Gathers unpredictable system data to be used for generating
+// Gathers unpredictable system data to be used for generating
-//	random bits
+// random bits
 
 #include <MacTypes.h>
 
-class CRandomizer
+class CRandomizer {
-{
+ public:
-public:
+    CRandomizer(void);
-	CRandomizer (void);
+    void PeriodicAction(void);
-	void PeriodicAction (void);
-	
-private:
 
-	// Private calls
+ private:
 
-	void		AddTimeSinceMachineStartup (void);
+    // Private calls
-	void		AddAbsoluteSystemStartupTime (void);
-	void		AddAppRunningTime (void);
-	void		AddStartupVolumeInfo (void);
-	void		AddFiller (void);
 
-	void		AddCurrentMouse (void);
+    void AddTimeSinceMachineStartup(void);
-	void		AddNow (double millisecondUncertainty);
+    void AddAbsoluteSystemStartupTime(void);
-	void		AddBytes (void *data, long size, double entropy);
+    void AddAppRunningTime(void);
-	
+    void AddStartupVolumeInfo(void);
-	void		GetTimeBaseResolution (void);
+    void AddFiller(void);
-	unsigned long	SysTimer (void);
 
-	// System Info	
+    void AddCurrentMouse(void);
-	bool		mSupportsLargeVolumes;
+    void AddNow(double millisecondUncertainty);
-	bool		mIsPowerPC;
+    void AddBytes(void *data, long size, double entropy);
-	bool		mIs601;
+
-	
+    void GetTimeBaseResolution(void);
-	// Time info
+    unsigned long SysTimer(void);
-	double		mTimebaseTicksPerMillisec;
+
-	unsigned long	mLastPeriodicTicks;
+    // System Info
-	
+    bool mSupportsLargeVolumes;
-	// Mouse info
+    bool mIsPowerPC;
-	long		mSamplePeriod;
+    bool mIs601;
-	Point		mLastMouse;
+
-	long		mMouseStill;
+    // Time info
+    double mTimebaseTicksPerMillisec;
+    unsigned long mLastPeriodicTicks;
+
+    // Mouse info
+    long mSamplePeriod;
+    Point mLastMouse;
+    long mMouseStill;
 };

MacOS/_MWERKS_GUSI_prefix.h

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

MacOS/_MWERKS_prefix.h

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

MacOS/buildinf.h

@@ -1,5 +1,5 @@
 #ifndef MK1MF_BUILD
-#  define CFLAGS	"-DB_ENDIAN"
+# define CFLAGS        "-DB_ENDIAN"
-#  define PLATFORM	"macos"
+# define PLATFORM      "macos"
-#  define DATE		"Sun Feb 27 19:44:16 MET 2000"
+# define DATE          "Sun Feb 27 19:44:16 MET 2000"
 #endif

MacOS/opensslconf.h

@@ -1,116 +1,126 @@
 /* MacOS/opensslconf.h */
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define OPENSSLDIR "/usr/local/ssl"
+#  define OPENSSLDIR "/usr/local/ssl"
-#endif
+# endif
 #endif
 
 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
+# define IDEA_INT unsigned int
 #endif
 
 #if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
+# define MD2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC2_H) && !defined(RC2_INT)
 /* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
+# define RC2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
+# if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
 /*
+ * using int types make the structure larger but make the code faster on most
+ * boxes I have tested - up to %20 faster.
+ */
+/*-
  * I don't know what does "most" mean, but declaring "int" is a must on:
  * - Intel P6 because partial register stalls are very expensive;
  * - elder Alpha because it lacks byte load/store instructions;
  */
-#define RC4_INT unsigned char
+#  define RC4_INT unsigned char
-#endif
+# endif
-#if !defined(RC4_CHUNK)
+# if !defined(RC4_CHUNK)
 /*
  * This enables code handling data aligned at natural CPU word
  * boundary. See crypto/rc4/rc4_enc.c for further details.
  */
-#define RC4_CHUNK unsigned long
+#  define RC4_CHUNK unsigned long
-#endif
+# endif
 #endif
 
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+/*
- * %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
-#ifndef DES_LONG
+ * speed up (longs are 8 bytes, int's are 4).
-#define DES_LONG unsigned long
+ */
-#endif
+# ifndef DES_LONG
+#  define DES_LONG unsigned long
+# endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
+# define CONFIG_HEADER_BN_H
-#if __option(longlong)
+# if __option(longlong)
 #  define BN_LLONG
-#else
+# else
 #  undef BN_LLONG
-#endif
+# endif
 
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
+/*
- * 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
+# undef SIXTY_FOUR_BIT_LONG
-#define THIRTY_TWO_BIT
+# undef SIXTY_FOUR_BIT
-#undef SIXTEEN_BIT
+# define THIRTY_TWO_BIT
-#undef EIGHT_BIT
+# undef SIXTEEN_BIT
+# undef EIGHT_BIT
 #endif
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
+# define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
+/*
- * speedup on x86 */
+ * if this is defined data[i] is used instead of *data, this is a %20 speedup
-#undef RC4_INDEX
+ * on x86
+ */
+# undef RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
+# define CONFIG_HEADER_BF_LOCL_H
-#define BF_PTR
+# define BF_PTR
-#endif /* HEADER_BF_LOCL_H */
+#endif                          /* HEADER_BF_LOCL_H */
 
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
+# define CONFIG_HEADER_DES_LOCL_H
-/* the following is tweaked from a config script, that is why it is a
+/*
- * protected undef/define */
+ * the following is tweaked from a config script, that is why it is a
-#ifndef DES_PTR
+ * protected undef/define
-#define DES_PTR
+ */
-#endif
+# 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
+# ifndef DES_RISC1
-#endif
+#  define DES_RISC1
+# endif
 
-#ifndef DES_RISC2
+# ifndef DES_RISC2
-#undef DES_RISC2
+#  undef DES_RISC2
-#endif
+# endif
-
-#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.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#define DES_UNROLL
-#endif
-
-#endif /* HEADER_DES_LOCL_H */
 
+# 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. Very mucy
+ * CPU dependant
+ */
+# ifndef DES_UNROLL
+#  define DES_UNROLL
+# endif
+#endif                          /* HEADER_DES_LOCL_H */
 #ifndef __POWERPC__
-#define MD32_XARRAY
+# 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_DEBUG_MEMORY=on; \
+		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
-	  export OPENSSL OPENSSL_DEBUG_MEMORY; \
+		OPENSSL_DEBUG_MEMORY=on; \
-	  $(PERL) tools/c_rehash certs)
+		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-	touch rehash.time
+		$(PERL) tools/c_rehash certs) && \
+		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,11 +570,15 @@ 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
@@ -430,15 +613,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 +631,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 +649,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 +673,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 +686,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 +702,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 +719,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,315 @@
   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.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 +322,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 +330,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 +343,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 +361,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 +372,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 +418,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 +448,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 +479,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 +496,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 +521,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 +536,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 +545,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 +581,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 +592,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 +606,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 +628,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
@@ -70,12 +72,16 @@ if "%1" == "nw-nasm"  set NO_ASM=
 if "%1" == "nw-nasm"  set ARG_PROCESSED=YES
 if "%1" == "nw-mwasm" set ASM_MODE=nw-mwasm
 if "%1" == "nw-mwasm" set ASSEMBLER=Metrowerks
-if "%1" == "nw-mwasm"  set NO_ASM=
+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

@@ -34,16 +34,21 @@ sub main()
    # delete all the output files in the output directory
    unlink <$output_path\\*.*>;
 
-   # open the main log file 
+   # 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");
 
@@ -67,10 +73,17 @@ sub algorithm_tests
 
    foreach $i (@tests)
    {
-      $outFile = "$output_path\\$i.out";
+      if (-e "$base_path\\$i.nlm")
-      system("$i > $outFile");
+      {
-      log_desc("Test: $i\.nlm:");
+         $outFile = "$output_path\\$i.out";
-      log_output("", $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,43 +396,43 @@ 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);
 
-   print(OUT "-- \n");
+   print(OUT "--\n");
    print(OUT "The generated CA certificate is $CAcert\n");
    print(OUT "The generated CA private key is $CAkey\n");
    print(OUT "The current CA signing serial number is in $CAserial\n");
@@ -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");
    }
 
@@ -448,8 +487,8 @@ sub log_output( $ $ )
       # copy test output to log file
    open(IN, "<$file");
    while (<IN>)
-   { 
+   {
-      print(OUT $_); 
+      print(OUT $_);
       if ( $_ =~ /ERROR/ )
       {
          $error = 1;
@@ -476,13 +515,13 @@ sub log_output( $ $ )
       $key = getc;
       print("\n");
    }
-      
+
-      # Several of the testing scripts run a loop loading the 
+      # Several of the testing scripts run a loop loading the
       # same NLM with different options.
-      # On slow NetWare machines there appears to be some delay in the 
+      # On slow NetWare machines there appears to be some delay in the
       # OS actually unloading the test nlms and the OS complains about.
-      # the NLM already being loaded.  This additional pause is to 
+      # the NLM already being loaded.  This additional pause is to
-      # to help provide a little more time for unloading before trying to 
+      # to help provide a little more time for unloading before trying to
       # load again.
    sleep(1);
 }
@@ -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);
@@ -561,7 +600,7 @@ sub make_tmp_cert_file()
    open( TMP_CERT, ">$tmp_cert") || die "\nunable to open $tmp_cert\n";
 
    print("building temporary cert file\n");
-   
+
    # create a temporary cert file that contains all the certs
    foreach $i (@cert_files)
    {

Netware/set_env.bat

@@ -16,75 +16,97 @@ 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=
 
-if "%1" == "netware-libc"  set LIBC_BUILD=Y
+if "%1" == "netware-libc" set LIBC_BUILD=Y
-if "%1" == "netware-libc"  set CLIB_BUILD=
+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.
-echo . No target build specified!
+echo No target build specified!
-echo .
+echo.
-echo . usage: set_env [target]
+echo usage: set_env [target] [compiler]
-echo .
+echo.
-echo .   target      - "netware-clib" - Clib build
+echo target      - "netware-clib" - Clib build
-echo .               - "netware-libc" - LibC build
+echo             - "netware-libc" - LibC build
-echo .
+echo.
-
+echo compiler    - "gnuc"         - GNU GCC Compiler
-
+echo             - "codewarrior"  - MetroWerks CodeWarrior (default)
+echo.
 
 :end
+echo.
+
 

PROBLEMS

@@ -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,20 +50,34 @@ 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
+  triggered by some of the code in OpenSSL, more specifically in
-PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
+  PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
 
 	header+=11;
 	if (*header != '4') return(0); header++;
 	if (*header != ',') return(0); header++;
 
-What happens is that gcc might optimize a little too agressively, and
+  What happens is that gcc might optimize a little too agressively, and
-you end up with an extra incrementation when *header != '4'.
+  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.
+  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.
 
@@ -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.8zg 11 Jun 2015
 
- 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,10 +162,14 @@
     - 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
 
+ Note that the request tracker should NOT be used for general assistance
+ or support queries. Just because something doesn't work the way you expect
+ does not mean it is necessarily a bug in OpenSSL.
+
  Note that mail to openssl-bugs@openssl.org is recorded in the publicly
  readable request tracker database and is forwarded to a public
  mailing list. Confidential mail may be sent to openssl-security@openssl.org
@@ -170,10 +180,22 @@
 
  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 the coding style of
+ OpenSSL and compile without warnings. Some of the core team developer targets
+ can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
+ compiles on many varied platforms: try to ensure you only use portable
+ features.
+
  Note: For legal reasons, contributions from the US can be accepted only
  if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
  (formerly BXA) with a copy to the ENC Encryption Request Coordinator;

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,31 +8,39 @@ $!
 $!
 $! Slightly modified by Richard Levitte <richard@levitte.org>
 $!
+$!
+$! Always define OPENSSL.  Others are optional (non-null P1).
+$!
 $ OPENSSL  :== $SSLEXE:OPENSSL
-$ VERIFY   :== $SSLEXE:OPENSSL VERIFY
+$
-$ ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
+$ IF (P1 .NES. "")
-$ REQ      :== $SSLEXE:OPENSSL REQ
+$ THEN
-$ DGST     :== $SSLEXE:OPENSSL DGST
+$     VERIFY   :== $SSLEXE:OPENSSL VERIFY
-$ DH       :== $SSLEXE:OPENSSL DH
+$     ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
-$ ENC      :== $SSLEXE:OPENSSL ENC
+$! REQ could conflict with REQUEST.
-$ GENDH    :== $SSLEXE:OPENSSL GENDH
+$     OREQ     :== $SSLEXE:OPENSSL REQ
-$ ERRSTR   :== $SSLEXE:OPENSSL ERRSTR
+$     DGST     :== $SSLEXE:OPENSSL DGST
-$ CA       :== $SSLEXE:OPENSSL CA
+$     DH       :== $SSLEXE:OPENSSL DH
-$ CRL      :== $SSLEXE:OPENSSL CRL
+$     ENC      :== $SSLEXE:OPENSSL ENC
-$ RSA      :== $SSLEXE:OPENSSL RSA
+$     GENDH    :== $SSLEXE:OPENSSL GENDH
-$ DSA      :== $SSLEXE:OPENSSL DSA
+$     ERRSTR   :== $SSLEXE:OPENSSL ERRSTR
-$ DSAPARAM :== $SSLEXE:OPENSSL DSAPARAM
+$     CA       :== $SSLEXE:OPENSSL CA
-$ X509     :== $SSLEXE:OPENSSL X509
+$     CRL      :== $SSLEXE:OPENSSL CRL
-$ GENRSA   :== $SSLEXE:OPENSSL GENRSA
+$     RSA      :== $SSLEXE:OPENSSL RSA
-$ GENDSA   :== $SSLEXE:OPENSSL GENDSA
+$     DSA      :== $SSLEXE:OPENSSL DSA
-$ S_SERVER :== $SSLEXE:OPENSSL S_SERVER
+$     DSAPARAM :== $SSLEXE:OPENSSL DSAPARAM
-$ S_CLIENT :== $SSLEXE:OPENSSL S_CLIENT
+$     X509     :== $SSLEXE:OPENSSL X509
-$ SPEED    :== $SSLEXE:OPENSSL SPEED
+$     GENRSA   :== $SSLEXE:OPENSSL GENRSA
-$ S_TIME   :== $SSLEXE:OPENSSL S_TIME
+$     GENDSA   :== $SSLEXE:OPENSSL GENDSA
-$ VERSION  :== $SSLEXE:OPENSSL VERSION
+$     S_SERVER :== $SSLEXE:OPENSSL S_SERVER
-$ PKCS7    :== $SSLEXE:OPENSSL PKCS7
+$     S_CLIENT :== $SSLEXE:OPENSSL S_CLIENT
-$ CRL2PKCS7:== $SSLEXE:OPENSSL CRL2P7
+$     SPEED    :== $SSLEXE:OPENSSL SPEED
-$ SESS_ID  :== $SSLEXE:OPENSSL SESS_ID
+$     S_TIME   :== $SSLEXE:OPENSSL S_TIME
-$ CIPHERS  :== $SSLEXE:OPENSSL CIPHERS
+$     VERSION  :== $SSLEXE:OPENSSL VERSION
-$ NSEQ     :== $SSLEXE:OPENSSL NSEQ
+$     PKCS7    :== $SSLEXE:OPENSSL PKCS7
-$ PKCS12   :== $SSLEXE:OPENSSL PKCS12
+$     CRL2PKCS7:== $SSLEXE:OPENSSL CRL2P7
+$     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

@@ -5,10 +5,10 @@
 #      things easier between now and when Eric is convinced to fix it :-)
 #
 # CA -newca ... will setup the right stuff
-# CA -newreq ... will generate a certificate request 
+# CA -newreq ... will generate a certificate request
-# CA -sign ... will sign the generated request and output 
+# CA -sign ... will sign the generated request and output
 #
-# At the end of that grab newreq.pem and newcert.pem (one has the key 
+# At the end of that grab newreq.pem and newcert.pem (one has the key
 # and the other the certificate) and cat them together and that is what
 # you want/need ... I'll make even this a little cleaner later.
 #
@@ -16,8 +16,8 @@
 # 12-Jan-96 tjh    Added more things ... including CA -signcert which
 #                  converts a certificate to a request and then signs it.
 # 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
-#		   environment variable so this can be driven from
+#                  environment variable so this can be driven from
-#		   a script.
+#                  a script.
 # 25-Jul-96 eay    Cleaned up filenames some more.
 # 11-Jun-96 eay    Fixed a few filename missmatches.
 # 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
@@ -29,52 +29,87 @@
 
 # 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) 
+-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) 
+-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"
     ;;
--newca)     
+-newca)
     # if explicitly asked for or it doesn't exist then setup the directory
-    # structure that Eric likes to manage things 
+    # structure that Eric likes to manage things
     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,37 +118,60 @@ 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 \
-			   -infiles ${CATOP}/$CAREQ 
+			   -extensions v3_ca \
+			   -infiles ${CATOP}/$CAREQ
 	    RET=$?
 	fi
     fi
     ;;
 -xsign)
-    $CA -policy policy_anything -infiles newreq.pem 
+    $CA -policy policy_anything -infiles newreq.pem
     RET=$?
     ;;
--sign|-signreq) 
+-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"
     ;;
--signcert) 
+-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"
     ;;
--verify) 
+-verify)
     shift
     if [ -z "$1" ]; then
 	    $VERIFY -CAfile $CATOP/$CACERT 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

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -115,104 +115,106 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 
-
 static int seeded = 0;
 static int egdsocket = 0;
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
-	{
+{
-	int consider_randfile = (file == NULL);
+    int consider_randfile = (file == NULL);
-	char buffer[200];
+    char buffer[200];
-	
+
 #ifdef OPENSSL_SYS_WINDOWS
-	BIO_printf(bio_e,"Loading 'screen' into random state -");
+    BIO_printf(bio_e, "Loading 'screen' into random state -");
-	BIO_flush(bio_e);
+    BIO_flush(bio_e);
-	RAND_screen();
+    RAND_screen();
-	BIO_printf(bio_e," done\n");
+    BIO_printf(bio_e, " done\n");
 #endif
 
-	if (file == NULL)
+    if (file == NULL)
-		file = RAND_file_name(buffer, sizeof buffer);
+        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;
+        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,
-				BIO_printf(bio_e,"unable to load 'random state'\n");
+                           "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");
-				BIO_printf(bio_e,"with much random data.\n");
+                if (consider_randfile) { /* explanation does not apply when a
-				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
+                                          * file is explicitly named */
-					{
+                    BIO_printf(bio_e,
-					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\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");
+                    BIO_printf(bio_e,
-					}
+                               "'random' data can be kept in (the file will be overwritten).\n");
-				}
+                }
-			return 0;
+            }
-			}
+            return 0;
-		}
+        }
-	seeded = 1;
+    }
-	return 1;
+    seeded = 1;
-	}
+    return 1;
+}
 
 long app_RAND_load_files(char *name)
-	{
+{
-	char *p,*n;
+    char *p, *n;
-	int last;
+    int last;
-	long tot=0;
+    long tot = 0;
-	int egd;
+    int egd;
-	
-	for (;;)
-		{
-		last=0;
-		for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++);
-		if (*p == '\0') last=1;
-		*p='\0';
-		n=name;
-		name=p+1;
-		if (*n == '\0') break;
 
-		egd=RAND_egd(n);
+    for (;;) {
-		if (egd > 0)
+        last = 0;
-			tot+=egd;
+        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
-		else
+        if (*p == '\0')
-			tot+=RAND_load_file(n,-1);
+            last = 1;
-		if (last) break;
+        *p = '\0';
-		}
+        n = name;
-	if (tot > 512)
+        name = p + 1;
-		app_RAND_allow_write_file();
+        if (*n == '\0')
-	return(tot);
+            break;
-	}
+
+        egd = RAND_egd(n);
+        if (egd > 0)
+            tot += egd;
+        else
+            tot += RAND_load_file(n, -1);
+        if (last)
+            break;
+    }
+    if (tot > 512)
+        app_RAND_allow_write_file();
+    return (tot);
+}
 
 int app_RAND_write_file(const char *file, BIO *bio_e)
-	{
+{
-	char buffer[200];
+    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 --
-		 * it would suppress a crucial warning the next time
-		 * we want to use it. */
-		return 0;
 
-	if (file == NULL)
+    if (egdsocket || !seeded)
-		file = RAND_file_name(buffer, sizeof buffer);
+        /*
-	if (file == NULL || !RAND_write_file(file))
+         * If we did not manage to read the seed file, we should not write a
-		{
+         * low-entropy seed file back -- it would suppress a crucial warning
-		BIO_printf(bio_e,"unable to write 'random state'\n");
+         * the next time we want to use it.
-		return 0;
+         */
-		}
+        return 0;
-	return 1;
+
-	}
+    if (file == NULL)
+        file = RAND_file_name(buffer, sizeof buffer);
+    if (file == NULL || !RAND_write_file(file)) {
+        BIO_printf(bio_e, "unable to write 'random state'\n");
+        return 0;
+    }
+    return 1;
+}
 
 void app_RAND_allow_write_file(void)
-	{
+{
-	seeded = 1;
+    seeded = 1;
-	}
+}

apps/apps.h

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -110,139 +110,149 @@
  */
 
 #ifndef HEADER_APPS_H
-#define HEADER_APPS_H
+# define HEADER_APPS_H
 
-#include "e_os.h"
+# include "e_os.h"
 
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/lhash.h>
+# include <openssl/lhash.h>
-#include <openssl/conf.h>
+# include <openssl/conf.h>
-#include <openssl/txt_db.h>
+# include <openssl/txt_db.h>
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+#  include <openssl/engine.h>
-#endif
+# endif
-#include <openssl/ossl_typ.h>
+# 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
                                        * (see e_os.h).  The string is
                                        * destroyed! */
 
-#ifdef OPENSSL_SYS_WIN32
+# ifdef OPENSSL_SYS_WIN32
-#define rename(from,to) WIN32_rename((from),(to))
+#  define rename(from,to) WIN32_rename((from),(to))
-int WIN32_rename(const char *oldname,const char *newname);
+int WIN32_rename(const char *oldname, const char *newname);
-#endif
+# endif
 
-#ifndef MONOLITH
+# ifndef MONOLITH
 
-#define MAIN(a,v)	main(a,v)
+#  define MAIN(a,v)       main(a,v)
 
-#ifndef NON_MAIN
+#  ifndef NON_MAIN
-CONF *config=NULL;
+CONF *config = NULL;
-BIO *bio_err=NULL;
+BIO *bio_err = NULL;
-#else
+int in_FIPS_mode = 0;
+#  else
 extern CONF *config;
 extern BIO *bio_err;
-#endif
+extern int in_FIPS_mode;
+#  endif
 
-#else
+# else
 
-#define MAIN(a,v)	PROG(a,v)
+#  define MAIN(a,v)       PROG(a,v)
 extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
+extern int in_FIPS_mode;
 
-#endif
+# endif
 
-#ifndef OPENSSL_SYS_NETWARE
+# ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
+#  include <signal.h>
-#endif
+# endif
 
-#ifdef SIGPIPE
+# ifdef SIGPIPE
-#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
+#  define do_pipe_sig()   signal(SIGPIPE,SIG_IGN)
-#else
+# else
-#define do_pipe_sig()
+#  define do_pipe_sig()
-#endif
+# endif
 
-#if defined(MONOLITH) && !defined(OPENSSL_C)
+# if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup() \
-		do_pipe_sig()
+                do_pipe_sig()
 #  define apps_shutdown()
-#else
+# else
 #  ifndef OPENSSL_NO_ENGINE
-#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
+#   if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
      defined(OPENSSL_SYS_WIN32)
-#      ifdef _O_BINARY
+#    ifdef _O_BINARY
-#        define apps_startup() \
+#     define apps_startup() \
-			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+                        do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+                        ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
-#      else
-#        define apps_startup() \
-			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
-#      endif
 #    else
-#      define apps_startup() \
+#     define apps_startup() \
-			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
+                        do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			setup_ui_method(); } while(0)
+                        ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 #    endif
-#    define apps_shutdown() \
+#   else
-			do { CONF_modules_unload(1); destroy_ui_method(); \
+#    define apps_startup() \
-			EVP_cleanup(); ENGINE_cleanup(); \
+                        do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                        ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
-			ERR_free_strings(); } while(0)
+                        setup_ui_method(); } while(0)
+#   endif
+#   define apps_shutdown() \
+                        do { CONF_modules_unload(1); destroy_ui_method(); \
+                        EVP_cleanup(); ENGINE_cleanup(); \
+                        CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                        ERR_free_strings(); } while(0)
 #  else
-#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
+#   if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
      defined(OPENSSL_SYS_WIN32)
-#      ifdef _O_BINARY
+#    ifdef _O_BINARY
-#        define apps_startup() \
+#     define apps_startup() \
-			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+                        do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			setup_ui_method(); } while(0)
+                        setup_ui_method(); } while(0)
-#      else
-#        define apps_startup() \
-			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			setup_ui_method(); } while(0)
-#      endif
 #    else
-#      define apps_startup() \
+#     define apps_startup() \
-			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
+                        do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_load_crypto_strings(); \
+                        ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			setup_ui_method(); } while(0)
+                        setup_ui_method(); } while(0)
 #    endif
-#    define apps_shutdown() \
+#   else
-			do { CONF_modules_unload(1); destroy_ui_method(); \
+#    define apps_startup() \
-			EVP_cleanup(); \
+                        do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                        ERR_load_crypto_strings(); \
-			ERR_free_strings(); } while(0)
+                        setup_ui_method(); } while(0)
+#   endif
+#   define apps_shutdown() \
+                        do { CONF_modules_unload(1); destroy_ui_method(); \
+                        EVP_cleanup(); \
+                        CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
+                        ERR_free_strings(); } while(0)
 #  endif
-#endif
+# endif
 
-typedef struct args_st
+# ifdef OPENSSL_SYSNAME_WIN32
-	{
+#  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
-	char **data;
+# else
-	int count;
+#  define openssl_fdset(a,b) FD_SET(a, b)
-	} ARGS;
+# endif
 
-#define PW_MIN_LENGTH 4
+typedef struct args_st {
-typedef struct pw_cb_data
+    char **data;
-	{
+    int count;
-	const void *password;
+} ARGS;
-	const char *prompt_info;
-	} PW_CB_DATA;
 
-int password_callback(char *buf, int bufsiz, int verify,
+# define PW_MIN_LENGTH 4
-	PW_CB_DATA *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, PW_CB_DATA *cb_data);
 
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -250,12 +260,13 @@ void destroy_ui_method(void);
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
-void program_name(char *in,char *out,int size);
+void program_name(char *in, char *out, int size);
-int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
+int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]);
-#ifdef HEADER_X509_H
+# ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
+void print_name(BIO *out, const char *title, X509_NAME *nm,
-#endif
+                unsigned long lflags);
+# endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
 int set_ext_copy(int *copy_type, const char *arg);
@@ -263,83 +274,95 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
 int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(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);
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
-	const char *pass, ENGINE *e, const char *key_descrip);
+                   const char *pass, ENGINE *e, const char *key_descrip);
 EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
-	const char *pass, ENGINE *e, const char *key_descrip);
+                      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
+# ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
-#endif
+# endif
+
+# ifndef OPENSSL_NO_OCSP
+OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
+                                 char *host, char *path, char *port,
+                                 int use_ssl, int req_timeout);
+# endif
 
 int load_config(BIO *err, CONF *cnf);
 char *make_config_name(void);
 
 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-			ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+                   ASN1_GENERALIZEDTIME **pinvtm, const char *str);
 
-#define DB_type         0
+# define DB_type         0
-#define DB_exp_date     1
+# define DB_exp_date     1
-#define DB_rev_date     2
+# define DB_rev_date     2
-#define DB_serial       3       /* index - unique */
+# define DB_serial       3      /* index - unique */
-#define DB_file         4       
+# define DB_file         4
-#define DB_name         5       /* index - unique when active and not disabled */
+# define DB_name         5      /* index - unique when active and not
-#define DB_NUMBER       6
+                                 * disabled */
+# define DB_NUMBER       6
 
-#define DB_TYPE_REV	'R'
+# define DB_TYPE_REV     'R'
-#define DB_TYPE_EXP	'E'
+# define DB_TYPE_EXP     'E'
-#define DB_TYPE_VAL	'V'
+# define DB_TYPE_VAL     'V'
 
-typedef struct db_attr_st
+typedef struct db_attr_st {
-	{
+    int unique_subject;
-	int unique_subject;
+} DB_ATTR;
-	} DB_ATTR;
+typedef struct ca_db_st {
-typedef struct ca_db_st
+    DB_ATTR attributes;
-	{
+    TXT_DB *db;
-	DB_ATTR attributes;
+} CA_DB;
-	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);
 
 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);
+                int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 void policies_print(BIO *out, X509_STORE_CTX *ctx);
+# ifndef OPENSSL_NO_JPAKE
+void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
+void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
+# endif
 
-#define FORMAT_UNDEF    0
+# define FORMAT_UNDEF    0
-#define FORMAT_ASN1     1
+# define FORMAT_ASN1     1
-#define FORMAT_TEXT     2
+# define FORMAT_TEXT     2
-#define FORMAT_PEM      3
+# define FORMAT_PEM      3
-#define FORMAT_NETSCAPE 4
+# define FORMAT_NETSCAPE 4
-#define FORMAT_PKCS12   5
+# define FORMAT_PKCS12   5
-#define FORMAT_SMIME    6
+# define FORMAT_SMIME    6
-#define FORMAT_ENGINE   7
+# define FORMAT_ENGINE   7
-#define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
+# define FORMAT_IISSGC   8      /* XXX this stupid macro helps us to avoid
-				 * adding yet another param to load_*key() */
+                                 * adding yet another param to load_*key() */
 
-#define EXT_COPY_NONE	0
+# define EXT_COPY_NONE   0
-#define EXT_COPY_ADD	1
+# define EXT_COPY_ADD    1
-#define EXT_COPY_ALL	2
+# define EXT_COPY_ALL    2
 
-#define NETSCAPE_CERT_HDR	"certificate"
+# define NETSCAPE_CERT_HDR       "certificate"
 
-#define APP_PASS_LEN	1024
+# define APP_PASS_LEN    1024
 
-#define SERIAL_RAND_BITS	64
+# define SERIAL_RAND_BITS        64
 
 #endif

apps/asn1pars.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,15 +49,16 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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,376 +70,361 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
- * -in arg	- input file - default stdin
+ * -inform arg  - input format - default PEM (DER or PEM)
- * -i		- indent the details by depth
+ * -in arg      - input file - default stdin
- * -offset	- where in the file to start
+ * -i           - indent the details by depth
- * -length	- how many bytes to use
+ * -offset      - where in the file to start
- * -oid file	- extra oid description file
+ * -length      - how many bytes to use
+ * -oid file    - extra oid description file
  */
 
 #undef PROG
-#define PROG	asn1parse_main
+#define PROG    asn1parse_main
 
 int MAIN(int, char **);
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,badops=0,offset=0,ret=1,j;
+    int i, badops = 0, offset = 0, ret = 1, j;
-	unsigned int length=0;
+    unsigned int length = 0;
-	long num,tmplen;
+    long num, tmplen;
-	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
+    BIO *in = NULL, *out = NULL, *b64 = NULL, *derout = NULL;
-	int informat,indent=0, noout = 0, dump = 0;
+    int informat, indent = 0, noout = 0, dump = 0;
-	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
+    char *infile = NULL, *str = NULL, *prog, *oidfile = NULL, *derfile = NULL;
-	char *genstr=NULL, *genconf=NULL;
+    char *genstr = NULL, *genconf = NULL;
-	unsigned char *tmpbuf;
+    unsigned char *tmpbuf;
-	const unsigned char *ctmpbuf;
+    const unsigned char *ctmpbuf;
-	BUF_MEM *buf=NULL;
+    BUF_MEM *buf = NULL;
-	STACK *osk=NULL;
+    STACK *osk = NULL;
-	ASN1_TYPE *at=NULL;
+    ASN1_TYPE *at = NULL;
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	if ((osk=sk_new_null()) == NULL)
+    if ((osk = sk_new_null()) == NULL) {
-		{
+        BIO_printf(bio_err, "Memory allocation failure\n");
-		BIO_printf(bio_err,"Memory allocation failure\n");
+        goto end;
-		goto end;
+    }
-		}
+    while (argc >= 1) {
-	while (argc >= 1)
+        if (strcmp(*argv, "-inform") == 0) {
-		{
+            if (--argc < 1)
-		if 	(strcmp(*argv,"-inform") == 0)
+                goto bad;
-			{
+            informat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			informat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            derfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-i") == 0) {
-			{
+            indent = 1;
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-noout") == 0)
-			derfile= *(++argv);
+            noout = 1;
-			}
+        else if (strcmp(*argv, "-oid") == 0) {
-		else if (strcmp(*argv,"-i") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			indent=1;
+            oidfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-offset") == 0) {
-		else if (strcmp(*argv,"-noout") == 0) noout = 1;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-oid") == 0)
+                goto bad;
-			{
+            offset = atoi(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-length") == 0) {
-			oidfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-offset") == 0)
+            length = atoi(*(++argv));
-			{
+            if (length == 0)
-			if (--argc < 1) goto bad;
+                goto bad;
-			offset= atoi(*(++argv));
+        } else if (strcmp(*argv, "-dump") == 0) {
-			}
+            dump = -1;
-		else if (strcmp(*argv,"-length") == 0)
+        } else if (strcmp(*argv, "-dlimit") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			length= atoi(*(++argv));
+            dump = atoi(*(++argv));
-			if (length == 0) goto bad;
+            if (dump <= 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-dump") == 0)
+        } else if (strcmp(*argv, "-strparse") == 0) {
-			{
+            if (--argc < 1)
-			dump= -1;
+                goto bad;
-			}
+            sk_push(osk, *(++argv));
-		else if (strcmp(*argv,"-dlimit") == 0)
+        } else if (strcmp(*argv, "-genstr") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			dump= atoi(*(++argv));
+            genstr = *(++argv);
-			if (dump <= 0) goto bad;
+        } else if (strcmp(*argv, "-genconf") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-strparse") == 0)
+                goto bad;
-			{
+            genconf = *(++argv);
-			if (--argc < 1) goto bad;
+        } else {
-			sk_push(osk,*(++argv));
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			}
+            badops = 1;
-		else if (strcmp(*argv,"-genstr") == 0)
+            break;
-			{
+        }
-			if (--argc < 1) goto bad;
+        argc--;
-			genstr= *(++argv);
+        argv++;
-			}
+    }
-		else if (strcmp(*argv,"-genconf") == 0)
-			{
-			if (--argc < 1) goto bad;
-			genconf= *(++argv);
-			}
-		else
-			{
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		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," -inform arg   input format - one of DER TXT PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
+                   " -out arg      output file (output format is always DER\n");
-		BIO_printf(bio_err," -noout arg    don't produce any output\n");
+        BIO_printf(bio_err, " -noout arg    don't produce any output\n");
-		BIO_printf(bio_err," -offset arg   offset into file\n");
+        BIO_printf(bio_err, " -offset arg   offset into file\n");
-		BIO_printf(bio_err," -length arg   length of section in file\n");
+        BIO_printf(bio_err, " -length arg   length of section in file\n");
-		BIO_printf(bio_err," -i            indent entries\n");
+        BIO_printf(bio_err, " -i            indent entries\n");
-		BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
+        BIO_printf(bio_err, " -dump         dump unknown data in hex form\n");
-		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
+                   " -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
-		BIO_printf(bio_err," -strparse offset\n");
+        BIO_printf(bio_err, " -oid file     file of extra oid definitions\n");
-		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
+        BIO_printf(bio_err, " -strparse offset\n");
-		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
+                   "               a series of these can be used to 'dig' into multiple\n");
-		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
+        BIO_printf(bio_err, "               ASN1 blob wrappings\n");
-		goto end;
+        BIO_printf(bio_err,
-		}
+                   " -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
+                   " -genconf file file to generate ASN1 structure from\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	out = BIO_push(tmpbio, out);
+        out = BIO_push(tmpbio, out);
-	}
+    }
 #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);
-			BIO_printf(bio_err,"problems opening %s\n",oidfile);
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+        OBJ_create_objects(in);
-			}
+    }
-		OBJ_create_objects(in);
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
-		}
 
-	if (derfile) {
+    if (derfile) {
-		if(!(derout = BIO_new_file(derfile, "wb"))) {
+        if (!(derout = BIO_new_file(derfile, "wb"))) {
-			BIO_printf(bio_err,"problems opening %s\n",derfile);
+            BIO_printf(bio_err, "problems opening %s\n", derfile);
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	}
+    }
 
-	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);
-		num = do_generate(bio_err, genstr, genconf, buf);
+        if (num < 0) {
-		if (num < 0)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+    }
-			}
-		}
 
-	else
+    else {
-		{
 
-		if (informat == FORMAT_PEM)
+        if (informat == FORMAT_PEM) {
-			{
+            BIO *tmp;
-			BIO *tmp;
 
-			if ((b64=BIO_new(BIO_f_base64())) == NULL)
+            if ((b64 = BIO_new(BIO_f_base64())) == NULL)
-				goto end;
+                goto end;
-			BIO_push(b64,in);
+            BIO_push(b64, in);
-			tmp=in;
+            tmp = in;
-			in=b64;
+            in = b64;
-			b64=tmp;
+            b64 = tmp;
-			}
+        }
 
-		num=0;
+        num = 0;
-		for (;;)
+        for (;;) {
-			{
+            if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
-			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
+                goto end;
-			i=BIO_read(in,&(buf->data[num]),BUFSIZ);
+            i = BIO_read(in, &(buf->data[num]), BUFSIZ);
-			if (i <= 0) break;
+            if (i <= 0)
-			num+=i;
+                break;
-			}
+            num += i;
-		}
+        }
-	str=buf->data;
+    }
+    str = buf->data;
 
-	/* If any structs to parse go through in sequence */
+    /* If any structs to parse go through in sequence */
 
-	if (sk_num(osk))
+    if (sk_num(osk)) {
-		{
+        tmpbuf = (unsigned char *)str;
-		tmpbuf=(unsigned char *)str;
+        tmplen = num;
-		tmplen=num;
+        for (i = 0; i < sk_num(osk); i++) {
-		for (i=0; i<sk_num(osk); i++)
+            ASN1_TYPE *atmp;
-			{
+            int typ;
-			ASN1_TYPE *atmp;
+            j = atoi(sk_value(osk, i));
-			int typ;
+            if (j == 0) {
-			j=atoi(sk_value(osk,i));
+                BIO_printf(bio_err, "'%s' is an invalid number\n",
-			if (j == 0)
+                           sk_value(osk, i));
-				{
+                continue;
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_value(osk,i));
+            }
-				continue;
+            tmpbuf += j;
-				}
+            tmplen -= j;
-			tmpbuf+=j;
+            atmp = at;
-			tmplen-=j;
+            ctmpbuf = tmpbuf;
-			atmp = at;
+            at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
-			ctmpbuf = tmpbuf;
+            ASN1_TYPE_free(atmp);
-			at = d2i_ASN1_TYPE(NULL,&ctmpbuf,tmplen);
+            if (!at) {
-			ASN1_TYPE_free(atmp);
+                BIO_printf(bio_err, "Error parsing structure\n");
-			if(!at)
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				BIO_printf(bio_err,"Error parsing structure\n");
+            }
-				ERR_print_errors(bio_err);
+            typ = ASN1_TYPE_get(at);
-				goto end;
+            if ((typ == V_ASN1_OBJECT)
-				}
+                || (typ == V_ASN1_NULL)) {
-			typ = ASN1_TYPE_get(at);
+                BIO_printf(bio_err, "Can't parse %s type\n",
-			if ((typ == V_ASN1_OBJECT)
+                           typ == V_ASN1_NULL ? "NULL" : "OBJECT");
-				|| (typ == V_ASN1_NULL))
+                ERR_print_errors(bio_err);
-				{
+                goto end;
-				BIO_printf(bio_err, "Can't parse %s type\n",
+            }
-					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
+            /* hmm... this is a little evil but it works */
-				ERR_print_errors(bio_err);
+            tmpbuf = at->value.asn1_string->data;
-				goto end;
+            tmplen = at->value.asn1_string->length;
-				}
+        }
-			/* hmm... this is a little evil but it works */
+        str = (char *)tmpbuf;
-			tmpbuf=at->value.asn1_string->data;
+        num = tmplen;
-			tmplen=at->value.asn1_string->length;
+    }
-			}
-		str=(char *)tmpbuf;
-		num=tmplen;
-		}
 
-	if (offset >= num)
+    if (offset >= num) {
-		{
+        BIO_printf(bio_err, "Error: offset too large\n");
-		BIO_printf(bio_err, "Error: offset too large\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	num -= offset;
+    num -= offset;
 
-	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
+    if ((length == 0) || ((long)length > num))
-	if(derout) {
+        length = (unsigned int)num;
-		if(BIO_write(derout, str + offset, length) != (int)length) {
+    if (derout) {
-			BIO_printf(bio_err, "Error writing output\n");
+        if (BIO_write(derout, str + offset, length) != (int)length) {
-			ERR_print_errors(bio_err);
+            BIO_printf(bio_err, "Error writing output\n");
-			goto end;
+            ERR_print_errors(bio_err);
-		}
+            goto end;
-	}
+        }
-	if (!noout &&
+    }
-	    !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
+    if (!noout &&
-		    indent,dump))
+        !ASN1_parse_dump(out, (unsigned char *)&(str[offset]), length,
-		{
+                         indent, dump)) {
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-		}
+    }
-	ret=0;
+    ret = 0;
-end:
+ end:
-	BIO_free(derout);
+    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)
-	if (ret != 0)
+        BIO_free_all(out);
-		ERR_print_errors(bio_err);
+    if (b64 != NULL)
-	if (buf != NULL) BUF_MEM_free(buf);
+        BIO_free(b64);
-	if (at != NULL) ASN1_TYPE_free(at);
+    if (ret != 0)
-	if (osk != NULL) sk_free(osk);
+        ERR_print_errors(bio_err);
-	OBJ_cleanup();
+    if (buf != NULL)
-	apps_shutdown();
+        BUF_MEM_free(buf);
-	OPENSSL_EXIT(ret);
+    if (at != NULL)
-	}
+        ASN1_TYPE_free(at);
+    if (osk != NULL)
+        sk_free(osk);
+    OBJ_cleanup();
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
-	{
+{
-	CONF *cnf = NULL;
+    CONF *cnf = NULL;
-	int len;
+    int len;
-	long errline;
+    long errline;
-	unsigned char *p;
+    unsigned char *p;
-	ASN1_TYPE *atyp = NULL;
+    ASN1_TYPE *atyp = NULL;
 
-	if (genconf)
+    if (genconf) {
-		{
+        cnf = NCONF_new(NULL);
-		cnf = NCONF_new(NULL);
+        if (!NCONF_load(cnf, genconf, &errline))
-		if (!NCONF_load(cnf, genconf, &errline))
+            goto conferr;
-			goto conferr;
+        if (!genstr)
-		if (!genstr)
+            genstr = NCONF_get_string(cnf, "default", "asn1");
-			genstr = NCONF_get_string(cnf, "default", "asn1");
+        if (!genstr) {
-		if (!genstr)
+            BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
-			{
+            goto err;
-			BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
+        }
-			goto err;
+    }
-			}
-		}
 
-	atyp = ASN1_generate_nconf(genstr, cnf);
+    atyp = ASN1_generate_nconf(genstr, cnf);
-	NCONF_free(cnf);
+    NCONF_free(cnf);
+    cnf = NULL;
 
-	if (!atyp)
+    if (!atyp)
-		return -1;
+        return -1;
 
-	len = i2d_ASN1_TYPE(atyp, NULL);
+    len = i2d_ASN1_TYPE(atyp, NULL);
 
-	if (len <= 0)
+    if (len <= 0)
-		goto err;
+        goto err;
 
-	if (!BUF_MEM_grow(buf,len))
+    if (!BUF_MEM_grow(buf, len))
-		goto err;
+        goto err;
 
-	p=(unsigned char *)buf->data;
+    p = (unsigned char *)buf->data;
 
-	i2d_ASN1_TYPE(atyp, &p);
+    i2d_ASN1_TYPE(atyp, &p);
 
-	ASN1_TYPE_free(atyp);
+    ASN1_TYPE_free(atyp);
-	return len;
+    return len;
 
-	conferr:
+ conferr:
 
-	if (errline > 0)
+    if (errline > 0)
-		BIO_printf(bio, "Error on line %ld of config file '%s'\n",
+        BIO_printf(bio, "Error on line %ld of config file '%s'\n",
-							errline, genconf);
+                   errline, genconf);
-	else
+    else
-		BIO_printf(bio, "Error loading config file '%s'\n", genconf);
+        BIO_printf(bio, "Error loading config file '%s'\n", genconf);
 
-	err:
+ err:
-	NCONF_free(cnf);
+    NCONF_free(cnf);
-	ASN1_TYPE_free(atyp);
+    ASN1_TYPE_free(atyp);
 
-	return -1;
+    return -1;
 
-	}
+}

apps/ciphers.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -60,149 +60,142 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
+# define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	ciphers_main
+#define PROG    ciphers_main
 
-static const char *ciphers_usage[]={
+static const char *ciphers_usage[] = {
-"usage: ciphers args\n",
+    "usage: ciphers args\n",
-" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
+    " -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
-" -ssl2       - SSL2 mode\n",
+    " -ssl2       - SSL2 mode\n",
-" -ssl3       - SSL3 mode\n",
+    " -ssl3       - SSL3 mode\n",
-" -tls1       - TLS1 mode\n",
+    " -tls1       - TLS1 mode\n",
-NULL
+    NULL
 };
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int ret=1,i;
+    int ret = 1, i;
-	int verbose=0;
+    int verbose = 0;
-	const char **pp;
+    const char **pp;
-	const char *p;
+    const char *p;
-	int badops=0;
+    int badops = 0;
-	SSL_CTX *ctx=NULL;
+    SSL_CTX *ctx = NULL;
-	SSL *ssl=NULL;
+    SSL *ssl = NULL;
-	char *ciphers=NULL;
+    char *ciphers = NULL;
-	SSL_METHOD *meth=NULL;
+    SSL_METHOD *meth = NULL;
-	STACK_OF(SSL_CIPHER) *sk;
+    STACK_OF(SSL_CIPHER) *sk;
-	char buf[512];
+    char buf[512];
-	BIO *STDout=NULL;
+    BIO *STDout = NULL;
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-	meth=SSLv23_server_method();
+    meth = SSLv23_server_method();
 #elif !defined(OPENSSL_NO_SSL3)
-	meth=SSLv3_server_method();
+    meth = SSLv3_server_method();
 #elif !defined(OPENSSL_NO_SSL2)
-	meth=SSLv2_server_method();
+    meth = SSLv2_server_method();
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
+    STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	STDout = BIO_push(tmpbio, STDout);
+        STDout = BIO_push(tmpbio, STDout);
-	}
+    }
 #endif
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-v") == 0)
-		if (strcmp(*argv,"-v") == 0)
+            verbose = 1;
-			verbose=1;
 #ifndef OPENSSL_NO_SSL2
-		else if (strcmp(*argv,"-ssl2") == 0)
+        else if (strcmp(*argv, "-ssl2") == 0)
-			meth=SSLv2_client_method();
+            meth = SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
-		else if (strcmp(*argv,"-ssl3") == 0)
+        else if (strcmp(*argv, "-ssl3") == 0)
-			meth=SSLv3_client_method();
+            meth = SSLv3_client_method();
 #endif
 #ifndef OPENSSL_NO_TLS1
-		else if (strcmp(*argv,"-tls1") == 0)
+        else if (strcmp(*argv, "-tls1") == 0)
-			meth=TLSv1_client_method();
+            meth = TLSv1_client_method();
 #endif
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
-			 (strcmp(*argv,"-?") == 0))
+            badops = 1;
-			{
+            break;
-			badops=1;
+        } else {
-			break;
+            ciphers = *argv;
-			}
+        }
-		else
+        argc--;
-			{
+        argv++;
-			ciphers= *argv;
+    }
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+        for (pp = ciphers_usage; (*pp != NULL); pp++)
-		for (pp=ciphers_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	OpenSSL_add_ssl_algorithms();
+    OpenSSL_add_ssl_algorithms();
 
-	ctx=SSL_CTX_new(meth);
+    ctx = SSL_CTX_new(meth);
-	if (ctx == NULL) goto err;
+    if (ctx == NULL)
-	if (ciphers != NULL) {
+        goto err;
-		if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
+    if (ciphers != NULL) {
-			BIO_printf(bio_err, "Error in cipher list\n");
+        if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
-			goto err;
+            BIO_printf(bio_err, "Error in cipher list\n");
-		}
+            goto err;
-	}
+        }
-	ssl=SSL_new(ctx);
+    }
-	if (ssl == NULL) goto err;
+    ssl = SSL_new(ctx);
+    if (ssl == NULL)
+        goto err;
 
+    if (!verbose) {
+        for (i = 0;; i++) {
+            p = SSL_get_cipher_list(ssl, i);
+            if (p == NULL)
+                break;
+            if (i != 0)
+                BIO_printf(STDout, ":");
+            BIO_printf(STDout, "%s", p);
+        }
+        BIO_printf(STDout, "\n");
+    } else {
+        sk = SSL_get_ciphers(ssl);
 
-	if (!verbose)
+        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
-		{
+            BIO_puts(STDout,
-		for (i=0; ; i++)
+                     SSL_CIPHER_description(sk_SSL_CIPHER_value(sk, i), buf,
-			{
+                                            sizeof buf));
-			p=SSL_get_cipher_list(ssl,i);
+        }
-			if (p == NULL) break;
+    }
-			if (i != 0) BIO_printf(STDout,":");
-			BIO_printf(STDout,"%s",p);
-			}
-		BIO_printf(STDout,"\n");
-		}
-	else
-		{
-		sk=SSL_get_ciphers(ssl);
-
-		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-			{
-			BIO_puts(STDout,SSL_CIPHER_description(
-				sk_SSL_CIPHER_value(sk,i),
-				buf,sizeof buf));
-			}
-		}
-
-	ret=0;
-	if (0)
-		{
-err:
-		SSL_load_error_strings();
-		ERR_print_errors(bio_err);
-		}
-end:
-	if (ctx != NULL) SSL_CTX_free(ctx);
-	if (ssl != NULL) SSL_free(ssl);
-	if (STDout != NULL) BIO_free_all(STDout);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 
+    ret = 0;
+    if (0) {
+ err:
+        SSL_load_error_strings();
+        ERR_print_errors(bio_err);
+    }
+ end:
+    if (ctx != NULL)
+        SSL_CTX_free(ctx);
+    if (ssl != NULL)
+        SSL_free(ssl);
+    if (STDout != NULL)
+        BIO_free_all(STDout);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/crl.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -67,363 +67,352 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	crl_main
+#define PROG    crl_main
 
 #undef POSTFIX
-#define	POSTFIX	".rvk"
+#define POSTFIX ".rvk"
 
-static const char *crl_usage[]={
+static const char *crl_usage[] = {
-"usage: crl args\n",
+    "usage: crl args\n",
-"\n",
+    "\n",
-" -inform arg     - input format - default PEM (DER or PEM)\n",
+    " -inform arg     - input format - default PEM (DER or PEM)\n",
-" -outform arg    - output format - default PEM\n",
+    " -outform arg    - output format - default PEM\n",
-" -text           - print out a text format version\n",
+    " -text           - print out a text format version\n",
-" -in arg         - input file - default stdin\n",
+    " -in arg         - input file - default stdin\n",
-" -out arg        - output file - default stdout\n",
+    " -out arg        - output file - default stdout\n",
-" -hash           - print hash value\n",
+    " -hash           - print hash value\n",
-" -fingerprint    - print the crl fingerprint\n",
+    " -fingerprint    - print the crl fingerprint\n",
-" -issuer         - print issuer DN\n",
+    " -issuer         - print issuer DN\n",
-" -lastupdate     - lastUpdate field\n",
+    " -lastupdate     - lastUpdate field\n",
-" -nextupdate     - nextUpdate field\n",
+    " -nextupdate     - nextUpdate field\n",
-" -noout          - no CRL output\n",
+    " -crlnumber      - print CRL number\n",
-" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
+    " -noout          - no CRL output\n",
-" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
+    " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
-" -nameopt arg    - various certificate name options\n",
+    " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
-NULL
+    " -nameopt arg    - various certificate name options\n",
+    NULL
 };
 
 static X509_CRL *load_crl(char *file, int format);
-static BIO *bio_out=NULL;
+static BIO *bio_out = NULL;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	unsigned long nmflag = 0;
+    unsigned long nmflag = 0;
-	X509_CRL *x=NULL;
+    X509_CRL *x = NULL;
-	char *CAfile = NULL, *CApath = NULL;
+    char *CAfile = NULL, *CApath = NULL;
-	int ret=1,i,num,badops=0;
+    int ret = 1, i, num, badops = 0;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile=NULL,*outfile=NULL;
+    char *infile = NULL, *outfile = NULL;
-	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
+    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
-	int fingerprint = 0;
+        0, text = 0;
-	const char **pp;
+    int fingerprint = 0, crlnumber = 0;
-	X509_STORE *store = NULL;
+    const char **pp;
-	X509_STORE_CTX ctx;
+    X509_STORE *store = NULL;
-	X509_LOOKUP *lookup = NULL;
+    X509_STORE_CTX ctx;
-	X509_OBJECT xobj;
+    X509_LOOKUP *lookup = NULL;
-	EVP_PKEY *pkey;
+    X509_OBJECT xobj;
-	int do_ver = 0;
+    EVP_PKEY *pkey;
-	const EVP_MD *md_alg,*digest=EVP_sha1();
+    int do_ver = 0;
+    const EVP_MD *md_alg, *digest = EVP_sha1();
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	if (bio_out == NULL)
+    if (bio_out == NULL)
-		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
-			{
+            BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
-			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			bio_out = BIO_push(tmpbio, bio_out);
+                bio_out = BIO_push(tmpbio, bio_out);
-			}
+            }
 #endif
-			}
+        }
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	num=0;
+    num = 0;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
 #ifdef undef
-		if	(strcmp(*argv,"-p") == 0)
+        if (strcmp(*argv, "-p") == 0) {
-			{
+            if (--argc < 1)
-			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));
+            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));
-			outformat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-in") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-in") == 0)
+                goto bad;
-			{
+            infile = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-out") == 0) {
-			infile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-out") == 0)
+            outfile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-CApath") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			outfile= *(++argv);
+                goto bad;
-			}
+            CApath = *(++argv);
-		else if (strcmp(*argv,"-CApath") == 0)
+            do_ver = 1;
-			{
+        } else if (strcmp(*argv, "-CAfile") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			CApath = *(++argv);
+                goto bad;
-			do_ver = 1;
+            CAfile = *(++argv);
-			}
+            do_ver = 1;
-		else if (strcmp(*argv,"-CAfile") == 0)
+        } else if (strcmp(*argv, "-verify") == 0)
-			{
+            do_ver = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			CAfile = *(++argv);
+            text = 1;
-			do_ver = 1;
+        else if (strcmp(*argv, "-hash") == 0)
-			}
+            hash = ++num;
-		else if (strcmp(*argv,"-verify") == 0)
+        else if (strcmp(*argv, "-nameopt") == 0) {
-			do_ver = 1;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-text") == 0)
+                goto bad;
-			text = 1;
+            if (!set_name_ex(&nmflag, *(++argv)))
-		else if (strcmp(*argv,"-hash") == 0)
+                goto bad;
-			hash= ++num;
+        } else if (strcmp(*argv, "-issuer") == 0)
-		else if (strcmp(*argv,"-nameopt") == 0)
+            issuer = ++num;
-			{
+        else if (strcmp(*argv, "-lastupdate") == 0)
-			if (--argc < 1) goto bad;
+            lastupdate = ++num;
-			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+        else if (strcmp(*argv, "-nextupdate") == 0)
-			}
+            nextupdate = ++num;
-		else if (strcmp(*argv,"-issuer") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			issuer= ++num;
+            noout = ++num;
-		else if (strcmp(*argv,"-lastupdate") == 0)
+        else if (strcmp(*argv, "-fingerprint") == 0)
-			lastupdate= ++num;
+            fingerprint = ++num;
-		else if (strcmp(*argv,"-nextupdate") == 0)
+        else if (strcmp(*argv, "-crlnumber") == 0)
-			nextupdate= ++num;
+            crlnumber = ++num;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if ((md_alg = EVP_get_digestbyname(*argv + 1))) {
-			noout= ++num;
+            /* ok */
-		else if (strcmp(*argv,"-fingerprint") == 0)
+            digest = md_alg;
-			fingerprint= ++num;
+        } else {
-		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			{
+            badops = 1;
-			/* ok */
+            break;
-			digest=md_alg;
+        }
-			}
+        argc--;
-		else
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        for (pp = crl_usage; (*pp != NULL); pp++)
-		for (pp=crl_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	x=load_crl(infile,informat);
+    x = load_crl(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
+        goto end;
+    }
 
-	if(do_ver) {
+    if (do_ver) {
-		store = X509_STORE_new();
+        store = X509_STORE_new();
-		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
+        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
-		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
+            goto end;
-			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+        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 (!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)) {
+        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
-			BIO_printf(bio_err,
+        if (lookup == NULL)
-				"Error initialising X509 store\n");
+            goto end;
-			goto end;
+        if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM))
-		}
+            X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
+        ERR_clear_error();
 
-		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
+        if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-					X509_CRL_get_issuer(x), &xobj);
+            BIO_printf(bio_err, "Error initialising X509 store\n");
-		if(i <= 0) {
+            goto end;
-			BIO_printf(bio_err,
+        }
-				"Error getting CRL issuer certificate\n");
-			goto end;
-		}
-		pkey = X509_get_pubkey(xobj.data.x509);
-		X509_OBJECT_free_contents(&xobj);
-		if(!pkey) {
-			BIO_printf(bio_err,
-				"Error getting CRL issuer public key\n");
-			goto end;
-		}
-		i = X509_CRL_verify(x, pkey);
-		EVP_PKEY_free(pkey);
-		if(i < 0) goto end;
-		if(i == 0) BIO_printf(bio_err, "verify failure\n");
-		else BIO_printf(bio_err, "verify OK\n");
-	}
 
-	if (num)
+        i = X509_STORE_get_by_subject(&ctx, X509_LU_X509,
-		{
+                                      X509_CRL_get_issuer(x), &xobj);
-		for (i=1; i<=num; i++)
+        if (i <= 0) {
-			{
+            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
-			if (issuer == i)
+            goto end;
-				{
+        }
-				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
+        pkey = X509_get_pubkey(xobj.data.x509);
-				}
+        X509_OBJECT_free_contents(&xobj);
+        if (!pkey) {
+            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
+            goto end;
+        }
+        i = X509_CRL_verify(x, pkey);
+        EVP_PKEY_free(pkey);
+        if (i < 0)
+            goto end;
+        if (i == 0)
+            BIO_printf(bio_err, "verify failure\n");
+        else
+            BIO_printf(bio_err, "verify OK\n");
+    }
 
-			if (hash == i)
+    if (num) {
-				{
+        for (i = 1; i <= num; i++) {
-				BIO_printf(bio_out,"%08lx\n",
+            if (issuer == i) {
-					X509_NAME_hash(X509_CRL_get_issuer(x)));
+                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
-				}
+                           nmflag);
-			if (lastupdate == i)
+            }
-				{
+            if (crlnumber == i) {
-				BIO_printf(bio_out,"lastUpdate=");
+                ASN1_INTEGER *crlnum;
-				ASN1_TIME_print(bio_out,
+                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
-						X509_CRL_get_lastUpdate(x));
+                BIO_printf(bio_out, "crlNumber=");
-				BIO_printf(bio_out,"\n");
+                if (crlnum) {
-				}
+                    i2a_ASN1_INTEGER(bio_out, crlnum);
-			if (nextupdate == i)
+                    ASN1_INTEGER_free(crlnum);
-				{
+                } else
-				BIO_printf(bio_out,"nextUpdate=");
+                    BIO_puts(bio_out, "<NONE>");
-				if (X509_CRL_get_nextUpdate(x)) 
+                BIO_printf(bio_out, "\n");
-					ASN1_TIME_print(bio_out,
+            }
-						X509_CRL_get_nextUpdate(x));
+            if (hash == i) {
-				else
+                BIO_printf(bio_out, "%08lx\n",
-					BIO_printf(bio_out,"NONE");
+                           X509_NAME_hash(X509_CRL_get_issuer(x)));
-				BIO_printf(bio_out,"\n");
+            }
-				}
+            if (lastupdate == i) {
-			if (fingerprint == i)
+                BIO_printf(bio_out, "lastUpdate=");
-				{
+                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
-				int j;
+                BIO_printf(bio_out, "\n");
-				unsigned int n;
+            }
-				unsigned char md[EVP_MAX_MD_SIZE];
+            if (nextupdate == i) {
+                BIO_printf(bio_out, "nextUpdate=");
+                if (X509_CRL_get_nextUpdate(x))
+                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
+                else
+                    BIO_printf(bio_out, "NONE");
+                BIO_printf(bio_out, "\n");
+            }
+            if (fingerprint == i) {
+                int j;
+                unsigned int n;
+                unsigned char md[EVP_MAX_MD_SIZE];
 
-				if (!X509_CRL_digest(x,digest,md,&n))
+                if (!X509_CRL_digest(x, digest, md, &n)) {
-					{
+                    BIO_printf(bio_err, "out of memory\n");
-					BIO_printf(bio_err,"out of memory\n");
+                    goto end;
-					goto end;
+                }
-					}
+                BIO_printf(bio_out, "%s Fingerprint=",
-				BIO_printf(bio_out,"%s Fingerprint=",
+                           OBJ_nid2sn(EVP_MD_type(digest)));
-						OBJ_nid2sn(EVP_MD_type(digest)));
+                for (j = 0; j < (int)n; j++) {
-				for (j=0; j<(int)n; j++)
+                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
-					{
+                               ? '\n' : ':');
-					BIO_printf(bio_out,"%02X%c",md[j],
+                }
-						(j+1 == (int)n)
+            }
-						?'\n':':');
+        }
-					}
+    }
-				}
-			}
-		}
 
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if (text) X509_CRL_print(out, x);
+    if (text)
+        X509_CRL_print(out, x);
 
-	if (noout) 
+    if (noout) {
-		{
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-		}
 
-	if 	(outformat == FORMAT_ASN1)
+    if (outformat == FORMAT_ASN1)
-		i=(int)i2d_X509_CRL_bio(out,x);
+        i = (int)i2d_X509_CRL_bio(out, x);
-	else if (outformat == FORMAT_PEM)
+    else if (outformat == FORMAT_PEM)
-		i=PEM_write_bio_X509_CRL(out,x);
+        i = PEM_write_bio_X509_CRL(out, x);
-	else	
+    else {
-		{
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+        goto end;
-		goto end;
+    }
-		}
+    if (!i) {
-	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
+        BIO_printf(bio_err, "unable to write CRL\n");
-	ret=0;
+        goto end;
-end:
+    }
-	BIO_free_all(out);
+    ret = 0;
-	BIO_free_all(bio_out);
+ end:
-	bio_out=NULL;
+    BIO_free_all(out);
-	X509_CRL_free(x);
+    BIO_free_all(bio_out);
-	if(store) {
+    bio_out = NULL;
-		X509_STORE_CTX_cleanup(&ctx);
+    X509_CRL_free(x);
-		X509_STORE_free(store);
+    if (store) {
-	}
+        X509_STORE_CTX_cleanup(&ctx);
-	apps_shutdown();
+        X509_STORE_free(store);
-	OPENSSL_EXIT(ret);
+    }
-	}
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static X509_CRL *load_crl(char *infile, int format)
-	{
+{
-	X509_CRL *x=NULL;
+    X509_CRL *x = NULL;
-	BIO *in=NULL;
+    BIO *in = NULL;
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if (in == NULL)
+    if (in == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (format == FORMAT_ASN1)
-		}
+        x = d2i_X509_CRL_bio(in, NULL);
-	if 	(format == FORMAT_ASN1)
+    else if (format == FORMAT_PEM)
-		x=d2i_X509_CRL_bio(in,NULL);
+        x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
-	else if (format == FORMAT_PEM)
+    else {
-		x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
+        BIO_printf(bio_err, "bad input format specified for input crl\n");
-	else	{
+        goto end;
-		BIO_printf(bio_err,"bad input format specified for input crl\n");
+    }
-		goto end;
+    if (x == NULL) {
-		}
+        BIO_printf(bio_err, "unable to load CRL\n");
-	if (x == NULL)
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err,"unable to load CRL\n");
+    }
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	
-end:
-	BIO_free(in);
-	return(x);
-	}
 
+ end:
+    BIO_free(in);
+    return (x);
+}

apps/crl2p7.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,16 +49,18 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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>
@@ -74,272 +76,266 @@
 
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
-#define PROG	crl2pkcs7_main
+#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
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,badops=0;
+    int i, badops = 0;
-	BIO *in=NULL,*out=NULL;
+    BIO *in = NULL, *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile,*outfile,*prog,*certfile;
+    char *infile, *outfile, *prog, *certfile;
-	PKCS7 *p7 = NULL;
+    PKCS7 *p7 = NULL;
-	PKCS7_SIGNED *p7s = NULL;
+    PKCS7_SIGNED *p7s = NULL;
-	X509_CRL *crl=NULL;
+    X509_CRL *crl = NULL;
-	STACK *certflst=NULL;
+    STACK *certflst = NULL;
-	STACK_OF(X509_CRL) *crl_stack=NULL;
+    STACK_OF(X509_CRL) *crl_stack = NULL;
-	STACK_OF(X509) *cert_stack=NULL;
+    STACK_OF(X509) *cert_stack = NULL;
-	int ret=1,nocrl=0;
+    int ret = 1, nocrl = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-nocrl") == 0) {
-			if (--argc < 1) goto bad;
+            nocrl = 1;
-			infile= *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-nocrl") == 0)
+                goto bad;
-			{
+            outfile = *(++argv);
-			nocrl=1;
+        } else if (strcmp(*argv, "-certfile") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-out") == 0)
+                goto bad;
-			{
+            if (!certflst)
-			if (--argc < 1) goto bad;
+                certflst = sk_new_null();
-			outfile= *(++argv);
+            if (!certflst)
-			}
+                goto end;
-		else if (strcmp(*argv,"-certfile") == 0)
+            if (!sk_push(certflst, *(++argv))) {
-			{
+                sk_free(certflst);
-			if (--argc < 1) goto bad;
+                goto end;
-			if(!certflst) certflst = sk_new_null();
+            }
-			sk_push(certflst,*(++argv));
+        } else {
-			}
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else
+            badops = 1;
-			{
+            break;
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+        }
-			badops=1;
+        argc--;
-			break;
+        argv++;
-			}
+    }
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg    input format - DER or PEM\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," -outform arg   output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg        input file\n");
-		BIO_printf(bio_err," -in arg        input file\n");
+        BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -out arg       output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
+                   " -certfile arg  certificates file of chain to a trusted CA\n");
-		BIO_printf(bio_err,"                (can be used more than once)\n");
+        BIO_printf(bio_err, "                (can be used more than once)\n");
-		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
+        BIO_printf(bio_err,
-		ret = 1;
+                   " -nocrl         no crl to load, just certs from '-certfile'\n");
-		goto end;
+        ret = 1;
-		}
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (!nocrl)
+    if (!nocrl) {
-		{
+        if (infile == NULL)
-		if (infile == NULL)
+            BIO_set_fp(in, stdin, BIO_NOCLOSE);
-			BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        else {
-		else
+            if (BIO_read_filename(in, infile) <= 0) {
-			{
+                perror(infile);
-			if (BIO_read_filename(in,infile) <= 0)
+                goto end;
-				{
+            }
-				perror(infile);
+        }
-				goto end;
-				}
-			}
 
-		if 	(informat == FORMAT_ASN1)
+        if (informat == FORMAT_ASN1)
-			crl=d2i_X509_CRL_bio(in,NULL);
+            crl = d2i_X509_CRL_bio(in, NULL);
-		else if (informat == FORMAT_PEM)
+        else if (informat == FORMAT_PEM)
-			crl=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
+            crl = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
-		else	{
+        else {
-			BIO_printf(bio_err,"bad input format specified for input crl\n");
+            BIO_printf(bio_err, "bad input format specified for input crl\n");
-			goto end;
+            goto end;
-			}
+        }
-		if (crl == NULL)
+        if (crl == NULL) {
-			{
+            BIO_printf(bio_err, "unable to load CRL\n");
-			BIO_printf(bio_err,"unable to load CRL\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+    }
-		}
-	
-	if ((p7=PKCS7_new()) == NULL) 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 ((p7 = PKCS7_new()) == NULL)
-	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
+        goto end;
-	p7s->crl=crl_stack;
+    if ((p7s = PKCS7_SIGNED_new()) == NULL)
-	if (crl != NULL)
+        goto end;
-		{
+    p7->type = OBJ_nid2obj(NID_pkcs7_signed);
-		sk_X509_CRL_push(crl_stack,crl);
+    p7->d.sign = p7s;
-		crl=NULL; /* now part of p7 for OPENSSL_freeing */
+    p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
-		}
 
-	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
+    if (!ASN1_INTEGER_set(p7s->version, 1))
-	p7s->cert=cert_stack;
+        goto end;
+    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+        goto end;
+    p7s->crl = crl_stack;
+    if (crl != NULL) {
+        sk_X509_CRL_push(crl_stack, crl);
+        crl = NULL;             /* now part of p7 for OPENSSL_freeing */
+    }
 
-	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
+    if ((cert_stack = sk_X509_new_null()) == NULL)
-		certfile = sk_value(certflst, i);
+        goto end;
-		if (add_certs_from_file(cert_stack,certfile) < 0)
+    p7s->cert = cert_stack;
-			{
-			BIO_printf(bio_err, "error loading certificates\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-	}
 
-	sk_free(certflst);
+    if (certflst)
+        for (i = 0; i < sk_num(certflst); i++) {
+            certfile = sk_value(certflst, i);
+            if (add_certs_from_file(cert_stack, certfile) < 0) {
+                BIO_printf(bio_err, "error loading certificates\n");
+                ERR_print_errors(bio_err);
+                goto end;
+            }
+        }
 
-	if (outfile == NULL)
+    sk_free(certflst);
-		{
+
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+    if (outfile == NULL) {
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if 	(outformat == FORMAT_ASN1)
+    if (outformat == FORMAT_ASN1)
-		i=i2d_PKCS7_bio(out,p7);
+        i = i2d_PKCS7_bio(out, p7);
-	else if (outformat == FORMAT_PEM)
+    else if (outformat == FORMAT_PEM)
-		i=PEM_write_bio_PKCS7(out,p7);
+        i = PEM_write_bio_PKCS7(out, p7);
-	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;
+        goto end;
-		}
+    }
-	if (!i)
+    if (!i) {
-		{
+        BIO_printf(bio_err, "unable to write pkcs7 object\n");
-		BIO_printf(bio_err,"unable to write pkcs7 object\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    ret = 0;
-	ret=0;
+ end:
-end:
+    if (in != NULL)
-	if (in != NULL) BIO_free(in);
+        BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
+    if (out != NULL)
-	if (p7 != NULL) PKCS7_free(p7);
+        BIO_free_all(out);
-	if (crl != NULL) X509_CRL_free(crl);
+    if (p7 != NULL)
+        PKCS7_free(p7);
+    if (crl != NULL)
+        X509_CRL_free(crl);
 
-	apps_shutdown();
+    apps_shutdown();
-	OPENSSL_EXIT(ret);
+    OPENSSL_EXIT(ret);
-	}
+}
 
-/*
+/*-
  *----------------------------------------------------------------------
  * int add_certs_from_file
  *
- *	Read a list of certificates to be checked from a file.
+ *      Read a list of certificates to be checked from a file.
  *
  * Results:
- *	number of certs added if successful, -1 if not.
+ *      number of certs added if successful, -1 if not.
  *----------------------------------------------------------------------
  */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
-	{
+{
-	struct stat st;
+    struct stat st;
-	BIO *in=NULL;
+    BIO *in = NULL;
-	int count=0;
+    int count = 0;
-	int ret= -1;
+    int ret = -1;
-	STACK_OF(X509_INFO) *sk=NULL;
+    STACK_OF(X509_INFO) *sk = NULL;
-	X509_INFO *xi;
+    X509_INFO *xi;
 
-	if ((stat(certfile,&st) != 0))
+    if ((stat(certfile, &st) != 0)) {
-		{
+        BIO_printf(bio_err, "unable to load the file, %s\n", certfile);
-		BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
+        goto end;
-		goto end;
+    }
-		}
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
+    if ((in == NULL) || (BIO_read_filename(in, certfile) <= 0)) {
-		{
+        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
-		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
+        goto end;
-		goto end;
+    }
-		}
 
-	/* This loads from a file, a stack of x509/crl/pkey sets */
+    /* This loads from a file, a stack of x509/crl/pkey sets */
-	sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
+    sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
-	if (sk == NULL) {
+    if (sk == NULL) {
-		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
+        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
-		goto end;
+        goto end;
-	}
+    }
 
-	/* scan over it and pull out the CRL's */
+    /* 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);
-		xi=sk_X509_INFO_shift(sk);
+        if (xi->x509 != NULL) {
-		if (xi->x509 != NULL)
+            sk_X509_push(stack, xi->x509);
-			{
+            xi->x509 = NULL;
-			sk_X509_push(stack,xi->x509);
+            count++;
-			xi->x509=NULL;
+        }
-			count++;
+        X509_INFO_free(xi);
-			}
+    }
-		X509_INFO_free(xi);
-		}
-
-	ret=count;
-end:
- 	/* never need to OPENSSL_free x */
-	if (in != NULL) BIO_free(in);
-	if (sk != NULL) sk_X509_INFO_free(sk);
-	return(ret);
-	}
 
+    ret = count;
+ end:
+    /* never need to OPENSSL_free x */
+    if (in != NULL)
+        BIO_free(in);
+    if (sk != NULL)
+        sk_X509_INFO_free(sk);
+    return (ret);
+}

apps/dgst.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -66,412 +66,457 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/hmac.h>
 
 #undef BUFSIZE
-#define BUFSIZE	1024*8
+#define BUFSIZE 1024*8
 
 #undef PROG
-#define PROG	dgst_main
+#define PROG    dgst_main
 
 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,
+          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 **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	unsigned char *buf=NULL;
+    unsigned char *buf = NULL;
-	int i,err=0;
+    int i, err = 1;
-	const EVP_MD *md=NULL,*m;
+    const EVP_MD *md = NULL, *m;
-	BIO *in=NULL,*inp;
+    BIO *in = NULL, *inp;
-	BIO *bmd=NULL;
+    BIO *bmd = NULL;
-	BIO *out = NULL;
+    BIO *out = NULL;
-	const char *name;
+    const char *name;
 #define PROG_NAME_SIZE  39
-	char pname[PROG_NAME_SIZE+1];
+    char pname[PROG_NAME_SIZE + 1];
-	int separator=0;
+    int separator = 0;
-	int debug=0;
+    int debug = 0;
-	int keyform=FORMAT_PEM;
+    int keyform = FORMAT_PEM;
-	const char *outfile = NULL, *keyfile = NULL;
+    const char *outfile = NULL, *keyfile = NULL;
-	const char *sigfile = NULL, *randfile = NULL;
+    const char *sigfile = NULL, *randfile = NULL;
-	int out_bin = -1, want_pub = 0, do_verify = 0;
+    int out_bin = -1, want_pub = 0, do_verify = 0;
-	EVP_PKEY *sigkey = NULL;
+    EVP_PKEY *sigkey = NULL;
-	unsigned char *sigbuf = NULL;
+    unsigned char *sigbuf = NULL;
-	int siglen = 0;
+    int siglen = 0;
-	char *passargin = NULL, *passin = NULL;
+    unsigned int sig_flags = 0;
+    char *passargin = NULL, *passin = NULL;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
+#endif
+    char *hmac_key = NULL;
+    int non_fips_allow = 0;
+
+    apps_startup();
+    ERR_load_crypto_strings();
+    if ((buf = (unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL) {
+        BIO_printf(bio_err, "out of memory\n");
+        goto end;
+    }
+    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 (!load_config(bio_err, NULL))
+        goto end;
+
+    /* first check the program name */
+    program_name(argv[0], pname, sizeof pname);
+
+    md = EVP_get_digestbyname(pname);
+
+    argc--;
+    argv++;
+    while (argc > 0) {
+        if ((*argv)[0] != '-')
+            break;
+        if (strcmp(*argv, "-c") == 0)
+            separator = 1;
+        else if (strcmp(*argv, "-rand") == 0) {
+            if (--argc < 1)
+                break;
+            randfile = *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
+            if (--argc < 1)
+                break;
+            outfile = *(++argv);
+        } else if (strcmp(*argv, "-sign") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+        } else if (!strcmp(*argv, "-passin")) {
+            if (--argc < 1)
+                break;
+            passargin = *++argv;
+        } else if (strcmp(*argv, "-verify") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+            want_pub = 1;
+            do_verify = 1;
+        } else if (strcmp(*argv, "-prverify") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+            do_verify = 1;
+        } else if (strcmp(*argv, "-x931") == 0)
+            sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
+        else if (strcmp(*argv, "-pss_saltlen") == 0) {
+            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) {
+            if (--argc < 1)
+                break;
+            keyform = str2fmt(*(++argv));
+        }
+#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-engine") == 0) {
+            if (--argc < 1)
+                break;
+            engine = *(++argv);
+        }
+#endif
+        else if (strcmp(*argv, "-hex") == 0)
+            out_bin = 0;
+        else if (strcmp(*argv, "-binary") == 0)
+            out_bin = 1;
+        else if (strcmp(*argv, "-d") == 0)
+            debug = 1;
+        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;
+        argc--;
+        argv++;
+    }
+
+    if (md == NULL)
+        md = EVP_md5();
+
+    if (do_verify && !sigfile) {
+        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 */
+        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, "-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,
+                   "-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");
 #endif
 
-	apps_startup();
+        BIO_printf(bio_err,
-
+                   "-%-14s to use the %s message digest algorithm (default)\n",
-	if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
+                   LN_md5, LN_md5);
-		{
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-		BIO_printf(bio_err,"out of memory\n");
+                   LN_md4, LN_md4);
-		goto end;
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-		}
+                   LN_md2, LN_md2);
-	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 (!load_config(bio_err, NULL))
-		goto end;
-
-	/* first check the program name */
-	program_name(argv[0],pname,sizeof pname);
-
-	md=EVP_get_digestbyname(pname);
-
-	argc--;
-	argv++;
-	while (argc > 0)
-		{
-		if ((*argv)[0] != '-') break;
-		if (strcmp(*argv,"-c") == 0)
-			separator=1;
-		else if (strcmp(*argv,"-rand") == 0)
-			{
-			if (--argc < 1) break;
-			randfile=*(++argv);
-			}
-		else if (strcmp(*argv,"-out") == 0)
-			{
-			if (--argc < 1) break;
-			outfile=*(++argv);
-			}
-		else if (strcmp(*argv,"-sign") == 0)
-			{
-			if (--argc < 1) break;
-			keyfile=*(++argv);
-			}
-		else if (!strcmp(*argv,"-passin"))
-			{
-			if (--argc < 1)
-				break;
-			passargin=*++argv;
-			}
-		else if (strcmp(*argv,"-verify") == 0)
-			{
-			if (--argc < 1) break;
-			keyfile=*(++argv);
-			want_pub = 1;
-			do_verify = 1;
-			}
-		else if (strcmp(*argv,"-prverify") == 0)
-			{
-			if (--argc < 1) break;
-			keyfile=*(++argv);
-			do_verify = 1;
-			}
-		else if (strcmp(*argv,"-signature") == 0)
-			{
-			if (--argc < 1) break;
-			sigfile=*(++argv);
-			}
-		else if (strcmp(*argv,"-keyform") == 0)
-			{
-			if (--argc < 1) break;
-			keyform=str2fmt(*(++argv));
-			}
-#ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) break;
-			engine= *(++argv);
-			}
-#endif
-		else if (strcmp(*argv,"-hex") == 0)
-			out_bin = 0;
-		else if (strcmp(*argv,"-binary") == 0)
-			out_bin = 1;
-		else if (strcmp(*argv,"-d") == 0)
-			debug=1;
-		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
-			md=m;
-		else
-			break;
-		argc--;
-		argv++;
-		}
-
-	if (md == NULL)
-		md=EVP_md5();
-
-	if(do_verify && !sigfile) {
-		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 */
-		{
-		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,"-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,"-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");
-#ifndef OPENSSL_NO_ENGINE
-		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",
-			LN_md5,LN_md5);
-		BIO_printf(bio_err,"-%3s 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",
-			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);
+                   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);
+                   LN_sha, LN_sha);
-#ifndef OPENSSL_NO_SHA256
+# 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_sha256,LN_sha256);
+                   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, "-%-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
-#ifndef OPENSSL_NO_SHA512
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+                   LN_mdc2, LN_mdc2);
-			LN_sha512,LN_sha512);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
-#endif
+                   LN_ripemd160, LN_ripemd160);
-#endif
+        err = 1;
-		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+        goto end;
-			LN_mdc2,LN_mdc2);
+    }
-		BIO_printf(bio_err,"-%3s 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);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	bmd=BIO_new(BIO_f_md());
+    bmd = BIO_new(BIO_f_md());
-	if (debug)
+    if (debug) {
-		{
+        BIO_set_callback(in, BIO_debug_callback);
-		BIO_set_callback(in,BIO_debug_callback);
+        /* needed for windows 3.1 */
-		/* needed for windows 3.1 */
+        BIO_set_callback_arg(in, (char *)bio_err);
-		BIO_set_callback_arg(in,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");
-		BIO_printf(bio_err, "Error getting password\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	if ((in == NULL) || (bmd == NULL))
+    if ((in == NULL) || (bmd == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if(out_bin == -1) {
+    if (out_bin == -1) {
-		if(keyfile) out_bin = 1;
+        if (keyfile)
-		else out_bin = 0;
+            out_bin = 1;
-	}
+        else
+            out_bin = 0;
+    }
 
-	if(randfile)
+    if (randfile)
-		app_RAND_load_file(randfile, bio_err, 0);
+        app_RAND_load_file(randfile, bio_err, 0);
 
-	if(outfile) {
+    if (outfile) {
-		if(out_bin)
+        if (out_bin)
-			out = BIO_new_file(outfile, "wb");
+            out = BIO_new_file(outfile, "wb");
-		else    out = BIO_new_file(outfile, "w");
+        else
-	} else {
+            out = BIO_new_file(outfile, "w");
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
+    } else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
 
-	if(!out) {
+    if (!out) {
-		BIO_printf(bio_err, "Error opening output file %s\n", 
+        BIO_printf(bio_err, "Error opening output file %s\n",
-					outfile ? outfile : "(stdout)");
+                   outfile ? outfile : "(stdout)");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	if(keyfile)
+    if (keyfile) {
-		{
+        if (want_pub)
-		if (want_pub)
+            sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
-			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
+                                 e, "key file");
-				e, "key file");
+        else
-		else
+            sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
-			sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
+                              e, "key file");
-				e, "key file");
+        if (!sigkey) {
-		if (!sigkey)
+            /*
-			{
+             * load_[pub]key() has already printed an appropriate message
-			/* load_[pub]key() has already printed an appropriate
+             */
-			   message */
+            goto end;
-			goto end;
+        }
-			}
+    }
-		}
 
-	if(sigfile && sigkey) {
+    if (sigfile && sigkey) {
-		BIO *sigbio;
+        BIO *sigbio;
-		sigbio = BIO_new_file(sigfile, "rb");
+        sigbio = BIO_new_file(sigfile, "rb");
-		siglen = EVP_PKEY_size(sigkey);
+        siglen = EVP_PKEY_size(sigkey);
-		sigbuf = OPENSSL_malloc(siglen);
+        sigbuf = OPENSSL_malloc(siglen);
-		if(!sigbio) {
+        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);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-		}
+        siglen = BIO_read(sigbio, sigbuf, siglen);
-		siglen = BIO_read(sigbio, sigbuf, siglen);
+        BIO_free(sigbio);
-		BIO_free(sigbio);
+        if (siglen <= 0) {
-		if(siglen <= 0) {
+            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
-			BIO_printf(bio_err, "Error reading signature file %s\n",
+            ERR_print_errors(bio_err);
-								sigfile);
+            goto end;
-			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);
+    }
 
-	/* we use md as a filter, reading from 'in' */
+    if (sig_flags) {
-	if (!BIO_set_md(bmd,md))
+        EVP_MD_CTX *md_ctx;
-		{
+        BIO_get_md_ctx(bmd, &md_ctx);
-		BIO_printf(bio_err, "Error setting digest %s\n", pname);
+        EVP_MD_CTX_set_flags(md_ctx, sig_flags);
-		ERR_print_errors(bio_err);
+    }
-		goto end;
-		}
-		
-	inp=BIO_push(bmd,in);
 
-	if (argc == 0)
+    /* we use md as a filter, reading from 'in' */
-		{
+    if (!BIO_set_md(bmd, md)) {
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_printf(bio_err, "Error setting digest %s\n", pname);
-		err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
+        ERR_print_errors(bio_err);
-			  siglen,"","(stdin)");
+        goto end;
-		}
+    }
-	else
-		{
-		name=OBJ_nid2sn(md->type);
-		for (i=0; i<argc; i++)
-			{
-			char *tmp,*tofree=NULL;
-			int r;
 
-			if (BIO_read_filename(in,argv[i]) <= 0)
+    inp = BIO_push(bmd, in);
-				{
+
-				perror(argv[i]);
+    if (argc == 0) {
-				err++;
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-				continue;
+        err = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
-				}
+                    siglen, "", "(stdin)", bmd, hmac_key, non_fips_allow);
-			if(!out_bin)
+    } else {
-				{
+        name = OBJ_nid2sn(md->type);
-				size_t len = strlen(name)+strlen(argv[i])+5;
+        err = 0;
-				tmp=tofree=OPENSSL_malloc(len);
+        for (i = 0; i < argc; i++) {
-				BIO_snprintf(tmp,len,"%s(%s)= ",name,argv[i]);
+            char *tmp, *tofree = NULL;
-				}
+            int r;
-			else
+
-				tmp="";
+            if (BIO_read_filename(in, argv[i]) <= 0) {
-			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
+                perror(argv[i]);
-				siglen,tmp,argv[i]);
+                err++;
-			if(r)
+                continue;
-			    err=r;
+            }
-			if(tofree)
+            if (!out_bin) {
-				OPENSSL_free(tofree);
+                size_t len =
-			(void)BIO_reset(bmd);
+                    strlen(name) + strlen(argv[i]) + (hmac_key ? 5 : 0) + 5;
-			}
+                tmp = tofree = OPENSSL_malloc(len);
-		}
+                BIO_snprintf(tmp, len, "%s%s(%s)= ",
-end:
+                             hmac_key ? "HMAC-" : "", name, argv[i]);
-	if (buf != NULL)
+            } else
-		{
+                tmp = "";
-		OPENSSL_cleanse(buf,BUFSIZE);
+            r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
-		OPENSSL_free(buf);
+                      siglen, tmp, argv[i], bmd, hmac_key, non_fips_allow);
-		}
+            if (r)
-	if (in != NULL) BIO_free(in);
+                err = r;
-	if (passin)
+            if (tofree)
-		OPENSSL_free(passin);
+                OPENSSL_free(tofree);
-	BIO_free_all(out);
+            (void)BIO_reset(bmd);
-	EVP_PKEY_free(sigkey);
+        }
-	if(sigbuf) OPENSSL_free(sigbuf);
+    }
-	if (bmd != NULL) BIO_free(bmd);
+ end:
-	apps_shutdown();
+    if (buf != NULL) {
-	OPENSSL_EXIT(err);
+        OPENSSL_cleanse(buf, BUFSIZE);
-	}
+        OPENSSL_free(buf);
+    }
+    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 (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,
+          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;
+{
-	int i;
+    unsigned int len;
+    int i;
+    EVP_MD_CTX *md_ctx;
+    HMAC_CTX hmac_ctx;
 
-	for (;;)
+    if (hmac_key) {
-		{
+        EVP_MD *md;
-		i=BIO_read(bp,(char *)buf,BUFSIZE);
-		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(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)
-			{
-			BIO_printf(out, "Verification Failure\n");
-			return 1;
-			}
-		else
-			{
-			BIO_printf(bio_err, "Error Verifying Data\n");
-			ERR_print_errors(bio_err);
-			return 1;
-			}
-		return 0;
-		}
-	if(key)
-		{
-		EVP_MD_CTX *ctx;
-		BIO_get_md_ctx(bp, &ctx);
-		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
-		len=BIO_gets(bp,(char *)buf,BUFSIZE);
 
-	if(binout) BIO_write(out, buf, len);
+        BIO_get_md(bmd, &md);
-	else 
+        HMAC_CTX_init(&hmac_ctx);
-		{
+        HMAC_Init_ex(&hmac_ctx, hmac_key, strlen(hmac_key), md, NULL);
-		BIO_write(out,title,strlen(title));
+        BIO_get_md_ctx(bmd, &md_ctx);
-		for (i=0; i<len; i++)
+        BIO_set_md_ctx(bmd, &hmac_ctx.md_ctx);
-			{
+    }
-			if (sep && (i != 0))
+    for (;;) {
-				BIO_printf(out, ":");
+        i = BIO_read(bp, (char *)buf, BUFSIZE);
-			BIO_printf(out, "%02x",buf[i]);
+        if (i < 0) {
-			}
+            BIO_printf(bio_err, "Read Error in %s\n", file);
-		BIO_printf(out, "\n");
+            ERR_print_errors(bio_err);
-		}
+            return 1;
-	return 0;
+        }
-	}
+        if (i == 0)
+            break;
+    }
+    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) {
+            BIO_printf(out, "Verification Failure\n");
+            return 1;
+        } else {
+            BIO_printf(bio_err, "Error Verifying Data\n");
+            ERR_print_errors(bio_err);
+            return 1;
+        }
+        return 0;
+    }
+    if (key) {
+        EVP_MD_CTX *ctx;
+        BIO_get_md_ctx(bp, &ctx);
+        if (!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) {
+            BIO_printf(bio_err, "Error Signing Data\n");
+            ERR_print_errors(bio_err);
+            return 1;
+        }
+    } else if (hmac_key) {
+        HMAC_Final(&hmac_ctx, buf, &len);
+        HMAC_CTX_cleanup(&hmac_ctx);
+    } else
+        len = BIO_gets(bp, (char *)buf, BUFSIZE);
 
+    if (binout)
+        BIO_write(out, buf, len);
+    else {
+        BIO_write(out, title, strlen(title));
+        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

@@ -6,21 +6,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -35,10 +35,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,34 +50,36 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dh_main
+# define PROG    dh_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -check	- check the parameters are ok
+ * -check       - check the parameters are ok
  * -noout
  * -text
  * -C
@@ -86,266 +88,244 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-#ifndef OPENSSL_NO_ENGINE
+    DH *dh = NULL;
-	ENGINE *e = NULL;
+    int i, badops = 0, text = 0;
-#endif
+    BIO *in = NULL, *out = NULL;
-	DH *dh=NULL;
+    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
-	int i,badops=0,text=0;
+    char *infile, *outfile, *prog;
-	BIO *in=NULL,*out=NULL;
+# ifndef OPENSSL_NO_ENGINE
-	int informat,outformat,check=0,noout=0,C=0,ret=1;
+    char *engine;
-	char *infile,*outfile,*prog;
+# endif
-#ifndef OPENSSL_NO_ENGINE
+
-	char *engine;
+    apps_startup();
-#endif
+
-
+    if (bio_err == NULL)
-	apps_startup();
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-	if (bio_err == NULL)
+
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+    if (!load_config(bio_err, NULL))
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+        goto end;
-
+
-	if (!load_config(bio_err, NULL))
+# ifndef OPENSSL_NO_ENGINE
-		goto end;
+    engine = NULL;
-
+# endif
-#ifndef OPENSSL_NO_ENGINE
+    infile = NULL;
-	engine=NULL;
+    outfile = NULL;
-#endif
+    informat = FORMAT_PEM;
-	infile=NULL;
+    outformat = FORMAT_PEM;
-	outfile=NULL;
+
-	informat=FORMAT_PEM;
+    prog = argv[0];
-	outformat=FORMAT_PEM;
+    argc--;
-
+    argv++;
-	prog=argv[0];
+    while (argc >= 1) {
-	argc--;
+        if (strcmp(*argv, "-inform") == 0) {
-	argv++;
+            if (--argc < 1)
-	while (argc >= 1)
+                goto bad;
-		{
+            informat = str2fmt(*(++argv));
-		if 	(strcmp(*argv,"-inform") == 0)
+        } else if (strcmp(*argv, "-outform") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			informat=str2fmt(*(++argv));
+            outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            infile = *(++argv);
-			outformat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-out") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-in") == 0)
+                goto bad;
-			{
+            outfile = *(++argv);
-			if (--argc < 1) goto bad;
+        }
-			infile= *(++argv);
+# ifndef OPENSSL_NO_ENGINE
-			}
+        else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            engine = *(++argv);
-			outfile= *(++argv);
+        }
-			}
+# endif
-#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-check") == 0)
-		else if (strcmp(*argv,"-engine") == 0)
+            check = 1;
-			{
+        else if (strcmp(*argv, "-text") == 0)
-			if (--argc < 1) goto bad;
+            text = 1;
-			engine= *(++argv);
+        else if (strcmp(*argv, "-C") == 0)
-			}
+            C = 1;
-#endif
+        else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-check") == 0)
+            noout = 1;
-			check=1;
+        else {
-		else if (strcmp(*argv,"-text") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			text=1;
+            badops = 1;
-		else if (strcmp(*argv,"-C") == 0)
+            break;
-			C=1;
+        }
-		else if (strcmp(*argv,"-noout") == 0)
+        argc--;
-			noout=1;
+        argv++;
-		else
+    }
-			{
+
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+    if (badops) {
-			badops=1;
+ bad:
-			break;
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-			}
+        BIO_printf(bio_err, "where options are\n");
-		argc--;
+        BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		argv++;
+        BIO_printf(bio_err,
-		}
+                   " -outform arg  output format - one of DER PEM\n");
-
+        BIO_printf(bio_err, " -in arg       input file\n");
-	if (badops)
+        BIO_printf(bio_err, " -out arg      output file\n");
-		{
+        BIO_printf(bio_err, " -check        check the DH parameters\n");
-bad:
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+                   " -text         print a text form of the DH parameters\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
+        BIO_printf(bio_err, " -noout        no output\n");
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -out arg      output file\n");
+                   " -engine e     use engine e, possibly a hardware device.\n");
-		BIO_printf(bio_err," -check        check the DH parameters\n");
+# endif
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        goto end;
-		BIO_printf(bio_err," -C            Output C code\n");
+    }
-		BIO_printf(bio_err," -noout        no output\n");
+
-#ifndef OPENSSL_NO_ENGINE
+    ERR_load_crypto_strings();
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+
-#endif
+# ifndef OPENSSL_NO_ENGINE
-		goto end;
+    setup_engine(bio_err, engine, 0);
-		}
+# endif
-
+
-	ERR_load_crypto_strings();
+    in = BIO_new(BIO_s_file());
-
+    out = BIO_new(BIO_s_file());
-#ifndef OPENSSL_NO_ENGINE
+    if ((in == NULL) || (out == NULL)) {
-        e = setup_engine(bio_err, engine, 0);
+        ERR_print_errors(bio_err);
-#endif
+        goto end;
-
+    }
-	in=BIO_new(BIO_s_file());
+
-	out=BIO_new(BIO_s_file());
+    if (infile == NULL)
-	if ((in == NULL) || (out == NULL))
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-		{
+    else {
-		ERR_print_errors(bio_err);
+        if (BIO_read_filename(in, infile) <= 0) {
-		goto end;
+            perror(infile);
-		}
+            goto end;
-
+        }
-	if (infile == NULL)
+    }
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+    if (outfile == NULL) {
-	else
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		{
+# ifdef OPENSSL_SYS_VMS
-		if (BIO_read_filename(in,infile) <= 0)
+        {
-			{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			perror(infile);
+            out = BIO_push(tmpbio, out);
-			goto end;
+        }
-			}
+# endif
-		}
+    } else {
-	if (outfile == NULL)
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+            goto end;
-#ifdef OPENSSL_SYS_VMS
+        }
-		{
+    }
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+
-		out = BIO_push(tmpbio, out);
+    if (informat == FORMAT_ASN1)
-		}
+        dh = d2i_DHparams_bio(in, NULL);
-#endif
+    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");
-		if (BIO_write_filename(out,outfile) <= 0)
+        goto end;
-			{
+    }
-			perror(outfile);
+    if (dh == NULL) {
-			goto end;
+        BIO_printf(bio_err, "unable to load DH parameters\n");
-			}
+        ERR_print_errors(bio_err);
-		}
+        goto end;
-
+    }
-	if	(informat == FORMAT_ASN1)
+
-		dh=d2i_DHparams_bio(in,NULL);
+    if (text) {
-	else if (informat == FORMAT_PEM)
+        DHparams_print(out, dh);
-		dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
+# ifdef undef
-	else
+        printf("p=");
-		{
+        BN_print(stdout, dh->p);
-		BIO_printf(bio_err,"bad input format specified\n");
+        printf("\ng=");
-		goto end;
+        BN_print(stdout, dh->g);
-		}
+        printf("\n");
-	if (dh == NULL)
+        if (dh->length != 0)
-		{
+            printf("recommended private length=%ld\n", dh->length);
-		BIO_printf(bio_err,"unable to load DH parameters\n");
+# endif
-		ERR_print_errors(bio_err);
+    }
-		goto end;
+
-		}
+    if (check) {
-
+        if (!DH_check(dh, &i)) {
-	
+            ERR_print_errors(bio_err);
-
+            goto end;
-	if (text)
+        }
-		{
+        if (i & DH_CHECK_P_NOT_PRIME)
-		DHparams_print(out,dh);
+            printf("p value is not prime\n");
-#ifdef undef
+        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-		printf("p=");
+            printf("p value is not a safe prime\n");
-		BN_print(stdout,dh->p);
+        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-		printf("\ng=");
+            printf("unable to check the generator value\n");
-		BN_print(stdout,dh->g);
+        if (i & DH_NOT_SUITABLE_GENERATOR)
-		printf("\n");
+            printf("the g value is not a generator\n");
-		if (dh->length != 0)
+        if (i == 0)
-			printf("recommended private length=%ld\n",dh->length);
+            printf("DH parameters appear to be ok.\n");
-#endif
+    }
-		}
+    if (C) {
-	
+        unsigned char *data;
-	if (check)
+        int len, l, bits;
-		{
+
-		if (!DH_check(dh,&i))
+        len = BN_num_bytes(dh->p);
-			{
+        bits = BN_num_bits(dh->p);
-			ERR_print_errors(bio_err);
+        data = (unsigned char *)OPENSSL_malloc(len);
-			goto end;
+        if (data == NULL) {
-			}
+            perror("OPENSSL_malloc");
-		if (i & DH_CHECK_P_NOT_PRIME)
+            goto end;
-			printf("p value is not prime\n");
+        }
-		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
+        l = BN_bn2bin(dh->p, data);
-			printf("p value is not a safe prime\n");
+        printf("static unsigned char dh%d_p[]={", bits);
-		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
+        for (i = 0; i < l; i++) {
-			printf("unable to check the generator value\n");
+            if ((i % 12) == 0)
-		if (i & DH_NOT_SUITABLE_GENERATOR)
+                printf("\n\t");
-			printf("the g value is not a generator\n");
+            printf("0x%02X,", data[i]);
-		if (i == 0)
+        }
-			printf("DH parameters appear to be ok.\n");
+        printf("\n\t};\n");
-		}
+
-	if (C)
+        l = BN_bn2bin(dh->g, data);
-		{
+        printf("static unsigned char dh%d_g[]={", bits);
-		unsigned char *data;
+        for (i = 0; i < l; i++) {
-		int len,l,bits;
+            if ((i % 12) == 0)
-
+                printf("\n\t");
-		len=BN_num_bytes(dh->p);
+            printf("0x%02X,", data[i]);
-		bits=BN_num_bits(dh->p);
+        }
-		data=(unsigned char *)OPENSSL_malloc(len);
+        printf("\n\t};\n\n");
-		if (data == NULL)
+
-			{
+        printf("DH *get_dh%d()\n\t{\n", bits);
-			perror("OPENSSL_malloc");
+        printf("\tDH *dh;\n\n");
-			goto end;
+        printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
-			}
+        printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
-		l=BN_bn2bin(dh->p,data);
+               bits, bits);
-		printf("static unsigned char dh%d_p[]={",bits);
+        printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
-		for (i=0; i<l; i++)
+               bits, bits);
-			{
+        printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
-			if ((i%12) == 0) printf("\n\t");
+        printf("\t\treturn(NULL);\n");
-			printf("0x%02X,",data[i]);
+        printf("\treturn(dh);\n\t}\n");
-			}
+        OPENSSL_free(data);
-		printf("\n\t};\n");
+    }
-
+
-		l=BN_bn2bin(dh->g,data);
+    if (!noout) {
-		printf("static unsigned char dh%d_g[]={",bits);
+        if (outformat == FORMAT_ASN1)
-		for (i=0; i<l; i++)
+            i = i2d_DHparams_bio(out, dh);
-			{
+        else if (outformat == FORMAT_PEM)
-			if ((i%12) == 0) printf("\n\t");
+            i = PEM_write_bio_DHparams(out, dh);
-			printf("0x%02X,",data[i]);
+        else {
-			}
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-		printf("\n\t};\n\n");
+            goto end;
-
+        }
-		printf("DH *get_dh%d()\n\t{\n",bits);
+        if (!i) {
-		printf("\tDH *dh;\n\n");
+            BIO_printf(bio_err, "unable to write DH parameters\n");
-		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
+            ERR_print_errors(bio_err);
-		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
+            goto end;
-			bits,bits);
+        }
-		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
+    }
-			bits,bits);
+    ret = 0;
-		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
+ end:
-		printf("\t\treturn(NULL);\n");
+    if (in != NULL)
-		printf("\treturn(dh);\n\t}\n");
+        BIO_free(in);
-		OPENSSL_free(data);
+    if (out != NULL)
-		}
+        BIO_free_all(out);
-
+    if (dh != NULL)
-
+        DH_free(dh);
-	if (!noout)
+    apps_shutdown();
-		{
+    OPENSSL_EXIT(ret);
-		if 	(outformat == FORMAT_ASN1)
+}
-			i=i2d_DHparams_bio(out,dh);
-		else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_DHparams(out,dh);
-		else	{
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
-			goto end;
-			}
-		if (!i)
-			{
-			BIO_printf(bio_err,"unable to write DH parameters\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		}
-	ret=0;
-end:
-	if (in != NULL) BIO_free(in);
-	if (out != NULL) BIO_free_all(out);
-	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 #endif

apps/dhparam.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -109,34 +109,36 @@
  *
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
+#  include <openssl/dsa.h>
-#endif
+# endif
 
-#undef PROG
+# undef PROG
-#define PROG	dhparam_main
+# define PROG    dhparam_main
 
-#define DEFBITS	512
+# define DEFBITS 512
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -dsaparam  - read or generate DSA parameters, convert to DH
- * -check	- check the parameters are ok
+ * -check       - check the parameters are ok
  * -noout
  * -text
  * -C
@@ -147,410 +149,389 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-#ifndef OPENSSL_NO_ENGINE
+    DH *dh = NULL;
-	ENGINE *e = NULL;
+    int i, badops = 0, text = 0;
-#endif
+# ifndef OPENSSL_NO_DSA
-	DH *dh=NULL;
+    int dsaparam = 0;
-	int i,badops=0,text=0;
+# endif
-#ifndef OPENSSL_NO_DSA
+    BIO *in = NULL, *out = NULL;
-	int dsaparam=0;
+    int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
-#endif
+    char *infile, *outfile, *prog;
-	BIO *in=NULL,*out=NULL;
+    char *inrand = NULL;
-	int informat,outformat,check=0,noout=0,C=0,ret=1;
+# ifndef OPENSSL_NO_ENGINE
-	char *infile,*outfile,*prog;
+    char *engine = NULL;
-	char *inrand=NULL;
+# endif
-#ifndef OPENSSL_NO_ENGINE
+    int num = 0, g = 0;
-	char *engine=NULL;
-#endif
-	int num = 0, g = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if (strcmp(*argv,"-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-check") == 0)
-			engine= *(++argv);
+            check = 1;
-			}
+        else if (strcmp(*argv, "-text") == 0)
-#endif
+            text = 1;
-		else if (strcmp(*argv,"-check") == 0)
+# ifndef OPENSSL_NO_DSA
-			check=1;
+        else if (strcmp(*argv, "-dsaparam") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            dsaparam = 1;
-			text=1;
+# endif
-#ifndef OPENSSL_NO_DSA
+        else if (strcmp(*argv, "-C") == 0)
-		else if (strcmp(*argv,"-dsaparam") == 0)
+            C = 1;
-			dsaparam=1;
+        else if (strcmp(*argv, "-noout") == 0)
-#endif
+            noout = 1;
-		else if (strcmp(*argv,"-C") == 0)
+        else if (strcmp(*argv, "-2") == 0)
-			C=1;
+            g = 2;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-5") == 0)
-			noout=1;
+            g = 5;
-		else if (strcmp(*argv,"-2") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			g=2;
+            if (--argc < 1)
-		else if (strcmp(*argv,"-5") == 0)
+                goto bad;
-			g=5;
+            inrand = *(++argv);
-		else if (strcmp(*argv,"-rand") == 0)
+        } else if (((sscanf(*argv, "%d", &num) == 0) || (num <= 0)))
-			{
+            goto bad;
-			if (--argc < 1) goto bad;
+        argv++;
-			inrand= *(++argv);
+        argc--;
-			}
+    }
-		else if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0)))
-			goto bad;
-		argv++;
-		argc--;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] [numbits]\n", prog);
-		BIO_printf(bio_err,"%s [options] [numbits]\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		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," -inform arg   input format - one of DER PEM\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+                   " -outform arg  output format - one of DER PEM\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
+        BIO_printf(bio_err,
-#endif
+                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
-		BIO_printf(bio_err," -check        check the DH parameters\n");
+# endif
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        BIO_printf(bio_err, " -check        check the DH parameters\n");
-		BIO_printf(bio_err," -C            Output C code\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
+                   " -text         print a text form of the DH parameters\n");
-		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_ENGINE
+                   " -2            generate parameters using  2 as the generator value\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
-#endif
+                   " -5            generate parameters using  5 as the generator value\n");
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
+                   " numbits       number of bits in to generate (default 512)\n");
-		BIO_printf(bio_err,"               the random number generator\n");
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -noout        no output\n");
+        BIO_printf(bio_err,
-		goto end;
+                   " -engine e     use engine e, possibly a hardware device.\n");
-		}
+# endif
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "               - load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, "               the random number generator\n");
+        BIO_printf(bio_err, " -noout        no output\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if (g && !num)
+    if (g && !num)
-		num = DEFBITS;
+        num = DEFBITS;
 
-#ifndef OPENSSL_NO_DSA
+# 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;
-			goto end;
+        }
-			}
+    } else
-		}
+# endif
-	else
+    {
-#endif
+        /* DH parameters */
-		{
+        if (num && !g)
-		/* DH parameters */
+            g = 2;
-		if (num && !g)
+    }
-			g = 2;
-		}
 
-	if(num) {
+    if (num) {
 
-		BN_GENCB cb;
+        BN_GENCB cb;
-		BN_GENCB_set(&cb, dh_cb, bio_err);
+        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)
+        if (inrand != NULL)
-			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-				app_RAND_load_files(inrand));
+                       app_RAND_load_files(inrand));
 
-#ifndef OPENSSL_NO_DSA
+# ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
+            DSA *dsa = DSA_new();
-			DSA *dsa = DSA_new();
-			
-			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
-						NULL, 0, NULL, NULL, &cb))
-				{
-				if(dsa) DSA_free(dsa);
-				ERR_print_errors(bio_err);
-				goto end;
-				}
 
-			dh = DSA_dup_DH(dsa);
+            BIO_printf(bio_err,
-			DSA_free(dsa);
+                       "Generating DSA parameters, %d bit long prime\n", num);
-			if (dh == NULL)
+            if (!dsa
-				{
+                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
-				ERR_print_errors(bio_err);
+                                               &cb)) {
-				goto end;
+                if (dsa)
-				}
+                    DSA_free(dsa);
-			}
+                ERR_print_errors(bio_err);
-		else
+                goto end;
-#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,"This is going to take a long time\n");
-			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
-				{
-				if(dh) DH_free(dh);
-				ERR_print_errors(bio_err);
-				goto end;
-				}
-			}
 
-		app_RAND_write_file(NULL, bio_err);
+            dh = DSA_dup_DH(dsa);
-	} else {
+            DSA_free(dsa);
+            if (dh == NULL) {
+                ERR_print_errors(bio_err);
+                goto end;
+            }
+        } 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, "This is going to take a long time\n");
+            if (!dh || !DH_generate_parameters_ex(dh, num, g, &cb)) {
+                ERR_print_errors(bio_err);
+                goto end;
+            }
+        }
 
-		in=BIO_new(BIO_s_file());
+        app_RAND_write_file(NULL, bio_err);
-		if (in == NULL)
+    } else {
-			{
-			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;
-				}
-			}
 
-		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
+        in = BIO_new(BIO_s_file());
-			{
+        if (in == NULL) {
-			BIO_printf(bio_err,"bad input format specified\n");
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-			}
+        }
+        if (infile == NULL)
+            BIO_set_fp(in, stdin, BIO_NOCLOSE);
+        else {
+            if (BIO_read_filename(in, infile) <= 0) {
+                perror(infile);
+                goto end;
+            }
+        }
 
-#ifndef OPENSSL_NO_DSA
+        if (informat != FORMAT_ASN1 && informat != FORMAT_PEM) {
-		if (dsaparam)
+            BIO_printf(bio_err, "bad input format specified\n");
-			{
+            goto end;
-			DSA *dsa;
+        }
-			
+# ifndef OPENSSL_NO_DSA
-			if (informat == FORMAT_ASN1)
+        if (dsaparam) {
-				dsa=d2i_DSAparams_bio(in,NULL);
+            DSA *dsa;
-			else /* informat == FORMAT_PEM */
-				dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
-			
-			if (dsa == NULL)
-				{
-				BIO_printf(bio_err,"unable to load DSA parameters\n");
-				ERR_print_errors(bio_err);
-				goto end;
-				}
-			
-			dh = DSA_dup_DH(dsa);
-			DSA_free(dsa);
-			if (dh == NULL)
-				{
-				ERR_print_errors(bio_err);
-				goto end;
-				}
-			}
-		else
-#endif
-			{
-			if (informat == FORMAT_ASN1)
-				dh=d2i_DHparams_bio(in,NULL);
-			else /* informat == FORMAT_PEM */
-				dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
-			
-			if (dh == NULL)
-				{
-				BIO_printf(bio_err,"unable to load DH parameters\n");
-				ERR_print_errors(bio_err);
-				goto end;
-				}
-			}
-		
-		/* dh != NULL */
-	}
-	
-	out=BIO_new(BIO_s_file());
-	if (out == NULL)
-		{
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	if (outfile == NULL)
-		{
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-		{
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
-		}
-#endif
-		}
-	else
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
+            if (informat == FORMAT_ASN1)
+                dsa = d2i_DSAparams_bio(in, NULL);
+            else                /* informat == FORMAT_PEM */
+                dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
 
-	if (text)
+            if (dsa == NULL) {
-		{
+                BIO_printf(bio_err, "unable to load DSA parameters\n");
-		DHparams_print(out,dh);
+                ERR_print_errors(bio_err);
-		}
+                goto end;
-	
+            }
-	if (check)
-		{
-		if (!DH_check(dh,&i))
-			{
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		if (i & DH_CHECK_P_NOT_PRIME)
-			printf("p value is not prime\n");
-		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-			printf("p value is not a safe prime\n");
-		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-			printf("unable to check the generator value\n");
-		if (i & DH_NOT_SUITABLE_GENERATOR)
-			printf("the g value is not a generator\n");
-		if (i == 0)
-			printf("DH parameters appear to be ok.\n");
-		}
-	if (C)
-		{
-		unsigned char *data;
-		int len,l,bits;
 
-		len=BN_num_bytes(dh->p);
+            dh = DSA_dup_DH(dsa);
-		bits=BN_num_bits(dh->p);
+            DSA_free(dsa);
-		data=(unsigned char *)OPENSSL_malloc(len);
+            if (dh == NULL) {
-		if (data == NULL)
+                ERR_print_errors(bio_err);
-			{
+                goto end;
-			perror("OPENSSL_malloc");
+            }
-			goto end;
+        } else
-			}
+# endif
-		printf("#ifndef HEADER_DH_H\n"
+        {
-		       "#include <openssl/dh.h>\n"
+            if (informat == FORMAT_ASN1)
-		       "#endif\n");
+                dh = d2i_DHparams_bio(in, NULL);
-		printf("DH *get_dh%d()\n\t{\n",bits);
+            else                /* informat == FORMAT_PEM */
+                dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 
-		l=BN_bn2bin(dh->p,data);
+            if (dh == NULL) {
-		printf("\tstatic unsigned char dh%d_p[]={",bits);
+                BIO_printf(bio_err, "unable to load DH parameters\n");
-		for (i=0; i<l; i++)
+                ERR_print_errors(bio_err);
-			{
+                goto end;
-			if ((i%12) == 0) printf("\n\t\t");
+            }
-			printf("0x%02X,",data[i]);
+        }
-			}
-		printf("\n\t\t};\n");
 
-		l=BN_bn2bin(dh->g,data);
+        /* dh != NULL */
-		printf("\tstatic unsigned char dh%d_g[]={",bits);
+    }
-		for (i=0; i<l; i++)
-			{
-			if ((i%12) == 0) printf("\n\t\t");
-			printf("0x%02X,",data[i]);
-			}
-		printf("\n\t\t};\n");
 
-		printf("\tDH *dh;\n\n");
+    out = BIO_new(BIO_s_file());
-		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
+    if (out == NULL) {
-		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
+        ERR_print_errors(bio_err);
-			bits,bits);
+        goto end;
-		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
+    }
-			bits,bits);
+    if (outfile == NULL) {
-		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		printf("\t\t{ DH_free(dh); return(NULL); }\n");
+# ifdef OPENSSL_SYS_VMS
-		if (dh->length)
+        {
-			printf("\tdh->length = %ld;\n", dh->length);
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		printf("\treturn(dh);\n\t}\n");
+            out = BIO_push(tmpbio, out);
-		OPENSSL_free(data);
+        }
-		}
+# endif
+    } else {
+        if (BIO_write_filename(out, outfile) <= 0) {
+            perror(outfile);
+            goto end;
+        }
+    }
 
+    if (text) {
+        DHparams_print(out, dh);
+    }
 
-	if (!noout)
+    if (check) {
-		{
+        if (!DH_check(dh, &i)) {
-		if 	(outformat == FORMAT_ASN1)
+            ERR_print_errors(bio_err);
-			i=i2d_DHparams_bio(out,dh);
+            goto end;
-		else if (outformat == FORMAT_PEM)
+        }
-			i=PEM_write_bio_DHparams(out,dh);
+        if (i & DH_CHECK_P_NOT_PRIME)
-		else	{
+            printf("p value is not prime\n");
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
-			goto end;
+            printf("p value is not a safe prime\n");
-			}
+        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
-		if (!i)
+            printf("unable to check the generator value\n");
-			{
+        if (i & DH_NOT_SUITABLE_GENERATOR)
-			BIO_printf(bio_err,"unable to write DH parameters\n");
+            printf("the g value is not a generator\n");
-			ERR_print_errors(bio_err);
+        if (i == 0)
-			goto end;
+            printf("DH parameters appear to be ok.\n");
-			}
+    }
-		}
+    if (C) {
-	ret=0;
+        unsigned char *data;
-end:
+        int len, l, bits;
-	if (in != NULL) BIO_free(in);
+
-	if (out != NULL) BIO_free_all(out);
+        len = BN_num_bytes(dh->p);
-	if (dh != NULL) DH_free(dh);
+        bits = BN_num_bits(dh->p);
-	apps_shutdown();
+        data = (unsigned char *)OPENSSL_malloc(len);
-	OPENSSL_EXIT(ret);
+        if (data == NULL) {
-	}
+            perror("OPENSSL_malloc");
+            goto end;
+        }
+        printf("#ifndef HEADER_DH_H\n"
+               "#include <openssl/dh.h>\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++) {
+            if ((i % 12) == 0)
+                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++) {
+            if ((i % 12) == 0)
+                printf("\n\t\t");
+            printf("0x%02X,", data[i]);
+        }
+        printf("\n\t\t};\n");
+
+        printf("\tDH *dh;\n\n");
+        printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
+        printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
+               bits, bits);
+        printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
+               bits, bits);
+        printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
+        printf("\t\t{ DH_free(dh); return(NULL); }\n");
+        if (dh->length)
+            printf("\tdh->length = %ld;\n", dh->length);
+        printf("\treturn(dh);\n\t}\n");
+        OPENSSL_free(data);
+    }
+
+    if (!noout) {
+        if (outformat == FORMAT_ASN1)
+            i = i2d_DHparams_bio(out, dh);
+        else if (outformat == FORMAT_PEM)
+            i = PEM_write_bio_DHparams(out, dh);
+        else {
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
+            goto end;
+        }
+        if (!i) {
+            BIO_printf(bio_err, "unable to write DH parameters\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
+    ret = 0;
+ end:
+    if (in != NULL)
+        BIO_free(in);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dh != NULL)
+        DH_free(dh);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
+    p = n;
+# endif
+    return 1;
+}
 
 #endif

apps/dsa.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,285 +49,286 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include <time.h>
+# include <time.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/dsa.h>
+# include <openssl/evp.h>
-#include <openssl/evp.h>
+# include <openssl/x509.h>
-#include <openssl/x509.h>
+# include <openssl/pem.h>
-#include <openssl/pem.h>
+# include <openssl/bn.h>
-#include <openssl/bn.h>
+# include <openssl/dsa.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dsa_main
+# define PROG    dsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -des		- encrypt output if PEM format with DES in cbc mode
+ * -des         - encrypt output if PEM format with DES in cbc mode
- * -des3	- encrypt output if PEM format
+ * -des3        - encrypt output if PEM format
- * -idea	- encrypt output if PEM format
+ * -idea        - encrypt output if PEM format
- * -aes128	- encrypt output if PEM format
+ * -aes128      - encrypt output if PEM format
- * -aes192	- encrypt output if PEM format
+ * -aes192      - encrypt output if PEM format
- * -aes256	- encrypt output if PEM format
+ * -aes256      - encrypt output if PEM format
- * -text	- print a text version
+ * -camellia128 - encrypt output if PEM format
- * -modulus	- print the DSA public key
+ * -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
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-#ifndef OPENSSL_NO_ENGINE
+    ENGINE *e = NULL;
-	ENGINE *e = NULL;
+    int ret = 1;
-#endif
+    DSA *dsa = NULL;
-	int ret=1;
+    int i, badops = 0;
-	DSA *dsa=NULL;
+    const EVP_CIPHER *enc = NULL;
-	int i,badops=0;
+    BIO *in = NULL, *out = NULL;
-	const EVP_CIPHER *enc=NULL;
+    int informat, outformat, text = 0, noout = 0;
-	BIO *in=NULL,*out=NULL;
+    int pubin = 0, pubout = 0;
-	int informat,outformat,text=0,noout=0;
+    char *infile, *outfile, *prog;
-	int pubin = 0, pubout = 0;
+# ifndef OPENSSL_NO_ENGINE
-	char *infile,*outfile,*prog;
+    char *engine;
-#ifndef OPENSSL_NO_ENGINE
+# endif
-	char *engine;
+    char *passargin = NULL, *passargout = NULL;
-#endif
+    char *passin = NULL, *passout = NULL;
-	char *passargin = NULL, *passargout = NULL;
+    int modulus = 0;
-	char *passin = NULL, *passout = NULL;
+
-	int modulus=0;
+    apps_startup();
-
+
-	apps_startup();
+    if (bio_err == NULL)
-
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-	if (bio_err == NULL)
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+    if (!load_config(bio_err, NULL))
-
+        goto end;
-	if (!load_config(bio_err, NULL))
+
-		goto end;
+# ifndef OPENSSL_NO_ENGINE
-
+    engine = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# endif
-	engine=NULL;
+    infile = NULL;
-#endif
+    outfile = NULL;
-	infile=NULL;
+    informat = FORMAT_PEM;
-	outfile=NULL;
+    outformat = FORMAT_PEM;
-	informat=FORMAT_PEM;
+
-	outformat=FORMAT_PEM;
+    prog = argv[0];
-
+    argc--;
-	prog=argv[0];
+    argv++;
-	argc--;
+    while (argc >= 1) {
-	argv++;
+        if (strcmp(*argv, "-inform") == 0) {
-	while (argc >= 1)
+            if (--argc < 1)
-		{
+                goto bad;
-		if 	(strcmp(*argv,"-inform") == 0)
+            informat = str2fmt(*(++argv));
-			{
+        } else if (strcmp(*argv, "-outform") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			informat=str2fmt(*(++argv));
+                goto bad;
-			}
+            outformat = str2fmt(*(++argv));
-		else if (strcmp(*argv,"-outform") == 0)
+        } else if (strcmp(*argv, "-in") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outformat=str2fmt(*(++argv));
+            infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            outfile = *(++argv);
-			infile= *(++argv);
+        } else if (strcmp(*argv, "-passin") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-out") == 0)
+                goto bad;
-			{
+            passargin = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-passout") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-passin") == 0)
+            passargout = *(++argv);
-			{
+        }
-			if (--argc < 1) goto bad;
+# ifndef OPENSSL_NO_ENGINE
-			passargin= *(++argv);
+        else if (strcmp(*argv, "-engine") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-passout") == 0)
+                goto bad;
-			{
+            engine = *(++argv);
-			if (--argc < 1) goto bad;
+        }
-			passargout= *(++argv);
+# endif
-			}
+        else if (strcmp(*argv, "-noout") == 0)
-#ifndef OPENSSL_NO_ENGINE
+            noout = 1;
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-text") == 0)
-			{
+            text = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-modulus") == 0)
-			engine= *(++argv);
+            modulus = 1;
-			}
+        else if (strcmp(*argv, "-pubin") == 0)
-#endif
+            pubin = 1;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-pubout") == 0)
-			noout=1;
+            pubout = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			text=1;
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else if (strcmp(*argv,"-modulus") == 0)
+            badops = 1;
-			modulus=1;
+            break;
-		else if (strcmp(*argv,"-pubin") == 0)
+        }
-			pubin=1;
+        argc--;
-		else if (strcmp(*argv,"-pubout") == 0)
+        argv++;
-			pubout=1;
+    }
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+
-			{
+    if (badops) {
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+ bad:
-			badops=1;
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-			break;
+        BIO_printf(bio_err, "where options are\n");
-			}
+        BIO_printf(bio_err, " -inform arg     input format - DER or PEM\n");
-		argc--;
+        BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
-		argv++;
+        BIO_printf(bio_err, " -in arg         input file\n");
-		}
+        BIO_printf(bio_err,
-
+                   " -passin arg     input file pass phrase source\n");
-	if (badops)
+        BIO_printf(bio_err, " -out arg        output file\n");
-		{
+        BIO_printf(bio_err,
-bad:
+                   " -passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -inform arg     input format - DER or PEM\n");
+                   " -engine e       use engine e, possibly a hardware device.\n");
-		BIO_printf(bio_err," -outform arg    output format - DER or PEM\n");
+# endif
-		BIO_printf(bio_err," -in arg         input file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
+                   " -des            encrypt PEM output with cbc des\n");
-		BIO_printf(bio_err," -out arg        output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
-#endif
+                   " -idea           encrypt PEM output with cbc idea\n");
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+# endif
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+# ifndef OPENSSL_NO_AES
-#ifndef OPENSSL_NO_IDEA
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
-#endif
+                   "                 encrypt PEM output with cbc aes\n");
-#ifndef OPENSSL_NO_AES
+# endif
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+# ifndef OPENSSL_NO_CAMELLIA
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -text           print the key in text\n");
+                   "                 encrypt PEM output with cbc camellia\n");
-		BIO_printf(bio_err," -noout          don't print key out\n");
+# endif
-		BIO_printf(bio_err," -modulus        print the DSA public value\n");
+# ifndef OPENSSL_NO_SEED
-		goto end;
+        BIO_printf(bio_err,
-		}
+                   " -seed           encrypt PEM output with cbc seed\n");
-
+# endif
-	ERR_load_crypto_strings();
+        BIO_printf(bio_err, " -text           print the key in text\n");
-
+        BIO_printf(bio_err, " -noout          don't print key out\n");
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err, " -modulus        print the DSA public value\n");
-        e = setup_engine(bio_err, engine, 0);
+        goto end;
-#endif
+    }
-
+
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+    ERR_load_crypto_strings();
-		BIO_printf(bio_err, "Error getting passwords\n");
+
-		goto end;
+# ifndef OPENSSL_NO_ENGINE
-	}
+    e = setup_engine(bio_err, engine, 0);
-
+# endif
-	in=BIO_new(BIO_s_file());
+
-	out=BIO_new(BIO_s_file());
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-	if ((in == NULL) || (out == NULL))
+        BIO_printf(bio_err, "Error getting passwords\n");
-		{
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
+
-		}
+    out = BIO_new(BIO_s_file());
-
+    if (out == NULL) {
-	if (infile == NULL)
+        ERR_print_errors(bio_err);
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        goto end;
-	else
+    }
-		{
+
-		if (BIO_read_filename(in,infile) <= 0)
+    BIO_printf(bio_err, "read DSA key\n");
-			{
+    {
-			perror(infile);
+        EVP_PKEY *pkey;
-			goto end;
+        if (pubin)
-			}
+            pkey = load_pubkey(bio_err, infile, informat, 1,
-		}
+                               passin, e, "Public Key");
-
+        else
-	BIO_printf(bio_err,"read DSA key\n");
+            pkey = load_key(bio_err, infile, informat, 1,
-	if	(informat == FORMAT_ASN1) {
+                            passin, e, "Private Key");
-		if(pubin) dsa=d2i_DSA_PUBKEY_bio(in,NULL);
+
-		else dsa=d2i_DSAPrivateKey_bio(in,NULL);
+        if (pkey != NULL)
-	} else if (informat == FORMAT_PEM) {
+            dsa = pkey == NULL ? NULL : EVP_PKEY_get1_DSA(pkey);
-		if(pubin) dsa=PEM_read_bio_DSA_PUBKEY(in,NULL, NULL, NULL);
+        EVP_PKEY_free(pkey);
-		else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,passin);
+    }
-	} else
+    if (dsa == NULL) {
-		{
+        BIO_printf(bio_err, "unable to load Key\n");
-		BIO_printf(bio_err,"bad input format specified for key\n");
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-		}
+    }
-	if (dsa == NULL)
+
-		{
+    if (outfile == NULL) {
-		BIO_printf(bio_err,"unable to load Key\n");
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		ERR_print_errors(bio_err);
+# ifdef OPENSSL_SYS_VMS
-		goto end;
+        {
-		}
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-
+            out = BIO_push(tmpbio, out);
-	if (outfile == NULL)
+        }
-		{
+# endif
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+    } else {
-#ifdef OPENSSL_SYS_VMS
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            goto end;
-		out = BIO_push(tmpbio, out);
+        }
-		}
+    }
-#endif
+
-		}
+    if (text)
-	else
+        if (!DSA_print(out, dsa, 0)) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			perror(outfile);
+        }
-			goto end;
+
-			}
+    if (modulus) {
-		}
+        fprintf(stdout, "Public Key=");
-
+        BN_print(out, dsa->pub_key);
-	if (text) 
+        fprintf(stdout, "\n");
-		if (!DSA_print(out,dsa,0))
+    }
-			{
+
-			perror(outfile);
+    if (noout)
-			ERR_print_errors(bio_err);
+        goto end;
-			goto end;
+    BIO_printf(bio_err, "writing DSA key\n");
-			}
+    if (outformat == FORMAT_ASN1) {
-
+        if (pubin || pubout)
-	if (modulus)
+            i = i2d_DSA_PUBKEY_bio(out, dsa);
-		{
+        else
-		fprintf(stdout,"Public Key=");
+            i = i2d_DSAPrivateKey_bio(out, dsa);
-		BN_print(out,dsa->pub_key);
+    } else if (outformat == FORMAT_PEM) {
-		fprintf(stdout,"\n");
+        if (pubin || pubout)
-		}
+            i = PEM_write_bio_DSA_PUBKEY(out, dsa);
-
+        else
-	if (noout) goto end;
+            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
-	BIO_printf(bio_err,"writing DSA key\n");
+                                            NULL, 0, NULL, passout);
-	if 	(outformat == FORMAT_ASN1) {
+    } else {
-		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
+        BIO_printf(bio_err, "bad output format specified for outfile\n");
-		else i=i2d_DSAPrivateKey_bio(out,dsa);
+        goto end;
-	} else if (outformat == FORMAT_PEM) {
+    }
-		if(pubin || pubout)
+    if (!i) {
-			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
+        BIO_printf(bio_err, "unable to write private key\n");
-		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
+        ERR_print_errors(bio_err);
-							NULL,0,NULL, passout);
+    } else
-	} else {
+        ret = 0;
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+ end:
-		goto end;
+    if (in != NULL)
-		}
+        BIO_free(in);
-	if (!i)
+    if (out != NULL)
-		{
+        BIO_free_all(out);
-		BIO_printf(bio_err,"unable to write private key\n");
+    if (dsa != NULL)
-		ERR_print_errors(bio_err);
+        DSA_free(dsa);
-		}
+    if (passin)
-	else
+        OPENSSL_free(passin);
-		ret=0;
+    if (passout)
-end:
+        OPENSSL_free(passout);
-	if(in != NULL) BIO_free(in);
+    apps_shutdown();
-	if(out != NULL) BIO_free_all(out);
+    OPENSSL_EXIT(ret);
-	if(dsa != NULL) DSA_free(dsa);
+}
-	if(passin) OPENSSL_free(passin);
-	if(passout) OPENSSL_free(passout);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}
 #endif

apps/dsaparam.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,40 +49,44 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DSA
-#include <assert.h>
+# include <assert.h>
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <time.h>
+# include <time.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dsa.h>
+# include <openssl/dsa.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	dsaparam_main
+# define PROG    dsaparam_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -noout
  * -text
  * -C
@@ -93,385 +97,368 @@
  *  #endif
  */
 
-#ifdef GENCB_TEST
+# ifdef GENCB_TEST
 
 static int stop_keygen_flag = 0;
 
 static void timebomb_sigalarm(int foo)
-	{
+{
-	stop_keygen_flag = 1;
+    stop_keygen_flag = 1;
-	}
+}
 
-#endif
+# endif
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-#ifndef OPENSSL_NO_ENGINE
+    DSA *dsa = NULL;
-	ENGINE *e = NULL;
+    int i, badops = 0, text = 0;
-#endif
+    BIO *in = NULL, *out = NULL;
-	DSA *dsa=NULL;
+    int informat, outformat, noout = 0, C = 0, ret = 1;
-	int i,badops=0,text=0;
+    char *infile, *outfile, *prog, *inrand = NULL;
-	BIO *in=NULL,*out=NULL;
+    int numbits = -1, num, genkey = 0;
-	int informat,outformat,noout=0,C=0,ret=1;
+    int need_rand = 0;
-	char *infile,*outfile,*prog,*inrand=NULL;
+# ifndef OPENSSL_NO_ENGINE
-	int numbits= -1,num,genkey=0;
+    char *engine = NULL;
-	int need_rand=0;
+# endif
-#ifndef OPENSSL_NO_ENGINE
+# ifdef GENCB_TEST
-	char *engine=NULL;
+    int timebomb = 0;
-#endif
+# endif
-#ifdef GENCB_TEST
-	int timebomb=0;
-#endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if(strcmp(*argv, "-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+# ifdef GENCB_TEST
-			engine = *(++argv);
+        else if (strcmp(*argv, "-timebomb") == 0) {
-			}
+            if (--argc < 1)
-#endif
+                goto bad;
-#ifdef GENCB_TEST
+            timebomb = atoi(*(++argv));
-		else if(strcmp(*argv, "-timebomb") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			timebomb = atoi(*(++argv));
+            text = 1;
-			}
+        else if (strcmp(*argv, "-C") == 0)
-#endif
+            C = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			text=1;
+            genkey = 1;
-		else if (strcmp(*argv,"-C") == 0)
+            need_rand = 1;
-			C=1;
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-genkey") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			genkey=1;
+            inrand = *(++argv);
-			need_rand=1;
+            need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-rand") == 0)
+            noout = 1;
-			{
+        else if (sscanf(*argv, "%d", &num) == 1) {
-			if (--argc < 1) goto bad;
+            /* generate a key */
-			inrand= *(++argv);
+            numbits = num;
-			need_rand=1;
+            need_rand = 1;
-			}
+        } else {
-		else if (strcmp(*argv,"-noout") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			noout=1;
+            badops = 1;
-		else if (sscanf(*argv,"%d",&num) == 1)
+            break;
-			{
+        }
-			/* generate a key */
+        argc--;
-			numbits=num;
+        argv++;
-			need_rand=1;
+    }
-			}
-		else
-			{
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] [bits] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\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," -outform arg  output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err, " -text         print as text\n");
-		BIO_printf(bio_err," -text         print as text\n");
+        BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," -C            Output C code\n");
+        BIO_printf(bio_err, " -noout        no output\n");
-		BIO_printf(bio_err," -noout        no output\n");
+        BIO_printf(bio_err, " -genkey       generate a DSA key\n");
-		BIO_printf(bio_err," -genkey       generate a DSA key\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -rand         files to use for random number input\n");
+                   " -rand         files to use for random number input\n");
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
-#endif
+                   " -engine e     use engine e, possibly a hardware device.\n");
-#ifdef GENCB_TEST
+# endif
-		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
+# ifdef GENCB_TEST
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
+                   " -timebomb n   interrupt keygen after <n> seconds\n");
-		goto end;
+# endif
-		}
+        BIO_printf(bio_err,
+                   " number        number of bits to use for generating private key\n");
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (outfile == NULL) {
-		}
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-	if (outfile == NULL)
+# ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-#ifdef OPENSSL_SYS_VMS
+            out = BIO_push(tmpbio, out);
-		{
+        }
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+# endif
-		out = BIO_push(tmpbio, out);
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-#endif
+            perror(outfile);
-		}
+            goto end;
-	else
+        }
-		{
+    }
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
-			perror(outfile);
-			goto end;
-			}
-		}
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if (need_rand)
+    if (need_rand) {
-		{
+        app_RAND_load_file(NULL, bio_err, (inrand != NULL));
-		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+        if (inrand != NULL)
-		if (inrand != NULL)
+            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                       app_RAND_load_files(inrand));
-				app_RAND_load_files(inrand));
+    }
-		}
 
-	if (numbits > 0)
+    if (numbits > 0) {
-		{
+        BN_GENCB cb;
-		BN_GENCB cb;
+        BN_GENCB_set(&cb, dsa_cb, bio_err);
-		BN_GENCB_set(&cb, dsa_cb, bio_err);
+        assert(need_rand);
-		assert(need_rand);
+        dsa = DSA_new();
-		dsa = DSA_new();
+        if (!dsa) {
-		if(!dsa)
+            BIO_printf(bio_err, "Error allocating DSA object\n");
-			{
+            goto end;
-			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");
-	        BIO_printf(bio_err,"This could take some time\n");
+# ifdef GENCB_TEST
-#ifdef GENCB_TEST
+        if (timebomb > 0) {
-		if(timebomb > 0)
+            struct sigaction act;
-	{
+            act.sa_handler = timebomb_sigalarm;
-		struct sigaction act;
+            act.sa_flags = 0;
-		act.sa_handler = timebomb_sigalarm;
+            BIO_printf(bio_err,
-		act.sa_flags = 0;
+                       "(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);
-				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;
-			BIO_printf(bio_err,"Error, couldn't set SIGALRM handler\n");
+            }
-			goto end;
+            alarm(timebomb);
-			}
+        }
-		alarm(timebomb);
+# endif
-	}
+        if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, &cb)) {
-#endif
+# ifdef GENCB_TEST
-	        if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
+            if (stop_keygen_flag) {
-			{
+                BIO_printf(bio_err, "DSA key generation time-stopped\n");
-#ifdef GENCB_TEST
+                /* This is an asked-for behaviour! */
-			if(stop_keygen_flag)
+                ret = 0;
-				{
+                goto end;
-				BIO_printf(bio_err,"DSA key generation time-stopped\n");
+            }
-				/* This is an asked-for behaviour! */
+# endif
-				ret = 0;
+            BIO_printf(bio_err, "Error, DSA key generation failed\n");
-				goto end;
+            goto end;
-				}
+        }
-#endif
+    } else if (informat == FORMAT_ASN1)
-			BIO_printf(bio_err,"Error, DSA key generation failed\n");
+        dsa = d2i_DSAparams_bio(in, NULL);
-			goto end;
+    else if (informat == FORMAT_PEM)
-			}
+        dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
-		}
+    else {
-	else if	(informat == FORMAT_ASN1)
+        BIO_printf(bio_err, "bad input format specified\n");
-		dsa=d2i_DSAparams_bio(in,NULL);
+        goto end;
-	else if (informat == FORMAT_PEM)
+    }
-		dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
+    if (dsa == NULL) {
-	else
+        BIO_printf(bio_err, "unable to load DSA parameters\n");
-		{
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err,"bad input format specified\n");
+        goto end;
-		goto end;
+    }
-		}
-	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);
-		DSAparams_print(out,dsa);
+    }
-		}
-	
-	if (C)
-		{
-		unsigned char *data;
-		int l,len,bits_p,bits_q,bits_g;
 
-		len=BN_num_bytes(dsa->p);
+    if (C) {
-		bits_p=BN_num_bits(dsa->p);
+        unsigned char *data;
-		bits_q=BN_num_bits(dsa->q);
+        int l, len, bits_p;
-		bits_g=BN_num_bits(dsa->g);
-		data=(unsigned char *)OPENSSL_malloc(len+20);
-		if (data == NULL)
-			{
-			perror("OPENSSL_malloc");
-			goto end;
-			}
-		l=BN_bn2bin(dsa->p,data);
-		printf("static unsigned char dsa%d_p[]={",bits_p);
-		for (i=0; i<l; i++)
-			{
-			if ((i%12) == 0) printf("\n\t");
-			printf("0x%02X,",data[i]);
-			}
-		printf("\n\t};\n");
 
-		l=BN_bn2bin(dsa->q,data);
+        len = BN_num_bytes(dsa->p);
-		printf("static unsigned char dsa%d_q[]={",bits_p);
+        bits_p = BN_num_bits(dsa->p);
-		for (i=0; i<l; i++)
+        data = (unsigned char *)OPENSSL_malloc(len + 20);
-			{
+        if (data == NULL) {
-			if ((i%12) == 0) printf("\n\t");
+            perror("OPENSSL_malloc");
-			printf("0x%02X,",data[i]);
+            goto end;
-			}
+        }
-		printf("\n\t};\n");
+        l = BN_bn2bin(dsa->p, data);
+        printf("static unsigned char dsa%d_p[]={", bits_p);
+        for (i = 0; i < l; i++) {
+            if ((i % 12) == 0)
+                printf("\n\t");
+            printf("0x%02X,", data[i]);
+        }
+        printf("\n\t};\n");
 
-		l=BN_bn2bin(dsa->g,data);
+        l = BN_bn2bin(dsa->q, data);
-		printf("static unsigned char dsa%d_g[]={",bits_p);
+        printf("static unsigned char dsa%d_q[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
-			printf("0x%02X,",data[i]);
+            printf("0x%02X,", data[i]);
-			}
+        }
-		printf("\n\t};\n\n");
+        printf("\n\t};\n");
 
-		printf("DSA *get_dsa%d()\n\t{\n",bits_p);
+        l = BN_bn2bin(dsa->g, data);
-		printf("\tDSA *dsa;\n\n");
+        printf("static unsigned char dsa%d_g[]={", bits_p);
-		printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
+        for (i = 0; i < l; i++) {
-		printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
+            if ((i % 12) == 0)
-			bits_p,bits_p);
+                printf("\n\t");
-		printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
+            printf("0x%02X,", data[i]);
-			bits_p,bits_p);
+        }
-		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
+        printf("\n\t};\n\n");
-			bits_p,bits_p);
-		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");
-		}
 
+        printf("DSA *get_dsa%d()\n\t{\n", bits_p);
+        printf("\tDSA *dsa;\n\n");
+        printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
+        printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
+               bits_p, bits_p);
+        printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
+               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("\t\t{ DSA_free(dsa); return(NULL); }\n");
+        printf("\treturn(dsa);\n\t}\n");
+    }
 
-	if (!noout)
+    if (!noout) {
-		{
+        if (outformat == FORMAT_ASN1)
-		if 	(outformat == FORMAT_ASN1)
+            i = i2d_DSAparams_bio(out, dsa);
-			i=i2d_DSAparams_bio(out,dsa);
+        else if (outformat == FORMAT_PEM)
-		else if (outformat == FORMAT_PEM)
+            i = PEM_write_bio_DSAparams(out, dsa);
-			i=PEM_write_bio_DSAparams(out,dsa);
+        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;
-			goto end;
+        }
-			}
+        if (!i) {
-		if (!i)
+            BIO_printf(bio_err, "unable to write DSA parameters\n");
-			{
+            ERR_print_errors(bio_err);
-			BIO_printf(bio_err,"unable to write DSA parameters\n");
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
+    }
-			}
+    if (genkey) {
-		}
+        DSA *dsakey;
-	if (genkey)
-		{
-		DSA *dsakey;
 
-		assert(need_rand);
+        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 	(outformat == FORMAT_ASN1)
+        if (!DSA_generate_key(dsakey))
-			i=i2d_DSAPrivateKey_bio(out,dsakey);
+            goto end;
-		else if (outformat == FORMAT_PEM)
+        if (outformat == FORMAT_ASN1)
-			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
+            i = i2d_DSAPrivateKey_bio(out, dsakey);
-		else	{
+        else if (outformat == FORMAT_PEM)
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
-			goto end;
+                                            NULL);
-			}
+        else {
-		DSA_free(dsakey);
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-		}
+            goto end;
-	if (need_rand)
+        }
-		app_RAND_write_file(NULL, bio_err);
+        DSA_free(dsakey);
-	ret=0;
+    }
-end:
+    if (need_rand)
-	if (in != NULL) BIO_free(in);
+        app_RAND_write_file(NULL, bio_err);
-	if (out != NULL) BIO_free_all(out);
+    ret = 0;
-	if (dsa != NULL) DSA_free(dsa);
+ end:
-	apps_shutdown();
+    if (in != NULL)
-	OPENSSL_EXIT(ret);
+        BIO_free(in);
-	}
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dsa != NULL)
+        DSA_free(dsa);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
+
+    if (p == 0)
+        c = '.';
+    if (p == 1)
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
+    BIO_write(cb->arg, &c, 1);
+    (void)BIO_flush(cb->arg);
+# ifdef LINT
+    p = n;
+# endif
+# ifdef GENCB_TEST
+    if (stop_keygen_flag)
+        return 0;
+# endif
+    return 1;
+}
+#else                           /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
 
-	if (p == 0) c='.';
-	if (p == 1) c='+';
-	if (p == 2) c='*';
-	if (p == 3) c='\n';
-	BIO_write(cb->arg,&c,1);
-	(void)BIO_flush(cb->arg);
-#ifdef LINT
-	p=n;
-#endif
-#ifdef GENCB_TEST
-	if(stop_keygen_flag)
-		return 0;
-#endif
-	return 1;
-	}
 #endif

apps/ec.c

@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,20 +56,22 @@
  *
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#undef PROG
+# undef PROG
-#define PROG	ec_main
+# define PROG    ec_main
 
-/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg    - input format - default PEM (one of DER, NET or PEM)
  * -outform arg   - output format - default PEM
  * -in arg        - input file - default stdin
  * -out arg       - output file - default stdout
@@ -84,316 +86,274 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
+    int ret = 1;
-	ENGINE 	*e = NULL;
+    EC_KEY *eckey = NULL;
-#endif
+    const EC_GROUP *group;
-	int 	ret = 1;
+    int i, badops = 0;
-	EC_KEY 	*eckey = NULL;
+    const EVP_CIPHER *enc = NULL;
-	const EC_GROUP *group;
+    BIO *in = NULL, *out = NULL;
-	int 	i, badops = 0;
+    int informat, outformat, text = 0, noout = 0;
-	const EVP_CIPHER *enc = NULL;
+    int pubin = 0, pubout = 0, param_out = 0;
-	BIO 	*in = NULL, *out = NULL;
+    char *infile, *outfile, *prog, *engine;
-	int 	informat, outformat, text=0, noout=0;
+    char *passargin = NULL, *passargout = NULL;
-	int  	pubin = 0, pubout = 0, param_out = 0;
+    char *passin = NULL, *passout = NULL;
-	char 	*infile, *outfile, *prog, *engine;
+    point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
-	char 	*passargin = NULL, *passargout = NULL;
+    int new_form = 0;
-	char 	*passin = NULL, *passout = NULL;
+    int asn1_flag = OPENSSL_EC_NAMED_CURVE;
-	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
+    int new_asn1_flag = 0;
-	int	new_form = 0;
-	int	asn1_flag = OPENSSL_EC_NAMED_CURVE;
-	int 	new_asn1_flag = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	engine = NULL;
+    engine = NULL;
-	infile = NULL;
+    infile = NULL;
-	outfile = NULL;
+    outfile = NULL;
-	informat = FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat = FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog = argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-passin") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargin= *(++argv);
+        } else if (strcmp(*argv, "-engine") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-passout") == 0)
+                goto bad;
-			{
+            engine = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-noout") == 0)
-			passargout= *(++argv);
+            noout = 1;
-			}
+        else if (strcmp(*argv, "-text") == 0)
-		else if (strcmp(*argv, "-engine") == 0)
+            text = 1;
-			{
+        else if (strcmp(*argv, "-conv_form") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			engine= *(++argv);
+                goto bad;
-			}
+            ++argv;
-		else if (strcmp(*argv, "-noout") == 0)
+            new_form = 1;
-			noout = 1;
+            if (strcmp(*argv, "compressed") == 0)
-		else if (strcmp(*argv, "-text") == 0)
+                form = POINT_CONVERSION_COMPRESSED;
-			text = 1;
+            else if (strcmp(*argv, "uncompressed") == 0)
-		else if (strcmp(*argv, "-conv_form") == 0)
+                form = POINT_CONVERSION_UNCOMPRESSED;
-			{
+            else if (strcmp(*argv, "hybrid") == 0)
-			if (--argc < 1)
+                form = POINT_CONVERSION_HYBRID;
-				goto bad;
+            else
-			++argv;
+                goto bad;
-			new_form = 1;
+        } else if (strcmp(*argv, "-param_enc") == 0) {
-			if (strcmp(*argv, "compressed") == 0)
+            if (--argc < 1)
-				form = POINT_CONVERSION_COMPRESSED;
+                goto bad;
-			else if (strcmp(*argv, "uncompressed") == 0)
+            ++argv;
-				form = POINT_CONVERSION_UNCOMPRESSED;
+            new_asn1_flag = 1;
-			else if (strcmp(*argv, "hybrid") == 0)
+            if (strcmp(*argv, "named_curve") == 0)
-				form = POINT_CONVERSION_HYBRID;
+                asn1_flag = OPENSSL_EC_NAMED_CURVE;
-			else
+            else if (strcmp(*argv, "explicit") == 0)
-				goto bad;
+                asn1_flag = 0;
-			}
+            else
-		else if (strcmp(*argv, "-param_enc") == 0)
+                goto bad;
-			{
+        } else if (strcmp(*argv, "-param_out") == 0)
-			if (--argc < 1)
+            param_out = 1;
-				goto bad;
+        else if (strcmp(*argv, "-pubin") == 0)
-			++argv;
+            pubin = 1;
-			new_asn1_flag = 1;
+        else if (strcmp(*argv, "-pubout") == 0)
-			if (strcmp(*argv, "named_curve") == 0)
+            pubout = 1;
-				asn1_flag = OPENSSL_EC_NAMED_CURVE;
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			else if (strcmp(*argv, "explicit") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-				asn1_flag = 0;
+            badops = 1;
-			else
+            break;
-				goto bad;
+        }
-			}
+        argc--;
-		else if (strcmp(*argv, "-param_out") == 0)
+        argv++;
-			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)
-			{
-			BIO_printf(bio_err, "unknown option %s\n", *argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, " -inform arg     input format - "
-		BIO_printf(bio_err, " -inform arg     input format - "
+                   "DER or PEM\n");
-				"DER or PEM\n");
+        BIO_printf(bio_err, " -outform arg    output format - "
-		BIO_printf(bio_err, " -outform arg    output format - "
+                   "DER or PEM\n");
-				"DER or PEM\n");
+        BIO_printf(bio_err, " -in arg         input file\n");
-		BIO_printf(bio_err, " -in arg         input file\n");
+        BIO_printf(bio_err, " -passin arg     input file pass "
-		BIO_printf(bio_err, " -passin arg     input file pass "
+                   "phrase source\n");
-				"phrase source\n");
+        BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err, " -out arg        output file\n");
+        BIO_printf(bio_err, " -passout arg    output file pass "
-		BIO_printf(bio_err, " -passout arg    output file pass "
+                   "phrase source\n");
-				"phrase source\n");
+        BIO_printf(bio_err, " -engine e       use engine e, "
-		BIO_printf(bio_err, " -engine e       use engine e, "
+                   "possibly a hardware device.\n");
-				"possibly a hardware device.\n");
+        BIO_printf(bio_err, " -des            encrypt PEM output, "
-		BIO_printf(bio_err, " -des            encrypt PEM output, "
+                   "instead of 'des' every other \n"
-				"instead of 'des' every other \n"
+                   "                 cipher "
-				"                 cipher "
+                   "supported by OpenSSL can be used\n");
-				"supported by OpenSSL can be used\n");
+        BIO_printf(bio_err, " -text           print the key\n");
-		BIO_printf(bio_err, " -text           print the key\n");
+        BIO_printf(bio_err, " -noout          don't print key out\n");
-		BIO_printf(bio_err, " -noout          don't print key out\n");
+        BIO_printf(bio_err, " -param_out      print the elliptic "
-		BIO_printf(bio_err, " -param_out      print the elliptic "
+                   "curve parameters\n");
-				"curve parameters\n");
+        BIO_printf(bio_err, " -conv_form arg  specifies the "
-		BIO_printf(bio_err, " -conv_form arg  specifies the "
+                   "point conversion form \n");
-				"point conversion form \n");
+        BIO_printf(bio_err, "                 possible values:"
-		BIO_printf(bio_err, "                 possible values:"
+                   " compressed\n");
-				" compressed\n");
+        BIO_printf(bio_err, "                                 "
-		BIO_printf(bio_err, "                                 "
+                   " uncompressed (default)\n");
-				" uncompressed (default)\n");
+        BIO_printf(bio_err, "                                  " " hybrid\n");
-		BIO_printf(bio_err, "                                  "
+        BIO_printf(bio_err, " -param_enc arg  specifies the way"
-				" hybrid\n");
+                   " the ec parameters are encoded\n");
-		BIO_printf(bio_err, " -param_enc arg  specifies the way"
+        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
-				" the ec parameters are encoded\n");
+        BIO_printf(bio_err, "                 possible values:"
-		BIO_printf(bio_err, "                 in the asn1 der "
+                   " named_curve (default)\n");
-				"encoding\n");
+        BIO_printf(bio_err, "                                  "
-		BIO_printf(bio_err, "                 possilbe values:"
+                   "explicit\n");
-				" named_curve (default)\n");
+        goto end;
-		BIO_printf(bio_err,"                                  "
+    }
-				"explicit\n");
-		goto end;
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
+        BIO_printf(bio_err, "Error getting passwords\n");
-		BIO_printf(bio_err, "Error getting passwords\n");
+        goto end;
-		goto end;
+    }
-		}
 
-	in = BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	out = BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in, stdin, BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in, infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
-		}
 
-	BIO_printf(bio_err, "read EC key\n");
+    BIO_printf(bio_err, "read EC key\n");
-	if (informat == FORMAT_ASN1) 
+    if (informat == FORMAT_ASN1) {
-		{
+        if (pubin)
-		if (pubin) 
+            eckey = d2i_EC_PUBKEY_bio(in, NULL);
-			eckey = d2i_EC_PUBKEY_bio(in, NULL);
+        else
-		else 
+            eckey = d2i_ECPrivateKey_bio(in, NULL);
-			eckey = d2i_ECPrivateKey_bio(in, NULL);
+    } else if (informat == FORMAT_PEM) {
-		} 
+        if (pubin)
-	else if (informat == FORMAT_PEM) 
+            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-		{
+        else
-		if (pubin) 
+            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
-			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
+    } else {
-				NULL);
+        BIO_printf(bio_err, "bad input format specified for key\n");
-		else 
+        goto end;
-			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
+    }
-				passin);
+    if (eckey == NULL) {
-		} 
+        BIO_printf(bio_err, "unable to load Key\n");
-	else
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err, "bad input format specified for key\n");
+    }
-		goto end;
-		}
-	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);
-		BIO_set_fp(out, stdout, BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-			{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-			out = BIO_push(tmpbio, out);
+        }
-			}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		if (BIO_write_filename(out, outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	group = EC_KEY_get0_group(eckey);
+    group = EC_KEY_get0_group(eckey);
 
-	if (new_form)
+    if (new_form)
-		EC_KEY_set_conv_form(eckey, form);
+        EC_KEY_set_conv_form(eckey, form);
 
-	if (new_asn1_flag)
+    if (new_asn1_flag)
-		EC_KEY_set_asn1_flag(eckey, asn1_flag);
+        EC_KEY_set_asn1_flag(eckey, asn1_flag);
 
-	if (text) 
+    if (text)
-		if (!EC_KEY_print(out, eckey, 0))
+        if (!EC_KEY_print(out, eckey, 0)) {
-			{
+            perror(outfile);
-			perror(outfile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
 
-	if (noout) 
+    if (noout) {
-		goto end;
+        ret = 0;
+        goto end;
+    }
 
-	BIO_printf(bio_err, "writing EC key\n");
+    BIO_printf(bio_err, "writing EC key\n");
-	if (outformat == FORMAT_ASN1) 
+    if (outformat == FORMAT_ASN1) {
-		{
+        if (param_out)
-		if (param_out)
+            i = i2d_ECPKParameters_bio(out, group);
-			i = i2d_ECPKParameters_bio(out, group);
+        else if (pubin || pubout)
-		else if (pubin || pubout) 
+            i = i2d_EC_PUBKEY_bio(out, eckey);
-			i = i2d_EC_PUBKEY_bio(out, eckey);
+        else
-		else 
+            i = i2d_ECPrivateKey_bio(out, eckey);
-			i = i2d_ECPrivateKey_bio(out, eckey);
+    } else if (outformat == FORMAT_PEM) {
-		} 
+        if (param_out)
-	else if (outformat == FORMAT_PEM) 
+            i = PEM_write_bio_ECPKParameters(out, group);
-		{
+        else if (pubin || pubout)
-		if (param_out)
+            i = PEM_write_bio_EC_PUBKEY(out, eckey);
-			i = PEM_write_bio_ECPKParameters(out, group);
+        else
-		else if (pubin || pubout)
+            i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
-			i = PEM_write_bio_EC_PUBKEY(out, eckey);
+                                           NULL, 0, NULL, passout);
-		else 
+    } else {
-			i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
+        BIO_printf(bio_err, "bad output format specified for " "outfile\n");
-						NULL, 0, NULL, passout);
+        goto end;
-		} 
+    }
-	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");
-		BIO_printf(bio_err, "unable to write private key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+    } else
-		}
+        ret = 0;
-	else
+ end:
-		ret=0;
+    if (in)
-end:
+        BIO_free(in);
-	if (in)
+    if (out)
-		BIO_free(in);
+        BIO_free_all(out);
-	if (out)
+    if (eckey)
-		BIO_free_all(out);
+        EC_KEY_free(eckey);
-	if (eckey)
+    if (passin)
-		EC_KEY_free(eckey);
+        OPENSSL_free(passin);
-	if (passin)
+    if (passout)
-		OPENSSL_free(passin);
+        OPENSSL_free(passout);
-	if (passout)
+    apps_shutdown();
-		OPENSSL_free(passout);
+    OPENSSL_EXIT(ret);
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
 }
 #endif

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.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,487 +57,454 @@
  *
  */
 
-#ifndef OPENSSL_NO_ENGINE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
+# define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
-#include <openssl/engine.h>
+#ifndef OPENSSL_NO_ENGINE
-#include <openssl/ssl.h>
+# include <openssl/engine.h>
+# include <openssl/ssl.h>
 
-#undef PROG
+# undef PROG
-#define PROG	engine_main
+# define PROG    engine_main
 
-static const char *engine_usage[]={
+static const char *engine_usage[] = {
-"usage: engine opts [engine ...]\n",
+    "usage: engine opts [engine ...]\n",
-" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
+    " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
-"               -vv will additionally display each command's description\n",
+    "               -vv will additionally display each command's description\n",
-"               -vvv will also add the input flags for each command\n",
+    "               -vvv will also add the input flags for each command\n",
-"               -vvvv will also show internal input flags\n",
+    "               -vvvv will also show internal input flags\n",
-" -c          - for each engine, also list the capabilities\n",
+    " -c          - for each engine, also list the capabilities\n",
-" -t[t]       - for each engine, check that they are really available\n",
+    " -t[t]       - for each engine, check that they are really available\n",
-"               -tt will display error trace for unavailable engines\n",
+    "               -tt will display error trace for unavailable engines\n",
-" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
+    " -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
-"               to load it (if -t is used)\n",
+    "               to load it (if -t is used)\n",
-" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
+    " -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
-"               (only used if -t is also provided)\n",
+    "               (only used if -t is also provided)\n",
-" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
+    " NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
-" line, or all supported ENGINEs if none are specified.\n",
+    " line, or all supported ENGINEs if none are specified.\n",
-" Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
+    " Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
-" argument \"/lib/libdriver.so\".\n",
+    " argument \"/lib/libdriver.so\".\n",
-NULL
+    NULL
 };
 
 static void identity(void *ptr)
-	{
+{
-	return;
+    return;
-	}
+}
 
 static int append_buf(char **buf, const char *s, int *size, int step)
-	{
+{
-	int l = strlen(s);
+    int l = strlen(s);
 
-	if (*buf == NULL)
+    if (*buf == NULL) {
-		{
+        *size = step;
-		*size = step;
+        *buf = OPENSSL_malloc(*size);
-		*buf = OPENSSL_malloc(*size);
+        if (*buf == NULL)
-		if (*buf == NULL)
+            return 0;
-			return 0;
+        **buf = '\0';
-		**buf = '\0';
+    }
-		}
 
-	if (**buf != '\0')
+    if (**buf != '\0')
-		l += 2;		/* ", " */
+        l += 2;                 /* ", " */
 
-	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
+    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
-		{
+        *size += step;
-		*size += step;
+        *buf = OPENSSL_realloc(*buf, *size);
-		*buf = OPENSSL_realloc(*buf, *size);
+    }
-		}
 
-	if (*buf == NULL)
+    if (*buf == NULL)
-		return 0;
+        return 0;
 
-	if (**buf != '\0')
+    if (**buf != '\0')
-		BUF_strlcat(*buf, ", ", *size);
+        BUF_strlcat(*buf, ", ", *size);
-	BUF_strlcat(*buf, s, *size);
+    BUF_strlcat(*buf, s, *size);
 
-	return 1;
+    return 1;
-	}
+}
 
 static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
-	{
+{
-	int started = 0, err = 0;
+    int started = 0, err = 0;
-	/* Indent before displaying input flags */
+    /* Indent before displaying input flags */
-	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
+    BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-	if(flags == 0)
+    if (flags == 0) {
-		{
+        BIO_printf(bio_out, "<no flags>\n");
-		BIO_printf(bio_out, "<no flags>\n");
+        return 1;
-		return 1;
+    }
-		}
+    /*
-        /* If the object is internal, mark it in a way that shows instead of
+     * If the object is internal, mark it in a way that shows instead of
-         * having it part of all the other flags, even if it really is. */
+     * having it part of all the other flags, even if it really is.
-	if(flags & ENGINE_CMD_FLAG_INTERNAL)
+     */
-		{
+    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
-		BIO_printf(bio_out, "[Internal] ");
+        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, "|");
+        }
-			err = 1;
+        BIO_printf(bio_out, "NUMERIC");
-			}
+        started = 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
-	 * 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
-	 * 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, "|");
+        }
-			err = 1;
+        BIO_printf(bio_out, "STRING");
-			}
+        started = 1;
-		BIO_printf(bio_out, "STRING");
+    }
-		started = 1;
+    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
-		}
+        if (started) {
-	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
+            BIO_printf(bio_out, "|");
-		{
+            err = 1;
-		if(started)
+        }
-			{
+        BIO_printf(bio_out, "NO_INPUT");
-			BIO_printf(bio_out, "|");
+        started = 1;
-			err = 1;
+    }
-			}
+    /* Check for unknown flags */
-		BIO_printf(bio_out, "NO_INPUT");
+    flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
-		started = 1;
+        ~ENGINE_CMD_FLAG_STRING &
-		}
+        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
-	/* Check for unknown flags */
+    if (flags) {
-	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
+        if (started)
-			~ENGINE_CMD_FLAG_STRING &
+            BIO_printf(bio_out, "|");
-			~ENGINE_CMD_FLAG_NO_INPUT &
+        BIO_printf(bio_out, "<0x%04X>", flags);
-			~ENGINE_CMD_FLAG_INTERNAL;
+    }
-	if(flags)
+    if (err)
-		{
+        BIO_printf(bio_out, "  <illegal flags!>");
-		if(started) BIO_printf(bio_out, "|");
+    BIO_printf(bio_out, "\n");
-		BIO_printf(bio_out, "<0x%04X>", flags);
+    return 1;
-		}
+}
-	if(err)
-		BIO_printf(bio_out, "  <illegal flags!>");
-	BIO_printf(bio_out, "\n");
-	return 1;
-	}
 
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, 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;
+    static const int line_wrap = 78;
-	int ret = 0;
+    int num;
-	char *name = NULL;
+    int ret = 0;
-	char *desc = NULL;
+    char *name = NULL;
-	int flags;
+    char *desc = NULL;
-	int xpos = 0;
+    int flags;
-	STACK *cmds = NULL;
+    int xpos = 0;
-	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
+    STACK *cmds = NULL;
-			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
+    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
-					0, NULL, NULL)) <= 0))
+        ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-		{
+                            0, NULL, NULL)) <= 0)) {
-#if 0
+# if 0
-		BIO_printf(bio_out, "%s<no control commands>\n", indent);
+        BIO_printf(bio_out, "%s<no control commands>\n", indent);
-#endif
+# endif
-		return 1;
+        return 1;
-		}
+    }
 
-	cmds = sk_new_null();
+    cmds = sk_new_null();
 
-	if(!cmds)
+    if (!cmds)
-		goto err;
+        goto err;
-	do {
+    do {
-		int len;
+        int len;
-		/* Get the command input flags */
+        /* Get the command input flags */
-		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
+        if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
-					NULL, NULL)) < 0)
+                                 NULL, NULL)) < 0)
-			goto err;
+            goto err;
-                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
+        if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
-                        {
+            /* Get the command name */
-                        /* Get the command name */
+            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
+                                   NULL, NULL)) <= 0)
-                                NULL, NULL)) <= 0)
+                goto err;
-                                goto err;
+            if ((name = OPENSSL_malloc(len + 1)) == NULL)
-                        if((name = OPENSSL_malloc(len + 1)) == NULL)
+                goto err;
-                                goto err;
+            if (ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
-                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
+                            NULL) <= 0)
+                goto err;
+            /* Get the command description */
+            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+                                   NULL, NULL)) < 0)
+                goto err;
+            if (len > 0) {
+                if ((desc = OPENSSL_malloc(len + 1)) == NULL)
+                    goto err;
+                if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
                                 NULL) <= 0)
-                                goto err;
+                    goto err;
-                        /* Get the command description */
+            }
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+            /* Now decide on the output */
-                                NULL, NULL)) < 0)
+            if (xpos == 0)
-                                goto err;
+                /* Do an indent */
-                        if(len > 0)
+                xpos = BIO_puts(bio_out, indent);
-                                {
+            else
-                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
+                /* Otherwise prepend a ", " */
-                                        goto err;
+                xpos += BIO_printf(bio_out, ", ");
-                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
+            if (verbose == 1) {
-                                        NULL) <= 0)
+                /*
-                                        goto err;
+                 * We're just listing names, comma-delimited
-                                }
+                 */
-                        /* Now decide on the output */
+                if ((xpos > (int)strlen(indent)) &&
-                        if(xpos == 0)
+                    (xpos + (int)strlen(name) > line_wrap)) {
-                                /* Do an indent */
+                    BIO_printf(bio_out, "\n");
-                                xpos = BIO_printf(bio_out, indent);
+                    xpos = BIO_puts(bio_out, indent);
-                        else
+                }
-                                /* Otherwise prepend a ", " */
+                xpos += BIO_printf(bio_out, "%s", name);
-                                xpos += BIO_printf(bio_out, ", ");
+            } else {
-                        if(verbose == 1)
+                /* We're listing names plus descriptions */
-                                {
+                BIO_printf(bio_out, "%s: %s\n", name,
-                                /* We're just listing names, comma-delimited */
+                           (desc == NULL) ? "<no description>" : desc);
-                                if((xpos > (int)strlen(indent)) &&
+                /* ... and sometimes input flags */
-					(xpos + (int)strlen(name) > line_wrap))
+                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
-                                        {
+                    goto err;
-                                        BIO_printf(bio_out, "\n");
+                xpos = 0;
-                                        xpos = BIO_printf(bio_out, indent);
+            }
-                                        }
+        }
-                                xpos += BIO_printf(bio_out, "%s", name);
+        OPENSSL_free(name);
-                                }
+        name = NULL;
-                        else
+        if (desc) {
-                                {
+            OPENSSL_free(desc);
-                                /* We're listing names plus descriptions */
+            desc = NULL;
-                                BIO_printf(bio_out, "%s: %s\n", name,
+        }
-                                        (desc == NULL) ? "<no description>" : desc);
+        /* Move to the next command */
-                                /* ... and sometimes input flags */
+        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
-                                if((verbose >= 3) && !util_flags(bio_out, flags,
+    } while (num > 0);
-                                        indent))
+    if (xpos > 0)
-                                        goto err;
+        BIO_printf(bio_out, "\n");
-                                xpos = 0;
+    ret = 1;
-                                }
+ err:
-                        }
+    if (cmds)
-		OPENSSL_free(name); name = NULL;
+        sk_pop_free(cmds, identity);
-		if(desc) { OPENSSL_free(desc); desc = NULL; }
+    if (name)
-		/* Move to the next command */
+        OPENSSL_free(name);
-		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
+    if (desc)
-					num, NULL, NULL);
+        OPENSSL_free(desc);
-		} while(num > 0);
+    return ret;
-	if(xpos > 0)
+}
-		BIO_printf(bio_out, "\n");
-	ret = 1;
-err:
-	if(cmds) sk_pop_free(cmds, identity);
-	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)
+    int loop, res, num = sk_num(cmds);
-		{
+    if (num < 0) {
-		BIO_printf(bio_out, "[Error]: internal stack error\n");
+        BIO_printf(bio_out, "[Error]: internal stack error\n");
-		return;
+        return;
-		}
+    }
-	for(loop = 0; loop < num; loop++)
+    for (loop = 0; loop < num; loop++) {
-		{
+        char buf[256];
-		char buf[256];
+        const char *cmd, *arg;
-		const char *cmd, *arg;
+        cmd = sk_value(cmds, loop);
-		cmd = sk_value(cmds, loop);
+        res = 1;                /* assume success */
-		res = 1; /* assume success */
+        /* Check if this command has no ":arg" */
-		/* 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;
-			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
+        } else {
-				res = 0;
+            if ((int)(arg - cmd) > 254) {
-			}
+                BIO_printf(bio_out, "[Error]: command name too long\n");
-		else
+                return;
-			{
+            }
-			if((int)(arg - cmd) > 254)
+            memcpy(buf, cmd, (int)(arg - cmd));
-				{
+            buf[arg - cmd] = '\0';
-				BIO_printf(bio_out,"[Error]: command name too long\n");
+            arg++;              /* Move past the ":" */
-				return;
+            /* Call the command with the argument */
-				}
+            if (!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
-			memcpy(buf, cmd, (int)(arg - cmd));
+                res = 0;
-			buf[arg-cmd] = '\0';
+        }
-			arg++; /* Move past the ":" */
+        if (res)
-			/* Call the command with the argument */
+            BIO_printf(bio_out, "[Success]: %s\n", cmd);
-			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
+        else {
-				res = 0;
+            BIO_printf(bio_out, "[Failure]: %s\n", cmd);
-			}
+            ERR_print_errors(bio_out);
-		if(res)
+        }
-			BIO_printf(bio_out, "[Success]: %s\n", cmd);
+    }
-		else
+}
-			{
-			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
-			ERR_print_errors(bio_out);
-			}
-		}
-	}
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int ret=1,i;
+    int ret = 1, i;
-	const char **pp;
+    const char **pp;
-	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
+    int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
-	ENGINE *e;
+    ENGINE *e;
-	STACK *engines = sk_new_null();
+    STACK *engines = sk_new_null();
-	STACK *pre_cmds = sk_new_null();
+    STACK *pre_cmds = sk_new_null();
-	STACK *post_cmds = sk_new_null();
+    STACK *post_cmds = sk_new_null();
-	int badops=1;
+    int badops = 1;
-	BIO *bio_out=NULL;
+    BIO *bio_out = NULL;
-	const char *indent = "     ";
+    const char *indent = "     ";
 
-	apps_startup();
+    apps_startup();
-	SSL_load_error_strings();
+    SSL_load_error_strings();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
-	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+    bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+# ifdef OPENSSL_SYS_VMS
-	{
+    {
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	bio_out = BIO_push(tmpbio, bio_out);
+        bio_out = BIO_push(tmpbio, bio_out);
-	}
+    }
-#endif
+# endif
 
-	argc--;
+    argc--;
-	argv++;
+    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(strspn(*argv + 1, "v") < strlen(*argv + 1))
+            if ((verbose = strlen(*argv + 1)) > 4)
-				goto skip_arg_loop;
+                goto skip_arg_loop;
-			if((verbose=strlen(*argv + 1)) > 4)
+        } else if (strcmp(*argv, "-c") == 0)
-				goto skip_arg_loop;
+            list_cap = 1;
-			}
+        else if (strncmp(*argv, "-t", 2) == 0) {
-		else if (strcmp(*argv,"-c") == 0)
+            test_avail = 1;
-			list_cap=1;
+            if (strspn(*argv + 1, "t") < strlen(*argv + 1))
-		else if (strncmp(*argv,"-t",2) == 0)
+                goto skip_arg_loop;
-			{
+            if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
-			test_avail=1;
+                goto skip_arg_loop;
-			if(strspn(*argv + 1, "t") < strlen(*argv + 1))
+        } else if (strcmp(*argv, "-pre") == 0) {
-				goto skip_arg_loop;
+            argc--;
-			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
+            argv++;
-				goto skip_arg_loop;
+            if (argc == 0)
-			}
+                goto skip_arg_loop;
-		else if (strcmp(*argv,"-pre") == 0)
+            sk_push(pre_cmds, *argv);
-			{
+        } else if (strcmp(*argv, "-post") == 0) {
-			argc--; argv++;
+            argc--;
-			if (argc == 0)
+            argv++;
-				goto skip_arg_loop;
+            if (argc == 0)
-			sk_push(pre_cmds,*argv);
+                goto skip_arg_loop;
-			}
+            sk_push(post_cmds, *argv);
-		else if (strcmp(*argv,"-post") == 0)
+        } else if ((strncmp(*argv, "-h", 2) == 0) ||
-			{
+                   (strcmp(*argv, "-?") == 0))
-			argc--; argv++;
+            goto skip_arg_loop;
-			if (argc == 0)
+        else
-				goto skip_arg_loop;
+            sk_push(engines, *argv);
-			sk_push(post_cmds,*argv);
+        argc--;
-			}
+        argv++;
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+    }
-				(strcmp(*argv,"-?") == 0))
+    /* Looks like everything went OK */
-			goto skip_arg_loop;
+    badops = 0;
-		else
+ skip_arg_loop:
-			sk_push(engines,*argv);
-		argc--;
-		argv++;
-		}
-	/* Looks like everything went OK */
-	badops = 0;
-skip_arg_loop:
 
-	if (badops)
+    if (badops) {
-		{
+        for (pp = engine_usage; (*pp != NULL); pp++)
-		for (pp=engine_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		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));
-			{
+        }
-			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);
-		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);
-			{
+            /*
-			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);
+            BIO_printf(bio_out, "(%s) %s\n", id, name);
-			util_do_cmds(e, pre_cmds, bio_out, indent);
+            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",
-				BIO_printf(bio_out, "Loaded: (%s) %s\n",
+                           ENGINE_get_id(e), ENGINE_get_name(e));
-					ENGINE_get_id(e), ENGINE_get_name(e));
+            }
-				}
+            if (list_cap) {
-			if (list_cap)
+                int cap_size = 256;
-				{
+                char *cap_buf = NULL;
-				int cap_size = 256;
+                int k, n;
-				char *cap_buf = NULL;
+                const int *nids;
-				int k,n;
+                ENGINE_CIPHERS_PTR fn_c;
-				const int *nids;
+                ENGINE_DIGESTS_PTR fn_d;
-				ENGINE_CIPHERS_PTR fn_c;
-				ENGINE_DIGESTS_PTR fn_d;
 
-				if (ENGINE_get_RSA(e) != NULL
+                if (ENGINE_get_RSA(e) != NULL
-					&& !append_buf(&cap_buf, "RSA",
+                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
-						&cap_size, 256))
+                    goto end;
-					goto end;
+                if (ENGINE_get_DSA(e) != NULL
-				if (ENGINE_get_DSA(e) != NULL
+                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
-					&& !append_buf(&cap_buf, "DSA",
+                    goto end;
-						&cap_size, 256))
+                if (ENGINE_get_DH(e) != NULL
-					goto end;
+                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
-				if (ENGINE_get_DH(e) != NULL
+                    goto end;
-					&& !append_buf(&cap_buf, "DH",
+                if (ENGINE_get_RAND(e) != NULL
-						&cap_size, 256))
+                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
-					goto end;
+                    goto end;
-				if (ENGINE_get_RAND(e) != NULL
-					&& !append_buf(&cap_buf, "RAND",
-						&cap_size, 256))
-					goto end;
 
-				fn_c = ENGINE_get_ciphers(e);
+                fn_c = ENGINE_get_ciphers(e);
-				if(!fn_c) goto skip_ciphers;
+                if (!fn_c)
-				n = fn_c(e, NULL, &nids, 0);
+                    goto skip_ciphers;
-				for(k=0 ; k < n ; ++k)
+                n = fn_c(e, NULL, &nids, 0);
-					if(!append_buf(&cap_buf,
+                for (k = 0; k < n; ++k)
-						       OBJ_nid2sn(nids[k]),
+                    if (!append_buf(&cap_buf,
-						       &cap_size, 256))
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						goto end;
+                        goto end;
 
-skip_ciphers:
+ skip_ciphers:
-				fn_d = ENGINE_get_digests(e);
+                fn_d = ENGINE_get_digests(e);
-				if(!fn_d) goto skip_digests;
+                if (!fn_d)
-				n = fn_d(e, NULL, &nids, 0);
+                    goto skip_digests;
-				for(k=0 ; k < n ; ++k)
+                n = fn_d(e, NULL, &nids, 0);
-					if(!append_buf(&cap_buf,
+                for (k = 0; k < n; ++k)
-						       OBJ_nid2sn(nids[k]),
+                    if (!append_buf(&cap_buf,
-						       &cap_size, 256))
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						goto end;
+                        goto end;
 
-skip_digests:
+ skip_digests:
-				if (cap_buf && (*cap_buf != '\0'))
+                if (cap_buf && (*cap_buf != '\0'))
-					BIO_printf(bio_out, " [%s]\n", cap_buf);
+                    BIO_printf(bio_out, " [%s]\n", cap_buf);
 
-				OPENSSL_free(cap_buf);
+                OPENSSL_free(cap_buf);
-				}
+            }
-			if(test_avail)
+            if (test_avail) {
-				{
+                BIO_printf(bio_out, "%s", indent);
-				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);
-					BIO_printf(bio_out, "[ available ]\n");
+                    ENGINE_finish(e);
-					util_do_cmds(e, post_cmds, bio_out, indent);
+                } else {
-					ENGINE_finish(e);
+                    BIO_printf(bio_out, "[ unavailable ]\n");
-					}
+                    if (test_avail_noise)
-				else
+                        ERR_print_errors_fp(stdout);
-					{
+                    ERR_clear_error();
-					BIO_printf(bio_out, "[ unavailable ]\n");
+                }
-					if(test_avail_noise)
+            }
-						ERR_print_errors_fp(stdout);
+            if ((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
-					ERR_clear_error();
+                goto end;
-					}
+            ENGINE_free(e);
-				}
+        } else
-			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
+            ERR_print_errors(bio_err);
-				goto end;
+    }
-			ENGINE_free(e);
-			}
-		else
-			ERR_print_errors(bio_err);
-		}
 
-	ret=0;
+    ret = 0;
-end:
+ end:
 
-	ERR_print_errors(bio_err);
+    ERR_print_errors(bio_err);
-	sk_pop_free(engines, identity);
+    sk_pop_free(engines, identity);
-	sk_pop_free(pre_cmds, identity);
+    sk_pop_free(pre_cmds, identity);
-	sk_pop_free(post_cmds, identity);
+    sk_pop_free(post_cmds, identity);
-	if (bio_out != NULL) BIO_free_all(bio_out);
+    if (bio_out != NULL)
-	apps_shutdown();
+        BIO_free_all(bio_out);
-	OPENSSL_EXIT(ret);
+    apps_shutdown();
-	}
+    OPENSSL_EXIT(ret);
+}
 #else
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/errstr.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -66,61 +66,56 @@
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	errstr_main
+#define PROG    errstr_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,ret=0;
+    int i, ret = 0;
-	char buf[256];
+    char buf[256];
-	unsigned long l;
+    unsigned long l;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	SSL_load_error_strings();
+    SSL_load_error_strings();
 
-	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
+    if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
-		{
+        BIO *out = NULL;
-		BIO *out=NULL;
 
-		out=BIO_new(BIO_s_file());
+        out = BIO_new(BIO_s_file());
-		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
+        if ((out != NULL) && BIO_set_fp(out, stdout, BIO_NOCLOSE)) {
-			{
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
+            lh_node_stats_bio((LHASH *)ERR_get_string_table(), out);
-			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
+            lh_stats_bio((LHASH *)ERR_get_string_table(), out);
-			lh_node_usage_stats_bio((LHASH *)
+            lh_node_usage_stats_bio((LHASH *)
-				ERR_get_string_table(),out);
+                                    ERR_get_string_table(), out);
-			}
+        }
-		if (out != NULL) BIO_free_all(out);
+        if (out != NULL)
-		argc--;
+            BIO_free_all(out);
-		argv++;
+        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);
-			ERR_error_string_n(l, buf, sizeof buf);
+        } else {
-			printf("%s\n",buf);
+            printf("%s: bad error code\n", argv[i]);
-			}
+            printf("usage: errstr [-stats] <errno> ...\n");
-		else
+            ret++;
-			{
+        }
-			printf("%s: bad error code\n",argv[i]);
+    }
-			printf("usage: errstr [-stats] <errno> ...\n");
+    apps_shutdown();
-			ret++;
+    OPENSSL_EXIT(ret);
-			}
+}
-		}
-	apps_shutdown();
-	OPENSSL_EXIT(ret);
-	}

apps/gendh.c

@@ -6,21 +6,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -35,10 +35,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,188 +50,193 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_DH
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/rand.h>
+# include <openssl/rand.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dh.h>
+# include <openssl/dh.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG gendh_main
+# define PROG gendh_main
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	BN_GENCB cb;
+    BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
+    DH *dh = NULL;
-	ENGINE *e = NULL;
+    int ret = 1, num = DEFBITS;
-#endif
+    int g = 2;
-	DH *dh=NULL;
+    char *outfile = NULL;
-	int ret=1,num=DEFBITS;
+    char *inrand = NULL;
-	int g=2;
+# ifndef OPENSSL_NO_ENGINE
-	char *outfile=NULL;
+    char *engine = NULL;
-	char *inrand=NULL;
+# endif
-#ifndef OPENSSL_NO_ENGINE
+    BIO *out = NULL;
-	char *engine=NULL;
-#endif
-	BIO *out=NULL;
 
-	apps_startup();
+    apps_startup();
 
-	BN_GENCB_set(&cb, dh_cb, bio_err);
+    BN_GENCB_set(&cb, dh_cb, bio_err);
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argv++;
+    argv++;
-	argc--;
+    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);
+            outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-2") == 0)
-		else if (strcmp(*argv,"-2") == 0)
+            g = 2;
-			g=2;
+/*-     else if (strcmp(*argv,"-3") == 0)
-	/*	else if (strcmp(*argv,"-3") == 0)
+                g=3; */
-			g=3; */
+        else if (strcmp(*argv, "-5") == 0)
-		else if (strcmp(*argv,"-5") == 0)
+            g = 5;
-			g=5;
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv,"-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            engine = *(++argv);
-			engine= *(++argv);
+        }
-			}
+# endif
-#endif
+        else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            inrand = *(++argv);
-			inrand= *(++argv);
+        } else
-			}
+            break;
-		else
+        argv++;
-			break;
+        argc--;
-		argv++;
+    }
-		argc--;
+    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
-		}
+ bad:
-	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
+        BIO_printf(bio_err, "usage: gendh [args] [numbits]\n");
-		{
+        BIO_printf(bio_err, " -out file - output the key to 'file\n");
-bad:
+        BIO_printf(bio_err, " -2        - use 2 as the generator value\n");
-		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," -3 - use 3 as the generator value\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, " -5        - use 5 as the generator value\n");
-		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
+# ifndef OPENSSL_NO_ENGINE
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+                   " -engine e - use engine e, possibly a hardware device.\n");
-#endif
+# endif
-		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,"             the random number generator\n");
+        BIO_printf(bio_err,
-		goto end;
+                   "           - 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);
+# ifndef OPENSSL_NO_ENGINE
-#endif
+    setup_engine(bio_err, engine, 0);
+# endif
 
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-		{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-		out = BIO_push(tmpbio, out);
+        }
-		}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		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)
+    if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
+                   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,
-	BIO_printf(bio_err,"This is going to take a long time\n");
+               "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)
-		goto end;
+        || !DH_generate_parameters_ex(dh, num, g, &cb))
-		
+        goto end;
-	app_RAND_write_file(NULL, bio_err);
 
-	if (!PEM_write_bio_DHparams(out,dh))
+    app_RAND_write_file(NULL, bio_err);
-		goto end;
+
-	ret=0;
+    if (!PEM_write_bio_DHparams(out, dh))
-end:
+        goto end;
-	if (ret != 0)
+    ret = 0;
-		ERR_print_errors(bio_err);
+ end:
-	if (out != NULL) BIO_free_all(out);
+    if (ret != 0)
-	if (dh != NULL) DH_free(dh);
+        ERR_print_errors(bio_err);
-	apps_shutdown();
+    if (out != NULL)
-	OPENSSL_EXIT(ret);
+        BIO_free_all(out);
-	}
+    if (dh != NULL)
+        DH_free(dh);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
+    p = n;
+# endif
+    return 1;
+}
 #endif

apps/gendsa.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,213 +49,239 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/dsa.h>
+# include <openssl/dsa.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG gendsa_main
+# define PROG gendsa_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-#ifndef OPENSSL_NO_ENGINE
+    DSA *dsa = NULL;
-	ENGINE *e = NULL;
+    int ret = 1;
-#endif
+    char *outfile = NULL;
-	DSA *dsa=NULL;
+    char *inrand = NULL, *dsaparams = NULL;
-	int ret=1;
+    char *passargout = NULL, *passout = NULL;
-	char *outfile=NULL;
+    BIO *out = NULL, *in = NULL;
-	char *inrand=NULL,*dsaparams=NULL;
+    const EVP_CIPHER *enc = NULL;
-	char *passargout = NULL, *passout = NULL;
+# ifndef OPENSSL_NO_ENGINE
-	BIO *out=NULL,*in=NULL;
+    char *engine = NULL;
-	const EVP_CIPHER *enc=NULL;
+# endif
-#ifndef OPENSSL_NO_ENGINE
+
-	char *engine=NULL;
+    apps_startup();
-#endif
+
-
+    if (bio_err == NULL)
-	apps_startup();
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-	if (bio_err == NULL)
+
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+    if (!load_config(bio_err, NULL))
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+        goto end;
-
+
-	if (!load_config(bio_err, NULL))
+    argv++;
-		goto end;
+    argc--;
-
+    for (;;) {
-	argv++;
+        if (argc <= 0)
-	argc--;
+            break;
-	for (;;)
+        if (strcmp(*argv, "-out") == 0) {
-		{
+            if (--argc < 1)
-		if (argc <= 0) break;
+                goto bad;
-		if (strcmp(*argv,"-out") == 0)
+            outfile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-passout") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			outfile= *(++argv);
+                goto bad;
-			}
+            passargout = *(++argv);
-		else if (strcmp(*argv,"-passout") == 0)
+        }
-			{
+# ifndef OPENSSL_NO_ENGINE
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-engine") == 0) {
-			passargout= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#ifndef OPENSSL_NO_ENGINE
+            engine = *(++argv);
-		else if (strcmp(*argv,"-engine") == 0)
+        }
-			{
+# endif
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-rand") == 0) {
-			engine= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-#endif
+            inrand = *(++argv);
-		else if (strcmp(*argv,"-rand") == 0)
+        } else if (strcmp(*argv, "-") == 0)
-			{
+            goto bad;
-			if (--argc < 1) goto bad;
+# ifndef OPENSSL_NO_DES
-			inrand= *(++argv);
+        else if (strcmp(*argv, "-des") == 0)
-			}
+            enc = EVP_des_cbc();
-		else if (strcmp(*argv,"-") == 0)
+        else if (strcmp(*argv, "-des3") == 0)
-			goto bad;
+            enc = EVP_des_ede3_cbc();
-#ifndef OPENSSL_NO_DES
+# endif
-		else if (strcmp(*argv,"-des") == 0)
+# ifndef OPENSSL_NO_IDEA
-			enc=EVP_des_cbc();
+        else if (strcmp(*argv, "-idea") == 0)
-		else if (strcmp(*argv,"-des3") == 0)
+            enc = EVP_idea_cbc();
-			enc=EVP_des_ede3_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_SEED
-#ifndef OPENSSL_NO_IDEA
+        else if (strcmp(*argv, "-seed") == 0)
-		else if (strcmp(*argv,"-idea") == 0)
+            enc = EVP_seed_cbc();
-			enc=EVP_idea_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_AES
-#ifndef OPENSSL_NO_AES
+        else if (strcmp(*argv, "-aes128") == 0)
-		else if (strcmp(*argv,"-aes128") == 0)
+            enc = EVP_aes_128_cbc();
-			enc=EVP_aes_128_cbc();
+        else if (strcmp(*argv, "-aes192") == 0)
-		else if (strcmp(*argv,"-aes192") == 0)
+            enc = EVP_aes_192_cbc();
-			enc=EVP_aes_192_cbc();
+        else if (strcmp(*argv, "-aes256") == 0)
-		else if (strcmp(*argv,"-aes256") == 0)
+            enc = EVP_aes_256_cbc();
-			enc=EVP_aes_256_cbc();
+# endif
-#endif
+# ifndef OPENSSL_NO_CAMELLIA
-		else if (**argv != '-' && dsaparams == NULL)
+        else if (strcmp(*argv, "-camellia128") == 0)
-			{
+            enc = EVP_camellia_128_cbc();
-			dsaparams = *argv;
+        else if (strcmp(*argv, "-camellia192") == 0)
-			}
+            enc = EVP_camellia_192_cbc();
-		else
+        else if (strcmp(*argv, "-camellia256") == 0)
-			goto bad;
+            enc = EVP_camellia_256_cbc();
-		argv++;
+# endif
-		argc--;
+        else if (**argv != '-' && dsaparams == NULL) {
-		}
+            dsaparams = *argv;
-
+        } else
-	if (dsaparams == NULL)
+            goto bad;
-		{
+        argv++;
-bad:
+        argc--;
-		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
+    if (dsaparams == NULL) {
-		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
+ bad:
-		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+        BIO_printf(bio_err, "usage: gendsa [args] dsaparam-file\n");
-#endif
+        BIO_printf(bio_err, " -out file - output the key to 'file'\n");
-#ifndef OPENSSL_NO_IDEA
+# ifndef OPENSSL_NO_DES
-		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+        BIO_printf(bio_err,
-#endif
+                   " -des      - encrypt the generated key with DES in cbc mode\n");
-#ifndef OPENSSL_NO_AES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+                   " -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+# endif
-#endif
+# ifndef OPENSSL_NO_IDEA
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
-#endif
+# endif
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+# ifndef OPENSSL_NO_SEED
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, " -seed\n");
-		BIO_printf(bio_err,"             the random number generator\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," dsaparam-file\n");
+                   "                 encrypt PEM output with cbc seed\n");
-		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
+# endif
-		goto end;
+# ifndef OPENSSL_NO_AES
-		}
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_ENGINE
+                   "                 encrypt PEM output with cbc aes\n");
-        e = setup_engine(bio_err, engine, 0);
+# endif
-#endif
+# ifndef OPENSSL_NO_CAMELLIA
-
+        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "Error getting password\n");
+                   "                 encrypt PEM output with cbc camellia\n");
-		goto end;
+# endif
-	}
+# ifndef OPENSSL_NO_ENGINE
-
+        BIO_printf(bio_err,
-
+                   " -engine e - use engine e, possibly a hardware device.\n");
-	in=BIO_new(BIO_s_file());
+# endif
-	if (!(BIO_read_filename(in,dsaparams)))
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		{
+                   LIST_SEPARATOR_CHAR);
-		perror(dsaparams);
+        BIO_printf(bio_err,
-		goto end;
+                   "           - 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");
-	if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
+        BIO_printf(bio_err,
-		{
+                   "           - a DSA parameter file as generated by the dsaparam command\n");
-		BIO_printf(bio_err,"unable to load DSA parameter file\n");
+        goto end;
-		goto end;
+    }
-		}
+# ifndef OPENSSL_NO_ENGINE
-	BIO_free(in);
+    setup_engine(bio_err, engine, 0);
-	in = NULL;
+# endif
-		
+
-	out=BIO_new(BIO_s_file());
+    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
-	if (out == NULL) goto end;
+        BIO_printf(bio_err, "Error getting password\n");
-
+        goto end;
-	if (outfile == NULL)
+    }
-		{
+
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+    in = BIO_new(BIO_s_file());
-#ifdef OPENSSL_SYS_VMS
+    if (!(BIO_read_filename(in, dsaparams))) {
-		{
+        perror(dsaparams);
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+        goto end;
-		out = BIO_push(tmpbio, out);
+    }
-		}
+
-#endif
+    if ((dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL)) == NULL) {
-		}
+        BIO_printf(bio_err, "unable to load DSA parameter file\n");
-	else
+        goto end;
-		{
+    }
-		if (BIO_write_filename(out,outfile) <= 0)
+    BIO_free(in);
-			{
+    in = NULL;
-			perror(outfile);
+
-			goto end;
+    out = BIO_new(BIO_s_file());
-			}
+    if (out == NULL)
-		}
+        goto end;
-
+
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+# ifdef OPENSSL_SYS_VMS
-		}
+        {
-	if (inrand != NULL)
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+            out = BIO_push(tmpbio, out);
-			app_RAND_load_files(inrand));
+        }
-
+# endif
-	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
+    } else {
-							BN_num_bits(dsa->p));
+        if (BIO_write_filename(out, outfile) <= 0) {
-	if (!DSA_generate_key(dsa)) goto end;
+            perror(outfile);
-
+            goto end;
-	app_RAND_write_file(NULL, bio_err);
+        }
-
+    }
-	if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))
+
-		goto end;
+    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
-	ret=0;
+        BIO_printf(bio_err,
-end:
+                   "warning, not much extra random data, consider using the -rand option\n");
-	if (ret != 0)
+    }
-		ERR_print_errors(bio_err);
+    if (inrand != NULL)
-	if (in != NULL) BIO_free(in);
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-	if (out != NULL) BIO_free_all(out);
+                   app_RAND_load_files(inrand));
-	if (dsa != NULL) DSA_free(dsa);
+
-	if(passout) OPENSSL_free(passout);
+    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
-	apps_shutdown();
+    if (!DSA_generate_key(dsa))
-	OPENSSL_EXIT(ret);
+        goto end;
-	}
+
+    app_RAND_write_file(NULL, bio_err);
+
+    if (!PEM_write_bio_DSAPrivateKey(out, dsa, enc, NULL, 0, NULL, passout))
+        goto end;
+    ret = 0;
+ end:
+    if (ret != 0)
+        ERR_print_errors(bio_err);
+    if (in != NULL)
+        BIO_free(in);
+    if (out != NULL)
+        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

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,259 +49,308 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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
+# undef OPENSSL_NO_DEPRECATED
 #endif
 
 #ifndef OPENSSL_NO_RSA
-#include <stdio.h>
+# include <stdio.h>
-#include <string.h>
+# include <string.h>
-#include <sys/types.h>
+# include <sys/types.h>
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/rand.h>
+# include <openssl/rand.h>
 
-#define DEFBITS	512
+# define DEFBITS 512
-#undef PROG
+# undef PROG
-#define PROG genrsa_main
+# define PROG genrsa_main
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	BN_GENCB cb;
+    BN_GENCB cb;
-#ifndef OPENSSL_NO_ENGINE
+    int ret = 1;
-	ENGINE *e = NULL;
+    int i, num = DEFBITS;
-#endif
+    long l;
-	int ret=1;
+    int use_x931 = 0;
-	int i,num=DEFBITS;
+    const EVP_CIPHER *enc = NULL;
-	long l;
+    unsigned long f4 = RSA_F4;
-	const EVP_CIPHER *enc=NULL;
+    char *outfile = NULL;
-	unsigned long f4=RSA_F4;
+    char *passargout = NULL, *passout = NULL;
-	char *outfile=NULL;
+# ifndef OPENSSL_NO_ENGINE
-	char *passargout = NULL, *passout = NULL;
+    char *engine = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# endif
-	char *engine=NULL;
+    char *inrand = NULL;
-#endif
+    BIO *out = NULL;
-	char *inrand=NULL;
+    BIGNUM *bn = BN_new();
-	BIO *out=NULL;
+    RSA *rsa = NULL;
-	BIGNUM *bn = BN_new();
-	RSA *rsa = RSA_new();
 
-	if(!bn || !rsa) goto err;
+    if (!bn)
+        goto err;
 
-	apps_startup();
+    apps_startup();
-	BN_GENCB_set(&cb, genrsa_cb, bio_err);
+    BN_GENCB_set(&cb, genrsa_cb, bio_err);
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto err;
+        goto err;
-	if ((out=BIO_new(BIO_s_file())) == NULL)
+    if ((out = BIO_new(BIO_s_file())) == NULL) {
-		{
+        BIO_printf(bio_err, "unable to create BIO for output\n");
-		BIO_printf(bio_err,"unable to create BIO for output\n");
+        goto err;
-		goto err;
+    }
-		}
 
-	argv++;
+    argv++;
-	argc--;
+    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);
+            outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-3") == 0)
-		else if (strcmp(*argv,"-3") == 0)
+            f4 = 3;
-			f4=3;
+        else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
-		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
+            f4 = RSA_F4;
-			f4=RSA_F4;
+        else if (strcmp(*argv, "-x931") == 0)
-#ifndef OPENSSL_NO_ENGINE
+            use_x931 = 1;
-		else if (strcmp(*argv,"-engine") == 0)
+# ifndef OPENSSL_NO_ENGINE
-			{
+        else if (strcmp(*argv, "-engine") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			engine= *(++argv);
+                goto bad;
-			}
+            engine = *(++argv);
-#endif
+        }
-		else if (strcmp(*argv,"-rand") == 0)
+# endif
-			{
+        else if (strcmp(*argv, "-rand") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			inrand= *(++argv);
+                goto bad;
-			}
+            inrand = *(++argv);
-#ifndef OPENSSL_NO_DES
+        }
-		else if (strcmp(*argv,"-des") == 0)
+# ifndef OPENSSL_NO_DES
-			enc=EVP_des_cbc();
+        else if (strcmp(*argv, "-des") == 0)
-		else if (strcmp(*argv,"-des3") == 0)
+            enc = EVP_des_cbc();
-			enc=EVP_des_ede3_cbc();
+        else if (strcmp(*argv, "-des3") == 0)
-#endif
+            enc = EVP_des_ede3_cbc();
-#ifndef OPENSSL_NO_IDEA
+# endif
-		else if (strcmp(*argv,"-idea") == 0)
+# ifndef OPENSSL_NO_IDEA
-			enc=EVP_idea_cbc();
+        else if (strcmp(*argv, "-idea") == 0)
-#endif
+            enc = EVP_idea_cbc();
-#ifndef OPENSSL_NO_AES
+# endif
-		else if (strcmp(*argv,"-aes128") == 0)
+# ifndef OPENSSL_NO_SEED
-			enc=EVP_aes_128_cbc();
+        else if (strcmp(*argv, "-seed") == 0)
-		else if (strcmp(*argv,"-aes192") == 0)
+            enc = EVP_seed_cbc();
-			enc=EVP_aes_192_cbc();
+# endif
-		else if (strcmp(*argv,"-aes256") == 0)
+# ifndef OPENSSL_NO_AES
-			enc=EVP_aes_256_cbc();
+        else if (strcmp(*argv, "-aes128") == 0)
-#endif
+            enc = EVP_aes_128_cbc();
-		else if (strcmp(*argv,"-passout") == 0)
+        else if (strcmp(*argv, "-aes192") == 0)
-			{
+            enc = EVP_aes_192_cbc();
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-aes256") == 0)
-			passargout= *(++argv);
+            enc = EVP_aes_256_cbc();
-			}
+# endif
-		else
+# ifndef OPENSSL_NO_CAMELLIA
-			break;
+        else if (strcmp(*argv, "-camellia128") == 0)
-		argv++;
+            enc = EVP_camellia_128_cbc();
-		argc--;
+        else if (strcmp(*argv, "-camellia192") == 0)
-		}
+            enc = EVP_camellia_192_cbc();
-	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
+        else if (strcmp(*argv, "-camellia256") == 0)
-		{
+            enc = EVP_camellia_256_cbc();
-bad:
+# endif
-		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
+        else if (strcmp(*argv, "-passout") == 0) {
-		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
+            if (--argc < 1)
-		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+                goto bad;
-#ifndef OPENSSL_NO_IDEA
+            passargout = *(++argv);
-		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
+        } else
-#endif
+            break;
-#ifndef OPENSSL_NO_AES
+        argv++;
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+        argc--;
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+    }
-#endif
+    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
-		BIO_printf(bio_err," -out file       output the key to 'file\n");
+ bad:
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err, "usage: genrsa [args] [numbits]\n");
-		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -3              use 3 for the E value\n");
+                   " -des            encrypt the generated key with DES in cbc mode\n");
-#ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+                   " -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-#endif
+# ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
+                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
-		BIO_printf(bio_err,"                 the random number generator\n");
+# endif
-		goto err;
+# ifndef OPENSSL_NO_SEED
-		}
+        BIO_printf(bio_err, " -seed\n");
-		
+        BIO_printf(bio_err,
-	ERR_load_crypto_strings();
+                   "                 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");
+# 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,
+                   " -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");
+# endif
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "                 load the file (or the files in the directory) into\n");
+        BIO_printf(bio_err, "                 the random number generator\n");
+        goto err;
+    }
 
-	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+    ERR_load_crypto_strings();
-		BIO_printf(bio_err, "Error getting password\n");
-		goto err;
-	}
 
-#ifndef OPENSSL_NO_ENGINE
+    if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
-        e = setup_engine(bio_err, engine, 0);
+        BIO_printf(bio_err, "Error getting password\n");
-#endif
+        goto err;
+    }
+# ifndef OPENSSL_NO_ENGINE
+    setup_engine(bio_err, engine, 0);
+# endif
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-		{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-		out = BIO_push(tmpbio, out);
+        }
-		}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto err;
-		if (BIO_write_filename(out,outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto err;
-			}
-		}
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
+    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)
+    if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
+                   app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
+    BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
-		num);
+               num);
 
-	if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+    rsa = RSA_new();
-		goto err;
+    if (!rsa)
-		
+        goto err;
-	app_RAND_write_file(NULL, bio_err);
 
-	/* We need to do the following for when the base number size is <
+    if (use_x931) {
-	 * long, esp windows 3.1 :-(. */
+        BIGNUM *pubexp;
-	l=0L;
+        pubexp = BN_new();
-	for (i=0; i<rsa->e->top; i++)
+        if (!BN_set_word(pubexp, f4))
-		{
+            goto err;
-#ifndef SIXTY_FOUR_BIT
+        if (!RSA_X931_generate_key_ex(rsa, num, pubexp, &cb))
-		l<<=BN_BITS4;
+            goto err;
-		l<<=BN_BITS4;
+        BN_free(pubexp);
-#endif
+    } else if (!BN_set_word(bn, f4)
-		l+=rsa->e->d[i];
+               || !RSA_generate_key_ex(rsa, num, bn, &cb))
-		}
+        goto err;
-	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
-	{
-	PW_CB_DATA cb_data;
-	cb_data.password = passout;
-	cb_data.prompt_info = outfile;
-	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
-		(pem_password_cb *)password_callback,&cb_data))
-		goto err;
-	}
 
-	ret=0;
+    app_RAND_write_file(NULL, bio_err);
-err:
+
-	if (bn) BN_free(bn);
+    /*
-	if (rsa) RSA_free(rsa);
+     * We need to do the following for when the base number size is < long,
-	if (out) BIO_free_all(out);
+     * esp windows 3.1 :-(.
-	if(passout) OPENSSL_free(passout);
+     */
-	if (ret != 0)
+    l = 0L;
-		ERR_print_errors(bio_err);
+    for (i = 0; i < rsa->e->top; i++) {
-	apps_shutdown();
+# ifndef SIXTY_FOUR_BIT
-	OPENSSL_EXIT(ret);
+        l <<= BN_BITS4;
-	}
+        l <<= BN_BITS4;
+# endif
+        l += rsa->e->d[i];
+    }
+    BIO_printf(bio_err, "e is %ld (0x%lX)\n", l, l);
+    {
+        PW_CB_DATA cb_data;
+        cb_data.password = passout;
+        cb_data.prompt_info = outfile;
+        if (!PEM_write_bio_RSAPrivateKey(out, rsa, enc, NULL, 0,
+                                         (pem_password_cb *)password_callback,
+                                         &cb_data))
+            goto err;
+    }
+
+    ret = 0;
+ err:
+    if (bn)
+        BN_free(bn);
+    if (rsa)
+        RSA_free(rsa);
+    if (out)
+        BIO_free_all(out);
+    if (passout)
+        OPENSSL_free(passout);
+    if (ret != 0)
+        ERR_print_errors(bio_err);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
 
 static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
-	{
+{
-	char c='*';
+    char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	BIO_write(cb->arg,&c,1);
+    if (p == 2)
-	(void)BIO_flush(cb->arg);
+        c = '*';
-#ifdef LINT
+    if (p == 3)
-	p=n;
+        c = '\n';
-#endif
+    BIO_write(cb->arg, &c, 1);
-	return 1;
+    (void)BIO_flush(cb->arg);
-	}
+# ifdef LINT
-#else /* !OPENSSL_NO_RSA */
+    p = n;
+# endif
+    return 1;
+}
+#else                           /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

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,157 +134,172 @@ $!
 $ 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
 $!
-$! Check To See If We Are At The End Of The File List.
+$!  Create The Executable File Name.
 $!
-$ IF (FILE_NAME0.EQS.";")
+$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
+$!
+$!  Check To See If We Are At The End Of The File List.
+$!
+$ 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.
+$!  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. -
-     ","+PROGRAMS+"," - (","+F$EDIT(FILE_NAME,"UPCASE")+",") .EQS. ","+PROGRAMS+","
-$ THEN
-$   GOTO NEXT_FILE
-$ ENDIF
-$!
-$! Create The Source File Name.
-$!
-$ SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C"
-$!
-$! Create The Object File Name.
-$!
-$ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
-$!
-$! 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.
-$!
-$ IF (F$SEARCH(SOURCE_FILE).EQS."")
-$ THEN
-$!
-$!  Tell The User That The File Dosen't Exist.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Exit The Build.
-$!
-$   GOTO EXIT
-$!
-$! End The File Exist Check.
-$!
-$ ENDIF
-$!
-$! Tell The User What We Are Building.
 $!
 $ IF (PHASE.EQS."LIB")
 $ THEN
-$   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME,".C File."
-$ ELSE
-$   WRITE SYS$OUTPUT "Building The ",FILE_NAME," Application Program."
-$ ENDIF
 $!
-$! Compile The File.
+$!  Define A Library File Counter And Set It To "-1".
+$!  -1 Means The Application File Name Is To Be Used.
 $!
-$ ON ERROR THEN GOTO NEXT_FILE
+$   LIB_COUNTER = -1
-$ IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
-$ THEN
-$   CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$ ELSE
-$   CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$ ENDIF
 $!
-$ ON WARNING THEN GOTO NEXT_FILE
+$!  Create a .OPT file for the object files
 $!
-$ IF (PHASE.EQS."LIB") 
+$   OPEN/WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
-$ THEN 
+$!
-$   GOTO NEXT_FILE
+$!  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"
+$!
+$!  Create The Object File Name.
+$!
+$   OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
+$   ON WARNING THEN GOTO NEXT_LIB
+$!
+$!  Check To See If The File We Want To Compile Actually Exists.
+$!
+$   IF (F$SEARCH(SOURCE_FILE).EQS."")
+$   THEN
+$!
+$!    Tell The User That The File Dosen't Exist.
+$!
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
+$     WRITE SYS$OUTPUT ""
+$!
+$!    Exit The Build.
+$!
+$     GOTO EXIT
+$!
+$!  End The File Exist Check.
+$!
+$   ENDIF
+$!
+$!  Tell The User What We Are Building.
+$!
+$   IF (PHASE.EQS."LIB")
+$   THEN
+$     WRITE SYS$OUTPUT "Compiling The ",FILE_NAME,".C File."
+$   ELSE
+$     WRITE SYS$OUTPUT "Building The ",FILE_NAME," Application Program."
+$   ENDIF
+$!
+$!  Compile The 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
+$!
+$   GOTO NEXT_LIB
 $ 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.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -69,99 +70,101 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int toseq = 0;
+    int toseq = 0;
-	X509 *x509 = NULL;
+    X509 *x509 = NULL;
-	NETSCAPE_CERT_SEQUENCE *seq = NULL;
+    NETSCAPE_CERT_SEQUENCE *seq = NULL;
-	int i, ret = 1;
+    int i, ret = 1;
-	int badarg = 0;
+    int badarg = 0;
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
-	ERR_load_crypto_strings();
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-	args = argv + 1;
+    ERR_load_crypto_strings();
-	while (!badarg && *args && *args[0] == '-') {
+    args = argv + 1;
-		if (!strcmp (*args, "-toseq")) toseq = 1;
+    while (!badarg && *args && *args[0] == '-') {
-		else if (!strcmp (*args, "-in")) {
+        if (!strcmp(*args, "-toseq"))
-			if (args[1]) {
+            toseq = 1;
-				args++;
+        else if (!strcmp(*args, "-in")) {
-				infile = *args;
+            if (args[1]) {
-			} else badarg = 1;
+                args++;
-		} else if (!strcmp (*args, "-out")) {
+                infile = *args;
-			if (args[1]) {
+            } else
-				args++;
+                badarg = 1;
-				outfile = *args;
+        } else if (!strcmp(*args, "-out")) {
-			} else badarg = 1;
+            if (args[1]) {
-		} else badarg = 1;
+                args++;
-		args++;
+                outfile = *args;
-	}
+            } else
+                badarg = 1;
+        } else
+            badarg = 1;
+        args++;
+    }
 
-	if (badarg) {
+    if (badarg) {
-		BIO_printf (bio_err, "Netscape certificate sequence utility\n");
+        BIO_printf(bio_err, "Netscape certificate sequence utility\n");
-		BIO_printf (bio_err, "Usage nseq [options]\n");
+        BIO_printf(bio_err, "Usage nseq [options]\n");
-		BIO_printf (bio_err, "where options are\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf (bio_err, "-in file  input file\n");
+        BIO_printf(bio_err, "-in file  input file\n");
-		BIO_printf (bio_err, "-out file output file\n");
+        BIO_printf(bio_err, "-out file output file\n");
-		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
+        BIO_printf(bio_err, "-toseq    output NS Sequence file\n");
-		OPENSSL_EXIT(1);
+        OPENSSL_EXIT(1);
-	}
+    }
 
-	if (infile) {
+    if (infile) {
-		if (!(in = BIO_new_file (infile, "r"))) {
+        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;
-			goto end;
+        }
-		}
+    } else
-	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if (outfile) {
+    if (outfile) {
-		if (!(out = BIO_new_file (outfile, "w"))) {
+        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;
-			goto end;
+        }
-		}
+    } else {
-	} else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
-	if (toseq) {
+    if (toseq) {
-		seq = NETSCAPE_CERT_SEQUENCE_new();
+        seq = NETSCAPE_CERT_SEQUENCE_new();
-		seq->certs = sk_X509_new_null();
+        seq->certs = sk_X509_new_null();
-		while((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL))) 
+        while ((x509 = PEM_read_bio_X509(in, NULL, NULL, NULL)))
-		    sk_X509_push(seq->certs,x509);
+            sk_X509_push(seq->certs, x509);
 
-		if(!sk_X509_num(seq->certs))
+        if (!sk_X509_num(seq->certs)) {
-		{
+            BIO_printf(bio_err, "Error reading certs file %s\n", infile);
-			BIO_printf (bio_err, "Error reading certs file %s\n", infile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-		}
+        PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
-		PEM_write_bio_NETSCAPE_CERT_SEQUENCE(out, seq);
+        ret = 0;
-		ret = 0;
+        goto end;
-		goto end;
+    }
-	}
 
-	if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
+    if (!(seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL))) {
-		BIO_printf (bio_err, "Error reading sequence file %s\n", infile);
+        BIO_printf(bio_err, "Error reading sequence file %s\n", infile);
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	for(i = 0; i < sk_X509_num(seq->certs); i++) {
+    for (i = 0; i < sk_X509_num(seq->certs); i++) {
-		x509 = sk_X509_value(seq->certs, i);
+        x509 = sk_X509_value(seq->certs, i);
-		dump_cert_text(out, x509);
+        dump_cert_text(out, x509);
-		PEM_write_bio_X509(out, x509);
+        PEM_write_bio_X509(out, x509);
-	}
+    }
-	ret = 0;
+    ret = 0;
-end:
+ end:
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	NETSCAPE_CERT_SEQUENCE_free(seq);
+    NETSCAPE_CERT_SEQUENCE_free(seq);
 
-	OPENSSL_EXIT(ret);
+    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

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,21 +49,21 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -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>
@@ -123,396 +123,403 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
 #endif
-#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS 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);
 /* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
-static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
+static int MS_CALLBACK cmp(const void *a_void, const void *b_void);
-static LHASH *prog_init(void );
+static LHASH *prog_init(void);
-static int do_cmd(LHASH *prog,int argc,char *argv[]);
+static int do_cmd(LHASH *prog, int argc, char *argv[]);
-char *default_config_file=NULL;
+char *default_config_file = NULL;
 
 /* Make sure there is only one when MONOLITH is defined */
 #ifdef MONOLITH
-CONF *config=NULL;
+CONF *config = NULL;
-BIO *bio_err=NULL;
+BIO *bio_err = NULL;
+int in_FIPS_mode = 0;
 #endif
 
-
 static void lock_dbg_cb(int mode, int type, const char *file, int line)
-	{
+{
-	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
+    static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
-	const char *errstr = NULL;
+    const char *errstr = NULL;
-	int rw;
+    int rw;
-	
-	rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
-	if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
-		{
-		errstr = "invalid mode";
-		goto err;
-		}
 
-	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
+    rw = mode & (CRYPTO_READ | CRYPTO_WRITE);
-		{
+    if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE))) {
-		errstr = "type out of bounds";
+        errstr = "invalid mode";
-		goto err;
+        goto err;
-		}
+    }
 
-	if (mode & CRYPTO_LOCK)
+    if (type < 0 || type >= CRYPTO_NUM_LOCKS) {
-		{
+        errstr = "type out of bounds";
-		if (modes[type])
+        goto err;
-			{
+    }
-			errstr = "already locked";
-			/* must not happen in a single-threaded program
-			 * (would deadlock) */
-			goto err;
-			}
 
-		modes[type] = rw;
+    if (mode & CRYPTO_LOCK) {
-		}
+        if (modes[type]) {
-	else if (mode & CRYPTO_UNLOCK)
+            errstr = "already locked";
-		{
+            /*
-		if (!modes[type])
+             * must not happen in a single-threaded program (would deadlock)
-			{
+             */
-			errstr = "not locked";
+            goto err;
-			goto err;
+        }
-			}
-		
-		if (modes[type] != rw)
-			{
-			errstr = (rw == CRYPTO_READ) ?
-				"CRYPTO_r_unlock on write lock" :
-				"CRYPTO_w_unlock on read lock";
-			}
 
-		modes[type] = 0;
+        modes[type] = rw;
-		}
+    } else if (mode & CRYPTO_UNLOCK) {
-	else
+        if (!modes[type]) {
-		{
+            errstr = "not locked";
-		errstr = "invalid mode";
+            goto err;
-		goto err;
+        }
-		}
+
+        if (modes[type] != rw) {
+            errstr = (rw == CRYPTO_READ) ?
+                "CRYPTO_r_unlock on write lock" :
+                "CRYPTO_w_unlock on read lock";
+        }
+
+        modes[type] = 0;
+    } else {
+        errstr = "invalid mode";
+        goto err;
+    }
 
  err:
-	if (errstr)
+    if (errstr) {
-		{
+        /* we cannot use bio_err here */
-		/* we cannot use bio_err here */
+        fprintf(stderr,
-		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
+                "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
-			errstr, mode, type, file, line);
+                errstr, mode, type, file, line);
-		}
+    }
-	}
+}
-
 
 int main(int Argc, char *Argv[])
-	{
+{
-	ARGS arg;
+    ARGS arg;
-#define PROG_NAME_SIZE	39
+#define PROG_NAME_SIZE  39
-	char pname[PROG_NAME_SIZE+1];
+    char pname[PROG_NAME_SIZE + 1];
-	FUNCTION f,*fp;
+    FUNCTION f, *fp;
-	MS_STATIC const char *prompt;
+    MS_STATIC const char *prompt;
-	MS_STATIC char buf[1024];
+    MS_STATIC char buf[1024];
-	char *to_free=NULL;
+    char *to_free = NULL;
-	int n,i,ret=0;
+    int n, i, ret = 0;
-	int argc;
+    int argc;
-	char **argv,*p;
+    char **argv, *p;
-	LHASH *prog=NULL;
+    LHASH *prog = NULL;
-	long errline;
+    long errline;
- 
-	arg.data=NULL;
-	arg.count=0;
 
-	if (bio_err == NULL)
+    arg.data = NULL;
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+    arg.count = 0;
-			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 */
+    in_FIPS_mode = 0;
-		{
+
-		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
+    if (getenv("OPENSSL_FIPS")) {
-			{
+#ifdef OPENSSL_FIPS
-			CRYPTO_malloc_debug_init();
+        if (!FIPS_mode_set(1)) {
-			CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+            ERR_load_crypto_strings();
-			}
+            ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
-		else
+            EXIT(1);
-			{
+        }
-			/* OPENSSL_DEBUG_MEMORY=off */
+        in_FIPS_mode = 1;
-			CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
+#else
-			}
+        fprintf(stderr, "FIPS mode not supported.\n");
-		}
+        EXIT(1);
-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+#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 (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))) {
+            CRYPTO_malloc_debug_init();
+            CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+        } else {
+            /* OPENSSL_DEBUG_MEMORY=off */
+            CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
+        }
+    }
+    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
 #if 0
-	if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
+    if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
 #endif
-		{
+    {
-		CRYPTO_set_locking_callback(lock_dbg_cb);
+        CRYPTO_set_locking_callback(lock_dbg_cb);
-		}
+    }
 
-	apps_startup();
+    apps_startup();
 
-	/* Lets load up our environment a little */
+    /* Lets load up our environment a little */
-	p=getenv("OPENSSL_CONF");
+    p = getenv("OPENSSL_CONF");
-	if (p == NULL)
+    if (p == NULL)
-		p=getenv("SSLEAY_CONF");
+        p = getenv("SSLEAY_CONF");
-	if (p == NULL)
+    if (p == NULL)
-		p=to_free=make_config_name();
+        p = to_free = make_config_name();
 
-	default_config_file=p;
+    default_config_file = p;
 
-	config=NCONF_new(NULL);
+    config = NCONF_new(NULL);
-	i=NCONF_load(config,p,&errline);
+    i = NCONF_load(config, p, &errline);
-	if (i == 0)
+    if (i == 0) {
-		{
+        NCONF_free(config);
-		NCONF_free(config);
+        config = NULL;
-		config = NULL;
+        ERR_clear_error();
-		ERR_clear_error();
+    }
-		}
 
-	prog=prog_init();
+    prog = prog_init();
 
-	/* first check the program name */
+    /* first check the program name */
-	program_name(Argv[0],pname,sizeof pname);
+    program_name(Argv[0], pname, sizeof pname);
 
-	f.name=pname;
+    f.name = pname;
-	fp=(FUNCTION *)lh_retrieve(prog,&f);
+    fp = (FUNCTION *) lh_retrieve(prog, &f);
-	if (fp != NULL)
+    if (fp != NULL) {
-		{
+        Argv[0] = pname;
-		Argv[0]=pname;
+        ret = fp->func(Argc, Argv);
-		ret=fp->func(Argc,Argv);
+        goto end;
-		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
-		{
+     */
-		Argc--;
+    if (Argc != 1) {
-		Argv++;
+        Argc--;
-		ret=do_cmd(prog,Argc,Argv);
+        Argv++;
-		if (ret < 0) ret=0;
+        ret = do_cmd(prog, Argc, Argv);
-		goto end;
+        if (ret < 0)
-		}
+            ret = 0;
+        goto end;
+    }
 
-	/* ok, lets enter the old 'OpenSSL>' mode */
+    /* ok, lets enter the old 'OpenSSL>' mode */
-	
-	for (;;)
-		{
-		ret=0;
-		p=buf;
-		n=sizeof buf;
-		i=0;
-		for (;;)
-			{
-			p[0]='\0';
-			if (i++)
-				prompt=">";
-			else	prompt="OpenSSL> ";
-			fputs(prompt,stdout);
-			fflush(stdout);
-			fgets(p,n,stdin);
-			if (p[0] == '\0') goto end;
-			i=strlen(p);
-			if (i <= 1) break;
-			if (p[i-2] != '\\') break;
-			i-=2;
-			p+=i;
-			n-=i;
-			}
-		if (!chopup_args(&arg,buf,&argc,&argv)) break;
 
-		ret=do_cmd(prog,argc,argv);
+    for (;;) {
-		if (ret < 0)
+        ret = 0;
-			{
+        p = buf;
-			ret=0;
+        n = sizeof buf;
-			goto end;
+        i = 0;
-			}
+        for (;;) {
-		if (ret != 0)
+            p[0] = '\0';
-			BIO_printf(bio_err,"error in %s\n",argv[0]);
+            if (i++)
-		(void)BIO_flush(bio_err);
+                prompt = ">";
-		}
+            else
-	BIO_printf(bio_err,"bad exit\n");
+                prompt = "OpenSSL> ";
-	ret=1;
+            fputs(prompt, stdout);
-end:
+            fflush(stdout);
-	if (to_free)
+            if (!fgets(p, n, stdin))
-		OPENSSL_free(to_free);
+                goto end;
-	if (config != NULL)
+            if (p[0] == '\0')
-		{
+                goto end;
-		NCONF_free(config);
+            i = strlen(p);
-		config=NULL;
+            if (i <= 1)
-		}
+                break;
-	if (prog != NULL) lh_free(prog);
+            if (p[i - 2] != '\\')
-	if (arg.data != NULL) OPENSSL_free(arg.data);
+                break;
+            i -= 2;
+            p += i;
+            n -= i;
+        }
+        if (!chopup_args(&arg, buf, &argc, &argv))
+            break;
 
-	apps_shutdown();
+        ret = do_cmd(prog, argc, argv);
+        if (ret < 0) {
+            ret = 0;
+            goto end;
+        }
+        if (ret != 0)
+            BIO_printf(bio_err, "error in %s\n", argv[0]);
+        (void)BIO_flush(bio_err);
+    }
+    BIO_printf(bio_err, "bad exit\n");
+    ret = 1;
+ end:
+    if (to_free)
+        OPENSSL_free(to_free);
+    if (config != NULL) {
+        NCONF_free(config);
+        config = NULL;
+    }
+    if (prog != NULL)
+        lh_free(prog);
+    if (arg.data != NULL)
+        OPENSSL_free(arg.data);
 
-	CRYPTO_mem_leaks(bio_err);
+    apps_shutdown();
-	if (bio_err != NULL)
+
-		{
+    CRYPTO_mem_leaks(bio_err);
-		BIO_free(bio_err);
+    if (bio_err != NULL) {
-		bio_err=NULL;
+        BIO_free(bio_err);
-		}
+        bio_err = NULL;
-	OPENSSL_EXIT(ret);
+    }
-	}
+    OPENSSL_EXIT(ret);
+}
 
 #define LIST_STANDARD_COMMANDS "list-standard-commands"
 #define LIST_MESSAGE_DIGEST_COMMANDS "list-message-digest-commands"
 #define LIST_CIPHER_COMMANDS "list-cipher-commands"
 
 static int do_cmd(LHASH *prog, int argc, char *argv[])
-	{
+{
-	FUNCTION f,*fp;
+    FUNCTION f, *fp;
-	int i,ret=1,tp,nl;
+    int i, ret = 1, tp, nl;
 
-	if ((argc <= 0) || (argv[0] == NULL))
+    if ((argc <= 0) || (argv[0] == NULL)) {
-		{ ret=0; goto end; }
+        ret = 0;
-	f.name=argv[0];
+        goto end;
-	fp=(FUNCTION *)lh_retrieve(prog,&f);
-	if (fp != NULL)
-		{
-		ret=fp->func(argc,argv);
-		}
-	else if ((strncmp(argv[0],"no-",3)) == 0)
-		{
-		BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-		{
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		bio_stdout = BIO_push(tmpbio, bio_stdout);
-		}
-#endif
-		f.name=argv[0]+3;
-		ret = (lh_retrieve(prog,&f) != NULL);
-		if (!ret)
-			BIO_printf(bio_stdout, "%s\n", argv[0]);
-		else
-			BIO_printf(bio_stdout, "%s\n", argv[0]+3);
-		BIO_free_all(bio_stdout);
-		goto end;
-		}
-	else if ((strcmp(argv[0],"quit") == 0) ||
-		(strcmp(argv[0],"q") == 0) ||
-		(strcmp(argv[0],"exit") == 0) ||
-		(strcmp(argv[0],"bye") == 0))
-		{
-		ret= -1;
-		goto end;
-		}
-	else if ((strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0) ||
-		(strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
-		(strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0))
-		{
-		int list_type;
-		BIO *bio_stdout;
-
-		if (strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0)
-			list_type = FUNC_TYPE_GENERAL;
-		else if (strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0)
-			list_type = FUNC_TYPE_MD;
-		else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
-			list_type = FUNC_TYPE_CIPHER;
-		bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-		{
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		bio_stdout = BIO_push(tmpbio, bio_stdout);
-		}
-#endif
-		
-		for (fp=functions; fp->name != NULL; fp++)
-			if (fp->type == list_type)
-				BIO_printf(bio_stdout, "%s\n", fp->name);
-		BIO_free_all(bio_stdout);
-		ret=0;
-		goto end;
-		}
-	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++)
-			{
-			nl=0;
-			if (((i++) % 5) == 0)
-				{
-				BIO_printf(bio_err,"\n");
-				nl=1;
-				}
-			if (fp->type != tp)
-				{
-				tp=fp->type;
-				if (!nl) 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)
-					{
-					i=1;
-					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
-					}
-				}
-			BIO_printf(bio_err,"%-15s",fp->name);
-			}
-		BIO_printf(bio_err,"\n\n");
-		ret=0;
-		}
-end:
-	return(ret);
-	}
-
-static int SortFnByName(const void *_f1,const void *_f2)
-    {
-    const FUNCTION *f1=_f1;
-    const FUNCTION *f2=_f2;
-
-    if(f1->type != f2->type)
-	return f1->type-f2->type;
-    return strcmp(f1->name,f2->name);
     }
+    f.name = argv[0];
+    fp = (FUNCTION *) lh_retrieve(prog, &f);
+    if (fp != NULL) {
+        ret = fp->func(argc, argv);
+    } else if ((strncmp(argv[0], "no-", 3)) == 0) {
+        BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            bio_stdout = BIO_push(tmpbio, bio_stdout);
+        }
+#endif
+        f.name = argv[0] + 3;
+        ret = (lh_retrieve(prog, &f) != NULL);
+        if (!ret)
+            BIO_printf(bio_stdout, "%s\n", argv[0]);
+        else
+            BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
+        BIO_free_all(bio_stdout);
+        goto end;
+    } else if ((strcmp(argv[0], "quit") == 0) ||
+               (strcmp(argv[0], "q") == 0) ||
+               (strcmp(argv[0], "exit") == 0) ||
+               (strcmp(argv[0], "bye") == 0)) {
+        ret = -1;
+        goto end;
+    } else if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
+               (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
+               (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0)) {
+        int list_type;
+        BIO *bio_stdout;
+
+        if (strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0)
+            list_type = FUNC_TYPE_GENERAL;
+        else if (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0)
+            list_type = FUNC_TYPE_MD;
+        else                    /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
+            list_type = FUNC_TYPE_CIPHER;
+        bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            bio_stdout = BIO_push(tmpbio, bio_stdout);
+        }
+#endif
+
+        for (fp = functions; fp->name != NULL; fp++)
+            if (fp->type == list_type)
+                BIO_printf(bio_stdout, "%s\n", fp->name);
+        BIO_free_all(bio_stdout);
+        ret = 0;
+        goto end;
+    } 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++) {
+            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) {
+                tp = fp->type;
+                if (!nl)
+                    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) {
+                    i = 1;
+                    BIO_printf(bio_err,
+                               "\nCipher commands (see the `enc' command for more details)\n");
+                }
+            }
+#ifdef OPENSSL_NO_CAMELLIA
+            BIO_printf(bio_err, "%-15s", fp->name);
+#else
+            BIO_printf(bio_err, "%-18s", fp->name);
+#endif
+        }
+        BIO_printf(bio_err, "\n\n");
+        ret = 0;
+    }
+ end:
+    return (ret);
+}
+
+static int SortFnByName(const void *_f1, const void *_f2)
+{
+    const FUNCTION *f1 = _f1;
+    const FUNCTION *f2 = _f2;
+
+    if (f1->type != f2->type)
+        return f1->type - f2->type;
+    return strcmp(f1->name, f2->name);
+}
 
 static LHASH *prog_init(void)
-	{
+{
-	LHASH *ret;
+    LHASH *ret;
-	FUNCTION *f;
+    FUNCTION *f;
-	size_t i;
+    size_t i;
 
-	/* Purely so it looks nice when the user hits ? */
+    /* Purely so it looks nice when the user hits ? */
-	for(i=0,f=functions ; f->name != NULL ; ++f,++i)
+    for (i = 0, f = functions; f->name != NULL; ++f, ++i) ;
-	    ;
+    qsort(functions, i, sizeof *functions, SortFnByName);
-	qsort(functions,i,sizeof *functions,SortFnByName);
 
-	if ((ret=lh_new(hash, cmp)) == NULL)
+    if ((ret = lh_new(hash, cmp)) == NULL)
-		return(NULL);
+        return (NULL);
 
-	for (f=functions; f->name != NULL; f++)
+    for (f = functions; f->name != NULL; f++)
-		lh_insert(ret,f);
+        lh_insert(ret, f);
-	return(ret);
+    return (ret);
-	}
+}
 
 /* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
 static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
-	{
+{
-	return(strncmp(((const FUNCTION *)a_void)->name,
+    return (strncmp(((const FUNCTION *)a_void)->name,
-			((const FUNCTION *)b_void)->name,8));
+                    ((const FUNCTION *)b_void)->name, 8));
-	}
+}
 
 /* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
 static unsigned long MS_CALLBACK hash(const void *a_void)
-	{
+{
-	return(lh_strhash(((const FUNCTION *)a_void)->name));
+    return (lh_strhash(((const FUNCTION *)a_void)->name));
-	}
+}

apps/openssl.cnf

@@ -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

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

apps/pkcs7.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -69,250 +69,235 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	pkcs7_main
+#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
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
  * -print_certs
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
+    PKCS7 *p7 = NULL;
+    int i, badops = 0;
+    BIO *in = NULL, *out = NULL;
+    int informat, outformat;
+    char *infile, *outfile, *prog;
+    int print_certs = 0, text = 0, noout = 0;
+    int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
+    char *engine = NULL;
-#endif
-	PKCS7 *p7=NULL;
-	int i,badops=0;
-	BIO *in=NULL,*out=NULL;
-	int informat,outformat;
-	char *infile,*outfile,*prog;
-	int print_certs=0,text=0,noout=0;
-	int ret=1;
-#ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-noout") == 0)
-			{
+            noout = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-text") == 0)
-			outfile= *(++argv);
+            text = 1;
-			}
+        else if (strcmp(*argv, "-print_certs") == 0)
-		else if (strcmp(*argv,"-noout") == 0)
+            print_certs = 1;
-			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);
+            engine = *(++argv);
-			}
+        }
 #endif
-		else
+        else {
-			{
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
+            badops = 1;
-			badops=1;
+            break;
-			break;
+        }
-			}
+        argc--;
-		argc--;
+        argv++;
-		argv++;
+    }
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -inform arg   input format - DER or PEM\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," -outform arg  output format - DER or PEM\n");
+        BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -in arg       input file\n");
+        BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -out arg      output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\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,
-		BIO_printf(bio_err," -noout        don't output encoded data\n");
+                   " -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;
+        ret = 1;
-		goto end;
+        goto end;
-		}
+    }
 
-	ERR_load_crypto_strings();
+    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());
+    in = BIO_new(BIO_s_file());
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
+        ERR_print_errors(bio_err);
-		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)
+            if (in == NULL) {
+                perror(infile);
                 goto end;
-                }
+            }
+    }
 
-	if (infile == NULL)
+    if (informat == FORMAT_ASN1)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        p7 = d2i_PKCS7_bio(in, NULL);
-	else
+    else if (informat == FORMAT_PEM)
-		{
+        p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
-		if (BIO_read_filename(in,infile) <= 0)
+    else {
-		if (in == NULL)
+        BIO_printf(bio_err, "bad input format specified for pkcs7 object\n");
-			{
+        goto end;
-			perror(infile);
+    }
-			goto end;
+    if (p7 == NULL) {
-			}
+        BIO_printf(bio_err, "unable to load PKCS7 object\n");
-		}
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if	(informat == FORMAT_ASN1)
+    if (outfile == NULL) {
-		p7=d2i_PKCS7_bio(in,NULL);
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-	else if (informat == FORMAT_PEM)
-		p7=PEM_read_bio_PKCS7(in,NULL,NULL,NULL);
-	else
-		{
-		BIO_printf(bio_err,"bad input format specified for pkcs7 object\n");
-		goto end;
-		}
-	if (p7 == NULL)
-		{
-		BIO_printf(bio_err,"unable to load PKCS7 object\n");
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-
-	if (outfile == NULL)
-		{
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
+            perror(outfile);
-		if (BIO_write_filename(out,outfile) <= 0)
+            goto end;
-			{
+        }
-			perror(outfile);
+    }
-			goto end;
-			}
-		}
 
-	if (print_certs)
+    if (print_certs) {
-		{
+        STACK_OF(X509) *certs = NULL;
-		STACK_OF(X509) *certs=NULL;
+        STACK_OF(X509_CRL) *crls = NULL;
-		STACK_OF(X509_CRL) *crls=NULL;
 
-		i=OBJ_obj2nid(p7->type);
+        i = OBJ_obj2nid(p7->type);
-		switch (i)
+        switch (i) {
-			{
+        case NID_pkcs7_signed:
-		case NID_pkcs7_signed:
+            certs = p7->d.sign->cert;
-			certs=p7->d.sign->cert;
+            crls = p7->d.sign->crl;
-			crls=p7->d.sign->crl;
+            break;
-			break;
+        case NID_pkcs7_signedAndEnveloped:
-		case NID_pkcs7_signedAndEnveloped:
+            certs = p7->d.signed_and_enveloped->cert;
-			certs=p7->d.signed_and_enveloped->cert;
+            crls = p7->d.signed_and_enveloped->crl;
-			crls=p7->d.signed_and_enveloped->crl;
+            break;
-			break;
+        default:
-		default:
+            break;
-			break;
+        }
-			}
 
-		if (certs != NULL)
+        if (certs != NULL) {
-			{
+            X509 *x;
-			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);
-				x=sk_X509_value(certs,i);
+                if (text)
-				if(text) X509_print(out, x);
+                    X509_print(out, x);
-				else dump_cert_text(out, x);
+                else
+                    dump_cert_text(out, x);
 
-				if(!noout) PEM_write_bio_X509(out,x);
+                if (!noout)
-				BIO_puts(out,"\n");
+                    PEM_write_bio_X509(out, x);
-				}
+                BIO_puts(out, "\n");
-			}
+            }
-		if (crls != NULL)
+        }
-			{
+        if (crls != NULL) {
-			X509_CRL *crl;
+            X509_CRL *crl;
 
-			for (i=0; i<sk_X509_CRL_num(crls); i++)
+            for (i = 0; i < sk_X509_CRL_num(crls); i++) {
-				{
+                crl = sk_X509_CRL_value(crls, i);
-				crl=sk_X509_CRL_value(crls,i);
 
-				X509_CRL_print(out, crl);
+                X509_CRL_print(out, crl);
 
-				if(!noout)PEM_write_bio_X509_CRL(out,crl);
+                if (!noout)
-				BIO_puts(out,"\n");
+                    PEM_write_bio_X509_CRL(out, crl);
-				}
+                BIO_puts(out, "\n");
-			}
+            }
+        }
 
-		ret=0;
+        ret = 0;
-		goto end;
+        goto end;
-		}
+    }
 
-	if(!noout) {
+    if (!noout) {
-		if 	(outformat == FORMAT_ASN1)
+        if (outformat == FORMAT_ASN1)
-			i=i2d_PKCS7_bio(out,p7);
+            i = i2d_PKCS7_bio(out, p7);
-		else if (outformat == FORMAT_PEM)
+        else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_PKCS7(out,p7);
+            i = PEM_write_bio_PKCS7(out, p7);
-		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;
+            goto end;
-			}
+        }
 
-		if (!i)
+        if (!i) {
-			{
+            BIO_printf(bio_err, "unable to write pkcs7 object\n");
-			BIO_printf(bio_err,"unable to write pkcs7 object\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
+    }
-	}
+    ret = 0;
-	ret=0;
+ end:
-end:
+    if (p7 != NULL)
-	if (p7 != NULL) PKCS7_free(p7);
+        PKCS7_free(p7);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	apps_shutdown();
+    if (out != NULL)
-	OPENSSL_EXIT(ret);
+        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.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -68,393 +69,343 @@
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	char **args, *infile = NULL, *outfile = NULL;
+    char **args, *infile = NULL, *outfile = NULL;
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int topk8 = 0;
+    int topk8 = 0;
-	int pbe_nid = -1;
+    int pbe_nid = -1;
-	const EVP_CIPHER *cipher = NULL;
+    const EVP_CIPHER *cipher = NULL;
-	int iter = PKCS12_DEFAULT_ITER;
+    int iter = PKCS12_DEFAULT_ITER;
-	int informat, outformat;
+    int informat, outformat;
-	int p8_broken = PKCS8_OK;
+    int p8_broken = PKCS8_OK;
-	int nocrypt = 0;
+    int nocrypt = 0;
-	X509_SIG *p8;
+    X509_SIG *p8;
-	PKCS8_PRIV_KEY_INFO *p8inf;
+    PKCS8_PRIV_KEY_INFO *p8inf;
-	EVP_PKEY *pkey=NULL;
+    EVP_PKEY *pkey = NULL;
-	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
+    char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
-	int badarg = 0;
+    int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    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))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	args = argv + 1;
+    args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-v2")) {
-		if (!strcmp(*args,"-v2"))
+            if (args[1]) {
-			{
+                args++;
-			if (args[1])
+                cipher = EVP_get_cipherbyname(*args);
-				{
+                if (!cipher) {
-				args++;
+                    BIO_printf(bio_err, "Unknown cipher %s\n", *args);
-				cipher=EVP_get_cipherbyname(*args);
+                    badarg = 1;
-				if (!cipher)
+                }
-					{
+            } else
-					BIO_printf(bio_err,
+                badarg = 1;
-						 "Unknown cipher %s\n", *args);
+        } else if (!strcmp(*args, "-v1")) {
-					badarg = 1;
+            if (args[1]) {
-					}
+                args++;
-				}
+                pbe_nid = OBJ_txt2nid(*args);
-			else
+                if (pbe_nid == NID_undef) {
-				badarg = 1;
+                    BIO_printf(bio_err, "Unknown PBE algorithm %s\n", *args);
-			}
+                    badarg = 1;
-		else if (!strcmp(*args,"-v1"))
+                }
-			{
+            } else
-			if (args[1])
+                badarg = 1;
-				{
+        } else if (!strcmp(*args, "-inform")) {
-				args++;
+            if (args[1]) {
-				pbe_nid=OBJ_txt2nid(*args);
+                args++;
-				if (pbe_nid == NID_undef)
+                informat = str2fmt(*args);
-					{
+            } else
-					BIO_printf(bio_err,
+                badarg = 1;
-						 "Unknown PBE algorithm %s\n", *args);
+        } else if (!strcmp(*args, "-outform")) {
-					badarg = 1;
+            if (args[1]) {
-					}
+                args++;
-				}
+                outformat = str2fmt(*args);
-			else
+            } else
-				badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-topk8"))
-		else if (!strcmp(*args,"-inform"))
+            topk8 = 1;
-			{
+        else if (!strcmp(*args, "-noiter"))
-			if (args[1])
+            iter = 1;
-				{
+        else if (!strcmp(*args, "-nocrypt"))
-				args++;
+            nocrypt = 1;
-				informat=str2fmt(*args);
+        else if (!strcmp(*args, "-nooct"))
-				}
+            p8_broken = PKCS8_NO_OCTET;
-			else badarg = 1;
+        else if (!strcmp(*args, "-nsdb"))
-			}
+            p8_broken = PKCS8_NS_DB;
-		else if (!strcmp(*args,"-outform"))
+        else if (!strcmp(*args, "-embed"))
-			{
+            p8_broken = PKCS8_EMBEDDED_PARAM;
-			if (args[1])
+        else if (!strcmp(*args, "-passin")) {
-				{
+            if (!args[1])
-				args++;
+                goto bad;
-				outformat=str2fmt(*args);
+            passargin = *(++args);
-				}
+        } else if (!strcmp(*args, "-passout")) {
-			else badarg = 1;
+            if (!args[1])
-			}
+                goto bad;
-		else if (!strcmp (*args, "-topk8"))
+            passargout = *(++args);
-			topk8 = 1;
+        }
-		else if (!strcmp (*args, "-noiter"))
-			iter = 1;
-		else if (!strcmp (*args, "-nocrypt"))
-			nocrypt = 1;
-		else if (!strcmp (*args, "-nooct"))
-			p8_broken = PKCS8_NO_OCTET;
-		else if (!strcmp (*args, "-nsdb"))
-			p8_broken = PKCS8_NS_DB;
-		else if (!strcmp (*args, "-embed"))
-			p8_broken = PKCS8_EMBEDDED_PARAM;
-		else if (!strcmp(*args,"-passin"))
-			{
-			if (!args[1]) goto bad;
-			passargin= *(++args);
-			}
-		else if (!strcmp(*args,"-passout"))
-			{
-			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);
+            engine = *(++args);
-			}
+        }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			if (args[1])
+                args++;
-				{
+                infile = *args;
-				args++;
+            } else
-				infile = *args;
+                badarg = 1;
-				}
+        } else if (!strcmp(*args, "-out")) {
-			else badarg = 1;
+            if (args[1]) {
-			}
+                args++;
-		else if (!strcmp (*args, "-out"))
+                outfile = *args;
-			{
+            } else
-			if (args[1])
+                badarg = 1;
-				{
+        } else
-				args++;
+            badarg = 1;
-				outfile = *args;
+        args++;
-				}
+    }
-			else badarg = 1;
-			}
-		else badarg = 1;
-		args++;
-		}
 
-	if (badarg)
+    if (badarg) {
-		{
+ bad:
-		bad:
+        BIO_printf(bio_err, "Usage pkcs8 [options]\n");
-		BIO_printf(bio_err, "Usage pkcs8 [options]\n");
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err, "where options are\n");
+        BIO_printf(bio_err, "-in file        input file\n");
-		BIO_printf(bio_err, "-in file        input file\n");
+        BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-		BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+                   "-passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
+        BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
-		BIO_printf(bio_err, "-out file       output file\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,
-		BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
+                   "-passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
+        BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+                   "-nooct          use (nonstandard) no octet format\n");
-		BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
+                   "-embed          use (nonstandard) embedded DSA parameters format\n");
-		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
+                   "-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,
+                   "-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;
+        return 1;
-		}
+    }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    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");
-		BIO_printf(bio_err, "Error getting passwords\n");
+        return 1;
-		return 1;
+    }
-		}
 
-	if ((pbe_nid == -1) && !cipher)
+    if ((pbe_nid == -1) && !cipher)
-		pbe_nid = NID_pbeWithMD5AndDES_CBC;
+        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);
-			{
+            return (1);
-			BIO_printf(bio_err,
+        }
-				 "Can't open input file %s\n", infile);
+    } else
-			return (1);
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
-			}
-		}
-	else
-		in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
+            return (1);
-			BIO_printf(bio_err,
+        }
-				 "Can't open output file %s\n", outfile);
+    } else {
-			return (1);
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-			}
-		}
-	else
-		{
-		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+        {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-			}
+        }
 #endif
-		}
+    }
-	if (topk8)
+    if (topk8) {
-		{
+        BIO_free(in);           /* Not needed in this section */
-		BIO_free(in); /* Not needed in this section */
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-		pkey = load_key(bio_err, infile, informat, 1,
+        if (!pkey) {
-			passin, e, "key");
+            BIO_free_all(out);
-		if (!pkey)
+            return 1;
-			{
+        }
-			BIO_free_all(out);
+        if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-			return 1;
+            BIO_printf(bio_err, "Error converting key\n");
-			}
+            ERR_print_errors(bio_err);
-		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
+            EVP_PKEY_free(pkey);
-			{
+            BIO_free_all(out);
-			BIO_printf(bio_err, "Error converting key\n");
+            return 1;
-			ERR_print_errors(bio_err);
+        }
-			EVP_PKEY_free(pkey);
+        if (nocrypt) {
-			BIO_free_all(out);
+            if (outformat == FORMAT_PEM)
-			return 1;
+                PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
-			}
+            else if (outformat == FORMAT_ASN1)
-		if (nocrypt)
+                i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
-			{
+            else {
-			if (outformat == FORMAT_PEM) 
+                BIO_printf(bio_err, "Bad format specified for key\n");
-				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
+                PKCS8_PRIV_KEY_INFO_free(p8inf);
-			else if (outformat == FORMAT_ASN1)
+                EVP_PKEY_free(pkey);
-				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
+                BIO_free_all(out);
-			else
+                return (1);
-				{
+            }
-				BIO_printf(bio_err, "Bad format specified for key\n");
+        } else {
-				PKCS8_PRIV_KEY_INFO_free(p8inf);
+            if (passout)
-				EVP_PKEY_free(pkey);
+                p8pass = passout;
-				BIO_free_all(out);
+            else {
-				return (1);
+                p8pass = pass;
-				}
+                if (EVP_read_pw_string
-			}
+                    (pass, sizeof pass, "Enter Encryption Password:", 1)) {
-		else
+                    PKCS8_PRIV_KEY_INFO_free(p8inf);
-			{
+                    EVP_PKEY_free(pkey);
-			if (passout)
+                    BIO_free_all(out);
-				p8pass = passout;
+                    return (1);
-			else
+                }
-				{
+            }
-				p8pass = pass;
+            app_RAND_load_file(NULL, bio_err, 0);
-				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
+            if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
-					{
+                                     p8pass, strlen(p8pass),
-					PKCS8_PRIV_KEY_INFO_free(p8inf);
+                                     NULL, 0, iter, p8inf))) {
-					EVP_PKEY_free(pkey);
+                BIO_printf(bio_err, "Error encrypting key\n");
-					BIO_free_all(out);
+                ERR_print_errors(bio_err);
-					return (1);
+                PKCS8_PRIV_KEY_INFO_free(p8inf);
-					}
+                EVP_PKEY_free(pkey);
-				}
+                BIO_free_all(out);
-			app_RAND_load_file(NULL, bio_err, 0);
+                return (1);
-			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
+            }
-					p8pass, strlen(p8pass),
+            app_RAND_write_file(NULL, bio_err);
-					NULL, 0, iter, p8inf)))
+            if (outformat == FORMAT_PEM)
-				{
+                PEM_write_bio_PKCS8(out, p8);
-				BIO_printf(bio_err, "Error encrypting key\n");
+            else if (outformat == FORMAT_ASN1)
-				ERR_print_errors(bio_err);
+                i2d_PKCS8_bio(out, p8);
-				PKCS8_PRIV_KEY_INFO_free(p8inf);
+            else {
-				EVP_PKEY_free(pkey);
+                BIO_printf(bio_err, "Bad format specified for key\n");
-				BIO_free_all(out);
+                PKCS8_PRIV_KEY_INFO_free(p8inf);
-				return (1);
+                EVP_PKEY_free(pkey);
-				}
+                BIO_free_all(out);
-			app_RAND_write_file(NULL, bio_err);
+                return (1);
-			if (outformat == FORMAT_PEM) 
+            }
-				PEM_write_bio_PKCS8(out, p8);
+            X509_SIG_free(p8);
-			else if (outformat == FORMAT_ASN1)
+        }
-				i2d_PKCS8_bio(out, p8);
-			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);
-				}
-			X509_SIG_free(p8);
-			}
 
-		PKCS8_PRIV_KEY_INFO_free (p8inf);
+        PKCS8_PRIV_KEY_INFO_free(p8inf);
-		EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
-		BIO_free_all(out);
+        BIO_free_all(out);
-		if (passin)
+        if (passin)
-			OPENSSL_free(passin);
+            OPENSSL_free(passin);
-		if (passout)
+        if (passout)
-			OPENSSL_free(passout);
+            OPENSSL_free(passout);
-		return (0);
+        return (0);
-		}
+    }
 
-	if (nocrypt)
+    if (nocrypt) {
-		{
+        if (informat == FORMAT_PEM)
-		if (informat == FORMAT_PEM) 
+            p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in, NULL, NULL, NULL);
-			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
+        else if (informat == FORMAT_ASN1)
-		else if (informat == FORMAT_ASN1)
+            p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
-			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
+        else {
-		else
+            BIO_printf(bio_err, "Bad format specified for key\n");
-			{
+            return (1);
-			BIO_printf(bio_err, "Bad format specified for key\n");
+        }
-			return (1);
+    } else {
-			}
+        if (informat == FORMAT_PEM)
-		}
+            p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
-	else
+        else if (informat == FORMAT_ASN1)
-		{
+            p8 = d2i_PKCS8_bio(in, NULL);
-		if (informat == FORMAT_PEM) 
+        else {
-			p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
+            BIO_printf(bio_err, "Bad format specified for key\n");
-		else if (informat == FORMAT_ASN1)
+            return (1);
-			p8 = d2i_PKCS8_bio(in, NULL);
+        }
-		else
-			{
-			BIO_printf(bio_err, "Bad format specified for key\n");
-			return (1);
-			}
 
-		if (!p8)
+        if (!p8) {
-			{
+            BIO_printf(bio_err, "Error reading key\n");
-			BIO_printf (bio_err, "Error reading key\n");
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            return (1);
-			return (1);
+        }
-			}
+        if (passin)
-		if (passin)
+            p8pass = passin;
-			p8pass = passin;
+        else {
-		else
+            p8pass = pass;
-			{
+            EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
-			p8pass = pass;
+        }
-			EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
+        p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
-			}
+        X509_SIG_free(p8);
-		p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
+    }
-		X509_SIG_free(p8);
-		}
 
-	if (!p8inf)
+    if (!p8inf) {
-		{
+        BIO_printf(bio_err, "Error decrypting key\n");
-		BIO_printf(bio_err, "Error decrypting key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        return (1);
-		return (1);
+    }
-		}
 
-	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
+    if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-		{
+        BIO_printf(bio_err, "Error converting key\n");
-		BIO_printf(bio_err, "Error converting key\n");
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        return (1);
-		return (1);
+    }
-		}
-	
-	if (p8inf->broken)
-		{
-		BIO_printf(bio_err, "Warning: broken key encoding: ");
-		switch (p8inf->broken)
-			{
-			case PKCS8_NO_OCTET:
-			BIO_printf(bio_err, "No Octet String in PrivateKey\n");
-			break;
 
-			case PKCS8_EMBEDDED_PARAM:
+    if (p8inf->broken) {
-			BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
+        BIO_printf(bio_err, "Warning: broken key encoding: ");
-			break;
+        switch (p8inf->broken) {
+        case PKCS8_NO_OCTET:
+            BIO_printf(bio_err, "No Octet String in PrivateKey\n");
+            break;
 
-			case PKCS8_NS_DB:
+        case PKCS8_EMBEDDED_PARAM:
-			BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
+            BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
-			break;
+            break;
 
-			default:
+        case PKCS8_NS_DB:
-			BIO_printf(bio_err, "Unknown broken type\n");
+            BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
-			break;
+            break;
-		}
-	}
-	
-	PKCS8_PRIV_KEY_INFO_free(p8inf);
-	if (outformat == FORMAT_PEM) 
-		PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
-	else if (outformat == FORMAT_ASN1)
-		i2d_PrivateKey_bio(out, pkey);
-	else
-		{
-		BIO_printf(bio_err, "Bad format specified for key\n");
-			return (1);
-		}
 
-	end:
+        default:
-	EVP_PKEY_free(pkey);
+            BIO_printf(bio_err, "Unknown broken type\n");
-	BIO_free_all(out);
+            break;
-	BIO_free(in);
+        }
-	if (passin)
+    }
-		OPENSSL_free(passin);
-	if (passout)
-		OPENSSL_free(passout);
 
-	return (0);
+    PKCS8_PRIV_KEY_INFO_free(p8inf);
-	}
+    if (outformat == FORMAT_PEM)
+        PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
+    else if (outformat == FORMAT_ASN1)
+        i2d_PrivateKey_bio(out, pkey);
+    else {
+        BIO_printf(bio_err, "Bad format specified for key\n");
+        return (1);
+    }
+
+ end:
+    EVP_PKEY_free(pkey);
+    BIO_free_all(out);
+    BIO_free(in);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
+
+    return (0);
+}

apps/prime.c

@@ -6,7 +6,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -52,79 +52,74 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
-
 #undef PROG
 #define PROG prime_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-    {
+{
-    int hex=0;
+    int hex = 0;
-    int checks=20;
+    int checks = 20;
-    BIGNUM *bn=NULL;
+    BIGNUM *bn = NULL;
     BIO *bio_out;
 
     apps_startup();
 
     if (bio_err == NULL)
-	if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-	    BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
     --argc;
     ++argv;
-    while (argc >= 1 && **argv == '-')
+    while (argc >= 1 && **argv == '-') {
-	{
+        if (!strcmp(*argv, "-hex"))
-	if(!strcmp(*argv,"-hex"))
+            hex = 1;
-	    hex=1;
+        else if (!strcmp(*argv, "-checks"))
-	else if(!strcmp(*argv,"-checks"))
+            if (--argc < 1)
-	    if(--argc < 1)
+                goto bad;
-		goto bad;
+            else
-	    else
+                checks = atoi(*++argv);
-		checks=atoi(*++argv);
+        else {
-	else
+            BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
-	    {
+            goto bad;
-	    BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
+        }
-	    goto bad;
+        --argc;
-	    }
+        ++argv;
-	--argc;
+    }
-	++argv;
-	}
 
-    if (argv[0] == NULL)
+    if (argv[0] == NULL) {
-	{
+        BIO_printf(bio_err, "No prime specified\n");
-	BIO_printf(bio_err,"No prime specified\n");
+        goto bad;
-	goto bad;
+    }
-	}
 
-   if ((bio_out=BIO_new(BIO_s_file())) != NULL)
+    if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
-	{
+        BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
-	BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-	    {
+        {
-	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	    bio_out = BIO_push(tmpbio, bio_out);
+            bio_out = BIO_push(tmpbio, bio_out);
-	    }
+        }
 #endif
-	}
+    }
 
-    if(hex)
+    if (hex)
-	BN_hex2bn(&bn,argv[0]);
+        BN_hex2bn(&bn, argv[0]);
     else
-	BN_dec2bn(&bn,argv[0]);
+        BN_dec2bn(&bn, argv[0]);
 
-    BN_print(bio_out,bn);
+    BN_print(bio_out, bn);
-    BIO_printf(bio_out," is %sprime\n",
+    BIO_printf(bio_out, " is %sprime\n",
-	       BN_is_prime(bn,checks,NULL,NULL,NULL) ? "" : "not ");
+               BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
 
     BN_free(bn);
     BIO_free_all(bio_out);
 
     return 0;
 
-    bad:
+ bad:
-    BIO_printf(bio_err,"options are\n");
+    BIO_printf(bio_err, "options are\n");
-    BIO_printf(bio_err,"%-14s hex\n","-hex");
+    BIO_printf(bio_err, "%-14s hex\n", "-hex");
-    BIO_printf(bio_err,"%-14s number of checks\n","-checks <n>");
+    BIO_printf(bio_err, "%-14s number of checks\n", "-checks <n>");
     return 1;
-    }
+}

apps/progs.h

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

apps/progs.pl

@@ -43,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",
+	"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

@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -66,162 +66,164 @@
 #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
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
+    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
-	ENGINE *e = NULL;
+    char *engine = NULL;
-#endif
-	int i, r, ret = 1;
-	int badopt;
-	char *outfile = NULL;
-	char *inrand = NULL;
-	int base64 = 0;
-	BIO *out = NULL;
-	int num = -1;
-#ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
 #endif
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto err;
+        goto err;
 
-	badopt = 0;
+    badopt = 0;
-	i = 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];
-			if ((argv[i+1] != NULL) && (outfile == NULL))
+            else
-				outfile = argv[++i];
+                badopt = 1;
-			else
+        }
-				badopt = 1;
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(argv[i], "-engine") == 0)
+        else if (strcmp(argv[i], "-engine") == 0) {
-			{
+            if ((argv[i + 1] != NULL) && (engine == NULL))
-			if ((argv[i+1] != NULL) && (engine == NULL))
+                engine = argv[++i];
-				engine = argv[++i];
+            else
-			else
+                badopt = 1;
-				badopt = 1;
+        }
-			}
 #endif
-		else if (strcmp(argv[i], "-rand") == 0)
+        else if (strcmp(argv[i], "-rand") == 0) {
-			{
+            if ((argv[i + 1] != NULL) && (inrand == NULL))
-			if ((argv[i+1] != NULL) && (inrand == NULL))
+                inrand = argv[++i];
-				inrand = argv[++i];
+            else
-			else
+                badopt = 1;
-				badopt = 1;
+        } else if (strcmp(argv[i], "-base64") == 0) {
-			}
+            if (!base64)
-		else if (strcmp(argv[i], "-base64") == 0)
+                base64 = 1;
-			{
+            else
-			if (!base64)
+                badopt = 1;
-				base64 = 1;
+        } else if (strcmp(argv[i], "-hex") == 0) {
-			else
+            if (!hex)
-				badopt = 1;
+                hex = 1;
-			}
+            else
-		else if (isdigit((unsigned char)argv[i][0]))
+                badopt = 1;
-			{
+        } else if (isdigit((unsigned char)argv[i][0])) {
-			if (num < 0)
+            if (num < 0) {
-				{
+                r = sscanf(argv[i], "%d", &num);
-				r = sscanf(argv[i], "%d", &num);
+                if (r == 0 || num < 0)
-				if (r == 0 || num < 0)
+                    badopt = 1;
-					badopt = 1;
+            } else
-				}
+                badopt = 1;
-			else
+        } else
-				badopt = 1;
+            badopt = 1;
-			}
+    }
-		else
-			badopt = 1;
-		}
 
-	if (num < 0)
+    if (hex && base64)
-		badopt = 1;
+        badopt = 1;
-	
+
-	if (badopt) 
+    if (num < 0)
-		{
+        badopt = 1;
-		BIO_printf(bio_err, "Usage: rand [options] num\n");
+
-		BIO_printf(bio_err, "where options are\n");
+    if (badopt) {
-		BIO_printf(bio_err, "-out file             - write to file\n");
+        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);
-		goto err;
+        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));
+    app_RAND_load_file(NULL, bio_err, (inrand != NULL));
-	if (inrand != NULL)
+    if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
-			app_RAND_load_files(inrand));
+                   app_RAND_load_files(inrand));
 
-	out = BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL)
-		goto err;
+        goto err;
-	if (outfile != NULL)
+    if (outfile != NULL)
-		r = BIO_write_filename(out, outfile);
+        r = BIO_write_filename(out, outfile);
-	else
+    else {
-		{
+        r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-		}
+    }
-	if (r <= 0)
+    if (r <= 0)
-		goto err;
+        goto err;
 
-	if (base64)
+    if (base64) {
-		{
+        BIO *b64 = BIO_new(BIO_f_base64());
-		BIO *b64 = BIO_new(BIO_f_base64());
+        if (b64 == NULL)
-		if (b64 == NULL)
+            goto err;
-			goto err;
+        out = BIO_push(b64, out);
-		out = BIO_push(b64, out);
+    }
-		}
-	
-	while (num > 0) 
-		{
-		unsigned char buf[4096];
-		int chunk;
 
-		chunk = num;
+    while (num > 0) {
-		if (chunk > (int)sizeof(buf))
+        unsigned char buf[4096];
-			chunk = sizeof buf;
+        int chunk;
-		r = RAND_bytes(buf, chunk);
-		if (r <= 0)
-			goto err;
-		BIO_write(out, buf, chunk);
-		num -= chunk;
-		}
-	BIO_flush(out);
 
-	app_RAND_write_file(NULL, bio_err);
+        chunk = num;
-	ret = 0;
+        if (chunk > (int)sizeof(buf))
-	
+            chunk = sizeof buf;
-err:
+        r = RAND_bytes(buf, chunk);
-	ERR_print_errors(bio_err);
+        if (r <= 0)
-	if (out)
+            goto err;
-		BIO_free_all(out);
+        if (!hex)
-	apps_shutdown();
+            BIO_write(out, buf, chunk);
-	OPENSSL_EXIT(ret);
+        else {
-	}
+            for (i = 0; i < chunk; i++)
+                BIO_printf(out, "%02x", buf[i]);
+        }
+        num -= chunk;
+    }
+    if (hex)
+        BIO_puts(out, "\n");
+    (void)BIO_flush(out);
+
+    app_RAND_write_file(NULL, bio_err);
+    ret = 0;
+
+ err:
+    ERR_print_errors(bio_err);
+    if (out)
+        BIO_free_all(out);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/rsa.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,341 +49,351 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
-#include <stdio.h>
+# include <stdio.h>
-#include <stdlib.h>
+# include <stdlib.h>
-#include <string.h>
+# include <string.h>
-#include <time.h>
+# include <time.h>
-#include "apps.h"
+# include "apps.h"
-#include <openssl/bio.h>
+# include <openssl/bio.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
-#include <openssl/evp.h>
+# include <openssl/evp.h>
-#include <openssl/x509.h>
+# include <openssl/x509.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/bn.h>
+# include <openssl/bn.h>
 
-#undef PROG
+# undef PROG
-#define PROG	rsa_main
+# define PROG    rsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
- * -in arg	- input file - default stdin
+ * -in arg      - input file - default stdin
- * -out arg	- output file - default stdout
+ * -out arg     - output file - default stdout
- * -des		- encrypt output if PEM format with DES in cbc mode
+ * -des         - encrypt output if PEM format with DES in cbc mode
- * -des3	- encrypt output if PEM format
+ * -des3        - encrypt output if PEM format
- * -idea	- encrypt output if PEM format
+ * -idea        - encrypt output if PEM format
- * -aes128	- encrypt output if PEM format
+ * -seed        - encrypt output if PEM format
- * -aes192	- encrypt output if PEM format
+ * -aes128      - encrypt output if PEM format
- * -aes256	- encrypt output if PEM format
+ * -aes192      - encrypt output if PEM format
- * -text	- print a text version
+ * -aes256      - encrypt output if PEM format
- * -modulus	- print the RSA key modulus
+ * -camellia128 - encrypt output if PEM format
- * -check	- verify key consistency
+ * -camellia192 - encrypt output if PEM format
- * -pubin	- Expect a public key in input file.
+ * -camellia256 - encrypt output if PEM format
- * -pubout	- Output a public key.
+ * -text        - print a text version
+ * -modulus     - print the RSA key modulus
+ * -check       - verify key consistency
+ * -pubin       - Expect a public key in input file.
+ * -pubout      - Output a public key.
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int ret=1;
+    int ret = 1;
-	RSA *rsa=NULL;
+    RSA *rsa = NULL;
-	int i,badops=0, sgckey=0;
+    int i, badops = 0, sgckey = 0;
-	const EVP_CIPHER *enc=NULL;
+    const EVP_CIPHER *enc = NULL;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat,text=0,check=0,noout=0;
+    int informat, outformat, text = 0, check = 0, noout = 0;
-	int pubin = 0, pubout = 0;
+    int pubin = 0, pubout = 0;
-	char *infile,*outfile,*prog;
+    char *infile, *outfile, *prog;
-	char *passargin = NULL, *passargout = NULL;
+    char *passargin = NULL, *passargout = NULL;
-	char *passin = NULL, *passout = NULL;
+    char *passin = NULL, *passout = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
-#endif
+# endif
-	int modulus=0;
+    int modulus = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	infile=NULL;
+    infile = NULL;
-	outfile=NULL;
+    outfile = NULL;
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-passin") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			outfile= *(++argv);
+            passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            passargout = *(++argv);
-			passargin= *(++argv);
+        }
-			}
+# ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-passout") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			passargout= *(++argv);
+            engine = *(++argv);
-			}
+        }
-#ifndef OPENSSL_NO_ENGINE
+# endif
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-sgckey") == 0)
-			{
+            sgckey = 1;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-pubin") == 0)
-			engine= *(++argv);
+            pubin = 1;
-			}
+        else if (strcmp(*argv, "-pubout") == 0)
-#endif
+            pubout = 1;
-		else if (strcmp(*argv,"-sgckey") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			sgckey=1;
+            noout = 1;
-		else if (strcmp(*argv,"-pubin") == 0)
+        else if (strcmp(*argv, "-text") == 0)
-			pubin=1;
+            text = 1;
-		else if (strcmp(*argv,"-pubout") == 0)
+        else if (strcmp(*argv, "-modulus") == 0)
-			pubout=1;
+            modulus = 1;
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-check") == 0)
-			noout=1;
+            check = 1;
-		else if (strcmp(*argv,"-text") == 0)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			text=1;
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		else if (strcmp(*argv,"-modulus") == 0)
+            badops = 1;
-			modulus=1;
+            break;
-		else if (strcmp(*argv,"-check") == 0)
+        }
-			check=1;
+        argc--;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -inform arg     input 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,
-		BIO_printf(bio_err," -in arg         input file\n");
+                   " -outform arg    output format - one of DER NET PEM\n");
-		BIO_printf(bio_err," -sgckey         Use IIS SGC key format\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, " -sgckey         Use IIS SGC key format\n");
-		BIO_printf(bio_err," -out arg        output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+                   " -passin arg     input file pass phrase source\n");
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+        BIO_printf(bio_err,
-#ifndef OPENSSL_NO_IDEA
+                   " -passout arg    output file pass phrase source\n");
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
-#endif
+                   " -des            encrypt PEM output with cbc des\n");
-#ifndef OPENSSL_NO_AES
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+# ifndef OPENSSL_NO_IDEA
-#endif
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -text           print the key in text\n");
+                   " -idea           encrypt PEM output with cbc idea\n");
-		BIO_printf(bio_err," -noout          don't print key out\n");
+# endif
-		BIO_printf(bio_err," -modulus        print the RSA key modulus\n");
+# ifndef OPENSSL_NO_SEED
-		BIO_printf(bio_err," -check          verify key consistency\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
+                   " -seed           encrypt PEM output with cbc seed\n");
-		BIO_printf(bio_err," -pubout         output a public key\n");
+# endif
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_AES
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-#endif
+        BIO_printf(bio_err,
-		goto end;
+                   "                 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, " -pubout         output a public key\n");
+# ifndef OPENSSL_NO_ENGINE
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
+# endif
+        goto end;
+    }
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
-#endif
+# endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		BIO_printf(bio_err, "Error getting passwords\n");
+        BIO_printf(bio_err, "Error getting passwords\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	if(check && pubin) {
+    if (check && pubin) {
-		BIO_printf(bio_err, "Only private keys can be checked\n");
+        BIO_printf(bio_err, "Only private keys can be checked\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	out=BIO_new(BIO_s_file());
+    out = BIO_new(BIO_s_file());
 
-	{
+    {
-		EVP_PKEY	*pkey;
+        EVP_PKEY *pkey;
 
-		if (pubin)
+        if (pubin)
-			pkey = load_pubkey(bio_err, infile,
+            pkey = load_pubkey(bio_err, infile,
-				(informat == FORMAT_NETSCAPE && sgckey ?
+                               (informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat), 1,
+                                FORMAT_IISSGC : informat), 1,
-				passin, e, "Public Key");
+                               passin, e, "Public Key");
-		else
+        else
-			pkey = load_key(bio_err, infile,
+            pkey = load_key(bio_err, infile,
-				(informat == FORMAT_NETSCAPE && sgckey ?
+                            (informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat), 1,
+                             FORMAT_IISSGC : informat), 1,
-				passin, e, "Private Key");
+                            passin, e, "Private Key");
 
-		if (pkey != NULL)
+        if (pkey != NULL)
-		rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
+            rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
-		EVP_PKEY_free(pkey);
+        EVP_PKEY_free(pkey);
-	}
+    }
 
-	if (rsa == NULL)
+    if (rsa == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
-		BIO_set_fp(out,stdout,BIO_NOCLOSE);
+# ifdef OPENSSL_SYS_VMS
-#ifdef OPENSSL_SYS_VMS
+        {
-		{
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
-		out = BIO_push(tmpbio, out);
+        }
-		}
+# endif
-#endif
+    } else {
-		}
+        if (BIO_write_filename(out, outfile) <= 0) {
-	else
+            perror(outfile);
-		{
+            goto end;
-		if (BIO_write_filename(out,outfile) <= 0)
+        }
-			{
+    }
-			perror(outfile);
-			goto end;
-			}
-		}
 
-	if (text) 
+    if (text)
-		if (!RSA_print(out,rsa,0))
+        if (!RSA_print(out, rsa, 0)) {
-			{
+            perror(outfile);
-			perror(outfile);
+            ERR_print_errors(bio_err);
-			ERR_print_errors(bio_err);
+            goto end;
-			goto end;
+        }
-			}
 
-	if (modulus)
+    if (modulus) {
-		{
+        BIO_printf(out, "Modulus=");
-		BIO_printf(out,"Modulus=");
+        BN_print(out, rsa->n);
-		BN_print(out,rsa->n);
+        BIO_printf(out, "\n");
-		BIO_printf(out,"\n");
+    }
-		}
 
-	if (check)
+    if (check) {
-		{
+        int r = RSA_check_key(rsa);
-		int r = RSA_check_key(rsa);
 
-		if (r == 1)
+        if (r == 1)
-			BIO_printf(out,"RSA key ok\n");
+            BIO_printf(out, "RSA key ok\n");
-		else if (r == 0)
+        else if (r == 0) {
-			{
+            unsigned long err;
-			unsigned long err;
 
-			while ((err = ERR_peek_error()) != 0 &&
+            while ((err = ERR_peek_error()) != 0 &&
-				ERR_GET_LIB(err) == ERR_LIB_RSA &&
+                   ERR_GET_LIB(err) == ERR_LIB_RSA &&
-				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
+                   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 */
+                ERR_get_error(); /* remove e from error stack */
-				}
+            }
-			}
+        }
-		
-		if (r == -1 || ERR_peek_error() != 0) /* should happen only if r == -1 */
-			{
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		}
-		
-	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);
-		else i=i2d_RSAPrivateKey_bio(out,rsa);
-	}
-#ifndef OPENSSL_NO_RC4
-	else if (outformat == FORMAT_NETSCAPE)
-		{
-		unsigned char *p,*pp;
-		int size;
 
-		i=1;
+        if (r == -1 || ERR_peek_error() != 0) { /* should happen only if r ==
-		size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
+                                                 * -1 */
-		if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			BIO_printf(bio_err,"Memory allocation failure\n");
+        }
-			goto end;
+    }
-			}
+
-		pp=p;
+    if (noout) {
-		i2d_RSA_NET(rsa,&p,NULL, sgckey);
+        ret = 0;
-		BIO_write(out,(char *)pp,size);
+        goto end;
-		OPENSSL_free(pp);
+    }
-		}
+    BIO_printf(bio_err, "writing RSA key\n");
-#endif
+    if (outformat == FORMAT_ASN1) {
-	else if (outformat == FORMAT_PEM) {
+        if (pubout || pubin)
-		if(pubout || pubin)
+            i = i2d_RSA_PUBKEY_bio(out, rsa);
-		    i=PEM_write_bio_RSA_PUBKEY(out,rsa);
+        else
-		else i=PEM_write_bio_RSAPrivateKey(out,rsa,
+            i = i2d_RSAPrivateKey_bio(out, rsa);
-						enc,NULL,0,NULL,passout);
+    }
-	} else	{
+# ifndef OPENSSL_NO_RC4
-		BIO_printf(bio_err,"bad output format specified for outfile\n");
+    else if (outformat == FORMAT_NETSCAPE) {
-		goto end;
+        unsigned char *p, *pp;
-		}
+        int size;
-	if (!i)
+
-		{
+        i = 1;
-		BIO_printf(bio_err,"unable to write key\n");
+        size = i2d_RSA_NET(rsa, NULL, NULL, sgckey);
-		ERR_print_errors(bio_err);
+        if ((p = (unsigned char *)OPENSSL_malloc(size)) == NULL) {
-		}
+            BIO_printf(bio_err, "Memory allocation failure\n");
-	else
+            goto end;
-		ret=0;
+        }
-end:
+        pp = p;
-	if(out != NULL) BIO_free_all(out);
+        i2d_RSA_NET(rsa, &p, NULL, sgckey);
-	if(rsa != NULL) RSA_free(rsa);
+        BIO_write(out, (char *)pp, size);
-	if(passin) OPENSSL_free(passin);
+        OPENSSL_free(pp);
-	if(passout) OPENSSL_free(passout);
+    }
-	apps_shutdown();
+# endif
-	OPENSSL_EXIT(ret);
+    else if (outformat == FORMAT_PEM) {
-	}
+        if (pubout || pubin)
-#else /* !OPENSSL_NO_RSA */
+            i = PEM_write_bio_RSA_PUBKEY(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) {
+        BIO_printf(bio_err, "unable to write key\n");
+        ERR_print_errors(bio_err);
+    } else
+        ret = 0;
+ end:
+    if (out != NULL)
+        BIO_free_all(out);
+    if (rsa != NULL)
+        RSA_free(rsa);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}
+#else                           /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif

apps/rsautl.c

@@ -1,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.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,276 +57,307 @@
  *
  */
 
+#include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 
-#include "apps.h"
+# include "apps.h"
-#include <string.h>
+# include <string.h>
-#include <openssl/err.h>
+# include <openssl/err.h>
-#include <openssl/pem.h>
+# include <openssl/pem.h>
-#include <openssl/rsa.h>
+# include <openssl/rsa.h>
 
-#define RSA_SIGN 	1
+# define RSA_SIGN        1
-#define RSA_VERIFY 	2
+# define RSA_VERIFY      2
-#define RSA_ENCRYPT 	3
+# define RSA_ENCRYPT     3
-#define RSA_DECRYPT 	4
+# define RSA_DECRYPT     4
 
-#define KEY_PRIVKEY	1
+# define KEY_PRIVKEY     1
-#define KEY_PUBKEY	2
+# define KEY_PUBKEY      2
-#define KEY_CERT	3
+# define KEY_CERT        3
 
 static void usage(void);
 
-#undef PROG
+# undef PROG
 
-#define PROG rsautl_main
+# define PROG rsautl_main
 
 int MAIN(int argc, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	BIO *in = NULL, *out = NULL;
+    BIO *in = NULL, *out = NULL;
-	char *infile = NULL, *outfile = NULL;
+    char *infile = NULL, *outfile = NULL;
-#ifndef OPENSSL_NO_ENGINE
+# ifndef OPENSSL_NO_ENGINE
-	char *engine = NULL;
+    char *engine = NULL;
-#endif
+# endif
-	char *keyfile = NULL;
+    char *keyfile = NULL;
-	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
+    char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
-	int keyform = FORMAT_PEM;
+    int keyform = FORMAT_PEM;
-	char need_priv = 0, badarg = 0, rev = 0;
+    char need_priv = 0, badarg = 0, rev = 0;
-	char hexdump = 0, asn1parse = 0;
+    char hexdump = 0, asn1parse = 0;
-	X509 *x;
+    X509 *x;
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
-	RSA *rsa = NULL;
+    RSA *rsa = NULL;
-	unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
+    unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
-	char *passargin = NULL, *passin = NULL;
+    char *passargin = NULL, *passin = NULL;
-	int rsa_inlen, rsa_outlen = 0;
+    int rsa_inlen, rsa_outlen = 0;
-	int keysize;
+    int keysize;
 
-	int ret = 1;
+    int ret = 1;
 
-	argc--;
+    argc--;
-	argv++;
+    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))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+    OpenSSL_add_all_algorithms();
-	pad = RSA_PKCS1_PADDING;
+    pad = RSA_PKCS1_PADDING;
-	
-	while(argc >= 1)
-	{
-		if (!strcmp(*argv,"-in")) {
-			if (--argc < 1) badarg = 1;
-                        infile= *(++argv);
-		} else if (!strcmp(*argv,"-out")) {
-			if (--argc < 1) badarg = 1;
-			outfile= *(++argv);
-		} else if(!strcmp(*argv, "-inkey")) {
-			if (--argc < 1) badarg = 1;
-			keyfile = *(++argv);
-		} else if (!strcmp(*argv,"-passin")) {
-			if (--argc < 1) badarg = 1;
-			passargin= *(++argv);
-		} else if (strcmp(*argv,"-keyform") == 0) {
-			if (--argc < 1) badarg = 1;
-			keyform=str2fmt(*(++argv));
-#ifndef OPENSSL_NO_ENGINE
-		} else if(!strcmp(*argv, "-engine")) {
-			if (--argc < 1) badarg = 1;
-			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")) asn1parse = 1;
-		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
-		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
-		else if(!strcmp(*argv, "-oaep")) 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, "-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;
-		if(badarg) {
-			usage();
-			goto end;
-		}
-		argc--;
-		argv++;
-	}
 
-	if(need_priv && (key_type != KEY_PRIVKEY)) {
+    while (argc >= 1) {
-		BIO_printf(bio_err, "A private key is needed for this operation\n");
+        if (!strcmp(*argv, "-in")) {
-		goto end;
+            if (--argc < 1)
-	}
+                badarg = 1;
+            else
+                infile = *(++argv);
+        } else if (!strcmp(*argv, "-out")) {
+            if (--argc < 1)
+                badarg = 1;
+            else
+                outfile = *(++argv);
+        } else if (!strcmp(*argv, "-inkey")) {
+            if (--argc < 1)
+                badarg = 1;
+            else
+                keyfile = *(++argv);
+        } else if (!strcmp(*argv, "-passin")) {
+            if (--argc < 1)
+                badarg = 1;
+            else
+                passargin = *(++argv);
+        } else if (strcmp(*argv, "-keyform") == 0) {
+            if (--argc < 1)
+                badarg = 1;
+            else
+                keyform = str2fmt(*(++argv));
+# ifndef OPENSSL_NO_ENGINE
+        } else if (!strcmp(*argv, "-engine")) {
+            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"))
+            asn1parse = 1;
+        else if (!strcmp(*argv, "-hexdump"))
+            hexdump = 1;
+        else if (!strcmp(*argv, "-raw"))
+            pad = RSA_NO_PADDING;
+        else if (!strcmp(*argv, "-oaep"))
+            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, "-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;
+        if (badarg) {
+            usage();
+            goto end;
+        }
+        argc--;
+        argv++;
+    }
 
-#ifndef OPENSSL_NO_ENGINE
+    if (need_priv && (key_type != KEY_PRIVKEY)) {
-        e = setup_engine(bio_err, engine, 0);
+        BIO_printf(bio_err, "A private key is needed for this operation\n");
-#endif
+        goto end;
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+    }
-		BIO_printf(bio_err, "Error getting password\n");
+# ifndef OPENSSL_NO_ENGINE
-		goto end;
+    e = setup_engine(bio_err, engine, 0);
-	}
+# endif
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+        BIO_printf(bio_err, "Error getting password\n");
+        goto end;
+    }
 
 /* FIXME: seed PRNG only if needed */
-	app_RAND_load_file(NULL, bio_err, 0);
+    app_RAND_load_file(NULL, bio_err, 0);
-	
-	switch(key_type) {
-		case KEY_PRIVKEY:
-		pkey = load_key(bio_err, keyfile, keyform, 0,
-			passin, e, "Private Key");
-		break;
 
-		case KEY_PUBKEY:
+    switch (key_type) {
-		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
+    case KEY_PRIVKEY:
-			NULL, e, "Public Key");
+        pkey = load_key(bio_err, keyfile, keyform, 0,
-		break;
+                        passin, e, "Private Key");
+        break;
 
-		case KEY_CERT:
+    case KEY_PUBKEY:
-		x = load_cert(bio_err, keyfile, keyform,
+        pkey = load_pubkey(bio_err, keyfile, keyform, 0,
-			NULL, e, "Certificate");
+                           NULL, e, "Public Key");
-		if(x) {
+        break;
-			pkey = X509_get_pubkey(x);
-			X509_free(x);
-		}
-		break;
-	}
 
-	if(!pkey) {
+    case KEY_CERT:
-		return 1;
+        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
-	}
+        if (x) {
+            pkey = X509_get_pubkey(x);
+            X509_free(x);
+        }
+        break;
+    }
 
-	rsa = EVP_PKEY_get1_RSA(pkey);
+    if (!pkey) {
-	EVP_PKEY_free(pkey);
+        return 1;
+    }
 
-	if(!rsa) {
+    rsa = EVP_PKEY_get1_RSA(pkey);
-		BIO_printf(bio_err, "Error getting RSA key\n");
+    EVP_PKEY_free(pkey);
-		ERR_print_errors(bio_err);
-		goto end;
-	}
 
+    if (!rsa) {
+        BIO_printf(bio_err, "Error getting RSA key\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if(infile) {
+    if (infile) {
-		if(!(in = BIO_new_file(infile, "rb"))) {
+        if (!(in = BIO_new_file(infile, "rb"))) {
-			BIO_printf(bio_err, "Error Reading Input File\n");
+            BIO_printf(bio_err, "Error Reading Input File\n");
-			ERR_print_errors(bio_err);	
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    } else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if(outfile) {
+    if (outfile) {
-		if(!(out = BIO_new_file(outfile, "wb"))) {
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-			BIO_printf(bio_err, "Error Reading Output File\n");
+            BIO_printf(bio_err, "Error Reading Output File\n");
-			ERR_print_errors(bio_err);	
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	} else {
+    } else {
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+# ifdef OPENSSL_SYS_VMS
-		{
+        {
-		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		    out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
-#endif
+# endif
-	}
+    }
 
-	keysize = RSA_size(rsa);
+    keysize = RSA_size(rsa);
 
-	rsa_in = OPENSSL_malloc(keysize * 2);
+    rsa_in = OPENSSL_malloc(keysize * 2);
-	rsa_out = OPENSSL_malloc(keysize);
+    rsa_out = OPENSSL_malloc(keysize);
 
-	/* Read the input data */
+    /* Read the input data */
-	rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
+    rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
-	if(rsa_inlen <= 0) {
+    if (rsa_inlen <= 0) {
-		BIO_printf(bio_err, "Error reading input Data\n");
+        BIO_printf(bio_err, "Error reading input Data\n");
-		exit(1);
+        exit(1);
-	}
+    }
-	if(rev) {
+    if (rev) {
-		int i;
+        int i;
-		unsigned char ctmp;
+        unsigned char ctmp;
-		for(i = 0; i < rsa_inlen/2; i++) {
+        for (i = 0; i < rsa_inlen / 2; i++) {
-			ctmp = rsa_in[i];
+            ctmp = rsa_in[i];
-			rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
+            rsa_in[i] = rsa_in[rsa_inlen - 1 - i];
-			rsa_in[rsa_inlen - 1 - i] = ctmp;
+            rsa_in[rsa_inlen - 1 - i] = ctmp;
-		}
+        }
-	}
+    }
-	switch(rsa_mode) {
+    switch (rsa_mode) {
 
-		case RSA_VERIFY:
+    case RSA_VERIFY:
-			rsa_outlen  = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen = RSA_public_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-		break;
+        break;
 
-		case RSA_SIGN:
+    case RSA_SIGN:
-			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
-		break;
+            RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        break;
 
-		case RSA_ENCRYPT:
+    case RSA_ENCRYPT:
-			rsa_outlen  = RSA_public_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen = RSA_public_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
-		break;
+        break;
 
-		case RSA_DECRYPT:
+    case RSA_DECRYPT:
-			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        rsa_outlen =
-		break;
+            RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
+        break;
 
-	}
+    }
 
-	if(rsa_outlen <= 0) {
+    if (rsa_outlen <= 0) {
-		BIO_printf(bio_err, "RSA operation error\n");
+        BIO_printf(bio_err, "RSA operation error\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
-	ret = 0;
+    ret = 0;
-	if(asn1parse) {
+    if (asn1parse) {
-		if(!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
+        if (!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
-			ERR_print_errors(bio_err);
+            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);
-	end:
+    else
-	RSA_free(rsa);
+        BIO_write(out, rsa_out, rsa_outlen);
-	BIO_free(in);
+ end:
-	BIO_free_all(out);
+    RSA_free(rsa);
-	if(rsa_in) OPENSSL_free(rsa_in);
+    BIO_free(in);
-	if(rsa_out) OPENSSL_free(rsa_out);
+    BIO_free_all(out);
-	if(passin) OPENSSL_free(passin);
+    if (rsa_in)
-	return ret;
+        OPENSSL_free(rsa_in);
+    if (rsa_out)
+        OPENSSL_free(rsa_out);
+    if (passin)
+        OPENSSL_free(passin);
+    return ret;
 }
 
 static void usage()
 {
-	BIO_printf(bio_err, "Usage: rsautl [options]\n");
+    BIO_printf(bio_err, "Usage: rsautl [options]\n");
-	BIO_printf(bio_err, "-in file        input file\n");
+    BIO_printf(bio_err, "-in file        input file\n");
-	BIO_printf(bio_err, "-out file       output file\n");
+    BIO_printf(bio_err, "-out file       output file\n");
-	BIO_printf(bio_err, "-inkey file     input key\n");
+    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, "-keyform arg    private key format - default PEM\n");
-	BIO_printf(bio_err, "-pubin          input is an RSA public\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,
-	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
+               "-certin         input is a certificate carrying an RSA public key\n");
-	BIO_printf(bio_err, "-raw            use no padding\n");
+    BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
-	BIO_printf(bio_err, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
+    BIO_printf(bio_err, "-raw            use no padding\n");
-	BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
+    BIO_printf(bio_err,
-	BIO_printf(bio_err, "-sign           sign with private key\n");
+               "-pkcs           use PKCS#1 v1.5 padding (default)\n");
-	BIO_printf(bio_err, "-verify         verify with public key\n");
+    BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
-	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
+    BIO_printf(bio_err, "-sign           sign with private key\n");
-	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
+    BIO_printf(bio_err, "-verify         verify with public key\n");
-	BIO_printf(bio_err, "-hexdump        hex dump output\n");
+    BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
-#ifndef OPENSSL_NO_ENGINE
+    BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err, "-hexdump        hex dump output\n");
-	BIO_printf (bio_err, "-passin arg    pass phrase source\n");
+# ifndef OPENSSL_NO_ENGINE
-#endif
+    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

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -108,47 +108,52 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */
+/* conflicts with winsock2 stuff on netware */
-#include <sys/types.h>
+#if !defined(OPENSSL_SYS_NETWARE)
+# include <sys/types.h>
 #endif
 #include <openssl/opensslconf.h>
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-#include <conio.h>
+# include <conio.h>
 #endif
 
 #ifdef OPENSSL_SYS_MSDOS
-#define _kbhit kbhit
+# define _kbhit kbhit
 #endif
 
 #if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
-/* VAX C does not defined fd_set and friends, but it's actually quite simple */
+/*
-/* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
+ * VAX C does not defined fd_set and friends, but it's actually quite simple
-#define MAX_NOFILE	32
+ */
-#define	NBBY		 8		/* number of bits in a byte	*/
+/* These definitions are borrowed from SOCKETSHR.       /Richard Levitte */
+# define MAX_NOFILE      32
+# define NBBY             8     /* number of bits in a byte */
 
-#ifndef	FD_SETSIZE
+# ifndef FD_SETSIZE
-#define	FD_SETSIZE	MAX_NOFILE
+#  define FD_SETSIZE      MAX_NOFILE
-#endif	/* FD_SETSIZE */
+# endif                         /* FD_SETSIZE */
 
 /* How many things we'll allow select to use. 0 if unlimited */
-#define MAXSELFD	MAX_NOFILE
+# define MAXSELFD        MAX_NOFILE
-typedef int	fd_mask;	/* int here! VMS prototypes int, not long */
+typedef int fd_mask;            /* int here! VMS prototypes int, not long */
-#define NFDBITS	(sizeof(fd_mask) * NBBY)	/* bits per mask (power of 2!)*/
+# define NFDBITS (sizeof(fd_mask) * NBBY)/* bits per mask (power of 2!) */
-#define NFDSHIFT 5				/* Shift based on above */
+# define NFDSHIFT 5             /* Shift based on above */
 
 typedef fd_mask fd_set;
-#define	FD_SET(n, p)	(*(p) |= (1 << ((n) % NFDBITS)))
+# define FD_SET(n, p)    (*(p) |= (1 << ((n) % NFDBITS)))
-#define	FD_CLR(n, p)	(*(p) &= ~(1 << ((n) % NFDBITS)))
+# define FD_CLR(n, p)    (*(p) &= ~(1 << ((n) % NFDBITS)))
-#define	FD_ISSET(n, p)	(*(p) & (1 << ((n) % NFDBITS)))
+# define FD_ISSET(n, p)  (*(p) & (1 << ((n) % NFDBITS)))
-#define FD_ZERO(p)	memset((char *)(p), 0, sizeof(*(p)))
+# define FD_ZERO(p)      memset((char *)(p), 0, sizeof(*(p)))
 #endif
 
 #define PORT            4433
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*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);
+                                   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/sess_id.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -67,20 +67,20 @@
 #include <openssl/ssl.h>
 
 #undef PROG
-#define PROG	sess_id_main
+#define PROG    sess_id_main
 
-static const char *sess_id_usage[]={
+static const char *sess_id_usage[] = {
-"usage: sess_id args\n",
+    "usage: sess_id args\n",
-"\n",
+    "\n",
-" -inform arg     - input format - default PEM (DER or PEM)\n",
+    " -inform arg     - input format - default PEM (DER or PEM)\n",
-" -outform arg    - output format - default PEM\n",
+    " -outform arg    - output format - default PEM\n",
-" -in arg         - input file - default stdin\n",
+    " -in arg         - input file - default stdin\n",
-" -out arg        - output file - default stdout\n",
+    " -out arg        - output file - default stdout\n",
-" -text           - print ssl session id details\n",
+    " -text           - print ssl session id details\n",
-" -cert           - output certificate \n",
+    " -cert           - output certificate \n",
-" -noout          - no CRL output\n",
+    " -noout          - no CRL output\n",
-" -context arg    - set the session ID context\n",
+    " -context arg    - set the session ID context\n",
-NULL
+    NULL
 };
 
 static SSL_SESSION *load_sess_id(char *file, int format);
@@ -88,233 +88,211 @@ static SSL_SESSION *load_sess_id(char *file, int format);
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	SSL_SESSION *x=NULL;
+    SSL_SESSION *x = NULL;
-	int ret=1,i,num,badops=0;
+    int ret = 1, i, num, badops = 0;
-	BIO *out=NULL;
+    BIO *out = NULL;
-	int informat,outformat;
+    int informat, outformat;
-	char *infile=NULL,*outfile=NULL,*context=NULL;
+    char *infile = NULL, *outfile = NULL, *context = NULL;
-	int cert=0,noout=0,text=0;
+    int cert = 0, noout = 0, text = 0;
-	const char **pp;
+    const char **pp;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	informat=FORMAT_PEM;
+    informat = FORMAT_PEM;
-	outformat=FORMAT_PEM;
+    outformat = FORMAT_PEM;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	num=0;
+    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));
-			informat=str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-outform") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-outform") == 0)
+                goto bad;
-			{
+            outformat = str2fmt(*(++argv));
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-in") == 0) {
-			outformat=str2fmt(*(++argv));
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-in") == 0)
+            infile = *(++argv);
-			{
+        } else if (strcmp(*argv, "-out") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			infile= *(++argv);
+                goto bad;
-			}
+            outfile = *(++argv);
-		else if (strcmp(*argv,"-out") == 0)
+        } else if (strcmp(*argv, "-text") == 0)
-			{
+            text = ++num;
-			if (--argc < 1) goto bad;
+        else if (strcmp(*argv, "-cert") == 0)
-			outfile= *(++argv);
+            cert = ++num;
-			}
+        else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-text") == 0)
+            noout = ++num;
-			text= ++num;
+        else if (strcmp(*argv, "-context") == 0) {
-		else if (strcmp(*argv,"-cert") == 0)
+            if (--argc < 1)
-			cert= ++num;
+                goto bad;
-		else if (strcmp(*argv,"-noout") == 0)
+            context = *++argv;
-			noout= ++num;
+        } else {
-		else if (strcmp(*argv,"-context") == 0)
+            BIO_printf(bio_err, "unknown option %s\n", *argv);
-		    {
+            badops = 1;
-		    if(--argc < 1) goto bad;
+            break;
-		    context=*++argv;
+        }
-		    }
+        argc--;
-		else
+        argv++;
-			{
+    }
-			BIO_printf(bio_err,"unknown option %s\n",*argv);
-			badops=1;
-			break;
-			}
-		argc--;
-		argv++;
-		}
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        for (pp = sess_id_usage; (*pp != NULL); pp++)
-		for (pp=sess_id_usage; (*pp != NULL); pp++)
+            BIO_printf(bio_err, "%s", *pp);
-			BIO_printf(bio_err,"%s",*pp);
+        goto end;
-		goto end;
+    }
-		}
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
-	x=load_sess_id(infile,informat);
+    x = load_sess_id(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
-
+        goto end;
-	if(context)
+    }
-	    {
-	    x->sid_ctx_length=strlen(context);
-	    if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
-		{
-		BIO_printf(bio_err,"Context too long\n");
-		goto end;
-		}
-	    memcpy(x->sid_ctx,context,x->sid_ctx_length);
-	    }
 
+    if (context) {
+        x->sid_ctx_length = strlen(context);
+        if (x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH) {
+            BIO_printf(bio_err, "Context too long\n");
+            goto end;
+        }
+        memcpy(x->sid_ctx, context, x->sid_ctx_length);
+    }
 #ifdef undef
-	/* just testing for memory leaks :-) */
+    /* just testing for memory leaks :-) */
-	{
+    {
-	SSL_SESSION *s;
+        SSL_SESSION *s;
-	char buf[1024*10],*p;
+        char buf[1024 * 10], *p;
-	int i;
+        int i;
 
-	s=SSL_SESSION_new();
+        s = SSL_SESSION_new();
 
-	p= &buf;
+        p = &buf;
-	i=i2d_SSL_SESSION(x,&p);
+        i = i2d_SSL_SESSION(x, &p);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	p= &buf;
+        p = &buf;
-	d2i_SSL_SESSION(&s,&p,(long)i);
+        d2i_SSL_SESSION(&s, &p, (long)i);
-	SSL_SESSION_free(s);
+        SSL_SESSION_free(s);
-	}
+    }
 #endif
 
-	if (!noout || text)
+    if (!noout || text) {
-		{
+        out = BIO_new(BIO_s_file());
-		out=BIO_new(BIO_s_file());
+        if (out == NULL) {
-		if (out == NULL)
+            ERR_print_errors(bio_err);
-			{
+            goto end;
-			ERR_print_errors(bio_err);
+        }
-			goto end;
-			}
 
-		if (outfile == NULL)
+        if (outfile == NULL) {
-			{
+            BIO_set_fp(out, stdout, BIO_NOCLOSE);
-			BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-			}
+        } else {
-		else
+            if (BIO_write_filename(out, outfile) <= 0) {
-			{
+                perror(outfile);
-			if (BIO_write_filename(out,outfile) <= 0)
+                goto end;
-				{
+            }
-				perror(outfile);
+        }
-				goto end;
+    }
-				}
-			}
-		}
 
-	if (text)
+    if (text) {
-		{
+        SSL_SESSION_print(out, x);
-		SSL_SESSION_print(out,x);
 
-		if (cert)
+        if (cert) {
-			{
+            if (x->peer == NULL)
-			if (x->peer == NULL)
+                BIO_puts(out, "No certificate present\n");
-				BIO_puts(out,"No certificate present\n");
+            else
-			else
+                X509_print(out, x->peer);
-				X509_print(out,x->peer);
+        }
-			}
+    }
-		}
 
-	if (!noout && !cert)
+    if (!noout && !cert) {
-		{
+        if (outformat == FORMAT_ASN1)
-		if 	(outformat == FORMAT_ASN1)
+            i = i2d_SSL_SESSION_bio(out, x);
-			i=i2d_SSL_SESSION_bio(out,x);
+        else if (outformat == FORMAT_PEM)
-		else if (outformat == FORMAT_PEM)
+            i = PEM_write_bio_SSL_SESSION(out, x);
-			i=PEM_write_bio_SSL_SESSION(out,x);
+        else {
-		else	{
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+            goto end;
-			goto end;
+        }
-			}
+        if (!i) {
-		if (!i) {
+            BIO_printf(bio_err, "unable to write SSL_SESSION\n");
-			BIO_printf(bio_err,"unable to write SSL_SESSION\n");
+            goto end;
-			goto end;
+        }
-			}
+    } else if (!noout && (x->peer != NULL)) { /* just print the certificate */
-		}
+        if (outformat == FORMAT_ASN1)
-	else if (!noout && (x->peer != NULL)) /* just print the certificate */
+            i = (int)i2d_X509_bio(out, x->peer);
-		{
+        else if (outformat == FORMAT_PEM)
-		if 	(outformat == FORMAT_ASN1)
+            i = PEM_write_bio_X509(out, x->peer);
-			i=(int)i2d_X509_bio(out,x->peer);
+        else {
-		else if (outformat == FORMAT_PEM)
+            BIO_printf(bio_err, "bad output format specified for outfile\n");
-			i=PEM_write_bio_X509(out,x->peer);
+            goto end;
-		else	{
+        }
-			BIO_printf(bio_err,"bad output format specified for outfile\n");
+        if (!i) {
-			goto end;
+            BIO_printf(bio_err, "unable to write X509\n");
-			}
+            goto end;
-		if (!i) {
+        }
-			BIO_printf(bio_err,"unable to write X509\n");
+    }
-			goto end;
+    ret = 0;
-			}
+ end:
-		}
+    if (out != NULL)
-	ret=0;
+        BIO_free_all(out);
-end:
+    if (x != NULL)
-	if (out != NULL) BIO_free_all(out);
+        SSL_SESSION_free(x);
-	if (x != NULL) SSL_SESSION_free(x);
+    apps_shutdown();
-	apps_shutdown();
+    OPENSSL_EXIT(ret);
-	OPENSSL_EXIT(ret);
+}
-	}
 
 static SSL_SESSION *load_sess_id(char *infile, int format)
-	{
+{
-	SSL_SESSION *x=NULL;
+    SSL_SESSION *x = NULL;
-	BIO *in=NULL;
+    BIO *in = NULL;
 
-	in=BIO_new(BIO_s_file());
+    in = BIO_new(BIO_s_file());
-	if (in == NULL)
+    if (in == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
 
-	if (infile == NULL)
+    if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
+            perror(infile);
-			{
+            goto end;
-			perror(infile);
+        }
-			goto end;
+    }
-			}
+    if (format == FORMAT_ASN1)
-		}
+        x = d2i_SSL_SESSION_bio(in, NULL);
-	if 	(format == FORMAT_ASN1)
+    else if (format == FORMAT_PEM)
-		x=d2i_SSL_SESSION_bio(in,NULL);
+        x = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
-	else if (format == FORMAT_PEM)
+    else {
-		x=PEM_read_bio_SSL_SESSION(in,NULL,NULL,NULL);
+        BIO_printf(bio_err, "bad input format specified for input crl\n");
-	else	{
+        goto end;
-		BIO_printf(bio_err,"bad input format specified for input crl\n");
+    }
-		goto end;
+    if (x == NULL) {
-		}
+        BIO_printf(bio_err, "unable to load SSL_SESSION\n");
-	if (x == NULL)
+        ERR_print_errors(bio_err);
-		{
+        goto end;
-		BIO_printf(bio_err,"unable to load SSL_SESSION\n");
+    }
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	
-end:
-	if (in != NULL) BIO_free(in);
-	return(x);
-	}
 
+ end:
+    if (in != NULL)
+        BIO_free(in);
+    return (x);
+}

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.
@@ -12,7 +12,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -71,238 +71,242 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	spkac_main
+#define PROG    spkac_main
 
-/* -in arg	- input file - default stdin
+/*-
- * -out arg	- output file - default stdout
+ * -in arg      - input file - default stdin
+ * -out arg     - output file - default stdout
  */
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int i,badops=0, ret = 1;
+    int i, badops = 0, ret = 1;
-	BIO *in = NULL,*out = NULL;
+    BIO *in = NULL, *out = NULL;
-	int verify=0,noout=0,pubkey=0;
+    int verify = 0, noout = 0, pubkey = 0;
-	char *infile = NULL,*outfile = NULL,*prog;
+    char *infile = NULL, *outfile = NULL, *prog;
-	char *passargin = NULL, *passin = NULL;
+    char *passargin = NULL, *passin = NULL;
-	const char *spkac = "SPKAC", *spksect = "default";
+    const char *spkac = "SPKAC", *spksect = "default";
-	char *spkstr = NULL;
+    char *spkstr = NULL;
-	char *challenge = NULL, *keyfile = NULL;
+    char *challenge = NULL, *keyfile = NULL;
-	CONF *conf = NULL;
+    CONF *conf = NULL;
-	NETSCAPE_SPKI *spki = NULL;
+    NETSCAPE_SPKI *spki = NULL;
-	EVP_PKEY *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	apps_startup();
+    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))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	prog=argv[0];
+    prog = argv[0];
-	argc--;
+    argc--;
-	argv++;
+    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);
-			infile= *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-out") == 0)
+                goto bad;
-			{
+            outfile = *(++argv);
-			if (--argc < 1) goto bad;
+        } else if (strcmp(*argv, "-passin") == 0) {
-			outfile= *(++argv);
+            if (--argc < 1)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-passin") == 0)
+            passargin = *(++argv);
-			{
+        } else if (strcmp(*argv, "-key") == 0) {
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
-			passargin= *(++argv);
+                goto bad;
-			}
+            keyfile = *(++argv);
-		else if (strcmp(*argv,"-key") == 0)
+        } else if (strcmp(*argv, "-challenge") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			keyfile= *(++argv);
+            challenge = *(++argv);
-			}
+        } else if (strcmp(*argv, "-spkac") == 0) {
-		else if (strcmp(*argv,"-challenge") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            spkac = *(++argv);
-			challenge= *(++argv);
+        } else if (strcmp(*argv, "-spksect") == 0) {
-			}
+            if (--argc < 1)
-		else if (strcmp(*argv,"-spkac") == 0)
+                goto bad;
-			{
+            spksect = *(++argv);
-			if (--argc < 1) goto bad;
+        }
-			spkac= *(++argv);
-			}
-		else if (strcmp(*argv,"-spksect") == 0)
-			{
-			if (--argc < 1) goto bad;
-			spksect= *(++argv);
-			}
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			engine= *(++argv);
+            engine = *(++argv);
-			}
+        }
 #endif
-		else if (strcmp(*argv,"-noout") == 0)
+        else if (strcmp(*argv, "-noout") == 0)
-			noout=1;
+            noout = 1;
-		else if (strcmp(*argv,"-pubkey") == 0)
+        else if (strcmp(*argv, "-pubkey") == 0)
-			pubkey=1;
+            pubkey = 1;
-		else if (strcmp(*argv,"-verify") == 0)
+        else if (strcmp(*argv, "-verify") == 0)
-			verify=1;
+            verify = 1;
-		else badops = 1;
+        else
-		argc--;
+            badops = 1;
-		argv++;
+        argc--;
-		}
+        argv++;
+    }
 
-	if (badops)
+    if (badops) {
-		{
+ bad:
-bad:
+        BIO_printf(bio_err, "%s [options]\n", prog);
-		BIO_printf(bio_err,"%s [options]\n",prog);
+        BIO_printf(bio_err, "where options are\n");
-		BIO_printf(bio_err,"where options are\n");
+        BIO_printf(bio_err, " -in arg        input file\n");
-		BIO_printf(bio_err," -in arg        input file\n");
+        BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -out arg       output file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -key arg       create SPKAC using private key\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,
-		BIO_printf(bio_err," -challenge arg challenge string\n");
+                   " -passin arg    input file pass phrase source\n");
-		BIO_printf(bio_err," -spkac arg     alternative SPKAC name\n");
+        BIO_printf(bio_err, " -challenge arg challenge string\n");
-		BIO_printf(bio_err," -noout         don't print SPKAC\n");
+        BIO_printf(bio_err, " -spkac arg     alternative SPKAC name\n");
-		BIO_printf(bio_err," -pubkey        output public key\n");
+        BIO_printf(bio_err, " -noout         don't print SPKAC\n");
-		BIO_printf(bio_err," -verify        verify SPKAC signature\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;
+        goto end;
-		}
+    }
-
-	ERR_load_crypto_strings();
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-		BIO_printf(bio_err, "Error getting password\n");
-		goto end;
-	}
 
+    ERR_load_crypto_strings();
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+        BIO_printf(bio_err, "Error getting password\n");
+        goto end;
+    }
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if(keyfile) {
+    if (keyfile) {
-		pkey = load_key(bio_err,
+        pkey = load_key(bio_err,
-				strcmp(keyfile, "-") ? keyfile : NULL,
+                        strcmp(keyfile, "-") ? keyfile : NULL,
-				FORMAT_PEM, 1, passin, e, "private key");
+                        FORMAT_PEM, 1, passin, e, "private key");
-		if(!pkey) {
+        if (!pkey) {
-			goto end;
+            goto end;
-		}
+        }
-		spki = NETSCAPE_SPKI_new();
+        spki = NETSCAPE_SPKI_new();
-		if(challenge) ASN1_STRING_set(spki->spkac->challenge,
+        if (challenge)
-						 challenge, (int)strlen(challenge));
+            ASN1_STRING_set(spki->spkac->challenge,
-		NETSCAPE_SPKI_set_pubkey(spki, pkey);
+                            challenge, (int)strlen(challenge));
-		NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
+        NETSCAPE_SPKI_set_pubkey(spki, pkey);
-		spkstr = NETSCAPE_SPKI_b64_encode(spki);
+        NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
+        spkstr = NETSCAPE_SPKI_b64_encode(spki);
 
-		if (outfile) out = BIO_new_file(outfile, "w");
+        if (outfile)
-		else {
+            out = BIO_new_file(outfile, "w");
-			out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        else {
+            out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-			{
+            {
-			    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-			    out = BIO_push(tmpbio, out);
+                out = BIO_push(tmpbio, out);
-			}
+            }
 #endif
-		}
+        }
 
-		if(!out) {
+        if (!out) {
-			BIO_printf(bio_err, "Error opening output file\n");
+            BIO_printf(bio_err, "Error opening output file\n");
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-		BIO_printf(out, "SPKAC=%s\n", spkstr);
+        BIO_printf(out, "SPKAC=%s\n", spkstr);
-		OPENSSL_free(spkstr);
+        OPENSSL_free(spkstr);
-		ret = 0;
+        ret = 0;
-		goto end;
+        goto end;
-	}
+    }
 
-	
+    if (infile)
+        in = BIO_new_file(infile, "r");
+    else
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if (infile) in = BIO_new_file(infile, "r");
+    if (!in) {
-	else in = BIO_new_fp(stdin, BIO_NOCLOSE);
+        BIO_printf(bio_err, "Error opening input file\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if(!in) {
+    conf = NCONF_new(NULL);
-		BIO_printf(bio_err, "Error opening input file\n");
+    i = NCONF_load_bio(conf, in, NULL);
-		ERR_print_errors(bio_err);
-		goto end;
-	}
 
-	conf = NCONF_new(NULL);
+    if (!i) {
-	i = NCONF_load_bio(conf, in, NULL);
+        BIO_printf(bio_err, "Error parsing config file\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
 
-	if(!i) {
+    spkstr = NCONF_get_string(conf, spksect, spkac);
-		BIO_printf(bio_err, "Error parsing config file\n");
-		ERR_print_errors(bio_err);
-		goto end;
-	}
 
-	spkstr = NCONF_get_string(conf, spksect, spkac);
+    if (!spkstr) {
-		
+        BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
-	if(!spkstr) {
+        ERR_print_errors(bio_err);
-		BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
+        goto end;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
-	}
 
-	spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
+    spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
-	
-	if(!spki) {
-		BIO_printf(bio_err, "Error loading SPKAC\n");
-		ERR_print_errors(bio_err);
-		goto end;
-	}
 
-	if (outfile) out = BIO_new_file(outfile, "w");
+    if (!spki) {
-	else {
+        BIO_printf(bio_err, "Error loading SPKAC\n");
-		out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    if (outfile)
+        out = BIO_new_file(outfile, "w");
+    else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
-		{
+        {
-		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-		    out = BIO_push(tmpbio, out);
+            out = BIO_push(tmpbio, out);
-		}
+        }
 #endif
-	}
+    }
 
-	if(!out) {
+    if (!out) {
-		BIO_printf(bio_err, "Error opening output file\n");
+        BIO_printf(bio_err, "Error opening output file\n");
-		ERR_print_errors(bio_err);
+        ERR_print_errors(bio_err);
-		goto end;
+        goto end;
-	}
+    }
 
-	if(!noout) NETSCAPE_SPKI_print(out, spki);
+    if (!noout)
-	pkey = NETSCAPE_SPKI_get_pubkey(spki);
+        NETSCAPE_SPKI_print(out, spki);
-	if(verify) {
+    pkey = NETSCAPE_SPKI_get_pubkey(spki);
-		i = NETSCAPE_SPKI_verify(spki, pkey);
+    if (verify) {
-		if(i) BIO_printf(bio_err, "Signature OK\n");
+        i = NETSCAPE_SPKI_verify(spki, pkey);
-		else {
+        if (i > 0)
-			BIO_printf(bio_err, "Signature Failure\n");
+            BIO_printf(bio_err, "Signature OK\n");
-			ERR_print_errors(bio_err);
+        else {
-			goto end;
+            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;
+    ret = 0;
 
-end:
+ end:
-	NCONF_free(conf);
+    NCONF_free(conf);
-	NETSCAPE_SPKI_free(spki);
+    NETSCAPE_SPKI_free(spki);
-	BIO_free(in);
+    BIO_free(in);
-	BIO_free_all(out);
+    BIO_free_all(out);
-	EVP_PKEY_free(pkey);
+    EVP_PKEY_free(pkey);
-	if(passin) OPENSSL_free(passin);
+    if (passin)
-	apps_shutdown();
+        OPENSSL_free(passin);
-	OPENSSL_EXIT(ret);
+    apps_shutdown();
-	}
+    OPENSSL_EXIT(ret);
+}

apps/testdsa.h

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

apps/testrsa.h

@@ -6,21 +6,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -35,10 +35,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,469 +50,469 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
-static unsigned char test512[]={
+static unsigned char test512[] = {
-	0x30,0x82,0x01,0x3a,0x02,0x01,0x00,0x02,0x41,0x00,
+    0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00,
-	0xd6,0x33,0xb9,0xc8,0xfb,0x4f,0x3c,0x7d,0xc0,0x01,
+    0xd6, 0x33, 0xb9, 0xc8, 0xfb, 0x4f, 0x3c, 0x7d, 0xc0, 0x01,
-	0x86,0xd0,0xe7,0xa0,0x55,0xf2,0x95,0x93,0xcc,0x4f,
+    0x86, 0xd0, 0xe7, 0xa0, 0x55, 0xf2, 0x95, 0x93, 0xcc, 0x4f,
-	0xb7,0x5b,0x67,0x5b,0x94,0x68,0xc9,0x34,0x15,0xde,
+    0xb7, 0x5b, 0x67, 0x5b, 0x94, 0x68, 0xc9, 0x34, 0x15, 0xde,
-	0xa5,0x2e,0x1c,0x33,0xc2,0x6e,0xfc,0x34,0x5e,0x71,
+    0xa5, 0x2e, 0x1c, 0x33, 0xc2, 0x6e, 0xfc, 0x34, 0x5e, 0x71,
-	0x13,0xb7,0xd6,0xee,0xd8,0xa5,0x65,0x05,0x72,0x87,
+    0x13, 0xb7, 0xd6, 0xee, 0xd8, 0xa5, 0x65, 0x05, 0x72, 0x87,
-	0xa8,0xb0,0x77,0xfe,0x57,0xf5,0xfc,0x5f,0x55,0x83,
+    0xa8, 0xb0, 0x77, 0xfe, 0x57, 0xf5, 0xfc, 0x5f, 0x55, 0x83,
-	0x87,0xdd,0x57,0x49,0x02,0x03,0x01,0x00,0x01,0x02,
+    0x87, 0xdd, 0x57, 0x49, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-	0x41,0x00,0xa7,0xf7,0x91,0xc5,0x0f,0x84,0x57,0xdc,
+    0x41, 0x00, 0xa7, 0xf7, 0x91, 0xc5, 0x0f, 0x84, 0x57, 0xdc,
-	0x07,0xf7,0x6a,0x7f,0x60,0x52,0xb3,0x72,0xf1,0x66,
+    0x07, 0xf7, 0x6a, 0x7f, 0x60, 0x52, 0xb3, 0x72, 0xf1, 0x66,
-	0x1f,0x7d,0x97,0x3b,0x9e,0xb6,0x0a,0x8f,0x8c,0xcf,
+    0x1f, 0x7d, 0x97, 0x3b, 0x9e, 0xb6, 0x0a, 0x8f, 0x8c, 0xcf,
-	0x42,0x23,0x00,0x04,0xd4,0x28,0x0e,0x1c,0x90,0xc4,
+    0x42, 0x23, 0x00, 0x04, 0xd4, 0x28, 0x0e, 0x1c, 0x90, 0xc4,
-	0x11,0x25,0x25,0xa5,0x93,0xa5,0x2f,0x70,0x02,0xdf,
+    0x11, 0x25, 0x25, 0xa5, 0x93, 0xa5, 0x2f, 0x70, 0x02, 0xdf,
-	0x81,0x9c,0x49,0x03,0xa0,0xf8,0x6d,0x54,0x2e,0x26,
+    0x81, 0x9c, 0x49, 0x03, 0xa0, 0xf8, 0x6d, 0x54, 0x2e, 0x26,
-	0xde,0xaa,0x85,0x59,0xa8,0x31,0x02,0x21,0x00,0xeb,
+    0xde, 0xaa, 0x85, 0x59, 0xa8, 0x31, 0x02, 0x21, 0x00, 0xeb,
-	0x47,0xd7,0x3b,0xf6,0xc3,0xdd,0x5a,0x46,0xc5,0xb9,
+    0x47, 0xd7, 0x3b, 0xf6, 0xc3, 0xdd, 0x5a, 0x46, 0xc5, 0xb9,
-	0x2b,0x9a,0xa0,0x09,0x8f,0xa6,0xfb,0xf3,0x78,0x7a,
+    0x2b, 0x9a, 0xa0, 0x09, 0x8f, 0xa6, 0xfb, 0xf3, 0x78, 0x7a,
-	0x33,0x70,0x9d,0x0f,0x42,0x6b,0x13,0x68,0x24,0xd3,
+    0x33, 0x70, 0x9d, 0x0f, 0x42, 0x6b, 0x13, 0x68, 0x24, 0xd3,
-	0x15,0x02,0x21,0x00,0xe9,0x10,0xb0,0xb3,0x0d,0xe2,
+    0x15, 0x02, 0x21, 0x00, 0xe9, 0x10, 0xb0, 0xb3, 0x0d, 0xe2,
-	0x82,0x68,0x77,0x8a,0x6e,0x7c,0xda,0xbc,0x3e,0x53,
+    0x82, 0x68, 0x77, 0x8a, 0x6e, 0x7c, 0xda, 0xbc, 0x3e, 0x53,
-	0x83,0xfb,0xd6,0x22,0xe7,0xb5,0xae,0x6e,0x80,0xda,
+    0x83, 0xfb, 0xd6, 0x22, 0xe7, 0xb5, 0xae, 0x6e, 0x80, 0xda,
-	0x00,0x55,0x97,0xc1,0xd0,0x65,0x02,0x20,0x4c,0xf8,
+    0x00, 0x55, 0x97, 0xc1, 0xd0, 0x65, 0x02, 0x20, 0x4c, 0xf8,
-	0x73,0xb1,0x6a,0x49,0x29,0x61,0x1f,0x46,0x10,0x0d,
+    0x73, 0xb1, 0x6a, 0x49, 0x29, 0x61, 0x1f, 0x46, 0x10, 0x0d,
-	0xf3,0xc7,0xe7,0x58,0xd7,0x88,0x15,0x5e,0x94,0x9b,
+    0xf3, 0xc7, 0xe7, 0x58, 0xd7, 0x88, 0x15, 0x5e, 0x94, 0x9b,
-	0xbf,0x7b,0xa2,0x42,0x58,0x45,0x41,0x0c,0xcb,0x01,
+    0xbf, 0x7b, 0xa2, 0x42, 0x58, 0x45, 0x41, 0x0c, 0xcb, 0x01,
-	0x02,0x20,0x12,0x11,0xba,0x31,0x57,0x9d,0x3d,0x11,
+    0x02, 0x20, 0x12, 0x11, 0xba, 0x31, 0x57, 0x9d, 0x3d, 0x11,
-	0x0e,0x5b,0x8c,0x2f,0x5f,0xe2,0x02,0x4f,0x05,0x47,
+    0x0e, 0x5b, 0x8c, 0x2f, 0x5f, 0xe2, 0x02, 0x4f, 0x05, 0x47,
-	0x8c,0x15,0x8e,0xb3,0x56,0x3f,0xb8,0xfb,0xad,0xd4,
+    0x8c, 0x15, 0x8e, 0xb3, 0x56, 0x3f, 0xb8, 0xfb, 0xad, 0xd4,
-	0xf4,0xfc,0x10,0xc5,0x02,0x20,0x18,0xa1,0x29,0x99,
+    0xf4, 0xfc, 0x10, 0xc5, 0x02, 0x20, 0x18, 0xa1, 0x29, 0x99,
-	0x5b,0xd9,0xc8,0xd4,0xfc,0x49,0x7a,0x2a,0x21,0x2c,
+    0x5b, 0xd9, 0xc8, 0xd4, 0xfc, 0x49, 0x7a, 0x2a, 0x21, 0x2c,
-	0x49,0xe4,0x4f,0xeb,0xef,0x51,0xf1,0xab,0x6d,0xfb,
+    0x49, 0xe4, 0x4f, 0xeb, 0xef, 0x51, 0xf1, 0xab, 0x6d, 0xfb,
-	0x4b,0x14,0xe9,0x4b,0x52,0xb5,0x82,0x2c,
+    0x4b, 0x14, 0xe9, 0x4b, 0x52, 0xb5, 0x82, 0x2c,
-	};
+};
 
-static unsigned char test1024[]={
+static unsigned char test1024[] = {
-	0x30,0x82,0x02,0x5c,0x02,0x01,0x00,0x02,0x81,0x81,
+    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
-	0x00,0xdc,0x98,0x43,0xe8,0x3d,0x43,0x5b,0xe4,0x05,
+    0x00, 0xdc, 0x98, 0x43, 0xe8, 0x3d, 0x43, 0x5b, 0xe4, 0x05,
-	0xcd,0xd0,0xa9,0x3e,0xcb,0x83,0x75,0xf6,0xb5,0xa5,
+    0xcd, 0xd0, 0xa9, 0x3e, 0xcb, 0x83, 0x75, 0xf6, 0xb5, 0xa5,
-	0x9f,0x6b,0xe9,0x34,0x41,0x29,0x18,0xfa,0x6a,0x55,
+    0x9f, 0x6b, 0xe9, 0x34, 0x41, 0x29, 0x18, 0xfa, 0x6a, 0x55,
-	0x4d,0x70,0xfc,0xec,0xae,0x87,0x38,0x0a,0x20,0xa9,
+    0x4d, 0x70, 0xfc, 0xec, 0xae, 0x87, 0x38, 0x0a, 0x20, 0xa9,
-	0xc0,0x45,0x77,0x6e,0x57,0x60,0x57,0xf4,0xed,0x96,
+    0xc0, 0x45, 0x77, 0x6e, 0x57, 0x60, 0x57, 0xf4, 0xed, 0x96,
-	0x22,0xcb,0x8f,0xe1,0x33,0x3a,0x17,0x1f,0xed,0x37,
+    0x22, 0xcb, 0x8f, 0xe1, 0x33, 0x3a, 0x17, 0x1f, 0xed, 0x37,
-	0xa5,0x6f,0xeb,0xa6,0xbc,0x12,0x80,0x1d,0x53,0xbd,
+    0xa5, 0x6f, 0xeb, 0xa6, 0xbc, 0x12, 0x80, 0x1d, 0x53, 0xbd,
-	0x70,0xeb,0x21,0x76,0x3e,0xc9,0x2f,0x1a,0x45,0x24,
+    0x70, 0xeb, 0x21, 0x76, 0x3e, 0xc9, 0x2f, 0x1a, 0x45, 0x24,
-	0x82,0xff,0xcd,0x59,0x32,0x06,0x2e,0x12,0x3b,0x23,
+    0x82, 0xff, 0xcd, 0x59, 0x32, 0x06, 0x2e, 0x12, 0x3b, 0x23,
-	0x78,0xed,0x12,0x3d,0xe0,0x8d,0xf9,0x67,0x4f,0x37,
+    0x78, 0xed, 0x12, 0x3d, 0xe0, 0x8d, 0xf9, 0x67, 0x4f, 0x37,
-	0x4e,0x47,0x02,0x4c,0x2d,0xc0,0x4f,0x1f,0xb3,0x94,
+    0x4e, 0x47, 0x02, 0x4c, 0x2d, 0xc0, 0x4f, 0x1f, 0xb3, 0x94,
-	0xe1,0x41,0x2e,0x2d,0x90,0x10,0xfc,0x82,0x91,0x8b,
+    0xe1, 0x41, 0x2e, 0x2d, 0x90, 0x10, 0xfc, 0x82, 0x91, 0x8b,
-	0x0f,0x22,0xd4,0xf2,0xfc,0x2c,0xab,0x53,0x55,0x02,
+    0x0f, 0x22, 0xd4, 0xf2, 0xfc, 0x2c, 0xab, 0x53, 0x55, 0x02,
-	0x03,0x01,0x00,0x01,0x02,0x81,0x80,0x2b,0xcc,0x3f,
+    0x03, 0x01, 0x00, 0x01, 0x02, 0x81, 0x80, 0x2b, 0xcc, 0x3f,
-	0x8f,0x58,0xba,0x8b,0x00,0x16,0xf6,0xea,0x3a,0xf0,
+    0x8f, 0x58, 0xba, 0x8b, 0x00, 0x16, 0xf6, 0xea, 0x3a, 0xf0,
-	0x30,0xd0,0x05,0x17,0xda,0xb0,0xeb,0x9a,0x2d,0x4f,
+    0x30, 0xd0, 0x05, 0x17, 0xda, 0xb0, 0xeb, 0x9a, 0x2d, 0x4f,
-	0x26,0xb0,0xd6,0x38,0xc1,0xeb,0xf5,0xd8,0x3d,0x1f,
+    0x26, 0xb0, 0xd6, 0x38, 0xc1, 0xeb, 0xf5, 0xd8, 0x3d, 0x1f,
-	0x70,0xf7,0x7f,0xf4,0xe2,0xcf,0x51,0x51,0x79,0x88,
+    0x70, 0xf7, 0x7f, 0xf4, 0xe2, 0xcf, 0x51, 0x51, 0x79, 0x88,
-	0xfa,0xe8,0x32,0x0e,0x7b,0x2d,0x97,0xf2,0xfa,0xba,
+    0xfa, 0xe8, 0x32, 0x0e, 0x7b, 0x2d, 0x97, 0xf2, 0xfa, 0xba,
-	0x27,0xc5,0x9c,0xd9,0xc5,0xeb,0x8a,0x79,0x52,0x3c,
+    0x27, 0xc5, 0x9c, 0xd9, 0xc5, 0xeb, 0x8a, 0x79, 0x52, 0x3c,
-	0x64,0x34,0x7d,0xc2,0xcf,0x28,0xc7,0x4e,0xd5,0x43,
+    0x64, 0x34, 0x7d, 0xc2, 0xcf, 0x28, 0xc7, 0x4e, 0xd5, 0x43,
-	0x0b,0xd1,0xa6,0xca,0x6d,0x03,0x2d,0x72,0x23,0xbc,
+    0x0b, 0xd1, 0xa6, 0xca, 0x6d, 0x03, 0x2d, 0x72, 0x23, 0xbc,
-	0x6d,0x05,0xfa,0x16,0x09,0x2f,0x2e,0x5c,0xb6,0xee,
+    0x6d, 0x05, 0xfa, 0x16, 0x09, 0x2f, 0x2e, 0x5c, 0xb6, 0xee,
-	0x74,0xdd,0xd2,0x48,0x8e,0x36,0x0c,0x06,0x3d,0x4d,
+    0x74, 0xdd, 0xd2, 0x48, 0x8e, 0x36, 0x0c, 0x06, 0x3d, 0x4d,
-	0xe5,0x10,0x82,0xeb,0x6a,0xf3,0x4b,0x9f,0xd6,0xed,
+    0xe5, 0x10, 0x82, 0xeb, 0x6a, 0xf3, 0x4b, 0x9f, 0xd6, 0xed,
-	0x11,0xb1,0x6e,0xec,0xf4,0xfe,0x8e,0x75,0x94,0x20,
+    0x11, 0xb1, 0x6e, 0xec, 0xf4, 0xfe, 0x8e, 0x75, 0x94, 0x20,
-	0x2f,0xcb,0xac,0x46,0xf1,0x02,0x41,0x00,0xf9,0x8c,
+    0x2f, 0xcb, 0xac, 0x46, 0xf1, 0x02, 0x41, 0x00, 0xf9, 0x8c,
-	0xa3,0x85,0xb1,0xdd,0x29,0xaf,0x65,0xc1,0x33,0xf3,
+    0xa3, 0x85, 0xb1, 0xdd, 0x29, 0xaf, 0x65, 0xc1, 0x33, 0xf3,
-	0x95,0xc5,0x52,0x68,0x0b,0xd4,0xf1,0xe5,0x0e,0x02,
+    0x95, 0xc5, 0x52, 0x68, 0x0b, 0xd4, 0xf1, 0xe5, 0x0e, 0x02,
-	0x9f,0x4f,0xfa,0x77,0xdc,0x46,0x9e,0xc7,0xa6,0xe4,
+    0x9f, 0x4f, 0xfa, 0x77, 0xdc, 0x46, 0x9e, 0xc7, 0xa6, 0xe4,
-	0x16,0x29,0xda,0xb0,0x07,0xcf,0x5b,0xa9,0x12,0x8a,
+    0x16, 0x29, 0xda, 0xb0, 0x07, 0xcf, 0x5b, 0xa9, 0x12, 0x8a,
-	0xdd,0x63,0x0a,0xde,0x2e,0x8c,0x66,0x8b,0x8c,0xdc,
+    0xdd, 0x63, 0x0a, 0xde, 0x2e, 0x8c, 0x66, 0x8b, 0x8c, 0xdc,
-	0x19,0xa3,0x7e,0xf4,0x3b,0xd0,0x1a,0x8c,0xa4,0xc2,
+    0x19, 0xa3, 0x7e, 0xf4, 0x3b, 0xd0, 0x1a, 0x8c, 0xa4, 0xc2,
-	0xe1,0xd3,0x02,0x41,0x00,0xe2,0x4c,0x05,0xf2,0x04,
+    0xe1, 0xd3, 0x02, 0x41, 0x00, 0xe2, 0x4c, 0x05, 0xf2, 0x04,
-	0x86,0x4e,0x61,0x43,0xdb,0xb0,0xb9,0x96,0x86,0x52,
+    0x86, 0x4e, 0x61, 0x43, 0xdb, 0xb0, 0xb9, 0x96, 0x86, 0x52,
-	0x2c,0xca,0x8d,0x7b,0xab,0x0b,0x13,0x0d,0x7e,0x38,
+    0x2c, 0xca, 0x8d, 0x7b, 0xab, 0x0b, 0x13, 0x0d, 0x7e, 0x38,
-	0x5b,0xe2,0x2e,0x7b,0x0e,0xe7,0x19,0x99,0x38,0xe7,
+    0x5b, 0xe2, 0x2e, 0x7b, 0x0e, 0xe7, 0x19, 0x99, 0x38, 0xe7,
-	0xf2,0x21,0xbd,0x85,0x85,0xe3,0xfd,0x28,0x77,0x20,
+    0xf2, 0x21, 0xbd, 0x85, 0x85, 0xe3, 0xfd, 0x28, 0x77, 0x20,
-	0x31,0x71,0x2c,0xd0,0xff,0xfb,0x2e,0xaf,0x85,0xb4,
+    0x31, 0x71, 0x2c, 0xd0, 0xff, 0xfb, 0x2e, 0xaf, 0x85, 0xb4,
-	0x86,0xca,0xf3,0xbb,0xca,0xaa,0x0f,0x95,0x37,0x02,
+    0x86, 0xca, 0xf3, 0xbb, 0xca, 0xaa, 0x0f, 0x95, 0x37, 0x02,
-	0x40,0x0e,0x41,0x9a,0x95,0xe8,0xb3,0x59,0xce,0x4b,
+    0x40, 0x0e, 0x41, 0x9a, 0x95, 0xe8, 0xb3, 0x59, 0xce, 0x4b,
-	0x61,0xde,0x35,0xec,0x38,0x79,0x9c,0xb8,0x10,0x52,
+    0x61, 0xde, 0x35, 0xec, 0x38, 0x79, 0x9c, 0xb8, 0x10, 0x52,
-	0x41,0x63,0xab,0x82,0xae,0x6f,0x00,0xa9,0xf4,0xde,
+    0x41, 0x63, 0xab, 0x82, 0xae, 0x6f, 0x00, 0xa9, 0xf4, 0xde,
-	0xdd,0x49,0x0b,0x7e,0xb8,0xa5,0x65,0xa9,0x0c,0x8f,
+    0xdd, 0x49, 0x0b, 0x7e, 0xb8, 0xa5, 0x65, 0xa9, 0x0c, 0x8f,
-	0x8f,0xf9,0x1f,0x35,0xc6,0x92,0xb8,0x5e,0xb0,0x66,
+    0x8f, 0xf9, 0x1f, 0x35, 0xc6, 0x92, 0xb8, 0x5e, 0xb0, 0x66,
-	0xab,0x52,0x40,0xc0,0xb6,0x36,0x6a,0x7d,0x80,0x46,
+    0xab, 0x52, 0x40, 0xc0, 0xb6, 0x36, 0x6a, 0x7d, 0x80, 0x46,
-	0x04,0x02,0xe5,0x9f,0x41,0x02,0x41,0x00,0xc0,0xad,
+    0x04, 0x02, 0xe5, 0x9f, 0x41, 0x02, 0x41, 0x00, 0xc0, 0xad,
-	0xcc,0x4e,0x21,0xee,0x1d,0x24,0x91,0xfb,0xa7,0x80,
+    0xcc, 0x4e, 0x21, 0xee, 0x1d, 0x24, 0x91, 0xfb, 0xa7, 0x80,
-	0x8d,0x9a,0xb6,0xb3,0x2e,0x8f,0xc2,0xe1,0x82,0xdf,
+    0x8d, 0x9a, 0xb6, 0xb3, 0x2e, 0x8f, 0xc2, 0xe1, 0x82, 0xdf,
-	0x69,0x18,0xb4,0x71,0xff,0xa6,0x65,0xde,0xed,0x84,
+    0x69, 0x18, 0xb4, 0x71, 0xff, 0xa6, 0x65, 0xde, 0xed, 0x84,
-	0x8d,0x42,0xb7,0xb3,0x21,0x69,0x56,0x1c,0x07,0x60,
+    0x8d, 0x42, 0xb7, 0xb3, 0x21, 0x69, 0x56, 0x1c, 0x07, 0x60,
-	0x51,0x29,0x04,0xff,0x34,0x06,0xdd,0xb9,0x67,0x2c,
+    0x51, 0x29, 0x04, 0xff, 0x34, 0x06, 0xdd, 0xb9, 0x67, 0x2c,
-	0x7c,0x04,0x93,0x0e,0x46,0x15,0xbb,0x2a,0xb7,0x1b,
+    0x7c, 0x04, 0x93, 0x0e, 0x46, 0x15, 0xbb, 0x2a, 0xb7, 0x1b,
-	0xe7,0x87,0x02,0x40,0x78,0xda,0x5d,0x07,0x51,0x0c,
+    0xe7, 0x87, 0x02, 0x40, 0x78, 0xda, 0x5d, 0x07, 0x51, 0x0c,
-	0x16,0x7a,0x9f,0x29,0x20,0x84,0x0d,0x42,0xfa,0xd7,
+    0x16, 0x7a, 0x9f, 0x29, 0x20, 0x84, 0x0d, 0x42, 0xfa, 0xd7,
-	0x00,0xd8,0x77,0x7e,0xb0,0xb0,0x6b,0xd6,0x5b,0x53,
+    0x00, 0xd8, 0x77, 0x7e, 0xb0, 0xb0, 0x6b, 0xd6, 0x5b, 0x53,
-	0xb8,0x9b,0x7a,0xcd,0xc7,0x2b,0xb8,0x6a,0x63,0xa9,
+    0xb8, 0x9b, 0x7a, 0xcd, 0xc7, 0x2b, 0xb8, 0x6a, 0x63, 0xa9,
-	0xfb,0x6f,0xa4,0x72,0xbf,0x4c,0x5d,0x00,0x14,0xba,
+    0xfb, 0x6f, 0xa4, 0x72, 0xbf, 0x4c, 0x5d, 0x00, 0x14, 0xba,
-	0xfa,0x59,0x88,0xed,0xe4,0xe0,0x8c,0xa2,0xec,0x14,
+    0xfa, 0x59, 0x88, 0xed, 0xe4, 0xe0, 0x8c, 0xa2, 0xec, 0x14,
-	0x7e,0x2d,0xe2,0xf0,0x46,0x49,0x95,0x45,
+    0x7e, 0x2d, 0xe2, 0xf0, 0x46, 0x49, 0x95, 0x45,
-	};
+};
 
-static unsigned char test2048[]={
+static unsigned char test2048[] = {
-	0x30,0x82,0x04,0xa3,0x02,0x01,0x00,0x02,0x82,0x01,
+    0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
-	0x01,0x00,0xc0,0xc0,0xce,0x3e,0x3c,0x53,0x67,0x3f,
+    0x01, 0x00, 0xc0, 0xc0, 0xce, 0x3e, 0x3c, 0x53, 0x67, 0x3f,
-	0x4f,0xc5,0x2f,0xa4,0xc2,0x5a,0x2f,0x58,0xfd,0x27,
+    0x4f, 0xc5, 0x2f, 0xa4, 0xc2, 0x5a, 0x2f, 0x58, 0xfd, 0x27,
-	0x52,0x6a,0xe8,0xcf,0x4a,0x73,0x47,0x8d,0x25,0x0f,
+    0x52, 0x6a, 0xe8, 0xcf, 0x4a, 0x73, 0x47, 0x8d, 0x25, 0x0f,
-	0x5f,0x03,0x26,0x78,0xef,0xf0,0x22,0x12,0xd3,0xde,
+    0x5f, 0x03, 0x26, 0x78, 0xef, 0xf0, 0x22, 0x12, 0xd3, 0xde,
-	0x47,0xb2,0x1c,0x0b,0x38,0x63,0x1a,0x6c,0x85,0x7a,
+    0x47, 0xb2, 0x1c, 0x0b, 0x38, 0x63, 0x1a, 0x6c, 0x85, 0x7a,
-	0x80,0xc6,0x8f,0xa0,0x41,0xaf,0x62,0xc4,0x67,0x32,
+    0x80, 0xc6, 0x8f, 0xa0, 0x41, 0xaf, 0x62, 0xc4, 0x67, 0x32,
-	0x88,0xf8,0xa6,0x9c,0xf5,0x23,0x1d,0xe4,0xac,0x3f,
+    0x88, 0xf8, 0xa6, 0x9c, 0xf5, 0x23, 0x1d, 0xe4, 0xac, 0x3f,
-	0x29,0xf9,0xec,0xe1,0x8b,0x26,0x03,0x2c,0xb2,0xab,
+    0x29, 0xf9, 0xec, 0xe1, 0x8b, 0x26, 0x03, 0x2c, 0xb2, 0xab,
-	0xf3,0x7d,0xb5,0xca,0x49,0xc0,0x8f,0x1c,0xdf,0x33,
+    0xf3, 0x7d, 0xb5, 0xca, 0x49, 0xc0, 0x8f, 0x1c, 0xdf, 0x33,
-	0x3a,0x60,0xda,0x3c,0xb0,0x16,0xf8,0xa9,0x12,0x8f,
+    0x3a, 0x60, 0xda, 0x3c, 0xb0, 0x16, 0xf8, 0xa9, 0x12, 0x8f,
-	0x64,0xac,0x23,0x0c,0x69,0x64,0x97,0x5d,0x99,0xd4,
+    0x64, 0xac, 0x23, 0x0c, 0x69, 0x64, 0x97, 0x5d, 0x99, 0xd4,
-	0x09,0x83,0x9b,0x61,0xd3,0xac,0xf0,0xde,0xdd,0x5e,
+    0x09, 0x83, 0x9b, 0x61, 0xd3, 0xac, 0xf0, 0xde, 0xdd, 0x5e,
-	0x9f,0x44,0x94,0xdb,0x3a,0x4d,0x97,0xe8,0x52,0x29,
+    0x9f, 0x44, 0x94, 0xdb, 0x3a, 0x4d, 0x97, 0xe8, 0x52, 0x29,
-	0xf7,0xdb,0x94,0x07,0x45,0x90,0x78,0x1e,0x31,0x0b,
+    0xf7, 0xdb, 0x94, 0x07, 0x45, 0x90, 0x78, 0x1e, 0x31, 0x0b,
-	0x80,0xf7,0x57,0xad,0x1c,0x79,0xc5,0xcb,0x32,0xb0,
+    0x80, 0xf7, 0x57, 0xad, 0x1c, 0x79, 0xc5, 0xcb, 0x32, 0xb0,
-	0xce,0xcd,0x74,0xb3,0xe2,0x94,0xc5,0x78,0x2f,0x34,
+    0xce, 0xcd, 0x74, 0xb3, 0xe2, 0x94, 0xc5, 0x78, 0x2f, 0x34,
-	0x1a,0x45,0xf7,0x8c,0x52,0xa5,0xbc,0x8d,0xec,0xd1,
+    0x1a, 0x45, 0xf7, 0x8c, 0x52, 0xa5, 0xbc, 0x8d, 0xec, 0xd1,
-	0x2f,0x31,0x3b,0xf0,0x49,0x59,0x5e,0x88,0x9d,0x15,
+    0x2f, 0x31, 0x3b, 0xf0, 0x49, 0x59, 0x5e, 0x88, 0x9d, 0x15,
-	0x92,0x35,0x32,0xc1,0xe7,0x61,0xec,0x50,0x48,0x7c,
+    0x92, 0x35, 0x32, 0xc1, 0xe7, 0x61, 0xec, 0x50, 0x48, 0x7c,
-	0xba,0x05,0xf9,0xf8,0xf8,0xa7,0x8c,0x83,0xe8,0x66,
+    0xba, 0x05, 0xf9, 0xf8, 0xf8, 0xa7, 0x8c, 0x83, 0xe8, 0x66,
-	0x5b,0xeb,0xfe,0xd8,0x4f,0xdd,0x6d,0x36,0xc0,0xb2,
+    0x5b, 0xeb, 0xfe, 0xd8, 0x4f, 0xdd, 0x6d, 0x36, 0xc0, 0xb2,
-	0x90,0x0f,0xb8,0x52,0xf9,0x04,0x9b,0x40,0x2c,0x27,
+    0x90, 0x0f, 0xb8, 0x52, 0xf9, 0x04, 0x9b, 0x40, 0x2c, 0x27,
-	0xd6,0x36,0x8e,0xc2,0x1b,0x44,0xf3,0x92,0xd5,0x15,
+    0xd6, 0x36, 0x8e, 0xc2, 0x1b, 0x44, 0xf3, 0x92, 0xd5, 0x15,
-	0x9e,0x9a,0xbc,0xf3,0x7d,0x03,0xd7,0x02,0x14,0x20,
+    0x9e, 0x9a, 0xbc, 0xf3, 0x7d, 0x03, 0xd7, 0x02, 0x14, 0x20,
-	0xe9,0x10,0x92,0xfd,0xf9,0xfc,0x8f,0xe5,0x18,0xe1,
+    0xe9, 0x10, 0x92, 0xfd, 0xf9, 0xfc, 0x8f, 0xe5, 0x18, 0xe1,
-	0x95,0xcc,0x9e,0x60,0xa6,0xfa,0x38,0x4d,0x02,0x03,
+    0x95, 0xcc, 0x9e, 0x60, 0xa6, 0xfa, 0x38, 0x4d, 0x02, 0x03,
-	0x01,0x00,0x01,0x02,0x82,0x01,0x00,0x00,0xc3,0xc3,
+    0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x00, 0xc3, 0xc3,
-	0x0d,0xb4,0x27,0x90,0x8d,0x4b,0xbf,0xb8,0x84,0xaa,
+    0x0d, 0xb4, 0x27, 0x90, 0x8d, 0x4b, 0xbf, 0xb8, 0x84, 0xaa,
-	0xd0,0xb8,0xc7,0x5d,0x99,0xbe,0x55,0xf6,0x3e,0x7c,
+    0xd0, 0xb8, 0xc7, 0x5d, 0x99, 0xbe, 0x55, 0xf6, 0x3e, 0x7c,
-	0x49,0x20,0xcb,0x8a,0x8e,0x19,0x0e,0x66,0x24,0xac,
+    0x49, 0x20, 0xcb, 0x8a, 0x8e, 0x19, 0x0e, 0x66, 0x24, 0xac,
-	0xaf,0x03,0x33,0x97,0xeb,0x95,0xd5,0x3b,0x0f,0x40,
+    0xaf, 0x03, 0x33, 0x97, 0xeb, 0x95, 0xd5, 0x3b, 0x0f, 0x40,
-	0x56,0x04,0x50,0xd1,0xe6,0xbe,0x84,0x0b,0x25,0xd3,
+    0x56, 0x04, 0x50, 0xd1, 0xe6, 0xbe, 0x84, 0x0b, 0x25, 0xd3,
-	0x9c,0xe2,0x83,0x6c,0xf5,0x62,0x5d,0xba,0x2b,0x7d,
+    0x9c, 0xe2, 0x83, 0x6c, 0xf5, 0x62, 0x5d, 0xba, 0x2b, 0x7d,
-	0x3d,0x7a,0x6c,0xe1,0xd2,0x0e,0x54,0x93,0x80,0x01,
+    0x3d, 0x7a, 0x6c, 0xe1, 0xd2, 0x0e, 0x54, 0x93, 0x80, 0x01,
-	0x91,0x51,0x09,0xe8,0x5b,0x8e,0x47,0xbd,0x64,0xe4,
+    0x91, 0x51, 0x09, 0xe8, 0x5b, 0x8e, 0x47, 0xbd, 0x64, 0xe4,
-	0x0e,0x03,0x83,0x55,0xcf,0x5a,0x37,0xf0,0x25,0xb5,
+    0x0e, 0x03, 0x83, 0x55, 0xcf, 0x5a, 0x37, 0xf0, 0x25, 0xb5,
-	0x7d,0x21,0xd7,0x69,0xdf,0x6f,0xc2,0xcf,0x10,0xc9,
+    0x7d, 0x21, 0xd7, 0x69, 0xdf, 0x6f, 0xc2, 0xcf, 0x10, 0xc9,
-	0x8a,0x40,0x9f,0x7a,0x70,0xc0,0xe8,0xe8,0xc0,0xe6,
+    0x8a, 0x40, 0x9f, 0x7a, 0x70, 0xc0, 0xe8, 0xe8, 0xc0, 0xe6,
-	0x9a,0x15,0x0a,0x8d,0x4e,0x46,0xcb,0x7a,0xdb,0xb3,
+    0x9a, 0x15, 0x0a, 0x8d, 0x4e, 0x46, 0xcb, 0x7a, 0xdb, 0xb3,
-	0xcb,0x83,0x02,0xc4,0xf0,0xab,0xeb,0x02,0x01,0x0e,
+    0xcb, 0x83, 0x02, 0xc4, 0xf0, 0xab, 0xeb, 0x02, 0x01, 0x0e,
-	0x23,0xfc,0x1d,0xc4,0xbd,0xd4,0xaa,0x5d,0x31,0x46,
+    0x23, 0xfc, 0x1d, 0xc4, 0xbd, 0xd4, 0xaa, 0x5d, 0x31, 0x46,
-	0x99,0xce,0x9e,0xf8,0x04,0x75,0x10,0x67,0xc4,0x53,
+    0x99, 0xce, 0x9e, 0xf8, 0x04, 0x75, 0x10, 0x67, 0xc4, 0x53,
-	0x47,0x44,0xfa,0xc2,0x25,0x73,0x7e,0xd0,0x8e,0x59,
+    0x47, 0x44, 0xfa, 0xc2, 0x25, 0x73, 0x7e, 0xd0, 0x8e, 0x59,
-	0xd1,0xb2,0x5a,0xf4,0xc7,0x18,0x92,0x2f,0x39,0xab,
+    0xd1, 0xb2, 0x5a, 0xf4, 0xc7, 0x18, 0x92, 0x2f, 0x39, 0xab,
-	0xcd,0xa3,0xb5,0xc2,0xb9,0xc7,0xb9,0x1b,0x9f,0x48,
+    0xcd, 0xa3, 0xb5, 0xc2, 0xb9, 0xc7, 0xb9, 0x1b, 0x9f, 0x48,
-	0xfa,0x13,0xc6,0x98,0x4d,0xca,0x84,0x9c,0x06,0xca,
+    0xfa, 0x13, 0xc6, 0x98, 0x4d, 0xca, 0x84, 0x9c, 0x06, 0xca,
-	0xe7,0x89,0x01,0x04,0xc4,0x6c,0xfd,0x29,0x59,0x35,
+    0xe7, 0x89, 0x01, 0x04, 0xc4, 0x6c, 0xfd, 0x29, 0x59, 0x35,
-	0xe7,0xf3,0xdd,0xce,0x64,0x59,0xbf,0x21,0x13,0xa9,
+    0xe7, 0xf3, 0xdd, 0xce, 0x64, 0x59, 0xbf, 0x21, 0x13, 0xa9,
-	0x9f,0x0e,0xc5,0xff,0xbd,0x33,0x00,0xec,0xac,0x6b,
+    0x9f, 0x0e, 0xc5, 0xff, 0xbd, 0x33, 0x00, 0xec, 0xac, 0x6b,
-	0x11,0xef,0x51,0x5e,0xad,0x07,0x15,0xde,0xb8,0x5f,
+    0x11, 0xef, 0x51, 0x5e, 0xad, 0x07, 0x15, 0xde, 0xb8, 0x5f,
-	0xc6,0xb9,0xa3,0x22,0x65,0x46,0x83,0x14,0xdf,0xd0,
+    0xc6, 0xb9, 0xa3, 0x22, 0x65, 0x46, 0x83, 0x14, 0xdf, 0xd0,
-	0xf1,0x44,0x8a,0xe1,0x9c,0x23,0x33,0xb4,0x97,0x33,
+    0xf1, 0x44, 0x8a, 0xe1, 0x9c, 0x23, 0x33, 0xb4, 0x97, 0x33,
-	0xe6,0x6b,0x81,0x02,0x81,0x81,0x00,0xec,0x12,0xa7,
+    0xe6, 0x6b, 0x81, 0x02, 0x81, 0x81, 0x00, 0xec, 0x12, 0xa7,
-	0x59,0x74,0x6a,0xde,0x3e,0xad,0xd8,0x36,0x80,0x50,
+    0x59, 0x74, 0x6a, 0xde, 0x3e, 0xad, 0xd8, 0x36, 0x80, 0x50,
-	0xa2,0xd5,0x21,0x81,0x07,0xf1,0xd0,0x91,0xf2,0x6c,
+    0xa2, 0xd5, 0x21, 0x81, 0x07, 0xf1, 0xd0, 0x91, 0xf2, 0x6c,
-	0x12,0x2f,0x9d,0x1a,0x26,0xf8,0x30,0x65,0xdf,0xe8,
+    0x12, 0x2f, 0x9d, 0x1a, 0x26, 0xf8, 0x30, 0x65, 0xdf, 0xe8,
-	0xc0,0x9b,0x6a,0x30,0x98,0x82,0x87,0xec,0xa2,0x56,
+    0xc0, 0x9b, 0x6a, 0x30, 0x98, 0x82, 0x87, 0xec, 0xa2, 0x56,
-	0x87,0x62,0x6f,0xe7,0x9f,0xf6,0x56,0xe6,0x71,0x8f,
+    0x87, 0x62, 0x6f, 0xe7, 0x9f, 0xf6, 0x56, 0xe6, 0x71, 0x8f,
-	0x49,0x86,0x93,0x5a,0x4d,0x34,0x58,0xfe,0xd9,0x04,
+    0x49, 0x86, 0x93, 0x5a, 0x4d, 0x34, 0x58, 0xfe, 0xd9, 0x04,
-	0x13,0xaf,0x79,0xb7,0xad,0x11,0xd1,0x30,0x9a,0x14,
+    0x13, 0xaf, 0x79, 0xb7, 0xad, 0x11, 0xd1, 0x30, 0x9a, 0x14,
-	0x06,0xa0,0xfa,0xb7,0x55,0xdc,0x6c,0x5a,0x4c,0x2c,
+    0x06, 0xa0, 0xfa, 0xb7, 0x55, 0xdc, 0x6c, 0x5a, 0x4c, 0x2c,
-	0x59,0x56,0xf6,0xe8,0x9d,0xaf,0x0a,0x78,0x99,0x06,
+    0x59, 0x56, 0xf6, 0xe8, 0x9d, 0xaf, 0x0a, 0x78, 0x99, 0x06,
-	0x06,0x9e,0xe7,0x9c,0x51,0x55,0x43,0xfc,0x3b,0x6c,
+    0x06, 0x9e, 0xe7, 0x9c, 0x51, 0x55, 0x43, 0xfc, 0x3b, 0x6c,
-	0x0b,0xbf,0x2d,0x41,0xa7,0xaf,0xb7,0xe0,0xe8,0x28,
+    0x0b, 0xbf, 0x2d, 0x41, 0xa7, 0xaf, 0xb7, 0xe0, 0xe8, 0x28,
-	0x18,0xb4,0x13,0xd1,0xe6,0x97,0xd0,0x9f,0x6a,0x80,
+    0x18, 0xb4, 0x13, 0xd1, 0xe6, 0x97, 0xd0, 0x9f, 0x6a, 0x80,
-	0xca,0xdd,0x1a,0x7e,0x15,0x02,0x81,0x81,0x00,0xd1,
+    0xca, 0xdd, 0x1a, 0x7e, 0x15, 0x02, 0x81, 0x81, 0x00, 0xd1,
-	0x06,0x0c,0x1f,0xe3,0xd0,0xab,0xd6,0xca,0x7c,0xbc,
+    0x06, 0x0c, 0x1f, 0xe3, 0xd0, 0xab, 0xd6, 0xca, 0x7c, 0xbc,
-	0x7d,0x13,0x35,0xce,0x27,0xcd,0xd8,0x49,0x51,0x63,
+    0x7d, 0x13, 0x35, 0xce, 0x27, 0xcd, 0xd8, 0x49, 0x51, 0x63,
-	0x64,0x0f,0xca,0x06,0x12,0xfc,0x07,0x3e,0xaf,0x61,
+    0x64, 0x0f, 0xca, 0x06, 0x12, 0xfc, 0x07, 0x3e, 0xaf, 0x61,
-	0x6d,0xe2,0x53,0x39,0x27,0xae,0xc3,0x11,0x9e,0x94,
+    0x6d, 0xe2, 0x53, 0x39, 0x27, 0xae, 0xc3, 0x11, 0x9e, 0x94,
-	0x01,0x4f,0xe3,0xf3,0x67,0xf9,0x77,0xf9,0xe7,0x95,
+    0x01, 0x4f, 0xe3, 0xf3, 0x67, 0xf9, 0x77, 0xf9, 0xe7, 0x95,
-	0x3a,0x6f,0xe2,0x20,0x73,0x3e,0xa4,0x7a,0x28,0xd4,
+    0x3a, 0x6f, 0xe2, 0x20, 0x73, 0x3e, 0xa4, 0x7a, 0x28, 0xd4,
-	0x61,0x97,0xf6,0x17,0xa0,0x23,0x10,0x2b,0xce,0x84,
+    0x61, 0x97, 0xf6, 0x17, 0xa0, 0x23, 0x10, 0x2b, 0xce, 0x84,
-	0x57,0x7e,0x25,0x1f,0xf4,0xa8,0x54,0xd2,0x65,0x94,
+    0x57, 0x7e, 0x25, 0x1f, 0xf4, 0xa8, 0x54, 0xd2, 0x65, 0x94,
-	0xcc,0x95,0x0a,0xab,0x30,0xc1,0x59,0x1f,0x61,0x8e,
+    0xcc, 0x95, 0x0a, 0xab, 0x30, 0xc1, 0x59, 0x1f, 0x61, 0x8e,
-	0xb9,0x6b,0xd7,0x4e,0xb9,0x83,0x43,0x79,0x85,0x11,
+    0xb9, 0x6b, 0xd7, 0x4e, 0xb9, 0x83, 0x43, 0x79, 0x85, 0x11,
-	0xbc,0x0f,0xae,0x25,0x20,0x05,0xbc,0xd2,0x48,0xa1,
+    0xbc, 0x0f, 0xae, 0x25, 0x20, 0x05, 0xbc, 0xd2, 0x48, 0xa1,
-	0x68,0x09,0x84,0xf6,0x12,0x9a,0x66,0xb9,0x2b,0xbb,
+    0x68, 0x09, 0x84, 0xf6, 0x12, 0x9a, 0x66, 0xb9, 0x2b, 0xbb,
-	0x76,0x03,0x17,0x46,0x4e,0x97,0x59,0x02,0x81,0x80,
+    0x76, 0x03, 0x17, 0x46, 0x4e, 0x97, 0x59, 0x02, 0x81, 0x80,
-	0x09,0x4c,0xfa,0xd6,0xe5,0x65,0x48,0x78,0x43,0xb5,
+    0x09, 0x4c, 0xfa, 0xd6, 0xe5, 0x65, 0x48, 0x78, 0x43, 0xb5,
-	0x1f,0x00,0x93,0x2c,0xb7,0x24,0xe8,0xc6,0x7d,0x5a,
+    0x1f, 0x00, 0x93, 0x2c, 0xb7, 0x24, 0xe8, 0xc6, 0x7d, 0x5a,
-	0x70,0x45,0x92,0xc8,0x6c,0xa3,0xcd,0xe1,0xf7,0x29,
+    0x70, 0x45, 0x92, 0xc8, 0x6c, 0xa3, 0xcd, 0xe1, 0xf7, 0x29,
-	0x40,0xfa,0x3f,0x5b,0x47,0x44,0x39,0xc1,0xe8,0x72,
+    0x40, 0xfa, 0x3f, 0x5b, 0x47, 0x44, 0x39, 0xc1, 0xe8, 0x72,
-	0x9e,0x7a,0x0e,0xda,0xaa,0xa0,0x2a,0x09,0xfd,0x54,
+    0x9e, 0x7a, 0x0e, 0xda, 0xaa, 0xa0, 0x2a, 0x09, 0xfd, 0x54,
-	0x93,0x23,0xaa,0x37,0x85,0x5b,0xcc,0xd4,0xf9,0xd8,
+    0x93, 0x23, 0xaa, 0x37, 0x85, 0x5b, 0xcc, 0xd4, 0xf9, 0xd8,
-	0xff,0xc1,0x61,0x0d,0xbd,0x7e,0x18,0x24,0x73,0x6d,
+    0xff, 0xc1, 0x61, 0x0d, 0xbd, 0x7e, 0x18, 0x24, 0x73, 0x6d,
-	0x40,0x72,0xf1,0x93,0x09,0x48,0x97,0x6c,0x84,0x90,
+    0x40, 0x72, 0xf1, 0x93, 0x09, 0x48, 0x97, 0x6c, 0x84, 0x90,
-	0xa8,0x46,0x14,0x01,0x39,0x11,0xe5,0x3c,0x41,0x27,
+    0xa8, 0x46, 0x14, 0x01, 0x39, 0x11, 0xe5, 0x3c, 0x41, 0x27,
-	0x32,0x75,0x24,0xed,0xa1,0xd9,0x12,0x29,0x8a,0x28,
+    0x32, 0x75, 0x24, 0xed, 0xa1, 0xd9, 0x12, 0x29, 0x8a, 0x28,
-	0x71,0x89,0x8d,0xca,0x30,0xb0,0x01,0xc4,0x2f,0x82,
+    0x71, 0x89, 0x8d, 0xca, 0x30, 0xb0, 0x01, 0xc4, 0x2f, 0x82,
-	0x19,0x14,0x4c,0x70,0x1c,0xb8,0x23,0x2e,0xe8,0x90,
+    0x19, 0x14, 0x4c, 0x70, 0x1c, 0xb8, 0x23, 0x2e, 0xe8, 0x90,
-	0x49,0x97,0x92,0x97,0x6b,0x7a,0x9d,0xb9,0x02,0x81,
+    0x49, 0x97, 0x92, 0x97, 0x6b, 0x7a, 0x9d, 0xb9, 0x02, 0x81,
-	0x80,0x0f,0x0e,0xa1,0x76,0xf6,0xa1,0x44,0x8f,0xaf,
+    0x80, 0x0f, 0x0e, 0xa1, 0x76, 0xf6, 0xa1, 0x44, 0x8f, 0xaf,
-	0x7c,0x76,0xd3,0x87,0xbb,0xbb,0x83,0x10,0x88,0x01,
+    0x7c, 0x76, 0xd3, 0x87, 0xbb, 0xbb, 0x83, 0x10, 0x88, 0x01,
-	0x18,0x14,0xd1,0xd3,0x75,0x59,0x24,0xaa,0xf5,0x16,
+    0x18, 0x14, 0xd1, 0xd3, 0x75, 0x59, 0x24, 0xaa, 0xf5, 0x16,
-	0xa5,0xe9,0x9d,0xd1,0xcc,0xee,0xf4,0x15,0xd9,0xc5,
+    0xa5, 0xe9, 0x9d, 0xd1, 0xcc, 0xee, 0xf4, 0x15, 0xd9, 0xc5,
-	0x7e,0x27,0xe9,0x44,0x49,0x06,0x72,0xb9,0xfc,0xd3,
+    0x7e, 0x27, 0xe9, 0x44, 0x49, 0x06, 0x72, 0xb9, 0xfc, 0xd3,
-	0x8a,0xc4,0x2c,0x36,0x7d,0x12,0x9b,0x5a,0xaa,0xdc,
+    0x8a, 0xc4, 0x2c, 0x36, 0x7d, 0x12, 0x9b, 0x5a, 0xaa, 0xdc,
-	0x85,0xee,0x6e,0xad,0x54,0xb3,0xf4,0xfc,0x31,0xa1,
+    0x85, 0xee, 0x6e, 0xad, 0x54, 0xb3, 0xf4, 0xfc, 0x31, 0xa1,
-	0x06,0x3a,0x70,0x57,0x0c,0xf3,0x95,0x5b,0x3e,0xe8,
+    0x06, 0x3a, 0x70, 0x57, 0x0c, 0xf3, 0x95, 0x5b, 0x3e, 0xe8,
-	0xfd,0x1a,0x4f,0xf6,0x78,0x93,0x46,0x6a,0xd7,0x31,
+    0xfd, 0x1a, 0x4f, 0xf6, 0x78, 0x93, 0x46, 0x6a, 0xd7, 0x31,
-	0xb4,0x84,0x64,0x85,0x09,0x38,0x89,0x92,0x94,0x1c,
+    0xb4, 0x84, 0x64, 0x85, 0x09, 0x38, 0x89, 0x92, 0x94, 0x1c,
-	0xbf,0xe2,0x3c,0x2a,0xe0,0xff,0x99,0xa3,0xf0,0x2b,
+    0xbf, 0xe2, 0x3c, 0x2a, 0xe0, 0xff, 0x99, 0xa3, 0xf0, 0x2b,
-	0x31,0xc2,0x36,0xcd,0x60,0xbf,0x9d,0x2d,0x74,0x32,
+    0x31, 0xc2, 0x36, 0xcd, 0x60, 0xbf, 0x9d, 0x2d, 0x74, 0x32,
-	0xe8,0x9c,0x93,0x6e,0xbb,0x91,0x7b,0xfd,0xd9,0x02,
+    0xe8, 0x9c, 0x93, 0x6e, 0xbb, 0x91, 0x7b, 0xfd, 0xd9, 0x02,
-	0x81,0x81,0x00,0xa2,0x71,0x25,0x38,0xeb,0x2a,0xe9,
+    0x81, 0x81, 0x00, 0xa2, 0x71, 0x25, 0x38, 0xeb, 0x2a, 0xe9,
-	0x37,0xcd,0xfe,0x44,0xce,0x90,0x3f,0x52,0x87,0x84,
+    0x37, 0xcd, 0xfe, 0x44, 0xce, 0x90, 0x3f, 0x52, 0x87, 0x84,
-	0x52,0x1b,0xae,0x8d,0x22,0x94,0xce,0x38,0xe6,0x04,
+    0x52, 0x1b, 0xae, 0x8d, 0x22, 0x94, 0xce, 0x38, 0xe6, 0x04,
-	0x88,0x76,0x85,0x9a,0xd3,0x14,0x09,0xe5,0x69,0x9a,
+    0x88, 0x76, 0x85, 0x9a, 0xd3, 0x14, 0x09, 0xe5, 0x69, 0x9a,
-	0xff,0x58,0x92,0x02,0x6a,0x7d,0x7c,0x1e,0x2c,0xfd,
+    0xff, 0x58, 0x92, 0x02, 0x6a, 0x7d, 0x7c, 0x1e, 0x2c, 0xfd,
-	0xa8,0xca,0x32,0x14,0x4f,0x0d,0x84,0x0d,0x37,0x43,
+    0xa8, 0xca, 0x32, 0x14, 0x4f, 0x0d, 0x84, 0x0d, 0x37, 0x43,
-	0xbf,0xe4,0x5d,0x12,0xc8,0x24,0x91,0x27,0x8d,0x46,
+    0xbf, 0xe4, 0x5d, 0x12, 0xc8, 0x24, 0x91, 0x27, 0x8d, 0x46,
-	0xd9,0x54,0x53,0xe7,0x62,0x71,0xa8,0x2b,0x71,0x41,
+    0xd9, 0x54, 0x53, 0xe7, 0x62, 0x71, 0xa8, 0x2b, 0x71, 0x41,
-	0x8d,0x75,0xf8,0x3a,0xa0,0x61,0x29,0x46,0xa6,0xe5,
+    0x8d, 0x75, 0xf8, 0x3a, 0xa0, 0x61, 0x29, 0x46, 0xa6, 0xe5,
-	0x82,0xfa,0x3a,0xd9,0x08,0xfa,0xfc,0x63,0xfd,0x6b,
+    0x82, 0xfa, 0x3a, 0xd9, 0x08, 0xfa, 0xfc, 0x63, 0xfd, 0x6b,
-	0x30,0xbc,0xf4,0x4e,0x9e,0x8c,0x25,0x0c,0xb6,0x55,
+    0x30, 0xbc, 0xf4, 0x4e, 0x9e, 0x8c, 0x25, 0x0c, 0xb6, 0x55,
-	0xe7,0x3c,0xd4,0x4e,0x0b,0xfd,0x8b,0xc3,0x0e,0x1d,
+    0xe7, 0x3c, 0xd4, 0x4e, 0x0b, 0xfd, 0x8b, 0xc3, 0x0e, 0x1d,
-	0x9c,0x44,0x57,0x8f,0x1f,0x86,0xf7,0xd5,0x1b,0xe4,
+    0x9c, 0x44, 0x57, 0x8f, 0x1f, 0x86, 0xf7, 0xd5, 0x1b, 0xe4,
-	0x95,
+    0x95,
-	};
+};
 
-static unsigned char test4096[]={
+static unsigned char test4096[] = {
-	0x30,0x82,0x09,0x29,0x02,0x01,0x00,0x02,0x82,0x02,
+    0x30, 0x82, 0x09, 0x29, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02,
-	0x01,0x00,0xc0,0x71,0xac,0x1a,0x13,0x88,0x82,0x43,
+    0x01, 0x00, 0xc0, 0x71, 0xac, 0x1a, 0x13, 0x88, 0x82, 0x43,
-	0x3b,0x51,0x57,0x71,0x8d,0xb6,0x2b,0x82,0x65,0x21,
+    0x3b, 0x51, 0x57, 0x71, 0x8d, 0xb6, 0x2b, 0x82, 0x65, 0x21,
-	0x53,0x5f,0x28,0x29,0x4f,0x8d,0x7c,0x8a,0xb9,0x44,
+    0x53, 0x5f, 0x28, 0x29, 0x4f, 0x8d, 0x7c, 0x8a, 0xb9, 0x44,
-	0xb3,0x28,0x41,0x4f,0xd3,0xfa,0x6a,0xf8,0xb9,0x28,
+    0xb3, 0x28, 0x41, 0x4f, 0xd3, 0xfa, 0x6a, 0xf8, 0xb9, 0x28,
-	0x50,0x39,0x67,0x53,0x2c,0x3c,0xd7,0xcb,0x96,0x41,
+    0x50, 0x39, 0x67, 0x53, 0x2c, 0x3c, 0xd7, 0xcb, 0x96, 0x41,
-	0x40,0x32,0xbb,0xeb,0x70,0xae,0x1f,0xb0,0x65,0xf7,
+    0x40, 0x32, 0xbb, 0xeb, 0x70, 0xae, 0x1f, 0xb0, 0x65, 0xf7,
-	0x3a,0xd9,0x22,0xfd,0x10,0xae,0xbd,0x02,0xe2,0xdd,
+    0x3a, 0xd9, 0x22, 0xfd, 0x10, 0xae, 0xbd, 0x02, 0xe2, 0xdd,
-	0xf3,0xc2,0x79,0x3c,0xc6,0xfc,0x75,0xbb,0xaf,0x4e,
+    0xf3, 0xc2, 0x79, 0x3c, 0xc6, 0xfc, 0x75, 0xbb, 0xaf, 0x4e,
-	0x3a,0x36,0xc2,0x4f,0xea,0x25,0xdf,0x13,0x16,0x4b,
+    0x3a, 0x36, 0xc2, 0x4f, 0xea, 0x25, 0xdf, 0x13, 0x16, 0x4b,
-	0x20,0xfe,0x4b,0x69,0x16,0xc4,0x7f,0x1a,0x43,0xa6,
+    0x20, 0xfe, 0x4b, 0x69, 0x16, 0xc4, 0x7f, 0x1a, 0x43, 0xa6,
-	0x17,0x1b,0xb9,0x0a,0xf3,0x09,0x86,0x28,0x89,0xcf,
+    0x17, 0x1b, 0xb9, 0x0a, 0xf3, 0x09, 0x86, 0x28, 0x89, 0xcf,
-	0x2c,0xd0,0xd4,0x81,0xaf,0xc6,0x6d,0xe6,0x21,0x8d,
+    0x2c, 0xd0, 0xd4, 0x81, 0xaf, 0xc6, 0x6d, 0xe6, 0x21, 0x8d,
-	0xee,0xef,0xea,0xdc,0xb7,0xc6,0x3b,0x63,0x9f,0x0e,
+    0xee, 0xef, 0xea, 0xdc, 0xb7, 0xc6, 0x3b, 0x63, 0x9f, 0x0e,
-	0xad,0x89,0x78,0x23,0x18,0xbf,0x70,0x7e,0x84,0xe0,
+    0xad, 0x89, 0x78, 0x23, 0x18, 0xbf, 0x70, 0x7e, 0x84, 0xe0,
-	0x37,0xec,0xdb,0x8e,0x9c,0x3e,0x6a,0x19,0xcc,0x99,
+    0x37, 0xec, 0xdb, 0x8e, 0x9c, 0x3e, 0x6a, 0x19, 0xcc, 0x99,
-	0x72,0xe6,0xb5,0x7d,0x6d,0xfa,0xe5,0xd3,0xe4,0x90,
+    0x72, 0xe6, 0xb5, 0x7d, 0x6d, 0xfa, 0xe5, 0xd3, 0xe4, 0x90,
-	0xb5,0xb2,0xb2,0x12,0x70,0x4e,0xca,0xf8,0x10,0xf8,
+    0xb5, 0xb2, 0xb2, 0x12, 0x70, 0x4e, 0xca, 0xf8, 0x10, 0xf8,
-	0xa3,0x14,0xc2,0x48,0x19,0xeb,0x60,0x99,0xbb,0x2a,
+    0xa3, 0x14, 0xc2, 0x48, 0x19, 0xeb, 0x60, 0x99, 0xbb, 0x2a,
-	0x1f,0xb1,0x7a,0xb1,0x3d,0x24,0xfb,0xa0,0x29,0xda,
+    0x1f, 0xb1, 0x7a, 0xb1, 0x3d, 0x24, 0xfb, 0xa0, 0x29, 0xda,
-	0xbd,0x1b,0xd7,0xa4,0xbf,0xef,0x60,0x2d,0x22,0xca,
+    0xbd, 0x1b, 0xd7, 0xa4, 0xbf, 0xef, 0x60, 0x2d, 0x22, 0xca,
-	0x65,0x98,0xf1,0xc4,0xe1,0xc9,0x02,0x6b,0x16,0x28,
+    0x65, 0x98, 0xf1, 0xc4, 0xe1, 0xc9, 0x02, 0x6b, 0x16, 0x28,
-	0x2f,0xa1,0xaa,0x79,0x00,0xda,0xdc,0x7c,0x43,0xf7,
+    0x2f, 0xa1, 0xaa, 0x79, 0x00, 0xda, 0xdc, 0x7c, 0x43, 0xf7,
-	0x42,0x3c,0xa0,0xef,0x68,0xf7,0xdf,0xb9,0x69,0xfb,
+    0x42, 0x3c, 0xa0, 0xef, 0x68, 0xf7, 0xdf, 0xb9, 0x69, 0xfb,
-	0x8e,0x01,0xed,0x01,0x42,0xb5,0x4e,0x57,0xa6,0x26,
+    0x8e, 0x01, 0xed, 0x01, 0x42, 0xb5, 0x4e, 0x57, 0xa6, 0x26,
-	0xb8,0xd0,0x7b,0x56,0x6d,0x03,0xc6,0x40,0x8c,0x8c,
+    0xb8, 0xd0, 0x7b, 0x56, 0x6d, 0x03, 0xc6, 0x40, 0x8c, 0x8c,
-	0x2a,0x55,0xd7,0x9c,0x35,0x00,0x94,0x93,0xec,0x03,
+    0x2a, 0x55, 0xd7, 0x9c, 0x35, 0x00, 0x94, 0x93, 0xec, 0x03,
-	0xeb,0x22,0xef,0x77,0xbb,0x79,0x13,0x3f,0x15,0xa1,
+    0xeb, 0x22, 0xef, 0x77, 0xbb, 0x79, 0x13, 0x3f, 0x15, 0xa1,
-	0x8f,0xca,0xdf,0xfd,0xd3,0xb8,0xe1,0xd4,0xcc,0x09,
+    0x8f, 0xca, 0xdf, 0xfd, 0xd3, 0xb8, 0xe1, 0xd4, 0xcc, 0x09,
-	0x3f,0x3c,0x2c,0xdb,0xd1,0x49,0x7f,0x38,0x07,0x83,
+    0x3f, 0x3c, 0x2c, 0xdb, 0xd1, 0x49, 0x7f, 0x38, 0x07, 0x83,
-	0x6d,0xeb,0x08,0x66,0xe9,0x06,0x44,0x12,0xac,0x95,
+    0x6d, 0xeb, 0x08, 0x66, 0xe9, 0x06, 0x44, 0x12, 0xac, 0x95,
-	0x22,0x90,0x23,0x67,0xd4,0x08,0xcc,0xf4,0xb7,0xdc,
+    0x22, 0x90, 0x23, 0x67, 0xd4, 0x08, 0xcc, 0xf4, 0xb7, 0xdc,
-	0xcc,0x87,0xd4,0xac,0x69,0x35,0x4c,0xb5,0x39,0x36,
+    0xcc, 0x87, 0xd4, 0xac, 0x69, 0x35, 0x4c, 0xb5, 0x39, 0x36,
-	0xcd,0xa4,0xd2,0x95,0xca,0x0d,0xc5,0xda,0xc2,0xc5,
+    0xcd, 0xa4, 0xd2, 0x95, 0xca, 0x0d, 0xc5, 0xda, 0xc2, 0xc5,
-	0x22,0x32,0x28,0x08,0xe3,0xd2,0x8b,0x38,0x30,0xdc,
+    0x22, 0x32, 0x28, 0x08, 0xe3, 0xd2, 0x8b, 0x38, 0x30, 0xdc,
-	0x8c,0x75,0x4f,0x6a,0xec,0x7a,0xac,0x16,0x3e,0xa8,
+    0x8c, 0x75, 0x4f, 0x6a, 0xec, 0x7a, 0xac, 0x16, 0x3e, 0xa8,
-	0xd4,0x6a,0x45,0xe1,0xa8,0x4f,0x2e,0x80,0x34,0xaa,
+    0xd4, 0x6a, 0x45, 0xe1, 0xa8, 0x4f, 0x2e, 0x80, 0x34, 0xaa,
-	0x54,0x1b,0x02,0x95,0x7d,0x8a,0x6d,0xcc,0x79,0xca,
+    0x54, 0x1b, 0x02, 0x95, 0x7d, 0x8a, 0x6d, 0xcc, 0x79, 0xca,
-	0xf2,0xa4,0x2e,0x8d,0xfb,0xfe,0x15,0x51,0x10,0x0e,
+    0xf2, 0xa4, 0x2e, 0x8d, 0xfb, 0xfe, 0x15, 0x51, 0x10, 0x0e,
-	0x4d,0x88,0xb1,0xc7,0xf4,0x79,0xdb,0xf0,0xb4,0x56,
+    0x4d, 0x88, 0xb1, 0xc7, 0xf4, 0x79, 0xdb, 0xf0, 0xb4, 0x56,
-	0x44,0x37,0xca,0x5a,0xc1,0x8c,0x48,0xac,0xae,0x48,
+    0x44, 0x37, 0xca, 0x5a, 0xc1, 0x8c, 0x48, 0xac, 0xae, 0x48,
-	0x80,0x83,0x01,0x3f,0xde,0xd9,0xd3,0x2c,0x51,0x46,
+    0x80, 0x83, 0x01, 0x3f, 0xde, 0xd9, 0xd3, 0x2c, 0x51, 0x46,
-	0xb1,0x41,0xb6,0xc6,0x91,0x72,0xf9,0x83,0x55,0x1b,
+    0xb1, 0x41, 0xb6, 0xc6, 0x91, 0x72, 0xf9, 0x83, 0x55, 0x1b,
-	0x8c,0xba,0xf3,0x73,0xe5,0x2c,0x74,0x50,0x3a,0xbe,
+    0x8c, 0xba, 0xf3, 0x73, 0xe5, 0x2c, 0x74, 0x50, 0x3a, 0xbe,
-	0xc5,0x2f,0xa7,0xb2,0x6d,0x8c,0x9e,0x13,0x77,0xa3,
+    0xc5, 0x2f, 0xa7, 0xb2, 0x6d, 0x8c, 0x9e, 0x13, 0x77, 0xa3,
-	0x13,0xcd,0x6d,0x8c,0x45,0xe1,0xfc,0x0b,0xb7,0x69,
+    0x13, 0xcd, 0x6d, 0x8c, 0x45, 0xe1, 0xfc, 0x0b, 0xb7, 0x69,
-	0xe9,0x27,0xbc,0x65,0xc3,0xfa,0x9b,0xd0,0xef,0xfe,
+    0xe9, 0x27, 0xbc, 0x65, 0xc3, 0xfa, 0x9b, 0xd0, 0xef, 0xfe,
-	0xe8,0x1f,0xb3,0x5e,0x34,0xf4,0x8c,0xea,0xfc,0xd3,
+    0xe8, 0x1f, 0xb3, 0x5e, 0x34, 0xf4, 0x8c, 0xea, 0xfc, 0xd3,
-	0x81,0xbf,0x3d,0x30,0xb2,0xb4,0x01,0xe8,0x43,0x0f,
+    0x81, 0xbf, 0x3d, 0x30, 0xb2, 0xb4, 0x01, 0xe8, 0x43, 0x0f,
-	0xba,0x02,0x23,0x42,0x76,0x82,0x31,0x73,0x91,0xed,
+    0xba, 0x02, 0x23, 0x42, 0x76, 0x82, 0x31, 0x73, 0x91, 0xed,
-	0x07,0x46,0x61,0x0d,0x39,0x83,0x40,0xce,0x7a,0xd4,
+    0x07, 0x46, 0x61, 0x0d, 0x39, 0x83, 0x40, 0xce, 0x7a, 0xd4,
-	0xdb,0x80,0x2c,0x1f,0x0d,0xd1,0x34,0xd4,0x92,0xe3,
+    0xdb, 0x80, 0x2c, 0x1f, 0x0d, 0xd1, 0x34, 0xd4, 0x92, 0xe3,
-	0xd4,0xf1,0xc2,0x01,0x02,0x03,0x01,0x00,0x01,0x02,
+    0xd4, 0xf1, 0xc2, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-	0x82,0x02,0x01,0x00,0x97,0x6c,0xda,0x6e,0xea,0x4f,
+    0x82, 0x02, 0x01, 0x00, 0x97, 0x6c, 0xda, 0x6e, 0xea, 0x4f,
-	0xcf,0xaf,0xf7,0x4c,0xd9,0xf1,0x90,0x00,0x77,0xdb,
+    0xcf, 0xaf, 0xf7, 0x4c, 0xd9, 0xf1, 0x90, 0x00, 0x77, 0xdb,
-	0xf2,0x97,0x76,0x72,0xb9,0xb7,0x47,0xd1,0x9c,0xdd,
+    0xf2, 0x97, 0x76, 0x72, 0xb9, 0xb7, 0x47, 0xd1, 0x9c, 0xdd,
-	0xcb,0x4a,0x33,0x6e,0xc9,0x75,0x76,0xe6,0xe4,0xa5,
+    0xcb, 0x4a, 0x33, 0x6e, 0xc9, 0x75, 0x76, 0xe6, 0xe4, 0xa5,
-	0x31,0x8c,0x77,0x13,0xb4,0x29,0xcd,0xf5,0x52,0x17,
+    0x31, 0x8c, 0x77, 0x13, 0xb4, 0x29, 0xcd, 0xf5, 0x52, 0x17,
-	0xef,0xf3,0x08,0x00,0xe3,0xbd,0x2e,0xbc,0xd4,0x52,
+    0xef, 0xf3, 0x08, 0x00, 0xe3, 0xbd, 0x2e, 0xbc, 0xd4, 0x52,
-	0x88,0xe9,0x30,0x75,0x0b,0x02,0xf5,0xcd,0x89,0x0c,
+    0x88, 0xe9, 0x30, 0x75, 0x0b, 0x02, 0xf5, 0xcd, 0x89, 0x0c,
-	0x6c,0x57,0x19,0x27,0x3d,0x1e,0x85,0xb4,0xc1,0x2f,
+    0x6c, 0x57, 0x19, 0x27, 0x3d, 0x1e, 0x85, 0xb4, 0xc1, 0x2f,
-	0x1d,0x92,0x00,0x5c,0x76,0x29,0x4b,0xa4,0xe1,0x12,
+    0x1d, 0x92, 0x00, 0x5c, 0x76, 0x29, 0x4b, 0xa4, 0xe1, 0x12,
-	0xb3,0xc8,0x09,0xfe,0x0e,0x78,0x72,0x61,0xcb,0x61,
+    0xb3, 0xc8, 0x09, 0xfe, 0x0e, 0x78, 0x72, 0x61, 0xcb, 0x61,
-	0x6f,0x39,0x91,0x95,0x4e,0xd5,0x3e,0xc7,0x8f,0xb8,
+    0x6f, 0x39, 0x91, 0x95, 0x4e, 0xd5, 0x3e, 0xc7, 0x8f, 0xb8,
-	0xf6,0x36,0xfe,0x9c,0x93,0x9a,0x38,0x25,0x7a,0xf4,
+    0xf6, 0x36, 0xfe, 0x9c, 0x93, 0x9a, 0x38, 0x25, 0x7a, 0xf4,
-	0x4a,0x12,0xd4,0xa0,0x13,0xbd,0xf9,0x1d,0x12,0x3e,
+    0x4a, 0x12, 0xd4, 0xa0, 0x13, 0xbd, 0xf9, 0x1d, 0x12, 0x3e,
-	0x21,0x39,0xfb,0x72,0xe0,0x05,0x3d,0xc3,0xe5,0x50,
+    0x21, 0x39, 0xfb, 0x72, 0xe0, 0x05, 0x3d, 0xc3, 0xe5, 0x50,
-	0xa8,0x5d,0x85,0xa3,0xea,0x5f,0x1c,0xb2,0x3f,0xea,
+    0xa8, 0x5d, 0x85, 0xa3, 0xea, 0x5f, 0x1c, 0xb2, 0x3f, 0xea,
-	0x6d,0x03,0x91,0x55,0xd8,0x19,0x0a,0x21,0x12,0x16,
+    0x6d, 0x03, 0x91, 0x55, 0xd8, 0x19, 0x0a, 0x21, 0x12, 0x16,
-	0xd9,0x12,0xc4,0xe6,0x07,0x18,0x5b,0x26,0xa4,0xae,
+    0xd9, 0x12, 0xc4, 0xe6, 0x07, 0x18, 0x5b, 0x26, 0xa4, 0xae,
-	0xed,0x2b,0xb7,0xa6,0xed,0xf8,0xad,0xec,0x77,0xe6,
+    0xed, 0x2b, 0xb7, 0xa6, 0xed, 0xf8, 0xad, 0xec, 0x77, 0xe6,
-	0x7f,0x4f,0x76,0x00,0xc0,0xfa,0x15,0x92,0xb4,0x2c,
+    0x7f, 0x4f, 0x76, 0x00, 0xc0, 0xfa, 0x15, 0x92, 0xb4, 0x2c,
-	0x22,0xc2,0xeb,0x6a,0xad,0x14,0x05,0xb2,0xe5,0x8a,
+    0x22, 0xc2, 0xeb, 0x6a, 0xad, 0x14, 0x05, 0xb2, 0xe5, 0x8a,
-	0x9e,0x85,0x83,0xcc,0x04,0xf1,0x56,0x78,0x44,0x5e,
+    0x9e, 0x85, 0x83, 0xcc, 0x04, 0xf1, 0x56, 0x78, 0x44, 0x5e,
-	0xde,0xe0,0x60,0x1a,0x65,0x79,0x31,0x23,0x05,0xbb,
+    0xde, 0xe0, 0x60, 0x1a, 0x65, 0x79, 0x31, 0x23, 0x05, 0xbb,
-	0x01,0xff,0xdd,0x2e,0xb7,0xb3,0xaa,0x74,0xe0,0xa5,
+    0x01, 0xff, 0xdd, 0x2e, 0xb7, 0xb3, 0xaa, 0x74, 0xe0, 0xa5,
-	0x94,0xaf,0x4b,0xde,0x58,0x0f,0x55,0xde,0x33,0xf6,
+    0x94, 0xaf, 0x4b, 0xde, 0x58, 0x0f, 0x55, 0xde, 0x33, 0xf6,
-	0xe3,0xd6,0x34,0x36,0x57,0xd6,0x79,0x91,0x2e,0xbe,
+    0xe3, 0xd6, 0x34, 0x36, 0x57, 0xd6, 0x79, 0x91, 0x2e, 0xbe,
-	0x3b,0xd9,0x4e,0xb6,0x9d,0x21,0x5c,0xd3,0x48,0x14,
+    0x3b, 0xd9, 0x4e, 0xb6, 0x9d, 0x21, 0x5c, 0xd3, 0x48, 0x14,
-	0x7f,0x4a,0xc4,0x60,0xa9,0x29,0xf8,0x53,0x7f,0x88,
+    0x7f, 0x4a, 0xc4, 0x60, 0xa9, 0x29, 0xf8, 0x53, 0x7f, 0x88,
-	0x11,0x2d,0xb5,0xc5,0x2d,0x6f,0xee,0x85,0x0b,0xf7,
+    0x11, 0x2d, 0xb5, 0xc5, 0x2d, 0x6f, 0xee, 0x85, 0x0b, 0xf7,
-	0x8d,0x9a,0xbe,0xb0,0x42,0xf2,0x2e,0x71,0xaf,0x19,
+    0x8d, 0x9a, 0xbe, 0xb0, 0x42, 0xf2, 0x2e, 0x71, 0xaf, 0x19,
-	0x31,0x6d,0xec,0xcd,0x6f,0x2b,0x23,0xdf,0xb4,0x40,
+    0x31, 0x6d, 0xec, 0xcd, 0x6f, 0x2b, 0x23, 0xdf, 0xb4, 0x40,
-	0xaf,0x2c,0x0a,0xc3,0x1b,0x7d,0x7d,0x03,0x1d,0x4b,
+    0xaf, 0x2c, 0x0a, 0xc3, 0x1b, 0x7d, 0x7d, 0x03, 0x1d, 0x4b,
-	0xf3,0xb5,0xe0,0x85,0xd8,0xdf,0x91,0x6b,0x0a,0x69,
+    0xf3, 0xb5, 0xe0, 0x85, 0xd8, 0xdf, 0x91, 0x6b, 0x0a, 0x69,
-	0xf7,0xf2,0x69,0x66,0x5b,0xf1,0xcf,0x46,0x7d,0xe9,
+    0xf7, 0xf2, 0x69, 0x66, 0x5b, 0xf1, 0xcf, 0x46, 0x7d, 0xe9,
-	0x70,0xfa,0x6d,0x7e,0x75,0x4e,0xa9,0x77,0xe6,0x8c,
+    0x70, 0xfa, 0x6d, 0x7e, 0x75, 0x4e, 0xa9, 0x77, 0xe6, 0x8c,
-	0x02,0xf7,0x14,0x4d,0xa5,0x41,0x8f,0x3f,0xc1,0x62,
+    0x02, 0xf7, 0x14, 0x4d, 0xa5, 0x41, 0x8f, 0x3f, 0xc1, 0x62,
-	0x1e,0x71,0x5e,0x38,0xb4,0xd6,0xe6,0xe1,0x4b,0xc2,
+    0x1e, 0x71, 0x5e, 0x38, 0xb4, 0xd6, 0xe6, 0xe1, 0x4b, 0xc2,
-	0x2c,0x30,0x83,0x81,0x6f,0x49,0x2e,0x96,0xe6,0xc9,
+    0x2c, 0x30, 0x83, 0x81, 0x6f, 0x49, 0x2e, 0x96, 0xe6, 0xc9,
-	0x9a,0xf7,0x5d,0x09,0xa0,0x55,0x02,0xa5,0x3a,0x25,
+    0x9a, 0xf7, 0x5d, 0x09, 0xa0, 0x55, 0x02, 0xa5, 0x3a, 0x25,
-	0x23,0xd0,0x92,0xc3,0xa3,0xe3,0x0e,0x12,0x2f,0x4d,
+    0x23, 0xd0, 0x92, 0xc3, 0xa3, 0xe3, 0x0e, 0x12, 0x2f, 0x4d,
-	0xef,0xf3,0x55,0x5a,0xbe,0xe6,0x19,0x86,0x31,0xab,
+    0xef, 0xf3, 0x55, 0x5a, 0xbe, 0xe6, 0x19, 0x86, 0x31, 0xab,
-	0x75,0x9a,0xd3,0xf0,0x2c,0xc5,0x41,0x92,0xd9,0x1f,
+    0x75, 0x9a, 0xd3, 0xf0, 0x2c, 0xc5, 0x41, 0x92, 0xd9, 0x1f,
-	0x5f,0x11,0x8c,0x75,0x1c,0x63,0xd0,0x02,0x80,0x2c,
+    0x5f, 0x11, 0x8c, 0x75, 0x1c, 0x63, 0xd0, 0x02, 0x80, 0x2c,
-	0x68,0xcb,0x93,0xfb,0x51,0x73,0x49,0xb4,0x60,0xda,
+    0x68, 0xcb, 0x93, 0xfb, 0x51, 0x73, 0x49, 0xb4, 0x60, 0xda,
-	0xe2,0x26,0xaf,0xa9,0x46,0x12,0xb8,0xec,0x50,0xdd,
+    0xe2, 0x26, 0xaf, 0xa9, 0x46, 0x12, 0xb8, 0xec, 0x50, 0xdd,
-	0x12,0x06,0x5f,0xce,0x59,0xe6,0xf6,0x1c,0xe0,0x54,
+    0x12, 0x06, 0x5f, 0xce, 0x59, 0xe6, 0xf6, 0x1c, 0xe0, 0x54,
-	0x10,0xad,0xf6,0xcd,0x98,0xcc,0x0f,0xfb,0xcb,0x41,
+    0x10, 0xad, 0xf6, 0xcd, 0x98, 0xcc, 0x0f, 0xfb, 0xcb, 0x41,
-	0x14,0x9d,0xed,0xe4,0xb4,0x74,0x5f,0x09,0x60,0xc7,
+    0x14, 0x9d, 0xed, 0xe4, 0xb4, 0x74, 0x5f, 0x09, 0x60, 0xc7,
-	0x12,0xf6,0x7b,0x3c,0x8f,0xa7,0x20,0xbc,0xe4,0xb1,
+    0x12, 0xf6, 0x7b, 0x3c, 0x8f, 0xa7, 0x20, 0xbc, 0xe4, 0xb1,
-	0xef,0xeb,0xa4,0x93,0xc5,0x06,0xca,0x9a,0x27,0x9d,
+    0xef, 0xeb, 0xa4, 0x93, 0xc5, 0x06, 0xca, 0x9a, 0x27, 0x9d,
-	0x87,0xf3,0xde,0xca,0xe5,0xe7,0xf6,0x1c,0x01,0x65,
+    0x87, 0xf3, 0xde, 0xca, 0xe5, 0xe7, 0xf6, 0x1c, 0x01, 0x65,
-	0x5b,0xfb,0x19,0x79,0x6e,0x08,0x26,0xc5,0xc8,0x28,
+    0x5b, 0xfb, 0x19, 0x79, 0x6e, 0x08, 0x26, 0xc5, 0xc8, 0x28,
-	0x0e,0xb6,0x3b,0x07,0x08,0xc1,0x02,0x82,0x01,0x01,
+    0x0e, 0xb6, 0x3b, 0x07, 0x08, 0xc1, 0x02, 0x82, 0x01, 0x01,
-	0x00,0xe8,0x1c,0x73,0xa6,0xb8,0xe0,0x0e,0x6d,0x8d,
+    0x00, 0xe8, 0x1c, 0x73, 0xa6, 0xb8, 0xe0, 0x0e, 0x6d, 0x8d,
-	0x1b,0xb9,0x53,0xed,0x58,0x94,0xe6,0x1d,0x60,0x14,
+    0x1b, 0xb9, 0x53, 0xed, 0x58, 0x94, 0xe6, 0x1d, 0x60, 0x14,
-	0x5c,0x76,0x43,0xc4,0x58,0x19,0xc4,0x24,0xe8,0xbc,
+    0x5c, 0x76, 0x43, 0xc4, 0x58, 0x19, 0xc4, 0x24, 0xe8, 0xbc,
-	0x1b,0x3b,0x0b,0x13,0x24,0x45,0x54,0x0e,0xcc,0x37,
+    0x1b, 0x3b, 0x0b, 0x13, 0x24, 0x45, 0x54, 0x0e, 0xcc, 0x37,
-	0xf0,0xe0,0x63,0x7d,0xc3,0xf7,0xfb,0x81,0x74,0x81,
+    0xf0, 0xe0, 0x63, 0x7d, 0xc3, 0xf7, 0xfb, 0x81, 0x74, 0x81,
-	0xc4,0x0f,0x1a,0x21,0x48,0xaf,0xce,0xc1,0xc4,0x94,
+    0xc4, 0x0f, 0x1a, 0x21, 0x48, 0xaf, 0xce, 0xc1, 0xc4, 0x94,
-	0x18,0x06,0x44,0x8d,0xd3,0xd2,0x22,0x2d,0x2d,0x3e,
+    0x18, 0x06, 0x44, 0x8d, 0xd3, 0xd2, 0x22, 0x2d, 0x2d, 0x3e,
-	0x5a,0x31,0xdc,0x95,0x8e,0xf4,0x41,0xfc,0x58,0xc9,
+    0x5a, 0x31, 0xdc, 0x95, 0x8e, 0xf4, 0x41, 0xfc, 0x58, 0xc9,
-	0x40,0x92,0x17,0x5f,0xe3,0xda,0xac,0x9e,0x3f,0x1c,
+    0x40, 0x92, 0x17, 0x5f, 0xe3, 0xda, 0xac, 0x9e, 0x3f, 0x1c,
-	0x2a,0x6b,0x58,0x5f,0x48,0x78,0x20,0xb1,0xaf,0x24,
+    0x2a, 0x6b, 0x58, 0x5f, 0x48, 0x78, 0x20, 0xb1, 0xaf, 0x24,
-	0x9b,0x3c,0x20,0x8b,0x93,0x25,0x9e,0xe6,0x6b,0xbc,
+    0x9b, 0x3c, 0x20, 0x8b, 0x93, 0x25, 0x9e, 0xe6, 0x6b, 0xbc,
-	0x13,0x42,0x14,0x6c,0x36,0x31,0xff,0x7a,0xd1,0xc1,
+    0x13, 0x42, 0x14, 0x6c, 0x36, 0x31, 0xff, 0x7a, 0xd1, 0xc1,
-	0x1a,0x26,0x14,0x7f,0xa9,0x76,0xa7,0x0c,0xf8,0xcc,
+    0x1a, 0x26, 0x14, 0x7f, 0xa9, 0x76, 0xa7, 0x0c, 0xf8, 0xcc,
-	0xed,0x07,0x6a,0xd2,0xdf,0x62,0xee,0x0a,0x7c,0x84,
+    0xed, 0x07, 0x6a, 0xd2, 0xdf, 0x62, 0xee, 0x0a, 0x7c, 0x84,
-	0xcb,0x49,0x90,0xb2,0x03,0x0d,0xa2,0x82,0x06,0x77,
+    0xcb, 0x49, 0x90, 0xb2, 0x03, 0x0d, 0xa2, 0x82, 0x06, 0x77,
-	0xf1,0xcd,0x67,0xf2,0x47,0x21,0x02,0x3f,0x43,0x21,
+    0xf1, 0xcd, 0x67, 0xf2, 0x47, 0x21, 0x02, 0x3f, 0x43, 0x21,
-	0xf0,0x46,0x30,0x62,0x51,0x72,0xb1,0xe7,0x48,0xc6,
+    0xf0, 0x46, 0x30, 0x62, 0x51, 0x72, 0xb1, 0xe7, 0x48, 0xc6,
-	0x67,0x12,0xcd,0x9e,0xd6,0x15,0xe5,0x21,0xed,0xfa,
+    0x67, 0x12, 0xcd, 0x9e, 0xd6, 0x15, 0xe5, 0x21, 0xed, 0xfa,
-	0x8f,0x30,0xa6,0x41,0xfe,0xb6,0xfa,0x8f,0x34,0x14,
+    0x8f, 0x30, 0xa6, 0x41, 0xfe, 0xb6, 0xfa, 0x8f, 0x34, 0x14,
-	0x19,0xe8,0x11,0xf7,0xa5,0x77,0x3e,0xb7,0xf9,0x39,
+    0x19, 0xe8, 0x11, 0xf7, 0xa5, 0x77, 0x3e, 0xb7, 0xf9, 0x39,
-	0x07,0x8c,0x67,0x2a,0xab,0x7b,0x08,0xf8,0xb0,0x06,
+    0x07, 0x8c, 0x67, 0x2a, 0xab, 0x7b, 0x08, 0xf8, 0xb0, 0x06,
-	0xa8,0xea,0x2f,0x8f,0xfa,0xcc,0xcc,0x40,0xce,0xf3,
+    0xa8, 0xea, 0x2f, 0x8f, 0xfa, 0xcc, 0xcc, 0x40, 0xce, 0xf3,
-	0x70,0x4f,0x3f,0x7f,0xe2,0x0c,0xea,0x76,0x4a,0x35,
+    0x70, 0x4f, 0x3f, 0x7f, 0xe2, 0x0c, 0xea, 0x76, 0x4a, 0x35,
-	0x4e,0x47,0xad,0x2b,0xa7,0x97,0x5d,0x74,0x43,0x97,
+    0x4e, 0x47, 0xad, 0x2b, 0xa7, 0x97, 0x5d, 0x74, 0x43, 0x97,
-	0x90,0xd2,0xfb,0xd9,0xf9,0x96,0x01,0x33,0x05,0xed,
+    0x90, 0xd2, 0xfb, 0xd9, 0xf9, 0x96, 0x01, 0x33, 0x05, 0xed,
-	0x7b,0x03,0x05,0xad,0xf8,0x49,0x03,0x02,0x82,0x01,
+    0x7b, 0x03, 0x05, 0xad, 0xf8, 0x49, 0x03, 0x02, 0x82, 0x01,
-	0x01,0x00,0xd4,0x40,0x17,0x66,0x10,0x92,0x95,0xc8,
+    0x01, 0x00, 0xd4, 0x40, 0x17, 0x66, 0x10, 0x92, 0x95, 0xc8,
-	0xec,0x62,0xa9,0x7a,0xcb,0x93,0x8e,0xe6,0x53,0xd4,
+    0xec, 0x62, 0xa9, 0x7a, 0xcb, 0x93, 0x8e, 0xe6, 0x53, 0xd4,
-	0x80,0x48,0x27,0x4b,0x41,0xce,0x61,0xdf,0xbf,0x94,
+    0x80, 0x48, 0x27, 0x4b, 0x41, 0xce, 0x61, 0xdf, 0xbf, 0x94,
-	0xa4,0x3d,0x71,0x03,0x0b,0xed,0x25,0x71,0x98,0xa4,
+    0xa4, 0x3d, 0x71, 0x03, 0x0b, 0xed, 0x25, 0x71, 0x98, 0xa4,
-	0xd6,0xd5,0x4a,0x57,0xf5,0x6c,0x1b,0xda,0x21,0x7d,
+    0xd6, 0xd5, 0x4a, 0x57, 0xf5, 0x6c, 0x1b, 0xda, 0x21, 0x7d,
-	0x35,0x45,0xb3,0xf3,0x6a,0xd9,0xd3,0x43,0xe8,0x5c,
+    0x35, 0x45, 0xb3, 0xf3, 0x6a, 0xd9, 0xd3, 0x43, 0xe8, 0x5c,
-	0x54,0x1c,0x83,0x1b,0xb4,0x5f,0xf2,0x97,0x24,0x2e,
+    0x54, 0x1c, 0x83, 0x1b, 0xb4, 0x5f, 0xf2, 0x97, 0x24, 0x2e,
-	0xdc,0x40,0xde,0x92,0x23,0x59,0x8e,0xbc,0xd2,0xa1,
+    0xdc, 0x40, 0xde, 0x92, 0x23, 0x59, 0x8e, 0xbc, 0xd2, 0xa1,
-	0xf2,0xe0,0x4c,0xdd,0x0b,0xd1,0xe7,0xae,0x65,0xbc,
+    0xf2, 0xe0, 0x4c, 0xdd, 0x0b, 0xd1, 0xe7, 0xae, 0x65, 0xbc,
-	0xb5,0xf5,0x5b,0x98,0xe9,0xd7,0xc2,0xb7,0x0e,0x55,
+    0xb5, 0xf5, 0x5b, 0x98, 0xe9, 0xd7, 0xc2, 0xb7, 0x0e, 0x55,
-	0x71,0x0e,0x3c,0x0a,0x24,0x6b,0xa6,0xe6,0x14,0x61,
+    0x71, 0x0e, 0x3c, 0x0a, 0x24, 0x6b, 0xa6, 0xe6, 0x14, 0x61,
-	0x11,0xfd,0x33,0x42,0x99,0x2b,0x84,0x77,0x74,0x92,
+    0x11, 0xfd, 0x33, 0x42, 0x99, 0x2b, 0x84, 0x77, 0x74, 0x92,
-	0x91,0xf5,0x79,0x79,0xcf,0xad,0x8e,0x04,0xef,0x80,
+    0x91, 0xf5, 0x79, 0x79, 0xcf, 0xad, 0x8e, 0x04, 0xef, 0x80,
-	0x1e,0x57,0xf4,0x14,0xf5,0x35,0x09,0x74,0xb2,0x13,
+    0x1e, 0x57, 0xf4, 0x14, 0xf5, 0x35, 0x09, 0x74, 0xb2, 0x13,
-	0x71,0x58,0x6b,0xea,0x32,0x5d,0xf3,0xd3,0x76,0x48,
+    0x71, 0x58, 0x6b, 0xea, 0x32, 0x5d, 0xf3, 0xd3, 0x76, 0x48,
-	0x39,0x10,0x23,0x84,0x9d,0xbe,0x92,0x77,0x4a,0xed,
+    0x39, 0x10, 0x23, 0x84, 0x9d, 0xbe, 0x92, 0x77, 0x4a, 0xed,
-	0x70,0x3e,0x1a,0xa2,0x6c,0xb3,0x81,0x00,0xc3,0xc9,
+    0x70, 0x3e, 0x1a, 0xa2, 0x6c, 0xb3, 0x81, 0x00, 0xc3, 0xc9,
-	0xe4,0x52,0xc8,0x24,0x88,0x0c,0x41,0xad,0x87,0x5a,
+    0xe4, 0x52, 0xc8, 0x24, 0x88, 0x0c, 0x41, 0xad, 0x87, 0x5a,
-	0xea,0xa3,0x7a,0x85,0x1c,0x5e,0x31,0x7f,0xc3,0x35,
+    0xea, 0xa3, 0x7a, 0x85, 0x1c, 0x5e, 0x31, 0x7f, 0xc3, 0x35,
-	0xc6,0xfa,0x10,0xc8,0x75,0x10,0xc4,0x96,0x99,0xe7,
+    0xc6, 0xfa, 0x10, 0xc8, 0x75, 0x10, 0xc4, 0x96, 0x99, 0xe7,
-	0xfe,0x01,0xb4,0x74,0xdb,0xb4,0x11,0xc3,0xc8,0x8c,
+    0xfe, 0x01, 0xb4, 0x74, 0xdb, 0xb4, 0x11, 0xc3, 0xc8, 0x8c,
-	0xf6,0xf7,0x3b,0x66,0x50,0xfc,0xdb,0xeb,0xca,0x47,
+    0xf6, 0xf7, 0x3b, 0x66, 0x50, 0xfc, 0xdb, 0xeb, 0xca, 0x47,
-	0x85,0x89,0xe1,0x65,0xd9,0x62,0x34,0x3c,0x70,0xd8,
+    0x85, 0x89, 0xe1, 0x65, 0xd9, 0x62, 0x34, 0x3c, 0x70, 0xd8,
-	0x2e,0xb4,0x2f,0x65,0x3c,0x4a,0xa6,0x2a,0xe7,0xc7,
+    0x2e, 0xb4, 0x2f, 0x65, 0x3c, 0x4a, 0xa6, 0x2a, 0xe7, 0xc7,
-	0xd8,0x41,0x8f,0x8a,0x43,0xbf,0x42,0xf2,0x4d,0xbc,
+    0xd8, 0x41, 0x8f, 0x8a, 0x43, 0xbf, 0x42, 0xf2, 0x4d, 0xbc,
-	0xfc,0x9e,0x27,0x95,0xfb,0x75,0xff,0xab,0x02,0x82,
+    0xfc, 0x9e, 0x27, 0x95, 0xfb, 0x75, 0xff, 0xab, 0x02, 0x82,
-	0x01,0x00,0x41,0x2f,0x44,0x57,0x6d,0x12,0x17,0x5b,
+    0x01, 0x00, 0x41, 0x2f, 0x44, 0x57, 0x6d, 0x12, 0x17, 0x5b,
-	0x32,0xc6,0xb7,0x6c,0x57,0x7a,0x8a,0x0e,0x79,0xef,
+    0x32, 0xc6, 0xb7, 0x6c, 0x57, 0x7a, 0x8a, 0x0e, 0x79, 0xef,
-	0x72,0xa8,0x68,0xda,0x2d,0x38,0xe4,0xbb,0x8d,0xf6,
+    0x72, 0xa8, 0x68, 0xda, 0x2d, 0x38, 0xe4, 0xbb, 0x8d, 0xf6,
-	0x02,0x65,0xcf,0x56,0x13,0xe1,0x1a,0xcb,0x39,0x80,
+    0x02, 0x65, 0xcf, 0x56, 0x13, 0xe1, 0x1a, 0xcb, 0x39, 0x80,
-	0xa6,0xb1,0x32,0x03,0x1e,0xdd,0xbb,0x35,0xd9,0xac,
+    0xa6, 0xb1, 0x32, 0x03, 0x1e, 0xdd, 0xbb, 0x35, 0xd9, 0xac,
-	0x43,0x89,0x31,0x08,0x90,0x92,0x5e,0x35,0x3d,0x7b,
+    0x43, 0x89, 0x31, 0x08, 0x90, 0x92, 0x5e, 0x35, 0x3d, 0x7b,
-	0x9c,0x6f,0x86,0xcb,0x17,0xdd,0x85,0xe4,0xed,0x35,
+    0x9c, 0x6f, 0x86, 0xcb, 0x17, 0xdd, 0x85, 0xe4, 0xed, 0x35,
-	0x08,0x8e,0xc1,0xf4,0x05,0xd8,0x68,0xc6,0x63,0x3c,
+    0x08, 0x8e, 0xc1, 0xf4, 0x05, 0xd8, 0x68, 0xc6, 0x63, 0x3c,
-	0xf7,0xff,0xf7,0x47,0x33,0x39,0xc5,0x3e,0xb7,0x0e,
+    0xf7, 0xff, 0xf7, 0x47, 0x33, 0x39, 0xc5, 0x3e, 0xb7, 0x0e,
-	0x58,0x35,0x9d,0x81,0xea,0xf8,0x6a,0x2c,0x1c,0x5a,
+    0x58, 0x35, 0x9d, 0x81, 0xea, 0xf8, 0x6a, 0x2c, 0x1c, 0x5a,
-	0x68,0x78,0x64,0x11,0x6b,0xc1,0x3e,0x4e,0x7a,0xbd,
+    0x68, 0x78, 0x64, 0x11, 0x6b, 0xc1, 0x3e, 0x4e, 0x7a, 0xbd,
-	0x84,0xcb,0x0f,0xc2,0xb6,0x85,0x1d,0xd3,0x76,0xc5,
+    0x84, 0xcb, 0x0f, 0xc2, 0xb6, 0x85, 0x1d, 0xd3, 0x76, 0xc5,
-	0x93,0x6a,0x69,0x89,0x56,0x34,0xdc,0x4a,0x9b,0xbc,
+    0x93, 0x6a, 0x69, 0x89, 0x56, 0x34, 0xdc, 0x4a, 0x9b, 0xbc,
-	0xff,0xa8,0x0d,0x6e,0x35,0x9c,0x60,0xa7,0x23,0x30,
+    0xff, 0xa8, 0x0d, 0x6e, 0x35, 0x9c, 0x60, 0xa7, 0x23, 0x30,
-	0xc7,0x06,0x64,0x39,0x8b,0x94,0x89,0xee,0xba,0x7f,
+    0xc7, 0x06, 0x64, 0x39, 0x8b, 0x94, 0x89, 0xee, 0xba, 0x7f,
-	0x60,0x8d,0xfa,0xb6,0x97,0x76,0xdc,0x51,0x4a,0x3c,
+    0x60, 0x8d, 0xfa, 0xb6, 0x97, 0x76, 0xdc, 0x51, 0x4a, 0x3c,
-	0xeb,0x3a,0x14,0x2c,0x20,0x60,0x69,0x4a,0x86,0xfe,
+    0xeb, 0x3a, 0x14, 0x2c, 0x20, 0x60, 0x69, 0x4a, 0x86, 0xfe,
-	0x8c,0x21,0x84,0x49,0x54,0xb3,0x20,0xe1,0x01,0x7f,
+    0x8c, 0x21, 0x84, 0x49, 0x54, 0xb3, 0x20, 0xe1, 0x01, 0x7f,
-	0x58,0xdf,0x7f,0xb5,0x21,0x51,0x8c,0x47,0x9f,0x91,
+    0x58, 0xdf, 0x7f, 0xb5, 0x21, 0x51, 0x8c, 0x47, 0x9f, 0x91,
-	0xeb,0x97,0x3e,0xf2,0x54,0xcf,0x16,0x46,0xf9,0xd9,
+    0xeb, 0x97, 0x3e, 0xf2, 0x54, 0xcf, 0x16, 0x46, 0xf9, 0xd9,
-	0xb6,0xe7,0x64,0xc9,0xd0,0x54,0xea,0x2f,0xa1,0xcf,
+    0xb6, 0xe7, 0x64, 0xc9, 0xd0, 0x54, 0xea, 0x2f, 0xa1, 0xcf,
-	0xa5,0x7f,0x28,0x8d,0x84,0xec,0xd5,0x39,0x03,0x76,
+    0xa5, 0x7f, 0x28, 0x8d, 0x84, 0xec, 0xd5, 0x39, 0x03, 0x76,
-	0x5b,0x2d,0x8e,0x43,0xf2,0x01,0x24,0xc9,0x6f,0xc0,
+    0x5b, 0x2d, 0x8e, 0x43, 0xf2, 0x01, 0x24, 0xc9, 0x6f, 0xc0,
-	0xf5,0x69,0x6f,0x7d,0xb5,0x85,0xd2,0x5f,0x7f,0x78,
+    0xf5, 0x69, 0x6f, 0x7d, 0xb5, 0x85, 0xd2, 0x5f, 0x7f, 0x78,
-	0x40,0x07,0x7f,0x09,0x15,0xb5,0x1f,0x28,0x65,0x10,
+    0x40, 0x07, 0x7f, 0x09, 0x15, 0xb5, 0x1f, 0x28, 0x65, 0x10,
-	0xe4,0x19,0xa8,0xc6,0x9e,0x8d,0xdc,0xcb,0x02,0x82,
+    0xe4, 0x19, 0xa8, 0xc6, 0x9e, 0x8d, 0xdc, 0xcb, 0x02, 0x82,
-	0x01,0x00,0x13,0x01,0xee,0x56,0x80,0x93,0x70,0x00,
+    0x01, 0x00, 0x13, 0x01, 0xee, 0x56, 0x80, 0x93, 0x70, 0x00,
-	0x7f,0x52,0xd2,0x94,0xa1,0x98,0x84,0x4a,0x92,0x25,
+    0x7f, 0x52, 0xd2, 0x94, 0xa1, 0x98, 0x84, 0x4a, 0x92, 0x25,
-	0x4c,0x9b,0xa9,0x91,0x2e,0xc2,0x79,0xb7,0x5c,0xe3,
+    0x4c, 0x9b, 0xa9, 0x91, 0x2e, 0xc2, 0x79, 0xb7, 0x5c, 0xe3,
-	0xc5,0xd5,0x8e,0xc2,0x54,0x16,0x17,0xad,0x55,0x9b,
+    0xc5, 0xd5, 0x8e, 0xc2, 0x54, 0x16, 0x17, 0xad, 0x55, 0x9b,
-	0x25,0x76,0x12,0x63,0x50,0x22,0x2f,0x58,0x58,0x79,
+    0x25, 0x76, 0x12, 0x63, 0x50, 0x22, 0x2f, 0x58, 0x58, 0x79,
-	0x6b,0x04,0xe3,0xf9,0x9f,0x8f,0x04,0x41,0x67,0x94,
+    0x6b, 0x04, 0xe3, 0xf9, 0x9f, 0x8f, 0x04, 0x41, 0x67, 0x94,
-	0xa5,0x1f,0xac,0x8a,0x15,0x9c,0x26,0x10,0x6c,0xf8,
+    0xa5, 0x1f, 0xac, 0x8a, 0x15, 0x9c, 0x26, 0x10, 0x6c, 0xf8,
-	0x19,0x57,0x61,0xd7,0x3a,0x7d,0x31,0xb0,0x2d,0x38,
+    0x19, 0x57, 0x61, 0xd7, 0x3a, 0x7d, 0x31, 0xb0, 0x2d, 0x38,
-	0xbd,0x94,0x62,0xad,0xc4,0xfa,0x36,0x42,0x42,0xf0,
+    0xbd, 0x94, 0x62, 0xad, 0xc4, 0xfa, 0x36, 0x42, 0x42, 0xf0,
-	0x24,0x67,0x65,0x9d,0x8b,0x0b,0x7c,0x6f,0x82,0x44,
+    0x24, 0x67, 0x65, 0x9d, 0x8b, 0x0b, 0x7c, 0x6f, 0x82, 0x44,
-	0x1a,0x8c,0xc8,0xc9,0xab,0xbb,0x4c,0x45,0xfc,0x7b,
+    0x1a, 0x8c, 0xc8, 0xc9, 0xab, 0xbb, 0x4c, 0x45, 0xfc, 0x7b,
-	0x38,0xee,0x30,0xe1,0xfc,0xef,0x8d,0xbc,0x58,0xdf,
+    0x38, 0xee, 0x30, 0xe1, 0xfc, 0xef, 0x8d, 0xbc, 0x58, 0xdf,
-	0x2b,0x5d,0x0d,0x54,0xe0,0x49,0x4d,0x97,0x99,0x8f,
+    0x2b, 0x5d, 0x0d, 0x54, 0xe0, 0x49, 0x4d, 0x97, 0x99, 0x8f,
-	0x22,0xa8,0x83,0xbe,0x40,0xbb,0x50,0x2e,0x78,0x28,
+    0x22, 0xa8, 0x83, 0xbe, 0x40, 0xbb, 0x50, 0x2e, 0x78, 0x28,
-	0x0f,0x95,0x78,0x8c,0x8f,0x98,0x24,0x56,0xc2,0x97,
+    0x0f, 0x95, 0x78, 0x8c, 0x8f, 0x98, 0x24, 0x56, 0xc2, 0x97,
-	0xf3,0x2c,0x43,0xd2,0x03,0x82,0x66,0x81,0x72,0x5f,
+    0xf3, 0x2c, 0x43, 0xd2, 0x03, 0x82, 0x66, 0x81, 0x72, 0x5f,
-	0x53,0x16,0xec,0xb1,0xb1,0x04,0x5e,0x40,0x20,0x48,
+    0x53, 0x16, 0xec, 0xb1, 0xb1, 0x04, 0x5e, 0x40, 0x20, 0x48,
-	0x7b,0x3f,0x02,0x97,0x6a,0xeb,0x96,0x12,0x21,0x35,
+    0x7b, 0x3f, 0x02, 0x97, 0x6a, 0xeb, 0x96, 0x12, 0x21, 0x35,
-	0xfe,0x1f,0x47,0xc0,0x95,0xea,0xc5,0x8a,0x08,0x84,
+    0xfe, 0x1f, 0x47, 0xc0, 0x95, 0xea, 0xc5, 0x8a, 0x08, 0x84,
-	0x4f,0x5e,0x63,0x94,0x60,0x0f,0x71,0x5b,0x7f,0x4a,
+    0x4f, 0x5e, 0x63, 0x94, 0x60, 0x0f, 0x71, 0x5b, 0x7f, 0x4a,
-	0xec,0x4f,0x60,0xc6,0xba,0x4a,0x24,0xf1,0x20,0x8b,
+    0xec, 0x4f, 0x60, 0xc6, 0xba, 0x4a, 0x24, 0xf1, 0x20, 0x8b,
-	0xa7,0x2e,0x3a,0xce,0x8d,0xe0,0x27,0x1d,0xb5,0x8e,
+    0xa7, 0x2e, 0x3a, 0xce, 0x8d, 0xe0, 0x27, 0x1d, 0xb5, 0x8e,
-	0xb4,0x21,0xc5,0xe2,0xa6,0x16,0x0a,0x51,0x83,0x55,
+    0xb4, 0x21, 0xc5, 0xe2, 0xa6, 0x16, 0x0a, 0x51, 0x83, 0x55,
-	0x88,0xd1,0x30,0x11,0x63,0xd5,0xd7,0x8d,0xae,0x16,
+    0x88, 0xd1, 0x30, 0x11, 0x63, 0xd5, 0xd7, 0x8d, 0xae, 0x16,
-	0x12,0x82,0xc4,0x85,0x00,0x4e,0x27,0x83,0xa5,0x7c,
+    0x12, 0x82, 0xc4, 0x85, 0x00, 0x4e, 0x27, 0x83, 0xa5, 0x7c,
-	0x90,0x2e,0xe5,0xa2,0xa3,0xd3,0x4c,0x63,0x02,0x82,
+    0x90, 0x2e, 0xe5, 0xa2, 0xa3, 0xd3, 0x4c, 0x63, 0x02, 0x82,
-	0x01,0x01,0x00,0x86,0x08,0x98,0x98,0xa5,0x00,0x05,
+    0x01, 0x01, 0x00, 0x86, 0x08, 0x98, 0x98, 0xa5, 0x00, 0x05,
-	0x39,0x77,0xd9,0x66,0xb3,0xcf,0xca,0xa0,0x71,0xb3,
+    0x39, 0x77, 0xd9, 0x66, 0xb3, 0xcf, 0xca, 0xa0, 0x71, 0xb3,
-	0x50,0xce,0x3d,0xb1,0x93,0x95,0x35,0xc4,0xd4,0x2e,
+    0x50, 0xce, 0x3d, 0xb1, 0x93, 0x95, 0x35, 0xc4, 0xd4, 0x2e,
-	0x90,0xdf,0x0f,0xfc,0x60,0xc1,0x94,0x68,0x61,0x43,
+    0x90, 0xdf, 0x0f, 0xfc, 0x60, 0xc1, 0x94, 0x68, 0x61, 0x43,
-	0xca,0x9a,0x23,0x4a,0x1e,0x45,0x72,0x99,0xb5,0x1e,
+    0xca, 0x9a, 0x23, 0x4a, 0x1e, 0x45, 0x72, 0x99, 0xb5, 0x1e,
-	0x61,0x8d,0x77,0x0f,0xa0,0xbb,0xd7,0x77,0xb4,0x2a,
+    0x61, 0x8d, 0x77, 0x0f, 0xa0, 0xbb, 0xd7, 0x77, 0xb4, 0x2a,
-	0x15,0x11,0x88,0x2d,0xb3,0x56,0x61,0x5e,0x6a,0xed,
+    0x15, 0x11, 0x88, 0x2d, 0xb3, 0x56, 0x61, 0x5e, 0x6a, 0xed,
-	0xa4,0x46,0x4a,0x3f,0x50,0x11,0xd6,0xba,0xb6,0xd7,
+    0xa4, 0x46, 0x4a, 0x3f, 0x50, 0x11, 0xd6, 0xba, 0xb6, 0xd7,
-	0x95,0x65,0x53,0xc3,0xa1,0x8f,0xe0,0xa3,0xf5,0x1c,
+    0x95, 0x65, 0x53, 0xc3, 0xa1, 0x8f, 0xe0, 0xa3, 0xf5, 0x1c,
-	0xfd,0xaf,0x6e,0x43,0xd7,0x17,0xa7,0xd3,0x81,0x1b,
+    0xfd, 0xaf, 0x6e, 0x43, 0xd7, 0x17, 0xa7, 0xd3, 0x81, 0x1b,
-	0xa4,0xdf,0xe0,0x97,0x8a,0x46,0x03,0xd3,0x46,0x0e,
+    0xa4, 0xdf, 0xe0, 0x97, 0x8a, 0x46, 0x03, 0xd3, 0x46, 0x0e,
-	0x83,0x48,0x4e,0xd2,0x02,0xcb,0xc0,0xad,0x79,0x95,
+    0x83, 0x48, 0x4e, 0xd2, 0x02, 0xcb, 0xc0, 0xad, 0x79, 0x95,
-	0x8c,0x96,0xba,0x40,0x34,0x11,0x71,0x5e,0xe9,0x11,
+    0x8c, 0x96, 0xba, 0x40, 0x34, 0x11, 0x71, 0x5e, 0xe9, 0x11,
-	0xf9,0xc5,0x4a,0x5e,0x91,0x9d,0xf5,0x92,0x4f,0xeb,
+    0xf9, 0xc5, 0x4a, 0x5e, 0x91, 0x9d, 0xf5, 0x92, 0x4f, 0xeb,
-	0xc6,0x70,0x02,0x2d,0x3d,0x04,0xaa,0xe9,0x3a,0x8e,
+    0xc6, 0x70, 0x02, 0x2d, 0x3d, 0x04, 0xaa, 0xe9, 0x3a, 0x8e,
-	0xd5,0xa8,0xad,0xf7,0xce,0x0d,0x16,0xb2,0xec,0x0a,
+    0xd5, 0xa8, 0xad, 0xf7, 0xce, 0x0d, 0x16, 0xb2, 0xec, 0x0a,
-	0x9c,0xf5,0x94,0x39,0xb9,0x8a,0xfc,0x1e,0xf9,0xcc,
+    0x9c, 0xf5, 0x94, 0x39, 0xb9, 0x8a, 0xfc, 0x1e, 0xf9, 0xcc,
-	0xf2,0x5f,0x21,0x31,0x74,0x72,0x6b,0x64,0xae,0x35,
+    0xf2, 0x5f, 0x21, 0x31, 0x74, 0x72, 0x6b, 0x64, 0xae, 0x35,
-	0x61,0x8d,0x0d,0xcb,0xe7,0xda,0x39,0xca,0xf3,0x21,
+    0x61, 0x8d, 0x0d, 0xcb, 0xe7, 0xda, 0x39, 0xca, 0xf3, 0x21,
-	0x66,0x0b,0x95,0xd7,0x0a,0x7c,0xca,0xa1,0xa9,0x5a,
+    0x66, 0x0b, 0x95, 0xd7, 0x0a, 0x7c, 0xca, 0xa1, 0xa9, 0x5a,
-	0xe8,0xac,0xe0,0x71,0x54,0xaf,0x28,0xcf,0xd5,0x70,
+    0xe8, 0xac, 0xe0, 0x71, 0x54, 0xaf, 0x28, 0xcf, 0xd5, 0x70,
-	0x89,0xe0,0xf3,0x9e,0x43,0x6c,0x8d,0x7b,0x99,0x01,
+    0x89, 0xe0, 0xf3, 0x9e, 0x43, 0x6c, 0x8d, 0x7b, 0x99, 0x01,
-	0x68,0x4d,0xa1,0x45,0x46,0x0c,0x43,0xbc,0xcc,0x2c,
+    0x68, 0x4d, 0xa1, 0x45, 0x46, 0x0c, 0x43, 0xbc, 0xcc, 0x2c,
-	0xdd,0xc5,0x46,0xc8,0x4e,0x0e,0xbe,0xed,0xb9,0x26,
+    0xdd, 0xc5, 0x46, 0xc8, 0x4e, 0x0e, 0xbe, 0xed, 0xb9, 0x26,
-	0xab,0x2e,0xdb,0xeb,0x8f,0xff,0xdb,0xb0,0xc6,0x55,
+    0xab, 0x2e, 0xdb, 0xeb, 0x8f, 0xff, 0xdb, 0xb0, 0xc6, 0x55,
-	0xaf,0xf8,0x2a,0x91,0x9d,0x50,0x44,0x21,0x17,
+    0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
-	};
+};

apps/timeouts.h

@@ -1,7 +1,7 @@
 /* apps/timeouts.h */
-/* 
+/*
  * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
  */
 /* ====================================================================
  * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
@@ -11,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -58,10 +58,10 @@
  */
 
 #ifndef INCLUDED_TIMEOUTS_H
-#define INCLUDED_TIMEOUTS_H
+# define INCLUDED_TIMEOUTS_H
 
 /* numbers in us */
-#define DGRAM_RCV_TIMEOUT         250000
+# define DGRAM_RCV_TIMEOUT         250000
-#define DGRAM_SND_TIMEOUT         250000
+# define DGRAM_SND_TIMEOUT         250000
 
-#endif /* ! INCLUDED_TIMEOUTS_H */
+#endif                          /* ! INCLUDED_TIMEOUTS_H */

apps/verify.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -67,304 +67,310 @@
 #include <openssl/pem.h>
 
 #undef PROG
-#define PROG	verify_main
+#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;
+static int v_verbose = 0, vflags = 0;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	ENGINE *e = NULL;
+    ENGINE *e = NULL;
-	int i,ret=1, badarg = 0;
+    int i, ret = 1, badarg = 0;
-	int purpose = -1;
+    int purpose = -1;
-	char *CApath=NULL,*CAfile=NULL;
+    char *CApath = NULL, *CAfile = NULL;
-	char *untfile = NULL, *trustfile = NULL;
+    char *untfile = NULL, *trustfile = NULL;
-	STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
+    STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
-	X509_STORE *cert_ctx=NULL;
+    X509_STORE *cert_ctx = NULL;
-	X509_LOOKUP *lookup=NULL;
+    X509_LOOKUP *lookup = NULL;
-	X509_VERIFY_PARAM *vpm = NULL;
+    X509_VERIFY_PARAM *vpm = NULL;
 #ifndef OPENSSL_NO_ENGINE
-	char *engine=NULL;
+    char *engine = NULL;
 #endif
 
-	cert_ctx=X509_STORE_new();
+    cert_ctx = X509_STORE_new();
-	if (cert_ctx == NULL) goto end;
+    if (cert_ctx == NULL)
-	X509_STORE_set_verify_cb_func(cert_ctx,cb);
+        goto end;
+    X509_STORE_set_verify_cb_func(cert_ctx, cb);
 
-	ERR_load_crypto_strings();
+    ERR_load_crypto_strings();
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
+    if (!load_config(bio_err, NULL))
-		goto end;
+        goto end;
 
-	argc--;
+    argc--;
-	argv++;
+    argv++;
-	for (;;)
+    for (;;) {
-		{
+        if (argc >= 1) {
-		if (argc >= 1)
+            if (strcmp(*argv, "-CApath") == 0) {
-			{
+                if (argc-- < 1)
-			if (strcmp(*argv,"-CApath") == 0)
+                    goto end;
-				{
+                CApath = *(++argv);
-				if (argc-- < 1) goto end;
+            } else if (strcmp(*argv, "-CAfile") == 0) {
-				CApath= *(++argv);
+                if (argc-- < 1)
-				}
+                    goto end;
-			else if (strcmp(*argv,"-CAfile") == 0)
+                CAfile = *(++argv);
-				{
+            } else if (args_verify(&argv, &argc, &badarg, bio_err, &vpm)) {
-				if (argc-- < 1) goto end;
+                if (badarg)
-				CAfile= *(++argv);
+                    goto end;
-				}
+                continue;
-			else if (args_verify(&argv, &argc, &badarg, bio_err,
+            } else if (strcmp(*argv, "-untrusted") == 0) {
-									&vpm))
+                if (argc-- < 1)
-				{
+                    goto end;
-				if (badarg)
+                untfile = *(++argv);
-					goto end;
+            } else if (strcmp(*argv, "-trusted") == 0) {
-				continue;
+                if (argc-- < 1)
-				}
+                    goto end;
-			else if (strcmp(*argv,"-untrusted") == 0)
+                trustfile = *(++argv);
-				{
+            }
-				if (argc-- < 1) goto end;
-				untfile= *(++argv);
-				}
-			else if (strcmp(*argv,"-trusted") == 0)
-				{
-				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);
+                engine = *(++argv);
-				}
+            }
 #endif
-			else if (strcmp(*argv,"-help") == 0)
+            else if (strcmp(*argv, "-help") == 0)
-				goto end;
+                goto end;
-			else if (strcmp(*argv,"-verbose") == 0)
+            else if (strcmp(*argv, "-verbose") == 0)
-				v_verbose=1;
+                v_verbose = 1;
-			else if (argv[0][0] == '-')
+            else if (argv[0][0] == '-')
-				goto end;
+                goto end;
-			else
+            else
-				break;
+                break;
-			argc--;
+            argc--;
-			argv++;
+            argv++;
-			}
+        } else
-		else
+            break;
-			break;
+    }
-		}
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (vpm)
+    if (vpm)
-		X509_STORE_set1_param(cert_ctx, vpm);
+        X509_STORE_set1_param(cert_ctx, vpm);
 
-	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
+    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_file());
-	if (lookup == NULL) abort();
+    if (lookup == NULL)
-	if (CAfile) {
+        abort();
-		i=X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM);
+    if (CAfile) {
-		if(!i) {
+        i = X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM);
-			BIO_printf(bio_err, "Error loading file %s\n", CAfile);
+        if (!i) {
-			ERR_print_errors(bio_err);
+            BIO_printf(bio_err, "Error loading file %s\n", CAfile);
-			goto end;
+            ERR_print_errors(bio_err);
-		}
+            goto end;
-	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+        }
-		
+    } else
-	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir());
+        X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
-	if (lookup == NULL) abort();
-	if (CApath) {
-		i=X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM);
-		if(!i) {
-			BIO_printf(bio_err, "Error loading directory %s\n", CApath);
-			ERR_print_errors(bio_err);
-			goto end;
-		}
-	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
 
-	ERR_clear_error();
+    lookup = X509_STORE_add_lookup(cert_ctx, X509_LOOKUP_hash_dir());
+    if (lookup == NULL)
+        abort();
+    if (CApath) {
+        i = X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM);
+        if (!i) {
+            BIO_printf(bio_err, "Error loading directory %s\n", CApath);
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    } else
+        X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
 
-	if(untfile) {
+    ERR_clear_error();
-		if(!(untrusted = load_untrusted(untfile))) {
-			BIO_printf(bio_err, "Error loading untrusted file %s\n", untfile);
-			ERR_print_errors(bio_err);
-			goto end;
-		}
-	}
 
-	if(trustfile) {
+    if (untfile) {
-		if(!(trusted = load_untrusted(trustfile))) {
+        if (!(untrusted = load_untrusted(untfile))) {
-			BIO_printf(bio_err, "Error loading untrusted file %s\n", trustfile);
+            BIO_printf(bio_err, "Error loading untrusted file %s\n", untfile);
-			ERR_print_errors(bio_err);
+            ERR_print_errors(bio_err);
-			goto end;
+            goto end;
-		}
+        }
-	}
+    }
 
-	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose, e);
+    if (trustfile) {
-	else
+        if (!(trusted = load_untrusted(trustfile))) {
-		for (i=0; i<argc; i++)
+            BIO_printf(bio_err, "Error loading untrusted file %s\n",
-			check(cert_ctx,argv[i], untrusted, trusted, purpose, e);
+                       trustfile);
-	ret=0;
+            ERR_print_errors(bio_err);
-end:
+            goto end;
-	if (ret == 1) {
+        }
-		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+    }
+
+    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]");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," [-engine e]");
+        BIO_printf(bio_err, " [-engine e]");
 #endif
-		BIO_printf(bio_err," cert1 cert2 ...\n");
+        BIO_printf(bio_err, " cert1 cert2 ...\n");
-		BIO_printf(bio_err,"recognized usages:\n");
+        BIO_printf(bio_err, "recognized usages:\n");
-		for(i = 0; i < X509_PURPOSE_get_count(); i++) {
+        for (i = 0; i < X509_PURPOSE_get_count(); i++) {
-			X509_PURPOSE *ptmp;
+            X509_PURPOSE *ptmp;
-			ptmp = X509_PURPOSE_get0(i);
+            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_name(ptmp));
+                       X509_PURPOSE_get0_sname(ptmp),
-		}
+                       X509_PURPOSE_get0_name(ptmp));
-	}
+        }
-	if (vpm) X509_VERIFY_PARAM_free(vpm);
+    }
-	if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
+    if (vpm)
-	sk_X509_pop_free(untrusted, X509_free);
+        X509_VERIFY_PARAM_free(vpm);
-	sk_X509_pop_free(trusted, X509_free);
+    if (cert_ctx != NULL)
-	apps_shutdown();
+        X509_STORE_free(cert_ctx);
-	OPENSSL_EXIT(ret);
+    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;
+    X509 *x = NULL;
-	X509_STORE_CTX *csc;
+    int i = 0, ret = 0;
+    X509_STORE_CTX *csc;
 
-	x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
+    x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
-	if (x == NULL)
+    if (x == NULL)
-		goto end;
+        goto end;
-	fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);
+    fprintf(stdout, "%s: ", (file == NULL) ? "stdin" : file);
 
-	csc = X509_STORE_CTX_new();
+    csc = X509_STORE_CTX_new();
-	if (csc == NULL)
+    if (csc == NULL) {
-		{
+        ERR_print_errors(bio_err);
-		ERR_print_errors(bio_err);
+        goto end;
-		goto end;
+    }
-		}
+    X509_STORE_set_flags(ctx, vflags);
-	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;
-		ERR_print_errors(bio_err);
+    }
-		goto end;
+    if (tchain)
-		}
+        X509_STORE_CTX_trusted_stack(csc, tchain);
-	if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
+    if (purpose >= 0)
-	if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
+        X509_STORE_CTX_set_purpose(csc, purpose);
-	i=X509_verify_cert(csc);
+    i = X509_verify_cert(csc);
-	X509_STORE_CTX_free(csc);
+    X509_STORE_CTX_free(csc);
 
-	ret=0;
+    ret = 0;
-end:
+ end:
-	if (i)
+    if (i > 0) {
-		{
+        fprintf(stdout, "OK\n");
-		fprintf(stdout,"OK\n");
+        ret = 1;
-		ret=1;
+    } else
-		}
+        ERR_print_errors(bio_err);
-	else
+    if (x != NULL)
-		ERR_print_errors(bio_err);
+        X509_free(x);
-	if (x != NULL) X509_free(x);
 
-	return(ret);
+    return (ret);
-	}
+}
 
 static STACK_OF(X509) *load_untrusted(char *certfile)
 {
-	STACK_OF(X509_INFO) *sk=NULL;
+    STACK_OF(X509_INFO) *sk = NULL;
-	STACK_OF(X509) *stack=NULL, *ret=NULL;
+    STACK_OF(X509) *stack = NULL, *ret = NULL;
-	BIO *in=NULL;
+    BIO *in = NULL;
-	X509_INFO *xi;
+    X509_INFO *xi;
 
-	if(!(stack = sk_X509_new_null())) {
+    if (!(stack = sk_X509_new_null())) {
-		BIO_printf(bio_err,"memory allocation failure\n");
+        BIO_printf(bio_err, "memory allocation failure\n");
-		goto end;
+        goto end;
-	}
+    }
 
-	if(!(in=BIO_new_file(certfile, "r"))) {
+    if (!(in = BIO_new_file(certfile, "r"))) {
-		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
+        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
-		goto end;
+        goto end;
-	}
+    }
 
-	/* This loads from a file, a stack of x509/crl/pkey sets */
+    /* This loads from a file, a stack of x509/crl/pkey sets */
-	if(!(sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL))) {
+    if (!(sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL))) {
-		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
+        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
-		goto end;
+        goto end;
-	}
+    }
 
-	/* scan over it and pull out the certs */
+    /* 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);
-		xi=sk_X509_INFO_shift(sk);
+        if (xi->x509 != NULL) {
-		if (xi->x509 != NULL)
+            sk_X509_push(stack, xi->x509);
-			{
+            xi->x509 = NULL;
-			sk_X509_push(stack,xi->x509);
+        }
-			xi->x509=NULL;
+        X509_INFO_free(xi);
-			}
+    }
-		X509_INFO_free(xi);
+    if (!sk_X509_num(stack)) {
-		}
+        BIO_printf(bio_err, "no certificates in file, %s\n", certfile);
-	if(!sk_X509_num(stack)) {
+        sk_X509_free(stack);
-		BIO_printf(bio_err,"no certificates in file, %s\n",certfile);
+        goto end;
-		sk_X509_free(stack);
+    }
-		goto end;
+    ret = stack;
-	}
+ end:
-	ret=stack;
+    BIO_free(in);
-end:
+    sk_X509_INFO_free(sk);
-	BIO_free(in);
+    return (ret);
-	sk_X509_INFO_free(sk);
+}
-	return(ret);
-	}
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
-	{
+{
-	char buf[256];
+    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,
-			{
+                              sizeof buf);
-			X509_NAME_oneline(
+            printf("%s\n", buf);
-				X509_get_subject_name(ctx->current_cert),buf,
+        }
-				sizeof buf);
+        printf("error %d at %d depth lookup:%s\n", ctx->error,
-			printf("%s\n",buf);
+               ctx->error_depth, X509_verify_cert_error_string(ctx->error));
-			}
+        if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED)
-		printf("error %d at %d depth lookup:%s\n",ctx->error,
+            ok = 1;
-			ctx->error_depth,
+        /*
-			X509_verify_cert_error_string(ctx->error));
+         * since we are just checking the certificates, it is ok if they are
-		if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED) ok=1;
+         * self signed. But we should still warn the user.
-		/* since we are just checking the certificates, it is
+         */
-		 * ok if they are self signed. But we should still warn
+        if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
-		 * the user.
+            ok = 1;
- 		 */
+        /* Continue after extension errors too */
-		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
+        if (ctx->error == X509_V_ERR_INVALID_CA)
-		/* Continue after extension errors too */
+            ok = 1;
-		if (ctx->error == X509_V_ERR_INVALID_CA) ok=1;
+        if (ctx->error == X509_V_ERR_INVALID_NON_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_PATH_LENGTH_EXCEEDED)
-		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_INVALID_PURPOSE)
-		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_DEPTH_ZERO_SELF_SIGNED_CERT)
-		if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION) ok=1;
+            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)
+        if (ctx->error == X509_V_ERR_NO_EXPLICIT_POLICY)
-			policies_print(NULL, ctx);
+            policies_print(NULL, ctx);
-		return ok;
+        return ok;
-
-		}
-	if ((ctx->error == X509_V_OK) && (ok == 2))
-		policies_print(NULL, ctx);
-	if (!v_verbose)
-		ERR_clear_error();
-	return(ok);
-	}
 
+    }
+    if ((ctx->error == X509_V_OK) && (ok == 2))
+        policies_print(NULL, ctx);
+    if (!v_verbose)
+        ERR_clear_error();
+    return (ok);
+}

apps/version.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -133,85 +133,82 @@
 #endif
 
 #undef PROG
-#define PROG	version_main
+#define PROG    version_main
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
-	{
+{
-	int i,ret=0;
+    int i, ret = 0;
-	int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
+    int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
 
-	apps_startup();
+    apps_startup();
 
-	if (bio_err == NULL)
+    if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (argc == 1) 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)
+        if (strcmp(argv[i], "-v") == 0)
-			version=1;	
+            version = 1;
-		else if (strcmp(argv[i],"-b") == 0)
+        else if (strcmp(argv[i], "-b") == 0)
-			date=1;
+            date = 1;
-		else if (strcmp(argv[i],"-f") == 0)
+        else if (strcmp(argv[i], "-f") == 0)
-			cflags=1;
+            cflags = 1;
-		else if (strcmp(argv[i],"-o") == 0)
+        else if (strcmp(argv[i], "-o") == 0)
-			options=1;
+            options = 1;
-		else if (strcmp(argv[i],"-p") == 0)
+        else if (strcmp(argv[i], "-p") == 0)
-			platform=1;
+            platform = 1;
-		else if (strcmp(argv[i],"-d") == 0)
+        else if (strcmp(argv[i], "-d") == 0)
-			dir=1;
+            dir = 1;
-		else if (strcmp(argv[i],"-a") == 0)
+        else if (strcmp(argv[i], "-a") == 0)
-			date=version=cflags=options=platform=dir=1;
+            date = version = cflags = options = platform = dir = 1;
-		else
+        else {
-			{
+            BIO_printf(bio_err, "usage:version -[avbofpd]\n");
-			BIO_printf(bio_err,"usage:version -[avbofp]\n");
+            ret = 1;
-			ret=1;
+            goto end;
-			goto end;
+        }
-			}
+    }
-		}
 
-	if (version)
+    if (version) {
-		{
+        if (SSLeay() == SSLEAY_VERSION_NUMBER) {
-		if (SSLeay() == SSLEAY_VERSION_NUMBER)
+            printf("%s\n", SSLeay_version(SSLEAY_VERSION));
-			{
+        } else {
-			printf("%s\n",SSLeay_version(SSLEAY_VERSION));
+            printf("%s (Library: %s)\n",
-			}
+                   OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
-		else
+        }
-			{
+    }
-			printf("%s (Library: %s)\n",
+    if (date)
-				OPENSSL_VERSION_TEXT,
+        printf("%s\n", SSLeay_version(SSLEAY_BUILT_ON));
-				SSLeay_version(SSLEAY_VERSION));
+    if (platform)
-			}
+        printf("%s\n", SSLeay_version(SSLEAY_PLATFORM));
-		}
+    if (options) {
-	if (date)    printf("%s\n",SSLeay_version(SSLEAY_BUILT_ON));
+        printf("options:  ");
-	if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
+        printf("%s ", BN_options());
-	if (options) 
-		{
-		printf("options:  ");
-		printf("%s ",BN_options());
 #ifndef OPENSSL_NO_MD2
-		printf("%s ",MD2_options());
+        printf("%s ", MD2_options());
 #endif
 #ifndef OPENSSL_NO_RC4
-		printf("%s ",RC4_options());
+        printf("%s ", RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-		printf("%s ",DES_options());
+        printf("%s ", DES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
-		printf("%s ",idea_options());
+        printf("%s ", idea_options());
 #endif
 #ifndef OPENSSL_NO_BF
-		printf("%s ",BF_options());
+        printf("%s ", BF_options());
 #endif
-		printf("\n");
+        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));
-end:
+    if (dir)
-	apps_shutdown();
+        printf("%s\n", SSLeay_version(SSLEAY_DIR));
-	OPENSSL_EXIT(ret);
+ end:
-	}
+    apps_shutdown();
+    OPENSSL_EXIT(ret);
+}

apps/winrand.c

@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -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
@@ -67,82 +68,79 @@ LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 const char *filename;
 
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-        PSTR cmdline, int iCmdShow)
+                   PSTR cmdline, int iCmdShow)
-	{
+{
-	static char appname[] = "OpenSSL";
+    static char appname[] = "OpenSSL";
-	HWND hwnd;
+    HWND hwnd;
-	MSG msg;
+    MSG msg;
-	WNDCLASSEX wndclass;
+    WNDCLASSEX wndclass;
-        char buffer[200];
+    char buffer[200];
 
-        if (cmdline[0] == '\0')
+    if (cmdline[0] == '\0')
-                filename = RAND_file_name(buffer, sizeof buffer);
+        filename = RAND_file_name(buffer, sizeof buffer);
-        else
+    else
-                filename = cmdline;
+        filename = cmdline;
 
-        RAND_load_file(filename, -1);
+    RAND_load_file(filename, -1);
 
-	wndclass.cbSize = sizeof(wndclass);
+    wndclass.cbSize = sizeof(wndclass);
-	wndclass.style = CS_HREDRAW | CS_VREDRAW;
+    wndclass.style = CS_HREDRAW | CS_VREDRAW;
-	wndclass.lpfnWndProc = WndProc;
+    wndclass.lpfnWndProc = WndProc;
-	wndclass.cbClsExtra = 0;
+    wndclass.cbClsExtra = 0;
-	wndclass.cbWndExtra = 0;
+    wndclass.cbWndExtra = 0;
-	wndclass.hInstance = hInstance;
+    wndclass.hInstance = hInstance;
-	wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
-	wndclass.lpszMenuName = NULL;
+    wndclass.lpszMenuName = NULL;
-        wndclass.lpszClassName = appname;
+    wndclass.lpszClassName = appname;
-	wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
-	RegisterClassEx(&wndclass);
+    RegisterClassEx(&wndclass);
 
-        hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
+    hwnd = CreateWindow(appname, OPENSSL_VERSION_TEXT,
-		WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
+                        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);
+    ShowWindow(hwnd, iCmdShow);
-	UpdateWindow(hwnd);
+    UpdateWindow(hwnd);
 
+    while (GetMessage(&msg, NULL, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
 
-	while (GetMessage(&msg, NULL, 0, 0))
+    return msg.wParam;
-		{
+}
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-		}
-
-	return msg.wParam;
-	}
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
-	{
+{
-        HDC hdc;
+    HDC hdc;
-	PAINTSTRUCT ps;
+    PAINTSTRUCT ps;
-        RECT rect;
+    RECT rect;
-        static int seeded = 0;
+    static int seeded = 0;
 
-	switch (iMsg)
+    switch (iMsg) {
-		{
+    case WM_PAINT:
-	case WM_PAINT:
+        hdc = BeginPaint(hwnd, &ps);
-		hdc = BeginPaint(hwnd, &ps);
+        GetClientRect(hwnd, &rect);
-		GetClientRect(hwnd, &rect);
+        DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1,
-                DrawText(hdc, "Seeding the PRNG. Please move the mouse!", -1,
+                 &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
-			&rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER);
+        EndPaint(hwnd, &ps);
-		EndPaint(hwnd, &ps);
+        return 0;
-		return 0;
-		
-        case WM_DESTROY:
-                PostQuitMessage(0);
-                return 0;
-                }
 
-        if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0)
+    case WM_DESTROY:
-                {
+        PostQuitMessage(0);
-                seeded = 1;
+        return 0;
-                if (RAND_write_file(filename) <= 0)
+    }
-                        MessageBox(hwnd, "Couldn't write random file!",
-				"OpenSSL", MB_OK | MB_ICONERROR);
-                PostQuitMessage(0);
-                }
 
-	return DefWindowProc(hwnd, iMsg, wParam, lParam);
+    if (RAND_event(iMsg, wParam, lParam) == 1 && seeded == 0) {
-	}
+        seeded = 1;
+        if (RAND_write_file(filename) <= 0)
+            MessageBox(hwnd, "Couldn't write random file!",
+                       "OpenSSL", MB_OK | MB_ICONERROR);
+        PostQuitMessage(0);
+    }
+
+    return DefWindowProc(hwnd, iMsg, wParam, lParam);
+}

bugs/alpha.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,18 +49,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [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.
  */
@@ -69,23 +71,22 @@
 
 #define TYPE    unsigned int
 
-void func(a,b)
+void func(a, b)
 TYPE *a;
 TYPE b;
-        {
+{
-        printf("%ld -1 == %ld\n",a[0],b);
+    printf("%ld -1 == %ld\n", a[0], b);
-        }
+}
 
 main()
-        {
+{
-        TYPE data[5]={1L,2L,3L,4L,5L};
+    TYPE data[5] = { 1L, 2L, 3L, 4L, 5L };
-        TYPE *p;
+    TYPE *p;
-        int i;
+    int i;
 
-        p=data;
+    p = data;
 
-        for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-                {
+        func(p, *(p++));
-                func(p,*(p++));
+    }
-                }
+}
-        }

bugs/dggccbug.c

@@ -4,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
@@ -23,23 +24,22 @@
 
 void inc(a)
 int *a;
-	{
+{
-	(*a)++;
+    (*a)++;
-	}
+}
 
 main()
-	{
+{
-	int p=0;
+    int p = 0;
 #ifdef FIXBUG
-	int dummy;
+    int dummy;
 #endif
 
-	while (p<3)
+    while (p < 3) {
-		{
+        fprintf(stderr, "%08X\n", p);
-		fprintf(stderr,"%08X\n",p);
+        inc(&p);
-		inc(&p);
 #ifdef FIXBUG
-		dummy+=p;
+        dummy += p;
 #endif
-		}
+    }
-	}
+}

bugs/sgiccbug.c

@@ -4,54 +4,57 @@
 
 #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()
-	{
+{
-	unsigned long r[4];
+    unsigned long r[4];
-	sub(r,a,b);
+    sub(r, a, b);
-	fprintf(stderr,"input a= %08X %08X %08X %08X\n",a[3],a[2],a[1],a[0]);
+    fprintf(stderr, "input a= %08X %08X %08X %08X\n", a[3], a[2], a[1], a[0]);
-	fprintf(stderr,"input b= %08X %08X %08X %08X\n",b[3],b[2],b[1],b[0]);
+    fprintf(stderr, "input b= %08X %08X %08X %08X\n", b[3], b[2], b[1], b[0]);
-	fprintf(stderr,"output = %08X %08X %08X %08X\n",r[3],r[2],r[1],r[0]);
+    fprintf(stderr, "output = %08X %08X %08X %08X\n", r[3], r[2], r[1], r[0]);
-	fprintf(stderr,"correct= %08X %08X %08X %08X\n",c[3],c[2],c[1],c[0]);
+    fprintf(stderr, "correct= %08X %08X %08X %08X\n", c[3], c[2], c[1], c[0]);
-	}
+}
 
-int sub(r,a,b)
+int sub(r, a, b)
-unsigned long *r,*a,*b;
+unsigned long *r, *a, *b;
-	{
+{
-	register unsigned long t1,t2,*ap,*bp,*rp;
+    register unsigned long t1, t2, *ap, *bp, *rp;
-	int i,carry;
+    int i, carry;
 #ifdef FIXBUG
-	unsigned long dummy;
+    unsigned long dummy;
 #endif
 
-	ap=a;
+    ap = a;
-	bp=b;
+    bp = b;
-	rp=r;
+    rp = r;
-	carry=0;
+    carry = 0;
-	for (i=0; i<4; i++)
+    for (i = 0; i < 4; i++) {
-		{
+        t1 = *(ap++);
-		t1= *(ap++);
+        t2 = *(bp++);
-		t2= *(bp++);
+        t1 = (t1 - t2);
-		t1=(t1-t2);
 #ifdef FIXBUG
-		dummy=t1;
+        dummy = t1;
 #endif
-		*(rp++)=t1&0xffffffff;
+        *(rp++) = t1 & 0xffffffff;
-		}
+    }
-	}
+}

bugs/stream.c

@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -59,73 +59,74 @@
 #include <stdio.h>
 #include <openssl/rc4.h>
 #ifdef OPENSSL_NO_DES
-#include <des.h>
+# include <des.h>
 #else
-#include <openssl/des.h>
+# include <openssl/des.h>
 #endif
 
-/* show how stream ciphers are not very good.  The mac has no affect
+/*
- * 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()
-	{
+{
-	fprintf(stderr,"rc4\n");
+    fprintf(stderr, "rc4\n");
-	rc4();
+    rc4();
-	fprintf(stderr,"cfb des\n");
+    fprintf(stderr, "cfb des\n");
-	des();
+    des();
-	}
+}
 
 int des()
-	{
+{
-	des_key_schedule ks;
+    des_key_schedule ks;
-	des_cblock iv,key;
+    des_cblock iv, key;
-	int num;
+    int num;
-	static char *keystr="01234567";
+    static char *keystr = "01234567";
-	static char *in1="0123456789ABCEDFdata 12345";
+    static char *in1 = "0123456789ABCEDFdata 12345";
-	static char *in2="9876543210abcdefdata 12345";
+    static char *in2 = "9876543210abcdefdata 12345";
-	unsigned char out[100];
+    unsigned char out[100];
-	int i;
+    int i;
 
-	des_set_key((des_cblock *)keystr,ks);
+    des_set_key((des_cblock *)keystr, ks);
 
-	num=0;
+    num = 0;
-	memset(iv,0,8);
+    memset(iv, 0, 8);
-	des_cfb64_encrypt(in1,out,26,ks,(des_cblock *)iv,&num,1);
+    des_cfb64_encrypt(in1, out, 26, ks, (des_cblock *)iv, &num, 1);
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
 
-	num=0;
+    num = 0;
-	memset(iv,0,8);
+    memset(iv, 0, 8);
-	des_cfb64_encrypt(in2,out,26,ks,(des_cblock *)iv,&num,1);
+    des_cfb64_encrypt(in2, out, 26, ks, (des_cblock *)iv, &num, 1);
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
-	}
+}
 
 int rc4()
-	{
+{
-	static char *keystr="0123456789abcdef";
+    static char *keystr = "0123456789abcdef";
-	RC4_KEY key;
+    RC4_KEY key;
-	unsigned char in[100],out[100];
+    unsigned char in[100], out[100];
-	int i;
+    int i;
 
-	RC4_set_key(&key,16,keystr);
+    RC4_set_key(&key, 16, keystr);
-	in[0]='\0';
+    in[0] = '\0';
-	strcpy(in,"0123456789ABCEDFdata 12345");
+    strcpy(in, "0123456789ABCEDFdata 12345");
-	RC4(key,26,in,out);
+    RC4(key, 26, in, out);
 
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
 
-	RC4_set_key(&key,16,keystr);
+    RC4_set_key(&key, 16, keystr);
-	in[0]='\0';
+    in[0] = '\0';
-	strcpy(in,"9876543210abcdefdata 12345");
+    strcpy(in, "9876543210abcdefdata 12345");
-	RC4(key,26,in,out);
+    RC4(key, 26, in, out);
 
-	for (i=0; i<26; i++)
+    for (i = 0; i < 26; i++)
-		fprintf(stderr,"%02X ",out[i]);
+        fprintf(stderr, "%02X ", out[i]);
-	fprintf(stderr,"\n");
+    fprintf(stderr, "\n");
-	}
+}