More comment realignment

Reviewed-by: Tim Hudson <tjh@openssl.org>

.cvsignore

@@ -1,22 +0,0 @@
-openssl.pc
-libcrypto.pc
-libssl.pc
-MINFO
-makefile.one
-tmp
-out
-outinc
-rehash.time
-testlog
-make.log
-maketest.log
-cctest
-cctest.c
-cctest.a
-*.flc
-semantic.cache
-Makefile
-*.dll*
-*.so*
-*.sl*
-*.dylib*

.gitignore

@@ -0,0 +1,118 @@
+# Object files
+*.o
+*.obj
+
+# editor artefacts
+*.swp
+.#*
+#*#
+*~
+
+# Top level excludes
+/Makefile.bak
+/Makefile
+/MINFO
+/*.a
+/include
+/*.pc
+/rehash.time
+/inc.*
+/makefile.*
+/out.*
+/tmp.*
+
+# 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/testutil.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/gost2814789t
+/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
+tags
+TAGS
+cscope.out
+*.d
+
+# 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.

CHANGES.SSLeay

@@ -29,7 +29,7 @@ eric (about to go bushwalking for the 4 day easter break :-)
 7-Jan-98
     - Finally reworked the cipher string to ciphers again, so it
       works correctly
-    - All the app_data stuff is now ex_data with funcion calls to access.
+    - All the app_data stuff is now ex_data with function calls to access.
       The index is supplied by a function and 'methods' can be setup
       for the types that are called on XXX_new/XXX_free.  This lets
       applications get notified on creation and destruction.  Some of
@@ -148,7 +148,7 @@ eric (about to go bushwalking for the 4 day easter break :-)
       This would tend to cause memory overwrites since SSLv3 has
       a maximum packet size of 16k.  If your program uses
       buffers <= 16k, you would probably never see this problem.
-    - Fixed a new errors that were cause by malloc() not returning
+    - Fixed a few errors that were cause by malloc() not returning
       0 initialised memory..
     - SSL_OP_NETSCAPE_CA_DN_BUG was being switched on when using
       SSL_CTX_set_options(ssl_ctx,SSL_OP_ALL); which was a bad thing

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
 
@@ -34,6 +35,7 @@ OpenSSL  -  Frequently Asked Questions
 * 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?
+* Some secure servers 'hang' with OpenSSL 1.0.1, is this a bug?
 
 [BUILD] Questions about building and testing OpenSSL
 
@@ -52,6 +54,9 @@ OpenSSL  -  Frequently Asked Questions
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 * Why does compiler fail to compile sha512.c?
 * Test suite still fails, what to do?
+* I think I've found a bug, what should I do?
+* I'm SURE I've found a bug, how do I report it?
+* I've found a security issue, how do I report it?
 
 [PROG] Questions about programming with OpenSSL
 
@@ -70,6 +75,8 @@ OpenSSL  -  Frequently Asked Questions
 * 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?
+* When debugging I observe SIGILL during OpenSSL initialization: why?
 
 ===============================================================================
 
@@ -78,11 +85,10 @@ 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.8k was released on Mar 25th, 2009.
 
 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?
@@ -94,19 +100,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
@@ -127,7 +133,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/about/binaries.html> .
 
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
@@ -166,14 +172,31 @@ 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.
+
+* What happens when the letter release reaches z?
+
+It was decided after the release of OpenSSL 0.9.8y the next version should
+be 0.9.8za then 0.9.8zb and so on.
+
+
 [LEGAL] =======================================================================
 
 * Do I need patent licenses to use OpenSSL?
 
-The patents section of the README file lists patents that may apply to
+For information on intellectual property rights, please consult a lawyer.
-you if you want to use OpenSSL.  For information on intellectual
+The OpenSSL team does not offer legal advice.
-property rights, please consult a lawyer.  The OpenSSL team does not
-offer legal advice.
 
 You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
  ./config no-idea no-mdc2 no-rc5
@@ -277,7 +300,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?
@@ -411,7 +434,7 @@ software from the US only weak encryption algorithms could be freely exported
 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
+Two slightly 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
@@ -459,7 +482,17 @@ 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:
 
-  http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html
+  <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html>
+
+
+* Some secure servers 'hang' with OpenSSL 1.0.1, is this a bug?
+
+OpenSSL 1.0.1 is the first release to support TLS 1.2, among other things,
+this increases the size of the default ClientHello message to more than
+255 bytes in length. Some software cannot handle this and hangs. For more
+details and workarounds see:
+
+  <URL: http://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=2771>
 
 
 [BUILD] =======================================================================
@@ -501,7 +534,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.
 
 
@@ -512,7 +545,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.
 
 
@@ -590,8 +623,8 @@ valid for the current DOS session.
 * What is special about OpenSSL on Redhat?
 
 Red Hat Linux (release 7.0 and later) include a preinstalled limited
-version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
+version of OpenSSL. Red Hat has chosen to disable support for IDEA, RC5 and
-is disabled in this version. The same may apply to other Linux distributions.
+MDC2 in this version. The same may apply to other Linux distributions.
 Users may therefore wish to install more or all of the features left out.
 
 To do this you MUST ensure that you do not overwrite the openssl that is in
@@ -614,11 +647,6 @@ relevant updates in packages up to and including 0.9.6b.
 A possible way around this is to persuade Red Hat to produce a non-US
 version of Red Hat Linux.
 
-FYI: Patent numbers and expiry dates of US patents:
-MDC-2: 4,908,861 13/03/2007
-IDEA:  5,214,703 25/05/2010
-RC5:   5,724,428 03/03/2015
-
 
 * Why does the OpenSSL compilation fail on MacOS X?
 
@@ -681,7 +709,7 @@ working across wider range of *BSD branches, not just OpenBSD.
 If the test program in question fails withs SIGILL, Illegal Instruction
 exception, then you more than likely to run SSE2-capable CPU, such as
 Intel P4, under control of kernel which does not support SSE2
-instruction extentions. See accompanying INSTALL file and
+instruction extensions. See accompanying INSTALL file and
 OPENSSL_ia32cap(3) documentation page for further information.
 
 * Why does compiler fail to compile sha512.c?
@@ -695,15 +723,67 @@ 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
+Another common reason for test failures is bugs in the toolchain
-simply bad code generated by a buggy component in toolchain or deficiency
+or run-time environment.  Known cases of this are documented in the
-in run-time environment. There are few cases documented in PROBLEMS file,
+PROBLEMS file, please review it before you beat the drum. Even if you
-consult it for possible workaround before you beat the drum. Even if you
+don't find anything in that file, please do consider the possibility
-don't find solution or even mention there, do reserve for possibility of
+of a compiler bug. Compiler bugs often appear in rather bizarre ways,
-a compiler bug. Compiler bugs might appear in rather bizarre ways, they
+they never make sense, and tend to emerge when you least expect
-never make sense, and tend to emerge when you least expect them. In order
+them. One thing to try is to reduce the level of optimization (such
-to identify one, drop optimization level, e.g. by editing CFLAG line in
+as by editing the CFLAG variable line in the top-level Makefile),
-top-level Makefile, recompile and re-run the test.
+and then 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.
+
+If you think you have found a bug based on the output of static analysis tools
+then please manually check the issue is genuine. Such tools can produce a
+LOT of false positives.
+
+
+* I'm SURE I've found a bug, how do I report it?
+
+To avoid duplicated reports check the mailing lists and release notes for the
+relevant version of OpenSSL to see if the problem has been reported already.
+
+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). If you wish to use PGP to send
+in a report please use one or more of the keys of the team members listed
+at <URL: http://www.openssl.org/about/>
+
+Note that bugs only present in the openssl utility are not in general
+considered to be security issues. 
 
 [PROG] ========================================================================
 
@@ -718,7 +798,7 @@ file.
 Multi-threaded applications must provide two callback functions to
 OpenSSL by calling CRYPTO_set_locking_callback() and
 CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
-including 0.9.8[abc...]. As of version 0.9.9, CRYPTO_set_id_callback()
+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.
 
@@ -801,7 +881,7 @@ The opposite assumes we already have len bytes in buf:
  p = buf;
  p7 = d2i_PKCS7(NULL, &p, len);
 
-At this point p7 contains a valid PKCS7 structure of NULL if an error
+At this point p7 contains a valid PKCS7 structure or NULL if an error
 occurred. If an error occurred ERR_print_errors(bio) should give more
 information.
 
@@ -813,6 +893,21 @@ that has been read or written. This may well be uninitialized data
 and attempts to free the buffer will have unpredictable results
 because it no longer points to the same address.
 
+Memory allocation and encoding can also be combined in a single
+operation by the ASN1 routines:
+
+ unsigned char *buf = NULL;	/* mandatory */
+ int len;
+ len = i2d_PKCS7(p7, &buf);
+ if (len < 0)
+	/* Error */
+ /* Do some things with 'buf' */
+ /* Finished with buf: free it */
+ OPENSSL_free(buf);
+
+In this special case the "buf" parameter is *not* incremented, it points
+to the start of the encoding.
+
 
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 
@@ -964,4 +1059,30 @@ is needed. This must be done by calling:
 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().
+
+* When debugging I observe SIGILL during OpenSSL initialization: why?
+
+OpenSSL adapts to processor it executes on and for this reason has to
+query its capabilities. Unfortunately on some processors the only way
+to achieve this for non-privileged code is to attempt instructions
+that can cause Illegal Instruction exceptions. The initialization
+procedure is coded to handle these exceptions to manipulate corresponding
+bits in capabilities vector. This normally appears transparent, except
+when you execute it under debugger, which stops prior delivering signal
+to handler. Simply resuming execution does the trick, but when debugging
+a lot it might feel counterproductive. Two options. Either set explicit
+capability environment variable in order to bypass the capability query
+(see corresponding crypto/*cap.c for details). Or configure debugger not
+to stop upon SIGILL exception, e.g. in gdb case add 'handle SIGILL nostop'
+to your .gdbinit.
+
 ===============================================================================

GitConfigure

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+./Configure $@ no-symlinks
+make files
+util/mk1mf.pl OUT=out.$BRANCH TMP=tmp.$BRANCH INC=inc.$BRANCH copy > makefile.$BRANCH
+MAKE=make
+which bsdmake > /dev/null && MAKE=bsdmake
+$MAKE -f makefile.$BRANCH init

GitMake

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+MAKE=make
+which bsdmake > /dev/null && MAKE=bsdmake
+$MAKE -f makefile.$BRANCH $@

INSTALL

@@ -79,7 +79,7 @@
                 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
+  no-sse2	Exclude SSE2 code pathes. Normally SSE2 extension is
 		detected at run-time, but the decision whether or not the
 		machine code will be executed is taken solely on CPU
 		capability vector. This means that if you happen to run OS

INSTALL.MacOS

@@ -1,72 +0,0 @@
-OpenSSL - Port To The Macintosh OS 9 or Earlier
-===============================================
-
-Thanks to Roy Wood <roy@centricsystems.ca> initial support for Mac OS (pre
-X) is now provided. "Initial" means that unlike other platforms where you
-get an SDK and a "swiss army" openssl application, on Macintosh you only
-get one sample application which fetches a page over HTTPS(*) and dumps it
-in a window. We don't even build the test applications so that we can't
-guarantee that all algorithms are operational.
-
-Required software:
-
-- StuffIt Expander 5.5 or later, alternatively MacGzip and SUNtar;
-- Scriptable Finder;
-- CodeWarrior Pro 5;
-
-Installation procedure:
-
-- fetch the source at ftp://ftp.openssl.org/ (well, you probably already
-  did, huh?)
-- unpack the .tar.gz file:
-	- if you have StuffIt Expander then just drag it over it;
-	- otherwise uncompress it with MacGzip and then unpack with SUNtar;
-- locate MacOS folder in OpenSSL source tree and open it;
-- unbinhex mklinks.as.hqx and OpenSSL.mcp.hqx if present (**), do it
-  "in-place", i.e. unpacked files should end-up in the very same folder;
-- execute mklinks.as;
-- open OpenSSL.mcp(***) and build 'GetHTTPS PPC' target(****);
-- that's it for now;
-
-(*)	URL is hardcoded into ./MacOS/GetHTTPS.src/GetHTTPS.cpp, lines 40
-        to 42, change appropriately.
-(**)	If you use SUNtar, then it might have already unbinhexed the files
-	in question.
-(***)	The project file was saved with CW Pro 5.3. If you have an earlier
-	version and it refuses to open it, then download
-	http://www.openssl.org/~appro/OpenSSL.mcp.xml and import it
-	overwriting the original OpenSSL.mcp.
-(****)	Other targets are works in progress. If you feel like giving 'em a
-	shot, then you should know that OpenSSL* and Lib* targets are
-	supposed to be built with the GUSI, MacOS library which mimics
-	BSD sockets and some other POSIX APIs. The GUSI distribution is
-	expected to be found in the same directory as the openssl source tree,
-	i.e., in the parent directory to the one where this very file,
-	namely INSTALL.MacOS, resides. For more information about GUSI, see
-	http://www.iis.ee.ethz.ch/~neeri/macintosh/gusi-qa.html
-
-Finally some essential comments from our generous contributor:-)
-
-"I've gotten OpenSSL working on the Macintosh. It's probably a bit of a
-hack, but it works for what I'm doing. If you don't like the way I've done
-it, then feel free to change what I've done. I freely admit that I've done
-some less-than-ideal things in my port, and if you don't like the way I've
-done something, then feel free to change it-- I won't be offended!
-
-... I've tweaked "bss_sock.c" a little to call routines in a "MacSocket"
-library I wrote. My MacSocket library is a wrapper around OpenTransport,
-handling stuff like endpoint creation, reading, writing, etc. It is not
-designed as a high-performance package such as you'd use in a webserver,
-but is fine for lots of other applications. MacSocket also uses some other
-code libraries I've written to deal with string manipulations and error
-handling. Feel free to use these things in your own code, but give me
-credit and/or send me free stuff in appreciation! :-)
-
-...
-
-If you have any questions, feel free to email me as the following:
-
-roy@centricsystems.ca
-
--Roy Wood"
-

INSTALL.NW

@@ -378,7 +378,7 @@ The openssl program has numerous options and can be used for many different
 things.  Many of the options operate in an interactive mode requiring the
 user to enter data.  Because of this, a default screen is created for the
 program.  However, when running the test script it is not desirable to
-have a seperate screen.  Therefore, the build also creates openssl2.nlm.
+have a separate screen.  Therefore, the build also creates openssl2.nlm.
 Openssl2.nlm is functionally identical but uses the console screen.
 Openssl2 can be used when a non-interactive mode is desired.
 

INSTALL.VMS

@@ -71,7 +71,7 @@ the top to understand how to use them.  However, if you want to
 compile all you can get, the simplest is to use MAKEVMS.COM in the top
 directory.  The syntax is the following:
 
-  @MAKEVMS <option> <rsaref-p> <debug-p> [<compiler>]
+  @MAKEVMS <option> <bits> <debug-p> [<compiler>]
 
 <option> must be one of the following:
 
@@ -87,24 +87,11 @@ directory.  The syntax is the following:
       TEST      Just build the "[.xxx.EXE.TEST]" test programs for OpenSSL.
       APPS      Just build the "[.xxx.EXE.APPS]" application programs for OpenSSL.
 
-<rsaref-p> must be one of the following:
+<bits> must be one of the following:
 
-      RSAREF    compile using the RSAREF Library
+      ""        compile using default pointer size
-      NORSAREF  compile without using RSAREF
+      32        compile using 32 bit pointer size
-
+      64        compile using 64 bit pointer size
-Note 0: The RSAREF library IS NO LONGER NEEDED.  The RSA patent
-        expires September 20, 2000, and RSA Security chose to make
-        the algorithm public domain two weeks before that.
-
-Note 1: If you still want to use RSAREF, the library is NOT INCLUDED
-        and you have to download it.  RSA Security doesn't carry it
-        any more, but there are a number of places where you can find
-        it.  You have to get the ".tar-Z" file as the ".zip" file
-        doesn't have the directory structure stored.  You have to
-        extract the file into the [.RSAREF] directory as that is where
-        the scripts will look for the files.
-
-Note 2: I have never done this, so I've no idea if it works or not.
 
 <debug-p> must be one of the following:
 
@@ -117,12 +104,13 @@ Note 2: I have never done this, so I've no idea if it works or not.
       GNUC      For GNU C.
 
 
-You will find the crypto library in [.xxx.EXE.CRYPTO], called LIBCRYPTO.OLB,
+You will find the crypto library in [.xxx.EXE.CRYPTO] (where xxx is VAX,
-where xxx is VAX or AXP.  You will find the SSL library in [.xxx.EXE.SSL],
+ALPHA or IA64), called SSL_LIBCRYPTO32.OLB or SSL_LIBCRYPTO.OLB depending
-named LIBSSL.OLB, and you will find a bunch of useful programs in
+on how it was built.  You will find the SSL library in [.xxx.EXE.SSL],
-[.xxx.EXE.APPS].  However, these shouldn't be used right off unless it's
+named SSL_LIBSSL32.OLB or SSL_LIBSSL.OLB, and you will find a bunch of
-just to test them.  For production use, make sure you install first, see
+useful programs in [.xxx.EXE.APPS].  However, these shouldn't be used
-Installation below.
+right off unless it's just to test them.  For production use, make sure
+you install first, see Installation below.
 
 Note 1: Some programs in this package require a TCP/IP library.
 
@@ -146,7 +134,7 @@ Currently, the logical names supported are:
                         will not be implemented.  Supported algorithms to
                         do this with are: RSA, DSA, DH, MD2, MD4, MD5, RIPEMD,
                         SHA, DES, MDC2, CR2, RC4, RC5, IDEA, BF, CAST, HMAC,
-                        SSL2.  So, for example, having the logical name
+                        SSL3.  So, for example, having the logical name
                         OPENSSL_NO_RSA with the value YES means that the
                         LIBCRYPTO.OLB library will not contain an RSA
                         implementation.
@@ -170,12 +158,14 @@ Installation:
 
 Installation is easy, just do the following:
 
-  @INSTALL <root>
+  @INSTALL <root> <bits>
 
 <root> is the directory in which everything will be installed,
 subdirectories, libraries, header files, programs and startup command
 procedures.
 
+<bits> works the same way as for MAKEVMS.COM
+
 N.B.: INSTALL.COM builds a new directory structure, different from
 the directory tree where you have now build OpenSSL.
 
@@ -196,6 +186,10 @@ following command procedures:
         sets up the symbols to the applications.  Should be called
         from for example SYS$MANAGER:SYLOGIN.COM 
 
+  OPENSSL_UNDO.COM
+
+	deassigns the logical names created with OPENSSL_STARTUP.COM.
+
 The logical names that are set up are the following:
 
   SSLROOT       a dotted concealed logical name pointing at the
@@ -203,7 +197,6 @@ The logical names that are set up are the following:
 
   SSLCERTS      Initially an empty directory, this is the default
 		location for certificate files.
-  SSLMISC	Various scripts.
   SSLPRIVATE	Initially an empty directory, this is the default
 		location for private key files.
 
@@ -211,8 +204,9 @@ The logical names that are set up are the following:
 		programs.
   SSLINCLUDE    Contains the header files needed if you want to
 		compile programs with libcrypto or libssl.
-  SSLLIB        Contains the OpenSSL library files (LIBCRYPTO.OLB
+  SSLLIB        Contains the OpenSSL library files themselves:
-		and LIBSSL.OLB) themselves.
+  		- SSL_LIBCRYPTO32.OLB and SSL_LIBSSL32.OLB or
+		- SSL_LIBCRYPTO.OLB and SSL_LIBSSL.OLB
 
   OPENSSL	Same as SSLINCLUDE.  This is because the standard
 		way to include OpenSSL header files from version
@@ -296,4 +290,4 @@ have any ideas.
 
 --
 Richard Levitte <richard@levitte.org>
-2000-02-27
+2000-02-27, 2011-03-18

INSTALL.W32

@@ -27,9 +27,9 @@
 
 - Netwide Assembler, a.k.a. NASM, available from http://nasm.sourceforge.net/
   is required if you intend to utilize assembler modules. Note that NASM
-  is the only supported assembler.
+  is now the only supported assembler.
 
- 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.
@@ -41,9 +41,9 @@
  C++, then you will need already mentioned Netwide Assembler binary,
  nasmw.exe or nasm.exe, to be available on your %PATH%.
 
- Firstly you should run Configure:
+ Firstly you should run Configure with platform VC-WIN32:
 
- > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir
+ > perl Configure VC-WIN32 --prefix=c:\some\openssl\dir
 
  Where the prefix argument specifies where OpenSSL will be installed to.
 
@@ -56,6 +56,7 @@
 
  - If you don't want to use the assembly language files at all then run:
 
+   > perl Configure VC-WIN32 no-asm --prefix=c:/some/openssl/dir
    > ms\do_ms
 
  If you get errors about things not having numbers assigned then check the
@@ -80,16 +81,13 @@
 
  There are various changes you can make to the Win32 compile
  environment. By default the library is not compiled with debugging
- symbols. If you add 'debug' to the mk1mf.pl lines in the do_* batch
+ symbols. If you use the platform debug-VC-WIN32 instead of VC-WIN32
- file then debugging symbols will be compiled in. Note that mk1mf.pl
+ then debugging symbols will be compiled in.
- 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 1.0.0 OpenSSL will compile builtin ENGINES into the
- By default in 0.9.8 OpenSSL will compile builtin ENGINES into the
+ separate shared librariesy. If you specify the "enable-static-engine"
- 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.
+ (ms\ntdll.mak) will compile the engines into libeay32.dll instead.
 
  The default Win32 environment is to leave out any Windows NT specific
  features.
@@ -102,7 +100,6 @@
  ms\nt.mak
 
 
-
  Borland C++ builder 5
  ---------------------
 
@@ -188,6 +185,15 @@
    required. Run the installers and do whatever magic they say it takes
    to start MSYS bash shell with GNU tools on its PATH.
 
+   N.B. Since source tar-ball can contain symbolic links, it's essential
+   that you use accompanying MSYS tar to unpack the source. It will
+   either handle them in one way or another or fail to extract them,
+   which does the trick too. Latter means that you may safely ignore all
+   "cannot create symlink" messages, as they will be "re-created" at
+   configure stage by copying corresponding files. Alternative programs
+   were observed to create empty files instead, which results in build
+   failure.
+
  * Compile OpenSSL:
 
    $ ./config
@@ -251,7 +257,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
@@ -300,7 +306,18 @@
  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.
+ actually make GUI calls. Additionally those who wish to
+ /DELAYLOAD:GDI32.DLL and /DELAYLOAD:USER32.DLL and actually keep them
+ off service process should consider implementing and exporting from
+ .exe image in question own _OPENSSL_isservice not relying on USER32.DLL.
+ E.g., on Windows Vista and later you could:
+
+	__declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
+	{   DWORD sess;
+	    if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
+	        return sess==0;
+	    return FALSE;
+	}
 
  If you link with OpenSSL .DLLs, then you're expected to include into
  your application code small "shim" snippet, which provides glue between

LICENSE

@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2008 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/GUSI_Init.cpp

@@ -1,62 +0,0 @@
-/**************** BEGIN GUSI CONFIGURATION ****************************
- *
- * GUSI Configuration section generated by GUSI Configurator
- * last modified: Wed Jan  5 20:33:51 2000
- *
- * This section will be overwritten by the next run of Configurator.
- */
-
-#define GUSI_SOURCE
-#include <GUSIConfig.h>
-#include <sys/cdefs.h>
-
-/* Declarations of Socket Factories */
-
-__BEGIN_DECLS
-void GUSIwithInetSockets();
-void GUSIwithLocalSockets();
-void GUSIwithMTInetSockets();
-void GUSIwithMTTcpSockets();
-void GUSIwithMTUdpSockets();
-void GUSIwithOTInetSockets();
-void GUSIwithOTTcpSockets();
-void GUSIwithOTUdpSockets();
-void GUSIwithPPCSockets();
-void GUSISetupFactories();
-__END_DECLS
-
-/* Configure Socket Factories */
-
-void GUSISetupFactories()
-{
-#ifdef GUSISetupFactories_BeginHook
-	GUSISetupFactories_BeginHook
-#endif
-	GUSIwithInetSockets();
-#ifdef GUSISetupFactories_EndHook
-	GUSISetupFactories_EndHook
-#endif
-}
-
-/* Declarations of File Devices */
-
-__BEGIN_DECLS
-void GUSIwithDConSockets();
-void GUSIwithNullSockets();
-void GUSISetupDevices();
-__END_DECLS
-
-/* Configure File Devices */
-
-void GUSISetupDevices()
-{
-#ifdef GUSISetupDevices_BeginHook
-	GUSISetupDevices_BeginHook
-#endif
-	GUSIwithNullSockets();
-#ifdef GUSISetupDevices_EndHook
-	GUSISetupDevices_EndHook
-#endif
-}
-
-/**************** END GUSI CONFIGURATION *************************/

MacOS/GetHTTPS.src/CPStringUtils.hpp

@@ -1,104 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void CopyPStrToCStr(const unsigned char *thePStr,char *theCStr,const int maxCStrLength);
-void CopyPStrToPStr(const unsigned char *theSrcPStr,unsigned char *theDstPStr,const int maxDstStrLength);
-void CopyCStrToCStr(const char *theSrcCStr,char *theDstCStr,const int maxDstStrLength);
-void CopyCStrToPStr(const char *theSrcCStr,unsigned char *theDstPStr,const int maxDstStrLength);
-void ConcatPStrToCStr(const unsigned char *thePStr,char *theCStr,const int maxCStrLength);
-void ConcatPStrToPStr(const unsigned char *theSrcPStr,unsigned char *theDstPStr,const int maxDstStrLength);
-void ConcatCStrToPStr(const char *theSrcCStr,unsigned char *theDstPStr,const int maxDstStrLength);
-void ConcatCStrToCStr(const char *theSrcCStr,char *theDstCStr,const int maxCStrLength);
-
-void ConcatCharToCStr(const char theChar,char *theDstCStr,const int maxCStrLength);
-void ConcatCharToPStr(const char theChar,unsigned char *theDstPStr,const int maxPStrLength);
-
-int ComparePStrs(const unsigned char *theFirstPStr,const unsigned char *theSecondPStr,const Boolean ignoreCase = true);
-int CompareCStrs(const char *theFirstCStr,const char *theSecondCStr,const Boolean ignoreCase = true);
-int CompareCStrToPStr(const char *theCStr,const unsigned char *thePStr,const Boolean ignoreCase = true);
-
-Boolean CStrsAreEqual(const char *theFirstCStr,const char *theSecondCStr,const Boolean ignoreCase = true);
-Boolean PStrsAreEqual(const unsigned char *theFirstCStr,const unsigned char *theSecondCStr,const Boolean ignoreCase = true);
-
-void CopyLongIntToCStr(const long theNum,char *theCStr,const int maxCStrLength,const int numDigits = -1);
-void CopyUnsignedLongIntToCStr(const unsigned long theNum,char *theCStr,const int maxCStrLength);
-void ConcatLongIntToCStr(const long theNum,char *theCStr,const int maxCStrLength,const int numDigits = -1);
-void CopyCStrAndConcatLongIntToCStr(const char *theSrcCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
-
-void CopyLongIntToPStr(const long theNum,unsigned char *thePStr,const int maxPStrLength,const int numDigits = -1);
-void ConcatLongIntToPStr(const long theNum,unsigned char *thePStr,const int maxPStrLength,const int numDigits = -1);
-
-long CStrLength(const char *theCString);
-long PStrLength(const unsigned char *thePString);
-
-OSErr CopyCStrToExistingHandle(const char *theCString,Handle theHandle);
-OSErr CopyLongIntToExistingHandle(const long inTheLongInt,Handle theHandle);
-
-OSErr CopyCStrToNewHandle(const char *theCString,Handle *theHandle);
-OSErr CopyPStrToNewHandle(const unsigned char *thePString,Handle *theHandle);
-OSErr CopyLongIntToNewHandle(const long inTheLongInt,Handle *theHandle);
-
-OSErr AppendCStrToHandle(const char *theCString,Handle theHandle,long *currentLength = nil,long *maxLength = nil);
-OSErr AppendCharsToHandle(const char *theChars,const int numChars,Handle theHandle,long *currentLength = nil,long *maxLength = nil);
-OSErr AppendPStrToHandle(const unsigned char *thePString,Handle theHandle,long *currentLength = nil);
-OSErr AppendLongIntToHandle(const long inTheLongInt,Handle theHandle,long *currentLength = nil);
-
-void ZeroMem(void *theMemPtr,const unsigned long numBytes);
-
-char *FindCharInCStr(const char theChar,const char *theCString);
-long FindCharOffsetInCStr(const char theChar,const char *theCString,const Boolean inIgnoreCase = false);
-long FindCStrOffsetInCStr(const char *theCSubstring,const char *theCString,const Boolean inIgnoreCase = false);
-
-void CopyCSubstrToCStr(const char *theSrcCStr,const int maxCharsToCopy,char *theDstCStr,const int maxDstStrLength);
-void CopyCSubstrToPStr(const char *theSrcCStr,const int maxCharsToCopy,unsigned char *theDstPStr,const int maxDstStrLength);
-
-void InsertCStrIntoCStr(const char *theSrcCStr,const int theInsertionOffset,char *theDstCStr,const int maxDstStrLength);
-void InsertPStrIntoCStr(const unsigned char *theSrcPStr,const int theInsertionOffset,char *theDstCStr,const int maxDstStrLength);
-OSErr InsertCStrIntoHandle(const char *theCString,Handle theHandle,const long inInsertOffset);
-
-void CopyCStrAndInsertCStrIntoCStr(const char *theSrcCStr,const char *theInsertCStr,char *theDstCStr,const int maxDstStrLength);
-
-void CopyCStrAndInsertCStrsLongIntsIntoCStr(const char *theSrcCStr,const char **theInsertCStrs,const long *theLongInts,char *theDstCStr,const int maxDstStrLength);
-
-void CopyCStrAndInsert1LongIntIntoCStr(const char *theSrcCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
-void CopyCStrAndInsert2LongIntsIntoCStr(const char *theSrcCStr,const long long1,const long long2,char *theDstCStr,const int maxDstStrLength);
-void CopyCStrAndInsert3LongIntsIntoCStr(const char *theSrcCStr,const long long1,const long long2,const long long3,char *theDstCStr,const int maxDstStrLength);
-
-void CopyCStrAndInsertCStrLongIntIntoCStr(const char *theSrcCStr,const char *theInsertCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
-OSErr CopyCStrAndInsertCStrLongIntIntoHandle(const char *theSrcCStr,const char *theInsertCStr,const long theNum,Handle *theHandle);
-
-
-OSErr CopyIndexedWordToCStr(char *theSrcCStr,int whichWord,char *theDstCStr,int maxDstCStrLength);
-OSErr CopyIndexedWordToNewHandle(char *theSrcCStr,int whichWord,Handle *outTheHandle);
-
-OSErr CopyIndexedLineToCStr(const char *theSrcCStr,int inWhichLine,int *lineEndIndex,Boolean *gotLastLine,char *theDstCStr,const int maxDstCStrLength);
-OSErr CopyIndexedLineToNewHandle(const char *theSrcCStr,int inWhichLine,Handle *outNewHandle);
-
-OSErr ExtractIntFromCStr(const char *theSrcCStr,int *outInt,Boolean skipLeadingSpaces = true);
-OSErr ExtractIntFromPStr(const unsigned char *theSrcPStr,int *outInt,Boolean skipLeadingSpaces = true);
-
-
-void ConvertCStrToUpperCase(char *theSrcCStr);
-
-
-int CountOccurencesOfCharInCStr(const char inChar,const char *inSrcCStr);
-int CountWordsInCStr(const char *inSrcCStr);
-
-OSErr CountDigits(const char *inCStr,int *outNumIntegerDigits,int *outNumFractDigits);
-
-void ExtractCStrItemFromCStr(const char *inSrcCStr,const char inItemDelimiter,const int inItemNumber,Boolean *foundItem,char *outDstCharPtr,const int inDstCharPtrMaxLength,const Boolean inTreatMultipleDelimsAsSingleDelim = false);
-OSErr ExtractCStrItemFromCStrIntoNewHandle(const char *inSrcCStr,const char inItemDelimiter,const int inItemNumber,Boolean *foundItem,Handle *outNewHandle,const Boolean inTreatMultipleDelimsAsSingleDelim = false);
-
-
-OSErr ExtractFloatFromCStr(const char *inCString,extended80 *outFloat);
-OSErr CopyFloatToCStr(const extended80 *theFloat,char *theCStr,const int maxCStrLength,const int inMaxNumIntDigits = -1,const int inMaxNumFractDigits = -1);
-
-void SkipWhiteSpace(char **ioSrcCharPtr,const Boolean inStopAtEOL = false);
-
-
-#ifdef __cplusplus
-}
-#endif

MacOS/GetHTTPS.src/ErrorHandling.hpp

@@ -1,147 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef kGenericError
-	#define kGenericError		-1
-#endif
-
-extern char	*gErrorMessage;
-
-
-void SetErrorMessage(const char *theErrorMessage);
-void SetErrorMessageAndAppendLongInt(const char *theErrorMessage,const long theLongInt);
-void SetErrorMessageAndCStrAndLongInt(const char *theErrorMessage,const char * theCStr,const long theLongInt);
-void SetErrorMessageAndCStr(const char *theErrorMessage,const char * theCStr);
-void AppendCStrToErrorMessage(const char *theErrorMessage);
-void AppendLongIntToErrorMessage(const long theLongInt);
-
-
-char *GetErrorMessage(void);
-OSErr GetErrorMessageInNewHandle(Handle *inoutHandle);
-OSErr GetErrorMessageInExistingHandle(Handle inoutHandle);
-OSErr AppendErrorMessageToHandle(Handle inoutHandle);
-
-
-#ifdef __EXCEPTIONS_ENABLED__
-	void ThrowErrorMessageException(void);
-#endif
-
-
-
-//	A bunch of evil macros that would be unnecessary if I were always using C++ !
-
-#define SetErrorMessageAndBailIfNil(theArg,theMessage)								\
-{																					\
-	if (theArg == nil)																\
-	{																				\
-		SetErrorMessage(theMessage);												\
-		errCode = kGenericError;													\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define SetErrorMessageAndBail(theMessage)											\
-{																					\
-		SetErrorMessage(theMessage);												\
-		errCode = kGenericError;													\
-		goto EXITPOINT;																\
-}
-
-
-#define SetErrorMessageAndLongIntAndBail(theMessage,theLongInt)						\
-{																					\
-		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
-		errCode = kGenericError;													\
-		goto EXITPOINT;																\
-}
-
-
-#define SetErrorMessageAndLongIntAndBailIfError(theErrCode,theMessage,theLongInt)	\
-{																					\
-	if (theErrCode != noErr)														\
-	{																				\
-		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
-		errCode = theErrCode;														\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define SetErrorMessageCStrLongIntAndBailIfError(theErrCode,theMessage,theCStr,theLongInt)	\
-{																					\
-	if (theErrCode != noErr)														\
-	{																				\
-		SetErrorMessageAndCStrAndLongInt(theMessage,theCStr,theLongInt);			\
-		errCode = theErrCode;														\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define SetErrorMessageAndCStrAndBail(theMessage,theCStr)							\
-{																					\
-	SetErrorMessageAndCStr(theMessage,theCStr);										\
-	errCode = kGenericError;														\
-	goto EXITPOINT;																	\
-}
-
-
-#define SetErrorMessageAndBailIfError(theErrCode,theMessage)						\
-{																					\
-	if (theErrCode != noErr)														\
-	{																				\
-		SetErrorMessage(theMessage);												\
-		errCode = theErrCode;														\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define SetErrorMessageAndLongIntAndBailIfNil(theArg,theMessage,theLongInt)			\
-{																					\
-	if (theArg == nil)																\
-	{																				\
-		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
-		errCode = kGenericError;													\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define BailIfError(theErrCode)														\
-{																					\
-	if ((theErrCode) != noErr)														\
-	{																				\
-		goto EXITPOINT;																\
-	}																				\
-}
-
-
-#define SetErrCodeAndBail(theErrCode)												\
-{																					\
-	errCode = theErrCode;															\
-																					\
-	goto EXITPOINT;																	\
-}
-
-
-#define SetErrorCodeAndMessageAndBail(theErrCode,theMessage)						\
-{																					\
-	SetErrorMessage(theMessage);													\
-	errCode = theErrCode;															\
-	goto EXITPOINT;																	\
-}
-
-
-#define BailNow()																	\
-{																					\
-	errCode = kGenericError;														\
-	goto EXITPOINT;																	\
-}
-
-
-#ifdef __cplusplus
-}
-#endif

MacOS/GetHTTPS.src/GetHTTPS.cpp

@@ -1,209 +0,0 @@
-/*
- *	An demo illustrating how to retrieve a URI from a secure HTTP server.
- *
- *	Author: 	Roy Wood
- *	Date:		September 7, 1999
- *	Comments:	This relies heavily on my MacSockets library.
- *				This project is also set up so that it expects the OpenSSL source folder (0.9.4 as I write this)
- *				to live in a folder called "OpenSSL-0.9.4" in this project's parent folder.  For example:
- *
- *					Macintosh HD:
- *						Development:
- *							OpenSSL-0.9.4:
- *								(OpenSSL sources here)
- *							OpenSSL Example:
- *								(OpenSSL example junk here)
- *
- *
- *				Also-- before attempting to compile this, make sure the aliases in "OpenSSL-0.9.4:include:openssl" 
- *				are installed!  Use the AppleScript applet in the "openssl-0.9.4" folder to do this!
- */
-/* modified to seed the PRNG */
-/* modified to use CRandomizer for seeding */
-
-
-//	Include some funky libs I've developed over time
-
-#include "CPStringUtils.hpp"
-#include "ErrorHandling.hpp"
-#include "MacSocket.h"
-#include "Randomizer.h"
-
-//	We use the OpenSSL implementation of SSL....
-//	This was a lot of work to finally get going, though you wouldn't know it by the results!
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include <timer.h>
-
-//	Let's try grabbing some data from here:
-
-#define kHTTPS_DNS		"www.apache-ssl.org"
-#define kHTTPS_Port		443
-#define kHTTPS_URI		"/"
-
-
-//	Forward-declare this
-
-OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr);
-
-//	My idle-wait callback.  Doesn't do much, does it?  Silly cooperative multitasking.
-
-OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr)
-{
-#pragma unused(inUserRefPtr)
-
-EventRecord		theEvent;
-	::EventAvail(everyEvent,&theEvent);
-	
-	CRandomizer *randomizer = (CRandomizer*)inUserRefPtr;
-	if (randomizer)
-		randomizer->PeriodicAction();
-
-	return(noErr);
-}
-
-
-//	Finally!
-
-void main(void)
-{
-	OSErr				errCode;
-	int					theSocket = -1;
-	int					theTimeout = 30;
-
-	SSL_CTX				*ssl_ctx = nil;
-	SSL					*ssl = nil;
-
-	char				tempString[256];
-	UnsignedWide		microTickCount;
-
-
-	CRandomizer randomizer;
-	
-	printf("OpenSSL Demo by Roy Wood, roy@centricsystems.ca\n\n");
-	
-	BailIfError(errCode = MacSocket_Startup());
-
-
-
-	//	Create a socket-like object
-	
-	BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,&randomizer));
-
-	
-	//	Set up the connect string and try to connect
-	
-	CopyCStrAndInsertCStrLongIntIntoCStr("%s:%ld",kHTTPS_DNS,kHTTPS_Port,tempString,sizeof(tempString));
-	
-	printf("Connecting to %s....\n",tempString);
-
-	BailIfError(errCode = MacSocket_connect(theSocket,tempString));
-	
-	
-	//	Init SSL stuff
-	
-	SSL_load_error_strings();
-	
-	SSLeay_add_ssl_algorithms();
-	
-	
-	//	Pick the SSL method
-	
-//	ssl_ctx = SSL_CTX_new(SSLv2_client_method());
-	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-//	ssl_ctx = SSL_CTX_new(SSLv3_client_method());
-			
-
-	//	Create an SSL thingey and try to negotiate the connection
-	
-	ssl = SSL_new(ssl_ctx);
-	
-	SSL_set_fd(ssl,theSocket);
-	
-	errCode = SSL_connect(ssl);
-	
-	if (errCode < 0)
-	{
-		SetErrorMessageAndLongIntAndBail("OpenSSL: Can't initiate SSL connection, SSL_connect() = ",errCode);
-	}
-	
-	//	Request the URI from the host
-	
-	CopyCStrToCStr("GET ",tempString,sizeof(tempString));
-	ConcatCStrToCStr(kHTTPS_URI,tempString,sizeof(tempString));
-	ConcatCStrToCStr(" HTTP/1.0\r\n\r\n",tempString,sizeof(tempString));
-
-	
-	errCode = SSL_write(ssl,tempString,CStrLength(tempString));
-	
-	if (errCode < 0)
-	{
-		SetErrorMessageAndLongIntAndBail("OpenSSL: Error writing data via ssl, SSL_write() = ",errCode);
-	}
-	
-
-	for (;;)
-	{
-	char	tempString[256];
-	int		bytesRead;
-		
-
-		//	Read some bytes and dump them to the console
-		
-		bytesRead = SSL_read(ssl,tempString,sizeof(tempString) - 1);
-		
-		if (bytesRead == 0 && MacSocket_RemoteEndIsClosing(theSocket))
-		{
-			break;
-		}
-		
-		else if (bytesRead < 0)
-		{
-			SetErrorMessageAndLongIntAndBail("OpenSSL: Error reading data via ssl, SSL_read() = ",bytesRead);
-		}
-		
-		
-		tempString[bytesRead] = '\0';
-		
-		printf("%s", tempString);
-	}
-	
-	printf("\n\n\n");
-	
-	//	All done!
-	
-	errCode = noErr;
-	
-	
-EXITPOINT:
-
-	//	Clean up and go home
-	
-	if (theSocket >= 0)
-	{
-		MacSocket_close(theSocket);
-	}
-	
-	if (ssl != nil)
-	{
-		SSL_free(ssl);
-	}
-	
-	if (ssl_ctx != nil)
-	{
-		SSL_CTX_free(ssl_ctx);
-	}
-	
-	
-	if (errCode != noErr)
-	{
-		printf("An error occurred:\n");
-		
-		printf("%s",GetErrorMessage());
-	}
-	
-	
-	MacSocket_Shutdown();
-}

MacOS/GetHTTPS.src/MacSocket.h

@@ -1,103 +0,0 @@
-#pragma once
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-enum
-{
-	kMacSocket_TimeoutErr = -2
-};
-
-
-//	Since MacSocket does busy waiting, I do a callback while waiting
-
-typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
-
-
-//	Call this before anything else!
-
-OSErr MacSocket_Startup(void);
-
-
-//	Call this to cleanup before quitting
-
-OSErr MacSocket_Shutdown(void);
-
-
-//	Call this to allocate a "socket" (reference number is returned in 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
-
-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 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
-
-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);
-
-
-//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
-//	This function will let you check whether that's true or not
-
-Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
-
-
-//	Call this to see if the listen has completed after a call to MacSocket_listen()
-
-Boolean MacSocket_ListenCompleted(const int inSocketNum);
-
-
-//	These really aren't very useful anymore
-
-Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
-Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
-
-
-//	You may wish to change the userRefPtr for a socket callback-- use this to do it
-
-void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
-
-
-//	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 this to get error info from a socket
-
-void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
-
-
-#ifdef __cplusplus
-}
-#endif

MacOS/Randomizer.cpp

@@ -1,476 +0,0 @@
-/* 
-------- Strong random data generation on a Macintosh (pre - OS X) ------
-		
---	GENERAL: We aim to generate unpredictable bits without explicit
-	user interaction. A general review of the problem may be found
-	in RFC 1750, "Randomness Recommendations for Security", and some
-	more discussion, of general and Mac-specific issues has appeared
-	in "Using and Creating Cryptographic- Quality Random Numbers" by
-	Jon Callas (www.merrymeet.com/jon/usingrandom.html).
-
-	The data and entropy estimates provided below are based on my
-	limited experimentation and estimates, rather than by any
-	rigorous study, and the entropy estimates tend to be optimistic.
-	They should not be considered absolute.
-
-	Some of the information being collected may be correlated in
-	subtle ways. That includes mouse positions, timings, and disk
-	size measurements. Some obvious correlations will be eliminated
-	by the programmer, but other, weaker ones may remain. The
-	reliability of the code depends on such correlations being
-	poorly understood, both by us and by potential interceptors.
-
-	This package has been planned to be used with OpenSSL, v. 0.9.5.
-	It requires the OpenSSL function RAND_add. 
-
---	OTHER WORK: Some source code and other details have been
-	published elsewhere, but I haven't found any to be satisfactory
-	for the Mac per se:
-
-	* The Linux random number generator (by Theodore Ts'o, in
-	  drivers/char/random.c), is a carefully designed open-source
-	  crypto random number package. It collects data from a variety
-	  of sources, including mouse, keyboard and other interrupts.
-	  One nice feature is that it explicitly estimates the entropy
-	  of the data it collects. Some of its features (e.g. interrupt
-	  timing) cannot be reliably exported to the Mac without using
-	  undocumented APIs.
-
-	* Truerand by Don P. Mitchell and Matt Blaze uses variations
-	  between different timing mechanisms on the same system. This
-	  has not been tested on the Mac, but requires preemptive
-	  multitasking, and is hardware-dependent, and can't be relied
-	  on to work well if only one oscillator is present.
-
-	* Cryptlib's RNG for the Mac (RNDMAC.C by Peter Gutmann),
-	  gathers a lot of information about the machine and system
-	  environment. Unfortunately, much of it is constant from one
-	  startup to the next. In other words, the random seed could be
-	  the same from one day to the next. Some of the APIs are
-	  hardware-dependent, and not all are compatible with Carbon (OS
-	  X). Incidentally, the EGD library is based on the UNIX entropy
-	  gathering methods in cryptlib, and isn't suitable for MacOS
-	  either.
-
-	* Mozilla (and perhaps earlier versions of Netscape) uses the
-	  time of day (in seconds) and an uninitialized local variable
-	  to seed the random number generator. The time of day is known
-	  to an outside interceptor (to within the accuracy of the
-	  system clock). The uninitialized variable could easily be
-	  identical between subsequent launches of an application, if it
-	  is reached through the same path.
-
-	* OpenSSL provides the function RAND_screen(), by G. van
-	  Oosten, which hashes the contents of the screen to generate a
-	  seed. This is not useful for an extension or for an
-	  application which launches at startup time, since the screen
-	  is likely to look identical from one launch to the next. This
-	  method is also rather slow.
-
-	* Using variations in disk drive seek times has been proposed
-	  (Davis, Ihaka and Fenstermacher, world.std.com/~dtd/;
-	  Jakobsson, Shriver, Hillyer and Juels,
-	  www.bell-labs.com/user/shriver/random.html). These variations
-	  appear to be due to air turbulence inside the disk drive
-	  mechanism, and are very strongly unpredictable. Unfortunately
-	  this technique is slow, and some implementations of it may be
-	  patented (see Shriver's page above.) It of course cannot be
-	  used with a RAM disk.
-
---	TIMING: On the 601 PowerPC the time base register is guaranteed
-	to change at least once every 10 addi instructions, i.e. 10
-	cycles. On a 60 MHz machine (slowest PowerPC) this translates to
-	a resolution of 1/6 usec. Newer machines seem to be using a 10
-	cycle resolution as well.
-	
-	For 68K Macs, the Microseconds() call may be used. See Develop
-	issue 29 on the Apple developer site
-	(developer.apple.com/dev/techsupport/develop/issue29/minow.html)
-	for information on its accuracy and resolution. The code below
-	has been tested only on PowerPC based machines.
-
-	The time from machine startup to the launch of an application in
-	the startup folder has a variance of about 1.6 msec on a new G4
-	machine with a defragmented and optimized disk, most extensions
-	off and no icons on the desktop. This can be reasonably taken as
-	a lower bound on the variance. Most of this variation is likely
-	due to disk seek time variability. The distribution of startup
-	times is probably not entirely even or uncorrelated. This needs
-	to be investigated, but I am guessing that it not a majpor
-	problem. Entropy = log2 (1600/0.166) ~= 13 bits on a 60 MHz
-	machine, ~16 bits for a 450 MHz machine.
-
-	User-launched application startup times will have a variance of
-	a second or more relative to machine startup time. Entropy >~22
-	bits.
-
-	Machine startup time is available with a 1-second resolution. It
-	is predictable to no better a minute or two, in the case of
-	people who show up punctually to work at the same time and
-	immediately start their computer. Using the scheduled startup
-	feature (when available) will cause the machine to start up at
-	the same time every day, making the value predictable. Entropy
-	>~7 bits, or 0 bits with scheduled startup.
-
-	The time of day is of course known to an outsider and thus has 0
-	entropy if the system clock is regularly calibrated.
-
---	KEY TIMING: A  very fast typist (120 wpm) will have a typical
-	inter-key timing interval of 100 msec. We can assume a variance
-	of no less than 2 msec -- maybe. Do good typists have a constant
-	rhythm, like drummers? Since what we measure is not the
-	key-generated interrupt but the time at which the key event was
-	taken off the event queue, our resolution is roughly the time
-	between process switches, at best 1 tick (17 msec). I  therefore
-	consider this technique questionable and not very useful for
-	obtaining high entropy data on the Mac.
-
---	MOUSE POSITION AND TIMING: The high bits of the mouse position
-	are far from arbitrary, since the mouse tends to stay in a few
-	limited areas of the screen. I am guessing that the position of
-	the mouse is arbitrary within a 6 pixel square. Since the mouse
-	stays still for long periods of time, it should be sampled only
-	after it was moved, to avoid correlated data. This gives an
-	entropy of log2(6*6) ~= 5 bits per measurement.
-
-	The time during which the mouse stays still can vary from zero
-	to, say, 5 seconds (occasionally longer). If the still time is
-	measured by sampling the mouse during null events, and null
-	events are received once per tick, its resolution is 1/60th of a
-	second, giving an entropy of log2 (60*5) ~= 8 bits per
-	measurement. Since the distribution of still times is uneven,
-	this estimate is on the high side.
-
-	For simplicity and compatibility across system versions, the
-	mouse is to be sampled explicitly (e.g. in the event loop),
-	rather than in a time manager task.
-
---	STARTUP DISK TOTAL FILE SIZE: Varies typically by at least 20k
-	from one startup to the next, with 'minimal' computer use. Won't
-	vary at all if machine is started again immediately after
-	startup (unless virtual memory is on), but any application which
-	uses the web and caches information to disk is likely to cause
-	this much variation or more. The variation is probably not
-	random, but I don't know in what way. File sizes tend to be
-	divisible by 4 bytes since file format fields are often
-	long-aligned. Entropy > log2 (20000/4) ~= 12 bits.
-	
---	STARTUP DISK FIRST AVAILABLE ALLOCATION BLOCK: As the volume
-	gets fragmented this could be anywhere in principle. In a
-	perfectly unfragmented volume this will be strongly correlated
-	with the total file size on the disk. With more fragmentation
-	comes less certainty. I took the variation in this value to be
-	1/8 of the total file size on the volume.
-
---	SYSTEM REQUIREMENTS: The code here requires System 7.0 and above
-	(for Gestalt and Microseconds calls). All the calls used are
-	Carbon-compatible.
-*/
-
-/*------------------------------ Includes ----------------------------*/
-
-#include "Randomizer.h"
-
-// Mac OS API
-#include <Files.h>
-#include <Folders.h>
-#include <Events.h>
-#include <Processes.h>
-#include <Gestalt.h>
-#include <Resources.h>
-#include <LowMem.h>
-
-// Standard C library
-#include <stdlib.h>
-#include <math.h>
-
-/*---------------------- Function declarations -----------------------*/
-
-// declared in OpenSSL/crypto/rand/rand.h
-extern "C" void RAND_add (const void *buf, int num, double entropy);
-
-unsigned long GetPPCTimer (bool is601);	// Make it global if needed
-					// elsewhere
-
-/*---------------------------- Constants -----------------------------*/
-
-#define kMouseResolution 6		// Mouse position has to differ
-					// from the last one by this
-					// much to be entered
-#define kMousePositionEntropy 5.16	// log2 (kMouseResolution**2)
-#define kTypicalMouseIdleTicks 300.0	// I am guessing that a typical
-					// amount of time between mouse
-					// moves is 5 seconds
-#define kVolumeBytesEntropy 12.0	// about log2 (20000/4),
-					// assuming a variation of 20K
-					// in total file size and
-					// long-aligned file formats.
-#define kApplicationUpTimeEntropy 6.0	// Variance > 1 second, uptime
-					// in ticks  
-#define kSysStartupEntropy 7.0		// Entropy for machine startup
-					// time
-
-
-/*------------------------ Function definitions ----------------------*/
-
-CRandomizer::CRandomizer (void)
-{
-	long	result;
-	
-	mSupportsLargeVolumes =
-		(Gestalt(gestaltFSAttr, &result) == noErr) &&
-		((result & (1L << gestaltFSSupports2TBVols)) != 0);
-	
-	if (Gestalt (gestaltNativeCPUtype, &result) != noErr)
-	{
-		mIsPowerPC = false;
-		mIs601 = false;
-	}
-	else
-	{
-		mIs601 = (result == gestaltCPU601);
-		mIsPowerPC = (result >= gestaltCPU601);
-	}
-	mLastMouse.h = mLastMouse.v = -10;	// First mouse will
-						// always be recorded
-	mLastPeriodicTicks = TickCount();
-	GetTimeBaseResolution ();
-	
-	// Add initial entropy
-	AddTimeSinceMachineStartup ();
-	AddAbsoluteSystemStartupTime ();
-	AddStartupVolumeInfo ();
-	AddFiller ();
-}
-
-void CRandomizer::PeriodicAction (void)
-{
-	AddCurrentMouse ();
-	AddNow (0.0);	// Should have a better entropy estimate here
-	mLastPeriodicTicks = TickCount();
-}
-
-/*------------------------- Private Methods --------------------------*/
-
-void CRandomizer::AddCurrentMouse (void)
-{
-	Point mouseLoc;
-	unsigned long lastCheck;	// Ticks since mouse was last
-					// sampled
-
-#if TARGET_API_MAC_CARBON
-	GetGlobalMouse (&mouseLoc);
-#else
-	mouseLoc = LMGetMouseLocation();
-#endif
-	
-	if (labs (mLastMouse.h - mouseLoc.h) > kMouseResolution/2 &&
-	    labs (mLastMouse.v - mouseLoc.v) > kMouseResolution/2)
-		AddBytes (&mouseLoc, sizeof (mouseLoc),
-				kMousePositionEntropy);
-	
-	if (mLastMouse.h == mouseLoc.h && mLastMouse.v == mouseLoc.v)
-		mMouseStill ++;
-	else
-	{
-		double entropy;
-		
-		// Mouse has moved. Add the number of measurements for
-		// which it's been still. If the resolution is too
-		// coarse, assume the entropy is 0.
-
-		lastCheck = TickCount() - mLastPeriodicTicks;
-		if (lastCheck <= 0)
-			lastCheck = 1;
-		entropy = log2l
-			(kTypicalMouseIdleTicks/(double)lastCheck);
-		if (entropy < 0.0)
-			entropy = 0.0;
-		AddBytes (&mMouseStill, sizeof (mMouseStill), entropy);
-		mMouseStill = 0;
-	}
-	mLastMouse = mouseLoc;
-}
-
-void CRandomizer::AddAbsoluteSystemStartupTime (void)
-{
-	unsigned long	now;		// Time in seconds since
-					// 1/1/1904
-	GetDateTime (&now);
-	now -= TickCount() / 60;	// Time in ticks since machine
-					// startup
-	AddBytes (&now, sizeof (now), kSysStartupEntropy);
-}
-
-void CRandomizer::AddTimeSinceMachineStartup (void)
-{
-	AddNow (1.5);			// Uncertainty in app startup
-					// time is > 1.5 msec (for
-					// automated app startup).
-}
-
-void CRandomizer::AddAppRunningTime (void)
-{
-	ProcessSerialNumber PSN;
-	ProcessInfoRec		ProcessInfo;
-	
-	ProcessInfo.processInfoLength = sizeof (ProcessInfoRec);
-	ProcessInfo.processName = nil;
-	ProcessInfo.processAppSpec = nil;
-	
-	GetCurrentProcess (&PSN);
-	GetProcessInformation (&PSN, &ProcessInfo);
-
-	// Now add the amount of time in ticks that the current process
-	// has been active
-
-	AddBytes (&ProcessInfo, sizeof (ProcessInfoRec),
-			kApplicationUpTimeEntropy);
-}
-
-void CRandomizer::AddStartupVolumeInfo (void)
-{
-	short			vRefNum;
-	long			dirID;
-	XVolumeParam	pb;
-	OSErr			err;
-	
-	if (!mSupportsLargeVolumes)
-		return;
-		
-	FindFolder (kOnSystemDisk, kSystemFolderType, kDontCreateFolder,
-			&vRefNum, &dirID);
-	pb.ioVRefNum = vRefNum;
-	pb.ioCompletion = 0;
-	pb.ioNamePtr = 0;
-	pb.ioVolIndex = 0;
-	err = PBXGetVolInfoSync (&pb);
-	if (err != noErr)
-		return;
-		
-	// Base the entropy on the amount of space used on the disk and
-	// on the next available allocation block. A lot else might be
-	// unpredictable, so might as well toss the whole block in. See
-	// comments for entropy estimate justifications.
-
-	AddBytes (&pb, sizeof (pb),
-		kVolumeBytesEntropy +
-		log2l (((pb.ioVTotalBytes.hi - pb.ioVFreeBytes.hi)
-				* 4294967296.0D +
-			(pb.ioVTotalBytes.lo - pb.ioVFreeBytes.lo))
-				/ pb.ioVAlBlkSiz - 3.0));
-}
-
-/*
-	On a typical startup CRandomizer will come up with about 60
-	bits of good, unpredictable data. Assuming no more input will
-	be available, we'll need some more lower-quality data to give
-	OpenSSL the 128 bits of entropy it desires. AddFiller adds some
-	relatively predictable data into the soup.
-*/
-
-void CRandomizer::AddFiller (void)
-{
-	struct
-	{
-		ProcessSerialNumber psn;	// Front process serial
-						// number
-		RGBColor	hiliteRGBValue;	// User-selected
-						// highlight color
-		long		processCount;	// Number of active
-						// processes
-		long		cpuSpeed;	// Processor speed
-		long		totalMemory;	// Total logical memory
-						// (incl. virtual one)
-		long		systemVersion;	// OS version
-		short		resFile;	// Current resource file
-	} data;
-	
-	GetNextProcess ((ProcessSerialNumber*) kNoProcess);
-	while (GetNextProcess (&data.psn) == noErr)
-		data.processCount++;
-	GetFrontProcess (&data.psn);
-	LMGetHiliteRGB (&data.hiliteRGBValue);
-	Gestalt (gestaltProcClkSpeed, &data.cpuSpeed);
-	Gestalt (gestaltLogicalRAMSize, &data.totalMemory);
-	Gestalt (gestaltSystemVersion, &data.systemVersion);
-	data.resFile = CurResFile ();
-	
-	// Here we pretend to feed the PRNG completely random data. This
-	// is of course false, as much of the above data is predictable
-	// by an outsider. At this point we don't have any more
-	// randomness to add, but with OpenSSL we must have a 128 bit
-	// seed before we can start. We just add what we can, without a
-	// real entropy estimate, and hope for the best.
-
-	AddBytes (&data, sizeof(data), 8.0 * sizeof(data));
-	AddCurrentMouse ();
-	AddNow (1.0);
-}
-
-//-------------------  LOW LEVEL ---------------------
-
-void CRandomizer::AddBytes (void *data, long size, double entropy)
-{
-	RAND_add (data, size, entropy * 0.125);	// Convert entropy bits
-						// to bytes
-}
-
-void CRandomizer::AddNow (double millisecondUncertainty)
-{
-	long time = SysTimer();
-	AddBytes (&time, sizeof (time), log2l (millisecondUncertainty *
-			mTimebaseTicksPerMillisec));
-}
-
-//----------------- TIMING SUPPORT ------------------
-
-void CRandomizer::GetTimeBaseResolution (void)
-{	
-#ifdef __powerc
-	long speed;
-	
-	// gestaltProcClkSpeed available on System 7.5.2 and above
-	if (Gestalt (gestaltProcClkSpeed, &speed) != noErr)
-		// Only PowerPCs running pre-7.5.2 are 60-80 MHz
-		// machines.
-		mTimebaseTicksPerMillisec =  6000.0D;
-	// Assume 10 cycles per clock update, as in 601 spec. Seems true
-	// for later chips as well.
-	mTimebaseTicksPerMillisec = speed / 1.0e4D;
-#else
-	// 68K VIA-based machines (see Develop Magazine no. 29)
-	mTimebaseTicksPerMillisec = 783.360D;
-#endif
-}
-
-unsigned long CRandomizer::SysTimer (void)	// returns the lower 32
-						// bit of the chip timer
-{
-#ifdef __powerc
-	return GetPPCTimer (mIs601);
-#else
-	UnsignedWide usec;
-	Microseconds (&usec);
-	return usec.lo;
-#endif
-}
-
-#ifdef __powerc
-// The timebase is available through mfspr on 601, mftb on later chips.
-// Motorola recommends that an 601 implementation map mftb to mfspr
-// through an exception, but I haven't tested to see if MacOS actually
-// does this. We only sample the lower 32 bits of the timer (i.e. a
-// few minutes of resolution)
-
-asm unsigned long GetPPCTimer (register bool is601)
-{
-	cmplwi	is601, 0	// Check if 601
-	bne	_601		// if non-zero goto _601
-	mftb  	r3		// Available on 603 and later.
-	blr			// return with result in r3
-_601:
-	mfspr r3, spr5  	// Available on 601 only.
-				// blr inserted automatically
-}
-#endif

MacOS/Randomizer.h

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

MacOS/TODO

@@ -1,18 +0,0 @@
--------------------------------------------------------------------
-Verify server certificate
--------------------------------------------------------------------
-Currently omitted from the project:
-
-	crypto/tmdiff.c
-	crypto/bio/bss_conn.c
-	crypto/bio/b_sock.c
-	crypto/bio/bss_acpt.c
-	crypto/bio/bss_log.h
-
--------------------------------------------------------------------
-Build libraries to link with...
--------------------------------------------------------------------
-Port openssl application.
--------------------------------------------------------------------
-BN optimizations (currently PPC version is compiled with BN_LLONG)
--------------------------------------------------------------------

MacOS/_MWERKS_GUSI_prefix.h

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

MacOS/_MWERKS_prefix.h

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

MacOS/buildinf.h

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

MacOS/mklinks.as.hqx

@@ -1,820 +0,0 @@
-(This file must be converted with BinHex 4.0)
-
-:#QeVE'PZDh-ZBA-!39"36'&`E(3J!!!!!!!!!*LiI6m!!!!!!3!!!*G#!!#@3J!
-!!AChFQPd!!!!K3)"!3m(Fh9`F'pbG!!!!)B#!3%$"(0eFQ8!!!#(!J-%"!3("3C
-cGfPdBfJ!!!#)!J%"#39cH@jMD!!!!)N#"J%$!`-&"3-'FhPcG'9Y!!!!LJ)&"3)
-%!J8("!-#!`4dB@*X!!!!L`))!3-$!`-$!`-$"(4PE'`!!!#-!J)"#38$G'KP!!!
-!M3))(J)@!Ki#!J))!K)#!`)B!Kd%G'KPE3!!!)i#!J%&#`4dD'9j!!!!M`)#!J)
-#$3TdD(*[G@GSEh9d!!!!N!!#!3%&"(4TCQB!!!#4!J%"!`4dD@eP!!!!NJ)"!JS
-#!h4T!!!!'N!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!H!!!!!!!#!!!!!!
-!!!!!!!!!!!!!rrrrr`!!!$3!!!!N!!!!!#"[!!5JAb"[!!5K++!M6R9$9'mJFR9
-Z)(4SDA-JFf0bDA"d)'&`F'aTBf&dD@pZ,#"jEh8JEA9cG#"QDA*cG#"TER0dB@a
-X)%&`F'aP8f0bDA"d,J!!!)C8D'Pc)(0MFQP`G#"MFQ9KG'9c)#iZ,fPZBfaeC'8
-[Eh"PER0cE#"KEQ3JCQPXE(-JDA3JGfPdD#"ZC@0PFh0KFRNJB@aTBA0PFbi0$8P
-d)'eTCfKd)(4KDf8JB5"hD'PXC5"dEb"MEfe`E'9dC5"cEb"`E'9KFf8JBQ8JF'&
-dD@9ZG$SY+3!!!#S!!J!!!!!!$3!+!"!!!!!-!!!!!!!!!!!!63!0!!S!%!%!!!`
-!!!!!!!!!!!!B!!!!+!!!!!!!!!!)!!!!)!#N2c`!!DR`!!!!l!!!!!&19[ri,`0
-f!#m$-$bKVDG'*KmY52ri,`-`2+LITdBQ(b!ZrrLa`'FJ,`-J2'0`ER4"l[rm)NL
-KV5+)*Kp+3'B)5Ulrr'F#GJ%3!bBZrr41ANje6PB!!#m-@Bm[2%j29%Nr2!#!U"m
-SAb!-CJK`!cm!UFKJ+#m-UC)J9#!)d+J!'#&!!"JJ9#!)d+J!(#&!!"a9Mbm8)&q
-JAMk!9%mSE[rm6Pj1G8j@!!![$%kkre4+!'FU@Bm[2'&`E(3[2(0MF(4`)DJU+&m
-J$'F5@Bm[$#mm!!!!!A!!U#UTp&K26VVrG#KZrra1ANje!!!!('&`E(3!!!!"4P*
-&4J!!!!!!J%P$6L-!!!!!!*B!!!!"!!!!!!G"8&"-!!!!!!!"!!!"!!!!!S!!!!4
-!!!"i)!!!K"!!!3))!!)#"!!%"!)!#!J"!"!8!)!J)J"!3%%!)2#!J"#*!%!)KJ!
-J")3!)!*!!"!")!!3!K!!%!3)!"!)"!!J%!)!3#!"!)"!!S%!J!5#!3!)4!)!#%J
-%!!KB#!!%C"!!!m)J!!!"3!!!!)!!!!%!!!!$J!!!"m!!!(rJ!!$rm!!"rrJ!!rr
-m!!IrrJ!2rrm!(rrrJ$rrrm"rrrrJrrrrm2rrrrMrrrrmrrrrrRrrrrmrrrrq(rr
-rr!rrrrJ(rrr`!rrri!(rrm!$rrq!"rrr!!rrrJ!2rr`!$rri!!IRm!!$`q!!!!(
-!!!!!J!!!!!)!!!!!!!!!!!m!!!!!!!!!!!!!!!!!!!$`m!!!!!!!!!!!!!!!!!!
-2!!m!!!!!!!!!!!!!!!rrm!!!m!!!!!!!!!!!!!$`c0m!!!m!!!!!!!!!!!!2!!c
--m!!!m!!!!!!!!!!!m!$-cI!!!!m!!!!!!!!!$`!-c0m!!!!!m!!!!!!!!2!!c-h
-`!!!!!!m!!!!!!!m!$-cIh`!!!!!!m!!!!!$`!-c0rGh`!!!!!!m!!!!2!!c-hph
--h`!!!!!!m!!!rrr-cIhF`-h`!!!!!!m!!2lFr0rGc!`-h`!!!!!!m!$pc-rph-$
-!`-h`!!!!!!m!r-`2cF`-$!!-r3!!!!!!m!m!`-c!`-!!$0m!!!!!$-m!m!`-$!`
-!!-cI!!!!!-c`!!m!`-$!!!`-h`!!!!c2!!!!m!`-!!$!c0m!!!$-m!!!!!m!`!!
--$-hm!!!-c`!!!!!!m!!!`-cIc!!!c2!!!!!!!!m!$!c0r-`!$-m!!!!!!!$pm-$
--hmc!!-c`!!!!!!!2hI`-cIc-!!c2!!!!!!!!rGc2c0r-`!$-m!!!!!!!!2h-cmh
-mc!!-c`!!!!!!!!$mc!rIr-!!c2!!!!!!!!!!$m$2m!r-$-m!!!!!!!!!!!$rr`!
-!r-c`!!!!!!!!!!!!!!!!!!r2!!!!!!!!!!!!!!!!!!!!m!!!!!!!!!!!!!"!!B!
-13"%J)4"##18%Q)+3!%&!)5!L%%3BL#83*L!G3!#!!B!2`"rJ2r"rq2rmrrlrrhr
-r2riIr"ri2r!ri"h!!)!!!!#!!!!!$r!!!!!!!2r`$`!!!!!2$!m!m!!!!2$!c`!
-2!!!2$!c`!!$`!2r`cpm!!!m!rGrpc2!!!2$p$p`-c`!!$`m!`-$0m!$2!2!-$-h
-`$2!!$`$-hm$2!!!2m-hm$2!!!2h2hm$2!!!!r-rm$2!!!!!2r`r2!!!!!!!!!2!
-!!!!!!!#D8f0bDA"d)%&`F'aTBf&dD@pZ$3e8D'Pc)(0MFQP`G#"MFQ9KG'9c)#i
-Z,fPZBfaeC'8[Eh"PER0cE#"KEQ3JCQPXE(-JDA3JGfPdD#"ZC@0PFh0KFRNJB@a
-TBA0PFbi0$8Pd)'eTCfKd)(4KDf8JB5"hD'PXC5"dEb"MEfe`E'9dC5"cEb"`E'9
-KFf8JBQ8JF'&dD@9ZG$SY+3!!!")!!J!!!!!!!!!!!!%!"J!'%iN!!!!+@1!!!b!
-!!!-J!!!!!"3!+`!(!Cm#@!!V!!F"f!*B!!!!!3!!M`C'BA0N98&6)$%Z-6!a,M%
-`$J!!!!32rrm!!3!#!!-"rrm!!!d!!3!"D`!!!!!!!!!%!J!%!!)!"3!'$3!&!!*
-X!!)!!!U`!!IrrJd!"`!#6`!!!!!+X!!)!!N0!!J!!@X!!!!%#Um!#J)!#J!#!!X
-!$!d!#`!#E!!#!!3!"2rprr`"rrd!!!(rr!!!!J!-!!)!$3!1$3!0!!*X!!%!"!!
-%rrX!$`(rq`!!$!!2!&N!8b"(CA3JF'&dD#"dEb"dD'Pc)%&`F'aP8f0bDA"d)'&
-`F'aPG$XJGA0P)'Pd)(4[)'C[FQdJG'KP)("KG'JJG'mJG'KP)'PZBfaeC'8JCQp
-XC'9b!!)!!!)!$J!#!"!!%3d!%!!#E!!"!!3!"2rk!")"rrS!!!`!%J!Q!#!JB@j
-N)(4SC5"[G'KPFL"bC@aPGQ&ZG#"QEfaNCA*c,J!#!!!#!"%!!J!6!"30!"-!!R-
-!!!!%!"%!&3!@$3!9!!*M!!!!"!!1!"F!'!d!&`!#E!!&!!3!$!!CrrN0!"N!!Qi
-!!!!%!!`!'J!E$3!D!!)d!!!!"3!-rrJ!(!Vrq!!%#Q0[BQS0!"`!!Q`!"3!'!!X
-!(Irh$3!G!!0*!!)!"J!,rrB!([re#[rf!"JZC@&bFfCQC(*KE'Pc!!!!!!!!)!"
-KCQ4b$3!H!!"Q!!!!"J!(![re!!!"rrF!!!d!'`!"E3!!!!3!"3!I$`!I!6J)ER9
-XE!!!!!!!!Gq!rrm!!!!A"NCTEQ4PFJ!!(`*[Me!!ASfm!Qq,i!"HA[!!I&M!!!!
-!!!!!'mi!!JN#!Qq-1!!!Kb%#Ei`J!!!!!%C14&*038e"3e-!!"%!B@aTF`!!!!!
-!fJ!#!!!-6@&MD@jdEh0S)%K%!!!!!!!!!!!!!!!!!!!!XSA5h%*%!!!!!!!A"NC
-TEQ4PFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!!!!!!!!!!!!!!!!!!!3rLc#@a!4Nj%8Ne"3e2rrrrr!!!!!!!!!!!!!!!!!!!
-!!!!!!!e6HA0dC@dJ4QpXC'9b!!!"!!3!!!!A!!)!)8eKBfPZG'pcD#")4$T6HA0
-dC@dJ4QpXC'9b1NCTEQ4PFJ$rr`!!!Irj!!!0!"J!!@d!!!!-!!hrp!Vrp!!%#Q0
-dH(30!"B!!@m!!!!!!!$rm`[rm`!5-!!(G'KPF'&dD!!(G'KP8'&dD!)!&!!#!#!
-!)3d!)!!#E!!#!")!%[rbrr%"rr)!!!(rm3!!!J!K!!)!)J!M$3!L!!*b!!!!%J!
-A!#3!*3d!*!!#EJ!$!")!&3!Q!#F0!#B!!6%!!!!6!"Arm!Vrm!!%#R4iC'`0!#F
-!!6%!!!!5!"2rl`Vrl`!%#Q&cBh)0!#8!!@m!!!!!!!$rlJ[rlJ!F-!!-G'KPEfa
-NC'9XD@ec!!adD'92E'4%C@aTEA-#!#-!!J!S!#N0!#J!!R)!!!!B!"d!+J!V$3!
-U!!&Y!!!!'!!C!#`-!#`!"`!"1J!#!!!0!#X!!Qi!!`!!!!!!,3!Z$3!Y!!%a!!!
-!'J!Frqd+rqd!"!TdH'4X$3!Z!!%a!!!!'3!Drq`+rq`!"!TKFf0b!J!T!!)!,`!
-`$3![!!*X!!)!(J!Hrq[rkJ(rk`!!!IrU!!!#!$!!!J!a!$)0!$%!!R)!!!!H!#X
-!-`!d$3!c!!*X!!8!(J!T!$Ark3d!03!#EJ!!!"i!+3!f!$F0!$B!!cF"!!!I!#R
-rk!!i!$N+rqJ!"!TMDA4Y$3!i!!&Y!!!!)`!PrqF$rqF!!3d!13!"E3!!!#B!+2r
-Q!rrQrrd0!$F!!@m!!!!H!"rrj3[rj3!5-!!(G'KPF'&dD!!(G'KP8'&dD!(rk3!
-!$3!d!!&[!!!!!!!!rq3,rq3!)$!!$R4SCA"bEfTPBh4`BA4S!!jdD'93FQpUC@0
-d8'&dD!)!-J!#!$S!1`d!1J!#FJ!!!#`!1`!m!$d0!$`!!Q-!!!!X!$N!2J!r$3!
-q!!*X!!8!,!!h!%$ri`d!3!!#EJ!!!#`!0`""!%)0!%%!!cF"!!!Y!$IriJ"$!%3
-+rq)!"!TMDA4Y$3"$!!&Y!!!!-3!crq%$rq%!!3d!4!!"E3!!!$3!0[rJ!rrJrri
-0!%)!!@m!!!!X!#hrh`[rh`!5-!!(G'KPF'&dD!!(G'KP8'&dD!(ri`!!$3!r!!&
-Y!!!!0`!irpi+rpi!"!T849K8$3!p!!&[!!!!!!!!rpd,rpd!&M!!#A4SC@ePF'&
-dD!!*G'KP6@93BA4S!J!l!!)!43"'$3"&!!*X!!)!2!!mrpcrf`(rh!!!!IrE!!!
-#!%B!!J"(!%J0!%F!!R)!!!!m!%8!53"+$3"*!!*M!!!!2!""!%X!6!d!5`!#BJ!
-!!$`!2`"0!%i0!%d!!@m!!!!m!$hrfJ[rfJ!J-!!1G'KPF(*[DQ9MG("KG'J!$R4
-SC9"bEfTPBh43BA4S$3"1!!&Y!!!!23!q!%m-!%m!$3!(D@jME(9NC3!#!!!0!%`
-!!@d!!!!r!%$rf3Vrf3!%#P4&@&30!%S!!@m!!!!!!!$rf![rf!!Q-!!4D@jME(9
-NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S!J")!!)!8!"4$3"3!!*b!!!
-!4J"9!&)!8`d!8J!#B`!!!%B!83"8!&80!&3!!Q)!!!"'!%m!9J"A$3"@!!*L!!!
-!4J",!&J!@3d!@!!"E`!!!%B!4rrA#rrA!#!`!!jdD'9`FQpUC@0dF'&dD!!1G'K
-P8(*[DQ9MG&"KG'J0!&N!!@d!!!"(!%S!@J`!@J!0!!GTEQ0XG@4P!!)!!!d!9`!
-"E3!!!%X!6J"E$!"E!!d!"fp`C@jcFf`!!J!!$3"9!!&Y!!!!6`"3rpB+rpB!"!T
-849K8$3"6!!&[!!!!!!!!rp8,rp8!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
-dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S!J"4!!)!A!"G$3"F!!*b!!!!9J"
-K!&i!A`d!AJ!#B`!!!&B!A3"J!'%0!'!!!Q)!!!"@!&X!BJ"M$3"L!!&[!!!!9J"
-Arp3,rp3!)$!!$R4SCA"bEfTPBh4`BA4S!!jdD'93FQpUC@0d8'&dD!d!B`!"E3!
-!!&F!@J"N$!"N!!`!"Q0bHA"dE`!#!!!0!'%!!@d!!!"E!&crd`Vrd`!%#P4&@&3
-0!&m!!@m!!!!!!!$rdJ[rdJ!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4Qp
-XC'9b8'&dD!)!A3!#!'8!CJd!C3!#FJ!!!')!E3"R!'J0!'F!!Q-!!!"L!'N!D3"
-U$3"T!!*L!!!!BJ"R!'X!E!d!D`!"E`!!!')!Brr4#rr4!#!`!!jdD'9`FQpUC@0
-dF'&dD!!1G'KP8(*[DQ9MG&"KG'J0!'`!!@d!!!"M!'B!E3`!E3!*!!0cFf`!!J!
-!$3"U!!&Y!!!!C`"Srp!+rp!!"!T849K8$3"S!!&[!!!!!!!!rmm,rmm!(M!!$A0
-cE'C[E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J#!'B!!J"Z!'m0!'i!!R)!!!"Z!(8
-!F!"a$3"`!!*M!!!!EJ"a!()!F`d!FJ!"E`!!!'i!Err1#rr1!#!`!!jdD'9`FQp
-UC@0dF'&dD!!1G'KP8(*[DQ9MG&"KG'J0!(-!!@d!!!"[!($rc3Vrc3!%#P4&@&3
-0!(%!!@m!!!!!!!$rc![rc!!Q-!!4Eh"PER0cE'C[E'4PFR"KG'J!%@p`C@jcFfa
-'EfaNCA*3BA4S!J"[!!)!G!"e$3"d!!*X!!)!GJ"frm[rbJ(rb`!!!Ir+!!!#!(8
-!!J"f!(F0!(B!!R)!!!"f!(X!H!"j$3"i!!&[!!!!GJ"hrmN,rmN!($!!$(4SC@p
-XC'4PE'PYF`!-G'KP6faN4'9XD@ec$3"j!!*Z!!-!!!!!!(S!H`d!HJ!"-3!!!(J
-!H[r)#[r)!!3+G(KNE!d!H`!"-3!!!(F!H2r(#[r(!!3+BA0MFJ)!G`!#!(`!I3d
-!I!!#E!!#!(`!I2r'rm8"rmB!!!(ra3!!!J"p!!)!IJ"r$3"q!!*X!!%!I!"mrm3
-!J!(ra!!!$!#!!%!!1L"NC@aPG'8JEfaN)'PZBfaeC'8kEh"PER0cE#"QEfaNCA)
-JB@jN)(*PBh*PBA4P)'Pd)'0XC@&ZE(N!!J!!!J"r!!)!J3##$3#"!!*X!!)!I!"
-mrm2r`J(r``!!!Ir#!!!#!))!!J#$!)30!)-!!e%!!!"m!+8!K3#'!)F0!)8!!@X
-!!!"r!*`!L!)!L!!#!)N!LJd!L3!$53!#!(m!N[r"!)[r`!Vr`3!B,QeTFf0cE'0
-d+LSU+J!!!!!!!*!!!#SU+LS0!)X!!Qi!!!"r!)i!M!#0$3#-!!)d!!!!K`#1rlm
-!MJVr[`!%#Q0QEf`0!)i!!@d!!!#+!)d!M``!M`!0!!G[F'9ZFh0X!!)!!!d!M3!
-#0!!!!(m!Krqq!*!!#[qq!!3+BfC[E!d!N!!!!@m!!!#$!)Er[3[r[3!Q-!!4D@j
-ME(9NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S![r!!!!#!)S!!J#4rl`
-0!*%!!dN!!J#6!*crZ`#5rlS+rlX!'#jMEh*PC'9XEbSU+LS!!!!!!!#3!!!U+LS
-U$3#5!!%a!!!!N`#BrlN+rlN!"!TcC@aP![qk!!!#rl`!!!d!KJ!$8J!!!!!!!2q
-irlIrYJVrZ!!B,Q&cBh*PFR)J+LSU+J!!!!!!!*!!!#SU+LS"rlF!!!,rYJ!!$3#
-(!!*X!!%!T!#Nrl8!N`(rY3!!$!#6!"-!$5"TCfj[FQ8JCA*bEh)!!J!!!J#%!!)
-!P!#9$3#8!!*X!!)!TJ#Qrl6rX`(rY!!!!Iqc!!!#!*8!!J#@!*F0!*B!!dN!!J#
-Q!,lrX[qa!*J+rl)!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Iqa!!!'!*J
-!!rq`!*N!QJVrX!!%#QY[Bf`0!*N!!@d!!!#U!+hrV`VrV`!%#Q0QEf`'!*S!!rq
-Z!*[rV3VrVJ!%#QPZFfJ0!*X!!M3!!!#`!,MrV!#F#[qX!!3+BfC[E!d!R!!"E`!
-!!,3!YrqV#rqV!#B`!"&TEQ0XG@4PCQpXC'9bF'&dD!!4D@jME(9NC8C[E'4PFP"
-KG'J'rkd!!!)!P`!#!*d!RJd!R3!#FJ!!!,m!aJ#I!+!0!*m!!Q`"!!#r!-)!SIq
-U$3#K!!%a!!!![`$#rkN+rkN!"!TbFfad!IqU!!!0!+!!!@m!!!!!!!$rU![rU!!
-Z-!!9G'KPEQ9hCQpXC'9bFQ9QCA*PEQ0P!"9dD'91CAG'EfaNCA*5C@CPFQ9ZBf8
-#!*i!!J#L!+-0!+)!!dN!!J$(!-lrT`#NrkB+rkF!'#jYDA0MFfaMG#SU+LS!!!!
-!!!#3!!!U+LSU$3#N!!&[!!!!a`$+rk8,rk8!,M!!&A4SC@jPGfC[E'4PFR*PCQ9
-bC@jMC3!9G'KP6Q9h4QpXC'9b8Q9QCA*PEQ0P![qQ!!!#!+-!!J#P!+B0!+8!!R)
-!!!$2!0`!T`#S$3#R!!&Y!!!!c`$5!+N-!+N!$3!(Eh"PER0cE!!#!!!0!+J!!Qi
-!!!!!!!!!UJ#V$3#U!!%a!!!!e`$Erk3+rk3!"!T`EQ&Y$3#V!!%a!!!!dJ$Ark-
-+rk-!"!TcC@aP!J#Q!!)!V!#Y$3#X!!*X!!)!h3$Grk,rS3(rSJ!!!IqK!!!#!+d
-!!J#Z!+m0!+i!!Q`!!3$G!0hrS!#`!IqJ!!!-!,!!(`!C)&0dBA*d)'eKDfPZCb"
-dD'8JB@aTBA0PF`!#!!!#!+m!!J#a!,)0!,%!!dN!!J$G!3ArRrqH!,-+rjm!'#j
-MEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!IqH!!!'!,-!!rqG!,3!Y3VrR3!%#QY
-[Bf`0!,3!!@d!!!$K!16rR!VrR!!%#Q&XD@%'!,8!!rqE!,B!Y`VrQ`!%#QPZFfJ
-0!,B!!M3!!!$R!1rrQJ#i#[qD!!3+BfC[E!d!Z!!"E`!!!1X!l[qC#rqC!$3`!"K
-[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&
-dD!B!Y`!$rjJ!ZIqA#[qB!!3+G'mJ)!d!Z3!#EJ!!!2)!r`#k!,X0!,S!!M3!!!$
-i!2rrPJ#m#[q@!!3+CQPXC3d![!!"E3!!!2X!rJ#p$!#p!"-!$@p`C@jcFfaMEfj
-Q,QJ!!J!!$3#l!!)d!!!!mJ$irj8![JVrP3!%#Q0QEf`0!,i!!@m!!!$f!2IrP![
-rP!!@-!!*G'KPE@9`BA4S!!PdD'90C9"KG'J'rjF!!!)!XJ!#!,m!`!d![`!#E!!
-#!3B""[q6rj)"rj-!!!(rNJ!!!J$!!!)!`3$#$3$"!!*b!!!""J%4!--!a!d!``!
-#BJ!!!3B"$3$&!-B0!-8!!@m!!!%'!3RrN3[rN3!N-!!3Bh*jF(4[CQpXC'9bF'&
-dD!!3Bh*jF(4[4QpXC'9b8'&dD!d!aJ!"E3!!!3N"$!$($!$(!!X!"6TKFfia!!)
-!!!d!a!!"E`!!!!!!!2q3!![rN!!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)!`J!
-#!-J!b3d!b!!$53!#!4)"22q2rii!bJVrM`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!
-!!'jeE'`"rii!!!B!bJ!$rid!b`$-#[q0!!3+DfpME!d!b`!"E3!!!4B"'Iq-#[q
--!!3+B@aTB3B!c!!$riX!c3$1#[q,!!3+D@jcD!d!c3!#0!!!!4`"*2q+!-m+riS
-!"!TMCQpX$3$2!!&[!!!")!%MriN,riN!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9
-bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J$1!!2rL!$3riF+riJ!"!T
-dEb!J$3$3!!*Z!!!"*`%f!0%!dJd!d3!#0!!!!5m"0[q'!0-+riB!"!TQD@aP$3$
-6!!&Y!!!"-J%e!03-!03!$!!'BA0Z-5jS!!)!!!d!dJ!#0!!!!5F",rq&!08+ri8
-!"!TMCQpX$3$9!!&[!!!"+`%Zri3,ri3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!E
-rK`!!!J$*!!)!eJ$A$3$@!!0*!!)"23&Rri2rJJ$B#[q$!"JZBfpbC@0bC@`U+LS
-U!!!!!!!!N!!!ER9XE!(rJJ!!"J$B!!2rJ3$C!0S+ri%!"!TVEf0X$3$C!!&Y!!!
-"33&%ri!+ri!!"!TKE'PK"J$D!!2rI`$E!0`+rhm!"!TTER0S$3$E!!)d!!!"4`&
-2rhi!h3VrIJ!%#Q0QEf`0!0d!!@m!!!&,!8lrI3[rI3!d-!!BEh"PER0cE'PZBfa
-eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!0`!!rpm!0l
-rH`VrI!!%#R4[)#!0!0i!!Qi!!!&5!@%!h`$J$3$I!!)d!!!"@J&KrhS!i3VrHJ!
-%#QCTE'80!1%!!@d!!!&G!@!!iJ`!iJ!3!!TKFfiaAfeKBbjS!!)!!!d!i!!#0!!
-!!9)"@[pj!1-+rhN!"!TMCQpX$3$M!!&[!!!"9J&CrhJ,rhJ!&$!!#(4PEA"`BA4
-S!!KdC@e`8'&dD!ErH`!!!J$A!!)!j!$P$3$N!!*X!!)"D!&SrhIrGJ(rG`!!!Ip
-f!!!#!18!!J$Q!1F0!1B!!R)!!!&S!A-!k!$T$3$S!!*L!!!"D!&[!1S!k`d!kJ!
-"E`!!!@J"Drpe#rpe!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*
-3BA4S$3$V!!&Y!!!"D`&Z!1`-!1`!#J!%1Q*TE`!#!!!0!1N!!@m!!!!!!!$rG![
-rG!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J$R!!)!l3$Z$3$Y!!0*!!)"G!'Hrh2
-rFJ$[#[pc!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(rFJ!!"J$[!!2rF3$
-`!2%+rh%!"!TVEf0X$3$`!!&Y!!!"H!&lrh!+rh!!"!TKE'PK"J$a!!2rE`$b!2-
-+rfm!"!TTER0S$3$b!!)d!!!"IJ''rfi!p!VrEJ!%#Q0QEf`0!23!!@m!!!'#!BA
-rE3[rE3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
-NC8C[E'4PFP"KG'J'!2-!!rpX!2ArD`VrE!!%#R4[)#!0!28!!Qi!!!'*!CJ!pJ$
-h$3$f!!)d!!!"N3'BrfS!q!VrDJ!%#QCTE'80!2J!!@d!!!'8!CF!q3`!q3!,!!9
-LD@mZD!!#!!!0!2F!!M3!!!'*!C(rD3$k#[pT!!3+BfC[E!d!qJ!"E`!!!Bd"N!$
-rD![rD!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[pV!!!#!1i!!J$l!2`0!2X!!Q`
-!!J'I!CrrCrpQ!IpR!!!"rfB!!!)!r!!#!2d!rJd!r3!#FJ!!!Cm"UJ$r!3!0!2m
-!!Q)!!!'I!DB"!3%#$3%"!!&[!!!"R`'Lrf8,rf8!*$!!%'0bHA"dEfC[E'4PFR"
-KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!3)!!@d!!!'L!D8"!``"!`!*!!-kBQB!!J!
-!$3%!!!&[!!!!!!!!rf3,rf3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)!rJ!#!33
-""3d""!!$53!#!DX"eIpMrf)""JVrB`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'j
-eE'`"rf)!!!B""J!$rf%""`%)#[pK!!3+DfpME!d""`!"E3!!!Dm"X[pJ#[pJ!!3
-+B@aTB3B"#!!$rem"#3%+#[pI!!3+D@jcD!d"#3!#0!!!!E8"[IpH!3X+rei!"!T
-MCQpX$3%,!!&[!!!"Z3'mred,red!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
-dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J%+!!2rA!%-reX+re`!"!TdEb!
-J$3%-!!*Z!!!"`!(2!3d"$Jd"$3!#0!!!!FJ"crpD!3m+reS!"!TQD@aP$3%2!!&
-Y!!!"b`(1!4!-!4!!%!!+BQa[GfCTFfJZD!!#!!!0!3i!!M3!!!(!!FMr@3%4#[p
-C!!3+BfC[E!d"%3!"E`!!!F3"arpB#rpB!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J
-'reX!!!)""3!#!4)"%`d"%J!#E!!#!GB"e[pAreB"reF!!!(r9J!!!J%6!!)"&!%
-9$3%8!!*b!!!"eJ(K!4B"&`d"&J!#BJ!!!GB"h3%B!4N0!4J!!@m!!!(@!GRr93[
-r93!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"'3!"E3!
-!!GN"h!%D$!%D!!N!!cTLEJ!#!!!0!4F!!@m!!!!!!!$r9![r9!!8-!!)G'9YF("
-KG'J!#(4PEA"3BA4S!J%9!!)"'`%F$3%E!!0*!!)"iJ)-re2r8J%G#[p6!"JZBfp
-bC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(r8J!!"J%G!!2r83%H!4m+re%!"!TVEf0
-X$3%H!!&Y!!!"jJ(Tre!+re!!"!TKE'PK"J%I!!2r6`%J!5%+rdm!"!TTER0S$3%
-J!!)d!!!"l!(drdi")JVr6J!%#Q0QEf`0!5)!!@m!!!(`!I2r63[r63!d-!!BEh"
-PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J
-'!5%!!rp-!52r5`Vr6!!%#R4[)#!0!5-!!Qi!!!(h!JB"*!%P$3%N!!)d!!!"r`)
-'rdS"*JVr5J!%#QCTE'80!5B!!@d!!!)#!J8"*``"*`!+!!4LELjS!!)!!!d"*3!
-#0!!!!IF"rrp*!5J+rdN!"!TMCQpX$3%S!!&[!!!"q`(qrdJ,rdJ!&$!!#(4PEA"
-`BA4S!!KdC@e`8'&dD!Er5`!!!J%F!!)"+3%U$3%T!!*X!!)#$3)0rdIr4J(r4`!
-!!Ip'!!!#!5S!!J%V!5`0!5X!!R)!!!)0!KJ",3%Z$3%Y!!*L!!!#$3)8!5m"-!d
-",`!"E`!!!Jd#%2p&#rp&!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'Efa
-NCA*3BA4S$3%`!!&Y!!!#%!)6!6%-!6%!$3!(1Q*eCQCPFJ!#!!!0!5i!!@m!!!!
-!!!$r4![r4!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J%X!!)"-J%c$3%b!!0*!!)
-#'3*$rd2r3J%d#[p$!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(r3J!!"J%
-d!!2r33%e!6B+rd%!"!TVEf0X$3%e!!&Y!!!#(3)Jrd!+rd!!"!TKE'PK"J%f!!2
-r2`%h!6J+rcm!"!TTER0S$3%h!!)d!!!#)`)Vrci"13Vr2J!%#Q0QEf`0!6N!!@m
-!!!)R!LVr23[r23!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
--5@jME(9NC8C[E'4PFP"KG'J'!6J!!rmm!6Vr1`Vr2!!%#R4[)#!0!6S!!Qi!!!)
-Z!Md"1`%m$3%l!!)d!!!#0J)prcS"23Vr1J!%#QCTE'80!6d!!@d!!!)j!M`"2J`
-"2J!1!!KLG@CQCA)ZD!!#!!!0!6`!!M3!!!)Z!MEr13%r#[mj!!3+BfC[E!d"2`!
-"E`!!!M)#0Imi#rmi!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rcX!!!)"-`!#!8!
-"33d"3!!#E!!#!N3#42mhrcB"rcF!!!(r0J!!!J&"!!)"3J&$$3&#!!*b!!!#4!*
-2!83"43d"4!!#BJ!!!N3#5`&'!8F0!8B!!@m!!!*%!NIr03[r03!N-!!3Bh*jF(4
-[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"4`!"E3!!!NF#5J&)$!&)!!X
-!"6TMBA0d!!)!!!d"43!"E`!!!!!!!2md#rmd!"3`!!KdC@e`F'&dD!!)G'9YF&"
-KG'J#!8-!!J&*!8S0!8N!!dN!!J*3!RVr-rmb!8X+rc-!'#jMEh*PBh*PE#SU+LS
-!!!!!!!#3!!"ZG@aX!Imb!!!'!8X!!rma!8`"63Vr-3!%#QY[Bf`0!8`!!@d!!!*
-8!PIr-!Vr-!!%#Q&XD@%'!8d!!rm[!8i"6`Vr,`!%#QPZFfJ0!8i!!M3!!!*D!Q,
-r,J&3#[mZ!!3+BfC[E!d"8!!"E`!!!Pi#BImY#rmY!$3`!"K[F'9ZFh0XD@jME(9
-NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B"6`!$rb`"8Im
-V#[mX!!3+G'mJ)!d"83!#EJ!!!Q8#G!&5!9-0!9)!!M3!!!*Y!R6r+J&8#[mU!!3
-+CQPXC3d"9!!"E3!!!R!#F`&9$!&9!!`!"Q0KFh3ZD!!#!!!0!9-!!M3!!!*P!Qh
-r+3&@#[mT!!3+BfC[E!d"9J!"E`!!!QN#E2mS#rmS!"3`!!KdC@e`F'&dD!!)G'9
-YF&"KG'J'rbX!!!)"5J!#!9F"@!d"9`!#E!!#!RX#HrmRrbB"rbF!!!(r*J!!!J&
-B!!)"@3&D$3&C!!*b!!!#H`+'!9X"A!d"@`!#BJ!!!RX#JJ&G!9i0!9d!!@m!!!*
-l!Rlr*3[r*3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d
-"AJ!"E3!!!Ri#J3&I$!&I!!X!"6TMEfe`!!)!!!d"A!!"E`!!!!!!!2mN#rmN!"3
-`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!9S!!J&J!@%0!@!!!dN!!J+(!V(r)rmL!@)
-+rb-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!ImL!!!'!@)!!rmK!@-"C!V
-r)3!%#QY[Bf`0!@-!!@d!!!+,!Slr)!Vr)!!%#Q&XD@%'!@3!!rmI!@8"CJVr(`!
-%#QPZFfJ0!@8!!M3!!!+4!TRr(J&R#[mH!!3+BfC[E!d"C`!"E`!!!T8#Q2mG#rm
-G!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4Qp
-XC'9b8'&dD!B"CJ!$ra`"D2mE#[mF!!3+G'mJ)!d"D!!#EJ!!!T`#U`&T!@S0!@N
-!!M3!!!+N!U[r'J&V#[mD!!3+CQPXC3d"D`!"E3!!!UF#UJ&X$!&X!!`!"Q0[EA!
-ZD!!#!!!0!@S!!M3!!!+F!U6r'3&Y#[mC!!3+BfC[E!d"E3!"E`!!!U!#SrmB#rm
-B!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'raX!!!)"B3!#!@i"E`d"EJ!#E!!#!V)
-#X[mAraB"raF!!!(r&J!!!J&[!!)"F!&a$3&`!!*b!!!#XJ+p!A)"F`d"FJ!#BJ!
-!!V)#Z3&d!A80!A3!!@m!!!+b!VAr&3[r&3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!
-3Bh*jF(4[4QpXC'9b8'&dD!d"G3!"E3!!!V8#Z!&f$!&f!!X!"6TMEfjQ!!)!!!d
-"F`!"E`!!!!!!!2m8#rm8!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!A%!!J&h!AJ
-0!AF!!dN!!J+q!ZMr%rm5!AN+ra-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@a
-X!Im5!!!'!AN!!rm4!AS"H`Vr%3!%#QY[Bf`0!AS!!@d!!!,#!XAr%!Vr%!!%#Q&
-XD@%'!AX!!rm2!A`"I3Vr$`!%#QPZFfJ0!A`!!M3!!!,)!Y$r$J&q#[m1!!3+BfC
-[E!d"IJ!"E`!!!X`#crm0#rm0!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J
-!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B"I3!$r``"Irm,#[m-!!3+G'mJ)!d
-"I`!#EJ!!!Y-#iJ'!!B%0!B!!!M3!!!,E!Z,r#J'##[m+!!3+CQPXC3d"JJ!"E3!
-!!Yi#i3'$$!'$!!`!"Q0[EQBZD!!#!!!0!B%!!M3!!!,6!Y[r#3'%#[m*!!3+BfC
-[E!d"K!!"E`!!!YF#f[m)#rm)!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'r`X!!!)
-"H!!#!B8"KJd"K3!#E!!#!ZN#kIm(r`B"r`F!!!(r"J!!!J''!!)"K`')$3'(!!*
-b!!!#k3,d!BN"LJd"L3!#BJ!!!ZN#m!',!B`0!BX!!@m!!!,T!Zcr"3[r"3!N-!!
-3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"M!!"E3!!!Z`#l`'
-0$!'0!!S!"$TNCA-!!J!!$3'+!!&[!!!!!!!!r`3,r`3!&$!!#(4PEA"`BA4S!!K
-dC@e`8'&dD!)"L!!#!Bi"M`d"MJ!$53!#![8$(rm$r`)"N!!+r`-!'#jMEh*PBh*
-PE#SU+LS!!!!!!!#3!!"ZG@aX!Im#!!!'!C!!!!2r!3'4!C)+r`%!"!TVEf0X$3'
-4!!&Y!!!#q3,mr`!+r`!!"!TKE'PK"J'5!!2qr`'6!C3+r[m!"!TTER0S$3'6!!)
-d!!!#r`-(r[i"P3VqrJ!%#Q0QEf`0!C8!!@m!!!-$!`Eqr3[qr3!d-!!BEh"PER0
-cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!C3
-!!rlm!CEqq`Vqr!!%#R4[)#!0!CB!!Qi!!!-+!aN"P`'B$3'A!!)d!!!$%J-Cr[S
-"Q3VqqJ!%#QCTE'80!CN!!@d!!!-9!aJ"QJ`"QJ!,!!9NCA-ZD!!#!!!0!CJ!!M3
-!!!-+!a,qq3'E#[lj!!3+BfC[E!d"Q`!"E`!!!`i$%Ili#rli!"3`!!KdC@e`F'&
-dD!!)G'9YF&"KG'J'r[X!!!)"M`!#!C`"R3d"R!!#E!!#!b!$)2lhr[B"r[F!!!(
-qpJ!!!J'G!!)"RJ'I$3'H!!*b!!!$)!-V!D!"S3d"S!!#BJ!!!b!$*`'L!D-0!D)
-!!@m!!!-J!b2qp3[qp3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9
-b8'&dD!d"S`!"E3!!!b-$*J'N$!'N!!N!!cTND!!#!!!0!D%!!@m!!!!!!!$qp![
-qp!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J'I!!)"T3'Q$3'P!!0*!!)$,!0@r[2
-qmJ'R#[lc!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(qmJ!!"J'R!!2qm3'
-S!DN+r[%!"!TVEf0X$3'S!!&Y!!!$-!-cr[!+r[!!"!TKE'PK"J'T!!2ql`'U!DX
-+rZm!"!TTER0S$3'U!!)d!!!$0J-qrZi"V!VqlJ!%#Q0QEf`0!D`!!@m!!!-k!ch
-ql3[ql3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
-NC8C[E'4PFP"KG'J'!DX!!rlX!Dhqk`Vql!!%#R4[)#!0!Dd!!Qi!!!0"!e!"VJ'
-[$3'Z!!)d!!!$5303rZS"X!VqkJ!%#QCTE'80!E!!!@d!!!0-!dm"X3`"X3!+!!4
-ND#jS!!)!!!d"V`!#0!!!!d%$5IlT!E)+rZN!"!TMCQpX$3'b!!&[!!!$430)rZJ
-,rZJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eqk`!!!J'Q!!)"X`'d$3'c!!*X!!)
-$9`0ArZIqjJ(qj`!!!IlQ!!!#!E3!!J'e!EB0!E8!!R)!!!0A!f)"Y`'i$3'h!!*
-L!!!$9`0H!EN"ZJd"Z3!"E`!!!eF$@[lP#rlP!#3`!""MFRP`G'pQEfaNCA*`BA4
-S!""MFRP`G'p'EfaNCA*3BA4S$3'k!!&Y!!!$@J0G!EX-!EX!#J!%1Q4cB3!#!!!
-0!EJ!!@m!!!!!!!$qj![qj!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J'f!!)"[!'
-p$3'm!!0*!!)$B`10rZ2qiJ'q#[lM!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
-XE!(qiJ!!"J'q!!2qi3'r!F!+rZ%!"!TVEf0X$3'r!!&Y!!!$C`0UrZ!+rZ!!"!T
-KE'PK"J(!!!2qh`("!F)+rYm!"!TTER0S$3("!!)d!!!$E30erYi"``VqhJ!%#Q0
-QEf`0!F-!!@m!!!0a!h6qh3[qh3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
-S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!F)!!rlF!F6qf`Vqh!!%#R4[)#!
-0!F3!!Qi!!!0i!iF"a3('$3(&!!)d!!!$J!1(rYS"a`VqfJ!%#QCTE'80!FF!!@d
-!!!1$!iB"b!`"b!!,!!9NFf%ZD!!#!!!0!FB!!M3!!!0i!i$qf3(*#[lC!!3+BfC
-[E!d"b3!"E`!!!h`$IrlB#rlB!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rYX!!!)
-"[3!#!FS"b`d"bJ!#E!!#!ii$M[lArYB"rYF!!!(qeJ!!!J(,!!)"c!(0$3(-!!*
-b!!!$MJ1C!Fi"c`d"cJ!#BJ!!!ii$P3(3!G%0!G!!!@m!!!11!j(qe3[qe3!N-!!
-3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"d3!"E3!!!j%$P!(
-5$!(5!!S!"$TPFR)!!J!!$3(2!!&[!!!!!!!!rY3,rY3!&$!!#(4PEA"`BA4S!!K
-dC@e`8'&dD!)"c3!#!G-"e!d"d`!$53!#!jS$a2l6rY)"e3Vqd`!B,Q0[FQ9MFQ9
-X+LSU+J!!!!!!!*!!!'jeE'`"rY)!!!B"e3!$rY%"eJ(A#[l4!!3+DfpME!d"eJ!
-"E3!!!ji$SIl3#[l3!!3+B@aTB3B"e`!$rXm"f!(C#[l2!!3+D@jcD!d"f!!#0!!
-!!k3$V2l1!GS+rXi!"!TMCQpX$3(D!!&[!!!$U!1VrXd,rXd!0$!!''p`C@jcFfa
-TEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J(C!!2
-qc!(ErXX+rX`!"!TdEb!J$3(E!!*Z!!!$V`1q!G`"h3d"h!!#0!!!!lF$[[l+!Gi
-+rXS!"!TQD@aP$3(H!!&Y!!!$ZJ1p!Gm-!Gm!#`!&CA*b,QJ!!J!!$3(G!!)d!!!
-$V`1hrXN"i!Vqb3!%#Q0QEf`0!H!!!@m!!!1c!lEqb![qb!!8-!!)G'9YF("KG'J
-!#(4PEA"3BA4S"[l,!!!#!G3!!J(K!H)0!H%!!Q`!!J2&!mAqarl'!Il(!!!"rXB
-!!!)"iJ!#!H-"j!d"i`!#FJ!!!m8$d!(P!HB0!H8!!Q)!!!2&!m`"j`(S$3(R!!&
-[!!!$a32)rX8,rX8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"
-KG'J0!HJ!!@d!!!2)!mX"k3`"k3!+!!3kCAC`!!)!!!d"jJ!"E`!!!!!!!2l%#rl
-%!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!H3!!J(U!HX0!HS!!dN!!J24!r[q`rl
-#!H`+rX-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Il#!!!'!H`!!rl"!Hd
-"lJVq`3!%#QY[Bf`0!Hd!!@d!!!29!pMq`!Vq`!!%#Q&XD@%'!Hi!!rkr!Hm"m!V
-q[`!%#QPZFfJ0!Hm!!M3!!!2E!q2q[J(a#[kq!!3+BfC[E!d"m3!"E`!!!pm$i[k
-p#rkp!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4
-P4QpXC'9b8'&dD!B"m!!$rV`"m[kl#[km!!3+G'mJ)!d"mJ!#EJ!!!qB$p3(c!I3
-0!I-!!M3!!!2Z!rAqZJ(e#[kk!!3+CQPXC3d"p3!"E3!!!r%$p!(f$!(f!!X!"@9
-fF#jS!!)!!!d"p!!#0!!!!qB$l[kj!IF+rVN!"!TMCQpX$3(h!!&[!!!$kJ2YrVJ
-,rVJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EqZ`!!!J(V!!)"q!(j$3(i!!*X!!)
-$r!2mrVIqYJ(qY`!!!Ikf!!!#!IN!!J(k!IX0!IS!!R)!!!2m"!F"r!(p$3(m!!*
-L!!!$r!3$!Ii"r`d"rJ!"E`!!!r`$rrke#rke!#3`!""MFRP`G'pQEfaNCA*`BA4
-S!""MFRP`G'p'EfaNCA*3BA4S$3(r!!&Y!!!$r`3#!J!-!J!!#`!&1QKYB@-!!J!
-!$3(p!!&[!!!!!!!!rV3,rV3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)"q`!#!J%
-#!Jd#!3!$53!#"!J%-[kcrV)#!`VqX`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'j
-eE'`"rV)!!!B#!`!$rV%#"!)&#[ka!!3+DfpME!d#"!!"E3!!"!`%$rk`#[k`!!3
-+B@aTB3B#"3!$rUm#"J)(#[k[!!3+D@jcD!d#"J!#0!!!"")%'[kZ!JJ+rUi!"!T
-MCQpX$3))!!&[!!!%&J3CrUd,rUd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
-dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J)(!!2qV!)*rUX+rU`!"!TdEb!
-J$3)*!!*Z!!!%(33X!JS##`d##J!#0!!!"#8%,2kU!J`+rUS!"!TQD@aP$3)-!!&
-Y!!!%+!3V!Jd-!Jd!$!!'D'eKBbjS!!)!!!d##`!#0!!!""d%*IkT!Ji+rUN!"!T
-MCQpX$3)1!!&[!!!%)33NrUJ,rUJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EqU`!
-!!J)#!!)#$`)3$3)2!!*X!!)%-`3crUIqTJ(qT`!!!IkQ!!!#!K!!!J)4!K)0!K%
-!!R)!!!3c"$i#%`)8$3)6!!*L!!!%-`3k!K8#&Jd#&3!"E`!!"$-%0[kP#rkP!#3
-`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3)@!!&Y!!!%0J3
-j!KF-!KF!#`!&1QPNC@%!!J!!$3)8!!&[!!!!!!!!rU3,rU3!&$!!#(4PEA"`BA4
-S!!KdC@e`8'&dD!)#%J!#!KJ#'3d#'!!$53!#"$m%DIkMrU)#'JVqS`!B,Q0[FQ9
-MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rU)!!!B#'J!$rU%#'`)F#[kK!!3+DfpME!d
-#'`!"E3!!"%-%4[kJ#[kJ!!3+B@aTB3B#(!!$rTm#(3)H#[kI!!3+D@jcD!d#(3!
-#0!!!"%N%8IkH!Km+rTi!"!TMCQpX$3)I!!&[!!!%6343rTd,rTd!0$!!''p`C@j
-cFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J)
-H!!2qR!)JrTX+rT`!"!TdEb!J$3)J!!*Z!!!%9!4M!L%#)Jd#)3!#0!!!"&`%Brk
-D!L-+rTS!"!TQD@aP$3)M!!&Y!!!%A`4L!L3-!L3!$!!'D@4PB5jS!!)!!!d#)J!
-#0!!!"&3%A2kC!L8+rTN!"!TMCQpX$3)P!!&[!!!%@!4ErTJ,rTJ!&$!!#(4PEA"
-`BA4S!!KdC@e`8'&dD!EqQ`!!!J)C!!)#*J)R$3)Q!!*X!!)%DJ4UrTIqPJ(qP`!
-!!Ik@!!!#!LF!!J)S!LN0!LJ!!R)!!!4U"(8#+J)V$3)U!!*L!!!%DJ4a!L`#,3d
-#,!!"E`!!"'S%EIk9#rk9!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'Efa
-NCA*3BA4S$3)Y!!&Y!!!%E34`!Li-!Li!$!!'1QaSBA0S!!)!!!d#+`!"E`!!!!!
-!!2k8#rk8!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!LN!!J)[!M!0!Lm!!dN!!J4
-f"+$qNrk5!M%+rT-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ik5!!!'!M%
-!!rk4!M)#-`VqN3!%#QY[Bf`0!M)!!@d!!!4k"(hqN!!+rT!!!!3+B@aTB3B#-`!
-$rSm#0!)e#[k2!!3+D@jcD!d#0!!#0!!!")!%L2k1!MB+rSi!"!TMCQpX$3)f!!&
-[!!!%K!5(rSd,rSd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP0
-66%PZBfaeC'9'EfaNCA*3BA4S"J)e!!2qM!)hrSX+rS`!"!TdEb!J$3)h!!*Z!!!
-%L`5D!MJ#13d#1!!#0!!!"*-%Q[k+!MS+rSS!"!TQD@aP$3)k!!&Y!!!%PJ5C!MX
--!MX!$3!(E'KKFfJZD!!#!!!0!MN!!M3!!!5,"*2qL3)m#[k*!!3+BfC[E!d#2!!
-"E`!!")m%N[k)#rk)!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rSX!!!)#-!!#!Md
-#2Jd#23!#E!!#"+%%SIk(rSB"rSF!!!(qKJ!!!J)q!!)#2`*!$3)r!!*b!!!%S35
-X!N%#3Jd#33!#BJ!!"+%%U!*$!N30!N-!!@m!!!5K"+6qK3[qK3!N-!!3Bh*jF(4
-[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d#4!!"E3!!"+3%T`*&$!*&!!S
-!"$TYC$)!!J!!$3*#!!&[!!!!!!!!rS3,rS3!&$!!#(4PEA"`BA4S!!KdC@e`8'&
-dD!)#3!!#!NB#4`d#4J!$53!#"+d%erk$rS)#5!VqJ`!B,Q0[FQ9MFQ9X+LSU+J!
-!!!!!!*!!!'jeE'`"rS)!!!B#5!!$rS%#53*+#[k"!!3+DfpME!d#53!"E3!!",%
-%Y2k!#[k!!!3+B@aTB3B#5J!$rRm#5`*-#[jr!!3+D@jcD!d#5`!#0!!!",F%[rj
-q!Nd+rRi!"!TMCQpX$3*0!!&[!!!%Z`5qrRd,rRd!0$!!''p`C@jcFfaTEQ0XG@4
-PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J*-!!2qI!*1rRX
-+rR`!"!TdEb!J$3*1!!*Z!!!%`J64!Nm#8!d#6`!#0!!!"-S%dIjk!P%+rRS!"!T
-QD@aP$3*4!!&Y!!!%c363!P)-!P)!#`!&E@3b,QJ!!J!!$3*3!!)d!!!%`J6+rRN
-#8`VqH3!%#Q0QEf`0!P-!!@m!!!6'"-RqH![qH!!8-!!)G'9YF("KG'J!#(4PEA"
-3BA4S"[jl!!!#!NF!!J*8!P80!P3!!Q`!!J6B"0MqGrjf!Ijh!!!"rRB!!!)#93!
-#!PB#9`d#9J!#FJ!!"0J%i`*B!PN0!PJ!!Q)!!!6B"0m#@J*E$3*D!!&[!!!%f!6
-ErR8,rR8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!PX
-!!@d!!!6E"0i#A!`#A!!+!!3kE@3e!!)!!!d#@3!"E`!!!!!!!2jd#rjd!"3`!!K
-dC@e`F'&dD!!)G'9YF&"KG'J#!PF!!J*G!Pi0!Pd!!dN!!J6N"3lqFrjb!Pm+rR-
-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ijb!!!'!Pm!!rja!Q!#B3VqF3!
-%#QY[Bf`0!Q!!!@d!!!6S"1[qF!VqF!!%#Q&XD@%'!Q%!!rj[!Q)#B`VqE`!%#QP
-ZFfJ0!Q)!!M3!!!6Z"2EqEJ*N#[jZ!!3+BfC[E!d#C!!"E`!!"2)%pIjY#rjY!$3
-`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9
-b8'&dD!B#B`!$rQ`#CIjV#[jX!!3+G'mJ)!d#C3!#EJ!!"2N&#!*Q!QF0!QB!!M3
-!!!8""3MqDJ*S#[jU!!3+CQPXC3d#D!!"E3!!"33&"`*T$!*T!!X!"@eN05jS!!)
-!!!d#C`!#0!!!"2N&!IjT!QS+rQN!"!TMCQpX$3*U!!&[!!!%r38!rQJ,rQJ!&$!
-!#(4PEA"`BA4S!!KdC@e`8'&dD!EqD`!!!J*H!!)#D`*X$3*V!!*X!!)&$`82rQI
-qCJ(qC`!!!IjQ!!!#!Q`!!J*Y!Qi0!Qd!!R)!!!82"4S#E`*`$3*[!!*L!!!&$`8
-@!R%#FJd#F3!"E`!!"3m&%[jP#rjP!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP
-`G'p'EfaNCA*3BA4S$3*b!!&Y!!!&%J89!R--!R-!#`!&1QeNBc)!!J!!$3*`!!&
-[!!!!!!!!rQ3,rQ3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)#EJ!#!R3#G3d#G!!
-$53!#"4X&4IjMrQ)#GJVqB`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rQ)
-!!!B#GJ!$rQ%#G`*i#[jK!!3+DfpME!d#G`!"E3!!"4m&)[jJ#[jJ!!3+B@aTB3B
-#H!!$rPm#H3*k#[jI!!3+D@jcD!d#H3!#0!!!"58&,IjH!RX+rPi!"!TMCQpX$3*
-l!!&[!!!&+38XrPd,rPd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"
-PEP066%PZBfaeC'9'EfaNCA*3BA4S"J*k!!2qA!*mrPX+rP`!"!TdEb!J$3*m!!*
-Z!!!&-!8r!Rd#IJd#I3!#0!!!"6J&2rjD!Rm+rPS!"!TQD@aP$3*r!!&Y!!!&1`8
-q!S!-!S!!$!!'E@4M-LjS!!)!!!d#IJ!#0!!!"6!&12jC!S%+rPN!"!TMCQpX$3+
-"!!&[!!!&0!8hrPJ,rPJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq@`!!!J*e!!)
-#JJ+$$3+#!!*X!!)&4J9'rPIq9J(q9`!!!Ij@!!!#!S-!!J+%!S80!S3!!R)!!!9
-'"9%#KJ+($3+'!!*L!!!&4J90!SJ#L3d#L!!"E`!!"8B&5Ij9#rj9!#3`!""MFRP
-`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3+*!!&Y!!!&539-!SS-!SS
-!$J!)1QpLDQ9MG(-!!J!!$3+(!!&[!!!!!!!!rP3,rP3!&$!!#(4PEA"`BA4S!!K
-dC@e`8'&dD!)#K3!#!SX#M!d#L`!$53!#"9)&I2j6rP)#M3Vq8`!B,Q0[FQ9MFQ9
-X+LSU+J!!!!!!!*!!!'jeE'`"rP)!!!B#M3!$rP%#MJ+2#[j4!!3+DfpME!d#MJ!
-"E3!!"9B&@Ij3#[j3!!3+B@aTB3B#M`!$rNm#N!!#N3Vq6`!%#QPZFfJ0!T!!!!)
-d!!!&A!9NrNi#NJVq6J!%#Q0QEf`0!T)!!@m!!!9J"@2q63[q63!d-!!BEh"PER0
-cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!T%
-!!rj-!T2q5`Vq6!!%#R4[)#!0!T-!!Qi!!!9R"AB#P!+9$3+8!!)d!!!&E`9frNS
-#PJVq5J!%#QCTE'80!TB!!@d!!!9b"A8#P``#P`!2!!P[BQTPBh4c,QJ!!J!!$3+
-9!!)d!!!&C`9[rNN#Q!Vq53!%#Q0QEf`0!TJ!!@m!!!9V"@lq5![q5!!8-!!)G'9
-YF("KG'J!#(4PEA"3BA4S"[j,!!!#!S`!!J+C!TS0!TN!!Q`!!J9p"Ahq4rj'!Ij
-(!!!"rNB!!!)#QJ!#!TX#R!d#Q`!#FJ!!"Ad&L!+G!Ti0!Td!!Q)!!!9p"B3#R`+
-J$3+I!!&[!!!&I3@!rN8,rN8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC
-[E'4PFP"KG'J0!U!!!@d!!!@!"B-#S3`#S3!+!!3kF'9Y!!)!!!d#RJ!"E`!!!!!
-!!2j%#rj%!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!T`!!J+L!U-0!U)!!dN!!J@
-*"E2q3rj#!U3+rN-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ij#!!!'!U3
-!!rj"!U8#TJVq33!%#QY[Bf`0!U8!!@d!!!@0"C!!rN!+rN!!"!TKE'PK"J+Q!!2
-q2`+R!UJ+rMm!"!TTER0S$3+R!!)d!!!&N`@ErMi#U3Vq2J!%#Q0QEf`0!UN!!@m
-!!!@A"CVq23[q23!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
--5@jME(9NC8C[E'4PFP"KG'J'!UJ!!rim!UVq1`Vq2!!%#R4[)#!0!US!!Qi!!!@
-H"Dd#U`+X$3+V!!)d!!!&TJ@YrMS#V3Vq1J!%#QCTE'80!Ud!!@d!!!@T"D`#VJ`
-#VJ!,!!9`C@dZD!!#!!!0!U`!!M3!!!@H"DEq13+[#[ij!!3+BfC[E!d#V`!"E`!
-!"D)&TIii#rii!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rMX!!!)#S`!#!V!#X3d
-#X!!$53!#"E3&h[ihrMB#XJVq0`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`
-"rMB!!!B#XJ!$rM8#X`+d#[ie!!3+DfpME!d#X`!"E3!!"EJ&Zrid#[id!!3+B@a
-TB3B#Y!!$rM-#Y3+f#[ic!!3+D@jcD!d#Y3!#0!!!"Ei&a[ib!VF+rM)!"!TMCQp
-X$3+h!!&[!!!&`JA&rM%,rM%!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!
-BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J+f!!2q-!+irLm+rM!!"!TdEb!J$3+
-i!!*Z!!!&b3AB!VN#ZJd#Z3!#0!!!"G%&f2iZ!VX+rLi!"!TQD@aP$3+l!!&Y!!!
-&e!AA!V`-!V`!$!!'F'9Y-LjS!!)!!!d#ZJ!#0!!!"FN&dIiY!Vd+rLd!"!TMCQp
-X$3+p!!&[!!!&c3A3rL`,rL`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq,`!!!J+
-a!!)#[J+r$3+q!!*X!!)&h`AIrL[q+J(q+`!!!IiU!!!#!Vm!!J,!!X%0!X!!!R)
-!!!AI"HS#`J,$$3,#!!*L!!!&h`AQ!X3#a3d#a!!"E`!!"Gm&i[iT#riT!#3`!""
-MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3,&!!&Y!!!&iJAP!XB
--!XB!$3!(1R"VBh-a-J!#!!!0!X-!!@m!!!!!!!$q+![q+!!8-!!)G'9YF("KG'J
-!#(4PEA"3BA4S!J,"!!)#a`,)$3,(!!0*!!)&k`B9rLIq*J,*#[iR!"JZBfpbC@0
-bC@`U+LSU!!!!!!!!N!!!ER9XE!(q*J!!"J,*!!2q*3,+!XX+rL8!"!TVEf0X$3,
-+!!&Y!!!&l`AbrL3+rL3!"!TKE'PK"J,,!!2q)`,-!Xd+rL-!"!TTER0S$3,-!!)
-d!!!&p3AprL)#cJVq)J!%#Q0QEf`0!Xi!!@m!!!Aj"Icq)3[q)3!d-!!BEh"PER0
-cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!Xd
-!!riJ!Xrq(`Vq)!!%#R4[)#!0!Xm!!Qi!!!B!"Jm#d!,4$3,3!!)d!!!'#!B2rKi
-#dJVq(J!%#QCTE'80!Y)!!@d!!!B,"Ji#d``#d`!1!!K`Df0c-6)ZD!!#!!!0!Y%
-!!M3!!!B!"JMq(3,8#[iG!!3+BfC[E!d#e!!"E`!!"J3'"riF#riF!"3`!!KdC@e
-`F'&dD!!)G'9YF&"KG'J'rKm!!!)#b!!#!Y8#eJd#e3!#E!!#"KB'&[iErKS"rKX
-!!!(q'J!!!J,@!!)#e`,B$3,A!!*b!!!'&JBK!YN#fJd#f3!#BJ!!"KB'(3,E!Y`
-0!YX!!@m!!!B@"KRq'3[q'3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4Qp
-XC'9b8'&dD!d#h!!"E3!!"KN'(!,G$!,G!!`!"MT`Df0c0`!#!!!0!YS!!@m!!!!
-!!!$q'![q'!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J,B!!)#hJ,I$3,H!!0*!!)
-')JC-rKIq&J,J#[iA!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(q&J!!"J,
-J!!2q&3,K!Z)+rK8!"!TVEf0X$3,K!!&Y!!!'*JBTrK3+rK3!"!TKE'PK"J,L!!2
-q%`,M!Z3+rK-!"!TTER0S$3,M!!)d!!!',!BdrK)#j3Vq%J!%#Q0QEf`0!Z8!!@m
-!!!B`"M2q%3[q%3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
--5@jME(9NC8C[E'4PFP"KG'J'!Z3!!ri3!ZEq$`Vq%!!%#R4[)#!0!ZB!!Qi!!!B
-h"NB#j`,S$3,R!!)d!!!'2`C'rJi#k3Vq$J!%#QCTE'80!ZN!!@d!!!C#"N8#kJ`
-#kJ!0!!G`Df0c0bjS!!)!!!d#k!!#0!!!"MF'2ri0!ZX+rJd!"!TMCQpX$3,V!!&
-[!!!'1`BqrJ`,rJ`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq$`!!!J,I!!)#l!,
-Y$3,X!!*X!!)'63C0rJ[q#J(q#`!!!Ii+!!!#!Zd!!J,Z!Zm0!Zi!!R)!!!C0"PJ
-#m!,a$3,`!!*L!!!'63C8![)#m`d#mJ!"E`!!"Nd'82i*#ri*!#3`!""MFRP`G'p
-QEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3,c!!&Y!!!'8!C6![3-![3!#`!
-&1R*KEQ3!!J!!$3,a!!&[!!!!!!!!rJJ,rJJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&
-dD!)#l`!#![8#pJd#p3!$53!#"PN'Jri(rJB#p`Vq"`!B,Q0[FQ9MFQ9X+LSU+J!
-!!!!!!*!!!'jeE'`"rJB!!!B#p`!$rJ8#q!,j#[i&!!3+DfpME!d#q!!"E3!!"Pd
-'B2i%#[i%!!3+B@aTB3B#q3!$rJ-#qJ,l#[i$!!3+D@jcD!d#qJ!#0!!!"Q-'Dri
-#![`+rJ)!"!TMCQpX$3,m!!&[!!!'C`CUrJ%,rJ%!0$!!''p`C@jcFfaTEQ0XG@4
-PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J,l!!2q!!,prIm
-+rJ!!"!TdEb!J$3,p!!*Z!!!'EJCp![i#r`d#rJ!#0!!!"RB'IIhq!`!+rIi!"!T
-QD@aP$3-!!!&Y!!!'H3Cm!`%-!`%!$!!'FQ&ZC#jS!!)!!!d#r`!#0!!!"Qi'G[h
-p!`)+rId!"!TMCQpX$3-#!!&[!!!'FJCerI`,rI`!&$!!#(4PEA"`BA4S!!KdC@e
-`8'&dD!Epr`!!!J,f!!)$!`-%$3-$!!*X!!)'K!D%rI[pqJ(pq`!!!Ihk!!!#!`3
-!!J-&!`B0!`8!!R)!!!D%"Sm$"`-)$3-(!!*L!!!'K!D,!`N$#Jd$#3!"E`!!"S3
-'Krhj#rhj!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3-
-+!!&Y!!!'K`D+!`X-!`X!#J!%1R*M-J!#!!!0!`J!!@m!!!!!!!$pq![pq!!8-!!
-)G'9YF("KG'J!#(4PEA"3BA4S!J-'!!)$$!-0$3--!!0*!!)'N!!'Z[hhrIB$$JV
-pp`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rIB!!!B$$J!$rI8$$`-3#[h
-e!!3+DfpME!d$$`!"E3!!"T3'Prhd#[hd!!3+B@aTB3B$%!!$rI-$%3-5#[hc!!3
-+D@jcD!d$%3!#0!!!"TS'S[hb!a-+rI)!"!TMCQpX$3-6!!&[!!!'RJDKrI%,rI%
-!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'Efa
-NCA*3BA4S"J-5!!2pm!-8rHm+rI!!"!TdEb!J$3-8!!*Z!!!'T3Dd!a8$&Jd$&3!
-#0!!!"Ud'Y2hZ!aF+rHi!"!TQD@aP$3-A!!&Y!!!'X!Dc!aJ-!aJ!#`!&FQ-b,QJ
-!!J!!$3-@!!)d!!!'T3DYrHd$'3Vpl3!%#Q0QEf`0!aN!!@m!!!DT"Ucpl![pl!!
-8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[h[!!!#!`d!!J-D!aX0!aS!!Q`!!JDl"V[
-pkrhU!IhV!!!"rHS!!!)$'`!#!a`$(3d$(!!#FJ!!"VX'aJ-H!am0!ai!!Q)!!!D
-l"X)$)!-K$3-J!!&[!!!'Z`DqrHN,rHN!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0
-bHA"dEdC[E'4PFP"KG'J0!b%!!@d!!!Dq"X%$)J`$)J!+!!3kFQ-d!!)!!!d$(`!
-"E`!!!!!!!2hS#rhS!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!ad!!J-M!b30!b-
-!!dN!!JE("[(pjrhQ!b8+rHF!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ih
-Q!!!'!b8!!rhP!bB$*`Vpj3!%#QY[Bf`0!bB!!@d!!!E,"Xlpj!Vpj!!%#Q&XD@%
-'!bF!!rhM!bJ$+3Vpi`!%#QPZFfJ0!bJ!!M3!!!E4"YRpiJ-U#[hL!!3+BfC[E!d
-$+J!"E`!!"Y8'f2hK#rhK!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p
-`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B$+3!$rH!$+rhI#[hJ!!3+G'mJ)!d$+`!
-#EJ!!"Y`'k`-X!bd0!b`!!M3!!!EN"Z[phJ-Z#[hH!!3+CQPXC3d$,J!"E3!!"ZF
-'kJ-[$!-[!!X!"A*M0#jS!!)!!!d$,3!#0!!!"Y`'j2hG!c!+rGd!"!TMCQpX$3-
-`!!&[!!!'i!EMrG`,rG`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eph`!!!J-N!!)
-$-3-b$3-a!!*X!!)'mJEbrG[pfJ(pf`!!!IhD!!!#!c)!!J-c!c30!c-!!R)!!!E
-b"[d$03-f$3-e!!*L!!!'mJEj!cF$1!d$0`!"E`!!"[)'pIhC#rhC!#3`!""MFRP
-`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3-i!!&Y!!!'p3Ei!cN-!cN
-!#J!%1R*M03!#!!!0!cB!!@m!!!!!!!$pf![pf!!8-!!)G'9YF("KG'J!#(4PEA"
-3BA4S!J-d!!)$1J-l$3-k!!0*!!)'rJFSrGIpeJ-m#[hA!"JZBfpbC@0bC@`U+LS
-U!!!!!!!!N!!!ER9XE!(peJ!!"J-m!!2pe3-p!ci+rG8!"!TVEf0X$3-p!!&Y!!!
-(!JF&rG3+rG3!"!TKE'PK"J-q!!2pd`-r!d!+rG-!"!TTER0S$3-r!!)d!!!(#!F
-3rG)$33VpdJ!%#Q0QEf`0!d%!!@m!!!F-"`rpd3[pd3!d-!!BEh"PER0cE'PZBfa
-eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!d!!!rh3!d,
-pc`Vpd!!%#R4[)#!0!d)!!Qi!!!F6"b)$3`0%$30$!!)d!!!('`FLrFi$43VpcJ!
-%#QCTE'80!d8!!@d!!!FH"b%$4J`$4J!,!!9bBc8ZD!!#!!!0!d3!!M3!!!F6"a[
-pc30(#[h0!!3+BfC[E!d$4`!"E`!!"aF('[h-#rh-!"3`!!KdC@e`F'&dD!!)G'9
-YF&"KG'J'rFm!!!)$1`!#!dJ$53d$5!!#E!!#"bN(+Ih,rFS"rFX!!!(pbJ!!!J0
-*!!)$5J0,$30+!!*b!!!(+3Fd!d`$63d$6!!#BJ!!"bN(-!01!dm0!di!!@m!!!F
-T"bcpb3[pb3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d
-$6`!"E3!!"b`(,`03$!03!!d!"cTbDA"PE@3!!J!!$300!!&[!!!!!!!!rFJ,rFJ
-!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)$5`!#!e%$8Jd$83!$53!#"c8(Arh(rFB
-$8`Vpa`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rFB!!!B$8`!$rF8$9!0
-9#[h&!!3+DfpME!d$9!!"E3!!"cN(22h%#[h%!!3+B@aTB3B$93!$rF-$9J0A#[h
-$!!3+D@jcD!d$9J!#0!!!"cm(4rh#!eJ+rF)!"!TMCQpX$30B!!&[!!!(3`G'rF%
-,rF%!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9
-'EfaNCA*3BA4S"J0A!!2p`!0CrEm+rF!!"!TdEb!J$30C!!*Z!!!(5JGC!eS$@`d
-$@J!#0!!!"e)(@Ifq!e`+rEi!"!TQD@aP$30F!!&Y!!!(93GB!ed-!ed!$J!)FQP
-`C@eN,QJ!!J!!$30E!!)d!!!(5JG5rEd$AJVp[3!%#Q0QEf`0!ei!!@m!!!G1"e(
-p[![p[!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[fr!!!#!e)!!J0I!f!0!em!!Q`
-!!JGJ"f$pZrfk!Ifl!!!"rES!!!)$B!!#!f%$BJd$B3!#FJ!!"f!(D`0M!f30!f-
-!!Q)!!!GJ"fF$C30Q$30P!!&[!!!(B!GMrEN,rEN!*$!!%'0bHA"dEfC[E'4PFR"
-KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!fB!!@d!!!GM"fB$C``$C`!+!!3kFR0K!!)
-!!!d$C!!"E`!!!!!!!2fi#rfi!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!f)!!J0
-S!fN0!fJ!!dN!!JGX"jEpYrff!fS+rEF!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"
-ZG@aX!Iff!!!'!fS!!rfe!fX$E!VpY3!%#QY[Bf`0!fX!!@d!!!G`"h2pY!VpY!!
-%#Q&XD@%'!f`!!rfc!fd$EJVpX`!%#QPZFfJ0!fd!!M3!!!Gf"hlpXJ0[#[fb!!3
-+BfC[E!d$E`!"E`!!"hS(IIfa#rfa!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"
-KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B$EJ!$rE!$F2f[#[f`!!3+G'm
-J)!d$F!!#EJ!!"i%(N!!$F30b$30a!!)d!!!(L3H3!2fZ!h-+rDi!"!TQD@aP$30
-c!!&Y!!!(M!H2!h3-!h3!#`!&FR0K,QJ!!J!!$30b!!)d!!!(J3H*rDd$G3VpV3!
-%#Q0QEf`0!h8!!@m!!!H&"iMpV![pV!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[f
-[!!!#!fN!!J0f!hF0!hB!!Q`!!JHA"jIpUrfU!IfV!!!"rDS!!!)$G`!#!hJ$H3d
-$H!!#FJ!!"jF(SJ0k!hX0!hS!!Q)!!!HA"ji$I!0p$30m!!&[!!!(P`HDrDN,rDN
-!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!hd!!@d!!!H
-D"jd$IJ`$IJ!-!!BkFh4KBfX!!J!!$30l!!&[!!!!!!!!rDJ,rDJ!&$!!#(4PEA"
-`BA4S!!KdC@e`8'&dD!)$H3!#!hm$J!d$I`!$53!#"k-(cIfRrDB$J3VpT`!B,Q0
-[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rDB!!!B$J3!$rD8$JJ1$#[fP!!3+Dfp
-ME!d$JJ!"E3!!"kF(U[fN#[fN!!3+B@aTB3B$J`!$rD-$K!1&#[fM!!3+D@jcD!d
-$K!!#0!!!"kd(YIfL!iB+rD)!"!TMCQpX$31'!!&[!!!(X3HdrD%,rD%!0$!!''p
-`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4
-S"J1&!!2pS!1(rCm+rD!!"!TdEb!J$31(!!*Z!!!(Z!I(!iJ$L3d$L!!#0!!!"m!
-(arfH!iS+rCi!"!TQD@aP$31+!!&Y!!!(``I'!iX-!iX!$3!(Fh4KBfXZD!!#!!!
-0!iN!!M3!!!Hi"m$pR31-#[fG!!3+BfC[E!d$M!!"E`!!"l`([rfF#rfF!"3`!!K
-dC@e`F'&dD!!)G'9YF&"KG'J'rCm!!!)$J!!#!id$MJd$M3!$53!#"mi(q2fErCS
-$M`VpQ`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rCS!!!B$M`!$rCN$N!!
-$N3VpQ3!%#QY[Bf`0!j!!!!&Y!!!(dJI9rCJ+rCJ!"!TKE'PK"J14!!2pP`15!j-
-+rCF!"!TTER0S$315!!)d!!!(f!IJrCB$P!VpPJ!%#Q0QEf`0!j3!!@m!!!IF"pr
-pP3[pP3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
-NC8C[E'4PFP"KG'J'!j-!!rf8!jApN`VpP!!%#R4[)#!0!j8!!Qi!!!IM"r)$PJ1
-A$31@!!)d!!!(k`IbrC)$Q!VpNJ!%#QCTE'80!jJ!!@d!!!IZ"r%$Q3`$Q3!4!!Y
-cB@CPFh4KBfXZD!!#!!!0!jF!!M3!!!IM"q[pN31D#[f4!!3+BfC[E!d$QJ!"E`!
-!"qF(k[f3!![pN!!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EpN`!!!J11!!)$Q`1
-F$31E!!*X!!)(q3IjrBrpMJ(pM`!!!If1!!!#!j`!!J1G!ji0!jd!!R)!!!Ij#!3
-$R`1J$31I!!*L!!!(q3J!!k%$SJd$S3!"E`!!"rN(r2f0#rf0!#3`!""MFRP`G'p
-QEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$31L!!&Y!!!(r!Ir!k--!k-!#J!
-%1R0SB3!#!!!0!k!!!@m!!!!!!!$pM![pM!!8-!!)G'9YF("KG'J!#(4PEA"3BA4
-S!J1H!!)$T!1P$31N!!0*!!))"3J[rB[pLJ1Q#[f,!"JZBfpbC@0bC@`U+LSU!!!
-!!!!!N!!!ER9XE!(pLJ!!"J1Q!!2pL31R!kJ+rBN!"!TVEf0X$31R!!&Y!!!)#3J
--rBJ+rBJ!"!TKE'PK"J1S!!2pK`1T!kS+rBF!"!TTER0S$31T!!)d!!!)$`JArBB
-$U`VpKJ!%#Q0QEf`0!kX!!@m!!!J6#"EpK3[pK3!d-!!BEh"PER0cE'PZBfaeC'9
-QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!kS!!rf%!kcpJ`V
-pK!!%#R4[)#!0!k`!!Qi!!!JD##N$V31Z$31Y!!)d!!!))JJTrB)$V`VpJJ!%#QC
-TE'80!km!!@d!!!JP##J$X!`$X!!,!!9cD'%ZD!!#!!!0!ki!!M3!!!JD##,pJ31
-a#[f"!!3+BfC[E!d$X3!"E`!!#"i))If!#rf!!"3`!!KdC@e`F'&dD!!)G'9YF&"
-KG'J'rB-!!!)$T3!#!l)$X`d$XJ!#E!!##$!)-2errAi"rAm!!!(pIJ!!!J1c!!)
-$Y!1e$31d!!*b!!!)-!Jl!lB$Y`d$YJ!#BJ!!#$!)0`1i!lN0!lJ!!@m!!!J`#$2
-pI3[pI3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d$Z3!
-"E3!!#$-)0J1k$!1k!!d!"cTdH(4IC')!!J!!$31h!!&[!!!!!!!!rA`,rA`!&$!
-!#(4PEA"`BA4S!!KdC@e`8'&dD!)$Y3!#!lX$[!d$Z`!$53!##$`)C[elrAS$[3V
-pH`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rAS!!!B$[3!$rAN$[J1r#[e
-j!!3+DfpME!d$[J!"E3!!#%!)3rei#[ei!!3+B@aTB3B$[`!$rAF$`!2"#[eh!!3
-+D@jcD!d$`!!#0!!!#%B)6[ef!m)+rAB!"!TMCQpX$32#!!&[!!!)5JK0rA8,rA8
-!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'Efa
-NCA*3BA4S"J2"!!2pG!2$rA-+rA3!"!TdEb!J$32$!!*Z!!!)83KJ!m3$a3d$a!!
-#0!!!#&N)B2eb!mB+rA)!"!TQD@aP$32'!!&Y!!!)A!KI!mF-!mF!$J!)G(KdAf4
-L,QJ!!J!!$32&!!)d!!!)83KCrA%$b!VpF3!%#Q0QEf`0!mJ!!@m!!!K9#&MpF![
-pF!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[ec!!!#!l`!!J2*!mS0!mN!!Q`!!JK
-R#'IpEreZ!Ie[!!!"r@i!!!)$bJ!#!mX$c!d$b`!#FJ!!#'F)FJ20!mi0!md!!Q)
-!!!KR#'i$c`23$322!!&[!!!)C`KUr@d,r@d!*$!!%'0bHA"dEfC[E'4PFR"KG'J
-!%'0bHA"dEdC[E'4PFP"KG'J0!p!!!@d!!!KU#'d$d3`$d3!,!!8kH$8`13!#!!!
-0!mi!!@m!!!!!!!$pE![pE!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J2-!!)$dJ2
-6$325!!0*!!))F`LGr@[pDJ28#[eV!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
-XE!(pDJ!!"J28!!2pD329!pB+r@N!"!TVEf0X$329!!&Y!!!)G`Kkr@J+r@J!"!T
-KE'PK"J2@!!2pC`2A!pJ+r@F!"!TTER0S$32A!!)d!!!)I3L&r@B$f3VpCJ!%#Q0
-QEf`0!pN!!@m!!!L"#)6pC3[pC3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
-S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!pJ!!reN!pVpB`VpC!!%#R4[)#!
-0!pS!!Qi!!!L)#*F$f`2F$32E!!)d!!!)N!!)PreL!pd+r@)!"!TQD@aP$32G!!&
-Y!!!)N`L@!pi-!pi!$!!'H$8`15jS!!)!!!d$h!!#0!!!#)J)N!$pB32I#[eK!!3
-+BfC[E!d$h`!"E`!!#)`)MreJ#reJ!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'r@-
-!!!)$d`!#!q!$i3d$i!!$53!##*i)b2eIr9i$iJVpA`!B,Q0[FQ9MFQ9X+LSU+J!
-!!!!!!*!!!'jeE'`"r9i!!!B$iJ!$r9d$i`2N#[eG!!3+DfpME!d$i`!"E3!!#+)
-)TIeF#[eF!!3+B@aTB3B$j!!$r9X$j32Q#[eE!!3+D@jcD!d$j3!#0!!!#+J)X2e
-D!qF+r9S!"!TMCQpX$32R!!&[!!!)V!L[r9N,r9N!0$!!''p`C@jcFfaTEQ0XG@4
-PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J2Q!!2p@!2Sr9F
-+r9J!"!TdEb!J$32S!!*Z!!!)X`M#!qN$kJd$k3!#0!!!#,X)`[e@!qX+r9B!"!T
-QD@aP$32V!!&Y!!!)[JM"!q`-!q`!%!!+H$8`19pfCRNZD!!#!!!0!qS!!M3!!!L
-c#,[p932Y#[e9!!3+BfC[E!d$l3!"E`!!#,F)Z[e8#re8!"3`!!KdC@e`F'&dD!!
-)G'9YF&"KG'J'r9F!!!)$i3!#!qi$l`d$lJ!#E!!##-N)bIe6r9)"r9-!!!(p8J!
-!!J2[!!)$m!2a$32`!!*b!!!)b3M8!r)$m`d$mJ!#BJ!!#-N)d!2d!r80!r3!!@m
-!!!M*#-cp83[p83!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&
-dD!d$p3!"E3!!#-`)c`2f$!2f!!d!"cTi06!jGM-!!J!!$32c!!&[!!!!!!!!r9!
-,r9!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)$m3!#!rF$q!d$p`!$53!##08)rre
-2r8i$q3Vp6`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r8i!!!B$q3!$r8d
-$qJ2l#[e0!!3+DfpME!d$qJ!"E3!!#0N)h2e-#[e-!!3+B@aTB3B$q`!$r8X$r!2
-p#[e,!!3+D@jcD!d$r!!#0!!!#0m)jre+!ri+r8S!"!TMCQpX$32q!!&[!!!)i`M
-Qr8N,r8N!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfa
-eC'9'EfaNCA*3BA4S"J2p!!2p5!2rr8F+r8J!"!TdEb!J$32r!!*Z!!!)kJMj"!!
-%!3d%!!!#0!!!#2))qIe'"!)+r8B!"!TQD@aP$33#!!&Y!!!)p3Mi"!--"!-!$J!
-)H$8`1ABc,QJ!!J!!$33"!!)d!!!)kJMbr88%"!Vp43!%#Q0QEf`0"!3!!@m!!!M
-Z#2(p4![p4!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[e(!!!#!rJ!!J3&"!B0"!8
-!!Q`!!JN!#3$p3re#!Ie$!!!"r8)!!!)%"J!#"!F%#!d%"`!$53!##3!*+[e"r8!
-%#3Vp33!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r8!!!!B%#3!$r6m%#J3
-,#[dr!!3+DfpME!d%#J!"E3!!#33*"rdq#[dq!!3+B@aTB3B%#`!$r6d%$!30#[d
-p!!3+D@jcD!d%$!!#0!!!#3S*%[dm"!i+r6`!"!TMCQpX$331!!&[!!!*$JN4r6X
-,r6X!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9
-'EfaNCA*3BA4S"J30!!2p1J32r6N+r6S!"!TdEb!J$332!!*Z!!!*&3NN""!%%3d
-%%!!#0!!!#4d**2di"")+r6J!"!TQD@aP$335!!&Y!!!*)!NM""--""-!#`!&Fh0
-X,QJ!!J!!$334!!)d!!!*&3NGr6F%&!Vp0`!%#Q0QEf`0""3!!@m!!!NC#4cp0J[
-p0J!H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9b8'&dD!Ep13!!!J3)!!)%&33
-@$339!!0*!!)*+`P9r6Ap0!3A#[de!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
-XE!(p0!!!"J3A!!2p-`3B""N+r6-!"!TVEf0X$33B!!&Y!!!*,`Nbr6)+r6)!"!T
-KE'PK"J3C!!2p-33D""X+r6%!"!TTER0S$33D!!)d!!!*03Npr6!%(!Vp-!!%#Q0
-QEf`0""`!!@m!!!Nj#6cp,`[p,`!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
-S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'""X!!rdZ""hp,3Vp,J!%#R4[)#!
-0""d!!Qi!!!P!#8m%(J3I$33H!!)d!!!*5!P2r5`%)!Vp,!!%#QCTE'80"#!!!@d
-!!!P,#8i%)3`%)3!-!!CcFf`b,QJ!!J!!$33I!!)d!!!*3!P)r5X%)JVp+`!%#Q0
-QEf`0"#)!!@m!!!P%#8Ip+J[p+J!H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9
-b8'&dD!Ep,3!!!J3@!!)%)`3N$33M!!0*!!)*9JQ!r5Rp+!3P#[dT!"JZBfpbC@0
-bC@`U+LSU!!!!!!!!N!!!ER9XE!(p+!!!"J3P!!2p*`3Q"#F+r5F!"!TVEf0X$33
-Q!!&Y!!!*@JPGr5B+r5B!"!TKE'PK"J3R!!2p*33S"#N+r58!"!TTER0S$33S!!)
-d!!!*B!PSr53%+JVp*!!%#Q0QEf`0"#S!!@m!!!PN#@Ip)`[p)`!d-!!BEh"PER0
-cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'"#N
-!!rdL"#[p)3Vp)J!%#R4[)#!0"#X!!Qi!!!PV#AS%,!3Y$33X!!)d!!!*F`Pkr5!
-%,JVp)!!%#QCTE'80"#i!!@d!!!Pf#AN%,``%,`!0!!GcFf`b-bjS!!)!!!d%,3!
-#0!!!#@X*FrdI"$!+r4m!"!TMCQpX$33`!!&[!!!*E`Pbr4i,r4i!(M!!$A0cE'C
-[E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J'r5%!!!)%*!!#"$%%-Jd%-3!$53!##B%
-*UrdGr4`%-`Vp(3!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r4`!!!B%-`!
-$r4X%0!3e#[dE!!3+DfpME!d%0!!"E3!!#B8*L2dD#[dD!!3+B@aTB3B%03!$r4N
-%0J3h#[dC!!3+D@jcD!d%0J!#0!!!#BX*NrdB"$J+r4J!"!TMCQpX$33i!!&[!!!
-*M`Q5r4F,r4F!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%P
-ZBfaeC'9'EfaNCA*3BA4S"J3h!!2p&J3jr48+r4B!"!TdEb!J$33j!!*Z!!!*PJQ
-P"$S%1`d%1J!#0!!!#Ci*TId8"$`+r43!"!TQD@aP$33m!!&Y!!!*S3QN"$d-"$d
-!$!!'Fh0X-bjS!!)!!!d%1`!#0!!!#CB*R[d6"$i+r4-!"!TMCQpX$33q!!&[!!!
-*QJQGr4),r4)!(M!!$A0cE'C[E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J'r48!!!)
-%-J!#"$m%3!d%2`!$53!##D`*e[d4r4!%33Vp%3!B,Q0[FQ9MFQ9X+LSU+J!!!!!
-!!*!!!'jeE'`"r4!!!!B%33!$r3m%3J4$#[d2!!3+DfpME!d%3J!"E3!!#E!*Xrd
-1#[d1!!3+B@aTB3B%3`!$r3d%4!4&#[d0!!3+D@jcD!d%4!!#0!!!#EB*[[d-"%B
-+r3`!"!TMCQpX$34'!!&[!!!*ZJQpr3X,r3X!0$!!''p`C@jcFfaTEQ0XG@4PCQp
-XC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J4&!!2p#J4(r3N+r3S
-!"!TdEb!J$34(!!*Z!!!*`3R3"%J%53d%5!!#0!!!#FN*d2d)"%S+r3J!"!TQD@a
-P$34+!!&Y!!!*c!R2"%X-"%X!$!!'G'ac-5jS!!)!!!d%53!#0!!!#F%*bId("%`
-+r3F!"!TMCQpX$34-!!&[!!!*a3R)r3B,r3B!(M!!$A0cE'C[E'4PFR"KG'J!$A0
-cE%C[E'4PFP"KG'J'r3N!!!)%3!!#"%d%6Jd%63!#E!!##GF*erd&r33"r38!!!(
-p"!!!!J41!!)%6`43$342!!0*!!)*e`S"r32p!J44#[d$!"JZBfpbC@0bC@`U+LS
-U!!!!!!!!N!!!ER9XE!(p!J!!"J44!!2p!345"&-+r3%!"!TVEf0X$345!!&Y!!!
-*f`RHr3!+r3!!"!TKE'PK"J46!!2mr`48"&8+r2m!"!TTER0S$348!!)d!!!*i3R
-Tr2i%9JVmrJ!%#Q0QEf`0"&B!!@m!!!RP#HMmr3[mr3!d-!!BEh"PER0cE'PZBfa
-eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'"&8!!rcm"&I
-mq`Vmr!!%#R4[)#!0"&F!!Qi!!!RX#IX%@!4C$34B!!)d!!!*p!Rlr2S%@JVmqJ!
-%#QCTE'80"&S!!@d!!!Rh#IS%@``%@`!1!!KMFRP`G'mZD!!#!!!0"&N!!M3!!!R
-X#I6mq34F#[cj!!3+BfC[E!d%A!!"E`!!#I!*mrci#rci!#3`!""MFRP`G'pQEfa
-NCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S"[cl!!!#"&!!!J4G"&i0"&d!!Q`!!JS
-##J,mprcf!Ich!!!"r2B!!!)%AJ!#"&m%B!d%A`!$53!##J)+,2cer23%B3Vmp3!
-B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r23!!!B%B3!$r2-%BJ4M#[cc!!3
-+DfpME!d%BJ!"E3!!#JB+#Icb#[cb!!3+B@aTB3B%B`!$r2%%C!4P#[ca!!3+D@j
-cD!d%C!!#0!!!#J`+&2c`"'B+r2!!"!TMCQpX$34Q!!&[!!!+%!S6r1m,r1m!0$!
-!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*
-3BA4S"J4P!!2mlJ4Rr1d+r1i!"!TdEb!J$34R!!*Z!!!+&`SQ"'J%D3d%D!!#0!!
-!#Km+*[cX"'S+r1`!"!TQD@aP$34U!!&Y!!!+)JSP"'X-"'X!%!!+Eh"PER0cE(B
-ZD!!#!!!0"'N!!M3!!!SA#Krmk`4X#[cV!!3+BfC[E!d%E!!"E`!!#KX+([cU#rc
-U!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S"[cY!!!#"'!
-!!J4Y"'i0"'d!!dN!!JSY#PImkIcS"'m+r1N!'#jMEh*PBh*PE#SU+LS!!!!!!!#
-3!!"ZG@aX!IcS!!!'"'m!!rcR"(!%F3Vmj`!%#QY[Bf`0"(!!!@d!!!Sa#M6mjJV
-mjJ!%#Q&XD@%'"(%!!rcP"()%F`Vmj3!%#QPZFfJ0"()!!M3!!!Sh#Mrmj!4d#[c
-N!!3+BfC[E!d%G!!"E`!!#MX+2[cM#rcM!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4
-PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B%F`!$r1)%GIcK#[cL!!3
-+G'mJ)!d%G3!#EJ!!#N)+834f"(F0"(B!!M3!!!T+#P(mi!4i#[cJ!!3+CQPXC3d
-%H!!"E3!!#Nd+8!4j$!4j!!i!#(4YC'PQCLjS!!)!!!d%G`!#0!!!#N)+5[cI"(S
-+r0m!"!TMCQpX$34k!!&[!!!+4JT*r0i,r0i!*$!!%'0bHA"dEfC[E'4PFR"KG'J
-!%'0bHA"dEdC[E'4PFP"KG'J'r1%!!!)%EJ!#"(X%I!d%H`!#E!!##PJ+@2cGr0`
-"r0d!!!(mh!!!!J4m!!)%I34q$34p!!*X!!)+@!TBr0[mfJ(mf`!!!IcD!!!#"(i
-!!J4r")!0"(m!!dN!!JTB#S,mfIcB")%+r0N!'#jMEh*PBh*PE#SU+LS!!!!!!!#
-3!!"ZG@aX!IcB!!!'")%!!rcA"))%J`Vme`!%#QY[Bf`0"))!!@d!!!TF#PrmeJV
-meJ!%#Q&XD@%'")-!!rc9")3%K3Vme3!%#QPZFfJ0")3!!M3!!!TL#QVme!5'#[c
-8!!3+BfC[E!d%KJ!"E`!!#QB+DIc6#rc6!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4
-PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B%K3!$r0)%Krc4#[c5!!3
-+G'mJ)!d%K`!#EJ!!#Qd+I!5)")N0")J!!M3!!!Te#Rcmd!5+#[c3!!3+CQPXC3d
-%LJ!"E3!!#RJ+H`5,$!5,!!`!"Q9IEh-ZD!!#!!!0")N!!M3!!!TY#RAmc`5-#[c
-2!!3+BfC[E!d%M!!"E`!!#R%+G2c1#rc1!#B`!"&[F'9ZFh0XCQpXC'9bF'&dD!!
-4Eh"PER0cE%C[E'4PFP"KG'J'r0%!!!)%J!!#")d%MJd%M3!$53!##S-+VIc0r-`
-%M`Vmc3!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r-`!!!B%M`!$r-X%N!!
-%N3Vmb`!%#QY[Bf`0"*!!!!&Y!!!+K`U+r-S+r-S!"!TKE'PK"J54!!2mb355"*-
-+r-N!"!TTER0S$355!!)d!!!+M3U9r-J%P!Vmb!!%#Q0QEf`0"*3!!@m!!!U4#T6
-ma`[ma`!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
-NC8C[E'4PFP"KG'J'"*-!!rc'"*Ama3VmaJ!%#R4[)#!0"*8!!Qi!!!UB#UF%PJ5
-A$35@!!)d!!!+S!URr-3%Q!Vma!!%#QCTE'80"*J!!@d!!!UM#UB%Q3`%Q3!0!!G
-PAfpc-LjS!!)!!!d%P`!#0!!!#TJ+S2c$"*S+r--!"!TMCQpX$35D!!&[!!!+R!U
-Ir-),r-)!*M!!%@p`C@jcFfaQEfaNCA*`BA4S!"&[F'9ZFh0X4QpXC'9b8'&dD!E
-ma3!!!J51!!)%Qrc"$35E!!*X!!)+VJUZr-$m[`(m`!!!!Ibr!!!#r-%!!!d!#3!
-"E3!!!!!!!3!I!Irq!!!#!!B!!J5F"*d0"*`!!Q`!!J!!!!$m[[bp!Ibq!!!"r,d
-!!!)%R3!#"*i%R`d%RJ!#E!!##V%+b!5Jr,`0"+!!!dN!!JUa#XMmZ`5K"+)+r,X
-!'#jcHA0[C'a[Cf&cDh)!!!!!!!!!!&4&@&30"+%!!@d!!!Ua#V3%S``%S`!'!!!
-!!J!!"J5L!!2mZJ5N"+8+r,S!"!TLG'jc$35N!!&+!!!+Y`Um"+B#"+B!!J5Rr,N
-0"+F!!@d!!!Uh#VS%U!`%U!!+!!4%EfjP!!)!!!,mZ3!!"J5P!!2mZ!5Tr,F+r,J
-!"!TRDACe$35T!!&Y!!!+[`V#r,B$r,B!"3EmY`!!!Ibm!!!#"*m!!J5Ur,80"+S
-!!Q`!!J!!!!$mY2bc!Ibd!!!"r,-!!!,mY3!!$J!#!!!2%!!$!",mXJ5V"+`%V35
-Z"+m%X!5a",)%X`5d",8%YJ5hr,(mX2b[r+i"r,)!!"!%U`!3r+hmV2bVr+VmUIb
-Sr+ImT[bPr+6mSrbLr+(mS2bIr*i+r+d!'#jKCACdEf&`F'jeE'`!!)!!!!#3!!!
-U+LSU#rbX!")`!!GdD'9`BA4S!!GdD'93BA4S#rbV!"``!!adD'9[E'4NC@aTEA-
-!$(4SC8pXC%4PE'PYF`[mUJ!J-!!1G'KPF(*[DQ9MG("KG'J!$R4SC9"bEfTPBh4
-3BA4S#rbT!"B`!!PdD'9YCA"KG'J!#A4SC8eP8'&dD![mU!!Q-!!4D@jME(9NC@C
-[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S#rbR!$3`!"K[F'9ZFh0XD@jME(9
-NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD![mTJ!N-!!3Bh*
-jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD![mT3!H-!!0Fh0XCQpXC'9
-bF'&dD!!0Fh0X4QpXC'9b8'&dD![mT!!Q-!!4Eh"PER0cE'C[E'4PFR"KG'J!%@p
-`C@jcFfa'EfaNCA*3BA4S#rbM!#i`!"9dD'9ZCAGQEfaNCA*bC@CPFQ9ZBf8!&A4
-SC8jPGdC[E'4PFP*PCQ9bC@jMC3[mSJ!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!Ib
-K!!!"r+!!!!(mR`!!!IbH!!!1"+`!"a$mR35ir*cmQ`5j",VmQJVmR3!B,Q&PGR4
-[BA"`ER9XE!!!J!!!!*!!!#SU+LS0",J!!@X!!!!!#XJ%Z`)%Z`!#!!8%[!)%[!!
-#"*lmQ3,mQ3!!!IbF!!!#r*X!!"!%Z3!!%!5k!)B!(rbBr*ImP[b9r*6mNrb5!#c
-mNIb3!2b2r)lmMIb-!%rmL`"D!&[mLJ"Nr)N!EIb)r)ImKJ#2r)AmK2b$r),mJIb
-!r(rmI[apr(cmH`#Tr(VmHIair(F![Iaf!-ImG3$8!1)!l!$j!3-"%!%D!5F"-3%
-q!8J"93&I!@`"GJ'$!Bd"QJ'N!E%"Z`()!G)"h`(T!IB#!!)0!KF#*!)Z!MX#43*
-5!P`#D3*c!S!#LJ+A!U%#VJ+m!XB#d`,G!ZS#p!-"!`X$'!-L!bm$130'!e!$A30
-R!h3$IJ1,!jN$S`1`!lS$a`24!pi$l!2f"!-%%`3K"#m%234,"&X%D`4j")X%Q35
-Mr(3%U2acr(,mF3VmQ!!%#Q0[BQS+r*F!'#jPBA*cCQCNFQ&XDA-!!!!!!!!J!'&
-QC()+r*B!"!TMG(Kd#rb9!")`!!GdD'9`BA4S!!GdD'93BA4S#[b8!!3+BA0MFJV
-mN`!%#R4iC'`,r*)!($!!$(4SC@pXC'4PE'PYF`!-G'KP6faN4'9XD@ec#[b4!!3
-+BfPdE32mN!$rr3[mM`!J-!!1G'KPF(*[DQ9MG("KG'J!$R4SC9"bEfTPBh43BA4
-S!rb1rri+r)d!"!T849K8#rb-!"B`!!PdD'9YCA"KG'J!#A4SC8eP8'&dD![mL`!
-Q-!!4D@jME(9NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S#rb+!$3`!"K
-[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&
-dD![mL3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD![mL!!
-H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9b8'&dD![mK`!Q-!!4Eh"PER0cE'C
-[E'4PFR"KG'J!%@p`C@jcFfa'EfaNCA*3BA4S#[b'!!3+BfC[E!VmK3!B,QeTFf0
-cE'0d+LSU+J!!!!!!!*!!!#SU+LS+r)3!"!TcC@aP#[b$!"JZBfpbC@4PE'mU+LS
-U!!!!!!!!N!!!+LSU+J(mJJ!!![b"!!!+r)!!"!TVEf0X#[ar!!3+D@jcD!2mIJ!
-%#[ap!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!VmI!!%#R*cE(3,r(X!,M!
-!&A4SC@jPGfC[E'4PFR*PCQ9bC@jMC3!9G'KP6Q9h4QpXC'9b8Q9QCA*PEQ0P#[a
-k!!3+F'jKE3VmH3!%#Q&XD@%+r(J!"!TdEb!J#[ah!!3+CQPXC32mGJ!'#rae!"3
-`!!KdC@e`F'&dD!!)G'9YF&"KG'J+r(3!"!TLG'jc#[ac!!3+CfPfG32mFJ!&#[a
-a!"JZFhPcEf4XEfGKFfYb!!!!!!!!!!"849K8%IbD#XRJ%JUYi1%TDJ`!!LrM*N9
-4e%r&jLa&edrSaHBX4Nr%@qPF@eTVA&VU-NAE6m4Ek9aE@QYF@Z`bl5C&hNr,lbA
-Y*N9J!""2bf%!%59K!")Pl5C&B!!66mYK!"3Pl5C&B!!96mYK!"BPl5C&B!!A6m[
-Y*N9J!"K2amAQ,%C2&!!L+Q%!'9m!%#pK!"PK!"S[DJ`!'dmUB3!F,'S-!"eA!!K
-B!"i!(fK2+Q%!)'%!'@%!)5TK!"PI!"![B3!L$!!M6em!*%9J!#92A`!PDJ`!'dp
-K!#BUB3!F,'%!*ba'6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"R1,f%!+Q%!+bp
-K!#`-!#02A`!9B3!Y*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,Lp
-K!#TK!#m[B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3!
-`,f%!,!`!)dpI!"9K!$%P4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!
-Z,f%!+Q%!-LpK!#`-!#02A`!9B3!c*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!
-T+Q%!'9m!,LpK!#TK!$3[B3!X$!!M6em!&@%!059&B!!Z6bTK!#"K!#KK!#%UB3!
-CA`!6,f%!+5TK!"PI!#i[B3!UB3!f,f%!,!`!)dpI!"9K!$FP4@!!,NmUB3!JB3!
-SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!1#pK!#`-!#02A`!9B3!j*89J!#j
-2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!$S[B3!X$!!M6em!&@%
-!1b9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3!m,f%!,!`
-!)dpI!"9K!$dP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%
-!2LpK!#`-!#02A`!9B3!r*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m
-!,LpK!#TK!%![B3!X$!!M6em!&@%!359&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%
-!+5TK!"PI!#i[B3!UB3"#,f%!,!`!)dpI!"9K!%-P4@!!,NmUB3!JB3!SB3!K+Q%
-!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!4#pK!#`-!#02A`!9B3"&*89J!#j2+Q%!)'%
-!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!%B[B3!X$!!M6em!&@%!4b9&B!!
-Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"),f%!,!`!)dpI!"9
-K!%NP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!5LpK!#`
--!#02A`!9B3",*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#T
-K!%`[B3!X$!!M6em!&@%!659&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"P
-I!#i[B3!UB3"1,f%!,!`!)dpI!"9K!%mP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bp
-K!#NUB3!CA`!Z,f%!+Q%!8#pK!#`-!#02A`!9B3"4*89J!#j2+Q%!)'%!+'%!)5T
-K!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!&)[B3!X$!!M6em!&@%!8b9&B!!Z6bTK!#"
-K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"8,f%!,!`!)dpI!"9K!&8P4@!
-!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!9LpK!#`-!#02A`!
-9B3"A*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!&J[B3!
-X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"C,f%!,!`!)dp
-I!"9K!&SP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!@bp
-K!#`-!#02A`!9B3"F*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,Lp
-K!#TK!&d[B3!X$!!M6em!&@%!AL9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5T
-K!"PI!#i[B3!UB3"I,f%!,!`!)dpI!"9K!'!P4@!!,NmUB3!JB3!SB3!K+Q%!'9m
-!%bpK!#NUB3!CA`!Z,f%!+Q%!B5pK!#`-!#02A`!9B3"L*89J!#j2+Q%!)'%!+'%
-!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!'-[B3!X$!!M6em!&@%!C#9&B!!Z6bT
-K!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"P,f%!,!`!)dpI!"9K!'B
-P4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!CbpK!#`-!#0
-2A`!9B3"S*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!'N
-[B3!X$!!M6em!&@%!DL9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i
-[B3!UB3"V,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%
-!E#pK!#`-!#02A`!9B3"Y*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m
-!,LpK!#TK!'i[B3!X$!!M6em!&@%!Eb9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%
-!+5TK!"PI!#i[B3!UB3"`,f%!,!`!)dpI!"9K!(%P4@!!,NmUB3!JB3!SB3!K+Q%
-!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!FLpK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-
-[B3!T+Q%!'9m!,LpK!#TK!(-[B3!X$!!M6em!&@%!G#9&B!!Z6bTK!#"K!#KK!#%
-UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"e,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m
-!%bpK!#NUB3!CA`!A,f%!+Q%!GLpK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-[B3!
-T+Q%!'9m!&bpK!#TK!(F[B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"P
-I!"F[B3!UB3"i,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!A,f%
-!+Q%!H5pK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!&bpK!#TK!(S
-[B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!"8[B3!UB3"l,f%!,!`
-!)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!9,f%!+Q%!I#pK!#`-!#02+Q%
-!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!&5pK!#TK!(d[B3!X$!!M6bTK!#"K!#K
-K!#%UB3!CA`!6,f%!+5TK!"PI!"J[B3!UB3"q,f%!,!`!)dmUB3!JB3!SB3!K+Q%
-!'9m!%bpK!#NUB3!CA`!B,f%!+Q%!IbpK!#`-!#028&92B3#!B3#"B3##DhCK!)0
-K!)4K!#)-!)82$!5Y!&%!5deKBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0
-[E@PZCcT[F'9ZFh0X,90139!Y-6Nj16%b-6%k6@&M6e-kE@YXD@jVFbjKF`!#!!!
-1"+i!!J6mF!5p!ra`!!%1",d!!3!%[J`%[J!'!!!!!J!!$J5[!!)%r'm%[`2mE`!
-%$J5r!!3!"-!%`36#"---"-!!%J!-6@&MD@jdEh0S)%K%!!)!!!`%`3!8!!j%CA0
-VG'p`)%C[E'4PFJ!#!!!-"-)!$J!)5@jMEfeTEQF!!J!!$!6$!"X!&@p`C@jcFf`
-Y8dj"8#da16Nj-6)a-3!#!!!-",!!4J"!6@&MD@jdEh0S)%K%1N4PFfYdEh!J4Qp
-XC'9b1NPZBfpYD@jR1Qp`C@jcFf`Y8dj"8#da16Nj-6)a-6T0B@028`!#!!!-",%
-!5!"#6@&MD@jdEh0S)%K%1N4PFfYdEh!J4QpXC'9b1NPZBfpYD@jR1Qp`C@jcFf`
-Y8dj"8#da16Nj-6)a-6TTEQ0XG@4P!!)!!!`%XJ"3!%T0B@0TER4[FfJJ5%3k4'9
-cDh4[F#"'EfaNCA)k5@jMEfeTEQFkEh"PER0cE#e66N&3,6%j16Na-M%a1QPZBfa
-eC'8kEh"PER0cE!!#!!!-",-!4`""6@&MD@jdEh0S)%K%1N4PFfYdEh!J4QpXC'9
-b1NPZBfpYD@jR1Qp`C@jcFf`Y8dj"8#da16Nj-6)a-6TMFRP`G'm!!J!!$!5d!%3
-!2NeKBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0[E@PZCcT[F'9ZFh0X,90
-139!Y-6Nj16%b-6%kFh0X!!)!!!`%Y3"!!$T0B@0TER4[FfJJ5%3k4'9cDh4[F#"
-'EfaNCA)k5@jMEfeTEQFkEh"PER0cE#e66N&3,6%j16Na-M%a!!)!!!i%YJ!"&!6
-%$J6%!!-B"-AmEJ6'$J6&!!-B"-ImE36)$J6(!!-B"-RmE!6+$J6*!!-B!"rmD`6
-,#[aV!!3+BfC[E!`%b`!1!!K*EQ0[E@PZC`!#!!!+r'`!"!TMCQpX$!6+!"X!&@p
-`C@jcFf`Y8dj"8#da16Nj-6)a-3!#!!!+r'd!"!TMCQpX$!6)!!d!"fPZBfaeC'8
-!!J!!#[aZ!!3+BfC[E!`%aJ!9!!peER4TG'aPC#"QEfaNCA)!!J!!$!5h!%i!5%e
-KBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0[E@PZCcT[F'9ZFh0X,90139!
-Y-6Nj16%b-6%kBh*jF(4[1RJe-$Pf-`!#!!!"r,%!!!(mX!!!!Ib[!!!"r+i!!'&
-cBh)!!3!-qYlHV3!!!3!!!*G#!!#@3J!!!AB!!$-8-0J!!!!F!AB!$h0MFhS!!!#
-#6Np853!!!)jcBh"d!!!!QP4&@&3!!3#QFh4jE!!!!,j$6d4&!!%!bN*14%`!!!$
-LBA"XG!!!!1j'8N9'!!!!qNP$6L-!!!%'D@0X0!!!!4*TBh-M!!!"(QPMFc3!!!%
-UD'CNFJ!!!6C659T&!!!"3PG3Eh-!!!&1!!$rr`!!!!!!!!!!!)$rre!!!"i!!!!
-!!)$rr`!!"cJ#DH#m"'Mrr`!!!*S!!!!!%iRrr`!!"Pi!!!!!"'Mrr`!!!53!!!!
-!!!$rrb!!!9)!!!!!!!(rra3!!@i#DG`%!)$rr`!!!Pi#DH"X!!$rr`!!!Ri!!!!
-!!)$rr`!!!S-#DH"d!*Err`!!!Si!!!!!!*Err`!!!j)!!!!!!*Err`!!"CB#DH%
-i!*Err`!!"GS#DH%dkF$rr`!!"[`!!!!!rrrrr`!!"a)!!!!!!)$rr`!!"b!!!!!
-!*4S:

MacOS/opensslconf.h

@@ -1,116 +0,0 @@
-/* MacOS/opensslconf.h */
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define OPENSSLDIR "/usr/local/ssl"
-#endif
-#endif
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_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
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * 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
-#endif
-#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
-#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). */
-#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
-#if __option(longlong)
-#  define BN_LLONG
-#else
-#  undef BN_LLONG
-#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
- * for debuging the bignum libraries */
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_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
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup 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 BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#define DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#define DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#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 */
-
-#ifndef __POWERPC__
-#define MD32_XARRAY
-#endif

Makefile.org

@@ -68,9 +68,12 @@ AR=ar $(ARFLAGS) r
 RANLIB= ranlib
 NM= nm
 PERL= perl
+#RM= echo --
+RM= rm -f
 TAR= tar
 TARFLAGS= --no-recursion
 MAKEDEPPROG=makedepend
+LIBDIR=lib
 
 # We let the C compiler driver to take care of .s files. This is done in
 # order to be excused from maintaining a separate set of architecture
@@ -87,6 +90,7 @@ PROCESSOR=
 # CPUID module collects small commonly used assembler snippets
 CPUID_OBJ= 
 BN_ASM= bn_asm.o
+EC_ASM=
 DES_ENC= des_enc.o fcrypt_b.o
 AES_ENC= aes_core.o aes_cbc.o
 BF_ENC= bf_enc.o
@@ -98,6 +102,8 @@ SHA1_ASM_OBJ=
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ=
 CMLL_ENC=
+MODES_ASM_OBJ=
+ENGINES_ASM_OBJ=
 PERLASM_SCHEME=
 
 # KRB5 stuff
@@ -108,7 +114,28 @@ LIBKRB5=
 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 may be different so hard
+# code the path.
+
+FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
+
+# The location of the library which contains fipscanister.o
+# normally it will be libcrypto. 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 ssl engines apps test tools
+ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
@@ -119,7 +146,7 @@ SDIRS=  \
 	bn ec rsa dsa ecdsa dh ecdh dso engine \
 	buffer bio stack lhash rand err \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-	cms pqueue ts jpake store
+	cms pqueue ts jpake srp store cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -156,6 +183,17 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
 
+# Directories created on install if they don't exist.
+INSTALLDIRS=	\
+		$(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
+
 all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
 
 # as we stick to -e, CLEARENV ensures that local variables in lower
@@ -170,7 +208,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
 		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
 		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
-		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
+		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS}	\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
@@ -178,21 +216,23 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
-		CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'	\
+		CROSS_COMPILE='$(CROSS_COMPILE)'	\
-		PERL='$(PERL)'					\
+		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
-		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'	\
+		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\
 		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\
 		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\
+		LIBDIR='$(LIBDIR)'				\
 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
+		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
 		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\
 		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\
 		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\
-		CPUID_OBJ='$(CPUID_OBJ)'			\
+		CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)'	\
-		BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' 	\
+		EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)'		\
 		AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)'	\
 		BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)'	\
 		RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)'	\
@@ -200,7 +240,12 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\
 		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\
 		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\
+		MODES_ASM_OBJ='$(MODES_ASM_OBJ)'		\
+		ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'		\
 		PERLASM_SCHEME='$(PERLASM_SCHEME)'		\
+		FIPSLIBDIR='${FIPSLIBDIR}'			\
+		FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"	\
+		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.
@@ -211,13 +256,13 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
 # This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
 # BUILD_ONE_CMD instead.
 #
-# 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_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.
 BUILD_CMD=  if [ -d "$$dir" ]; then \
 	    (	cd $$dir && echo "making $$target in $$dir..." && \
 		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
@@ -232,22 +277,107 @@ BUILD_ONE_CMD=\
 reflect:
 	@[ -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_gf2m.o \
+	../crypto/bn/bn_lib.o \
+	../crypto/bn/bn_mod.o \
+	../crypto/bn/bn_mont.o \
+	../crypto/bn/bn_mul.o \
+	../crypto/bn/bn_nist.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/cmac/cmac.o \
+	../crypto/cryptlib.o \
+	../crypto/des/cfb64ede.o \
+	../crypto/des/cfb64enc.o \
+	../crypto/des/cfb_enc.o \
+	../crypto/des/ecb3_enc.o \
+	../crypto/des/ofb64ede.o \
+	../crypto/des/fcrypt.o \
+	../crypto/des/set_key.o \
+	../crypto/dh/dh_check.o \
+	../crypto/dh/dh_gen.o \
+	../crypto/dh/dh_key.o \
+	../crypto/dsa/dsa_gen.o \
+	../crypto/dsa/dsa_key.o \
+	../crypto/dsa/dsa_ossl.o \
+	../crypto/ec/ec_curve.o \
+	../crypto/ec/ec_cvt.o \
+	../crypto/ec/ec_key.o \
+	../crypto/ec/ec_lib.o \
+	../crypto/ec/ecp_mont.o \
+	../crypto/ec/ec_mult.o \
+	../crypto/ec/ecp_nist.o \
+	../crypto/ec/ecp_smpl.o \
+	../crypto/ec/ec2_mult.o \
+	../crypto/ec/ec2_smpl.o \
+	../crypto/ecdh/ech_key.o \
+	../crypto/ecdh/ech_ossl.o \
+	../crypto/ecdsa/ecs_ossl.o \
+	../crypto/evp/e_aes.o \
+	../crypto/evp/e_des3.o \
+	../crypto/evp/e_null.o \
+	../crypto/evp/m_sha1.o \
+	../crypto/evp/m_dss1.o \
+	../crypto/evp/m_dss.o \
+	../crypto/evp/m_ecdsa.o \
+	../crypto/hmac/hmac.o \
+	../crypto/modes/cbc128.o \
+	../crypto/modes/ccm128.o \
+	../crypto/modes/cfb128.o \
+	../crypto/modes/ctr128.o \
+	../crypto/modes/gcm128.o \
+	../crypto/modes/ofb128.o \
+	../crypto/modes/xts128.o \
+	../crypto/rsa/rsa_eay.o \
+	../crypto/rsa/rsa_gen.o \
+	../crypto/rsa/rsa_crpt.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/rsa/rsa_x931g.o \
+	../crypto/sha/sha1dgst.o \
+	../crypto/sha/sha256.o \
+	../crypto/sha/sha512.o \
+	../crypto/thr_id.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_crypto:
 	@dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl:
+build_ssl: build_crypto
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines:
+build_engines: build_crypto
-	@dir=engines; target=all; $(BUILD_ONE_CMD)
+	@dir=engines; target=all; AS='$(CC) -c'; export AS; $(BUILD_ONE_CMD)
-build_apps:
+
+build_apps: build_libs
 	@dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests:
+build_tests: build_libs
 	@dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools:
+build_tools: build_libs
 	@dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps
@@ -256,7 +386,11 @@ build_testapps:
 
 libcrypto$(SHLIB_EXT): libcrypto.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		$(MAKE) SHLIBDIRS=crypto build-shared; \
+		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+			FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+			export CC FIPSLD_CC; \
+		fi; \
+		$(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared; \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \
@@ -279,7 +413,7 @@ clean-shared:
 			done; \
 		fi; \
 		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
-		if [ "$(PLATFORM)" = "Cygwin" ]; then \
+		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
 			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
 		fi; \
 	done
@@ -297,7 +431,7 @@ build-shared: do_$(SHLIB_TARGET) link-shared
 
 do_$(SHLIB_TARGET):
 	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
-		if [ "$(SHLIBDIRS)" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+		if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
@@ -311,41 +445,41 @@ do_$(SHLIB_TARGET):
 libcrypto.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-libcrypto'; \
 	    echo 'Description: OpenSSL cryptography library'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lcrypto'; \
+	    echo 'Libs.private: $(EX_LIBS)'; \
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 
 libssl.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'; \
+	    echo 'Name: OpenSSL-libssl'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
 	    echo 'Version: '$(VERSION); \
-	    echo 'Requires: '; \
+	    echo 'Requires.private: libcrypto'; \
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+	    echo 'Libs: -L$${libdir} -lssl'; \
+	    echo 'Libs.private: $(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'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
 	    echo 'Version: '$(VERSION); \
-	    echo 'Requires: '; \
+	    echo 'Requires: libssl libcrypto' ) > openssl.pc
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile: Makefile.org Configure config
 	@echo "Makefile is older than Makefile.org, Configure or config."
@@ -353,12 +487,13 @@ Makefile: Makefile.org Configure config
 	@false
 
 libclean:
-	rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
+	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
 
 clean:	libclean
 	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+	rm -rf *.bak certs/.0
 	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
-	rm -f $(LIBS)
+	rm -f $(LIBS) tags TAGS
 	rm -f openssl.pc libssl.pc libcrypto.pc
 	rm -f speed.* .pure
 	rm -f $(TARFILE)
@@ -385,17 +520,16 @@ gentests:
 	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:
-	rm -rf *.bak include/openssl certs/.0
 	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
 rehash: rehash.time
 rehash.time: certs apps
-	@if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \
+	@if [ -z "$(CROSS_COMPILE)" ]; then \
 		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
 		OPENSSL_DEBUG_MEMORY=on; \
 		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-		$(PERL) tools/c_rehash certs) && \
+		$(PERL) tools/c_rehash certs/demo) && \
 		touch rehash.time; \
 	else :; fi
 
@@ -403,8 +537,8 @@ test:   tests
 
 tests: rehash
 	@(cd test && echo "testing..." && \
-	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on tests );
+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
-	util/opensslwrap.sh version -a
+	OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
 
 report:
 	@$(PERL) util/selftest.pl
@@ -415,14 +549,17 @@ depend:
 lint:
 	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
 
-tags:
+tags TAGS: FORCE
-	rm -f TAGS
+	rm -f TAGS tags
-	find . -name '[^.]*.[ch]' | xargs etags -a
+	-ctags -R .
+	-etags -R .
+
+FORCE:
 
 errors:
+	$(PERL) util/ck_errf.pl -strict */*.c */*/*.c
 	$(PERL) util/mkerr.pl -recurse -write
 	(cd engines; $(MAKE) PERL=$(PERL) errors)
-	$(PERL) util/ck_errf.pl */*.c */*/*.c
 
 stacks:
 	$(PERL) util/mkstack.pl -write
@@ -490,29 +627,24 @@ dist_pem_h:
 
 install: all install_docs install_sw
 
+uninstall: uninstall_sw uninstall_docs
+
 install_sw:
-	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
-		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
-		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
 	do \
 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
 	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-	@set -e; for i in $(LIBS) ;\
+	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
 	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 \
@@ -521,18 +653,18 @@ install_sw:
 		do \
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 			(       echo installing $$i; \
-				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+				if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
-				else \
 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/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; \
+				else \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 				fi ); \
 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 				(	case $$i in \
@@ -547,7 +679,7 @@ install_sw:
 			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:'; \
@@ -556,61 +688,121 @@ install_sw:
 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
 		fi; \
 	fi
-	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
-	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+
+uninstall_sw:
+	cd include/openssl && files=* && cd $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl && $(RM) $$files
+	@for i in $(LIBS) ;\
+	do \
+		test -f "$$i" && \
+		echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i && \
+		$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+	done;
+	@if [ -n "$(SHARED_LIBS)" ]; then \
+		tmp="$(SHARED_LIBS)"; \
+		for i in $${tmp:-x}; \
+		do \
+			if [ -f "$$i" -o -f "$$i.a" ]; then \
+				if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
+					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+				else \
+					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+				fi; \
+				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+					case $$i in \
+						*crypto*) i=libeay32.dll;; \
+						*ssl*)    i=ssleay32.dll;; \
+					esac; \
+					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+				fi; \
+			fi; \
+		done; \
+	fi
+	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
+	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
+	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+	@target=uninstall; $(RECURSIVE_BUILD_CMD)
 
 install_html_docs:
 	here="`pwd`"; \
+	filecase=; \
+	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
+		filecase=-i; \
+	esac; \
 	for subdir in apps crypto ssl; do \
-		mkdir -p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
+		$(PERL) $(TOP)/util/mkdir-p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
 		for i in doc/$$subdir/*.pod; do \
 			fn=`basename $$i .pod`; \
 			echo "installing html/$$fn.$(HTMLSUFFIX)"; \
 			cat $$i \
 			| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
-			| pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \
+			| pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \
 			| sed -r 's/<!DOCTYPE.*//g' \
 			> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
 			$(PERL) util/extract-names.pl < $$i | \
 				grep -v $$filecase "^$$fn\$$" | \
 				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
 				 while read n; do \
-					$$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \
+					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \
 				 done); \
 		done; \
 	done
 
+uninstall_html_docs:
+	here="`pwd`"; \
+	filecase=; \
+	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
+		filecase=-i; \
+	esac; \
+	for subdir in apps crypto ssl; do \
+		for i in doc/$$subdir/*.pod; do \
+			fn=`basename $$i .pod`; \
+			$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
+			$(PERL) util/extract-names.pl < $$i | \
+				grep -v $$filecase "^$$fn\$$" | \
+				while read n; do \
+					$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \
+				done; \
+		done; \
+	done
+
 install_docs:
 	@$(PERL) $(TOP)/util/mkdir-p.pl \
 		$(INSTALL_PREFIX)$(MANDIR)/man1 \
 		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 		$(INSTALL_PREFIX)$(MANDIR)/man7
-	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
 	here="`pwd`"; \
 	filecase=; \
-	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
+	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
 		filecase=-i; \
-	fi; \
+	esac; \
 	set -e; for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
-		sh -c "$$pod2man \
+		pod2man \
 			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`") \
+			--release=$(VERSION) `basename $$i`) \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done; \
 	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
@@ -618,17 +810,50 @@ install_docs:
 		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
-		sh -c "$$pod2man \
+		pod2man \
 			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`") \
+			--release=$(VERSION) `basename $$i`) \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done
 
+uninstall_docs:
+	@here="`pwd`"; \
+	filecase=; \
+	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
+		filecase=-i; \
+	esac; \
+	for i in doc/apps/*.pod; do \
+		fn=`basename $$i .pod`; \
+		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
+		echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+		$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+		$(PERL) util/extract-names.pl < $$i | \
+			(grep -v $$filecase "^$$fn\$$"; true) | \
+			(grep -v "[	]"; true) | \
+			while read n; do \
+				echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
+				$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
+			done; \
+	done; \
+	for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+		fn=`basename $$i .pod`; \
+		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
+		echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+		$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+		$(PERL) util/extract-names.pl < $$i | \
+			(grep -v $$filecase "^$$fn\$$"; true) | \
+			(grep -v "[	]"; true) | \
+			while read n; do \
+				echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
+				$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
+			done; \
+	done
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.

Makefile.shared

@@ -135,7 +135,7 @@ LINK_SO_A_VIA_O=	\
   ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
   ( $(SET_X); \
     ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
-  $(LINK_SO) && rm -f $(LIBNAME).o
+  $(LINK_SO) && rm -f lib$(LIBNAME).o
 
 LINK_SO_A_UNPACKED=	\
   UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
@@ -170,17 +170,6 @@ link_a.gnu:
 link_app.gnu:
 	@ $(DO_GNU_APP); $(LINK_APP)
 
-DO_BEOS_SO=	SHLIB=lib$(LIBNAME).so; \
-	SHLIB_SUFFIX=; \
-	ALLSYMSFLAGS='-Wl,--whole-archive'; \
-	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SUFFIX"
-
-link_o.beos:
-	@ $(DO_BEOS_SO); $(LINK_SO_O)
-link_a.beos:
-	@ $(DO_BEOS_SO); $(LINK_SO_A)
-
 link_o.bsd:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
@@ -207,17 +196,29 @@ 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,
+# Originally link_o.darwin produced .so, because it was hard-coded
-# which has .so extension hard-coded. One can argue that one should
+# in dso_dlfcn module. At later point dso_dlfcn switched to .dylib
-# develop special dso module for MacOS X. At least manual encourages
+# extension in order to allow for run-time linking with vendor-
-# to use native NSModule(3) API and refers to dlfcn as termporary hack.
+# supplied shared libraries such as libz, so that link_o.darwin had
+# to be harmonized with it. This caused minor controversy, because
+# it was believed that dlopen can't be used to dynamically load
+# .dylib-s, only so called bundle modules (ones linked with -bundle
+# flag). The belief seems to be originating from pre-10.4 release,
+# where dlfcn functionality was emulated by dlcompat add-on. In
+# 10.4 dlopen was rewritten as native part of dyld and is documented
+# to be capable of loading both dynamic libraries and bundles. In
+# order to provide compatibility with pre-10.4 dlopen, modules are
+# linked with -bundle flag, which makes .dylib extension misleading.
+# It works, because dlopen is [and always was] extension-agnostic.
+# Alternative to this heuristic approach is to develop specific
+# MacOS X dso module relying on whichever "native" dyld interface.
 link_o.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME); \
-	SHLIB_SUFFIX=.so; \
+	SHLIB_SUFFIX=.dylib; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
+	SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
@@ -238,7 +239,7 @@ link_a.darwin:
 	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 	fi; \
-	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/lib/$$SHLIB$(SHLIB_EXT)"; \
+	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/$(LIBDIR)/$$SHLIB$(SHLIB_EXT)"; \
 	$(LINK_SO_A)
 link_app.darwin:	# is there run-path on darwin?
 	$(LINK_APP)
@@ -281,7 +282,7 @@ link_a.cygwin:
 	fi; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 	$(PERL) util/mkrc.pl $$dll_name | \
-		$(CROSS_COMPILE_PREFIX)windres -o rc.o; \
+		$(CROSS_COMPILE)windres -o rc.o; \
 	extras="$$extras rc.o"; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
@@ -543,28 +544,10 @@ link_app.aix:
 	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
 	$(LINK_APP)
 
-link_o.reliantunix:
-	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME).so; \
-	SHLIB_SUFFIX=; \
-	ALLSYMSFLAGS=; \
-	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS='$(CFLAGS) -G'; \
-	$(LINK_SO_O)
-link_a.reliantunix:
-	@ $(CALC_VERSIONS); \
-	SHLIB=lib$(LIBNAME).so; \
-	SHLIB_SUFFIX=; \
-	ALLSYMSFLAGS=; \
-	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS='$(CFLAGS) -G'; \
-	$(LINK_SO_A_UNPACKED)
-link_app.reliantunix:
-	$(LINK_APP)
 
 # Targets to build symbolic links when needed
 symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
-symlink.aix symlink.reliantunix:
+symlink.aix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	$(SYMLINK_SO)
@@ -579,7 +562,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 symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
+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
@@ -633,11 +616,3 @@ link_o.aix-shared: link_o.aix
 link_a.aix-shared: link_a.aix
 link_app.aix-shared: link_app.aix
 symlink.aix-shared: symlink.aix
-link_o.reliantunix-shared: link_o.reliantunix
-link_a.reliantunix-shared: link_a.reliantunix
-link_app.reliantunix-shared: link_app.reliantunix
-symlink.reliantunix-shared: symlink.reliantunix
-link_o.beos-shared: link_o.beos
-link_a.beos-shared: link_a.beos
-link_app.beos-shared: link_app.gnu
-symlink.beos-shared: symlink.beos

NEWS

@@ -5,13 +5,171 @@
   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.8k and OpenSSL 1.0:
+  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.2 [in beta]:
 
+      o Suite B support for TLS 1.2 and DTLS 1.2
+      o Support for DTLS 1.2
+      o TLS automatic EC curve selection.
+      o API to set TLS supported signature algorithms and curves
+      o SSL_CONF configuration API.
+      o TLS Brainpool support.
+      o ALPN support.
+      o CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.
+
+  Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [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 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014]
+
+      o Fix for CVE-2014-3512
+      o Fix for CVE-2014-3511
+      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-3509
+      o Fix for CVE-2014-5139
+      o Fix for CVE-2014-3508
+
+  Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [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-2010-5298
+
+  Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
+
+      o Fix for CVE-2014-0160
+      o Add TLS padding extension workaround for broken servers.
+      o Fix for CVE-2014-0076
+
+  Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]
+
+      o Don't include gmt_unix_time in TLS server and client random values
+      o Fix for TLS record tampering bug CVE-2013-4353
+      o Fix for TLS version checking bug CVE-2013-6449
+      o Fix for DTLS retransmission bug CVE-2013-6450
+
+  Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e [11 Feb 2013]:
+
+      o Corrected fix for CVE-2013-0169
+
+  Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d [4 Feb 2013]:
+
+      o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version.
+      o Include the fips configuration module.
+      o Fix OCSP bad key DoS attack CVE-2013-0166
+      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
+      o Fix for TLS AESNI record handling flaw CVE-2012-2686
+
+  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c [10 May 2012]:
+
+      o Fix TLS/DTLS record length checking bug CVE-2012-2333
+      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
+
+  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b [26 Apr 2012]:
+
+      o Fix compilation error on non-x86 platforms.
+      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
+      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
+
+  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a [19 Apr 2012]:
+
+      o Fix for ASN1 overflow bug CVE-2012-2110
+      o Workarounds for some servers that hang on long client hellos.
+      o Fix SEGV in AES code.
+
+  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1 [14 Mar 2012]:
+
+      o TLS/DTLS heartbeat support.
+      o SCTP support.
+      o RFC 5705 TLS key material exporter.
+      o RFC 5764 DTLS-SRTP negotiation.
+      o Next Protocol Negotiation.
+      o PSS signatures in certificates, requests and CRLs.
+      o Support for password based recipient info for CMS.
+      o Support TLS v1.2 and TLS v1.1.
+      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
+      o SRP support.
+
+  Major changes between OpenSSL 1.0.0k and OpenSSL 1.0.0l [6 Jan 2014]
+
+      o Fix for DTLS retransmission bug CVE-2013-6450
+
+  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [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 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
+
+      o Fix DTLS record length checking bug CVE-2012-2333
+
+  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
+
+      o Fix for ASN1 overflow bug CVE-2012-2110
+
+  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [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 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]:
+
+      o Fix for DTLS DoS issue CVE-2012-0050
+
+  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]:
+
+      o Fix for DTLS plaintext recovery attack CVE-2011-4108
+      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 parameters are not NULL in GOST ENGINE CVE-2012-0027
+      o Check for malformed RFC3779 data CVE-2011-4577
+
+  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]:
+
+      o Fix for CRL vulnerability issue CVE-2011-3207
+      o Fix for ECDH crashes CVE-2011-3210
+      o Protection against EC timing attacks.
+      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]:
+
+      o Fix for security issue CVE-2011-0014
+
+  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]:
+
+      o Fix for security issue CVE-2010-4180
+      o Fix for CVE-2010-4252
+      o Fix mishandling of absent EC point format extension.
+      o Fix various platform compilation issues.
+      o Corrected fix for security issue CVE-2010-3864.
+
+  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]:
+
+      o Fix for security issue CVE-2010-3864.
+      o Fix for CVE-2010-2939
+      o Fix WIN32 build system for GOST ENGINE.
+
+  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]:
+
+      o Fix for security issue CVE-2010-1633.
+      o GOST MAC and CFB fixes.
+
+  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]:
 
       o RFC3280 path validation: sufficient to process PKITS tests.
       o Integrated support for PVK files and keyblobs.
       o Change default private key format to PKCS#8.
-      o CMS support: able to process all examples in RFCXXXX
+      o CMS support: able to process all examples in RFC4134
       o Streaming ASN1 encode support for PKCS#7 and CMS.
       o Multiple signer and signer add support for PKCS#7 and CMS.
       o ASN1 printing support.
@@ -27,30 +185,118 @@
       o ecdsa-with-SHA224/256/384/512 signature types.
       o dsa-with-SHA224 and dsa-with-SHA256 signature types.
       o Opaque PRF Input TLS extension support.
+      o Updated time routines to avoid OS limitations.
 
-  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k:
+  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:
+  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:
+  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:
+  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:
+  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
@@ -61,23 +307,23 @@
       o RFC4507bis support.
       o TLS Extensions support.
 
-  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
+  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:
+  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:
+  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:
+  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
 
       o Cipher string fixes.
       o Fixes for VC++ 2005.
@@ -87,12 +333,12 @@
       o Built in dynamic engine compilation support on Win32.
       o Fixes auto dynamic engine loading in Win32.
 
-  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
+  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:
+  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
@@ -166,36 +412,36 @@
       o Added initial support for Win64.
       o Added alternate pkg-config files.
 
-  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m:
+  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:
+  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:
+  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:
+  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:
+  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:
+  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:
+  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.
@@ -204,7 +450,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.
@@ -212,12 +458,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()
@@ -225,14 +471,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 
@@ -243,7 +489,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.
@@ -254,7 +500,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.
@@ -300,23 +546,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.
@@ -330,25 +576,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.
@@ -361,7 +607,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.
@@ -378,7 +624,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.
@@ -403,7 +649,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.
@@ -418,7 +664,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
@@ -427,7 +673,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
@@ -463,7 +709,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
@@ -474,7 +720,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
@@ -488,7 +734,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"
@@ -510,7 +756,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/do_tests.pl

@@ -270,22 +270,6 @@ sub ssl_tests
    print( OUT "\n========================================================\n");
    print( OUT "SSL TESTS:\n\n");
 
-   system("ssltest -ssl2 (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2:");
-   log_output("ssltest -ssl2", $outFile);
-
-   system("$ssltest -ssl2 -server_auth (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with server authentication:");
-   log_output("$ssltest -ssl2 -server_auth", $outFile);
-
-   system("$ssltest -ssl2 -client_auth (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with client authentication:");
-   log_output("$ssltest -ssl2 -client_auth", $outFile);
-
-   system("$ssltest -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with both client and server authentication:");
-   log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
-
    system("ssltest -ssl3 (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3:");
    log_output("ssltest -ssl3", $outFile);
@@ -318,26 +302,10 @@ sub ssl_tests
    log_desc("Testing sslv2/sslv3 with both client and server authentication:");
    log_output("$ssltest -server_auth -client_auth", $outFile);
 
-   system("ssltest -bio_pair -ssl2 (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 via BIO pair:");
-   log_output("ssltest -bio_pair -ssl2", $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 (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with server authentication via BIO pair:");
-   log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
-
-   system("$ssltest -bio_pair -ssl2 -client_auth (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with client authentication via BIO pair:");
-   log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
-
-   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth (CLIB_OPT)/>$outFile");
-   log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
-   log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
-
    system("ssltest -bio_pair -ssl3 (CLIB_OPT)/>$outFile");
    log_desc("Testing sslv3 via BIO pair:");
    log_output("ssltest -bio_pair -ssl3", $outFile);

Netware/globals.txt

@@ -66,7 +66,7 @@ static LHASH *error_hash=NULL;
 static LHASH *thread_hash=NULL;
 
 several files have routines with static "init" to track if error strings
-   have been loaded ( may not want seperate error strings for each process )
+   have been loaded ( may not want separate error strings for each process )
    The "init" variable can't be left "global" because the error has is a ptr
    that is malloc'ed.  The malloc'ed error has is dependant on the "init"
    vars.

PROBLEMS

@@ -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
@@ -195,3 +197,17 @@ reconfigure with additional no-sse2 [or 386] option passed to ./config.
 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.
+
+* hpux-parisc2-cc no-asm build fails with SEGV in ECDSA/DH.
+
+Compiler bug, presumably at particular patch level. Remaining
+hpux*-parisc*-cc configurations can be affected too. Drop optimization
+level to +O2 when compiling bn_nist.o.
+
+* solaris64-sparcv9-cc link failure
+
+Solaris 8 ar can fail to maintain symbol table in .a, which results in
+link failures. Apply 109147-09 or later or modify Makefile generated
+by ./Configure solaris64-sparcv9-cc and replace RANLIB assignment with
+
+	RANLIB= /usr/ccs/bin/ar rs

README

@@ -1,7 +1,7 @@
 
- OpenSSL 1.0.0-dev XX xxx XXXX
+ OpenSSL 1.1.0-dev
 
- Copyright (c) 1998-2008 The OpenSSL Project
+ Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
@@ -90,34 +90,6 @@
         SSL/TLS Client and Server Tests
         Handling of S/MIME signed or encrypted mail
 
-
- PATENTS
- -------
-
- Various companies hold various patents for various algorithms in various
- locations around the world. _YOU_ are responsible for ensuring that your use
- of any algorithms is legal by checking if there are any patents in your
- country.  The file contains some of the patents that we know about or are
- rumored to exist. This is not a definitive list.
-
- RSA Security holds software patents on the RC5 algorithm.  If you
- intend to use this cipher, you must contact RSA Security for
- licensing conditions. Their web page is http://www.rsasecurity.com/.
-
- RC4 is a trademark of RSA Security, so use of this label should perhaps
- only be used with RSA Security's permission.
-
- The IDEA algorithm is patented by Ascom in Austria, France, Germany, Italy,
- Japan, the Netherlands, Spain, Sweden, Switzerland, UK and the USA.  They
- 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
  ------------
 
@@ -139,6 +111,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:
 
@@ -160,25 +135,41 @@
     - Problem Description (steps that will reproduce the problem, if known)
     - Stack Traceback (if the application dumps core)
 
- Report the bug to the OpenSSL project via the Request Tracker
+ Email the report to:
- (http://www.openssl.org/support/rt.html) by mail to:
 
     openssl-bugs@openssl.org
 
- Note that mail to openssl-bugs@openssl.org is recorded in the publicly
+ Note that the request tracker should NOT be used for general assistance
- readable request tracker database and is forwarded to a public
+ or support queries. Just because something doesn't work the way you expect
- mailing list. Confidential mail may be sent to openssl-security@openssl.org
+ does not mean it is necessarily a bug in OpenSSL.
- (PGP key available from the key servers).
+
+ Note that mail to openssl-bugs@openssl.org is recorded in the public
+ request tracker database (see https://www.openssl.org/support/rt.html
+ for details) and also forwarded to a public mailing list. Confidential
+ mail may be sent to openssl-security@openssl.org (PGP key available from
+ the key servers).
 
  HOW TO CONTRIBUTE TO OpenSSL
  ----------------------------
 
  Development is coordinated on the openssl-dev mailing list (see
  http://www.openssl.org for information on subscribing). If you
- would like to submit a patch, send it to openssl-dev@openssl.org with
+ would like to submit a patch, send it to openssl-bugs@openssl.org with
  the string "[PATCH]" in the subject. Please be sure to include a
  textual explanation of what your patch does.
 
+ If you are unsure as to whether a feature will be useful for the general
+ OpenSSL community please discuss it on the openssl-dev mailing list first.
+ Someone may be already working on the same thing or there may be a good
+ reason as to why that feature isn't implemented.
+
+ Patches should be as up to date as possible, preferably relative to the
+ current Git or the last snapshot. They should follow the coding style of
+ OpenSSL and compile without warnings. Some of the core team developer targets
+ can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
+ compiles on many varied platforms: try to ensure you only use portable
+ features.
+
  Note: For legal reasons, contributions from the US can be accepted only
  if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
  (formerly BXA) with a copy to the ENC Encryption Request Coordinator;

README.ECC

@@ -0,0 +1,61 @@
+NOTE: The OpenSSL Software Foundation has executed a sublicense agreement
+entitled "Elliptic Curve Cryptography Patent License Agreement" with the
+National Security Agency/ Central Security Service Commercial Solutions
+Center (NCSC) dated 2010-11-04. That agreement permits implementation and
+distribution of software containing features covered by any or all of the
+following patents:
+
+1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol 
+    with Implicit Signatures" issued on June 2, 1998;
+2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport 
+    Protocol with Implicit Signature and Reduced Bandwidth" filed on May 
+    16, 1996;
+3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol 
+    with Implicit Signatures" issued on March 30, 1999;
+4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol 
+    with Implicit Signatures" issued on April 20, 1999;
+5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" 
+    issued on August 3, 1999;
+6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key 
+    Protocol" filed on May 17, 1996;
+7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key 
+    Protocol" filed on May 17, 1996;
+8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" 
+    issued on December 7, 1999;
+9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a 
+    Smartcard" filed on April 14, 1997;
+10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a 
+     Smartcard" filed on April 15, 1997;
+11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol 
+     with Implicit Signatures" issued on September 19, 2000;
+12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport 
+     Protocol with Implicit Signatures" filed on April 16, 1996;
+13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and 
+     Transport Protocol with Implicit Signatures" filed on April 16, 1996;
+14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" 
+     issued on October 31, 2000;
+15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption 
+     Systems" filed on July 31, 1995;
+16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption 
+     Systems" filed on July 31, 1995;
+17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued 
+     on January 1, 2002;
+18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" 
+     issued on November 26, 2002;
+19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport 
+     Protocol" filed on April 16, 1996;
+20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and 
+     Transport Protocol" filed on April 21, 1996;
+21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" 
+     issued on May 13, 2003;
+22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" 
+     issued September 9, 2003;
+23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a 
+     Smartcard" filed on November 5, 1999;
+24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and 
+     Transport Protocol with Implicit Signatures" filed on April 25, 2000;
+25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a 
+     Smartcard" filed on August 29, 2001 and published on July 18, 2002; and,
+26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key 
+     Protocol" filed on July 1, 2000.
+

README.FIPS

@@ -0,0 +1,130 @@
+Preliminary status and build information for FIPS module v2.0
+
+NB: if you are cross compiling you now need to use the latest "incore" script
+this can be found at util/incore in the tarballs.
+
+If you have any object files from a previous build do:
+
+make clean
+
+To build the module do:
+
+./config fipscanisteronly
+make
+
+Build should complete without errors.
+
+Build test utilities:
+
+make build_tests
+
+Run test suite:
+
+test/fips_test_suite
+
+again should complete without errors.
+
+Run test vectors: 
+
+1. Download an appropriate set of testvectors from www.openssl.org/docs/fips
+   only the fips-2.0 testvector files are usable for complete tests.
+
+2. Extract the files to a suitable directory.
+
+3. Run the test vector perl script, for example:
+
+   cd fips
+   perl fipsalgtest.pl --dir=/wherever/stuff/was/extracted
+
+4. It should say "passed all tests" at the end. Report full details of any
+   failures.
+
+If you wish to use the older 1.2.x testvectors (for example those from 2007)
+you need the command line switch --disable-v2 to fipsalgtest.pl
+
+Examine the external symbols in fips/fipscanister.o they should all begin
+with FIPS or fips. One way to check with GNU nm is:
+
+	nm -g --defined-only fips/fipscanister.o | grep -v -i fips
+
+If you get *any* output at all from this test (i.e. symbols not starting with
+fips or FIPS) please report it.
+
+Restricted tarball tests.
+
+The validated module will have its own tarball containing sufficient code to
+build fipscanister.o and the associated algorithm tests. You can create a
+similar tarball yourself for testing purposes using the commands below.
+
+Standard restricted tarball:
+
+make -f Makefile.fips dist
+
+Prime field field only ECC tarball:
+
+make NOEC2M=1 -f Makefile.fips dist
+
+Once you've created the tarball extract into a fresh directory and do:
+
+./config
+make
+
+You can then run the algorithm tests as above. This build automatically uses
+fipscanisterbuild and no-ec2m as appropriate.
+
+FIPS capable OpenSSL test: WARNING PRELIMINARY INSTRUCTIONS, SUBJECT TO CHANGE.
+
+At least initially the test module and FIPS capable OpenSSL may change and
+by out of sync. You are advised to check for any changes and pull the latest
+source from CVS if you have problems. See anon CVS and rsync instructions at:
+
+http://www.openssl.org/source/repos.html
+
+Make or download a restricted tarball from ftp://ftp.openssl.org/snapshot/
+
+If required set the environment variable FIPSDIR to an appropriate location
+to install the test module. If cross compiling set other environment
+variables too.
+
+In this restricted tarball on a Linux or U*ix like system run:
+
+./config
+make
+make install
+
+On Windows from a VC++ environment do:
+
+ms\do_fips
+
+This will build and install the test module and some associated files.
+
+Now download the latest version of the OpenSSL 1.0.1 branch from either a
+snapshot or preferably CVS. For Linux do:
+
+./config fips [other args]
+make
+
+For Windows:
+
+perl Configure VC-WIN32 fips [other args]
+ms\do_nasm
+nmake -f ms\ntdll.mak
+
+(or ms\nt.mak for a static build).
+
+Where [other args] can be any other arguments you use for an OpenSSL build
+such as "shared" or "zlib".
+
+This will build the fips capable OpenSSL and link it to the test module. You
+can now try linking and testing applications against the FIPS capable OpenSSL.
+
+Please report any problems to either the openssl-dev mailing list or directly
+to me steve@openssl.org . Check the mailing lists regularly to avoid duplicate
+reports.
+
+Known issues:
+
+Code needs extensively reviewing to ensure it builds correctly on 
+supported platforms and is compliant with FIPS 140-2.
+The "FIPS capable OpenSSL" is still largely untested, it builds and runs
+some simple tests OK on some systems but needs far more "real world" testing.

STATUS

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

VMS/install-vms.com

@@ -0,0 +1,67 @@
+$! install-vms.com -- Installs the files in a given directory tree
+$!
+$! Author: Richard Levitte <richard@levitte.org>
+$! Time of creation: 23-MAY-1998 19:22
+$!
+$! P1	root of the directory tree
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$ if p1 .eqs. ""
+$ then
+$   write sys$output "First argument missing."
+$   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") - -
+   "[000000." - "][" - "[" - "]"
+$ root = root_dev + "[" + root_dir
+$
+$ define /nolog wrk_sslroot 'root'.] /translation_attributes = concealed
+$ define /nolog wrk_sslinclude wrk_sslroot:[include]
+$
+$ if f$parse( "wrk_sslroot:[000000]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[000000]
+$ if f$parse( "wrk_sslinclude:") .eqs. "" then -
+   create /directory /log wrk_sslinclude:
+$ if f$parse( "wrk_sslroot:[vms]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[vms]
+$!
+$ copy /log /protection = world:re openssl_startup.com wrk_sslroot:[vms]
+$ copy /log /protection = world:re openssl_undo.com wrk_sslroot:[vms]
+$ copy /log /protection = world:re openssl_utils.com wrk_sslroot:[vms]
+$!
+$ tidy:
+$!
+$ call deass wrk_sslroot
+$ call deass wrk_sslinclude
+$!
+$ exit
+$!
+$ deass: subroutine
+$ if (f$trnlnm( p1, "LNM$PROCESS") .nes. "")
+$ then
+$   deassign /process 'p1'
+$ endif
+$ endsubroutine
+$!

VMS/install.com

@@ -1,72 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 23-MAY-1998 19:22
-$!
-$! 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."
-$	    EXIT
-$	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") -
-		   - "[000000." - "][" - "[" - "]"
-$	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]
-$	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLINCLUDE:
-$	IF F$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]
-$
-$	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -
-	   DELETE WRK_SSLINCLUDE:vms_idhacks.h;*
-$
-$	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 "$!"
-$	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"
-$	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"") .GE. 128 THEN ARCH = ""ALPHA"""
-$	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]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLEXE		SSLROOT:['ARCH'_EXE]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLCERTS	SSLROOT:[CERTS]"
-$	WRITE SF "$	DEFINE/NOLOG'P1	SSLPRIVATE	SSLROOT:[PRIVATE]"
-$	WRITE SF "$"
-$	WRITE SF "$!	This is program can include <openssl/{foo}.h>"
-$	WRITE SF "$	DEFINE/NOLOG'P1	OPENSSL		SSLINCLUDE:"
-$	WRITE SF "$"
-$	WRITE SF "$	IF F$SEARCH(""SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"") .NES."""" THEN -"
-$	WRITE SF "	   @SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
-$	WRITE SF "$"
-$	WRITE SF "$	EXIT"
-$	CLOSE SF
-$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
-$
-$	COPY OPENSSL_UTILS.COM WRK_SSLROOT:[VMS]/LOG
-$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_UTILS.COM
-$
-$	EXIT

VMS/mkshared.com

@@ -1,77 +1,168 @@
-$! MKSHARED.COM -- script to created shareable images on VMS
+$! MKSHARED.COM -- Create shareable images.
 $!
-$! No command line parameters.  This should be run at the start of the source
+$! P1: "64" for 64-bit pointers.
-$! tree (the same directory where one finds INSTALL.VMS).
 $!
-$! Input:	[.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
+$! P2: Zlib object library path (optional).
-$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
+$!
-$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
+$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO[32].OLB
-$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
+$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]SSL_LIBSSL[32].OLB
+$!		[.CRYPTO.xxx]OPENSSLCONF.H
+$! Output:	[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO_SHR[32].OPT,.MAP,.EXE
+$!		[.xxx.EXE.SSL]SSL_LIBSSL_SRH[32].OPT,.MAP,.EXE
 $!
 $! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
 $! ===========================================================================
-$
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$! Save the original default device:[directory].
+$!
+$ def_orig = f$environment( "default")
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$! SET DEFAULT to the main kit directory.
+$!
+$ proc = f$environment("procedure")
+$ proc = f$parse( "A.;", proc)- "A.;"
+$ set default 'proc'
+$ set default [-]
+$!
 $! ----- Prepare info for processing: version number and file info
 $ gosub read_version_info
 $ if libver .eqs. ""
 $ then
 $   write sys$error "ERROR: Couldn't find any library version info..."
-$   exit
+$   go to tidy:
 $ endif
 $
-$ if f$getsyi("CPU") .ge. 128
+$ if (f$getsyi("cpu") .lt. 128)
 $ then
-$   libid  = "Crypto"
+$   arch_vax = 1
-$   libnum = "[.UTIL]LIBEAY.NUM"
+$   arch = "VAX"
-$   libdir = "[.AXP.EXE.CRYPTO]"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
-$   libref = ""
-$   gosub create_axp_shr
-$   libid  = "SSL"
-$   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.AXP.EXE.SSL]"
-$   libolb = "''libdir'LIBSSL.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
-$   libmap = "''libdir'LIBSSL.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.AXP.EXE.CRYPTO]LIBCRYPTO.EXE"
-$   gosub create_axp_shr
 $ else
+$   arch_vax = 0
+$   arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
+$   if (arch .eqs. "") then arch = "UNK"
+$ endif
+$!
+$ archd = arch
+$ lib32 = "32"
+$ shr = "SHR32"
+$!
+$ if (p1 .nes. "")
+$ then
+$   if (p1 .eqs. "64")
+$   then
+$     archd = arch+ "_64"
+$     lib32 = ""
+$     shr = "SHR"
+$   else
+$     if (p1 .nes. "32")
+$     then
+$       write sys$output "Second argument invalid."
+$       write sys$output "It should be "32", "64", or nothing."
+$       exit
+$     endif
+$   endif
+$ endif
+$!
+$! ----- Prepare info for processing: disabled algorithms info
+$ gosub read_disabled_algorithms_info
+$!
+$ ZLIB = p2
+$ zlib_lib = ""
+$ if (ZLIB .nes. "")
+$ then
+$   file2 = f$parse( ZLIB, "libz.olb", , , "syntax_only")
+$   if (f$search( file2) .eqs. "")
+$   then
+$     write sys$output ""
+$     write sys$output "The Option ", ZLIB, " Is Invalid."
+$     write sys$output "    Can't find library: ''file2'"
+$     write sys$output ""
+$     goto tidy
+$   endif
+$   zlib_lib = ", ''file2' /library"
+$ endif
+$!
+$ if (arch_vax)
+$ then
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.VAX.EXE.CRYPTO]"
+$   libdir = "[.''ARCHD'.EXE.CRYPTO]"
-$   libmar = "''libdir'LIBCRYPTO.MAR"
+$   libmar = "''libdir'SSL_LIBCRYPTO_''shr'.MAR"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
+$   libolb = "''libdir'SSL_LIBCRYPTO''lib32'.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
+$   libopt = "''libdir'SSL_LIBCRYPTO_''shr'.OPT"
-$   libobj = "''libdir'LIBCRYPTO.OBJ"
+$   libobj = "''libdir'SSL_LIBCRYPTO_''shr'.OBJ"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
+$   libmap = "''libdir'SSL_LIBCRYPTO_''shr'.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
+$   libgoal= "''libdir'SSL_LIBCRYPTO_''shr'.EXE"
 $   libref = ""
 $   libvec = "LIBCRYPTO"
-$   gosub create_vax_shr
+$   if f$search( libolb) .nes. "" then gosub create_vax_shr
 $   libtit = "SSL_TRANSFER_VECTOR"
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.VAX.EXE.SSL]"
+$   libdir = "[.''ARCHD'.EXE.SSL]"
-$   libmar = "''libdir'LIBSSL.MAR"
+$   libmar = "''libdir'SSL_LIBSSL_''shr'.MAR"
-$   libolb = "''libdir'LIBSSL.OLB"
+$   libolb = "''libdir'SSL_LIBSSL''lib32'.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
+$   libopt = "''libdir'SSL_LIBSSL_''shr'.OPT"
-$   libobj = "''libdir'LIBSSL.OBJ"
+$   libobj = "''libdir'SSL_LIBSSL_''shr'.OBJ"
-$   libmap = "''libdir'LIBSSL.MAP"
+$   libmap = "''libdir'SSL_LIBSSL_''shr'.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
+$   libgoal= "''libdir'SSL_LIBSSL_''shr'.EXE"
-$   libref = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   libref = "[.''ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO_''shr'.EXE"
 $   libvec = "LIBSSL"
-$   gosub create_vax_shr
+$   if f$search( libolb) .nes. "" then gosub create_vax_shr
+$ else
+$   libid  = "Crypto"
+$   libnum = "[.UTIL]LIBEAY.NUM"
+$   libdir = "[.''ARCHD'.EXE.CRYPTO]"
+$   libolb = "''libdir'SSL_LIBCRYPTO''lib32'.OLB"
+$   libopt = "''libdir'SSL_LIBCRYPTO_''shr'.OPT"
+$   libmap = "''libdir'SSL_LIBCRYPTO_''shr'.MAP"
+$   libgoal= "''libdir'SSL_LIBCRYPTO_''shr'.EXE"
+$   libref = ""
+$   if f$search( libolb) .nes. "" then gosub create_nonvax_shr
+$   libid  = "SSL"
+$   libnum = "[.UTIL]SSLEAY.NUM"
+$   libdir = "[.''ARCHD'.EXE.SSL]"
+$   libolb = "''libdir'SSL_LIBSSL''lib32'.OLB"
+$   libopt = "''libdir'SSL_LIBSSL_''shr'.OPT"
+$   libmap = "''libdir'SSL_LIBSSL_''shr'.MAP"
+$   libgoal= "''libdir'SSL_LIBSSL_''shr'.EXE"
+$   libref = "[.''ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO_''shr'.EXE"
+$   if f$search( libolb) .nes. "" then gosub create_nonvax_shr
 $ endif
+$!
+$ tidy:
+$!
+$! Close any open files.
+$!
+$ if (f$trnlnm( "libnum", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close libnum
+$!
+$ if (f$trnlnm( "mar", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close mar
+$!
+$ if (f$trnlnm( "opt", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close opt
+$!
+$ if (f$trnlnm( "vf", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close vf
+$!
+$! Restore the original default device:[directory].
+$!
+$ set default 'def_orig'
 $ exit
 $
-$! ----- Soubroutines to actually build the shareable libraries
+$! ----- Subroutines 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,28 +188,29 @@ $! 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"
+$   write opt libolb, " /library"
 $   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 ")"
 $   write opt "GSMATCH=",libvmatch,",",libver
 $   close opt
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
+$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+     'zlib_lib'
 $   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 +236,7 @@ $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for AXP
+$! ----- Subroutines for VAX
 $! -----
 $! The creator routine
 $ create_vax_shr:
@@ -186,7 +278,7 @@ $   close mar
 $   open /write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
 $   write opt libobj
-$   write opt libolb,"/lib"
+$   write opt libolb, " /library"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   type sys$input:/out=opt:
 !
@@ -205,7 +297,8 @@ $   libwriter := write_vax_psect_attr
 $   gosub read_func_num
 $   close opt
 $   macro/obj='libobj' 'libmar'
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
+$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+     'zlib_lib'
 $   return
 $
 $! The record writer routine for VAX functions
@@ -227,9 +320,9 @@ $   return
 $
 $! ----- Common subroutines
 $! -----
-$! The .num file reader.  This one has great responsability.
+$! The .num file reader.  This one has great responsibility.
 $ read_func_num:
-$   open libnum 'libnum'
+$   open /read libnum 'libnum'
 $   goto read_nums
 $
 $ read_nums:
@@ -238,9 +331,12 @@ $   liblastentry:=false
 $   entrycount=0
 $   loop:
 $     read /end=loop_end /err=loop_end libnum line
-$     entrynum=f$int(f$element(1," ",f$edit(line,"COMPRESS,TRIM")))
+$     lin = f$edit( line, "COMPRESS,TRIM")
-$     entryinfo=f$element(2," ",f$edit(line,"COMPRESS,TRIM"))
+$!    Skip a "#" comment line.
-$     curentry=f$element(0," ",f$edit(line,"COMPRESS,TRIM"))
+$     if (f$extract( 0, 1, lin) .eqs. "#") then goto loop
+$     entrynum = f$int(f$element( 1, " ", lin))
+$     entryinfo = f$element( 2, " ", lin)
+$     curentry = f$element( 0, " ", lin)
 $     info_exist = f$element( 0, ":", entryinfo)
 $     info_platforms = ","+ f$element(1, ":", entryinfo)+ ","
 $     info_kind = f$element( 2, ":", entryinfo)
@@ -257,15 +353,23 @@ $       if plat_entry .eqs. "" then goto loop1
 $       if plat_entry .nes. ","
 $       then
 $         if f$extract(0,1,plat_entry) .nes. "!" then negatives = 0
-$         if f$getsyi("CPU") .lt. 128
+$         if (arch_vax)
 $         then
 $           if plat_entry .eqs. "EXPORT_VAR_AS_FUNCTION" then -
 $             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. -
+            ((plat_entry .eqs. "ZLIB") .and. (ZLIB .nes. "")) .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:
@@ -284,8 +388,7 @@ $	alg_i = alg_i + 1
 $       if alg_entry .eqs. "" then goto loop2
 $       if alg_entry .nes. ","
 $       then
-$         if alg_entry .eqs. "KRB5" then goto loop ! Special for now
+$	  if disabled_algorithms - ("," + alg_entry + ",") .nes disabled_algorithms then goto loop
-$	  if alg_entry .eqs. "STATIC_ENGINE" then goto loop ! Special for now
 $         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
 $	  goto loop2
 $       endif
@@ -352,3 +455,22 @@ $     endif
 $   endloop_rvi:
 $   close vf
 $   return
+$
+$! The disabled algorithms reader
+$ read_disabled_algorithms_info:
+$   disabled_algorithms = ","
+$   open /read cf [.CRYPTO.'ARCH']OPENSSLCONF.H
+$   loop_rci:
+$     read/err=endloop_rci/end=endloop_rci cf rci_line
+$     rci_line = f$edit(rci_line,"TRIM,COMPRESS")
+$     rci_ei = 0
+$     if f$extract(0,9,rci_line) .eqs. "# define " then rci_ei = 2
+$     if f$extract(0,8,rci_line) .eqs. "#define " then rci_ei = 1
+$     if rci_ei .eq. 0 then goto loop_rci
+$     rci_e = f$element(rci_ei," ",rci_line)
+$     if f$extract(0,11,rci_e) .nes. "OPENSSL_NO_" then goto loop_rci
+$     disabled_algorithms = disabled_algorithms + f$extract(11,999,rci_e) + ","
+$     goto loop_rci
+$   endloop_rci:
+$   close cf
+$   return

VMS/openssl_startup.com

@@ -0,0 +1,108 @@
+$!
+$! Startup file for OpenSSL 1.x.
+$!
+$! 2011-03-05 SMS.
+$!
+$! This procedure must reside in the OpenSSL installation directory.
+$! It will fail if it is copied to a different location.
+$!
+$! P1  qualifier(s) for DEFINE.  For example, "/SYSTEM" to get the
+$!     logical names defined in the system logical name table.
+$!
+$! P2  "64", to use executables which were built with 64-bit pointers.
+$!
+$! Good (default) and bad status values.
+$!
+$ status =    %x00010001 ! RMS$_NORMAL, normal successful completion.
+$ rms_e_fnf = %x00018292 ! RMS$_FNF, file not found.
+$!
+$! Prepare for problems.
+$!
+$ orig_dev_dir = f$environment( "DEFAULT")
+$ on control_y then goto clean_up
+$ on error then goto clean_up
+$!
+$! Determine hardware architecture.
+$!
+$ if (f$getsyi( "cpu") .lt. 128)
+$ then
+$   arch_name = "VAX"
+$ else
+$   arch_name = f$edit( f$getsyi( "arch_name"), "upcase")
+$   if (arch_name .eqs. "") then arch_name = "UNK"
+$ endif
+$!
+$ if (p2 .eqs. "64")
+$ then
+$   arch_name_exe = arch_name+ "_64"
+$ else
+$   arch_name_exe = arch_name
+$ endif
+$!
+$! Derive the OpenSSL installation device:[directory] from the location
+$! of this command procedure.
+$!
+$ proc = f$environment( "procedure")
+$ proc_dev_dir = f$parse( "A.;", proc, , , "no_conceal") - "A.;"
+$ proc_dev = f$parse( proc_dev_dir, , , "device", "syntax_only")
+$ proc_dir = f$parse( proc_dev_dir, , , "directory", "syntax_only") - -
+   ".][000000"- "[000000."- "]["- "["- "]"
+$ proc_dev_dir = proc_dev+ "["+ proc_dir+ "]"
+$ set default 'proc_dev_dir'
+$ set default [-]
+$ ossl_dev_dir = f$environment( "default")
+$!
+$! Check existence of expected directories (to see if this procedure has
+$! been moved away from its proper place).
+$!
+$ if ((f$search( "certs.dir;1") .eqs. "") .or. -
+   (f$search( "include.dir;1") .eqs. "") .or. -
+   (f$search( "private.dir;1") .eqs. "") .or. -
+   (f$search( "vms.dir;1") .eqs. ""))
+$ then
+$    write sys$output -
+      "   Can't find expected common OpenSSL directories in:"
+$    write sys$output "   ''ossl_dev_dir'"
+$    status = rms_e_fnf
+$    goto clean_up
+$ endif
+$!
+$ if ((f$search( "''arch_name_exe'_exe.dir;1") .eqs. "") .or. -
+   (f$search( "''arch_name'_lib.dir;1") .eqs. ""))
+$ then
+$    write sys$output -
+      "   Can't find expected architecture-specific OpenSSL directories in:"
+$    write sys$output "   ''ossl_dev_dir'"
+$    status = rms_e_fnf
+$    goto clean_up
+$ endif
+$!
+$! All seems well (enough).  Define the OpenSSL logical names.
+$!
+$ ossl_root = ossl_dev_dir- "]"+ ".]"
+$ define /translation_attributes = concealed /nolog'p1 SSLROOT 'ossl_root'
+$ define /nolog 'p1' SSLCERTS     sslroot:[certs]
+$ define /nolog 'p1' SSLINCLUDE   sslroot:[include]
+$ define /nolog 'p1' SSLPRIVATE   sslroot:[private]
+$ define /nolog 'p1' SSLEXE       sslroot:['arch_name_exe'_exe]
+$ define /nolog 'p1' SSLLIB       sslroot:['arch_name'_lib]
+$!
+$! Defining OPENSSL lets a C program use "#include <openssl/{foo}.h>":
+$ define /nolog 'p1' OPENSSL      SSLINCLUDE:
+$!
+$! Run a site-specific procedure, if it exists.
+$!
+$ if f$search( "sslroot:[vms]openssl_systartup.com") .nes."" then -
+   @ sslroot:[vms]openssl_systartup.com
+$!
+$! Restore the original default dev:[dir] (if known).
+$!
+$ clean_up:
+$!
+$ if (f$type( orig_dev_dir) .nes. "")
+$ then
+$    set default 'orig_dev_dir'
+$ endif
+$!
+$ EXIT 'status'
+$!

VMS/openssl_undo.com

@@ -0,0 +1,20 @@
+$!
+$! Deassign OpenSSL logical names.
+$!
+$ call deass "OPENSSL" "''p1'"
+$ call deass "SSLCERTS" "''p1'"
+$ call deass "SSLEXE" "''p1'"
+$ call deass "SSLINCLUDE" "''p1'"
+$ call deass "SSLLIB" "''p1'"
+$ call deass "SSLPRIVATE" "''p1'"
+$ call deass "SSLROOT" "''p1'"
+$!
+$ exit
+$!
+$deass: subroutine
+$ if (f$trnlnm( p1) .nes. "")
+$ then
+$    deassign 'p2' 'p1'
+$ endif
+$ endsubroutine
+$!

VMS/openssl_utils.com

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

apps/.cvsignore

@@ -1,8 +0,0 @@
-openssl
-Makefile.save
-der_chop
-der_chop.bak
-CA.pl
-*.flc
-semantic.cache
-*.dll

apps/CA.com

@@ -37,14 +37,25 @@ $ VERIFY = openssl + " verify"
 $ X509   = openssl + " x509"
 $ PKCS12 = openssl + " pkcs12"
 $ echo   = "write sys$Output"
+$ RET = 1
 $!
-$ s = F$PARSE(F$ENVIRONMENT("DEFAULT"),"[]") - "].;"
+$! 2010-12-20 SMS.
-$ CATOP  := 's'.demoCA
+$! Use a concealed logical name to reduce command line lengths, to
-$ CAKEY  := ]cakey.pem
+$! avoid DCL errors on VAX:
-$ CACERT := ]cacert.pem
+$!     %DCL-W-TKNOVF, command element is too long - shorten
+$! (Path segments like "openssl-1_0_1-stable-SNAP-20101217" accumulate
+$! quickly.)
+$!
+$ CATOP = F$PARSE( F$ENVIRONMENT( "DEFAULT"), "[]")- "].;"+ ".demoCA.]"
+$ define /translation_attributes = concealed CATOP 'CATOP'
+$!
+$ on error then goto clean_up
+$ on control_y then goto clean_up
+$!
+$ CAKEY  = "CATOP:[private]cakey.pem"
+$ CACERT = "CATOP:[000000]cacert.pem"
 $
 $ __INPUT := SYS$COMMAND
-$ RET = 1
 $!
 $ i = 1
 $opt_loop:
@@ -55,7 +66,7 @@ $
 $ IF (prog_opt .EQS. "?" .OR. prog_opt .EQS. "-h" .OR. prog_opt .EQS. "-help") 
 $ THEN
 $   echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" 
-$   exit
+$   goto clean_up
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-input")
@@ -69,7 +80,7 @@ $!
 $ IF (prog_opt .EQS. "-newcert")
 $ THEN
 $   ! Create a certificate.
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   REQ -new -x509 -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Certificate (and private key) is in newreq.pem"
@@ -79,7 +90,7 @@ $!
 $ IF (prog_opt .EQS. "-newreq")
 $ THEN
 $   ! Create a certificate request
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   REQ -new -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Request (and private key) is in newreq.pem"
@@ -90,40 +101,39 @@ $ IF (prog_opt .EQS. "-newca")
 $ THEN
 $   ! If explicitly asked for or it doesn't exist then setup the directory
 $   ! structure that Eric likes to manage things.
-$   IF F$SEARCH(CATOP+"]serial.") .EQS. ""
+$   IF F$SEARCH( "CATOP:[000000]serial.") .EQS. ""
 $   THEN
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP']
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[000000]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.certs]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[certs]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.crl]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[crl]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.newcerts]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[newcerts]
-$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.private]
+$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[private]
 $
-$     OPEN   /WRITE ser_file 'CATOP']serial. 
+$     OPEN /WRITE ser_file CATOP:[000000]serial. 
 $     WRITE ser_file "01"
 $     CLOSE ser_file
-$     APPEND/NEW NL: 'CATOP']index.txt
+$     APPEND /NEW_VERSION NL: CATOP:[000000]index.txt
 $
 $     ! The following is to make sure access() doesn't get confused.  It
 $     ! really needs one file in the directory to give correct answers...
-$     COPY NLA0: 'CATOP'.certs].;
+$     COPY NLA0: CATOP:[certs].;
-$     COPY NLA0: 'CATOP'.crl].;
+$     COPY NLA0: CATOP:[crl].;
-$     COPY NLA0: 'CATOP'.newcerts].;
+$     COPY NLA0: CATOP:[newcerts].;
-$     COPY NLA0: 'CATOP'.private].;
+$     COPY NLA0: CATOP:[private].;
 $   ENDIF
 $!
-$   IF F$SEARCH(CATOP+".private"+CAKEY) .EQS. ""
+$   IF F$SEARCH( 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'
+$       COPY 'FILE' 'CAKEY'
 $       RET=$STATUS
 $     ELSE
 $       echo "Making CA certificate ..."
-$       DEFINE/USER SYS$INPUT '__INPUT'
+$       DEFINE /USER_MODE SYS$INPUT '__INPUT'
-$       REQ -new -x509 -keyout 'CATOP'.private'CAKEY' -
+$       REQ -new -x509 -keyout 'CAKEY' -out 'CACERT' 'DAYS'
-		       -out 'CATOP''CACERT' 'DAYS'
 $       RET=$STATUS
 $     ENDIF
 $   ENDIF
@@ -135,16 +145,16 @@ $ THEN
 $   i = i + 1
 $   cname = P'i'
 $   IF cname .EQS. "" THEN cname = "My certificate"
-$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CATOP''CACERT -
+$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CACERT' -
      -out newcert.p12 -export -name "''cname'"
 $   RET=$STATUS
-$   exit RET
+$   goto clean_up
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-xsign")
 $ THEN
 $!
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -infiles newreq.pem
 $   RET=$STATUS
 $   GOTO opt_loop_continue
@@ -153,7 +163,7 @@ $!
 $ IF ((prog_opt .EQS. "-sign") .OR. (prog_opt .EQS. "-signreq"))
 $ THEN
 $!   
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles newreq.pem
 $   RET=$STATUS
 $   type newcert.pem
@@ -165,9 +175,9 @@ $ IF (prog_opt .EQS. "-signcert")
 $  THEN
 $!   
 $   echo "Cert passphrase will be requested twice - bug?"
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
-$   DEFINE/USER SYS$INPUT '__INPUT'
+$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles tmp.pem
 y
 y
@@ -182,17 +192,17 @@ $!
 $   i = i + 1
 $   IF (p'i' .EQS. "")
 $   THEN
-$     DEFINE/USER SYS$INPUT '__INPUT'
+$     DEFINE /USER_MODE SYS$INPUT '__INPUT'
-$     VERIFY "-CAfile" 'CATOP''CACERT' newcert.pem
+$     VERIFY "-CAfile" 'CACERT' newcert.pem
 $   ELSE
 $     j = i
 $    verify_opt_loop:
 $     IF j .GT. 8 THEN GOTO verify_opt_loop_end
 $     IF p'j' .NES. ""
 $     THEN 
-$       DEFINE/USER SYS$INPUT '__INPUT'
+$       DEFINE /USER_MODE SYS$INPUT '__INPUT'
 $       __tmp = p'j'
-$       VERIFY "-CAfile" 'CATOP''CACERT' '__tmp'
+$       VERIFY "-CAfile" 'CACERT' '__tmp'
 $       tmp=$STATUS
 $       IF tmp .NE. 0 THEN RET=tmp
 $     ENDIF
@@ -208,8 +218,8 @@ $ IF (prog_opt .NES. "")
 $ THEN
 $!   
 $   echo "Unknown argument ''prog_opt'"
-$   
+$   RET = 3
-$   EXIT 3
+$   goto clean_up
 $ ENDIF
 $
 $opt_loop_continue:
@@ -217,4 +227,10 @@ $ i = i + 1
 $ GOTO opt_loop
 $
 $opt_loop_end:
+$!
+$clean_up:
+$!
+$ if f$trnlnm( "CATOP", "LNM$PROCESS") .nes. "" then -
+   deassign /process CATOP
+$!
 $ EXIT 'RET'

apps/CA.pl.in

@@ -1,37 +1,10 @@
 #!/usr/local/bin/perl
 #
-# CA - wrapper around ca to make it easier to use ... basically ca requires
+# CA - wrapper around ca to make it easier to use
-#      some setup stuff to be done before you can use it and this makes
-#      things easier between now and when Eric is convinced to fix it :-)
 #
 # CA -newca ... will setup the right stuff
 # CA -newreq[-nodes] ... will generate a certificate request 
 # CA -sign ... will sign the generated request and output 
-#
-# 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.
-#
-#
-# 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
-#		   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'.
-# 18-Apr-96 tjh    Original hacking
-#
-# Tim Hudson
-# tjh@cryptsoft.com
-#
-
-# 27-Apr-98 snh    Translation into perl, fix existing CA bug.
-#
-#
-# Steve Henson
-# shenson@bigfoot.com
 
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
@@ -57,6 +30,7 @@ $CATOP="./demoCA";
 $CAKEY="cakey.pem";
 $CAREQ="careq.pem";
 $CACERT="cacert.pem";
+$CACRL="crl.pem";
 
 $DIRMODE = 0777;
 
@@ -65,6 +39,7 @@ $RET = 0;
 foreach (@ARGV) {
 	if ( /^(-\?|-h|-help)$/ ) {
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
+	    print STDERR "       CA -crl|-revoke cert-filename [reason]\n";
 	    exit 0;
 	} elsif (/^-newcert$/) {
 	    # create a certificate
@@ -160,17 +135,50 @@ foreach (@ARGV) {
 	    } else {
 		    system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
 		    $RET=$?;
-	    	    exit 0;
+		    exit $RET;
 	    }
+	} elsif (/^-crl$/) {
+		system ("$CA -gencrl -out $CATOP/crl/$CACRL");
+		$RET=$?;
+		print "Generated CRL is in $CATOP/crl/$CACRL\n" if (!$RET);
+	} elsif (/^-revoke$/) {
+		my $cname = $ARGV[1];
+		if (!defined $cname) {
+			print "Certificate filename is required; reason optional.\n";
+			exit 1;
+		}
+		my $reason = $ARGV[2];
+		$reason = " -crl_reason $reason"
+			if defined $reason && crl_reason_ok($reason);
+		my $cmd = "$CA -revoke \"$cname\"".$reason;
+		system ($cmd);
+		$RET=$?;
+		exit $RET;
 	} else {
 	    print STDERR "Unknown arg $_\n";
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
+	    print STDERR "       CA -crl|-revoke cert-filename [reason]\n";
 	    exit 1;
 	}
 }
 
 exit $RET;
 
+sub crl_reason_ok {
+	my ($r) = shift;
+	if ($r eq 'unspecified' || $r eq 'keyCompromise' ||
+	$r eq 'CACompromise' || $r eq 'affiliationChanged' ||
+	$r eq 'superseded' || $r eq 'cessationOfOperation' ||
+	$r eq 'certificateHold' || $r eq 'removeFromCRL') {
+		return 1;
+	}
+	print STDERR "Invalid CRL reason; must be one of:\n";
+	print STDERR "    unspecified, keyCompromise, CACompromise,\n";
+	print STDERR "    affiliationChanged, superseded, cessationOfOperation\n";
+	print STDERR "    certificateHold, removeFromCRL";
+	exit 1;
+}
+
 sub cp_pem {
 my ($infile, $outfile, $bound) = @_;
 open IN, $infile;

apps/CA.sh

@@ -29,26 +29,56 @@
 
 # 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)
@@ -63,18 +93,23 @@ case $i in
     RET=$?
     echo "Request is in newreq.pem, private key is in newkey.pem"
     ;;
+-newreq-nodes) 
+    # create a certificate request
+    $REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS
+    RET=$?
+    echo "Request (and private key) is in newreq.pem"
+    ;;
 -newca)
     # if explicitly asked for or it doesn't exist then setup the directory
     # structure that Eric likes to manage things
     NEW="1"
     if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
 	# create the directory hierarchy
-	mkdir ${CATOP} 
+	mkdir -p ${CATOP}
-	mkdir ${CATOP}/certs 
+	mkdir -p ${CATOP}/certs
-	mkdir ${CATOP}/crl 
+	mkdir -p ${CATOP}/crl
-	mkdir ${CATOP}/newcerts
+	mkdir -p ${CATOP}/newcerts
-	mkdir ${CATOP}/private
+	mkdir -p ${CATOP}/private
-	echo "00" > ${CATOP}/serial
 	touch ${CATOP}/index.txt
     fi
     if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@ -83,14 +118,20 @@ case $i in
 
 	# ask user for existing CA certificate
 	if [ "$FILE" ]; then
-	    cp $FILE ${CATOP}/private/$CAKEY
+	    cp_pem $FILE ${CATOP}/private/$CAKEY PRIVATE
+	    cp_pem $FILE ${CATOP}/$CACERT CERTIFICATE
 	    RET=$?
+	    if [ ! -f "${CATOP}/serial" ]; then
+		$X509 -in ${CATOP}/$CACERT -noout -next_serial \
+		      -out ${CATOP}/serial
+	    fi
 	else
 	    echo "Making CA certificate ..."
 	    $REQ -new -keyout ${CATOP}/private/$CAKEY \
 			   -out ${CATOP}/$CAREQ
-	    $CA -out ${CATOP}/$CACERT $CADAYS -batch \
+	    $CA -create_serial -out ${CATOP}/$CACERT $CADAYS -batch \
 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
+			   -extensions v3_ca \
 			   -infiles ${CATOP}/$CAREQ
 	    RET=$?
 	fi
@@ -100,16 +141,33 @@ case $i in
     $CA -policy policy_anything -infiles newreq.pem
     RET=$?
     ;;
+-pkcs12)
+    if [ -z "$2" ] ; then
+	CNAME="My Certificate"
+    else
+	CNAME="$2"
+    fi
+    $PKCS12 -in newcert.pem -inkey newreq.pem -certfile ${CATOP}/$CACERT \
+	    -out newcert.p12 -export -name "$CNAME"
+    RET=$?
+    exit $RET
+    ;;
 -sign|-signreq)
     $CA -policy policy_anything -out newcert.pem -infiles newreq.pem
     RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
+-signCA)
+    $CA -policy policy_anything -out newcert.pem -extensions v3_ca -infiles newreq.pem
+    RET=$?
+    echo "Signed CA certificate is in newcert.pem"
+    ;;
 -signcert)
     echo "Cert passphrase will be requested twice - bug?"
     $X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
     $CA -policy policy_anything -out newcert.pem -infiles tmp.pem
+    RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
@@ -127,13 +185,14 @@ case $i in
 	    fi
 	done
     fi
-    exit 0
+    exit $RET
     ;;
 *)
-    echo "Unknown arg $i";
+    echo "Unknown arg $i" >&2
+    usage
     exit 1
     ;;
 esac
+shift
 done
 exit $RET
-

apps/Makefile

@@ -39,7 +39,7 @@ E_EXE=	verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
 	ca crl rsa rsautl dsa dsaparam ec ecparam \
 	x509 genrsa gendsa genpkey s_server s_client speed \
 	s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \
-	pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts
+	pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts srp
 
 PROGS= $(PROGRAM).c
 
@@ -56,7 +56,7 @@ E_OBJ=	verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o er
 	x509.o genrsa.o gendsa.o genpkey.o s_server.o s_client.o speed.o \
 	s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
 	ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o pkeyutl.o \
-	spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o
+	spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o srp.o
 
 E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
 	pkcs7.c crl2p7.c crl.c \
@@ -64,7 +64,7 @@ E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.
 	x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \
 	s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
 	ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
-	spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c
+	spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c srp.c
 
 SRC=$(E_SRC)
 
@@ -117,6 +117,19 @@ install:
 	chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \
 	mv -f  $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
+uninstall:
+	@set -e; for i in $(EXE); \
+	do  \
+		echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+		$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
+	done;
+	@set -e; for i in $(SCRIPTS); \
+	do  \
+		echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
+		$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
+	done
+	$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+
 tags:
 	ctags $(SRC)
 
@@ -137,7 +150,6 @@ depend:
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
 	mv -f Makefile.new $(MAKEFILE)
-	rm -f CA.pl
 
 clean:
 	rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
@@ -245,13 +257,13 @@ ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ciphers.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ciphers.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ciphers.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ciphers.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-ciphers.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ciphers.o: ciphers.c
+ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c
 cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 cms.o: ../include/openssl/buffer.h ../include/openssl/cms.h
 cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -350,20 +362,18 @@ dsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsa.c
 dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+dsaparam.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-dsaparam.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+dsaparam.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-dsaparam.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+dsaparam.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-dsaparam.o: ../include/openssl/engine.h ../include/openssl/err.h
+dsaparam.o: ../include/openssl/err.h ../include/openssl/evp.h
-dsaparam.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+dsaparam.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+dsaparam.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-dsaparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+dsaparam.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+dsaparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
+dsaparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h
 dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 dsaparam.o: dsaparam.c
 ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -427,13 +437,13 @@ engine.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 engine.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 engine.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-engine.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+engine.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-engine.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-engine.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-engine.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-engine.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-engine.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-engine.o: engine.c
+engine.o: ../include/openssl/x509v3.h apps.h engine.c
 errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 errstr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 errstr.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -448,32 +458,30 @@ errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 errstr.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-errstr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+errstr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-errstr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-errstr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-errstr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-errstr.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-errstr.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-errstr.o: errstr.c
+errstr.o: ../include/openssl/x509v3.h apps.h errstr.c
 gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+gendh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h
-gendh.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+gendh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-gendh.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+gendh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-gendh.o: ../include/openssl/engine.h ../include/openssl/err.h
+gendh.o: ../include/openssl/err.h ../include/openssl/evp.h
-gendh.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+gendh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-gendh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+gendh.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-gendh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+gendh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-gendh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+gendh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+gendh.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-gendh.o: ../include/openssl/ui.h ../include/openssl/x509.h
+gendh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-gendh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+gendh.o: ../include/openssl/x509v3.h apps.h gendh.c
-gendh.o: gendh.c
 gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -510,7 +518,6 @@ genpkey.o: genpkey.c
 genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 genrsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
 genrsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
 genrsa.o: ../include/openssl/engine.h ../include/openssl/err.h
@@ -523,9 +530,8 @@ genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-genrsa.o: ../include/openssl/ui.h ../include/openssl/x509.h
+genrsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-genrsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+genrsa.o: ../include/openssl/x509v3.h apps.h genrsa.c
-genrsa.o: genrsa.c
 nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -556,12 +562,12 @@ ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ocsp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ocsp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ocsp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-ocsp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ocsp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ocsp.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ocsp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-ocsp.o: ../include/openssl/x509v3.h apps.h ocsp.c
+ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c
 openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 openssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -575,8 +581,9 @@ openssl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
 openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-openssl.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
+openssl.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
-openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+openssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
@@ -729,21 +736,20 @@ rand.o: ../include/openssl/x509v3.h apps.h rand.c
 req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 req.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 req.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-req.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+req.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-req.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+req.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-req.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+req.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-req.o: ../include/openssl/engine.h ../include/openssl/err.h
+req.o: ../include/openssl/err.h ../include/openssl/evp.h
-req.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+req.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-req.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+req.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-req.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+req.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-req.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+req.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-req.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+req.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-req.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
 req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 req.o: ../include/openssl/sha.h ../include/openssl/stack.h
 req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-req.o: ../include/openssl/ui.h ../include/openssl/x509.h
+req.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h req.c
+req.o: ../include/openssl/x509v3.h apps.h req.c
 rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 rsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -777,8 +783,9 @@ rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
 rsautl.o: ../include/openssl/x509v3.h apps.h rsautl.c
 s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
-s_cb.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+s_cb.o: ../include/openssl/bn.h ../include/openssl/buffer.h
-s_cb.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+s_cb.o: ../include/openssl/comp.h ../include/openssl/conf.h
+s_cb.o: ../include/openssl/crypto.h ../include/openssl/dh.h
 s_cb.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
 s_cb.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 s_cb.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
@@ -789,8 +796,9 @@ s_cb.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
 s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_cb.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
+s_cb.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
-s_cb.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_cb.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
@@ -812,7 +820,8 @@ s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h
+s_client.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
@@ -823,24 +832,24 @@ s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h
 s_server.o: ../include/openssl/crypto.h ../include/openssl/dh.h
-s_server.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
+s_server.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
-s_server.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+s_server.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
-s_server.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+s_server.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
-s_server.o: ../include/openssl/engine.h ../include/openssl/err.h
+s_server.o: ../include/openssl/err.h ../include/openssl/evp.h
-s_server.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+s_server.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
-s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+s_server.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s_server.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-s_server.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_server.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+s_server.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
-s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+s_server.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
-s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_server.o: ../include/openssl/sha.h ../include/openssl/srp.h
-s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_server.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h
+s_server.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 s_server.o: s_apps.h s_server.c timeouts.h
 s_socket.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -857,12 +866,13 @@ s_socket.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_socket.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_socket.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_socket.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_socket.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s_socket.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-s_socket.o: ../include/openssl/x509v3.h apps.h s_apps.h s_socket.c
+s_socket.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+s_socket.o: s_apps.h s_socket.c
 s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_time.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s_time.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -877,13 +887,13 @@ s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_time.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-s_time.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_time.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-s_time.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_time.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_time.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_time.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_time.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-s_time.o: s_apps.h s_time.c
+s_time.o: ../include/openssl/x509v3.h apps.h s_apps.h s_time.c
 sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 sess_id.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 sess_id.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -898,13 +908,13 @@ sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 sess_id.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-sess_id.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+sess_id.o: ../include/openssl/sha.h ../include/openssl/srtp.h
-sess_id.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-sess_id.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-sess_id.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-sess_id.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-sess_id.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-sess_id.o: sess_id.c
+sess_id.o: ../include/openssl/x509v3.h apps.h sess_id.c
 smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 smime.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -932,21 +942,21 @@ speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 speed.o: ../include/openssl/err.h ../include/openssl/evp.h
 speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
-speed.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h
-speed.o: ../include/openssl/md4.h ../include/openssl/md5.h
+speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h
-speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
-speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h
+speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
+speed.o: ../include/openssl/seed.h ../include/openssl/sha.h
-speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
+speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
+speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
-speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h
+speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h
-speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-speed.o: speed.c testdsa.h testrsa.h
+speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h
 spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -963,6 +973,21 @@ spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 spkac.o: spkac.c
+srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+srp.o: ../include/openssl/engine.h ../include/openssl/err.h
+srp.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+srp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+srp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
+srp.o: ../include/openssl/sha.h ../include/openssl/srp.h
+srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c
 ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -1005,17 +1030,16 @@ version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
 version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
 version.o: ../include/openssl/evp.h ../include/openssl/idea.h
-version.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+version.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-version.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+version.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
-version.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-version.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+version.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
-version.o: ../include/openssl/pkcs7.h ../include/openssl/rc4.h
+version.o: ../include/openssl/rc4.h ../include/openssl/safestack.h
-version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+version.o: ../include/openssl/sha.h ../include/openssl/stack.h
-version.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-version.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
+version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
-version.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
+version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-version.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+version.o: ../include/openssl/x509v3.h apps.h version.c
-version.o: version.c
 x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h

apps/app_rand.c

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

apps/apps.h

@@ -129,8 +129,9 @@
 
 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
@@ -168,6 +169,12 @@ extern BIO *bio_err;
 #  define do_pipe_sig()
 # endif
 
+# ifdef OPENSSL_NO_COMP
+#  define zlib_cleanup()
+# else
+#  define zlib_cleanup() COMP_zlib_cleanup()
+# endif
+
 # if defined(MONOLITH) && !defined(OPENSSL_C)
 #  define apps_startup() \
                 do_pipe_sig()
@@ -182,7 +189,8 @@ extern BIO *bio_err;
                         do { CONF_modules_unload(1); destroy_ui_method(); \
                         OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
                         CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
-			ERR_free_strings(); COMP_zlib_cleanup();} while(0)
+                        RAND_cleanup(); \
+                        ERR_free_strings(); zlib_cleanup();} while(0)
 #  else
 #   define apps_startup() \
                         do { do_pipe_sig(); CRYPTO_malloc_init(); \
@@ -192,32 +200,29 @@ extern BIO *bio_err;
                         do { CONF_modules_unload(1); destroy_ui_method(); \
                         OBJ_cleanup(); EVP_cleanup(); \
                         CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
-			ERR_free_strings(); } while(0)
+                        RAND_cleanup(); \
+                        ERR_free_strings(); zlib_cleanup(); } while(0)
 #  endif
 # endif
 
-#ifdef OPENSSL_SYSNAME_WIN32
+# if defined(OPENSSL_SYSNAME_WIN32) || defined(OPENSSL_SYSNAME_WINCE)
 #  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
 # else
 #  define openssl_fdset(a,b) FD_SET(a, b)
 # endif
 
-
+typedef struct args_st {
-typedef struct args_st
-	{
     char **data;
     int count;
 } ARGS;
 
 # define PW_MIN_LENGTH 4
-typedef struct pw_cb_data
+typedef struct pw_cb_data {
-	{
     const void *password;
     const char *prompt_info;
 } PW_CB_DATA;
 
-int password_callback(char *buf, int bufsiz, int verify,
+int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
-	PW_CB_DATA *cb_data);
 
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -229,7 +234,8 @@ void program_name(char *in,char *out,int size);
 int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]);
 # ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
+void print_name(BIO *out, const char *title, X509_NAME *nm,
+                unsigned long lflags);
 # endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
@@ -239,12 +245,19 @@ 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);
+X509_CRL *load_crl(const char *infile, int format);
+int load_cert_crl_http(const char *url, BIO *err,
+                       X509 **pcert, X509_CRL **pcrl);
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
                    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);
 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);
+STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
+                              const char *pass, ENGINE *e,
+                              const char *cert_descrip);
 X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 # ifndef OPENSSL_NO_ENGINE
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);
@@ -252,7 +265,9 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug);
 
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
-			char *host, char *path, char *port, int use_ssl,
+                                 const char *host, const char *path,
+                                 const char *port, int use_ssl,
+                                 const STACK_OF(CONF_VALUE) *headers,
                                  int req_timeout);
 # endif
 
@@ -268,36 +283,37 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 # define DB_rev_date     2
 # define DB_serial       3      /* index - unique */
 # define DB_file         4
-#define DB_name         5       /* index - unique when active and not disabled */
+# define DB_name         5      /* index - unique when active and not
+                                 * disabled */
 # define DB_NUMBER       6
 
 # define DB_TYPE_REV     'R'
 # define DB_TYPE_EXP     'E'
 # define DB_TYPE_VAL     'V'
 
-typedef struct db_attr_st
+typedef struct db_attr_st {
-	{
     int unique_subject;
 } DB_ATTR;
-typedef struct ca_db_st
+typedef struct ca_db_st {
-	{
     DB_ATTR attributes;
     TXT_DB *db;
 } CA_DB;
 
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
+                ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
-int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
+int rotate_index(const char *dbfile, const char *new_suffix,
+                 const char *old_suffix);
 void free_index(CA_DB *db);
 # define index_name_cmp_noconst(a, b) \
-	index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
+        index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
-	(const CSTRING *)CHECKED_PTR_OF(STRING, b))
+        (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
-int index_name_cmp(const CSTRING *a, const CSTRING *b);
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);
@@ -308,6 +324,12 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
                  const char *algname, ENGINE *e, int do_param);
+int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
+                 STACK_OF(OPENSSL_STRING) *sigopts);
+int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
+                     STACK_OF(OPENSSL_STRING) *sigopts);
+int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
+                     STACK_OF(OPENSSL_STRING) *sigopts);
 # ifndef OPENSSL_NO_PSK
 extern char *psk_key;
 # endif
@@ -316,6 +338,16 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 # endif
 
+# ifndef OPENSSL_NO_TLSEXT
+unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
+# endif                         /* ndef OPENSSL_NO_TLSEXT */
+
+void print_cert_checks(BIO *bio, X509 *x,
+                       const char *checkhost,
+                       const char *checkemail, const char *checkip);
+
+void store_setup_crl_download(X509_STORE *st);
+
 # define FORMAT_UNDEF    0
 # define FORMAT_ASN1     1
 # define FORMAT_TEXT     2
@@ -330,6 +362,8 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 # define FORMAT_ASN1RSA  10     /* DER RSAPubicKey format */
 # define FORMAT_MSBLOB   11     /* MS Key blob format */
 # define FORMAT_PVK      12     /* MS PVK file format */
+# define FORMAT_HTTP     13     /* Download using HTTP */
+# define FORMAT_NSS      14     /* NSS keylog format */
 
 # define EXT_COPY_NONE   0
 # define EXT_COPY_ADD    1
@@ -348,4 +382,7 @@ int raw_write_stdout(const void *,int);
 # define TM_START        0
 # define TM_STOP         1
 double app_tminterval(int stop, int usertime);
+
+# define OPENSSL_NO_SSL_INTERN
+
 #endif

apps/asn1pars.c

@@ -56,8 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-/* A nice addition from Dr Stephen Henson <steve@openssl.org> to 
+/*
- * add the -strparse option which parses nested binary structures
+ * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * -strparse option which parses nested binary structures
  */
 
 #include <stdio.h>
@@ -69,7 +70,8 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -in arg      - input file - default stdin
  * -i           - indent the details by depth
  * -offset      - where in the file to start
@@ -90,13 +92,14 @@ int MAIN(int argc, char **argv)
     unsigned int length = 0;
     long num, tmplen;
     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, strictpem = 0;
-	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
+    char *infile = NULL, *str = NULL, *prog, *oidfile = NULL, *derfile =
+        NULL, *name = NULL, *header = NULL;
     char *genstr = NULL, *genconf = NULL;
     unsigned char *tmpbuf;
     const unsigned char *ctmpbuf;
     BUF_MEM *buf = NULL;
-	STACK_OF(STRING) *osk=NULL;
+    STACK_OF(OPENSSL_STRING) *osk = NULL;
     ASN1_TYPE *at = NULL;
 
     informat = FORMAT_PEM;
@@ -113,76 +116,65 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	if ((osk=sk_STRING_new_null()) == NULL)
+    if ((osk = sk_OPENSSL_STRING_new_null()) == NULL) {
-		{
         BIO_printf(bio_err, "Memory allocation failure\n");
         goto end;
     }
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             derfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-i") == 0) {
-		else if (strcmp(*argv,"-i") == 0)
-			{
             indent = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-noout") == 0) noout = 1;
+            noout = 1;
-		else if (strcmp(*argv,"-oid") == 0)
+        else if (strcmp(*argv, "-oid") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             oidfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-offset") == 0) {
-		else if (strcmp(*argv,"-offset") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             offset = atoi(*(++argv));
-			}
+        } else if (strcmp(*argv, "-length") == 0) {
-		else if (strcmp(*argv,"-length") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             length = atoi(*(++argv));
-			if (length == 0) goto bad;
+            if (length == 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-dump") == 0)
+        } else if (strcmp(*argv, "-dump") == 0) {
-			{
             dump = -1;
-			}
+        } else if (strcmp(*argv, "-dlimit") == 0) {
-		else if (strcmp(*argv,"-dlimit") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             dump = atoi(*(++argv));
-			if (dump <= 0) goto bad;
+            if (dump <= 0)
-			}
+                goto bad;
-		else if (strcmp(*argv,"-strparse") == 0)
+        } else if (strcmp(*argv, "-strparse") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			sk_STRING_push(osk,*(++argv));
+            sk_OPENSSL_STRING_push(osk, *(++argv));
-			}
+        } else if (strcmp(*argv, "-genstr") == 0) {
-		else if (strcmp(*argv,"-genstr") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             genstr = *(++argv);
-			}
+        } else if (strcmp(*argv, "-genconf") == 0) {
-		else if (strcmp(*argv,"-genconf") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             genconf = *(++argv);
-			}
+        } else if (strcmp(*argv, "-strictpem") == 0) {
-		else
+            strictpem = 1;
-			{
+            informat = FORMAT_PEM;
+        } else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -191,26 +183,33 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile\n", prog);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
-		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
+        BIO_printf(bio_err,
+                   " -out arg      output file (output format is always DER\n");
         BIO_printf(bio_err, " -noout arg    don't produce any output\n");
         BIO_printf(bio_err, " -offset arg   offset into file\n");
         BIO_printf(bio_err, " -length arg   length of section in file\n");
         BIO_printf(bio_err, " -i            indent entries\n");
         BIO_printf(bio_err, " -dump         dump unknown data in hex form\n");
-		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
+        BIO_printf(bio_err,
+                   " -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
         BIO_printf(bio_err, " -oid file     file of extra oid definitions\n");
         BIO_printf(bio_err, " -strparse offset\n");
-		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
+        BIO_printf(bio_err,
+                   "               a series of these can be used to 'dig' into multiple\n");
         BIO_printf(bio_err, "               ASN1 blob wrappings\n");
-		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
+                   " -genstr str   string to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
+                   " -genconf file file to generate ASN1 structure from\n");
+        BIO_printf(bio_err,
+                   " -strictpem    do not attempt base64 decode outside PEM markers (-inform \n");
+        BIO_printf(bio_err, "               will be ignored)\n");
         goto end;
     }
 
@@ -218,8 +217,7 @@ bad:
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -231,10 +229,8 @@ bad:
     }
 #endif
 
-	if (oidfile != NULL)
+    if (oidfile != NULL) {
-		{
+        if (BIO_read_filename(in, oidfile) <= 0) {
-		if (BIO_read_filename(in,oidfile) <= 0)
-			{
             BIO_printf(bio_err, "problems opening %s\n", oidfile);
             ERR_print_errors(bio_err);
             goto end;
@@ -244,10 +240,8 @@ bad:
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
@@ -261,24 +255,31 @@ bad:
         }
     }
 
-	if ((buf=BUF_MEM_new()) == NULL) goto end;
+    if (strictpem) {
-	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
+        if (PEM_read_bio(in, &name, &header, (unsigned char **)&str, &num) !=
+            1) {
+            BIO_printf(bio_err, "Error reading PEM file\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    } else {
 
-	if (genstr || genconf)
+        if ((buf = BUF_MEM_new()) == NULL)
-		{
+            goto end;
+        if (!BUF_MEM_grow(buf, BUFSIZ * 8))
+            goto end;           /* Pre-allocate :-) */
+
+        if (genstr || genconf) {
             num = do_generate(bio_err, genstr, genconf, buf);
-		if (num < 0)
+            if (num < 0) {
-			{
                 ERR_print_errors(bio_err);
                 goto end;
             }
         }
 
-	else
+        else {
-		{
 
-		if (informat == FORMAT_PEM)
+            if (informat == FORMAT_PEM) {
-			{
                 BIO *tmp;
 
                 if ((b64 = BIO_new(BIO_f_base64())) == NULL)
@@ -290,30 +291,31 @@ bad:
             }
 
             num = 0;
-		for (;;)
+            for (;;) {
-			{
+                if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
-			if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
+                    goto end;
                 i = BIO_read(in, &(buf->data[num]), BUFSIZ);
-			if (i <= 0) break;
+                if (i <= 0)
+                    break;
                 num += i;
             }
         }
         str = buf->data;
 
+    }
+
     /* If any structs to parse go through in sequence */
 
-	if (sk_STRING_num(osk))
+    if (sk_OPENSSL_STRING_num(osk)) {
-		{
         tmpbuf = (unsigned char *)str;
         tmplen = num;
-		for (i=0; i<sk_STRING_num(osk); i++)
+        for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) {
-			{
             ASN1_TYPE *atmp;
             int typ;
-			j=atoi(sk_STRING_value(osk,i));
+            j = atoi(sk_OPENSSL_STRING_value(osk, i));
-			if (j == 0)
+            if (j == 0) {
-				{
+                BIO_printf(bio_err, "'%s' is an invalid number\n",
-				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_STRING_value(osk,i));
+                           sk_OPENSSL_STRING_value(osk, i));
                 continue;
             }
             tmpbuf += j;
@@ -322,16 +324,14 @@ bad:
             ctmpbuf = tmpbuf;
             at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
             ASN1_TYPE_free(atmp);
-			if(!at)
+            if (!at) {
-				{
                 BIO_printf(bio_err, "Error parsing structure\n");
                 ERR_print_errors(bio_err);
                 goto end;
             }
             typ = ASN1_TYPE_get(at);
             if ((typ == V_ASN1_OBJECT)
-				|| (typ == V_ASN1_NULL))
+                || (typ == V_ASN1_NULL)) {
-				{
                 BIO_printf(bio_err, "Can't parse %s type\n",
                            typ == V_ASN1_NULL ? "NULL" : "OBJECT");
                 ERR_print_errors(bio_err);
@@ -345,15 +345,15 @@ bad:
         num = tmplen;
     }
 
-	if (offset >= num)
+    if (offset >= num) {
-		{
         BIO_printf(bio_err, "Error: offset too large\n");
         goto end;
     }
 
     num -= offset;
 
-	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
+    if ((length == 0) || ((long)length > num))
+        length = (unsigned int)num;
     if (derout) {
         if (BIO_write(derout, str + offset, length) != (int)length) {
             BIO_printf(bio_err, "Error writing output\n");
@@ -363,22 +363,33 @@ bad:
     }
     if (!noout &&
         !ASN1_parse_dump(out, (unsigned char *)&(str[offset]), length,
-		    indent,dump))
+                         indent, dump)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
     ret = 0;
  end:
     BIO_free(derout);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (b64 != NULL) BIO_free(b64);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (b64 != NULL)
+        BIO_free(b64);
     if (ret != 0)
         ERR_print_errors(bio_err);
-	if (buf != NULL) BUF_MEM_free(buf);
+    if (buf != NULL)
-	if (at != NULL) ASN1_TYPE_free(at);
+        BUF_MEM_free(buf);
-	if (osk != NULL) sk_STRING_free(osk);
+    if (name != NULL)
+        OPENSSL_free(name);
+    if (header != NULL)
+        OPENSSL_free(header);
+    if (strictpem && str != NULL)
+        OPENSSL_free(str);
+    if (at != NULL)
+        ASN1_TYPE_free(at);
+    if (osk != NULL)
+        sk_OPENSSL_STRING_free(osk);
     OBJ_cleanup();
     apps_shutdown();
     OPENSSL_EXIT(ret);
@@ -392,15 +403,13 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
     unsigned char *p;
     ASN1_TYPE *atyp = NULL;
 
-	if (genconf)
+    if (genconf) {
-		{
         cnf = NCONF_new(NULL);
         if (!NCONF_load(cnf, genconf, &errline))
             goto conferr;
         if (!genstr)
             genstr = NCONF_get_string(cnf, "default", "asn1");
-		if (!genstr)
+        if (!genstr) {
-			{
             BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
             goto err;
         }
@@ -408,6 +417,7 @@ static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 
     atyp = ASN1_generate_nconf(genstr, cnf);
     NCONF_free(cnf);
+    cnf = NULL;
 
     if (!atyp)
         return -1;

apps/ciphers.c

@@ -59,9 +59,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -73,7 +70,6 @@ static const char *ciphers_usage[]={
     "usage: ciphers args\n",
     " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
     " -V          - even more verbose\n",
-" -ssl2       - SSL2 mode\n",
     " -ssl3       - SSL3 mode\n",
     " -tls1       - TLS1 mode\n",
     NULL
@@ -85,6 +81,10 @@ int MAIN(int argc, char **argv)
 {
     int ret = 1, i;
     int verbose = 0, Verbose = 0;
+    int use_supported = 0;
+#ifndef OPENSSL_NO_SSL_TRACE
+    int stdname = 0;
+#endif
     const char **pp;
     const char *p;
     int badops = 0;
@@ -92,17 +92,11 @@ int MAIN(int argc, char **argv)
     SSL *ssl = NULL;
     char *ciphers = NULL;
     const SSL_METHOD *meth = NULL;
-	STACK_OF(SSL_CIPHER) *sk;
+    STACK_OF(SSL_CIPHER) *sk = NULL;
     char buf[512];
     BIO *STDout = NULL;
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
     meth = SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-	meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-	meth=SSLv2_server_method();
-#endif
 
     apps_startup();
 
@@ -120,15 +114,16 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
         if (strcmp(*argv, "-v") == 0)
             verbose = 1;
         else if (strcmp(*argv, "-V") == 0)
             verbose = Verbose = 1;
-#ifndef OPENSSL_NO_SSL2
+        else if (strcmp(*argv, "-s") == 0)
-		else if (strcmp(*argv,"-ssl2") == 0)
+            use_supported = 1;
-			meth=SSLv2_client_method();
+#ifndef OPENSSL_NO_SSL_TRACE
+        else if (strcmp(*argv, "-stdname") == 0)
+            stdname = verbose = 1;
 #endif
 #ifndef OPENSSL_NO_SSL3
         else if (strcmp(*argv, "-ssl3") == 0)
@@ -138,22 +133,17 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-tls1") == 0)
             meth = TLSv1_client_method();
 #endif
-		else if ((strncmp(*argv,"-h",2) == 0) ||
+        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
-			 (strcmp(*argv,"-?") == 0))
-			{
             badops = 1;
             break;
-			}
+        } else {
-		else
-			{
             ciphers = *argv;
         }
         argc--;
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
         for (pp = ciphers_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
         goto end;
@@ -162,7 +152,8 @@ int MAIN(int argc, char **argv)
     OpenSSL_add_ssl_algorithms();
 
     ctx = SSL_CTX_new(meth);
-	if (ctx == NULL) goto err;
+    if (ctx == NULL)
+        goto err;
     if (ciphers != NULL) {
         if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
             BIO_printf(bio_err, "Error in cipher list\n");
@@ -170,62 +161,76 @@ int MAIN(int argc, char **argv)
         }
     }
     ssl = SSL_new(ctx);
-	if (ssl == NULL) goto err;
+    if (ssl == NULL)
+        goto err;
 
+    if (use_supported)
+        sk = SSL_get1_supported_ciphers(ssl);
+    else
+        sk = SSL_get_ciphers(ssl);
 
-	if (!verbose)
+    if (!verbose) {
-		{
+        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
-		for (i=0; ; i++)
+            SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);
-			{
+            p = SSL_CIPHER_get_name(c);
-			p=SSL_get_cipher_list(ssl,i);
+            if (p == NULL)
-			if (p == NULL) break;
+                break;
-			if (i != 0) BIO_printf(STDout,":");
+            if (i != 0)
+                BIO_printf(STDout, ":");
             BIO_printf(STDout, "%s", p);
         }
         BIO_printf(STDout, "\n");
-		}
+    } else {                    /* verbose */
-	else /* verbose */
-		{
-		sk=SSL_get_ciphers(ssl);
 
-		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
-			{
             SSL_CIPHER *c;
 
             c = sk_SSL_CIPHER_value(sk, i);
 
-			if (Verbose)
+            if (Verbose) {
-				{
+                unsigned long id = SSL_CIPHER_get_id(c);
-				unsigned long id = c->id;
                 int id0 = (int)(id >> 24);
                 int id1 = (int)((id >> 16) & 0xffL);
                 int id2 = (int)((id >> 8) & 0xffL);
                 int id3 = (int)(id & 0xffL);
 
-				if ((id & 0xff000000L) == 0x02000000L)
+                if ((id & 0xff000000L) == 0x03000000L) {
-					BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
+                    /* SSL3 cipher */
-				else if ((id & 0xff000000L) == 0x03000000L)
+                    BIO_printf(STDout, "          0x%02X,0x%02X - ", id2,
-					BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */
+                               id3);
-				else
+                } else {
-					BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
+                    /* whatever */
+                    BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0,
+                               id1, id2, id3);
                 }
-
+            }
+#ifndef OPENSSL_NO_SSL_TRACE
+            if (stdname) {
+                const char *nm = SSL_CIPHER_standard_name(c);
+                if (nm == NULL)
+                    nm = "UNKNOWN";
+                BIO_printf(STDout, "%s - ", nm);
+            }
+#endif
             BIO_puts(STDout, SSL_CIPHER_description(c, buf, sizeof buf));
         }
     }
 
     ret = 0;
-	if (0)
+    if (0) {
-		{
  err:
         SSL_load_error_strings();
         ERR_print_errors(bio_err);
     }
  end:
-	if (ctx != NULL) SSL_CTX_free(ctx);
+    if (use_supported && sk)
-	if (ssl != NULL) SSL_free(ssl);
+        sk_SSL_CIPHER_free(sk);
-	if (STDout != NULL) BIO_free_all(STDout);
+    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/client.pem

@@ -1,24 +1,52 @@
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
+subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Client Cert
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Client test cert (512 bit)
+issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
 -----BEGIN CERTIFICATE-----
-MIIB6TCCAVICAQIwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
+MIID5zCCAs+gAwIBAgIJALnu1NlVpZ6yMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
+BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
-VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzU2WhcNOTgwNjA5
+VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
-MTM1NzU2WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
+ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZDELMAkG
-A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGkNsaWVudCB0ZXN0IGNl
+A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
-cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALtv55QyzG6i2Plw
+RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgQ2xpZW50IENlcnQw
-Z1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexmq/R4KedLjFEIYjocDui+IXs62NNt
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0ranbHRLcLVqN+0BzcZpY
-XrT8odkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQBwtMmI7oGUG8nKmftQssATViH5
++yOLqxzDWT1LD9eW1stC4NzXX9/DCtSIVyN7YIHdGLrIPr64IDdXXaMRzgZ2rOKs
-NRRtoEw07DxJp/LfatHdrhqQB73eGdL5WILZJXk46Xz2e9WMSUjVCSYhdKxtflU3
+lmHCAiFpO/ja99gGCJRxH0xwQatqAULfJVHeUhs7OEGOZc2nWifjqKvGfNTilP7D
-UR2Ajv1Oo0sTNdfz0wDqJNirLNtzyhhsaq8qMTrLwXrCP31VxBiigFSQSUFnZyTE
+nwi69ipQFq9oS19FmhwVHk2wg7KZGHI1qDyG04UrfCZMRitvS9+UVhPpIPjuiBi2
-9TKwhS4GlwbtCfxSKQ==
+x3/FZIpL5gXJvvFK6xHY63oq2asyzBATntBgnP4qJFWWcvRx24wF1PnZabxuVoL2
+bPnQ/KvONDrw3IdqkKhYNTul7jEcu3OlcZIMw+7DiaKJLAzKb/bBF5gm/pwW6As9
+AgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBeAwLAYJYIZI
+AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
+BBSZHKyLoTh7Mb409Zn/mK1ceSDAjDAfBgNVHSMEGDAWgBQ2w2yI55X+sL3szj49
+hqshgYfa2jANBgkqhkiG9w0BAQUFAAOCAQEAD0mL7PtPYgCEuDyOQSbLpeND5hVS
+curxQdGnrJ6Acrhodb7E9ccATokeb0PLx6HBLQUicxhTZIQ9FbO43YkQcOU6C3BB
+IlwskqmtN6+VmrQzNolHCDzvxNZs9lYL2VbGPGqVRyjZeHpoAlf9cQr8PgDb4d4b
+vUx2KAhHQvV2nkmYvKyXcgnRuHggumF87mkxidriGAEFwH4qfOqetUg64WyxP7P2
+QLipm04SyQa7ONtIApfVXgHcE42Py4/f4arzCzMjKe3VyhGkS7nsT55X/fWgTaRm
+CQPkO+H94P958WTvQDt77bQ+D3IvYaVvfil8n6HJMOJfFT0LJuSUbpSXJg==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBALtv55QyzG6i2PlwZ1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexm
+MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f
-q/R4KedLjFEIYjocDui+IXs62NNtXrT8odkCAwEAAQJAbwXq0vJ/+uyEvsNgxLko
+wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr
-/V86mGXQ/KrSkeKlL0r4ENxjcyeMAGoKu6J9yMY7+X9+Zm4nxShNfTsf/+Freoe1
+agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy
-HQIhAPOSm5Q1YI+KIsII2GeVJx1U69+wnd71OasIPakS1L1XAiEAxQAW+J3/JWE0
+mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr
-ftEYakbhUOKL8tD1OaFZS71/5GdG7E8CIQCefUMmySSvwd6kC0VlATSWbW+d+jp/
+MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x
-nWmM1KvqnAo5uQIhALqEADu5U1Wvt8UN8UDGBRPQulHWNycuNV45d3nnskWPAiAw
+HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L
-ueTyr6WsZ5+SD8g/Hy3xuvF3nPmJRH+rwvVihlcFOg==
+p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT
+KMab4o4D8gXD7UavQVDjtjb/ta79WL3SjRl2Uc9YjjMkyq6WmDNQeo2NKDdafCTB
+1uzSJtLNipB8Z53ELPuHJhxX9QMHrMnuha49riQgXZ7buP9iQrHJFhImBjSzbxJx
+L+TI6rkyLSf9Wi0Pd3L27Ob3QWNfNRYNSeTE+08eSRChkur5W0RuXAcuAICdQlCl
+LBvWO/LmmvbzCqiDcgy/TliSb6CGGwgiNG7LJZmlkYNj8laGwalNlYZs3UrVv6NO
+Br2loAECgYEA2kvCvPGj0Dg/6g7WhXDvAkEbcaL1tSeCxBbNH+6HS2UWMWvyTtCn
+/bbD519QIdkvayy1QjEf32GV/UjUVmlULMLBcDy0DGjtL3+XpIhLKWDNxN1v1/ai
+1oz23ZJCOgnk6K4qtFtlRS1XtynjA+rBetvYvLP9SKeFrnpzCgaA2r0CgYEA0+KX
+1ACXDTNH5ySX3kMjSS9xdINf+OOw4CvPHFwbtc9aqk2HePlEsBTz5I/W3rKwXva3
+NqZ/bRqVVeZB/hHKFywgdUQk2Uc5z/S7Lw70/w1HubNTXGU06Ngb6zOFAo/o/TwZ
+zTP1BMIKSOB6PAZPS3l+aLO4FRIRotfFhgRHOoECgYEAmiZbqt8cJaJDB/5YYDzC
+mp3tSk6gIb936Q6M5VqkMYp9pIKsxhk0N8aDCnTU+kIK6SzWBpr3/d9Ecmqmfyq7
+5SvWO3KyVf0WWK9KH0abhOm2BKm2HBQvI0DB5u8sUx2/hsvOnjPYDISbZ11t0MtK
+u35Zy89yMYcSsIYJjG/ROCUCgYEAgI2P9G5PNxEP5OtMwOsW84Y3Xat/hPAQFlI+
+HES+AzbFGWJkeT8zL2nm95tVkFP1sggZ7Kxjz3w7cpx7GX0NkbWSE9O+T51pNASV
+tN1sQ3p5M+/a+cnlqgfEGJVvc7iAcXQPa3LEi5h2yPR49QYXAgG6cifn3dDSpmwn
+SUI7PQECgYEApGCIIpSRPLAEHTGmP87RBL1smurhwmy2s/pghkvUkWehtxg0sGHh
+kuaqDWcskogv+QC0sVdytiLSz8G0DwcEcsHK1Fkyb8A+ayiw6jWJDo2m9+IF4Fww
+1Te6jFPYDESnbhq7+TLGgHGhtwcu5cnb4vSuYXGXKupZGzoLOBbv1Zw=
 -----END RSA PRIVATE KEY-----

apps/crl.c

@@ -81,6 +81,9 @@ static const char *crl_usage[]={
     " -in arg         - input file - default stdin\n",
     " -out arg        - output file - default stdout\n",
     " -hash           - print hash value\n",
+#ifndef OPENSSL_NO_MD5
+    " -hash_old       - print old-style (MD5) hash value\n",
+#endif
     " -fingerprint    - print the crl fingerprint\n",
     " -issuer         - print issuer DN\n",
     " -lastupdate     - lastUpdate field\n",
@@ -93,7 +96,6 @@ static const char *crl_usage[]={
     NULL
 };
 
-static X509_CRL *load_crl(char *file, int format);
 static BIO *bio_out = NULL;
 
 int MAIN(int, char **);
@@ -103,11 +105,15 @@ int MAIN(int argc, char **argv)
     unsigned long nmflag = 0;
     X509_CRL *x = NULL;
     char *CAfile = NULL, *CApath = NULL;
-	int ret=1,i,num,badops=0;
+    int ret = 1, i, num, badops = 0, badsig = 0;
     BIO *out = NULL;
-	int informat,outformat;
+    int informat, outformat, keyformat;
-	char *infile=NULL,*outfile=NULL;
+    char *infile = NULL, *outfile = NULL, *crldiff = NULL, *keyfile = NULL;
-	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
+    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
+        0, text = 0;
+#ifndef OPENSSL_NO_MD5
+    int hash_old = 0;
+#endif
     int fingerprint = 0, crlnumber = 0;
     const char **pp;
     X509_STORE *store = NULL;
@@ -128,8 +134,7 @@ int MAIN(int argc, char **argv)
         goto end;
 
     if (bio_out == NULL)
-		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
+        if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
-			{
             BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
             {
@@ -141,63 +146,75 @@ int MAIN(int argc, char **argv)
 
     informat = FORMAT_PEM;
     outformat = FORMAT_PEM;
+    keyformat = FORMAT_PEM;
 
     argc--;
     argv++;
     num = 0;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
 #ifdef undef
-		if	(strcmp(*argv,"-p") == 0)
+        if (strcmp(*argv, "-p") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
-			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
+            if (!args_from_file(++argv, Nargc, Nargv)) {
+                goto end;
             }
+        */}
 #endif
-		if 	(strcmp(*argv,"-inform") == 0)
+        if (strcmp(*argv, "-inform") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-gendelta") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
+            crldiff = *(++argv);
+        } else if (strcmp(*argv, "-key") == 0) {
+            if (--argc < 1)
+                goto bad;
+            keyfile = *(++argv);
+        } else if (strcmp(*argv, "-keyform") == 0) {
+            if (--argc < 1)
+                goto bad;
+            keyformat = str2fmt(*(++argv));
+        } else if (strcmp(*argv, "-out") == 0) {
+            if (--argc < 1)
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-CApath") == 0) {
-		else if (strcmp(*argv,"-CApath") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             CApath = *(++argv);
             do_ver = 1;
-			}
+        } else if (strcmp(*argv, "-CAfile") == 0) {
-		else if (strcmp(*argv,"-CAfile") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             CAfile = *(++argv);
             do_ver = 1;
-			}
+        } else if (strcmp(*argv, "-verify") == 0)
-		else if (strcmp(*argv,"-verify") == 0)
             do_ver = 1;
         else if (strcmp(*argv, "-text") == 0)
             text = 1;
         else if (strcmp(*argv, "-hash") == 0)
             hash = ++num;
-		else if (strcmp(*argv,"-nameopt") == 0)
+#ifndef OPENSSL_NO_MD5
-			{
+        else if (strcmp(*argv, "-hash_old") == 0)
-			if (--argc < 1) goto bad;
+            hash_old = ++num;
-			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+#endif
-			}
+        else if (strcmp(*argv, "-nameopt") == 0) {
-		else if (strcmp(*argv,"-issuer") == 0)
+            if (--argc < 1)
+                goto bad;
+            if (!set_name_ex(&nmflag, *(++argv)))
+                goto bad;
+        } else if (strcmp(*argv, "-issuer") == 0)
             issuer = ++num;
         else if (strcmp(*argv, "-lastupdate") == 0)
             lastupdate = ++num;
@@ -209,13 +226,12 @@ int MAIN(int argc, char **argv)
             fingerprint = ++num;
         else if (strcmp(*argv, "-crlnumber") == 0)
             crlnumber = ++num;
-		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
+        else if (strcmp(*argv, "-badsig") == 0)
-			{
+            badsig = 1;
+        else if ((md_alg = EVP_get_digestbyname(*argv + 1))) {
             /* ok */
             digest = md_alg;
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -224,8 +240,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         for (pp = crl_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
@@ -234,110 +249,132 @@ bad:
 
     ERR_load_crypto_strings();
     x = load_crl(infile, informat);
-	if (x == NULL) { goto end; }
+    if (x == NULL) {
+        goto end;
+    }
 
     if (do_ver) {
         store = X509_STORE_new();
         lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
+            goto end;
         if (!X509_LOOKUP_load_file(lookup, CAfile, X509_FILETYPE_PEM))
             X509_LOOKUP_load_file(lookup, NULL, X509_FILETYPE_DEFAULT);
 
         lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
-		if (lookup == NULL) goto end;
+        if (lookup == NULL)
+            goto end;
         if (!X509_LOOKUP_add_dir(lookup, CApath, X509_FILETYPE_PEM))
             X509_LOOKUP_add_dir(lookup, NULL, X509_FILETYPE_DEFAULT);
         ERR_clear_error();
 
         if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error initialising X509 store\n");
-				"Error initialising X509 store\n");
             goto end;
         }
 
         i = X509_STORE_get_by_subject(&ctx, X509_LU_X509,
                                       X509_CRL_get_issuer(x), &xobj);
         if (i <= 0) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
-				"Error getting CRL issuer certificate\n");
             goto end;
         }
         pkey = X509_get_pubkey(xobj.data.x509);
         X509_OBJECT_free_contents(&xobj);
         if (!pkey) {
-			BIO_printf(bio_err,
+            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
-				"Error getting CRL issuer public key\n");
             goto end;
         }
         i = X509_CRL_verify(x, pkey);
         EVP_PKEY_free(pkey);
-		if(i < 0) goto end;
+        if (i < 0)
-		if(i == 0) BIO_printf(bio_err, "verify failure\n");
+            goto end;
-		else BIO_printf(bio_err, "verify OK\n");
+        if (i == 0)
+            BIO_printf(bio_err, "verify failure\n");
+        else
+            BIO_printf(bio_err, "verify OK\n");
     }
 
-	if (num)
+    if (crldiff) {
-		{
+        X509_CRL *newcrl, *delta;
-		for (i=1; i<=num; i++)
+        if (!keyfile) {
-			{
+            BIO_puts(bio_err, "Missing CRL signing key\n");
-			if (issuer == i)
+            goto end;
-				{
-				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
         }
-			if (crlnumber == i)
+        newcrl = load_crl(crldiff, informat);
-				{
+        if (!newcrl)
+            goto end;
+        pkey = load_key(bio_err, keyfile, keyformat, 0, NULL, NULL,
+                        "CRL signing key");
+        if (!pkey) {
+            X509_CRL_free(newcrl);
+            goto end;
+        }
+        delta = X509_CRL_diff(x, newcrl, pkey, digest, 0);
+        X509_CRL_free(newcrl);
+        EVP_PKEY_free(pkey);
+        if (delta) {
+            X509_CRL_free(x);
+            x = delta;
+        } else {
+            BIO_puts(bio_err, "Error creating delta CRL\n");
+            goto end;
+        }
+    }
+
+    if (num) {
+        for (i = 1; i <= num; i++) {
+            if (issuer == i) {
+                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
+                           nmflag);
+            }
+            if (crlnumber == i) {
                 ASN1_INTEGER *crlnum;
-				crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number,
+                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
-							      NULL, NULL);
                 BIO_printf(bio_out, "crlNumber=");
-				if (crlnum)
+                if (crlnum) {
-					{
                     i2a_ASN1_INTEGER(bio_out, crlnum);
                     ASN1_INTEGER_free(crlnum);
-					}
+                } else
-				else
                     BIO_puts(bio_out, "<NONE>");
                 BIO_printf(bio_out, "\n");
             }
-			if (hash == i)
+            if (hash == i) {
-				{
                 BIO_printf(bio_out, "%08lx\n",
                            X509_NAME_hash(X509_CRL_get_issuer(x)));
             }
-			if (lastupdate == i)
+#ifndef OPENSSL_NO_MD5
-				{
+            if (hash_old == i) {
+                BIO_printf(bio_out, "%08lx\n",
+                           X509_NAME_hash_old(X509_CRL_get_issuer(x)));
+            }
+#endif
+            if (lastupdate == i) {
                 BIO_printf(bio_out, "lastUpdate=");
-				ASN1_TIME_print(bio_out,
+                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
-						X509_CRL_get_lastUpdate(x));
                 BIO_printf(bio_out, "\n");
             }
-			if (nextupdate == i)
+            if (nextupdate == i) {
-				{
                 BIO_printf(bio_out, "nextUpdate=");
                 if (X509_CRL_get_nextUpdate(x))
-					ASN1_TIME_print(bio_out,
+                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
-						X509_CRL_get_nextUpdate(x));
                 else
                     BIO_printf(bio_out, "NONE");
                 BIO_printf(bio_out, "\n");
             }
-			if (fingerprint == i)
+            if (fingerprint == i) {
-				{
                 int j;
                 unsigned int n;
                 unsigned char md[EVP_MAX_MD_SIZE];
 
-				if (!X509_CRL_digest(x,digest,md,&n))
+                if (!X509_CRL_digest(x, digest, md, &n)) {
-					{
                     BIO_printf(bio_err, "out of memory\n");
                     goto end;
                 }
                 BIO_printf(bio_out, "%s Fingerprint=",
                            OBJ_nid2sn(EVP_MD_type(digest)));
-				for (j=0; j<(int)n; j++)
+                for (j = 0; j < (int)n; j++) {
-					{
+                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
-					BIO_printf(bio_out,"%02X%c",md[j],
-						(j+1 == (int)n)
                                ? '\n' : ':');
                 }
             }
@@ -345,14 +382,12 @@ bad:
     }
 
     out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -360,36 +395,40 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
-	if (text) X509_CRL_print(out, x);
+    if (text)
+        X509_CRL_print(out, x);
 
-	if (noout) 
+    if (noout) {
-		{
         ret = 0;
         goto end;
     }
 
+    if (badsig)
+        x->signature->data[x->signature->length - 1] ^= 0x1;
+
     if (outformat == FORMAT_ASN1)
         i = (int)i2d_X509_CRL_bio(out, x);
     else if (outformat == FORMAT_PEM)
         i = PEM_write_bio_X509_CRL(out, x);
-	else	
+    else {
-		{
         BIO_printf(bio_err, "bad output format specified for outfile\n");
         goto end;
     }
-	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
+    if (!i) {
+        BIO_printf(bio_err, "unable to write CRL\n");
+        goto end;
+    }
     ret = 0;
  end:
+    if (ret != 0)
+        ERR_print_errors(bio_err);
     BIO_free_all(out);
     BIO_free_all(bio_out);
     bio_out = NULL;
@@ -401,46 +440,3 @@ end:
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
-
-static X509_CRL *load_crl(char *infile, int format)
-	{
-	X509_CRL *x=NULL;
-	BIO *in=NULL;
-
-	in=BIO_new(BIO_s_file());
-	if (in == NULL)
-		{
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-
-	if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-	else
-		{
-		if (BIO_read_filename(in,infile) <= 0)
-			{
-			perror(infile);
-			goto end;
-			}
-		}
-	if 	(format == FORMAT_ASN1)
-		x=d2i_X509_CRL_bio(in,NULL);
-	else if (format == FORMAT_PEM)
-		x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
-	else	{
-		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");
-		ERR_print_errors(bio_err);
-		goto end;
-		}
-	
-end:
-	BIO_free(in);
-	return(x);
-	}
-

apps/crl2p7.c

@@ -56,9 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
+/*
- * and donated 'to the cause' along with lots and lots of other fixes to
+ * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
- * the library. */
+ * donated 'to the cause' along with lots and lots of other fixes to the
+ * library.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -75,7 +77,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG    crl2pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -92,7 +95,7 @@ int MAIN(int argc, char **argv)
     PKCS7 *p7 = NULL;
     PKCS7_SIGNED *p7s = NULL;
     X509_CRL *crl = NULL;
-	STACK_OF(STRING) *certflst=NULL;
+    STACK_OF(OPENSSL_STRING) *certflst = NULL;
     STACK_OF(X509_CRL) *crl_stack = NULL;
     STACK_OF(X509) *cert_stack = NULL;
     int ret = 1, nocrl = 0;
@@ -111,40 +114,37 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-nocrl") == 0) {
-		else if (strcmp(*argv,"-nocrl") == 0)
-			{
             nocrl = 1;
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
+        } else if (strcmp(*argv, "-certfile") == 0) {
+            if (--argc < 1)
+                goto bad;
+            if (!certflst)
+                certflst = sk_OPENSSL_STRING_new_null();
+            if (!certflst)
+                goto end;
+            if (!sk_OPENSSL_STRING_push(certflst, *(++argv))) {
+                sk_OPENSSL_STRING_free(certflst);
+                goto end;
             }
-		else if (strcmp(*argv,"-certfile") == 0)
+        } else {
-			{
-			if (--argc < 1) goto bad;
-			if(!certflst) certflst = sk_STRING_new_null();
-			sk_STRING_push(certflst,*(++argv));
-			}
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -153,8 +153,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -162,9 +161,11 @@ bad:
         BIO_printf(bio_err, " -outform arg   output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg        input file\n");
         BIO_printf(bio_err, " -out arg       output file\n");
-		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
+        BIO_printf(bio_err,
+                   " -certfile arg  certificates file of chain to a trusted CA\n");
         BIO_printf(bio_err, "                (can be used more than once)\n");
-		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
+        BIO_printf(bio_err,
+                   " -nocrl         no crl to load, just certs from '-certfile'\n");
         ret = 1;
         goto end;
     }
@@ -173,20 +174,16 @@ bad:
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (!nocrl)
+    if (!nocrl) {
-		{
         if (infile == NULL)
             BIO_set_fp(in, stdin, BIO_NOCLOSE);
-		else
+        else {
-			{
+            if (BIO_read_filename(in, infile) <= 0) {
-			if (BIO_read_filename(in,infile) <= 0)
-				{
                 perror(infile);
                 goto end;
             }
@@ -200,46 +197,48 @@ bad:
             BIO_printf(bio_err, "bad input format specified for input crl\n");
             goto end;
         }
-		if (crl == NULL)
+        if (crl == NULL) {
-			{
             BIO_printf(bio_err, "unable to load CRL\n");
             ERR_print_errors(bio_err);
             goto end;
         }
     }
 
-	if ((p7=PKCS7_new()) == NULL) goto end;
+    if ((p7 = PKCS7_new()) == NULL)
-	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
+        goto end;
+    if ((p7s = PKCS7_SIGNED_new()) == NULL)
+        goto end;
     p7->type = OBJ_nid2obj(NID_pkcs7_signed);
     p7->d.sign = p7s;
     p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
 
-	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
+    if (!ASN1_INTEGER_set(p7s->version, 1))
-	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
+        goto end;
+    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+        goto end;
     p7s->crl = crl_stack;
-	if (crl != NULL)
+    if (crl != NULL) {
-		{
         sk_X509_CRL_push(crl_stack, crl);
         crl = NULL;             /* now part of p7 for OPENSSL_freeing */
     }
 
-	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
+    if ((cert_stack = sk_X509_new_null()) == NULL)
+        goto end;
     p7s->cert = cert_stack;
 
-	if(certflst) for(i = 0; i < sk_STRING_num(certflst); i++) {
+    if (certflst)
-		certfile = sk_STRING_value(certflst, i);
+        for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
-		if (add_certs_from_file(cert_stack,certfile) < 0)
+            certfile = sk_OPENSSL_STRING_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;
             }
         }
 
-	sk_STRING_free(certflst);
+    sk_OPENSSL_STRING_free(certflst);
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -247,11 +246,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -265,24 +261,27 @@ bad:
         BIO_printf(bio_err, "bad output format specified for outfile\n");
         goto end;
     }
-	if (!i)
+    if (!i) {
-		{
         BIO_printf(bio_err, "unable to write pkcs7 object\n");
         ERR_print_errors(bio_err);
         goto end;
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (p7 != NULL) PKCS7_free(p7);
+    if (out != NULL)
-	if (crl != NULL) X509_CRL_free(crl);
+        BIO_free_all(out);
+    if (p7 != NULL)
+        PKCS7_free(p7);
+    if (crl != NULL)
+        X509_CRL_free(crl);
 
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
 
-/*
+/*-
  *----------------------------------------------------------------------
  * int add_certs_from_file
  *
@@ -301,8 +300,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     X509_INFO *xi;
 
     in = BIO_new(BIO_s_file());
-	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
+    if ((in == NULL) || (BIO_read_filename(in, certfile) <= 0)) {
-		{
         BIO_printf(bio_err, "error opening the file, %s\n", certfile);
         goto end;
     }
@@ -315,11 +313,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     }
 
     /* scan over it and pull out the CRL's */
-	while (sk_X509_INFO_num(sk))
+    while (sk_X509_INFO_num(sk)) {
-		{
         xi = sk_X509_INFO_shift(sk);
-		if (xi->x509 != NULL)
+        if (xi->x509 != NULL) {
-			{
             sk_X509_push(stack, xi->x509);
             xi->x509 = NULL;
             count++;
@@ -330,8 +326,9 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     ret = count;
  end:
     /* never need to OPENSSL_free x */
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (sk != NULL) sk_X509_INFO_free(sk);
+        BIO_free(in);
+    if (sk != NULL)
+        sk_X509_INFO_free(sk);
     return (ret);
 }
-

apps/demoSRP/srp_verifier.txt

@@ -0,0 +1,6 @@
+# This is a file that will be filled by the openssl srp routine.
+# You can initialize the file with additional groups, these are
+# records starting with a I followed by the g and N values and the id.
+# The exact values ... you have to dig this out from the source of srp.c
+# or srp_vfy.c
+# The last value of an I is used as the default group for new users.  

apps/demoSRP/srp_verifier.txt.attr

@@ -0,0 +1 @@
+unique_subject = yes

apps/dgst.c

@@ -79,11 +79,31 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
           const char *sig_name, const char *md_name,
           const char *file, BIO *bmd);
 
+static void list_md_fn(const EVP_MD *m,
+                       const char *from, const char *to, void *arg)
+{
+    const char *mname;
+    /* Skip aliases */
+    if (!m)
+        return;
+    mname = OBJ_nid2ln(EVP_MD_type(m));
+    /* Skip shortnames */
+    if (strcmp(from, mname))
+        return;
+    /* Skip clones */
+    if (EVP_MD_flags(m) & EVP_MD_FLAG_PKEY_DIGEST)
+        return;
+    if (strchr(mname, ' '))
+        mname = EVP_MD_name(m);
+    BIO_printf(arg, "-%-14s to use the %s message digest algorithm\n",
+               mname, mname);
+}
+
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
+    ENGINE *e = NULL, *impl = NULL;
     unsigned char *buf = NULL;
     int i, err = 1;
     const EVP_MD *md = NULL, *m;
@@ -104,15 +124,16 @@ int MAIN(int argc, char **argv)
     char *passargin = NULL, *passin = NULL;
 #ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
+    int engine_impl = 0;
 #endif
     char *hmac_key = NULL;
     char *mac_name = NULL;
-	STACK_OF(STRING) *sigopts = NULL, *macopts = NULL;
+    int non_fips_allow = 0;
+    STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
     apps_startup();
 
-	if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
+    if ((buf = (unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL) {
-		{
         BIO_printf(bio_err, "out of memory\n");
         goto end;
     }
@@ -130,62 +151,57 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc > 0)
+    while (argc > 0) {
-		{
+        if ((*argv)[0] != '-')
-		if ((*argv)[0] != '-') break;
+            break;
         if (strcmp(*argv, "-c") == 0)
             separator = 1;
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-r") == 0)
-			{
+            separator = 2;
-			if (--argc < 1) break;
+        else if (strcmp(*argv, "-rand") == 0) {
+            if (--argc < 1)
+                break;
             randfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-sign") == 0) {
-		else if (strcmp(*argv,"-sign") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
-			}
+        } else if (!strcmp(*argv, "-passin")) {
-		else if (!strcmp(*argv,"-passin"))
-			{
             if (--argc < 1)
                 break;
             passargin = *++argv;
-			}
+        } else if (strcmp(*argv, "-verify") == 0) {
-		else if (strcmp(*argv,"-verify") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
             want_pub = 1;
             do_verify = 1;
-			}
+        } else if (strcmp(*argv, "-prverify") == 0) {
-		else if (strcmp(*argv,"-prverify") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyfile = *(++argv);
             do_verify = 1;
-			}
+        } else if (strcmp(*argv, "-signature") == 0) {
-		else if (strcmp(*argv,"-signature") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             sigfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-keyform") == 0) {
-		else if (strcmp(*argv,"-keyform") == 0)
+            if (--argc < 1)
-			{
+                break;
-			if (--argc < 1) break;
             keyform = str2fmt(*(++argv));
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) break;
+                break;
             engine = *(++argv);
             e = setup_engine(bio_err, engine, 0);
-			}
+        } else if (strcmp(*argv, "-engine_impl") == 0)
+            engine_impl = 1;
 #endif
         else if (strcmp(*argv, "-hex") == 0)
             out_bin = 0;
@@ -193,37 +209,33 @@ int MAIN(int argc, char **argv)
             out_bin = 1;
         else if (strcmp(*argv, "-d") == 0)
             debug = 1;
-		else if (!strcmp(*argv,"-hmac"))
+        else if (!strcmp(*argv, "-fips-fingerprint"))
-			{
+            hmac_key = "etaonrishdlcupfm";
+        else if (strcmp(*argv, "-non-fips-allow") == 0)
+            non_fips_allow = 1;
+        else if (!strcmp(*argv, "-hmac")) {
             if (--argc < 1)
                 break;
             hmac_key = *++argv;
-			}
+        } else if (!strcmp(*argv, "-mac")) {
-		else if (!strcmp(*argv,"-mac"))
-			{
             if (--argc < 1)
                 break;
             mac_name = *++argv;
-			}
+        } else if (strcmp(*argv, "-sigopt") == 0) {
-		else if (strcmp(*argv,"-sigopt") == 0)
-			{
             if (--argc < 1)
                 break;
             if (!sigopts)
-				sigopts = sk_STRING_new_null();
+                sigopts = sk_OPENSSL_STRING_new_null();
-			if (!sigopts || !sk_STRING_push(sigopts, *(++argv)))
+            if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
                 break;
-			}
+        } else if (strcmp(*argv, "-macopt") == 0) {
-		else if (strcmp(*argv,"-macopt") == 0)
-			{
             if (--argc < 1)
                 break;
             if (!macopts)
-				macopts = sk_STRING_new_null();
+                macopts = sk_OPENSSL_STRING_new_null();
-			if (!macopts || !sk_STRING_push(macopts, *(++argv)))
+            if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
                 break;
-			}
+        } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL)
-		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
             md = m;
         else
             break;
@@ -231,81 +243,68 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-
     if (do_verify && !sigfile) {
-		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
+        BIO_printf(bio_err,
+                   "No signature to verify: use the -signature option\n");
         goto end;
     }
 
-	if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
+    if ((argc > 0) && (argv[0][0] == '-')) { /* bad option */
-		{
         BIO_printf(bio_err, "unknown option '%s'\n", *argv);
         BIO_printf(bio_err, "options are\n");
-		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
+        BIO_printf(bio_err,
+                   "-c              to output the digest with separating colons\n");
+        BIO_printf(bio_err,
+                   "-r              to output the digest in coreutils format\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, "-hmac arg       set the HMAC key to arg\n");
-		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
+        BIO_printf(bio_err, "-non-fips-allow allow use of non FIPS digest\n");
-		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
+                   "-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,
+                   "-out filename   output to filename rather than stdout\n");
         BIO_printf(bio_err, "-signature file signature to verify\n");
         BIO_printf(bio_err, "-sigopt nm:v    signature parameter\n");
         BIO_printf(bio_err, "-hmac key       create hashed MAC with key\n");
+        BIO_printf(bio_err,
+                   "-mac algorithm  create MAC (not neccessarily HMAC)\n");
+        BIO_printf(bio_err,
+                   "-macopt nm:v    MAC algorithm parameters or key\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
 
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm (default)\n",
+        EVP_MD_do_all_sorted(list_md_fn, bio_err);
-			LN_md5,LN_md5);
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_md4,LN_md4);
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_md2,LN_md2);
-#ifndef OPENSSL_NO_SHA
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_sha1,LN_sha1);
-#ifndef OPENSSL_NO_SHA256
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_sha224,LN_sha224);
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_sha256,LN_sha256);
-#endif
-#ifndef OPENSSL_NO_SHA512
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_sha384,LN_sha384);
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_sha512,LN_sha512);
-#endif
-#endif
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_mdc2,LN_mdc2);
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			LN_ripemd160,LN_ripemd160);
-#ifndef OPENSSL_NO_WHIRLPOOL
-		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-			SN_whirlpool,SN_whirlpool);
-#endif
         goto end;
     }
+#ifndef OPENSSL_NO_ENGINE
+    if (engine_impl)
+        impl = e;
+#endif
 
     in = BIO_new(BIO_s_file());
     bmd = BIO_new(BIO_f_md());
-	if (debug)
+    if (debug) {
-		{
         BIO_set_callback(in, BIO_debug_callback);
         /* needed for windows 3.1 */
         BIO_set_callback_arg(in, (char *)bio_err);
     }
 
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-		{
         BIO_printf(bio_err, "Error getting password\n");
         goto end;
     }
 
-	if ((in == NULL) || (bmd == NULL))
+    if ((in == NULL) || (bmd == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -323,7 +322,8 @@ int MAIN(int argc, char **argv)
     if (outfile) {
         if (out_bin)
             out = BIO_new_file(outfile, "wb");
-		else    out = BIO_new_file(outfile, "w");
+        else
+            out = BIO_new_file(outfile, "w");
     } else {
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -340,52 +340,44 @@ int MAIN(int argc, char **argv)
         ERR_print_errors(bio_err);
         goto end;
     }
-	if ((!!mac_name + !!keyfile + !!hmac_key) > 1)
+    if ((! !mac_name + ! !keyfile + ! !hmac_key) > 1) {
-		{
         BIO_printf(bio_err, "MAC and Signing key cannot both be specified\n");
         goto end;
     }
 
-	if(keyfile)
+    if (keyfile) {
-		{
         if (want_pub)
             sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
                                  e, "key file");
         else
             sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
                               e, "key file");
-		if (!sigkey)
+        if (!sigkey) {
-			{
+            /*
-			/* load_[pub]key() has already printed an appropriate
+             * load_[pub]key() has already printed an appropriate message
-			   message */
+             */
             goto end;
         }
     }
 
-	if (mac_name)
+    if (mac_name) {
-		{
         EVP_PKEY_CTX *mac_ctx = NULL;
         int r = 0;
-		if (!init_gen_str(bio_err, &mac_ctx, mac_name,e, 0))
+        if (!init_gen_str(bio_err, &mac_ctx, mac_name, impl, 0))
             goto mac_end;
-		if (macopts)
+        if (macopts) {
-			{
             char *macopt;
-			for (i = 0; i < sk_STRING_num(macopts); i++)
+            for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++) {
-				{
+                macopt = sk_OPENSSL_STRING_value(macopts, i);
-				macopt = sk_STRING_value(macopts, i);
+                if (pkey_ctrl_string(mac_ctx, macopt) <= 0) {
-				if (pkey_ctrl_string(mac_ctx, macopt) <= 0)
-					{
                     BIO_printf(bio_err,
-						"MAC parameter error \"%s\"\n",
+                               "MAC parameter error \"%s\"\n", macopt);
-						macopt);
                     ERR_print_errors(bio_err);
                     goto mac_end;
                 }
             }
         }
-		if (EVP_PKEY_keygen(mac_ctx, &sigkey) <= 0)
+        if (EVP_PKEY_keygen(mac_ctx, &sigkey) <= 0) {
-			{
             BIO_puts(bio_err, "Error generating key\n");
             ERR_print_errors(bio_err);
             goto mac_end;
@@ -398,46 +390,43 @@ int MAIN(int argc, char **argv)
             goto end;
     }
 
-	if (hmac_key)
+    if (non_fips_allow) {
-		{
+        EVP_MD_CTX *md_ctx;
-		sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, e,
+        BIO_get_md_ctx(bmd, &md_ctx);
+        EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+    }
+
+    if (hmac_key) {
+        sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, impl,
                                       (unsigned char *)hmac_key, -1);
         if (!sigkey)
             goto end;
     }
 
-	if (sigkey)
+    if (sigkey) {
-		{
         EVP_MD_CTX *mctx = NULL;
         EVP_PKEY_CTX *pctx = NULL;
         int r;
-		if (!BIO_get_md_ctx(bmd, &mctx))
+        if (!BIO_get_md_ctx(bmd, &mctx)) {
-			{
             BIO_printf(bio_err, "Error getting context\n");
             ERR_print_errors(bio_err);
             goto end;
         }
         if (do_verify)
-			r = EVP_DigestVerifyInit(mctx, &pctx, md, e, sigkey);
+            r = EVP_DigestVerifyInit(mctx, &pctx, md, impl, sigkey);
         else
-			r = EVP_DigestSignInit(mctx, &pctx, md, e, sigkey);
+            r = EVP_DigestSignInit(mctx, &pctx, md, impl, sigkey);
-		if (!r)
+        if (!r) {
-			{
             BIO_printf(bio_err, "Error setting context\n");
             ERR_print_errors(bio_err);
             goto end;
         }
-		if (sigopts)
+        if (sigopts) {
-			{
             char *sigopt;
-			for (i = 0; i < sk_STRING_num(sigopts); i++)
+            for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++) {
-				{
+                sigopt = sk_OPENSSL_STRING_value(sigopts, i);
-				sigopt = sk_STRING_value(sigopts, i);
+                if (pkey_ctrl_string(pctx, sigopt) <= 0) {
-				if (pkey_ctrl_string(pctx, sigopt) <= 0)
+                    BIO_printf(bio_err, "parameter error \"%s\"\n", sigopt);
-					{
-					BIO_printf(bio_err,
-						"parameter error \"%s\"\n",
-						sigopt);
                     ERR_print_errors(bio_err);
                     goto end;
                 }
@@ -445,12 +434,16 @@ int MAIN(int argc, char **argv)
         }
     }
     /* we use md as a filter, reading from 'in' */
-	else
+    else {
-		{
+        EVP_MD_CTX *mctx = NULL;
+        if (!BIO_get_md_ctx(bmd, &mctx)) {
+            BIO_printf(bio_err, "Error getting context\n");
+            ERR_print_errors(bio_err);
+            goto end;
+        }
         if (md == NULL)
             md = EVP_md5();
-		if (!BIO_set_md(bmd,md))
+        if (!EVP_DigestInit_ex(mctx, md, impl)) {
-			{
             BIO_printf(bio_err, "Error setting digest %s\n", pname);
             ERR_print_errors(bio_err);
             goto end;
@@ -463,61 +456,51 @@ int MAIN(int argc, char **argv)
         siglen = EVP_PKEY_size(sigkey);
         sigbuf = OPENSSL_malloc(siglen);
         if (!sigbio) {
-			BIO_printf(bio_err, "Error opening signature file %s\n",
+            BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
-								sigfile);
             ERR_print_errors(bio_err);
             goto end;
         }
         siglen = BIO_read(sigbio, sigbuf, siglen);
         BIO_free(sigbio);
         if (siglen <= 0) {
-			BIO_printf(bio_err, "Error reading signature file %s\n",
+            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
-								sigfile);
             ERR_print_errors(bio_err);
             goto end;
         }
     }
     inp = BIO_push(bmd, in);
 
-	if (md == NULL)
+    if (md == NULL) {
-		{
         EVP_MD_CTX *tctx;
         BIO_get_md_ctx(bmd, &tctx);
         md = EVP_MD_CTX_md(tctx);
     }
 
-	if (argc == 0)
+    if (argc == 0) {
-		{
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
         err = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
                     siglen, NULL, NULL, "stdin", bmd);
-		}
+    } else {
-	else
-		{
         const char *md_name = NULL, *sig_name = NULL;
-		if(!out_bin)
+        if (!out_bin) {
-			{
+            if (sigkey) {
-			if (sigkey)
-				{
                 const EVP_PKEY_ASN1_METHOD *ameth;
                 ameth = EVP_PKEY_get0_asn1(sigkey);
                 if (ameth)
                     EVP_PKEY_asn1_get0_info(NULL, NULL,
                                             NULL, NULL, &sig_name, ameth);
             }
+            if (md)
                 md_name = EVP_MD_name(md);
         }
         err = 0;
-		for (i=0; i<argc; i++)
+        for (i = 0; i < argc; i++) {
-			{
             int r;
-			if (BIO_read_filename(in,argv[i]) <= 0)
+            if (BIO_read_filename(in, argv[i]) <= 0) {
-				{
                 perror(argv[i]);
                 err++;
                 continue;
-				}
+            } else
-			else
                 r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
                           siglen, sig_name, md_name, argv[i], bmd);
             if (r)
@@ -526,22 +509,24 @@ int MAIN(int argc, char **argv)
         }
     }
  end:
-	if (buf != NULL)
+    if (buf != NULL) {
-		{
         OPENSSL_cleanse(buf, BUFSIZE);
         OPENSSL_free(buf);
     }
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
+        BIO_free(in);
     if (passin)
         OPENSSL_free(passin);
     BIO_free_all(out);
     EVP_PKEY_free(sigkey);
     if (sigopts)
-		sk_STRING_free(sigopts);
+        sk_OPENSSL_STRING_free(sigopts);
     if (macopts)
-		sk_STRING_free(macopts);
+        sk_OPENSSL_STRING_free(macopts);
-	if(sigbuf) OPENSSL_free(sigbuf);
+    if (sigbuf)
-	if (bmd != NULL) BIO_free(bmd);
+        OPENSSL_free(sigbuf);
+    if (bmd != NULL)
+        BIO_free(bmd);
     apps_shutdown();
     OPENSSL_EXIT(err);
 }
@@ -554,70 +539,66 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
     size_t len;
     int i;
 
-	for (;;)
+    for (;;) {
-		{
         i = BIO_read(bp, (char *)buf, BUFSIZE);
-		if(i < 0)
+        if (i < 0) {
-			{
             BIO_printf(bio_err, "Read Error in %s\n", file);
             ERR_print_errors(bio_err);
             return 1;
         }
-		if (i == 0) break;
+        if (i == 0)
+            break;
     }
-	if(sigin)
+    if (sigin) {
-		{
         EVP_MD_CTX *ctx;
         BIO_get_md_ctx(bp, &ctx);
         i = EVP_DigestVerifyFinal(ctx, sigin, (unsigned int)siglen);
         if (i > 0)
             BIO_printf(out, "Verified OK\n");
-		else if(i == 0)
+        else if (i == 0) {
-			{
             BIO_printf(out, "Verification Failure\n");
             return 1;
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "Error Verifying Data\n");
             ERR_print_errors(bio_err);
             return 1;
         }
         return 0;
     }
-	if(key)
+    if (key) {
-		{
         EVP_MD_CTX *ctx;
         BIO_get_md_ctx(bp, &ctx);
         len = BUFSIZE;
-		if(!EVP_DigestSignFinal(ctx, buf, &len)) 
+        if (!EVP_DigestSignFinal(ctx, buf, &len)) {
-			{
             BIO_printf(bio_err, "Error Signing Data\n");
             ERR_print_errors(bio_err);
             return 1;
         }
-		}
+    } else {
-	else
-		{
         len = BIO_gets(bp, (char *)buf, BUFSIZE);
-		if (len <0) 
+        if ((int)len < 0) {
-			{
             ERR_print_errors(bio_err);
             return 1;
         }
     }
 
-	if(binout) BIO_write(out, buf, len);
+    if (binout)
-	else 
+        BIO_write(out, buf, len);
-		{
+    else if (sep == 2) {
-		if (sig_name)
+        for (i = 0; i < (int)len; i++)
-			BIO_printf(out, "%s-%s(%s)= ", sig_name, md_name, file);
+            BIO_printf(out, "%02x", buf[i]);
-		else if (md_name)
+        BIO_printf(out, " *%s\n", file);
+    } else {
+        if (sig_name) {
+            BIO_puts(out, sig_name);
+            if (md_name)
+                BIO_printf(out, "-%s", md_name);
+            BIO_printf(out, "(%s)= ", file);
+        } else if (md_name)
             BIO_printf(out, "%s(%s)= ", md_name, file);
         else
             BIO_printf(out, "(%s)= ", file);
-		for (i=0; i<(int)len; i++)
+        for (i = 0; i < (int)len; i++) {
-			{
             if (sep && (i != 0))
                 BIO_printf(out, ":");
             BIO_printf(out, "%02x", buf[i]);
@@ -626,4 +607,3 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
     }
     return 0;
 }
-

apps/dh.c

@@ -74,7 +74,8 @@
 # undef PROG
 # define PROG    dh_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -88,9 +89,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DH *dh = NULL;
     int i, badops = 0, text = 0;
     BIO *in = NULL, *out = NULL;
@@ -120,32 +118,28 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -157,8 +151,7 @@ int MAIN(int argc, char **argv)
             C = 1;
         else if (strcmp(*argv, "-noout") == 0)
             noout = 1;
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -167,21 +160,23 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+        BIO_printf(bio_err,
+                   " -outform arg  output format - one of DER PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
         BIO_printf(bio_err, " -out arg      output file\n");
         BIO_printf(bio_err, " -check        check the DH parameters\n");
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        BIO_printf(bio_err,
+                   " -text         print a text form of the DH parameters\n");
         BIO_printf(bio_err, " -C            Output C code\n");
         BIO_printf(bio_err, " -noout        no output\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 # endif
         goto end;
     }
@@ -189,29 +184,25 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -219,11 +210,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -233,22 +221,17 @@ bad:
         dh = d2i_DHparams_bio(in, NULL);
     else if (informat == FORMAT_PEM)
         dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
-	else
+    else {
-		{
         BIO_printf(bio_err, "bad input format specified\n");
         goto end;
     }
-	if (dh == NULL)
+    if (dh == NULL) {
-		{
         BIO_printf(bio_err, "unable to load DH parameters\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	
+    if (text) {
-
-	if (text)
-		{
         DHparams_print(out, dh);
 # ifdef undef
         printf("p=");
@@ -261,10 +244,8 @@ bad:
 # endif
     }
 
-	if (check)
+    if (check) {
-		{
+        if (!DH_check(dh, &i)) {
-		if (!DH_check(dh,&i))
-			{
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -279,33 +260,31 @@ bad:
         if (i == 0)
             printf("DH parameters appear to be ok.\n");
     }
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
         int len, l, bits;
 
         len = BN_num_bytes(dh->p);
         bits = BN_num_bits(dh->p);
         data = (unsigned char *)OPENSSL_malloc(len);
-		if (data == NULL)
+        if (data == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
         l = BN_bn2bin(dh->p, data);
         printf("static unsigned char dh%d_p[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dh->g, data);
         printf("static unsigned char dh%d_g[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n\n");
@@ -323,9 +302,7 @@ bad:
         OPENSSL_free(data);
     }
 
-
+    if (!noout) {
-	if (!noout)
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_DHparams_bio(out, dh);
         else if (outformat == FORMAT_PEM)
@@ -334,8 +311,7 @@ bad:
             BIO_printf(bio_err, "bad output format specified for outfile\n");
             goto end;
         }
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write DH parameters\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -343,10 +319,19 @@ bad:
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dh != NULL) DH_free(dh);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dh != NULL)
+        DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
+#else                           /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/dhparam.c

@@ -130,9 +130,10 @@
 # undef PROG
 # define PROG    dhparam_main
 
-#define DEFBITS	512
+# define DEFBITS 2048
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -143,15 +144,12 @@
  * -C
  */
 
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
+static int dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DH *dh = NULL;
     int i, badops = 0, text = 0;
 # ifndef OPENSSL_NO_DSA
@@ -183,32 +181,28 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -228,40 +222,47 @@ int MAIN(int argc, char **argv)
             g = 2;
         else if (strcmp(*argv, "-5") == 0)
             g = 5;
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
-			}
+        } else if (((sscanf(*argv, "%d", &num) == 0) || (num <= 0)))
-		else if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0)))
             goto bad;
         argv++;
         argc--;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] [numbits]\n", prog);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -inform arg   input format - one of DER PEM\n");
-		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
+        BIO_printf(bio_err,
+                   " -outform arg  output format - one of DER PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
         BIO_printf(bio_err, " -out arg      output file\n");
 # ifndef OPENSSL_NO_DSA
-		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
+        BIO_printf(bio_err,
+                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
 # endif
         BIO_printf(bio_err, " -check        check the DH parameters\n");
-		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
+        BIO_printf(bio_err,
+                   " -text         print a text form of the DH parameters\n");
         BIO_printf(bio_err, " -C            Output C code\n");
-		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
+                   " -2            generate parameters using  2 as the generator value\n");
-		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
+        BIO_printf(bio_err,
+                   " -5            generate parameters using  5 as the generator value\n");
+        BIO_printf(bio_err,
+                   " numbits       number of bits in to generate (default 2048)\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 # endif
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "               - load the file (or the files in the directory) into\n");
         BIO_printf(bio_err, "               the random number generator\n");
         BIO_printf(bio_err, " -noout        no output\n");
         goto end;
@@ -270,22 +271,20 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     if (g && !num)
         num = DEFBITS;
 
 # ifndef OPENSSL_NO_DSA
-	if (dsaparam)
+    if (dsaparam) {
-		{
+        if (g) {
-		if (g)
+            BIO_printf(bio_err,
-			{
+                       "generator may not be chosen for DSA parameters\n");
-			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
             goto end;
         }
-		}
+    } else
-	else
 # endif
     {
         /* DH parameters */
@@ -295,81 +294,84 @@ bad:
 
     if (num) {
 
-		BN_GENCB cb;
+        BN_GENCB *cb;
-		BN_GENCB_set(&cb, dh_cb, bio_err);
+        cb = BN_GENCB_new();
-		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+        if (!cb) {
-			{
+            ERR_print_errors(bio_err);
-			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+            goto end;
+        }
+
+        BN_GENCB_set(cb, dh_cb, bio_err);
+        if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+            BIO_printf(bio_err,
+                       "warning, not much extra random data, consider using the -rand option\n");
         }
         if (inrand != NULL)
             BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                        app_RAND_load_files(inrand));
 
 # ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
             DSA *dsa = DSA_new();
 
-			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+            BIO_printf(bio_err,
-			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
+                       "Generating DSA parameters, %d bit long prime\n", num);
-						NULL, 0, NULL, NULL, &cb))
+            if (!dsa
-				{
+                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
-				if(dsa) DSA_free(dsa);
+                                               cb)) {
+                if (dsa)
+                    DSA_free(dsa);
+                BN_GENCB_free(cb);
                 ERR_print_errors(bio_err);
                 goto end;
             }
 
             dh = DSA_dup_DH(dsa);
             DSA_free(dsa);
-			if (dh == NULL)
+            if (dh == NULL) {
-				{
+                BN_GENCB_free(cb);
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else
-		else
 # endif
         {
             dh = DH_new();
-			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
+            BIO_printf(bio_err,
+                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
+                       num, g);
             BIO_printf(bio_err, "This is going to take a long time\n");
-			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
+            if (!dh || !DH_generate_parameters_ex(dh, num, g, cb)) {
-				{
+                BN_GENCB_free(cb);
-				if(dh) DH_free(dh);
                 ERR_print_errors(bio_err);
                 goto end;
             }
         }
 
+        BN_GENCB_free(cb);
         app_RAND_write_file(NULL, bio_err);
     } else {
 
         in = BIO_new(BIO_s_file());
-		if (in == NULL)
+        if (in == NULL) {
-			{
             ERR_print_errors(bio_err);
             goto end;
         }
         if (infile == NULL)
             BIO_set_fp(in, stdin, BIO_NOCLOSE);
-		else
+        else {
-			{
+            if (BIO_read_filename(in, infile) <= 0) {
-			if (BIO_read_filename(in,infile) <= 0)
-				{
                 perror(infile);
                 goto end;
             }
         }
 
-		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
+        if (informat != FORMAT_ASN1 && informat != FORMAT_PEM) {
-			{
             BIO_printf(bio_err, "bad input format specified\n");
             goto end;
         }
-
 # ifndef OPENSSL_NO_DSA
-		if (dsaparam)
+        if (dsaparam) {
-			{
             DSA *dsa;
 
             if (informat == FORMAT_ASN1)
@@ -377,8 +379,7 @@ bad:
             else                /* informat == FORMAT_PEM */
                 dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
 
-			if (dsa == NULL)
+            if (dsa == NULL) {
-				{
                 BIO_printf(bio_err, "unable to load DSA parameters\n");
                 ERR_print_errors(bio_err);
                 goto end;
@@ -386,13 +387,11 @@ bad:
 
             dh = DSA_dup_DH(dsa);
             DSA_free(dsa);
-			if (dh == NULL)
+            if (dh == NULL) {
-				{
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else
-		else
 # endif
         {
             if (informat == FORMAT_ASN1)
@@ -400,8 +399,7 @@ bad:
             else                /* informat == FORMAT_PEM */
                 dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 
-			if (dh == NULL)
+            if (dh == NULL) {
-				{
                 BIO_printf(bio_err, "unable to load DH parameters\n");
                 ERR_print_errors(bio_err);
                 goto end;
@@ -412,13 +410,11 @@ bad:
     }
 
     out = BIO_new(BIO_s_file());
-	if (out == NULL)
+    if (out == NULL) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -426,26 +422,19 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
-
+    if (text) {
-	if (text)
-		{
         DHparams_print(out, dh);
     }
 
-	if (check)
+    if (check) {
-		{
+        if (!DH_check(dh, &i)) {
-		if (!DH_check(dh,&i))
-			{
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -460,38 +449,35 @@ bad:
         if (i == 0)
             printf("DH parameters appear to be ok.\n");
     }
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
         int len, l, bits;
 
         len = BN_num_bytes(dh->p);
         bits = BN_num_bits(dh->p);
         data = (unsigned char *)OPENSSL_malloc(len);
-		if (data == NULL)
+        if (data == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
         printf("#ifndef HEADER_DH_H\n"
-		       "#include <openssl/dh.h>\n"
+               "#include <openssl/dh.h>\n" "#endif\n");
-		       "#endif\n");
         printf("DH *get_dh%d()\n\t{\n", bits);
 
         l = BN_bn2bin(dh->p, data);
         printf("\tstatic unsigned char dh%d_p[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t\t");
+                printf("\n\t\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t\t};\n");
 
         l = BN_bn2bin(dh->g, data);
         printf("\tstatic unsigned char dh%d_g[]={", bits);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t\t");
+                printf("\n\t\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t\t};\n");
@@ -510,19 +496,19 @@ bad:
         OPENSSL_free(data);
     }
 
-
+    if (!noout) {
-	if (!noout)
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_DHparams_bio(out, dh);
-		else if (outformat == FORMAT_PEM)
+        else if (outformat == FORMAT_PEM) {
+            if (dh->q)
+                i = PEM_write_bio_DHxparams(out, dh);
+            else
                 i = PEM_write_bio_DHparams(out, dh);
-		else	{
+        } else {
             BIO_printf(bio_err, "bad output format specified for outfile\n");
             goto end;
         }
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write DH parameters\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -530,28 +516,38 @@ bad:
     }
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dh != NULL) DH_free(dh);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (dh != NULL)
+        DH_free(dh);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
+static int dh_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	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(BN_GENCB_get_arg(cb), &c, 1);
+    (void)BIO_flush(BN_GENCB_get_arg(cb));
     return 1;
 }
 
+#else                           /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/dsa.c

@@ -74,7 +74,8 @@
 # undef PROG
 # define PROG    dsa_main
 
-/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -134,42 +135,36 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
@@ -189,8 +184,7 @@ int MAIN(int argc, char **argv)
             pubin = 1;
         else if (strcmp(*argv, "-pubout") == 0)
             pubout = 1;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -199,35 +193,43 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, " -inform arg     input format - DER or PEM\n");
         BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg         input file\n");
-		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
+        BIO_printf(bio_err,
+                   " -passin arg     input file pass phrase source\n");
         BIO_printf(bio_err, " -out arg        output file\n");
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   " -passout arg    output file pass phrase source\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 # endif
-		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+                   " -des            encrypt PEM output with cbc des\n");
+        BIO_printf(bio_err,
+                   " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
+        BIO_printf(bio_err,
+                   " -idea           encrypt PEM output with cbc idea\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
         BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\n");
 # endif
 # ifndef OPENSSL_NO_SEED
-		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
+        BIO_printf(bio_err,
+                   " -seed           encrypt PEM output with cbc seed\n");
 # endif
         BIO_printf(bio_err, " -text           print the key in text\n");
         BIO_printf(bio_err, " -noout          don't print key out\n");
@@ -248,18 +250,15 @@ bad:
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
@@ -277,21 +276,18 @@ bad:
             pkey = load_key(bio_err, infile, informat, 1,
                             passin, e, "Private Key");
 
-		if (pkey)
+        if (pkey) {
-			{
             dsa = EVP_PKEY_get1_DSA(pkey);
             EVP_PKEY_free(pkey);
         }
     }
-	if (dsa == NULL)
+    if (dsa == NULL) {
-		{
         BIO_printf(bio_err, "unable to load Key\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -299,41 +295,41 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
     if (text)
-		if (!DSA_print(out,dsa,0))
+        if (!DSA_print(out, dsa, 0)) {
-			{
             perror(outfile);
             ERR_print_errors(bio_err);
             goto end;
         }
 
-	if (modulus)
+    if (modulus) {
-		{
         fprintf(stdout, "Public Key=");
         BN_print(out, dsa->pub_key);
         fprintf(stdout, "\n");
     }
 
-	if (noout) goto end;
+    if (noout)
+        goto end;
     BIO_printf(bio_err, "writing DSA key\n");
     if (outformat == FORMAT_ASN1) {
-		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
+        if (pubin || pubout)
-		else i=i2d_DSAPrivateKey_bio(out,dsa);
+            i = i2d_DSA_PUBKEY_bio(out, dsa);
+        else
+            i = i2d_DSAPrivateKey_bio(out, dsa);
     } else if (outformat == FORMAT_PEM) {
         if (pubin || pubout)
             i = PEM_write_bio_DSA_PUBKEY(out, dsa);
-		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
+        else
+            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
                                             NULL, 0, NULL, passout);
+# if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
     } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
         EVP_PKEY *pk;
         pk = EVP_PKEY_new();
@@ -345,24 +341,34 @@ bad:
         else
             i = i2b_PrivateKey_bio(out, pk);
         EVP_PKEY_free(pk);
+# endif
     } else {
         BIO_printf(bio_err, "bad output format specified for outfile\n");
         goto end;
     }
-	if (!i)
+    if (i <= 0) {
-		{
         BIO_printf(bio_err, "unable to write private key\n");
         ERR_print_errors(bio_err);
-		}
+    } else
-	else
         ret = 0;
  end:
-	if(in != NULL) BIO_free(in);
+    if (in != NULL)
-	if(out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if(dsa != NULL) DSA_free(dsa);
+    if (out != NULL)
-	if(passin) OPENSSL_free(passin);
+        BIO_free_all(out);
-	if(passout) OPENSSL_free(passout);
+    if (dsa != NULL)
+        DSA_free(dsa);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
+#else                           /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/dsaparam.c

@@ -57,11 +57,6 @@
  */
 
 #include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
 
 #ifndef OPENSSL_NO_DSA
 # include <assert.h>
@@ -80,7 +75,8 @@
 # undef PROG
 # define PROG    dsaparam_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -105,15 +101,12 @@ static void timebomb_sigalarm(int foo)
 
 # endif
 
-static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
+static int dsa_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DSA *dsa = NULL;
     int i, badops = 0, text = 0;
     BIO *in = NULL, *out = NULL;
@@ -121,6 +114,8 @@ int MAIN(int argc, char **argv)
     char *infile, *outfile, *prog, *inrand = NULL;
     int numbits = -1, num, genkey = 0;
     int need_rand = 0;
+    int non_fips_allow = 0;
+    BN_GENCB *cb = NULL;
 # ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
 # endif
@@ -145,39 +140,35 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if(strcmp(*argv, "-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
 # ifdef GENCB_TEST
-		else if(strcmp(*argv, "-timebomb") == 0)
+        else if (strcmp(*argv, "-timebomb") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             timebomb = atoi(*(++argv));
         }
 # endif
@@ -185,27 +176,23 @@ int MAIN(int argc, char **argv)
             text = 1;
         else if (strcmp(*argv, "-C") == 0)
             C = 1;
-		else if (strcmp(*argv,"-genkey") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			{
             genkey = 1;
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv,"-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             inrand = *(++argv);
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-noout") == 0)
             noout = 1;
-		else if (sscanf(*argv,"%d",&num) == 1)
+        else if (strcmp(*argv, "-non-fips-allow") == 0)
-			{
+            non_fips_allow = 1;
+        else if (sscanf(*argv, "%d", &num) == 1) {
             /* generate a key */
             numbits = num;
             need_rand = 1;
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -214,8 +201,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] [bits] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -227,14 +213,18 @@ bad:
         BIO_printf(bio_err, " -C            Output C code\n");
         BIO_printf(bio_err, " -noout        no output\n");
         BIO_printf(bio_err, " -genkey       generate a DSA key\n");
-		BIO_printf(bio_err," -rand         files to use for random number input\n");
+        BIO_printf(bio_err,
+                   " -rand         files to use for random number input\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 # endif
 # ifdef GENCB_TEST
-		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
+        BIO_printf(bio_err,
+                   " -timebomb n   interrupt keygen after <n> seconds\n");
 # endif
-		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
+        BIO_printf(bio_err,
+                   " number        number of bits to use for generating private key\n");
         goto end;
     }
 
@@ -242,24 +232,20 @@ bad:
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -267,131 +253,122 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
-	if (need_rand)
+    if (need_rand) {
-		{
         app_RAND_load_file(NULL, bio_err, (inrand != NULL));
         if (inrand != NULL)
             BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                        app_RAND_load_files(inrand));
     }
 
-	if (numbits > 0)
+    if (numbits > 0) {
-		{
+        cb = BN_GENCB_new();
-		BN_GENCB cb;
+        if (!cb) {
-		BN_GENCB_set(&cb, dsa_cb, bio_err);
+            BIO_printf(bio_err, "Error allocating BN_GENCB object\n");
+            goto end;
+        }
+        BN_GENCB_set(cb, dsa_cb, bio_err);
         assert(need_rand);
         dsa = DSA_new();
-		if(!dsa)
+        if (!dsa) {
-			{
             BIO_printf(bio_err, "Error allocating DSA object\n");
             goto end;
         }
-		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
+        if (non_fips_allow)
+            dsa->flags |= DSA_FLAG_NON_FIPS_ALLOW;
+        BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
+                   num);
         BIO_printf(bio_err, "This could take some time\n");
 # ifdef GENCB_TEST
-		if(timebomb > 0)
+        if (timebomb > 0) {
-	{
             struct sigaction act;
             act.sa_handler = timebomb_sigalarm;
             act.sa_flags = 0;
-		BIO_printf(bio_err,"(though I'll stop it if not done within %d secs)\n",
+            BIO_printf(bio_err,
+                       "(though I'll stop it if not done within %d secs)\n",
                        timebomb);
-		if(sigaction(SIGALRM, &act, NULL) != 0)
+            if (sigaction(SIGALRM, &act, NULL) != 0) {
-			{
                 BIO_printf(bio_err, "Error, couldn't set SIGALRM handler\n");
                 goto end;
             }
             alarm(timebomb);
         }
 # endif
-	        if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
+        if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, cb)) {
-			{
 # ifdef GENCB_TEST
-			if(stop_keygen_flag)
+            if (stop_keygen_flag) {
-				{
                 BIO_printf(bio_err, "DSA key generation time-stopped\n");
                 /* This is an asked-for behaviour! */
                 ret = 0;
                 goto end;
             }
 # endif
+            ERR_print_errors(bio_err);
             BIO_printf(bio_err, "Error, DSA key generation failed\n");
             goto end;
         }
-		}
+    } else if (informat == FORMAT_ASN1)
-	else if	(informat == FORMAT_ASN1)
         dsa = d2i_DSAparams_bio(in, NULL);
     else if (informat == FORMAT_PEM)
         dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
-	else
+    else {
-		{
         BIO_printf(bio_err, "bad input format specified\n");
         goto end;
     }
-	if (dsa == NULL)
+    if (dsa == NULL) {
-		{
         BIO_printf(bio_err, "unable to load DSA parameters\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (text)
+    if (text) {
-		{
         DSAparams_print(out, dsa);
     }
 
-	if (C)
+    if (C) {
-		{
         unsigned char *data;
-		int l,len,bits_p,bits_q,bits_g;
+        int l, len, bits_p;
 
         len = BN_num_bytes(dsa->p);
         bits_p = BN_num_bits(dsa->p);
-		bits_q=BN_num_bits(dsa->q);
-		bits_g=BN_num_bits(dsa->g);
         data = (unsigned char *)OPENSSL_malloc(len + 20);
-		if (data == NULL)
+        if (data == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
         l = BN_bn2bin(dsa->p, data);
         printf("static unsigned char dsa%d_p[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dsa->q, data);
         printf("static unsigned char dsa%d_q[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n");
 
         l = BN_bn2bin(dsa->g, data);
         printf("static unsigned char dsa%d_g[]={", bits_p);
-		for (i=0; i<l; i++)
+        for (i = 0; i < l; i++) {
-			{
+            if ((i % 12) == 0)
-			if ((i%12) == 0) printf("\n\t");
+                printf("\n\t");
             printf("0x%02X,", data[i]);
         }
         printf("\n\t};\n\n");
@@ -405,14 +382,13 @@ bad:
                bits_p, bits_p);
         printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
                bits_p, bits_p);
-		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
+        printf
+            ("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
         printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
         printf("\treturn(dsa);\n\t}\n");
     }
 
-
+    if (!noout) {
-	if (!noout)
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_DSAparams_bio(out, dsa);
         else if (outformat == FORMAT_PEM)
@@ -421,26 +397,33 @@ bad:
             BIO_printf(bio_err, "bad output format specified for outfile\n");
             goto end;
         }
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write DSA parameters\n");
             ERR_print_errors(bio_err);
             goto end;
         }
     }
-	if (genkey)
+    if (genkey) {
-		{
         DSA *dsakey;
 
         assert(need_rand);
-		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
+        if ((dsakey = DSAparams_dup(dsa)) == NULL)
-		if (!DSA_generate_key(dsakey)) goto end;
+            goto end;
+        if (non_fips_allow)
+            dsakey->flags |= DSA_FLAG_NON_FIPS_ALLOW;
+        if (!DSA_generate_key(dsakey)) {
+            ERR_print_errors(bio_err);
+            DSA_free(dsakey);
+            goto end;
+        }
         if (outformat == FORMAT_ASN1)
             i = i2d_DSAPrivateKey_bio(out, dsakey);
         else if (outformat == FORMAT_PEM)
-			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
+            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
+                                            NULL);
         else {
             BIO_printf(bio_err, "bad output format specified for outfile\n");
+            DSA_free(dsakey);
             goto end;
         }
         DSA_free(dsakey);
@@ -449,30 +432,42 @@ bad:
         app_RAND_write_file(NULL, bio_err);
     ret = 0;
  end:
-	if (in != NULL) BIO_free(in);
+    if (cb != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BN_GENCB_free(cb);
-	if (dsa != NULL) DSA_free(dsa);
+    if (in != NULL)
+        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)
+static int dsa_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	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(BN_GENCB_get_arg(cb), &c, 1);
+    (void)BIO_flush(BN_GENCB_get_arg(cb));
 # ifdef GENCB_TEST
     if (stop_keygen_flag)
         return 0;
 # endif
     return 1;
 }
+#else                           /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/ec.c

@@ -70,7 +70,8 @@
 # undef PROG
 # define PROG    ec_main
 
-/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
+/*-
+ * -inform arg    - input format - default PEM (one of DER, NET or PEM)
  * -outform arg   - output format - default PEM
  * -in arg        - input file - default stdin
  * -out arg       - output file - default stdout
@@ -85,9 +86,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE 	*e = NULL;
-#endif
     int ret = 1;
     EC_KEY *eckey = NULL;
     const EC_GROUP *group;
@@ -122,49 +120,40 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if (strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passin") == 0) {
-		else if (strcmp(*argv,"-passin") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
-			}
+        } else if (strcmp(*argv, "-engine") == 0) {
-		else if (strcmp(*argv, "-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             engine = *(++argv);
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv, "-noout") == 0)
             noout = 1;
         else if (strcmp(*argv, "-text") == 0)
             text = 1;
-		else if (strcmp(*argv, "-conv_form") == 0)
+        else if (strcmp(*argv, "-conv_form") == 0) {
-			{
             if (--argc < 1)
                 goto bad;
             ++argv;
@@ -177,9 +166,7 @@ int MAIN(int argc, char **argv)
                 form = POINT_CONVERSION_HYBRID;
             else
                 goto bad;
-			}
+        } else if (strcmp(*argv, "-param_enc") == 0) {
-		else if (strcmp(*argv, "-param_enc") == 0)
-			{
             if (--argc < 1)
                 goto bad;
             ++argv;
@@ -190,15 +177,13 @@ int MAIN(int argc, char **argv)
                 asn1_flag = 0;
             else
                 goto bad;
-			}
+        } else if (strcmp(*argv, "-param_out") == 0)
-		else if (strcmp(*argv, "-param_out") == 0)
             param_out = 1;
         else if (strcmp(*argv, "-pubin") == 0)
             pubin = 1;
         else if (strcmp(*argv, "-pubout") == 0)
             pubout = 1;
-		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -207,8 +192,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -238,12 +222,10 @@ bad:
                    " compressed\n");
         BIO_printf(bio_err, "                                 "
                    " uncompressed (default)\n");
-		BIO_printf(bio_err, "                                  "
+        BIO_printf(bio_err, "                                  " " hybrid\n");
-				" hybrid\n");
         BIO_printf(bio_err, " -param_enc arg  specifies the way"
                    " the ec parameters are encoded\n");
-		BIO_printf(bio_err, "                 in the asn1 der "
+        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
-				"encoding\n");
         BIO_printf(bio_err, "                 possible values:"
                    " named_curve (default)\n");
         BIO_printf(bio_err, "                                  "
@@ -254,65 +236,52 @@ bad:
     ERR_load_crypto_strings();
 
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
-	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
         BIO_printf(bio_err, "Error getting passwords\n");
         goto end;
     }
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in, infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
     }
 
     BIO_printf(bio_err, "read EC key\n");
-	if (informat == FORMAT_ASN1) 
+    if (informat == FORMAT_ASN1) {
-		{
         if (pubin)
             eckey = d2i_EC_PUBKEY_bio(in, NULL);
         else
             eckey = d2i_ECPrivateKey_bio(in, NULL);
-		} 
+    } else if (informat == FORMAT_PEM) {
-	else if (informat == FORMAT_PEM) 
-		{
         if (pubin)
-			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
+            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
-				NULL);
         else
-			eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
+            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
-				passin);
+    } else {
-		} 
-	else
-		{
         BIO_printf(bio_err, "bad input format specified for key\n");
         goto end;
     }
-	if (eckey == NULL)
+    if (eckey == NULL) {
-		{
         BIO_printf(bio_err, "unable to load Key\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -320,11 +289,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out, outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -339,31 +305,26 @@ bad:
         EC_KEY_set_asn1_flag(eckey, asn1_flag);
 
     if (text)
-		if (!EC_KEY_print(out, eckey, 0))
+        if (!EC_KEY_print(out, eckey, 0)) {
-			{
             perror(outfile);
             ERR_print_errors(bio_err);
             goto end;
         }
 
-	if (noout) 
+    if (noout) {
-		{
         ret = 0;
         goto end;
     }
 
     BIO_printf(bio_err, "writing EC key\n");
-	if (outformat == FORMAT_ASN1) 
+    if (outformat == FORMAT_ASN1) {
-		{
         if (param_out)
             i = i2d_ECPKParameters_bio(out, group);
         else if (pubin || pubout)
             i = i2d_EC_PUBKEY_bio(out, eckey);
         else
             i = i2d_ECPrivateKey_bio(out, eckey);
-		} 
+    } else if (outformat == FORMAT_PEM) {
-	else if (outformat == FORMAT_PEM) 
-		{
         if (param_out)
             i = PEM_write_bio_ECPKParameters(out, group);
         else if (pubin || pubout)
@@ -371,20 +332,15 @@ bad:
         else
             i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
                                            NULL, 0, NULL, passout);
-		} 
+    } else {
-	else 
+        BIO_printf(bio_err, "bad output format specified for " "outfile\n");
-		{
-		BIO_printf(bio_err, "bad output format specified for "
-			"outfile\n");
         goto end;
     }
 
-	if (!i)
+    if (!i) {
-		{
         BIO_printf(bio_err, "unable to write private key\n");
         ERR_print_errors(bio_err);
-		}
+    } else
-	else
         ret = 0;
  end:
     if (in)
@@ -400,4 +356,10 @@ end:
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
+#else                           /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/ecparam.c

@@ -87,7 +87,8 @@
 # undef PROG
 # define PROG    ecparam_main
 
-/* -inform arg      - input format - default PEM (DER or PEM)
+/*-
+ * -inform arg      - input format - default PEM (DER or PEM)
  * -outform arg     - output format - default PEM
  * -in  arg         - input file  - default stdin
  * -out arg         - output file - default stdout
@@ -105,14 +106,14 @@
  *                    in the asn1 der encoding
  *                    possible values: named_curve (default)
  *                                     explicit
- * -no_seed         - if 'explicit' parameters are choosen do not use the seed
+ * -no_seed         - if 'explicit' parameters are chosen do not use the seed
  * -genkey          - generate ec key
  * -rand file       - files to use for random number input
  * -engine e        - use engine e, possibly a hardware device
  */
 
-
+static int ecparam_print_var(BIO *, BIGNUM *, const char *, int,
-static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
+                             unsigned char *);
 
 int MAIN(int, char **);
 
@@ -129,9 +130,6 @@ int MAIN(int argc, char **argv)
     char *infile = NULL, *outfile = NULL, *prog;
     BIO *in = NULL, *out = NULL;
     int informat, outformat, noout = 0, C = 0, ret = 1;
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE	*e = NULL;
-#endif
     char *engine = NULL;
 
     BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
@@ -153,44 +151,36 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-text") == 0)
-		else if (strcmp(*argv,"-text") == 0)
             text = 1;
         else if (strcmp(*argv, "-C") == 0)
             C = 1;
         else if (strcmp(*argv, "-check") == 0)
             check = 1;
-		else if (strcmp (*argv, "-name") == 0)
+        else if (strcmp(*argv, "-name") == 0) {
-			{
             if (--argc < 1)
                 goto bad;
             curve_name = *(++argv);
-			}
+        } else if (strcmp(*argv, "-list_curves") == 0)
-		else if (strcmp(*argv, "-list_curves") == 0)
             list_curves = 1;
-		else if (strcmp(*argv, "-conv_form") == 0)
+        else if (strcmp(*argv, "-conv_form") == 0) {
-			{
             if (--argc < 1)
                 goto bad;
             ++argv;
@@ -203,9 +193,7 @@ int MAIN(int argc, char **argv)
                 form = POINT_CONVERSION_HYBRID;
             else
                 goto bad;
-			}
+        } else if (strcmp(*argv, "-param_enc") == 0) {
-		else if (strcmp(*argv, "-param_enc") == 0)
-			{
             if (--argc < 1)
                 goto bad;
             ++argv;
@@ -216,29 +204,23 @@ int MAIN(int argc, char **argv)
                 asn1_flag = 0;
             else
                 goto bad;
-			}
+        } else if (strcmp(*argv, "-no_seed") == 0)
-		else if (strcmp(*argv, "-no_seed") == 0)
             no_seed = 1;
         else if (strcmp(*argv, "-noout") == 0)
             noout = 1;
-		else if (strcmp(*argv,"-genkey") == 0)
+        else if (strcmp(*argv, "-genkey") == 0) {
-			{
             genkey = 1;
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-rand") == 0) {
-		else if (strcmp(*argv, "-rand") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             inrand = *(++argv);
             need_rand = 1;
-			}
+        } else if (strcmp(*argv, "-engine") == 0) {
-		else if(strcmp(*argv, "-engine") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             engine = *(++argv);
-			}	
+        } else {
-		else
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -247,8 +229,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -289,10 +270,8 @@ bad:
         BIO_printf(bio_err, "                                   "
                    " explicit\n");
         BIO_printf(bio_err, " -no_seed          if 'explicit'"
-				" parameters are choosen do not"
+                   " parameters are chosen do not" " use the seed\n");
-				" use the seed\n");
+        BIO_printf(bio_err, " -genkey           generate ec" " key\n");
-		BIO_printf(bio_err, " -genkey           generate ec"
-				" key\n");
         BIO_printf(bio_err, " -rand file        files to use for"
                    " random number input\n");
         BIO_printf(bio_err, " -engine e         use engine e, "
@@ -304,24 +283,20 @@ bad:
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
+        if (BIO_read_filename(in, infile) <= 0) {
-		if (BIO_read_filename(in,infile) <= 0)
-			{
             perror(infile);
             goto end;
         }
     }
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -329,22 +304,18 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
 # ifndef OPENSSL_NO_ENGINE
-	e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
-	if (list_curves)
+    if (list_curves) {
-		{
         EC_builtin_curve *curves = NULL;
         size_t crv_len = 0;
         size_t n = 0;
@@ -356,15 +327,12 @@ bad:
         if (curves == NULL)
             goto end;
 
-		if (!EC_get_builtin_curves(curves, crv_len))
+        if (!EC_get_builtin_curves(curves, crv_len)) {
-			{
             OPENSSL_free(curves);
             goto end;
         }
 
-		
+        for (n = 0; n < crv_len; n++) {
-		for (n = 0; n < crv_len; n++)
-			{
             const char *comment;
             const char *sname;
             comment = curves[n].comment;
@@ -383,64 +351,51 @@ bad:
         goto end;
     }
 
-	if (curve_name != NULL)
+    if (curve_name != NULL) {
-		{
         int nid;
 
-		/* workaround for the SECG curve names secp192r1
+        /*
-		 * and secp256r1 (which are the same as the curves
+         * workaround for the SECG curve names secp192r1 and secp256r1 (which
-		 * prime192v1 and prime256v1 defined in X9.62)
+         * are the same as the curves prime192v1 and prime256v1 defined in
+         * X9.62)
          */
-		if (!strcmp(curve_name, "secp192r1"))
+        if (!strcmp(curve_name, "secp192r1")) {
-			{
             BIO_printf(bio_err, "using curve name prime192v1 "
                        "instead of secp192r1\n");
             nid = NID_X9_62_prime192v1;
-			}
+        } else if (!strcmp(curve_name, "secp256r1")) {
-		else if (!strcmp(curve_name, "secp256r1"))
-			{
             BIO_printf(bio_err, "using curve name prime256v1 "
                        "instead of secp256r1\n");
             nid = NID_X9_62_prime256v1;
-			}
+        } else
-		else
             nid = OBJ_sn2nid(curve_name);
 
         if (nid == 0)
-			{
+            nid = EC_curve_nist2nid(curve_name);
-			BIO_printf(bio_err, "unknown curve name (%s)\n", 
+
-				curve_name);
+        if (nid == 0) {
+            BIO_printf(bio_err, "unknown curve name (%s)\n", curve_name);
             goto end;
         }
 
         group = EC_GROUP_new_by_curve_name(nid);
-		if (group == NULL)
+        if (group == NULL) {
-			{
+            BIO_printf(bio_err, "unable to create curve (%s)\n", curve_name);
-			BIO_printf(bio_err, "unable to create curve (%s)\n", 
-				curve_name);
             goto end;
         }
         EC_GROUP_set_asn1_flag(group, asn1_flag);
         EC_GROUP_set_point_conversion_form(group, form);
-		}
+    } else if (informat == FORMAT_ASN1) {
-	else if (informat == FORMAT_ASN1)
-		{
         group = d2i_ECPKParameters_bio(in, NULL);
-		}
+    } else if (informat == FORMAT_PEM) {
-	else if (informat == FORMAT_PEM)
-		{
         group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
-		}
+    } else {
-	else
-		{
         BIO_printf(bio_err, "bad input format specified\n");
         goto end;
     }
 
-	if (group == NULL)
+    if (group == NULL) {
-		{
+        BIO_printf(bio_err, "unable to load elliptic curve parameters\n");
-		BIO_printf(bio_err, 
-			"unable to load elliptic curve parameters\n");
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -451,34 +406,28 @@ bad:
     if (new_asn1_flag)
         EC_GROUP_set_asn1_flag(group, asn1_flag);
 
-	if (no_seed)
+    if (no_seed) {
-		{
         EC_GROUP_set_seed(group, NULL, 0);
     }
 
-	if (text)
+    if (text) {
-		{
         if (!ECPKParameters_print(out, group, 0))
             goto end;
     }
 
-	if (check)
+    if (check) {
-		{
         if (group == NULL)
             BIO_printf(bio_err, "no elliptic curve parameters\n");
         BIO_printf(bio_err, "checking elliptic curve parameters: ");
-		if (!EC_GROUP_check(group, NULL))
+        if (!EC_GROUP_check(group, NULL)) {
-			{
             BIO_printf(bio_err, "failed\n");
             ERR_print_errors(bio_err);
-			}
+        } else
-		else
             BIO_printf(bio_err, "ok\n");
 
     }
 
-	if (C)
+    if (C) {
-		{
         size_t buf_len = 0, tmp_len = 0;
         const EC_POINT *point;
         int is_prime, len = 0;
@@ -487,23 +436,17 @@ bad:
         if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
             (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
             (ec_order = BN_new()) == NULL ||
-		    (ec_cofactor = BN_new()) == NULL )
+            (ec_cofactor = BN_new()) == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
 
-		is_prime = (EC_METHOD_get_field_type(meth) == 
+        is_prime = (EC_METHOD_get_field_type(meth) == NID_X9_62_prime_field);
-			NID_X9_62_prime_field);
 
-		if (is_prime)
+        if (is_prime) {
-			{
+            if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
-			if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a,
-				ec_b, NULL))
                 goto end;
-			}
+        } else {
-		else
-			{
             /* TODO */
             goto end;
         }
@@ -511,16 +454,15 @@ bad:
         if ((point = EC_GROUP_get0_generator(group)) == NULL)
             goto end;
         if (!EC_POINT_point2bn(group, point,
-			EC_GROUP_get_point_conversion_form(group), ec_gen, 
+                               EC_GROUP_get_point_conversion_form(group),
-			NULL))
+                               ec_gen, NULL))
             goto end;
         if (!EC_GROUP_get_order(group, ec_order, NULL))
             goto end;
         if (!EC_GROUP_get_cofactor(group, ec_cofactor, NULL))
             goto end;
 
-		if (!ec_p || !ec_a || !ec_b || !ec_gen || 
+        if (!ec_p || !ec_a || !ec_b || !ec_gen || !ec_order || !ec_cofactor)
-			!ec_order || !ec_cofactor)
             goto end;
 
         len = BN_num_bits(ec_order);
@@ -540,8 +482,7 @@ bad:
 
         buffer = (unsigned char *)OPENSSL_malloc(buf_len);
 
-		if (buffer == NULL)
+        if (buffer == NULL) {
-			{
             perror("OPENSSL_malloc");
             goto end;
         }
@@ -551,8 +492,7 @@ bad:
         ecparam_print_var(out, ec_b, "ec_b", len, buffer);
         ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
         ecparam_print_var(out, ec_order, "ec_order", len, buffer);
-		ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, 
+        ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
-			buffer);
 
         BIO_printf(out, "\n\n");
 
@@ -571,14 +511,11 @@ bad:
         BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
                    "sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
                    "goto err;\n", len, len);
-		if (is_prime)
+        if (is_prime) {
-			{
             BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
                        "GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
                        "\n\t\tgoto err;\n\n");
-			}
+        } else {
-		else
-			{
             /* TODO */
             goto end;
         }
@@ -611,20 +548,17 @@ bad:
         BIO_printf(out, "\treturn(group);\n\t}\n");
     }
 
-	if (!noout)
+    if (!noout) {
-		{
         if (outformat == FORMAT_ASN1)
             i = i2d_ECPKParameters_bio(out, group);
         else if (outformat == FORMAT_PEM)
             i = PEM_write_bio_ECPKParameters(out, group);
-		else	
+        else {
-			{
             BIO_printf(bio_err, "bad output format specified for"
                        " outfile\n");
             goto end;
         }
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write elliptic "
                        "curve parameters\n");
             ERR_print_errors(bio_err);
@@ -632,16 +566,14 @@ bad:
         }
     }
 
-	if (need_rand)
+    if (need_rand) {
-		{
         app_RAND_load_file(NULL, bio_err, (inrand != NULL));
         if (inrand != NULL)
             BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                        app_RAND_load_files(inrand));
     }
 
-	if (genkey)
+    if (genkey) {
-		{
         EC_KEY *eckey = EC_KEY_new();
 
         if (eckey == NULL)
@@ -652,8 +584,7 @@ bad:
         if (EC_KEY_set_group(eckey, group) == 0)
             goto end;
 
-		if (!EC_KEY_generate_key(eckey))
+        if (!EC_KEY_generate_key(eckey)) {
-			{
             EC_KEY_free(eckey);
             goto end;
         }
@@ -662,8 +593,7 @@ bad:
         else if (outformat == FORMAT_PEM)
             i = PEM_write_bio_ECPrivateKey(out, eckey, NULL,
                                            NULL, 0, NULL, NULL);
-		else	
+        else {
-			{
             BIO_printf(bio_err, "bad output format specified "
                        "for outfile\n");
             EC_KEY_free(eckey);
@@ -707,13 +637,11 @@ static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
     BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
     if (BN_is_zero(in))
         BIO_printf(out, "\n\t0x00");
-	else 
+    else {
-		{
         int i, l;
 
         l = BN_bn2bin(in, buffer);
-		for (i=0; i<l-1; i++)
+        for (i = 0; i < l - 1; i++) {
-			{
             if ((i % 12) == 0)
                 BIO_printf(out, "\n\t");
             BIO_printf(out, "0x%02X,", buffer[i]);
@@ -725,4 +653,10 @@ static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
     BIO_printf(out, "\n\t};\n\n");
     return 1;
 }
+#else                           /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/enc.c

@@ -67,7 +67,9 @@
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
+#ifndef OPENSSL_NO_COMP
 # include <openssl/comp.h>
+#endif
 #include <ctype.h>
 
 int set_hex(char *in, unsigned char *out, int size);
@@ -88,12 +90,10 @@ static void show_ciphers(const OBJ_NAME *name,void *bio_)
         return;
 
     BIO_printf(bio, "-%-25s", name->name);
-	if(++n == 3)
+    if (++n == 3) {
-		{
         BIO_printf(bio, "\n");
         n = 0;
-		}
+    } else
-	else
         BIO_printf(bio, " ");
 }
 
@@ -101,9 +101,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     static const char magic[] = "Salted__";
     char mbuf[sizeof magic - 1];
     char *strbuf = NULL;
@@ -125,13 +122,15 @@ int MAIN(int argc, char **argv)
     const EVP_CIPHER *cipher = NULL, *c;
     EVP_CIPHER_CTX *ctx = NULL;
     char *inf = NULL, *outf = NULL;
-	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
+    BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
+        NULL, *wbio = NULL;
 #define PROG_NAME_SIZE  39
     char pname[PROG_NAME_SIZE + 1];
 #ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
 #endif
     const EVP_MD *dgst = NULL;
+    int non_fips_allow = 0;
 
     apps_startup();
 
@@ -165,29 +164,26 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
         if (strcmp(*argv, "-e") == 0)
             enc = 1;
-		else if (strcmp(*argv,"-in") == 0)
+        else if (strcmp(*argv, "-in") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inf = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outf = *(++argv);
-			}
+        } else if (strcmp(*argv, "-pass") == 0) {
-		else if (strcmp(*argv,"-pass") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passarg = *(++argv);
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 #endif
@@ -217,77 +213,67 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-z") == 0)
             do_zlib = 1;
 #endif
-		else if (strcmp(*argv,"-bufsize") == 0)
+        else if (strcmp(*argv, "-bufsize") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             bufsize = (unsigned char *)*(++argv);
-			}
+        } else if (strcmp(*argv, "-k") == 0) {
-		else if (strcmp(*argv,"-k") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             str = *(++argv);
-			}
+        } else if (strcmp(*argv, "-kfile") == 0) {
-		else if (strcmp(*argv,"-kfile") == 0)
-			{
             static char buf[128];
             FILE *infile;
             char *file;
 
-			if (--argc < 1) goto bad;
+            if (--argc < 1)
+                goto bad;
             file = *(++argv);
             infile = fopen(file, "r");
-			if (infile == NULL)
+            if (infile == NULL) {
-				{
+                BIO_printf(bio_err, "unable to read key from '%s'\n", file);
-				BIO_printf(bio_err,"unable to read key from '%s'\n",
-					file);
                 goto bad;
             }
             buf[0] = '\0';
-			fgets(buf,sizeof buf,infile);
+            if (!fgets(buf, sizeof buf, infile)) {
+                BIO_printf(bio_err, "unable to read key from '%s'\n", file);
+                goto bad;
+            }
             fclose(infile);
             i = strlen(buf);
-			if ((i > 0) &&
+            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
-				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
                 buf[--i] = '\0';
-			if ((i > 0) &&
+            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
-				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
                 buf[--i] = '\0';
-			if (i < 1)
+            if (i < 1) {
-				{
                 BIO_printf(bio_err, "zero length password\n");
                 goto bad;
             }
             str = buf;
-			}
+        } else if (strcmp(*argv, "-K") == 0) {
-		else if (strcmp(*argv,"-K") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hkey = *(++argv);
-			}
+        } else if (strcmp(*argv, "-S") == 0) {
-		else if (strcmp(*argv,"-S") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hsalt = *(++argv);
-			}
+        } else if (strcmp(*argv, "-iv") == 0) {
-		else if (strcmp(*argv,"-iv") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             hiv = *(++argv);
-			}
+        } else if (strcmp(*argv, "-md") == 0) {
-		else if (strcmp(*argv,"-md") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             md = *(++argv);
-			}
+        } else if (strcmp(*argv, "-non-fips-allow") == 0)
+            non_fips_allow = 1;
         else if ((argv[0][0] == '-') &&
-			((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
+                 ((c = EVP_get_cipherbyname(&(argv[0][1]))) != NULL)) {
-			{
             cipher = c;
-			}
+        } else if (strcmp(*argv, "-none") == 0)
-		else if (strcmp(*argv,"-none") == 0)
             cipher = NULL;
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option '%s'\n", *argv);
  bad:
             BIO_printf(bio_err, "options are\n");
@@ -296,24 +282,38 @@ bad:
             BIO_printf(bio_err, "%-14s pass phrase source\n", "-pass <arg>");
             BIO_printf(bio_err, "%-14s encrypt\n", "-e");
             BIO_printf(bio_err, "%-14s decrypt\n", "-d");
-			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
+            BIO_printf(bio_err,
-			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
+                       "%-14s base64 encode/decode, depending on encryption flag\n",
-			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
+                       "-a/-base64");
-			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
+            BIO_printf(bio_err, "%-14s passphrase is the next argument\n",
-			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
+                       "-k");
-			BIO_printf(bio_err,"%-14s salt in hex is the next argument\n","-S");
+            BIO_printf(bio_err,
-			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
+                       "%-14s passphrase is the first line of the file argument\n",
-			BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
+                       "-kfile");
+            BIO_printf(bio_err,
+                       "%-14s the next argument is the md to use to create a key\n",
+                       "-md");
+            BIO_printf(bio_err,
+                       "%-14s   from a passphrase.  One of md2, md5, sha or sha1\n",
+                       "");
+            BIO_printf(bio_err, "%-14s salt in hex is the next argument\n",
+                       "-S");
+            BIO_printf(bio_err, "%-14s key/iv in hex is the next argument\n",
+                       "-K/-iv");
+            BIO_printf(bio_err, "%-14s print the iv/key (then exit if -P)\n",
+                       "-[pP]");
             BIO_printf(bio_err, "%-14s buffer size\n", "-bufsize <n>");
-			BIO_printf(bio_err,"%-14s disable standard block padding\n","-nopad");
+            BIO_printf(bio_err, "%-14s disable standard block padding\n",
+                       "-nopad");
 #ifndef OPENSSL_NO_ENGINE
-			BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
+            BIO_printf(bio_err,
+                       "%-14s use engine e, possibly a hardware device.\n",
+                       "-engine e");
 #endif
 
             BIO_printf(bio_err, "Cipher Types\n");
             OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-					       show_ciphers,
+                                   show_ciphers, bio_err);
-					       bio_err);
             BIO_printf(bio_err, "\n");
 
             goto end;
@@ -323,82 +323,86 @@ bad:
     }
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
-	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
+    if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
-		{
+        BIO_printf(bio_err,
+                   "AEAD ciphers not supported by the enc utility\n");
+        goto end;
+    }
+
+    if (cipher && (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE)) {
+        BIO_printf(bio_err,
+                   "Ciphers in XTS mode are not supported by the enc utility\n");
+        goto end;
+    }
+
+    if (md && (dgst = EVP_get_digestbyname(md)) == NULL) {
         BIO_printf(bio_err, "%s is an unsupported message digest type\n", md);
         goto end;
     }
 
-	if (dgst == NULL)
+    if (dgst == NULL) {
-		{
         dgst = EVP_md5();
     }
 
-	if (bufsize != NULL)
+    if (bufsize != NULL) {
-		{
         unsigned long n;
 
-		for (n=0; *bufsize; bufsize++)
+        for (n = 0; *bufsize; bufsize++) {
-			{
             i = *bufsize;
             if ((i <= '9') && (i >= '0'))
                 n = n * 10 + i - '0';
-			else if (i == 'k')
+            else if (i == 'k') {
-				{
                 n *= 1024;
                 bufsize++;
                 break;
             }
         }
-		if (*bufsize != '\0')
+        if (*bufsize != '\0') {
-			{
             BIO_printf(bio_err, "invalid 'bufsize' specified.\n");
             goto end;
         }
 
         /* It must be large enough for a base64 encoded line */
-		if (base64 && n < 80) n=80;
+        if (base64 && n < 80)
+            n = 80;
 
         bsize = (int)n;
-		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
+        if (verbose)
+            BIO_printf(bio_err, "bufsize=%d\n", bsize);
     }
 
     strbuf = OPENSSL_malloc(SIZE);
     buff = (unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize));
-	if ((buff == NULL) || (strbuf == NULL))
+    if ((buff == NULL) || (strbuf == NULL)) {
-		{
+        BIO_printf(bio_err, "OPENSSL_malloc failure %ld\n",
-		BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
+                   (long)EVP_ENCODE_LENGTH(bsize));
         goto end;
     }
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
-	if (debug)
+    if (debug) {
-		{
         BIO_set_callback(in, BIO_debug_callback);
         BIO_set_callback(out, BIO_debug_callback);
         BIO_set_callback_arg(in, (char *)bio_err);
         BIO_set_callback_arg(out, (char *)bio_err);
     }
 
-	if (inf == NULL)
+    if (inf == NULL) {
-	        {
+#ifndef OPENSSL_NO_SETVBUF_IONBF
         if (bufsize != NULL)
             setvbuf(stdin, (char *)NULL, _IONBF, 0);
+#endif                          /* ndef OPENSSL_NO_SETVBUF_IONBF */
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	        }
+    } else {
-	else
+        if (BIO_read_filename(in, inf) <= 0) {
-		{
-		if (BIO_read_filename(in,inf) <= 0)
-			{
             perror(inf);
             goto end;
         }
@@ -412,10 +416,8 @@ bad:
         str = pass;
     }
 
-	if ((str == NULL) && (cipher != NULL) && (hkey == NULL))
+    if ((str == NULL) && (cipher != NULL) && (hkey == NULL)) {
-		{
+        for (;;) {
-		for (;;)
-			{
             char buf[200];
 
             BIO_snprintf(buf, sizeof buf, "enter %s %s password:",
@@ -423,41 +425,35 @@ bad:
                          (enc) ? "encryption" : "decryption");
             strbuf[0] = '\0';
             i = EVP_read_pw_string((char *)strbuf, SIZE, buf, enc);
-			if (i == 0)
+            if (i == 0) {
-				{
+                if (strbuf[0] == '\0') {
-				if (strbuf[0] == '\0')
-					{
                     ret = 1;
                     goto end;
                 }
                 str = strbuf;
                 break;
             }
-			if (i < 0)
+            if (i < 0) {
-				{
                 BIO_printf(bio_err, "bad password read\n");
                 goto end;
             }
         }
     }
 
-
+    if (outf == NULL) {
-	if (outf == NULL)
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
+#ifndef OPENSSL_NO_SETVBUF_IONBF
         if (bufsize != NULL)
             setvbuf(stdout, (char *)NULL, _IONBF, 0);
+#endif                          /* ndef OPENSSL_NO_SETVBUF_IONBF */
 #ifdef OPENSSL_SYS_VMS
         {
             BIO *tmpbio = BIO_new(BIO_f_linebuffer());
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outf) <= 0) {
-		{
-		if (BIO_write_filename(out,outf) <= 0)
-			{
             perror(outf);
             goto end;
         }
@@ -468,8 +464,7 @@ bad:
 
 #ifdef ZLIB
 
-	if (do_zlib)
+    if (do_zlib) {
-		{
         if ((bzl = BIO_new(BIO_f_zlib())) == NULL)
             goto end;
         if (enc)
@@ -479,12 +474,10 @@ bad:
     }
 #endif
 
-	if (base64)
+    if (base64) {
-		{
         if ((b64 = BIO_new(BIO_f_base64())) == NULL)
             goto end;
-		if (debug)
+        if (debug) {
-			{
             BIO_set_callback(b64, BIO_debug_callback);
             BIO_set_callback_arg(b64, (char *)bio_err);
         }
@@ -496,30 +489,31 @@ bad:
             rbio = BIO_push(b64, rbio);
     }
 
-	if (cipher != NULL)
+    if (cipher != NULL) {
-		{
+        /*
-		/* Note that str is NULL if a key was passed on the command
+         * Note that str is NULL if a key was passed on the command line, so
-		 * line, so we get no salt in that case. Is this a bug?
+         * we get no salt in that case. Is this a bug?
          */
-		if (str != NULL)
+        if (str != NULL) {
-			{
+            /*
-			/* Salt handling: if encrypting generate a salt and
+             * Salt handling: if encrypting generate a salt and write to
-			 * write to output BIO. If decrypting read salt from
+             * output BIO. If decrypting read salt from input BIO.
-			 * input BIO.
              */
             unsigned char *sptr;
-			if(nosalt) sptr = NULL;
+            if (nosalt)
+                sptr = NULL;
             else {
                 if (enc) {
                     if (hsalt) {
                         if (!set_hex(hsalt, salt, sizeof salt)) {
-							BIO_printf(bio_err,
+                            BIO_printf(bio_err, "invalid hex salt value\n");
-								"invalid hex salt value\n");
                             goto end;
                         }
                     } else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
                         goto end;
-					/* If -P option then don't bother writing */
+                    /*
+                     * If -P option then don't bother writing
+                     */
                     if ((printkey != 2)
                         && (BIO_write(wbio, magic,
                                       sizeof magic - 1) != sizeof magic - 1
@@ -543,34 +537,36 @@ bad:
                 sptr = salt;
             }
 
-			EVP_BytesToKey(cipher,dgst,sptr,
+            if (!EVP_BytesToKey(cipher, dgst, sptr,
                                 (unsigned char *)str,
-				strlen(str),1,key,iv);
+                                strlen(str), 1, key, iv)) {
-			/* zero the complete buffer or the string
+                BIO_printf(bio_err, "EVP_BytesToKey failed\n");
-			 * passed from the command line
+                goto end;
-			 * bug picked up by
+            }
-			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
+            /*
+             * zero the complete buffer or the string passed from the command
+             * line bug picked up by Larry J. Hughes Jr. <hughes@indiana.edu>
+             */
             if (str == strbuf)
                 OPENSSL_cleanse(str, SIZE);
             else
                 OPENSSL_cleanse(str, strlen(str));
         }
-		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
+        if ((hiv != NULL) && !set_hex(hiv, iv, sizeof iv)) {
-			{
             BIO_printf(bio_err, "invalid hex iv value\n");
             goto end;
         }
         if ((hiv == NULL) && (str == NULL)
-		    && EVP_CIPHER_iv_length(cipher) != 0)
+            && EVP_CIPHER_iv_length(cipher) != 0) {
-			{
+            /*
-			/* No IV was explicitly set and no IV was generated
+             * No IV was explicitly set and no IV was generated during
-			 * during EVP_BytesToKey. Hence the IV is undefined,
+             * EVP_BytesToKey. Hence the IV is undefined, making correct
-			 * making correct decryption impossible. */
+             * decryption impossible.
+             */
             BIO_printf(bio_err, "iv undefined\n");
             goto end;
         }
-		if ((hkey != NULL) && !set_hex(hkey,key,sizeof key))
+        if ((hkey != NULL) && !set_hex(hkey, key, sizeof key)) {
-			{
             BIO_printf(bio_err, "invalid hex key value\n");
             goto end;
         }
@@ -578,13 +574,17 @@ bad:
         if ((benc = BIO_new(BIO_f_cipher())) == NULL)
             goto end;
 
-		/* Since we may be changing parameters work on the encryption
+        /*
-		 * context rather than calling BIO_set_cipher().
+         * Since we may be changing parameters work on the encryption context
+         * rather than calling BIO_set_cipher().
          */
 
         BIO_get_cipher_ctx(benc, &ctx);
-		if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
+
-			{
+        if (non_fips_allow)
+            EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_NON_FIPS_ALLOW);
+
+        if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)) {
             BIO_printf(bio_err, "Error setting cipher %s\n",
                        EVP_CIPHER_name(cipher));
             ERR_print_errors(bio_err);
@@ -594,45 +594,38 @@ bad:
         if (nopad)
             EVP_CIPHER_CTX_set_padding(ctx, 0);
 
-		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
+        if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc)) {
-			{
             BIO_printf(bio_err, "Error setting cipher %s\n",
                        EVP_CIPHER_name(cipher));
             ERR_print_errors(bio_err);
             goto end;
         }
 
-		if (debug)
+        if (debug) {
-			{
             BIO_set_callback(benc, BIO_debug_callback);
             BIO_set_callback_arg(benc, (char *)bio_err);
         }
 
-		if (printkey)
+        if (printkey) {
-			{
+            if (!nosalt) {
-			if (!nosalt)
-				{
                 printf("salt=");
                 for (i = 0; i < (int)sizeof(salt); i++)
                     printf("%02X", salt[i]);
                 printf("\n");
             }
-			if (cipher->key_len > 0)
+            if (cipher->key_len > 0) {
-				{
                 printf("key=");
                 for (i = 0; i < cipher->key_len; i++)
                     printf("%02X", key[i]);
                 printf("\n");
             }
-			if (cipher->iv_len > 0)
+            if (cipher->iv_len > 0) {
-				{
                 printf("iv =");
                 for (i = 0; i < cipher->iv_len; i++)
                     printf("%02X", iv[i]);
                 printf("\n");
             }
-			if (printkey == 2)
+            if (printkey == 2) {
-				{
                 ret = 0;
                 goto end;
             }
@@ -643,40 +636,45 @@ bad:
     if (benc != NULL)
         wbio = BIO_push(benc, wbio);
 
-	for (;;)
+    for (;;) {
-		{
         inl = BIO_read(rbio, (char *)buff, bsize);
-		if (inl <= 0) break;
+        if (inl <= 0)
-		if (BIO_write(wbio,(char *)buff,inl) != inl)
+            break;
-			{
+        if (BIO_write(wbio, (char *)buff, inl) != inl) {
             BIO_printf(bio_err, "error writing output file\n");
             goto end;
         }
     }
-	if (!BIO_flush(wbio))
+    if (!BIO_flush(wbio)) {
-		{
         BIO_printf(bio_err, "bad decrypt\n");
         goto end;
     }
 
     ret = 0;
-	if (verbose)
+    if (verbose) {
-		{
         BIO_printf(bio_err, "bytes read   :%8ld\n", BIO_number_read(in));
         BIO_printf(bio_err, "bytes written:%8ld\n", BIO_number_written(out));
     }
  end:
     ERR_print_errors(bio_err);
-	if (strbuf != NULL) OPENSSL_free(strbuf);
+    if (strbuf != NULL)
-	if (buff != NULL) OPENSSL_free(buff);
+        OPENSSL_free(strbuf);
-	if (in != NULL) BIO_free(in);
+    if (buff != NULL)
-	if (out != NULL) BIO_free_all(out);
+        OPENSSL_free(buff);
-	if (benc != NULL) BIO_free(benc);
+    if (in != NULL)
-	if (b64 != NULL) BIO_free(b64);
+        BIO_free(in);
+    if (out != NULL)
+        BIO_free_all(out);
+    if (benc != NULL)
+        BIO_free(benc);
+    if (b64 != NULL)
+        BIO_free(b64);
 #ifdef ZLIB
-	if (bzl != NULL) BIO_free(bzl);
+    if (bzl != NULL)
+        BIO_free(bzl);
 #endif
-	if(pass) OPENSSL_free(pass);
+    if (pass)
+        OPENSSL_free(pass);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -687,25 +685,23 @@ int set_hex(char *in, unsigned char *out, int size)
     unsigned char j;
 
     n = strlen(in);
-	if (n > (size*2))
+    if (n > (size * 2)) {
-		{
         BIO_printf(bio_err, "hex string is too long\n");
         return (0);
     }
     memset(out, 0, size);
-	for (i=0; i<n; i++)
+    for (i = 0; i < n; i++) {
-		{
         j = (unsigned char)*in;
         *(in++) = '\0';
-		if (j == 0) break;
+        if (j == 0)
+            break;
         if ((j >= '0') && (j <= '9'))
             j -= '0';
         else if ((j >= 'A') && (j <= 'F'))
             j = j - 'A' + 10;
         else if ((j >= 'a') && (j <= 'f'))
             j = j - 'a' + 10;
-		else
+        else {
-			{
             BIO_printf(bio_err, "non-hex digit\n");
             return (0);
         }

apps/engine.c

@@ -1,6 +1,7 @@
 /* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
+/*
- * project 2000.
+ * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -56,13 +57,9 @@
  *
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
 #include "apps.h"
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
@@ -101,8 +98,7 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 {
     int l = strlen(s);
 
-	if (*buf == NULL)
+    if (*buf == NULL) {
-		{
         *size = step;
         *buf = OPENSSL_malloc(*size);
         if (*buf == NULL)
@@ -113,8 +109,7 @@ static int append_buf(char **buf, const char *s, int *size, int step)
     if (**buf != '\0')
         l += 2;                 /* ", " */
 
-	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
+    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
-		{
         *size += step;
         *buf = OPENSSL_realloc(*buf, *size);
     }
@@ -134,41 +129,38 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
     int started = 0, err = 0;
     /* Indent before displaying input flags */
     BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-	if(flags == 0)
+    if (flags == 0) {
-		{
         BIO_printf(bio_out, "<no flags>\n");
         return 1;
     }
-        /* If the object is internal, mark it in a way that shows instead of
+    /*
-         * having it part of all the other flags, even if it really is. */
+     * If the object is internal, mark it in a way that shows instead of
-	if(flags & ENGINE_CMD_FLAG_INTERNAL)
+     * having it part of all the other flags, even if it really is.
-		{
+     */
+    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
         BIO_printf(bio_out, "[Internal] ");
     }
 
-	if(flags & ENGINE_CMD_FLAG_NUMERIC)
+    if (flags & ENGINE_CMD_FLAG_NUMERIC) {
-		{
         BIO_printf(bio_out, "NUMERIC");
         started = 1;
     }
-	/* Now we check that no combinations of the mutually exclusive NUMERIC,
+    /*
+     * Now we check that no combinations of the mutually exclusive NUMERIC,
      * STRING, and NO_INPUT flags have been used. Future flags that can be
      * OR'd together with these would need to added after these to preserve
-	 * the testing logic. */
+     * the testing logic.
-	if(flags & ENGINE_CMD_FLAG_STRING)
+     */
-		{
+    if (flags & ENGINE_CMD_FLAG_STRING) {
-		if(started)
+        if (started) {
-			{
             BIO_printf(bio_out, "|");
             err = 1;
         }
         BIO_printf(bio_out, "STRING");
         started = 1;
     }
-	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
+    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
-		{
+        if (started) {
-		if(started)
-			{
             BIO_printf(bio_out, "|");
             err = 1;
         }
@@ -178,11 +170,10 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
     /* Check for unknown flags */
     flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
         ~ENGINE_CMD_FLAG_STRING &
-			~ENGINE_CMD_FLAG_NO_INPUT &
+        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
-			~ENGINE_CMD_FLAG_INTERNAL;
+    if (flags) {
-	if(flags)
+        if (started)
-		{
+            BIO_printf(bio_out, "|");
-		if(started) BIO_printf(bio_out, "|");
         BIO_printf(bio_out, "<0x%04X>", flags);
     }
     if (err)
@@ -191,7 +182,8 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
     return 1;
 }
 
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
+                        const char *indent)
 {
     static const int line_wrap = 78;
     int num;
@@ -200,18 +192,17 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
     char *desc = NULL;
     int flags;
     int xpos = 0;
-	STACK_OF(STRING) *cmds = NULL;
+    STACK_OF(OPENSSL_STRING) *cmds = NULL;
     if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
         ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-					0, NULL, NULL)) <= 0))
+                            0, NULL, NULL)) <= 0)) {
-		{
 # if 0
         BIO_printf(bio_out, "%s<no control commands>\n", indent);
 # endif
         return 1;
     }
 
-	cmds = sk_STRING_new_null();
+    cmds = sk_OPENSSL_STRING_new_null();
 
     if (!cmds)
         goto err;
@@ -221,8 +212,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
         if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
                                  NULL, NULL)) < 0)
             goto err;
-                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
+        if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
-                        {
             /* Get the command name */
             if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
                                    NULL, NULL)) <= 0)
@@ -236,8 +226,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
             if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
                                    NULL, NULL)) < 0)
                 goto err;
-                        if(len > 0)
+            if (len > 0) {
-                                {
                 if ((desc = OPENSSL_malloc(len + 1)) == NULL)
                     goto err;
                 if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
@@ -251,71 +240,68 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
             else
                 /* Otherwise prepend a ", " */
                 xpos += BIO_printf(bio_out, ", ");
-                        if(verbose == 1)
+            if (verbose == 1) {
-                                {
+                /*
-                                /* We're just listing names, comma-delimited */
+                 * We're just listing names, comma-delimited
+                 */
                 if ((xpos > (int)strlen(indent)) &&
-					(xpos + (int)strlen(name) > line_wrap))
+                    (xpos + (int)strlen(name) > line_wrap)) {
-                                        {
                     BIO_printf(bio_out, "\n");
                     xpos = BIO_puts(bio_out, indent);
                 }
                 xpos += BIO_printf(bio_out, "%s", name);
-                                }
+            } else {
-                        else
-                                {
                 /* We're listing names plus descriptions */
                 BIO_printf(bio_out, "%s: %s\n", name,
                            (desc == NULL) ? "<no description>" : desc);
                 /* ... and sometimes input flags */
-                                if((verbose >= 3) && !util_flags(bio_out, flags,
+                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
-                                        indent))
                     goto err;
                 xpos = 0;
             }
         }
-		OPENSSL_free(name); name = NULL;
+        OPENSSL_free(name);
-		if(desc) { OPENSSL_free(desc); desc = NULL; }
+        name = NULL;
+        if (desc) {
+            OPENSSL_free(desc);
+            desc = NULL;
+        }
         /* Move to the next command */
-		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
+        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
-					num, NULL, NULL);
     } while (num > 0);
     if (xpos > 0)
         BIO_printf(bio_out, "\n");
     ret = 1;
  err:
-	if(cmds) sk_STRING_pop_free(cmds, identity);
+    if (cmds)
-	if(name) OPENSSL_free(name);
+        sk_OPENSSL_STRING_pop_free(cmds, identity);
-	if(desc) OPENSSL_free(desc);
+    if (name)
+        OPENSSL_free(name);
+    if (desc)
+        OPENSSL_free(desc);
     return ret;
 }
 
-static void util_do_cmds(ENGINE *e, STACK_OF(STRING) *cmds, BIO *bio_out,
+static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
-			 const char *indent)
+                         BIO *bio_out, const char *indent)
 {
-	int loop, res, num = sk_STRING_num(cmds);
+    int loop, res, num = sk_OPENSSL_STRING_num(cmds);
 
-	if(num < 0)
+    if (num < 0) {
-		{
         BIO_printf(bio_out, "[Error]: internal stack error\n");
         return;
     }
-	for(loop = 0; loop < num; loop++)
+    for (loop = 0; loop < num; loop++) {
-		{
         char buf[256];
         const char *cmd, *arg;
-		cmd = sk_STRING_value(cmds, loop);
+        cmd = sk_OPENSSL_STRING_value(cmds, loop);
         res = 1;                /* assume success */
         /* Check if this command has no ":arg" */
-		if((arg = strstr(cmd, ":")) == NULL)
+        if ((arg = strstr(cmd, ":")) == NULL) {
-			{
             if (!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
                 res = 0;
-			}
+        } else {
-		else
+            if ((int)(arg - cmd) > 254) {
-			{
-			if((int)(arg - cmd) > 254)
-				{
                 BIO_printf(bio_out, "[Error]: command name too long\n");
                 return;
             }
@@ -328,8 +314,7 @@ static void util_do_cmds(ENGINE *e, STACK_OF(STRING) *cmds, BIO *bio_out,
         }
         if (res)
             BIO_printf(bio_out, "[Success]: %s\n", cmd);
-		else
+        else {
-			{
             BIO_printf(bio_out, "[Failure]: %s\n", cmd);
             ERR_print_errors(bio_out);
         }
@@ -344,9 +329,9 @@ int MAIN(int argc, char **argv)
     const char **pp;
     int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
     ENGINE *e;
-	STACK_OF(STRING) *engines = sk_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
-	STACK_OF(STRING) *pre_cmds = sk_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
-	STACK_OF(STRING) *post_cmds = sk_STRING_new_null();
+    STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
     int badops = 1;
     BIO *bio_out = NULL;
     const char *indent = "     ";
@@ -369,44 +354,37 @@ int MAIN(int argc, char **argv)
 
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strncmp(*argv, "-v", 2) == 0) {
-		if (strncmp(*argv,"-v",2) == 0)
-			{
             if (strspn(*argv + 1, "v") < strlen(*argv + 1))
                 goto skip_arg_loop;
             if ((verbose = strlen(*argv + 1)) > 4)
                 goto skip_arg_loop;
-			}
+        } else if (strcmp(*argv, "-c") == 0)
-		else if (strcmp(*argv,"-c") == 0)
             list_cap = 1;
-		else if (strncmp(*argv,"-t",2) == 0)
+        else if (strncmp(*argv, "-t", 2) == 0) {
-			{
             test_avail = 1;
             if (strspn(*argv + 1, "t") < strlen(*argv + 1))
                 goto skip_arg_loop;
             if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
                 goto skip_arg_loop;
-			}
+        } else if (strcmp(*argv, "-pre") == 0) {
-		else if (strcmp(*argv,"-pre") == 0)
+            argc--;
-			{
+            argv++;
-			argc--; argv++;
             if (argc == 0)
                 goto skip_arg_loop;
-			sk_STRING_push(pre_cmds,*argv);
+            sk_OPENSSL_STRING_push(pre_cmds, *argv);
-			}
+        } else if (strcmp(*argv, "-post") == 0) {
-		else if (strcmp(*argv,"-post") == 0)
+            argc--;
-			{
+            argv++;
-			argc--; argv++;
             if (argc == 0)
                 goto skip_arg_loop;
-			sk_STRING_push(post_cmds,*argv);
+            sk_OPENSSL_STRING_push(post_cmds, *argv);
-			}
+        } else if ((strncmp(*argv, "-h", 2) == 0) ||
-		else if ((strncmp(*argv,"-h",2) == 0) ||
                    (strcmp(*argv, "-?") == 0))
             goto skip_arg_loop;
         else
-			sk_STRING_push(engines,*argv);
+            sk_OPENSSL_STRING_push(engines, *argv);
         argc--;
         argv++;
     }
@@ -414,37 +392,32 @@ int MAIN(int argc, char **argv)
     badops = 0;
  skip_arg_loop:
 
-	if (badops)
+    if (badops) {
-		{
         for (pp = engine_usage; (*pp != NULL); pp++)
             BIO_printf(bio_err, "%s", *pp);
         goto end;
     }
 
-	if (sk_STRING_num(engines) == 0)
+    if (sk_OPENSSL_STRING_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_OPENSSL_STRING_push(engines, (char *)ENGINE_get_id(e));
-			{
-			sk_STRING_push(engines,(char *)ENGINE_get_id(e));
         }
     }
 
-	for (i=0; i<sk_STRING_num(engines); i++)
+    for (i = 0; i < sk_OPENSSL_STRING_num(engines); i++) {
-		{
+        const char *id = sk_OPENSSL_STRING_value(engines, i);
-		const char *id = sk_STRING_value(engines,i);
+        if ((e = ENGINE_by_id(id)) != NULL) {
-		if ((e = ENGINE_by_id(id)) != NULL)
-			{
             const char *name = ENGINE_get_name(e);
-			/* Do "id" first, then "name". Easier to auto-parse. */
+            /*
+             * Do "id" first, then "name". Easier to auto-parse.
+             */
             BIO_printf(bio_out, "(%s) %s\n", id, name);
             util_do_cmds(e, pre_cmds, bio_out, indent);
-			if (strcmp(ENGINE_get_id(e), id) != 0)
+            if (strcmp(ENGINE_get_id(e), id) != 0) {
-				{
                 BIO_printf(bio_out, "Loaded: (%s) %s\n",
                            ENGINE_get_id(e), ENGINE_get_name(e));
             }
-			if (list_cap)
+            if (list_cap) {
-				{
                 int cap_size = 256;
                 char *cap_buf = NULL;
                 int k, n;
@@ -454,49 +427,45 @@ skip_arg_loop:
                 ENGINE_PKEY_METHS_PTR fn_pk;
 
                 if (ENGINE_get_RSA(e) != NULL
-					&& !append_buf(&cap_buf, "RSA",
+                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_DSA(e) != NULL
-					&& !append_buf(&cap_buf, "DSA",
+                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_DH(e) != NULL
-					&& !append_buf(&cap_buf, "DH",
+                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
                 if (ENGINE_get_RAND(e) != NULL
-					&& !append_buf(&cap_buf, "RAND",
+                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
-						&cap_size, 256))
                     goto end;
 
                 fn_c = ENGINE_get_ciphers(e);
-				if(!fn_c) goto skip_ciphers;
+                if (!fn_c)
+                    goto skip_ciphers;
                 n = fn_c(e, NULL, &nids, 0);
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						       &cap_size, 256))
                         goto end;
 
  skip_ciphers:
                 fn_d = ENGINE_get_digests(e);
-				if(!fn_d) goto skip_digests;
+                if (!fn_d)
+                    goto skip_digests;
                 n = fn_d(e, NULL, &nids, 0);
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						       &cap_size, 256))
                         goto end;
 
  skip_digests:
                 fn_pk = ENGINE_get_pkey_meths(e);
-				if(!fn_pk) goto skip_pmeths;
+                if (!fn_pk)
+                    goto skip_pmeths;
                 n = fn_pk(e, NULL, &nids, 0);
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
+                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
-						       &cap_size, 256))
                         goto end;
  skip_pmeths:
                 if (cap_buf && (*cap_buf != '\0'))
@@ -504,17 +473,13 @@ skip_pmeths:
 
                 OPENSSL_free(cap_buf);
             }
-			if(test_avail)
+            if (test_avail) {
-				{
                 BIO_printf(bio_out, "%s", indent);
-				if (ENGINE_init(e))
+                if (ENGINE_init(e)) {
-					{
                     BIO_printf(bio_out, "[ available ]\n");
                     util_do_cmds(e, post_cmds, bio_out, indent);
                     ENGINE_finish(e);
-					}
+                } else {
-				else
-					{
                     BIO_printf(bio_out, "[ unavailable ]\n");
                     if (test_avail_noise)
                         ERR_print_errors_fp(stdout);
@@ -524,8 +489,7 @@ skip_pmeths:
             if ((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
                 goto end;
             ENGINE_free(e);
-			}
+        } else
-		else
             ERR_print_errors(bio_err);
     }
 
@@ -533,10 +497,11 @@ skip_pmeths:
  end:
 
     ERR_print_errors(bio_err);
-	sk_STRING_pop_free(engines, identity);
+    sk_OPENSSL_STRING_pop_free(engines, identity);
-	sk_STRING_pop_free(pre_cmds, identity);
+    sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
-	sk_STRING_pop_free(post_cmds, identity);
+    sk_OPENSSL_STRING_pop_free(post_cmds, identity);
-	if (bio_out != NULL) BIO_free_all(bio_out);
+    if (bio_out != NULL)
+        BIO_free_all(bio_out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/errstr.c

@@ -84,40 +84,33 @@ int MAIN(int argc, char **argv)
 
     SSL_load_error_strings();
 
-	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
+    if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
-		{
         BIO *out = NULL;
 
         out = BIO_new(BIO_s_file());
-		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
+        if ((out != NULL) && BIO_set_fp(out, stdout, BIO_NOCLOSE)) {
-			{
 #ifdef OPENSSL_SYS_VMS
             {
                 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                 out = BIO_push(tmpbio, out);
             }
 #endif
-			lh_ERR_STRING_DATA_node_stats_bio(
+            lh_ERR_STRING_DATA_node_stats_bio(ERR_get_string_table(), out);
-						  ERR_get_string_table(), out);
+            lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(), out);
-			lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(),
+            lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
                                                     out);
-			lh_ERR_STRING_DATA_node_usage_stats_bio(
-						    ERR_get_string_table(),out);
         }
-		if (out != NULL) BIO_free_all(out);
+        if (out != NULL)
+            BIO_free_all(out);
         argc--;
         argv++;
     }
 
-	for (i=1; i<argc; i++)
+    for (i = 1; i < argc; i++) {
-		{
+        if (sscanf(argv[i], "%lx", &l)) {
-		if (sscanf(argv[i],"%lx",&l))
-			{
             ERR_error_string_n(l, buf, sizeof buf);
             printf("%s\n", buf);
-			}
+        } else {
-		else
-			{
             printf("%s: bad error code\n", argv[i]);
             printf("usage: errstr [-stats] <errno> ...\n");
             ret++;

apps/gendh.c

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

apps/gendsa.c

@@ -78,9 +78,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     DSA *dsa = NULL;
     int ret = 1;
     char *outfile = NULL;
@@ -103,32 +100,30 @@ int MAIN(int argc, char **argv)
 
     argv++;
     argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-passout") == 0) {
-		else if (strcmp(*argv,"-passout") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             passargout = *(++argv);
         }
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
-			}
+        } else if (strcmp(*argv, "-") == 0)
-		else if (strcmp(*argv,"-") == 0)
             goto bad;
 # ifndef OPENSSL_NO_DES
         else if (strcmp(*argv, "-des") == 0)
@@ -160,53 +155,59 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-camellia256") == 0)
             enc = EVP_camellia_256_cbc();
 # endif
-		else if (**argv != '-' && dsaparams == NULL)
+        else if (**argv != '-' && dsaparams == NULL) {
-			{
             dsaparams = *argv;
-			}
+        } else
-		else
             goto bad;
         argv++;
         argc--;
     }
 
-	if (dsaparams == NULL)
+    if (dsaparams == NULL) {
-		{
  bad:
         BIO_printf(bio_err, "usage: gendsa [args] dsaparam-file\n");
         BIO_printf(bio_err, " -out file - output the key to 'file'\n");
 # ifndef OPENSSL_NO_DES
-		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+                   " -des      - encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 # endif
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
 # endif
 # ifndef OPENSSL_NO_SEED
         BIO_printf(bio_err, " -seed\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc seed\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
         BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\n");
 # endif
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e - use engine e, possibly a hardware device.\n");
 # endif
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "           - load the file (or the files in the directory) into\n");
         BIO_printf(bio_err, "             the random number generator\n");
         BIO_printf(bio_err, " dsaparam-file\n");
-		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
+        BIO_printf(bio_err,
+                   "           - a DSA parameter file as generated by the dsaparam command\n");
         goto end;
     }
-
 # ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 # endif
 
     if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
@@ -214,16 +215,13 @@ bad:
         goto end;
     }
 
-
     in = BIO_new(BIO_s_file());
-	if (!(BIO_read_filename(in,dsaparams)))
+    if (!(BIO_read_filename(in, dsaparams))) {
-		{
         perror(dsaparams);
         goto end;
     }
 
-	if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
+    if ((dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL)) == NULL) {
-		{
         BIO_printf(bio_err, "unable to load DSA parameter file\n");
         goto end;
     }
@@ -231,10 +229,10 @@ bad:
     in = NULL;
 
     out = BIO_new(BIO_s_file());
-	if (out == NULL) goto end;
+    if (out == NULL)
+        goto end;
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -242,27 +240,24 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
     }
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
+    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
-		{
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                   "warning, not much extra random data, consider using the -rand option\n");
     }
     if (inrand != NULL)
         BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                    app_RAND_load_files(inrand));
 
-	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
+    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
-							BN_num_bits(dsa->p));
+    if (!DSA_generate_key(dsa))
-	if (!DSA_generate_key(dsa)) goto end;
+        goto end;
 
     app_RAND_write_file(NULL, bio_err);
 
@@ -272,11 +267,21 @@ bad:
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
-	if (in != NULL) BIO_free(in);
+    if (in != NULL)
-	if (out != NULL) BIO_free_all(out);
+        BIO_free(in);
-	if (dsa != NULL) DSA_free(dsa);
+    if (out != NULL)
-	if(passout) OPENSSL_free(passout);
+        BIO_free_all(out);
+    if (dsa != NULL)
+        DSA_free(dsa);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
+#else                           /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy = &dummy;
+# endif
+
 #endif

apps/genpkey.c

@@ -1,6 +1,7 @@
 /* apps/genpkey.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -101,32 +102,26 @@ int MAIN(int argc, char **argv)
     ERR_load_crypto_strings();
     OpenSSL_add_all_algorithms();
     args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-outform")) {
-		if (!strcmp(*args,"-outform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outformat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-pass")) {
-		else if (!strcmp(*args,"-pass"))
+            if (!args[1])
-			{
+                goto bad;
-			if (!args[1]) goto bad;
             passarg = *(++args);
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
             if (!args[1])
                 goto bad;
             e = setup_engine(bio_err, *(++args), 0);
         }
 #endif
-		else if (!strcmp (*args, "-paramfile"))
+        else if (!strcmp(*args, "-paramfile")) {
-			{
             if (!args[1])
                 goto bad;
             args++;
@@ -134,54 +129,38 @@ int MAIN(int argc, char **argv)
                 goto bad;
             if (!init_keygen_file(bio_err, &ctx, *args, e))
                 goto end;
-			}
+        } else if (!strcmp(*args, "-out")) {
-		else if (!strcmp (*args, "-out"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (strcmp(*args, "-algorithm") == 0) {
-		else if (strcmp(*args,"-algorithm") == 0)
-			{
             if (!args[1])
                 goto bad;
             if (!init_gen_str(bio_err, &ctx, *(++args), e, do_param))
                 goto end;
-			}
+        } else if (strcmp(*args, "-pkeyopt") == 0) {
-		else if (strcmp(*args,"-pkeyopt") == 0)
-			{
             if (!args[1])
                 goto bad;
-			if (!ctx)
+            if (!ctx) {
-				{
                 BIO_puts(bio_err, "No keytype specified\n");
                 goto bad;
-				}
+            } else if (pkey_ctrl_string(ctx, *(++args)) <= 0) {
-			else if (pkey_ctrl_string(ctx, *(++args)) <= 0)
-				{
                 BIO_puts(bio_err, "parameter setting error\n");
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else if (strcmp(*args, "-genparam") == 0) {
-		else if (strcmp(*args,"-genparam") == 0)
-			{
             if (ctx)
                 goto bad;
             do_param = 1;
-			}
+        } else if (strcmp(*args, "-text") == 0)
-		else if (strcmp(*args,"-text") == 0)
             text = 1;
-		else
+        else {
-			{
             cipher = EVP_get_cipherbyname(*args + 1);
-			if (!cipher)
+            if (!cipher) {
-				{
+                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
-				BIO_printf(bio_err, "Unknown cipher %s\n",
-								*args + 1);
                 badarg = 1;
             }
             if (do_param == 1)
@@ -193,45 +172,45 @@ int MAIN(int argc, char **argv)
     if (!ctx)
         badarg = 1;
 
-	if (badarg)
+    if (badarg) {
-		{
  bad:
         BIO_printf(bio_err, "Usage: genpkey [options]\n");
         BIO_printf(bio_err, "where options may be\n");
         BIO_printf(bio_err, "-out file          output file\n");
-		BIO_printf(bio_err, "-outform X         output format (DER or PEM)\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-pass arg          output file pass phrase source\n");
+                   "-outform X         output format (DER or PEM)\n");
-		BIO_printf(bio_err, "-<cipher>          use cipher <cipher> to encrypt the key\n");
+        BIO_printf(bio_err,
+                   "-pass arg          output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-<cipher>          use cipher <cipher> to encrypt the key\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e          use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e          use engine e, possibly a hardware device.\n");
 #endif
         BIO_printf(bio_err, "-paramfile file    parameters file\n");
         BIO_printf(bio_err, "-algorithm alg     the public key algorithm\n");
-		BIO_printf(bio_err, "-pkeyopt opt:value set the public key algorithm option <opt>\n"
+        BIO_printf(bio_err,
+                   "-pkeyopt opt:value set the public key algorithm option <opt>\n"
                    "                   to value <value>\n");
-		BIO_printf(bio_err, "-genparam          generate parameters, not key\n");
+        BIO_printf(bio_err,
+                   "-genparam          generate parameters, not key\n");
         BIO_printf(bio_err, "-text              print the in text\n");
-		BIO_printf(bio_err, "NB: options order may be important!  See the manual page.\n");
+        BIO_printf(bio_err,
+                   "NB: options order may be important!  See the manual page.\n");
         goto end;
     }
 
-	if (!app_passwd(bio_err, passarg, NULL, &pass, NULL))
+    if (!app_passwd(bio_err, passarg, NULL, &pass, NULL)) {
-		{
         BIO_puts(bio_err, "Error getting password\n");
         goto end;
     }
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open output file %s\n", outfile);
             goto end;
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -244,19 +223,14 @@ int MAIN(int argc, char **argv)
     EVP_PKEY_CTX_set_cb(ctx, genpkey_cb);
     EVP_PKEY_CTX_set_app_data(ctx, bio_err);
 
-	if (do_param)
+    if (do_param) {
-		{
+        if (EVP_PKEY_paramgen(ctx, &pkey) <= 0) {
-		if (EVP_PKEY_paramgen(ctx, &pkey) <= 0)
-			{
             BIO_puts(bio_err, "Error generating parameters\n");
             ERR_print_errors(bio_err);
             goto end;
         }
-		}
+    } else {
-	else
+        if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
-		{
-		if (EVP_PKEY_keygen(ctx, &pkey) <= 0)
-			{
             BIO_puts(bio_err, "Error generating key\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -266,31 +240,26 @@ int MAIN(int argc, char **argv)
     if (do_param)
         rv = PEM_write_bio_Parameters(out, pkey);
     else if (outformat == FORMAT_PEM)
-		rv = PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0,
+        rv = PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0, NULL, pass);
-								NULL, pass);
     else if (outformat == FORMAT_ASN1)
         rv = i2d_PrivateKey_bio(out, pkey);
-	else
+    else {
-		{
         BIO_printf(bio_err, "Bad format specified for key\n");
         goto end;
     }
 
-	if (rv <= 0)
+    if (rv <= 0) {
-		{
         BIO_puts(bio_err, "Error writing key\n");
         ERR_print_errors(bio_err);
     }
 
-	if (text)
+    if (text) {
-		{
         if (do_param)
             rv = EVP_PKEY_print_params(out, pkey, 0, NULL);
         else
             rv = EVP_PKEY_print_private(out, pkey, 0, NULL);
 
-		if (rv <= 0)
+        if (rv <= 0) {
-			{
             BIO_puts(bio_err, "Error printing key\n");
             ERR_print_errors(bio_err);
         }
@@ -318,15 +287,13 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
     BIO *pbio;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
-	if (*pctx)
+    if (*pctx) {
-		{
         BIO_puts(err, "Parameters already set!\n");
         return 0;
     }
 
     pbio = BIO_new_file(file, "r");
-	if (!pbio)
+    if (!pbio) {
-		{
         BIO_printf(err, "Can't open parameter file %s\n", file);
         return 0;
     }
@@ -334,8 +301,7 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
     pkey = PEM_read_bio_Parameters(pbio, NULL);
     BIO_free(pbio);
 
-	if (!pkey)
+    if (!pkey) {
-		{
         BIO_printf(bio_err, "Error reading parameter file %s\n", file);
         return 0;
     }
@@ -368,8 +334,7 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
     ENGINE *tmpeng = NULL;
     int pkey_id;
 
-	if (*pctx)
+    if (*pctx) {
-		{
         BIO_puts(err, "Algorithm already set!\n");
         return 0;
     }
@@ -381,8 +346,7 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
         ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
 #endif
 
-	if (!ameth)
+    if (!ameth) {
-		{
         BIO_printf(bio_err, "Algorithm %s not found\n", algname);
         return 0;
     }
@@ -398,13 +362,10 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
 
     if (!ctx)
         goto err;
-	if (do_param)
+    if (do_param) {
-		{
         if (EVP_PKEY_paramgen_init(ctx) <= 0)
             goto err;
-		}
+    } else {
-	else
-		{
         if (EVP_PKEY_keygen_init(ctx) <= 0)
             goto err;
     }
@@ -427,14 +388,15 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx)
     BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
     int p;
     p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
+    if (p == 2)
+        c = '*';
+    if (p == 3)
+        c = '\n';
     BIO_write(b, &c, 1);
     (void)BIO_flush(b);
-#ifdef LINT
-	p=n;
-#endif
     return 1;
 }

apps/genrsa.c

@@ -57,11 +57,6 @@
  */
 
 #include <openssl/opensslconf.h>
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
 
 #ifndef OPENSSL_NO_RSA
 # include <stdio.h>
@@ -78,39 +73,45 @@
 # include <openssl/pem.h>
 # include <openssl/rand.h>
 
-#define DEFBITS	512
+# define DEFBITS 2048
 # undef PROG
 # define PROG genrsa_main
 
-static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
+static int 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 = NULL;
 # ifndef OPENSSL_NO_ENGINE
     ENGINE *e = NULL;
 # endif
     int ret = 1;
-	int i,num=DEFBITS;
+    int non_fips_allow = 0;
-	long l;
+    int num = DEFBITS;
     const EVP_CIPHER *enc = NULL;
     unsigned long f4 = RSA_F4;
     char *outfile = NULL;
     char *passargout = NULL, *passout = NULL;
+    char *hexe, *dece;
 # ifndef OPENSSL_NO_ENGINE
     char *engine = NULL;
 # endif
     char *inrand = NULL;
     BIO *out = NULL;
     BIGNUM *bn = BN_new();
-	RSA *rsa = RSA_new();
+    RSA *rsa = NULL;
+    if (!bn)
+        goto err;
 
-	if(!bn || !rsa) goto err;
+    cb = BN_GENCB_new();
+    if (!cb)
+        goto err;
 
     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 = BIO_new(BIO_s_file())) != NULL)
@@ -118,36 +119,34 @@ int MAIN(int argc, char **argv)
 
     if (!load_config(bio_err, NULL))
         goto err;
-	if ((out=BIO_new(BIO_s_file())) == NULL)
+    if ((out = BIO_new(BIO_s_file())) == NULL) {
-		{
         BIO_printf(bio_err, "unable to create BIO for output\n");
         goto err;
     }
 
     argv++;
     argc--;
-	for (;;)
+    for (;;) {
-		{
+        if (argc <= 0)
-		if (argc <= 0) break;
+            break;
-		if (strcmp(*argv,"-out") == 0)
+        if (strcmp(*argv, "-out") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-3") == 0)
-		else if (strcmp(*argv,"-3") == 0)
             f4 = 3;
         else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
             f4 = RSA_F4;
 # ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 # endif
-		else if (strcmp(*argv,"-rand") == 0)
+        else if (strcmp(*argv, "-rand") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             inrand = *(++argv);
         }
 # ifndef OPENSSL_NO_DES
@@ -180,46 +179,57 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-camellia256") == 0)
             enc = EVP_camellia_256_cbc();
 # endif
-		else if (strcmp(*argv,"-passout") == 0)
+        else if (strcmp(*argv, "-passout") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             passargout = *(++argv);
-			}
+        } else if (strcmp(*argv, "-non-fips-allow") == 0)
+            non_fips_allow = 1;
         else
             break;
         argv++;
         argc--;
     }
-	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
+    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
-		{
  bad:
         BIO_printf(bio_err, "usage: genrsa [args] [numbits]\n");
-		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
+                   " -des            encrypt the generated key with DES in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 # ifndef OPENSSL_NO_IDEA
-		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
+        BIO_printf(bio_err,
+                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
 # endif
 # ifndef OPENSSL_NO_SEED
         BIO_printf(bio_err, " -seed\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc seed\n");
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
         BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
-		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+        BIO_printf(bio_err,
+                   "                 encrypt PEM output with cbc camellia\n");
 # endif
         BIO_printf(bio_err, " -out file       output the key to 'file\n");
-		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
+                   " -passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   " -f4             use F4 (0x10001) for the E value\n");
         BIO_printf(bio_err, " -3              use 3 for the E value\n");
 # ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 # endif
-		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "                 load the file (or the files in the directory) into\n");
         BIO_printf(bio_err, "                 the random number generator\n");
         goto err;
     }
@@ -230,13 +240,11 @@ bad:
         BIO_printf(bio_err, "Error getting password\n");
         goto err;
     }
-
 # ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 # endif
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
         {
@@ -244,20 +252,17 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 # endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto err;
         }
     }
 
     if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-		&& !RAND_status())
+        && !RAND_status()) {
-		{
+        BIO_printf(bio_err,
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+                   "warning, not much extra random data, consider using the -rand option\n");
     }
     if (inrand != NULL)
         BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
@@ -265,58 +270,73 @@ bad:
 
     BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
                num);
+# ifdef OPENSSL_NO_ENGINE
+    rsa = RSA_new();
+# else
+    rsa = RSA_new_method(e);
+# endif
+    if (!rsa)
+        goto err;
 
-	if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+    if (non_fips_allow)
+        rsa->flags |= RSA_FLAG_NON_FIPS_ALLOW;
+
+    if (!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, cb))
         goto err;
 
     app_RAND_write_file(NULL, bio_err);
 
-	/* We need to do the following for when the base number size is <
+    hexe = BN_bn2hex(rsa->e);
-	 * long, esp windows 3.1 :-(. */
+    dece = BN_bn2dec(rsa->e);
-	l=0L;
+    if (hexe && dece) {
-	for (i=0; i<rsa->e->top; i++)
+        BIO_printf(bio_err, "e is %s (0x%s)\n", dece, hexe);
-		{
-#ifndef SIXTY_FOUR_BIT
-		l<<=BN_BITS4;
-		l<<=BN_BITS4;
-#endif
-		l+=rsa->e->d[i];
     }
-	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
+    if (hexe)
+        OPENSSL_free(hexe);
+    if (dece)
+        OPENSSL_free(dece);
     {
         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))
+                                         (pem_password_cb *)password_callback,
+                                         &cb_data))
             goto err;
     }
 
     ret = 0;
  err:
-	if (bn) BN_free(bn);
+    if (bn)
-	if (rsa) RSA_free(rsa);
+        BN_free(bn);
-	if (out) BIO_free_all(out);
+    if (cb)
-	if(passout) OPENSSL_free(passout);
+        BN_GENCB_free(cb);
+    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)
+static int genrsa_cb(int p, int n, BN_GENCB *cb)
 {
     char c = '*';
 
-	if (p == 0) c='.';
+    if (p == 0)
-	if (p == 1) c='+';
+        c = '.';
-	if (p == 2) c='*';
+    if (p == 1)
-	if (p == 3) c='\n';
+        c = '+';
-	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(BN_GENCB_get_arg(cb), &c, 1);
+    (void)BIO_flush(BN_GENCB_get_arg(cb));
     return 1;
 }
 #else                           /* !OPENSSL_NO_RSA */

apps/install-apps.com

@@ -0,0 +1,107 @@
+$! INSTALL.COM -- Installs the files in a given directory tree
+$!
+$! Author: Richard Levitte <richard@levitte.org>
+$! Time of creation: 22-MAY-1998 10:13
+$!
+$! P1  root of the directory tree
+$! P2  "64" for 64-bit pointers.
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on error then goto tidy
+$ on control_c then goto tidy
+$!
+$ if (p1 .eqs. "")
+$ then
+$   write sys$output "First argument missing."
+$   write sys$output -
+     "It 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
+$!
+$ archd = arch
+$!
+$ if (p2 .nes. "")
+$ then
+$   if (p2 .eqs. "64")
+$   then
+$     archd = arch+ "_64"
+$   else
+$     if (p2 .nes. "32")
+$     then
+$       write sys$output "Second argument invalid."
+$       write sys$output "It should be "32", "64", or nothing."
+$       exit
+$     endif
+$   endif
+$ 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") - -
+   "[000000." - "][" - "[" - "]"
+$ root = root_dev + "[" + root_dir
+$!
+$ define /nolog wrk_sslroot 'root'.] /trans=conc
+$ define /nolog wrk_sslxexe wrk_sslroot:['archd'_exe]
+$!
+$ if f$parse("wrk_sslroot:[000000]") .eqs. "" then -
+   create /directory /log wrk_sslroot:[000000]
+$ if f$parse("wrk_sslxexe:") .eqs. "" then -
+   create /directory /log wrk_sslxexe:
+$!
+$ exe := openssl
+$!
+$ exe_dir := [-.'archd'.exe.apps]
+$!
+$! Executables.
+$!
+$ i = 0
+$ loop_exe:
+$   e = f$edit(f$element( i, ",", exe), "trim")
+$   i = i + 1
+$   if e .eqs. "," then goto loop_exe_end
+$   set noon
+$   file = exe_dir+ e+ ".exe"
+$   if f$search( file) .nes. ""
+$   then
+$     copy /protection = w:re 'file' wrk_sslxexe: /log
+$   endif
+$   set on
+$ goto loop_exe
+$ loop_exe_end:
+$!
+$! Miscellaneous.
+$!
+$ set noon
+$ copy /protection = w:re ca.com wrk_sslxexe:ca.com /log
+$ copy /protection = w:re openssl-vms.cnf wrk_sslroot:[000000]openssl.cnf /log
+$ set on
+$!
+$ tidy:
+$!
+$ call deass wrk_sslroot
+$ call deass wrk_sslxexe
+$!
+$ exit
+$!
+$ deass: subroutine
+$ if (f$trnlnm( p1, "LNM$PROCESS") .nes. "")
+$ then
+$   deassign /process 'p1'
+$ endif
+$ endsubroutine
+$!

apps/install.com

@@ -1,69 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! 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."
-$	    EXIT
-$	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") -
-		   - "[000000." - "][" - "[" - "]"
-$	ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$	DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$	DEFINE/NOLOG WRK_SSLVEXE WRK_SSLROOT:[VAX_EXE]
-$	DEFINE/NOLOG WRK_SSLAEXE WRK_SSLROOT:[ALPHA_EXE]
-$	DEFINE/NOLOG WRK_SSLLIB WRK_SSLROOT:[LIB]
-$
-$	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$	IF F$PARSE("WRK_SSLVEXE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLVEXE:
-$	IF F$PARSE("WRK_SSLAEXE:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLAEXE:
-$	IF F$PARSE("WRK_SSLLIB:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLLIB:
-$
-$	EXE := openssl
-$
-$	VEXE_DIR := [-.VAX.EXE.APPS]
-$	AEXE_DIR := [-.AXP.EXE.APPS]
-$
-$	I = 0
-$ LOOP_EXE: 
-$	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. ""
-$	THEN
-$	  COPY 'VEXE_DIR''E'.EXE WRK_SSLVEXE:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLVEXE:'E'.EXE
-$	ENDIF
-$	IF F$SEARCH(AEXE_DIR+E+".EXE") .NES. ""
-$	THEN
-$	  COPY 'AEXE_DIR''E'.EXE WRK_SSLAEXE:'E'.EXE/log
-$	  SET FILE/PROT=W:RE WRK_SSLAEXE:'E'.EXE
-$	ENDIF
-$	SET ON
-$	GOTO LOOP_EXE
-$ LOOP_EXE_END:
-$
-$	SET NOON
-$	COPY CA.COM WRK_SSLAEXE:CA.COM/LOG
-$	SET FILE/PROT=W:RE WRK_SSLAEXE:CA.COM
-$	COPY CA.COM WRK_SSLVEXE:CA.COM/LOG
-$	SET FILE/PROT=W:RE WRK_SSLVEXE:CA.COM
-$	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
-$	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
-$	SET ON
-$
-$	EXIT

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.
@@ -24,7 +25,7 @@ $!	   VAXC	 For VAX C.
 $!	   DECC	 For DEC C.
 $!	   GNUC	 For GNU C.
 $!
-$!  If you don't speficy a compiler, it will try to determine which
+$!  If you don't specify a compiler, it will try to determine which
 $!  "C" compiler to use.
 $!
 $!  P3, if defined, sets a TCP/IP library to use, through one of the following
@@ -38,33 +39,63 @@ $!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
 $!  P5, if defined, sets a choice of programs to compile.
 $!
+$!  P6, if defined, specifies the C pointer size.  Ignored on VAX.
+$!      ("64=ARGV" gives more efficient code with HP C V7.3 or newer.)
+$!      Supported values are:
+$!
+$!      ""       Compile with default (/NOPOINTER_SIZE)
+$!      32       Compile with /POINTER_SIZE=32 (SHORT)
+$!      64       Compile with /POINTER_SIZE=64[=ARGV] (LONG[=ARGV])
+$!               (Automatically select ARGV if compiler supports it.)
+$!      64=      Compile with /POINTER_SIZE=64 (LONG).
+$!      64=ARGV  Compile with /POINTER_SIZE=64=ARGV (LONG=ARGV).
+$!
+$!  P7, if defined, specifies a directory where ZLIB files (zlib.h,
+$!  libz.olb) may be found.  Optionally, a non-default object library
+$!  name may be included ("dev:[dir]libz_64.olb", for example).
+$!
+$!
+$! Announce/identify.
+$!
+$ proc = f$environment( "procedure")
+$ write sys$output "@@@ "+ -
+   f$parse( proc, , , "name")+ f$parse( proc, , , "type")
+$!
+$ on control_c then goto exit
 $!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $! (That Is, If We Need To Link To One.)
 $!
 $ TCPIP_LIB = ""
+$ ZLIB_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.
 $!
 $ ENDIF
 $!
+$ ARCHD = ARCH
+$ LIB32 = "32"
+$ OPT_FILE = ""
+$ POINTER_SIZE = ""
+$!
 $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
@@ -73,25 +104,40 @@ $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
 $ GOSUB CHECK_OPTIONS
 $!
+$! Define The CRYPTO Library.
+$!
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO'LIB32'.OLB
+$!
+$! Define The SSL Library.
+$!
+$ SSL_LIB := SYS$DISK:[-.'ARCHD'.EXE.SSL]SSL_LIBSSL'LIB32'.OLB
+$!
+$! Define The OBJ and EXE Directories.
+$!
+$ OBJ_DIR := SYS$DISK:[-.'ARCHD'.OBJ.APPS]
+$ EXE_DIR := SYS$DISK:[-.'ARCHD'.EXE.APPS]
+$!
+$! Specify the destination directory in any /MAP option.
+$!
+$ if (LINKMAP .eqs. "MAP")
+$ then
+$   LINKMAP = LINKMAP+ "=''EXE_DIR'"
+$ endif
+$!
+$! Add the location prefix to the linker options file name.
+$!
+$ if (OPT_FILE .nes. "")
+$ then
+$   OPT_FILE = EXE_DIR+ OPT_FILE
+$ endif
+$!
 $! 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."
+$ WRITE SYS$OUTPUT "Host system architecture: ''ARCHD'"
-$!
-$! Define The CRYPTO Library.
-$!
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
-$!
-$! Define The SSL Library.
-$!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
-$!
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
 $!
 $! Check To See If The OBJ Directory Exists.
 $!
@@ -106,10 +152,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."")
@@ -132,6 +174,9 @@ $!
 $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The Application Files.
+$! NOTE: Some might think this list ugly.  However, it's made this way to
+$! reflect the E_OBJ variable in Makefile as closely as possible, thereby
+$! making it fairly easy to verify that the lists are the same.
 $!
 $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
 	     	"CA,PKCS7,CRL2P7,CRL,"+-
@@ -139,14 +184,17 @@ $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
 	      	"X509,GENRSA,GENDSA,GENPKEY,S_SERVER,S_CLIENT,SPEED,"+-
 	      	"S_TIME,APPS,S_CB,S_SOCKET,APP_RAND,VERSION,SESS_ID,"+-
 	      	"CIPHERS,NSEQ,PKCS12,PKCS8,PKEY,PKEYPARAM,PKEYUTL,"+ -
-	      	"SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS"
+	      	"SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS,SRP"
+$!
+$ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT"
+$!
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"
 $!
 $! Setup exceptional compilations
 $!
-$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
 $!
 $ PHASE := LIB
 $!
@@ -164,6 +212,10 @@ $!  Make The Application File Name
 $!
 $ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
 $!
+$!  Create The Executable File Name.
+$!
+$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
+$!
 $!  Check To See If We Are At The End Of The File List.
 $!
 $ IF (CURRENT_APP.EQS.",")
@@ -227,10 +279,6 @@ $!
 $!  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_LIB
 $!
 $!  Check To See If The File We Want To Compile Actually Exists.
@@ -284,34 +332,18 @@ $   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' -
+$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
+  'EXE_DIR''CURRENT_APP'.OPT /OPTIONS, -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+  'SSL_LIB' /LIBRARY, -
-        'TCPIP_LIB','OPT_FILE'/OPTION
+  'CRYPTO_LIB' /LIBRARY -
-$!
+  'TCPIP_LIB' -
-$! Else...
+  'ZLIB_LIB' -
-$!
+  ,'OPT_FILE' /OPTIONS
-$ ELSE
-$!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
-$!
-$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'EXE_DIR''CURRENT_APP'.OPT/OPTION, -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
-        'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$ ENDIF
 $!
 $! Go Back And Do It Again.
 $!
@@ -346,7 +378,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable VAX C Runtime Library.
 !
 SYS$SHARE:VAXCRTL.EXE/SHARE
@@ -375,7 +407,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable C Runtime Library.
 !
 GNU_CC:[000000]GCCLIB/LIBRARY
@@ -410,7 +442,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Agianst 
+! Default System Options File To Link Against 
 ! The Sharable DEC C Runtime Library.
 !
 SYS$SHARE:DECC$SHR.EXE/SHARE
@@ -420,19 +452,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 Against 
 ! 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
 $!
@@ -512,6 +544,7 @@ $!
 $!  P1 Is NODEBUG, So Compile Without Debugger Information.
 $!
 $   DEBUGGER  = "NODEBUG"
+$   LINKMAP = "NOMAP"
 $   TRACEBACK = "NOTRACEBACK" 
 $   GCC_OPTIMIZE = "OPTIMIZE"
 $   CC_OPTIMIZE = "OPTIMIZE"
@@ -530,6 +563,7 @@ $!
 $!    Compile With Debugger Information.
 $!
 $     DEBUGGER  = "DEBUG"
+$     LINKMAP = "MAP"
 $     TRACEBACK = "TRACEBACK"
 $     GCC_OPTIMIZE = "NOOPTIMIZE"
 $     CC_OPTIMIZE = "NOOPTIMIZE"
@@ -537,7 +571,7 @@ $     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."
 $     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."
 $   ELSE
 $!
-$!    Tell The User Entered An Invalid Option..
+$!    Tell The User Entered An Invalid Option.
 $!
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
@@ -550,7 +584,7 @@ $!    Time To EXIT.
 $!
 $     EXIT
 $!
-$!  End The Valid Arguement Check.
+$!  End The Valid Argument Check.
 $!
 $   ENDIF
 $!
@@ -558,6 +592,87 @@ $! End The P1 Check.
 $!
 $ ENDIF
 $!
+$! Check P6 (POINTER_SIZE).
+$!
+$ IF (P6 .NES. "") .AND. (ARCH .NES. "VAX")
+$ THEN
+$!
+$   IF (P6 .EQS. "32")
+$   THEN
+$     POINTER_SIZE = " /POINTER_SIZE=32"
+$   ELSE
+$     POINTER_SIZE = F$EDIT( P6, "COLLAPSE, UPCASE")
+$     IF ((POINTER_SIZE .EQS. "64") .OR. -
+       (POINTER_SIZE .EQS. "64=") .OR. -
+       (POINTER_SIZE .EQS. "64=ARGV"))
+$     THEN
+$       ARCHD = ARCH+ "_64"
+$       LIB32 = ""
+$       IF (F$EXTRACT( 2, 1, POINTER_SIZE) .EQS. "=")
+$       THEN
+$!        Explicit user choice: "64" or "64=ARGV".
+$         IF (POINTER_SIZE .EQS. "64=") THEN POINTER_SIZE = "64"
+$       ELSE
+$         SET NOON
+$         DEFINE /USER_MODE SYS$OUTPUT NL:
+$         DEFINE /USER_MODE SYS$ERROR NL:
+$         CC /NOLIST /NOOBJECT /POINTER_SIZE=64=ARGV NL:
+$         IF ($STATUS .AND. %X0FFF0000) .EQ. %X00030000
+$         THEN
+$           ! If we got here, it means DCL complained like this:
+$           ! %DCL-W-NOVALU, value not allowed - remove value specification
+$           !  \64=\
+$           !
+$           ! If the compiler was run, logicals defined in /USER would
+$           ! have been deassigned automatically.  However, when DCL
+$           ! complains, they aren't, so we do it here (it might be
+$           ! unnecessary, but just in case there will be another error
+$           ! message further on that we don't want to miss)
+$           DEASSIGN /USER_MODE SYS$ERROR
+$           DEASSIGN /USER_MODE SYS$OUTPUT
+$         ELSE
+$           POINTER_SIZE = POINTER_SIZE + "=ARGV"
+$         ENDIF
+$         SET ON
+$       ENDIF
+$       POINTER_SIZE = " /POINTER_SIZE=''POINTER_SIZE'"
+$!
+$     ELSE
+$!
+$!      Tell The User Entered An Invalid Option.
+$!
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", P6, -
+         " Is Invalid.  The Valid Options Are:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT -
+         "    """"  :  Compile with default (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    32  :  Compile with 32-bit (short) pointers."
+$       WRITE SYS$OUTPUT -
+         "    64       :  Compile with 64-bit (long) pointers (auto ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=      :  Compile with 64-bit (long) pointers (no ARGV)."
+$       WRITE SYS$OUTPUT -
+         "    64=ARGV  :  Compile with 64-bit (long) pointers (ARGV)."
+$       WRITE SYS$OUTPUT ""
+$! 
+$!      Time To EXIT.
+$!
+$       EXIT
+$!
+$     ENDIF
+$!
+$   ENDIF
+$!
+$! End The P6 (POINTER_SIZE) Check.
+$!
+$ ENDIF
+$!
+$! Set basic C compiler /INCLUDE directories.
+$!
+$ CC_INCLUDES = "SYS$DISK:[-],SYS$DISK:[-.CRYPTO]"
+$!
 $! Check To See If P2 Is Blank.
 $!
 $ IF (P2.EQS."")
@@ -581,7 +696,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.
@@ -658,11 +773,64 @@ $ CCDEFS = "MONOLITH"
 $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
 $ CCEXTRAFLAGS = ""
 $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
+$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
 $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
 	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 $!
-$!  Check To See If The User Entered A Valid Paramter.
+$! Check To See If We Have A ZLIB Option.
+$!
+$ ZLIB = P7
+$ IF (ZLIB .NES. "")
+$ THEN
+$!
+$!  Check for expected ZLIB files.
+$!
+$   err = 0
+$   file1 = f$parse( "zlib.h", ZLIB, , , "SYNTAX_ONLY")
+$   if (f$search( file1) .eqs. "")
+$   then
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     WRITE SYS$OUTPUT "    Can't find header: ''file1'"
+$     err = 1
+$   endif
+$   file1 = f$parse( "A.;", ZLIB)- "A.;"
+$!
+$   file2 = f$parse( ZLIB, "libz.olb", , , "SYNTAX_ONLY")
+$   if (f$search( file2) .eqs. "")
+$   then
+$     if (err .eq. 0)
+$     then
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ", ZLIB, " Is Invalid."
+$     endif
+$     WRITE SYS$OUTPUT "    Can't find library: ''file2'"
+$     WRITE SYS$OUTPUT ""
+$     err = err+ 2
+$   endif
+$   if (err .eq. 1)
+$   then
+$     WRITE SYS$OUTPUT ""
+$   endif
+$!
+$   if (err .ne. 0)
+$   then
+$     EXIT
+$   endif
+$!
+$   CCDEFS = """ZLIB=1"", "+ CCDEFS
+$   CC_INCLUDES = CC_INCLUDES+ ", "+ file1
+$   ZLIB_LIB = ", ''file2' /library"
+$!
+$!  Print info
+$!
+$   WRITE SYS$OUTPUT "ZLIB library spec: ", file2
+$!
+$! End The ZLIB Check.
+$!
+$ ENDIF
+$!
+$!  Check To See If The User Entered A Valid Parameter.
 $!
 $ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")
 $ THEN
@@ -685,13 +853,13 @@ $!
 $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
 	 THEN CC = "CC/DECC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
+$     CC = CC + " /''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=RELAXED"+ -
-           "/NOLIST/PREFIX=ALL" + -
+       "''POINTER_SIZE' /NOLIST /PREFIX=ALL" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+       " /INCLUDE=(''CC_INCLUDES') " + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -712,14 +880,14 @@ $!
 $!    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"
 $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -728,7 +896,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -751,11 +919,11 @@ $!    Use GNU C...
 $!
 $     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
 $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
+	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -765,7 +933,7 @@ $!  Set up default defines
 $!
 $   CCDEFS = """FLAT_INC=1""," + CCDEFS
 $!
-$!  Else The User Entered An Invalid Arguement.
+$!  Else The User Entered An Invalid Argument.
 $!
 $ ELSE
 $!
@@ -797,7 +965,7 @@ $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS"
 $!
 $!    Done with SOCKETSHR
 $!
@@ -823,13 +991,13 @@ $   THEN
 $!
 $!    Set the library to use UCX.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS"
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
+$       TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS"
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
+	  TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS"
 $     ENDIF
 $!
 $!    Done with UCX
@@ -843,7 +1011,7 @@ $   THEN
 $!
 $!    Set the library to use TCPIP.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = ",SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS"
 $!
 $!    Done with TCPIP
 $!
@@ -868,9 +1036,9 @@ $   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P3'"
 $!
 $!  Print info
 $!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
+$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB- ","
 $!
-$!  Else The User Entered An Invalid Arguement.
+$!  Else The User Entered An Invalid Argument.
 $!
 $ ELSE
 $!
@@ -978,15 +1146,24 @@ $ RETURN
 $!
 $ CLEANUP:
 $!
-$! Restore the logical name OPENSSL if it had a value
+$! Restore the saved logical name OPENSSL, if it had a value.
 $!
+$ if (f$type( __SAVE_OPENSSL) .nes. "")
+$ then
 $   IF __SAVE_OPENSSL .EQS. ""
 $   THEN
 $     DEASSIGN OPENSSL
 $   ELSE
 $     DEFINE /NOLOG OPENSSL '__SAVE_OPENSSL'
 $   ENDIF
+$ endif
+$!
+$! Close any open files.
+$!
+$ if (f$trnlnm( "objects", "LNM$PROCESS", 0, "SUPERVISOR") .nes. "") then -
+   close objects
 $!
 $! Done
 $!
 $ RETURN
+$!

apps/nseq.c

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

apps/openssl-vms.cnf

@@ -44,7 +44,7 @@ certs		= $dir.certs]		# Where the issued certs are kept
 crl_dir		= $dir.crl]		# Where the issued crl are kept
 database	= $dir]index.txt	# database index file.
 #unique_subject	= no			# Set to 'no' to allow creation of
-					# several ctificates with same subject.
+					# several certs with same subject.
 new_certs_dir	= $dir.newcerts]		# default place for new certs.
 
 certificate	= $dir]cacert.pem 	# The CA certificate
@@ -55,7 +55,7 @@ crl		= $dir]crl.pem 		# The current CRL
 private_key	= $dir.private]cakey.pem# The private key
 RANDFILE	= $dir.private].rand	# private random number file
 
-x509_extensions	= usr_cert		# The extentions to add to the cert
+x509_extensions	= usr_cert		# The extensions to add to the cert
 
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
@@ -103,11 +103,11 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 
 # Passwords for private keys if not present they will be prompted for
 # input_password = secret
@@ -145,7 +145,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
@@ -231,7 +231,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 
 subjectKeyIdentifier=hash
 
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always,issuer
 
 # This is what PKIX recommends but some broken software chokes on critical
 # extensions.
@@ -264,7 +264,7 @@ basicConstraints = CA:true
 # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
 
 # issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always
 
 [ proxy_cert_ext ]
 # These extensions should be added when creating a proxy certificate
@@ -297,7 +297,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

@@ -109,14 +109,15 @@
  *
  */
 
-
 #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>
+#include <openssl/rand.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/x509.h>
@@ -125,15 +126,21 @@
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
-#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#define USE_SOCKETS             /* needed for the _O_BINARY defs in the MS
+                                 * world */
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
+# include <openssl/fips.h>
+#endif
 
-/* 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 LHASH_OF(FUNCTION) *prog_init(void);
 static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]);
@@ -148,7 +155,6 @@ CONF *config=NULL;
 BIO *bio_err = NULL;
 #endif
 
-
 static void lock_dbg_cb(int mode, int type, const char *file, int line)
 {
     static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
@@ -156,64 +162,60 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
     int rw;
 
     rw = mode & (CRYPTO_READ | CRYPTO_WRITE);
-	if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
+    if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE))) {
-		{
         errstr = "invalid mode";
         goto err;
     }
 
-	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
+    if (type < 0 || type >= CRYPTO_NUM_LOCKS) {
-		{
         errstr = "type out of bounds";
         goto err;
     }
 
-	if (mode & CRYPTO_LOCK)
+    if (mode & CRYPTO_LOCK) {
-		{
+        if (modes[type]) {
-		if (modes[type])
-			{
             errstr = "already locked";
-			/* must not happen in a single-threaded program
+            /*
-			 * (would deadlock) */
+             * must not happen in a single-threaded program (would deadlock)
+             */
             goto err;
         }
 
         modes[type] = rw;
-		}
+    } else if (mode & CRYPTO_UNLOCK) {
-	else if (mode & CRYPTO_UNLOCK)
+        if (!modes[type]) {
-		{
-		if (!modes[type])
-			{
             errstr = "not locked";
             goto err;
         }
 
-		if (modes[type] != rw)
+        if (modes[type] != rw) {
-			{
             errstr = (rw == CRYPTO_READ) ?
                 "CRYPTO_r_unlock on write lock" :
                 "CRYPTO_w_unlock on read lock";
         }
 
         modes[type] = 0;
-		}
+    } else {
-	else
-		{
         errstr = "invalid mode";
         goto err;
     }
 
  err:
-	if (errstr)
+    if (errstr) {
-		{
         /* we cannot use bio_err here */
-		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
+        fprintf(stderr,
+                "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
                 errstr, mode, type, file, line);
     }
 }
 
+#if defined( OPENSSL_SYS_VMS) && (__INITIAL_POINTER_SIZE == 64)
+# define ARGV _Argv
+#else
+# define ARGV Argv
+#endif
 
-int main(int Argc, char *Argv[])
+int main(int Argc, char *ARGV[])
 {
     ARGS arg;
 #define PROG_NAME_SIZE  39
@@ -228,6 +230,57 @@ int main(int Argc, char *Argv[])
     LHASH_OF(FUNCTION) *prog = NULL;
     long errline;
 
+#if defined( OPENSSL_SYS_VMS) && (__INITIAL_POINTER_SIZE == 64)
+    /*-
+     * 2011-03-22 SMS.
+     * If we have 32-bit pointers everywhere, then we're safe, and
+     * we bypass this mess, as on non-VMS systems.  (See ARGV,
+     * above.)
+     * Problem 1: Compaq/HP C before V7.3 always used 32-bit
+     * pointers for argv[].
+     * Fix 1: For a 32-bit argv[], when we're using 64-bit pointers
+     * everywhere else, we always allocate and use a 64-bit
+     * duplicate of argv[].
+     * Problem 2: Compaq/HP C V7.3 (Alpha, IA64) before ECO1 failed
+     * to NULL-terminate a 64-bit argv[].  (As this was written, the
+     * compiler ECO was available only on IA64.)
+     * Fix 2: Unless advised not to (VMS_TRUST_ARGV), we test a
+     * 64-bit argv[argc] for NULL, and, if necessary, use a
+     * (properly) NULL-terminated (64-bit) duplicate of argv[].
+     * The same code is used in either case to duplicate argv[].
+     * Some of these decisions could be handled in preprocessing,
+     * but the code tends to get even uglier, and the penalty for
+     * deciding at compile- or run-time is tiny.
+     */
+    char **Argv = NULL;
+    int free_Argv = 0;
+
+    if ((sizeof(_Argv) < 8)     /* 32-bit argv[]. */
+# if !defined( VMS_TRUST_ARGV)
+        || (_Argv[Argc] != NULL) /* Untrusted argv[argc] not NULL. */
+# endif
+        ) {
+        int i;
+        Argv = OPENSSL_malloc((Argc + 1) * sizeof(char *));
+        if (Argv == NULL) {
+            ret = -1;
+            goto end;
+        }
+        for (i = 0; i < Argc; i++)
+            Argv[i] = _Argv[i];
+        Argv[Argc] = NULL;      /* Certain NULL termination. */
+        free_Argv = 1;
+    } else {
+        /*
+         * Use the known-good 32-bit argv[] (which needs the type cast to
+         * satisfy the compiler), or the trusted or tested-good 64-bit argv[]
+         * as-is.
+         */
+        Argv = (char **)_Argv;
+    }
+#endif                          /* defined( OPENSSL_SYS_VMS) &&
+                                 * (__INITIAL_POINTER_SIZE == 64) */
+
     arg.data = NULL;
     arg.count = 0;
 
@@ -235,15 +288,13 @@ int main(int Argc, char *Argv[])
         if ((bio_err = BIO_new(BIO_s_file())) != NULL)
             BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
 
-	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
+    if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) { /* if not defined, use
-		{
+                                                   * compiled-in library
-		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
+                                                   * defaults */
-			{
+        if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))) {
             CRYPTO_malloc_debug_init();
             CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-			}
+        } else {
-		else
-			{
             /* OPENSSL_DEBUG_MEMORY=off */
             CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
         }
@@ -257,6 +308,19 @@ int main(int Argc, char *Argv[])
         CRYPTO_set_locking_callback(lock_dbg_cb);
     }
 
+    if (getenv("OPENSSL_FIPS")) {
+#ifdef OPENSSL_FIPS
+        if (!FIPS_mode_set(1)) {
+            ERR_load_crypto_strings();
+            ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE));
+            EXIT(1);
+        }
+#else
+        fprintf(stderr, "FIPS mode not supported.\n");
+        EXIT(1);
+#endif
+    }
+
     apps_startup();
 
     /* Lets load up our environment a little */
@@ -270,19 +334,14 @@ int main(int Argc, char *Argv[])
 
     config = NCONF_new(NULL);
     i = NCONF_load(config, p, &errline);
-	if (i == 0)
+    if (i == 0) {
-		{
         if (ERR_GET_REASON(ERR_peek_last_error())
-		    == CONF_R_NO_SUCH_FILE)
+            == CONF_R_NO_SUCH_FILE) {
-			{
+            BIO_printf(bio_err, "WARNING: can't open config file: %s\n", p);
-			BIO_printf(bio_err,
-				   "WARNING: can't open config file: %s\n",p);
             ERR_clear_error();
             NCONF_free(config);
             config = NULL;
-			}
+        } else {
-		else
-			{
             ERR_print_errors(bio_err);
             NCONF_free(config);
             exit(1);
@@ -296,54 +355,58 @@ int main(int Argc, char *Argv[])
 
     f.name = pname;
     fp = lh_FUNCTION_retrieve(prog, &f);
-	if (fp != NULL)
+    if (fp != NULL) {
-		{
         Argv[0] = pname;
         ret = fp->func(Argc, Argv);
         goto end;
     }
 
-	/* ok, now check that there are not arguments, if there are,
+    /*
-	 * run with them, shifting the ssleay off the front */
+     * ok, now check that there are not arguments, if there are, run with
-	if (Argc != 1)
+     * them, shifting the ssleay off the front
-		{
+     */
+    if (Argc != 1) {
         Argc--;
         Argv++;
         ret = do_cmd(prog, Argc, Argv);
-		if (ret < 0) ret=0;
+        if (ret < 0)
+            ret = 0;
         goto end;
     }
 
     /* ok, lets enter the old 'OpenSSL>' mode */
 
-	for (;;)
+    for (;;) {
-		{
         ret = 0;
         p = buf;
         n = sizeof buf;
         i = 0;
-		for (;;)
+        for (;;) {
-			{
             p[0] = '\0';
             if (i++)
                 prompt = ">";
-			else	prompt="OpenSSL> ";
+            else
+                prompt = "OpenSSL> ";
             fputs(prompt, stdout);
             fflush(stdout);
-			fgets(p,n,stdin);
+            if (!fgets(p, n, stdin))
-			if (p[0] == '\0') goto end;
+                goto end;
+            if (p[0] == '\0')
+                goto end;
             i = strlen(p);
-			if (i <= 1) break;
+            if (i <= 1)
-			if (p[i-2] != '\\') break;
+                break;
+            if (p[i - 2] != '\\')
+                break;
             i -= 2;
             p += i;
             n -= i;
         }
-		if (!chopup_args(&arg,buf,&argc,&argv)) break;
+        if (!chopup_args(&arg, buf, &argc, &argv))
+            break;
 
         ret = do_cmd(prog, argc, argv);
-		if (ret < 0)
+        if (ret < 0) {
-			{
             ret = 0;
             goto end;
         }
@@ -356,22 +419,28 @@ int main(int Argc, char *Argv[])
  end:
     if (to_free)
         OPENSSL_free(to_free);
-	if (config != NULL)
+    if (config != NULL) {
-		{
         NCONF_free(config);
         config = NULL;
     }
-	if (prog != NULL) lh_FUNCTION_free(prog);
+    if (prog != NULL)
-	if (arg.data != NULL) OPENSSL_free(arg.data);
+        lh_FUNCTION_free(prog);
+    if (arg.data != NULL)
+        OPENSSL_free(arg.data);
 
-	apps_shutdown();
+    if (bio_err != NULL) {
-
-	CRYPTO_mem_leaks(bio_err);
-	if (bio_err != NULL)
-		{
         BIO_free(bio_err);
         bio_err = NULL;
     }
+#if defined( OPENSSL_SYS_VMS) && (__INITIAL_POINTER_SIZE == 64)
+    /* Free any duplicate Argv[] storage. */
+    if (free_Argv) {
+        OPENSSL_free(Argv);
+    }
+#endif
+    apps_shutdown();
+    CRYPTO_mem_leaks(bio_err);
+
     OPENSSL_EXIT(ret);
 }
 
@@ -382,37 +451,31 @@ end:
 #define LIST_CIPHER_ALGORITHMS "list-cipher-algorithms"
 #define LIST_PUBLIC_KEY_ALGORITHMS "list-public-key-algorithms"
 
-
 static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 {
     FUNCTION f, *fp;
     int i, ret = 1, tp, nl;
 
-	if ((argc <= 0) || (argv[0] == NULL))
+    if ((argc <= 0) || (argv[0] == NULL)) {
-		{ ret=0; goto end; }
+        ret = 0;
+        goto end;
+    }
     f.name = argv[0];
     fp = lh_FUNCTION_retrieve(prog, &f);
-	if (fp == NULL)
+    if (fp == NULL) {
-		{
+        if (EVP_get_digestbyname(argv[0])) {
-		if (EVP_get_digestbyname(argv[0]))
-			{
             f.type = FUNC_TYPE_MD;
             f.func = dgst_main;
             fp = &f;
-			}
+        } else if (EVP_get_cipherbyname(argv[0])) {
-		else if (EVP_get_cipherbyname(argv[0]))
-			{
             f.type = FUNC_TYPE_CIPHER;
             f.func = enc_main;
             fp = &f;
         }
     }
-	if (fp != NULL)
+    if (fp != NULL) {
-		{
         ret = fp->func(argc, argv);
-		}
+    } else if ((strncmp(argv[0], "no-", 3)) == 0) {
-	else if ((strncmp(argv[0],"no-",3)) == 0)
-		{
         BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -428,22 +491,18 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
             BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
         BIO_free_all(bio_stdout);
         goto end;
-		}
+    } else if ((strcmp(argv[0], "quit") == 0) ||
-	else if ((strcmp(argv[0],"quit") == 0) ||
                (strcmp(argv[0], "q") == 0) ||
                (strcmp(argv[0], "exit") == 0) ||
-		(strcmp(argv[0],"bye") == 0))
+               (strcmp(argv[0], "bye") == 0)) {
-		{
         ret = -1;
         goto end;
-		}
+    } else if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
-	else if ((strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0) ||
                (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
                (strcmp(argv[0], LIST_MESSAGE_DIGEST_ALGORITHMS) == 0) ||
                (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0) ||
                (strcmp(argv[0], LIST_CIPHER_ALGORITHMS) == 0) ||
-		(strcmp(argv[0],LIST_PUBLIC_KEY_ALGORITHMS) == 0))
+               (strcmp(argv[0], LIST_PUBLIC_KEY_ALGORITHMS) == 0)) {
-		{
         int list_type;
         BIO *bio_stdout;
 
@@ -476,26 +535,21 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
             list_md(bio_stdout);
         if (list_type == FUNC_TYPE_CIPHER_ALG)
             list_cipher(bio_stdout);
-		else
+        else {
-			{
             for (fp = functions; fp->name != NULL; fp++)
                 if (fp->type == list_type)
-					BIO_printf(bio_stdout, "%s\n",
+                    BIO_printf(bio_stdout, "%s\n", fp->name);
-								fp->name);
         }
         BIO_free_all(bio_stdout);
         ret = 0;
         goto end;
-		}
+    } else {
-	else
-		{
         BIO_printf(bio_err, "openssl:Error: '%s' is an invalid command.\n",
                    argv[0]);
         BIO_printf(bio_err, "\nStandard commands");
         i = 0;
         tp = 0;
-		for (fp=functions; fp->name != NULL; fp++)
+        for (fp = functions; fp->name != NULL; fp++) {
-			{
             nl = 0;
 #ifdef OPENSSL_NO_CAMELLIA
             if (((i++) % 5) == 0)
@@ -506,20 +560,18 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
                 BIO_printf(bio_err, "\n");
                 nl = 1;
             }
-			if (fp->type != tp)
+            if (fp->type != tp) {
-				{
                 tp = fp->type;
-				if (!nl) BIO_printf(bio_err,"\n");
+                if (!nl)
-				if (tp == FUNC_TYPE_MD)
+                    BIO_printf(bio_err, "\n");
-					{
+                if (tp == FUNC_TYPE_MD) {
                     i = 1;
                     BIO_printf(bio_err,
                                "\nMessage Digest commands (see the `dgst' command for more details)\n");
-					}
+                } else if (tp == FUNC_TYPE_CIPHER) {
-				else if (tp == FUNC_TYPE_CIPHER)
-					{
                     i = 1;
-					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
+                    BIO_printf(bio_err,
+                               "\nCipher commands (see the `enc' command for more details)\n");
                 }
             }
 #ifdef OPENSSL_NO_CAMELLIA
@@ -548,23 +600,18 @@ static int SortFnByName(const void *_f1,const void *_f2)
 static void list_pkey(BIO *out)
 {
     int i;
-	for (i = 0; i < EVP_PKEY_asn1_get_count(); i++)
+    for (i = 0; i < EVP_PKEY_asn1_get_count(); i++) {
-		{
         const EVP_PKEY_ASN1_METHOD *ameth;
         int pkey_id, pkey_base_id, pkey_flags;
         const char *pinfo, *pem_str;
         ameth = EVP_PKEY_asn1_get0(i);
         EVP_PKEY_asn1_get0_info(&pkey_id, &pkey_base_id, &pkey_flags,
                                 &pinfo, &pem_str, ameth);
-		if (pkey_flags & ASN1_PKEY_ALIAS)
+        if (pkey_flags & ASN1_PKEY_ALIAS) {
-			{
+            BIO_printf(out, "Name: %s\n", OBJ_nid2ln(pkey_id));
-			BIO_printf(out, "Name: %s\n", 
-					OBJ_nid2ln(pkey_id));
             BIO_printf(out, "\tType: Alias to %s\n",
                        OBJ_nid2ln(pkey_base_id));
-			}
+        } else {
-		else
-			{
             BIO_printf(out, "Name: %s\n", pinfo);
             BIO_printf(out, "\tType: %s Algorithm\n",
                        pkey_flags & ASN1_PKEY_DYNAMIC ?
@@ -583,8 +630,7 @@ static void list_cipher_fn(const EVP_CIPHER *c,
 {
     if (c)
         BIO_printf(arg, "%s\n", EVP_CIPHER_name(c));
-	else
+    else {
-		{
         if (!from)
             from = "<undefined>";
         if (!to)
@@ -603,8 +649,7 @@ static void list_md_fn(const EVP_MD *m,
 {
     if (m)
         BIO_printf(arg, "%s\n", EVP_MD_name(m));
-	else
+    else {
-		{
         if (!from)
             from = "<undefined>";
         if (!to)
@@ -618,16 +663,18 @@ static void list_md(BIO *out)
     EVP_MD_do_all_sorted(list_md_fn, out);
 }
 
-static int MS_CALLBACK function_cmp(const FUNCTION *a, const FUNCTION *b)
+static int function_cmp(const FUNCTION * a, const FUNCTION * b)
 {
     return strncmp(a->name, b->name, 8);
 }
+
 static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION)
 
-static unsigned long MS_CALLBACK function_hash(const FUNCTION *a)
+static unsigned long function_hash(const FUNCTION * a)
 {
     return lh_strhash(a->name);
 }
+
 static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION)
 
 static LHASH_OF(FUNCTION) *prog_init(void)
@@ -637,8 +684,7 @@ static LHASH_OF(FUNCTION) *prog_init(void)
     size_t i;
 
     /* Purely so it looks nice when the user hits ? */
-	for(i=0,f=functions ; f->name != NULL ; ++f,++i)
+    for (i = 0, f = functions; f->name != NULL; ++f, ++i) ;
-	    ;
     qsort(functions, i, sizeof *functions, SortFnByName);
 
     if ((ret = lh_FUNCTION_new()) == NULL)
@@ -648,4 +694,3 @@ static LHASH_OF(FUNCTION) *prog_init(void)
         (void)lh_FUNCTION_insert(ret, f);
     return (ret);
 }
-

apps/openssl.cnf

@@ -44,7 +44,7 @@ certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
 #unique_subject	= no			# Set to 'no' to allow creation of
-					# several ctificates with same subject.
+					# several certs with same subject.
 new_certs_dir	= $dir/newcerts		# default place for new certs.
 
 certificate	= $dir/cacert.pem 	# The CA certificate
@@ -55,7 +55,7 @@ crl		= $dir/crl.pem 		# The current CRL
 private_key	= $dir/private/cakey.pem# The private key
 RANDFILE	= $dir/private/.rand	# private random number file
 
-x509_extensions	= usr_cert		# The extentions to add to the cert
+x509_extensions	= usr_cert		# The extensions to add to the cert
 
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
@@ -103,11 +103,11 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 
 # Passwords for private keys if not present they will be prompted for
 # input_password = secret
@@ -145,7 +145,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
@@ -231,7 +231,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 
 subjectKeyIdentifier=hash
 
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always,issuer
 
 # This is what PKIX recommends but some broken software chokes on critical
 # extensions.
@@ -264,7 +264,7 @@ basicConstraints = CA:true
 # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
 
 # issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always,issuer:always
+authorityKeyIdentifier=keyid:always
 
 [ proxy_cert_ext ]
 # These extensions should be added when creating a proxy certificate
@@ -297,7 +297,7 @@ nsComment			= "OpenSSL Generated Certificate"
 
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer:always
+authorityKeyIdentifier=keyid,issuer
 
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.

apps/passwd.c

@@ -22,11 +22,9 @@
 #  include <openssl/md5.h>
 # endif
 
-
 # undef PROG
 # define PROG passwd_main
 
-
 static unsigned const char cov_2char[64] = {
     /* from crypto/des/fcrypt.c */
     0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
@@ -40,10 +38,12 @@ static unsigned const char cov_2char[64]={
 };
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out, int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+                     int useapr1);
 
-/* -crypt        - standard Unix password algorithm (default)
+/*-
+ * -crypt        - standard Unix password algorithm (default)
  * -1            - MD5-based password algorithm
  * -apr1         - MD5-based password algorithm, Apache variant
  * -salt string  - salt
@@ -94,45 +94,32 @@ int MAIN(int argc, char **argv)
 
     badopt = 0, opt_done = 0;
     i = 0;
-	while (!badopt && !opt_done && argv[++i] != NULL)
+    while (!badopt && !opt_done && argv[++i] != NULL) {
-		{
         if (strcmp(argv[i], "-crypt") == 0)
             usecrypt = 1;
         else if (strcmp(argv[i], "-1") == 0)
             use1 = 1;
         else if (strcmp(argv[i], "-apr1") == 0)
             useapr1 = 1;
-		else if (strcmp(argv[i], "-salt") == 0)
+        else if (strcmp(argv[i], "-salt") == 0) {
-			{
+            if ((argv[i + 1] != NULL) && (salt == NULL)) {
-			if ((argv[i+1] != NULL) && (salt == NULL))
-				{
                 passed_salt = 1;
                 salt = argv[++i];
-				}
+            } else
-			else
                 badopt = 1;
-			}
+        } else if (strcmp(argv[i], "-in") == 0) {
-		else if (strcmp(argv[i], "-in") == 0)
+            if ((argv[i + 1] != NULL) && !pw_source_defined) {
-			{
-			if ((argv[i+1] != NULL) && !pw_source_defined)
-				{
                 pw_source_defined = 1;
                 infile = argv[++i];
-				}
+            } else
-			else
                 badopt = 1;
-			}
+        } else if (strcmp(argv[i], "-stdin") == 0) {
-		else if (strcmp(argv[i], "-stdin") == 0)
+            if (!pw_source_defined) {
-			{
-			if (!pw_source_defined)
-				{
                 pw_source_defined = 1;
                 in_stdin = 1;
-				}
+            } else
-			else
                 badopt = 1;
-			}
+        } else if (strcmp(argv[i], "-noverify") == 0)
-		else if (strcmp(argv[i], "-noverify") == 0)
             in_noverify = 1;
         else if (strcmp(argv[i], "-quiet") == 0)
             quiet = 1;
@@ -148,8 +135,7 @@ int MAIN(int argc, char **argv)
             pw_source_defined = 1;
             passwds = &argv[i];
             opt_done = 1;
-			}
+        } else
-		else
             badopt = 1;
     }
 
@@ -160,27 +146,32 @@ int MAIN(int argc, char **argv)
 
     /* reject unsupported algorithms */
 # ifdef OPENSSL_NO_DES
-	if (usecrypt) badopt = 1;
+    if (usecrypt)
+        badopt = 1;
 # endif
 # ifdef NO_MD5CRYPT_1
-	if (use1 || useapr1) badopt = 1;
+    if (use1 || useapr1)
+        badopt = 1;
 # endif
 
-	if (badopt) 
+    if (badopt) {
-		{
         BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
         BIO_printf(bio_err, "where options are\n");
 # ifndef OPENSSL_NO_DES
-		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
+        BIO_printf(bio_err,
+                   "-crypt             standard Unix password algorithm (default)\n");
 # endif
 # ifndef NO_MD5CRYPT_1
-		BIO_printf(bio_err, "-1                 MD5-based password algorithm\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-apr1              MD5-based password algorithm, Apache variant\n");
+                   "-1                 MD5-based password algorithm\n");
+        BIO_printf(bio_err,
+                   "-apr1              MD5-based password algorithm, Apache variant\n");
 # endif
         BIO_printf(bio_err, "-salt string       use provided salt\n");
         BIO_printf(bio_err, "-in file           read passwords from file\n");
         BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
-		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
+        BIO_printf(bio_err,
+                   "-noverify          never verify when reading password from terminal\n");
         BIO_printf(bio_err, "-quiet             no warnings\n");
         BIO_printf(bio_err, "-table             format output as table\n");
         BIO_printf(bio_err, "-reverse           switch table columns\n");
@@ -188,19 +179,15 @@ int MAIN(int argc, char **argv)
         goto err;
     }
 
-	if ((infile != NULL) || in_stdin)
+    if ((infile != NULL) || in_stdin) {
-		{
         in = BIO_new(BIO_s_file());
         if (in == NULL)
             goto err;
-		if (infile != NULL)
+        if (infile != NULL) {
-			{
             assert(in_stdin == 0);
             if (BIO_read_filename(in, infile) <= 0)
                 goto err;
-			}
+        } else {
-		else
-			{
             assert(in_stdin);
             BIO_set_fp(in, stdin, BIO_NOCLOSE);
         }
@@ -209,61 +196,59 @@ int MAIN(int argc, char **argv)
     if (usecrypt)
         pw_maxlen = 8;
     else if (use1 || useapr1)
-		pw_maxlen = 256; /* arbitrary limit, should be enough for most passwords */
+        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
+                                 * passwords */
 
-	if (passwds == NULL)
+    if (passwds == NULL) {
-		{
         /* no passwords on the command line */
 
         passwd_malloc_size = pw_maxlen + 2;
-		/* longer than necessary so that we can warn about truncation */
+        /*
+         * longer than necessary so that we can warn about truncation
+         */
         passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
         if (passwd_malloc == NULL)
             goto err;
     }
 
-	if ((in == NULL) && (passwds == NULL))
+    if ((in == NULL) && (passwds == NULL)) {
-		{
         /* build a null-terminated list */
         static char *passwds_static[2] = { NULL, NULL };
 
         passwds = passwds_static;
         if (in == NULL)
-			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
+            if (EVP_read_pw_string
+                (passwd_malloc, passwd_malloc_size, "Password: ",
+                 !(passed_salt || in_noverify)) != 0)
                 goto err;
         passwds[0] = passwd_malloc;
     }
 
-	if (in == NULL)
+    if (in == NULL) {
-		{
         assert(passwds != NULL);
         assert(*passwds != NULL);
 
-		do /* loop over list of passwords */
+        do {                    /* loop over list of passwords */
-			{
             passwd = *passwds++;
             if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-				quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
+                           useapr1))
                 goto err;
         }
         while (*passwds != NULL);
-		}
+    } else
-	else
         /* in != NULL */
     {
         int done;
 
         assert(passwd != NULL);
-		do
+        do {
-			{
             int r = BIO_gets(in, passwd, pw_maxlen + 1);
-			if (r > 0)
+            if (r > 0) {
-				{
                 char *c = (strchr(passwd, '\n'));
                 if (c != NULL)
                     *c = 0;     /* truncate at newline */
-				else
+                else {
-					{
                     /* ignore rest of line */
                     char trash[BUFSIZ];
                     do
@@ -272,7 +257,8 @@ int MAIN(int argc, char **argv)
                 }
 
                 if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
+                               quiet, table, reverse, pw_maxlen, usecrypt,
+                               use1, useapr1))
                     goto err;
             }
             done = (r <= 0);
@@ -295,21 +281,20 @@ err:
     OPENSSL_EXIT(ret);
 }
 
-
 # ifndef NO_MD5CRYPT_1
-/* MD5-based password algorithm (should probably be available as a library
+/*
- * function; then the static buffer would not be acceptable).
+ * MD5-based password algorithm (should probably be available as a library
- * For magic string "1", this should be compatible to the MD5-based BSD
+ * function; then the static buffer would not be acceptable). For magic
- * password algorithm.
+ * string "1", this should be compatible to the MD5-based BSD password
- * For 'magic' string "apr1", this is compatible to the MD5-based Apache
+ * algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
- * password algorithm.
+ * Apache password algorithm. (Apparently, the Apache password algorithm is
- * (Apparently, the Apache password algorithm is identical except that the
+ * identical except that the 'magic' string was changed -- the laziest
- * 'magic' string was changed -- the laziest application of the NIH principle
+ * application of the NIH principle I've ever encountered.)
- * I've ever encountered.)
  */
 static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 {
-	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
+    /* "$apr1$..salt..$.......md5hash..........\0" */
+    static char out_buf[6 + 9 + 24 + 2];
     unsigned char buf[MD5_DIGEST_LENGTH];
     char *salt_out;
     int n;
@@ -349,15 +334,13 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     EVP_DigestUpdate(&md, buf, i);
 
     n = passwd_len;
-	while (n)
+    while (n) {
-		{
         EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
         n >>= 1;
     }
     EVP_DigestFinal_ex(&md, buf, NULL);
 
-	for (i = 0; i < 1000; i++)
+    for (i = 0; i < 1000; i++) {
-		{
         EVP_DigestInit_ex(&md2, EVP_md5(), NULL);
         EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *)passwd : buf,
                          (i & 1) ? passwd_len : sizeof buf);
@@ -379,11 +362,13 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         char *output;
 
         /* silly output permutation */
-		for (dest = 0, source = 0; dest < 14; dest++, source = (source + 6) % 17)
+        for (dest = 0, source = 0; dest < 14;
+             dest++, source = (source + 6) % 17)
             buf_perm[dest] = buf[source];
         buf_perm[14] = buf[5];
         buf_perm[15] = buf[11];
-#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */
+#  ifndef PEDANTIC              /* Unfortunately, this generates a "no
+                                 * effect" warning */
         assert(16 == sizeof buf_perm);
 #  endif
 
@@ -392,8 +377,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 
         *output++ = '$';
 
-		for (i = 0; i < 15; i += 3)
+        for (i = 0; i < 15; i += 3) {
-			{
             *output++ = cov_2char[buf_perm[i + 2] & 0x3f];
             *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
                                   (buf_perm[i + 2] >> 6)];
@@ -413,10 +397,10 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 }
 # endif
 
-
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-	char *passwd, BIO *out,	int quiet, int table, int reverse,
+                     char *passwd, BIO *out, int quiet, int table,
-	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
+                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+                     int useapr1)
 {
     char *hash = NULL;
 
@@ -424,13 +408,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     assert(salt_malloc_p != NULL);
 
     /* first make sure we have a salt */
-	if (!passed_salt)
+    if (!passed_salt) {
-		{
 # ifndef OPENSSL_NO_DES
-		if (usecrypt)
+        if (usecrypt) {
-			{
+            if (*salt_malloc_p == NULL) {
-			if (*salt_malloc_p == NULL)
-				{
                 *salt_p = *salt_malloc_p = OPENSSL_malloc(3);
                 if (*salt_malloc_p == NULL)
                     goto err;
@@ -441,19 +422,17 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
             (*salt_p)[1] = cov_2char[(*salt_p)[1] & 0x3f]; /* 6 bits */
             (*salt_p)[2] = 0;
 #  ifdef CHARSET_EBCDIC
-			ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert
+            ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert back
-			                                    * back to ASCII */
+                                                * to ASCII */
 #  endif
         }
 # endif                         /* !OPENSSL_NO_DES */
 
 # ifndef NO_MD5CRYPT_1
-		if (use1 || useapr1)
+        if (use1 || useapr1) {
-			{
             int i;
 
-			if (*salt_malloc_p == NULL)
+            if (*salt_malloc_p == NULL) {
-				{
                 *salt_p = *salt_malloc_p = OPENSSL_malloc(9);
                 if (*salt_malloc_p == NULL)
                     goto err;
@@ -471,11 +450,14 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     assert(*salt_p != NULL);
 
     /* truncate password if necessary */
-	if ((strlen(passwd) > pw_maxlen))
+    if ((strlen(passwd) > pw_maxlen)) {
-		{
         if (!quiet)
-			/* 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);
+             * XXX: really we should know how to print a size_t, not cast it
+             */
+            BIO_printf(bio_err,
+                       "Warning: truncating password to %u characters\n",
+                       (unsigned)pw_maxlen);
         passwd[pw_maxlen] = 0;
     }
     assert(strlen(passwd) <= pw_maxlen);

apps/pkcs12.c

@@ -1,5 +1,6 @@
 /* pkcs12.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
@@ -72,7 +73,6 @@
 
 const EVP_CIPHER *enc;
 
-
 # define NOKEYS          0x1
 # define NOCERTS         0x2
 # define INFO            0x4
@@ -80,11 +80,15 @@ const EVP_CIPHER *enc;
 # define CACERTS         0x10
 
 int get_cert_chain(X509 *cert, X509_STORE *store, STACK_OF(X509) **chain);
-int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options, char *pempass);
+int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen,
-int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, char *pass,
+                        int options, char *pempass);
+int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
+                          char *pass, int passlen, int options,
+                          char *pempass);
+int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass,
                          int passlen, int options, char *pempass);
-int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options, char *pempass);
+int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,
-int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name);
+                  const char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
@@ -117,7 +121,7 @@ int MAIN(int argc, char **argv)
     int ret = 1;
     int macver = 1;
     int noprompt = 0;
-    STACK_OF(STRING) *canames = NULL;
+    STACK_OF(OPENSSL_STRING) *canames = NULL;
     char *cpass = NULL, *mpass = NULL;
     char *passargin = NULL, *passargout = NULL, *passarg = NULL;
     char *passin = NULL, *passout = NULL;
@@ -131,49 +135,72 @@ int MAIN(int argc, char **argv)
     apps_startup();
 
     enc = EVP_des_ede3_cbc();
-    if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
 
     args = argv + 1;
 
-
     while (*args) {
         if (*args[0] == '-') {
-		if (!strcmp (*args, "-nokeys")) options |= NOKEYS;
+            if (!strcmp(*args, "-nokeys"))
-		else if (!strcmp (*args, "-keyex")) keytype = KEY_EX;
+                options |= NOKEYS;
-		else if (!strcmp (*args, "-keysig")) keytype = KEY_SIG;
+            else if (!strcmp(*args, "-keyex"))
-		else if (!strcmp (*args, "-nocerts")) options |= NOCERTS;
+                keytype = KEY_EX;
-		else if (!strcmp (*args, "-clcerts")) options |= CLCERTS;
+            else if (!strcmp(*args, "-keysig"))
-		else if (!strcmp (*args, "-cacerts")) options |= CACERTS;
+                keytype = KEY_SIG;
-		else if (!strcmp (*args, "-noout")) options |= (NOKEYS|NOCERTS);
+            else if (!strcmp(*args, "-nocerts"))
-		else if (!strcmp (*args, "-info")) options |= INFO;
+                options |= NOCERTS;
-		else if (!strcmp (*args, "-chain")) chain = 1;
+            else if (!strcmp(*args, "-clcerts"))
-		else if (!strcmp (*args, "-twopass")) twopass = 1;
+                options |= CLCERTS;
-		else if (!strcmp (*args, "-nomacver")) macver = 0;
+            else if (!strcmp(*args, "-cacerts"))
+                options |= CACERTS;
+            else if (!strcmp(*args, "-noout"))
+                options |= (NOKEYS | NOCERTS);
+            else if (!strcmp(*args, "-info"))
+                options |= INFO;
+            else if (!strcmp(*args, "-chain"))
+                chain = 1;
+            else if (!strcmp(*args, "-twopass"))
+                twopass = 1;
+            else if (!strcmp(*args, "-nomacver"))
+                macver = 0;
             else if (!strcmp(*args, "-descert"))
                 cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-		else if (!strcmp (*args, "-export")) export_cert = 1;
+            else if (!strcmp(*args, "-export"))
-		else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
+                export_cert = 1;
-		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
+            else if (!strcmp(*args, "-des"))
+                enc = EVP_des_cbc();
+            else if (!strcmp(*args, "-des3"))
+                enc = EVP_des_ede3_cbc();
 # ifndef OPENSSL_NO_IDEA
-		else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
+            else if (!strcmp(*args, "-idea"))
+                enc = EVP_idea_cbc();
 # endif
 # ifndef OPENSSL_NO_SEED
-		else if (!strcmp(*args, "-seed")) enc=EVP_seed_cbc();
+            else if (!strcmp(*args, "-seed"))
+                enc = EVP_seed_cbc();
 # endif
 # ifndef OPENSSL_NO_AES
-		else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
+            else if (!strcmp(*args, "-aes128"))
-		else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
+                enc = EVP_aes_128_cbc();
-		else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
+            else if (!strcmp(*args, "-aes192"))
+                enc = EVP_aes_192_cbc();
+            else if (!strcmp(*args, "-aes256"))
+                enc = EVP_aes_256_cbc();
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
-		else if (!strcmp(*args,"-camellia128")) enc=EVP_camellia_128_cbc();
+            else if (!strcmp(*args, "-camellia128"))
-		else if (!strcmp(*args,"-camellia192")) enc=EVP_camellia_192_cbc();
+                enc = EVP_camellia_128_cbc();
-		else if (!strcmp(*args,"-camellia256")) enc=EVP_camellia_256_cbc();
+            else if (!strcmp(*args, "-camellia192"))
+                enc = EVP_camellia_192_cbc();
+            else if (!strcmp(*args, "-camellia256"))
+                enc = EVP_camellia_256_cbc();
 # endif
-		else if (!strcmp (*args, "-noiter")) iter = 1;
+            else if (!strcmp(*args, "-noiter"))
+                iter = 1;
             else if (!strcmp(*args, "-maciter"))
                 maciter = PKCS12_DEFAULT_ITER;
             else if (!strcmp(*args, "-nomaciter"))
@@ -184,8 +211,10 @@ int MAIN(int argc, char **argv)
                 if (args[1]) {
                     args++;
                     macalg = *args;
-		    } else badarg = 1;
+                } else
-		else if (!strcmp (*args, "-nodes")) enc=NULL;
+                    badarg = 1;
+            else if (!strcmp(*args, "-nodes"))
+                enc = NULL;
             else if (!strcmp(*args, "-certpbe")) {
                 if (!set_pbe(bio_err, &cert_pbe, *++args))
                     badarg = 1;
@@ -196,81 +225,98 @@ int MAIN(int argc, char **argv)
                 if (args[1]) {
                     args++;
                     inrand = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-inkey")) {
                 if (args[1]) {
                     args++;
                     keyname = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-certfile")) {
                 if (args[1]) {
                     args++;
                     certfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-name")) {
                 if (args[1]) {
                     args++;
                     name = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-LMK"))
                 add_lmk = 1;
             else if (!strcmp(*args, "-CSP")) {
                 if (args[1]) {
                     args++;
                     csp_name = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-caname")) {
                 if (args[1]) {
                     args++;
-			if (!canames) canames = sk_STRING_new_null();
+                    if (!canames)
-			sk_STRING_push(canames, *args);
+                        canames = sk_OPENSSL_STRING_new_null();
-		    } else badarg = 1;
+                    sk_OPENSSL_STRING_push(canames, *args);
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-in")) {
                 if (args[1]) {
                     args++;
                     infile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-out")) {
                 if (args[1]) {
                     args++;
                     outfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-passin")) {
                 if (args[1]) {
                     args++;
                     passargin = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-passout")) {
                 if (args[1]) {
                     args++;
                     passargout = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-password")) {
                 if (args[1]) {
                     args++;
                     passarg = *args;
                     noprompt = 1;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-CApath")) {
                 if (args[1]) {
                     args++;
                     CApath = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
             } else if (!strcmp(*args, "-CAfile")) {
                 if (args[1]) {
                     args++;
                     CAfile = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
 # ifndef OPENSSL_NO_ENGINE
             } else if (!strcmp(*args, "-engine")) {
                 if (args[1]) {
                     args++;
                     engine = *args;
-		    } else badarg = 1;
+                } else
+                    badarg = 1;
 # endif
-		} else badarg = 1;
+            } else
+                badarg = 1;
 
-	} else badarg = 1;
+        } else
+            badarg = 1;
         args++;
     }
 
@@ -284,18 +330,23 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_err, "-CApath arg   - PEM format directory of CA's\n");
         BIO_printf(bio_err, "-CAfile arg   - PEM format file of CA's\n");
         BIO_printf(bio_err, "-name \"name\"  use name as friendly name\n");
-	BIO_printf (bio_err, "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
+        BIO_printf(bio_err,
+                   "-caname \"nm\"  use nm as CA friendly name (can be used more than once).\n");
         BIO_printf(bio_err, "-in  infile   input filename\n");
         BIO_printf(bio_err, "-out outfile  output filename\n");
-	BIO_printf (bio_err, "-noout        don't output anything, just verify.\n");
+        BIO_printf(bio_err,
+                   "-noout        don't output anything, just verify.\n");
         BIO_printf(bio_err, "-nomacver     don't verify MAC.\n");
         BIO_printf(bio_err, "-nocerts      don't output certificates.\n");
-	BIO_printf (bio_err, "-clcerts      only output client certificates.\n");
+        BIO_printf(bio_err,
+                   "-clcerts      only output client certificates.\n");
         BIO_printf(bio_err, "-cacerts      only output CA certificates.\n");
         BIO_printf(bio_err, "-nokeys       don't output private keys.\n");
-	BIO_printf (bio_err, "-info         give info about PKCS#12 structure.\n");
+        BIO_printf(bio_err,
+                   "-info         give info about PKCS#12 structure.\n");
         BIO_printf(bio_err, "-des          encrypt private keys with DES\n");
-	BIO_printf (bio_err, "-des3         encrypt private keys with triple DES (default)\n");
+        BIO_printf(bio_err,
+                   "-des3         encrypt private keys with triple DES (default)\n");
 # ifndef OPENSSL_NO_IDEA
         BIO_printf(bio_err, "-idea         encrypt private keys with idea\n");
 # endif
@@ -304,45 +355,58 @@ int MAIN(int argc, char **argv)
 # endif
 # ifndef OPENSSL_NO_AES
         BIO_printf(bio_err, "-aes128, -aes192, -aes256\n");
-	BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
+        BIO_printf(bio_err,
+                   "              encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
         BIO_printf(bio_err, "-camellia128, -camellia192, -camellia256\n");
-	BIO_printf (bio_err, "              encrypt PEM output with cbc camellia\n");
+        BIO_printf(bio_err,
+                   "              encrypt PEM output with cbc camellia\n");
 # endif
         BIO_printf(bio_err, "-nodes        don't encrypt private keys\n");
         BIO_printf(bio_err, "-noiter       don't use encryption iteration\n");
         BIO_printf(bio_err, "-nomaciter    don't use MAC iteration\n");
         BIO_printf(bio_err, "-maciter      use MAC iteration\n");
         BIO_printf(bio_err, "-nomac        don't generate MAC\n");
-	BIO_printf (bio_err, "-twopass      separate MAC, encryption passwords\n");
+        BIO_printf(bio_err,
-	BIO_printf (bio_err, "-descert      encrypt PKCS#12 certificates with triple DES (default RC2-40)\n");
+                   "-twopass      separate MAC, encryption passwords\n");
-	BIO_printf (bio_err, "-certpbe alg  specify certificate PBE algorithm (default RC2-40)\n");
+        BIO_printf(bio_err,
-	BIO_printf (bio_err, "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
+                   "-descert      encrypt PKCS#12 certificates with triple DES (default RC2-40)\n");
-	BIO_printf (bio_err, "-macalg alg   digest algorithm used in MAC (default SHA1)\n");
+        BIO_printf(bio_err,
+                   "-certpbe alg  specify certificate PBE algorithm (default RC2-40)\n");
+        BIO_printf(bio_err,
+                   "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
+        BIO_printf(bio_err,
+                   "-macalg alg   digest algorithm used in MAC (default SHA1)\n");
         BIO_printf(bio_err, "-keyex        set MS key exchange type\n");
         BIO_printf(bio_err, "-keysig       set MS key signature type\n");
-	BIO_printf (bio_err, "-password p   set import/export password source\n");
+        BIO_printf(bio_err,
+                   "-password p   set import/export password source\n");
         BIO_printf(bio_err, "-passin p     input file pass phrase source\n");
         BIO_printf(bio_err, "-passout p    output file pass phrase source\n");
 # ifndef OPENSSL_NO_ENGINE
-	BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e     use engine e, possibly a hardware device.\n");
 # endif
-	BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
-	BIO_printf(bio_err,  "              load the file (or the files in the directory) into\n");
+                   LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err,
+                   "              load the file (or the files in the directory) into\n");
         BIO_printf(bio_err, "              the random number generator\n");
         BIO_printf(bio_err, "-CSP name     Microsoft CSP name\n");
-	BIO_printf(bio_err,  "-LMK          Add local machine keyset attribute to private key\n");
+        BIO_printf(bio_err,
+                   "-LMK          Add local machine keyset attribute to private key\n");
         goto end;
     }
-
 # ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 # endif
 
     if (passarg) {
-	if(export_cert) passargout = passarg;
+        if (export_cert)
-	else passargin = passarg;
+            passargout = passarg;
+        else
+            passargin = passarg;
     }
 
     if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
@@ -351,8 +415,10 @@ int MAIN(int argc, char **argv)
     }
 
     if (!cpass) {
-    	if(export_cert) cpass = passout;
+        if (export_cert)
-    	else cpass = passin;
+            cpass = passout;
+        else
+            cpass = passin;
     }
 
     if (cpass) {
@@ -375,15 +441,16 @@ int MAIN(int argc, char **argv)
     CRYPTO_push_info("read files");
 # endif
 
-    if (!infile) in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    if (!infile)
-    else in = BIO_new_file(infile, "rb");
+        in = BIO_new_fp(stdin, BIO_NOCLOSE);
+    else
+        in = BIO_new_file(infile, "rb");
     if (!in) {
         BIO_printf(bio_err, "Error opening input file %s\n",
                    infile ? infile : "<stdin>");
         perror(infile);
         goto end;
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
     CRYPTO_push_info("write files");
@@ -397,7 +464,8 @@ int MAIN(int argc, char **argv)
             out = BIO_push(tmpbio, out);
         }
 # endif
-    } else out = BIO_new_file(outfile, "wb");
+    } else
+        out = BIO_new_file(outfile, "wb");
     if (!out) {
         BIO_printf(bio_err, "Error opening output file %s\n",
                    outfile ? outfile : "<stdout>");
@@ -408,8 +476,8 @@ int MAIN(int argc, char **argv)
 # ifdef CRYPTO_MDEBUG
         CRYPTO_push_info("read MAC password");
 # endif
-	if(EVP_read_pw_string (macpass, sizeof macpass, "Enter MAC Password:", export_cert))
+        if (EVP_read_pw_string
-	{
+            (macpass, sizeof macpass, "Enter MAC Password:", export_cert)) {
             BIO_printf(bio_err, "Can't read Password\n");
             goto end;
         }
@@ -426,8 +494,7 @@ int MAIN(int argc, char **argv)
         unsigned char *catmp = NULL;
         int i;
 
-	if ((options & (NOCERTS|NOKEYS)) == (NOCERTS|NOKEYS))
+        if ((options & (NOCERTS | NOKEYS)) == (NOCERTS | NOKEYS)) {
-		{	
             BIO_printf(bio_err, "Nothing to do!\n");
             goto export_end;
         }
@@ -439,35 +506,29 @@ int MAIN(int argc, char **argv)
         CRYPTO_push_info("process -export_cert");
         CRYPTO_push_info("reading private key");
 # endif
-	if (!(options & NOKEYS))
+        if (!(options & NOKEYS)) {
-		{
             key = load_key(bio_err, keyname ? keyname : infile,
                            FORMAT_PEM, 1, passin, e, "private key");
             if (!key)
                 goto export_end;
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from input");
 # endif
 
         /* Load in all certs in input file */
-	if(!(options & NOCERTS))
+        if (!(options & NOCERTS)) {
-		{
             certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
                                "certificates");
             if (!certs)
                 goto export_end;
 
-		if (key)
+            if (key) {
-			{
                 /* Look for matching private key */
-			for(i = 0; i < sk_X509_num(certs); i++)
+                for (i = 0; i < sk_X509_num(certs); i++) {
-				{
                     x = sk_X509_value(certs, i);
-				if(X509_check_private_key(x, key))
+                    if (X509_check_private_key(x, key)) {
-					{
                         ucert = x;
                         /* Zero keyid and alias */
                         X509_keyid_set1(ucert, NULL, 0);
@@ -477,23 +538,21 @@ int MAIN(int argc, char **argv)
                         break;
                     }
                 }
-			if (!ucert)
+                if (!ucert) {
-				{
+                    BIO_printf(bio_err,
-				BIO_printf(bio_err, "No certificate matches private key\n");
+                               "No certificate matches private key\n");
                     goto export_end;
                 }
             }
 
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from input 2");
 # endif
 
         /* Add any more certificates asked for */
-	if(certfile)
+        if (certfile) {
-		{
             STACK_OF(X509) *morecerts = NULL;
             if (!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
                                          NULL, e,
@@ -503,7 +562,6 @@ int MAIN(int argc, char **argv)
                 sk_X509_push(certs, sk_X509_shift(morecerts));
             sk_X509_free(morecerts);
         }
-
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
         CRYPTO_push_info("reading certs from certfile");
@@ -519,8 +577,7 @@ int MAIN(int argc, char **argv)
             int vret;
             STACK_OF(X509) *chain2;
             X509_STORE *store = X509_STORE_new();
-		if (!store)
+            if (!store) {
-			{
                 BIO_printf(bio_err, "Memory allocation error\n");
                 goto export_end;
             }
@@ -549,15 +606,15 @@ int MAIN(int argc, char **argv)
 
         /* Add any CA names */
 
-	for (i = 0; i < sk_STRING_num(canames); i++)
+        for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++) {
-		{
+            catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
-		catmp = (unsigned char *)sk_STRING_value(canames, i);
             X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
         }
 
         if (csp_name && key)
             EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
-				MBSTRING_ASC, (unsigned char *)csp_name, -1);
+                                      MBSTRING_ASC, (unsigned char *)csp_name,
+                                      -1);
 
         if (add_lmk && key)
             EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
@@ -568,12 +625,13 @@ int MAIN(int argc, char **argv)
 # endif
 
         if (!noprompt &&
-		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
+            EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:",
-		{
+                               1)) {
             BIO_printf(bio_err, "Can't read Password\n");
             goto export_end;
         }
-	if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+        if (!twopass)
+            BUF_strlcpy(macpass, pass, sizeof macpass);
 
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
@@ -583,19 +641,15 @@ int MAIN(int argc, char **argv)
         p12 = PKCS12_create(cpass, name, key, ucert, certs,
                             key_pbe, cert_pbe, iter, -1, keytype);
 
-	if (!p12)
+        if (!p12) {
-		{
             ERR_print_errors(bio_err);
             goto export_end;
         }
 
-	if (macalg)
+        if (macalg) {
-		{
             macmd = EVP_get_digestbyname(macalg);
-		if (!macmd)
+            if (!macmd) {
-			{
+                BIO_printf(bio_err, "Unknown digest algorithm %s\n", macalg);
-			BIO_printf(bio_err, "Unknown digest algorithm %s\n", 
-						macalg);
             }
         }
 
@@ -618,9 +672,12 @@ int MAIN(int argc, char **argv)
         CRYPTO_push_info("process -export_cert: freeing");
 # endif
 
-	if (key) EVP_PKEY_free(key);
+        if (key)
-	if (certs) sk_X509_pop_free(certs, X509_free);
+            EVP_PKEY_free(key);
-	if (ucert) X509_free(ucert);
+        if (certs)
+            sk_X509_pop_free(certs, X509_free);
+        if (ucert)
+            X509_free(ucert);
 
 # ifdef CRYPTO_MDEBUG
         CRYPTO_pop_info();
@@ -633,11 +690,12 @@ int MAIN(int argc, char **argv)
         ERR_print_errors(bio_err);
         goto end;
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("read import password");
 # endif
-    if(!noprompt && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:", 0)) {
+    if (!noprompt
+        && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:",
+                              0)) {
         BIO_printf(bio_err, "Can't read Password\n");
         goto end;
     }
@@ -645,9 +703,12 @@ int MAIN(int argc, char **argv)
     CRYPTO_pop_info();
 # endif
 
-    if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+    if (!twopass)
+        BUF_strlcpy(macpass, pass, sizeof macpass);
 
-    if (options & INFO) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1);
+    if ((options & INFO) && p12->mac)
+        BIO_printf(bio_err, "MAC Iteration %ld\n",
+                   p12->mac->iter ? ASN1_INTEGER_get(p12->mac->iter) : 1);
     if (macver) {
 # ifdef CRYPTO_MDEBUG
         CRYPTO_push_info("verify MAC");
@@ -655,7 +716,8 @@ int MAIN(int argc, char **argv)
         /* If we enter empty password try no password first */
         if (!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
             /* If mac and crypto pass the same set it to NULL too */
-		if(!twopass) cpass = NULL;
+            if (!twopass)
+                cpass = NULL;
         } else if (!PKCS12_verify_mac(p12, mpass, -1)) {
             BIO_printf(bio_err, "Mac verify error: invalid password?\n");
             ERR_print_errors(bio_err);
@@ -666,7 +728,6 @@ int MAIN(int argc, char **argv)
         CRYPTO_pop_info();
 # endif
     }
-
 # ifdef CRYPTO_MDEBUG
     CRYPTO_push_info("output keys and certificates");
 # endif
@@ -680,16 +741,21 @@ int MAIN(int argc, char **argv)
 # endif
     ret = 0;
  end:
-    if (p12) PKCS12_free(p12);
+    if (p12)
-    if(export_cert || inrand) app_RAND_write_file(NULL, bio_err);
+        PKCS12_free(p12);
+    if (export_cert || inrand)
+        app_RAND_write_file(NULL, bio_err);
 # ifdef CRYPTO_MDEBUG
     CRYPTO_remove_all_info();
 # endif
     BIO_free(in);
     BIO_free_all(out);
-    if (canames) sk_STRING_free(canames);
+    if (canames)
-    if(passin) OPENSSL_free(passin);
+        sk_OPENSSL_STRING_free(canames);
-    if(passout) OPENSSL_free(passout);
+    if (passin)
+        OPENSSL_free(passin);
+    if (passout)
+        OPENSSL_free(passout);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }
@@ -703,22 +769,25 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
     int ret = 0;
     PKCS7 *p7;
 
-	if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
+    if (!(asafes = PKCS12_unpack_authsafes(p12)))
+        return 0;
     for (i = 0; i < sk_PKCS7_num(asafes); i++) {
         p7 = sk_PKCS7_value(asafes, i);
         bagnid = OBJ_obj2nid(p7->type);
         if (bagnid == NID_pkcs7_data) {
             bags = PKCS12_unpack_p7data(p7);
-			if (options & INFO) BIO_printf (bio_err, "PKCS7 Data\n");
+            if (options & INFO)
+                BIO_printf(bio_err, "PKCS7 Data\n");
         } else if (bagnid == NID_pkcs7_encrypted) {
             if (options & INFO) {
                 BIO_printf(bio_err, "PKCS7 Encrypted data: ");
-				alg_print(bio_err, 
+                alg_print(bio_err, p7->d.encrypted->enc_data->algorithm);
-					p7->d.encrypted->enc_data->algorithm);
             }
             bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
-		} else continue;
+        } else
-		if (!bags) goto err;
+            continue;
+        if (!bags)
+            goto err;
         if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
                                    options, pempass)) {
             sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
@@ -743,8 +812,7 @@ int dump_certs_pkeys_bags (BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
     for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
         if (!dump_certs_pkeys_bag(out,
                                   sk_PKCS12_SAFEBAG_value(bags, i),
-					   pass, passlen,
+                                  pass, passlen, options, pempass))
-					   options, pempass))
             return 0;
     }
     return 1;
@@ -757,14 +825,16 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
     PKCS8_PRIV_KEY_INFO *p8;
     X509 *x509;
 
-	switch (M_PKCS12_bag_type(bag))
+    switch (M_PKCS12_bag_type(bag)) {
-	{
     case NID_keyBag:
-		if (options & INFO) BIO_printf (bio_err, "Key bag\n");
+        if (options & INFO)
-		if (options & NOKEYS) return 1;
+            BIO_printf(bio_err, "Key bag\n");
+        if (options & NOKEYS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         p8 = bag->value.keybag;
-		if (!(pkey = EVP_PKCS82PKEY (p8))) return 0;
+        if (!(pkey = EVP_PKCS82PKEY(p8)))
+            return 0;
         print_attribs(out, p8->attributes, "Key Attributes");
         PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
         EVP_PKEY_free(pkey);
@@ -775,7 +845,8 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
             BIO_printf(bio_err, "Shrouded Keybag: ");
             alg_print(bio_err, bag->value.shkeybag->algor);
         }
-		if (options & NOKEYS) return 1;
+        if (options & NOKEYS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
             return 0;
@@ -790,22 +861,28 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
         break;
 
     case NID_certBag:
-		if (options & INFO) BIO_printf (bio_err, "Certificate bag\n");
+        if (options & INFO)
-		if (options & NOCERTS) return 1;
+            BIO_printf(bio_err, "Certificate bag\n");
+        if (options & NOCERTS)
+            return 1;
         if (PKCS12_get_attr(bag, NID_localKeyID)) {
-			if (options & CACERTS) return 1;
+            if (options & CACERTS)
-		} else if (options & CLCERTS) return 1;
+                return 1;
+        } else if (options & CLCERTS)
+            return 1;
         print_attribs(out, bag->attrib, "Bag Attributes");
         if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate)
             return 1;
-		if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
+        if (!(x509 = PKCS12_certbag2x509(bag)))
+            return 0;
         dump_cert_text(out, x509);
         PEM_write_bio_X509(out, x509);
         X509_free(x509);
         break;
 
     case NID_safeContentsBag:
-		if (options & INFO) BIO_printf (bio_err, "Safe Contents bag\n");
+        if (options & INFO)
+            BIO_printf(bio_err, "Safe Contents bag\n");
         print_attribs(out, bag->attrib, "Bag Attributes");
         return dump_certs_pkeys_bags(out, bag->value.safes, pass,
                                      passlen, options, pempass);
@@ -830,15 +907,19 @@ int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
     STACK_OF(X509) *chn;
     int i = 0;
 
-	/* FIXME: Should really check the return status of X509_STORE_CTX_init
+    /*
-	 * for an error, but how that fits into the return value of this
+     * FIXME: Should really check the return status of X509_STORE_CTX_init
-	 * function is less obvious. */
+     * for an error, but how that fits into the return value of this function
+     * is less obvious.
+     */
     X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
     if (X509_verify_cert(&store_ctx) <= 0) {
         i = X509_STORE_CTX_get_error(&store_ctx);
         if (i == 0)
-			/* avoid returning 0 if X509_verify_cert() did not
+            /*
-			 * set an appropriate error value in the context */
+             * avoid returning 0 if X509_verify_cert() did not set an
+             * appropriate error value in the context
+             */
             i = -1;
         chn = NULL;
         goto err;
@@ -889,13 +970,15 @@ int cert_load(BIO *in, STACK_OF(X509) *sk)
 # ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
 # endif
-	if(ret) ERR_clear_error();
+    if (ret)
+        ERR_clear_error();
     return ret;
 }
 
 /* Generalised attribute print: handle PKCS#8 and bag attributes */
 
-int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
+int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,
+                  const char *name)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *av;
@@ -917,13 +1000,14 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
         if (attr_nid == NID_undef) {
             i2a_ASN1_OBJECT(out, attr->object);
             BIO_printf(out, ": ");
-		} else BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
+        } else
+            BIO_printf(out, "%s: ", OBJ_nid2ln(attr_nid));
 
         if (sk_ASN1_TYPE_num(attr->value.set)) {
             av = sk_ASN1_TYPE_value(attr->value.set, 0);
             switch (av->type) {
             case V_ASN1_BMPSTRING:
-        			value = uni2asc(av->value.bmpstring->data,
+                value = OPENSSL_uni2asc(av->value.bmpstring->data,
                                         av->value.bmpstring->length);
                 BIO_printf(out, "%s\n", value);
                 OPENSSL_free(value);
@@ -945,7 +1029,8 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
                 BIO_printf(out, "<Unsupported tag %d>\n", av->type);
                 break;
             }
-		} else BIO_printf(out, "<No Values>\n");
+        } else
+            BIO_printf(out, "<No Values>\n");
     }
     return 1;
 }
@@ -953,21 +1038,20 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
 void hex_prin(BIO *out, unsigned char *buf, int len)
 {
     int i;
-	for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]);
+    for (i = 0; i < len; i++)
+        BIO_printf(out, "%02X ", buf[i]);
 }
 
 static int set_pbe(BIO *err, int *ppbe, const char *str)
 {
     if (!str)
         return 0;
-	if (!strcmp(str, "NONE"))
+    if (!strcmp(str, "NONE")) {
-		{
         *ppbe = -1;
         return 1;
     }
     *ppbe = OBJ_txt2nid(str);
-	if (*ppbe == NID_undef)
+    if (*ppbe == NID_undef) {
-		{
         BIO_printf(bio_err, "Unknown PBE algorithm %s\n", str);
         return 0;
     }

apps/pkcs7.c

@@ -71,7 +71,8 @@
 #undef PROG
 #define PROG    pkcs7_main
 
-/* -inform arg	- input format - default PEM (DER or PEM)
+/*-
+ * -inform arg  - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
@@ -82,9 +83,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     PKCS7 *p7 = NULL;
     int i, badops = 0;
     BIO *in = NULL, *out = NULL;
@@ -113,29 +111,24 @@ int MAIN(int argc, char **argv)
     prog = argv[0];
     argc--;
     argv++;
-	while (argc >= 1)
+    while (argc >= 1) {
-		{
+        if (strcmp(*argv, "-inform") == 0) {
-		if 	(strcmp(*argv,"-inform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             informat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-outform") == 0) {
-		else if (strcmp(*argv,"-outform") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outformat = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-in") == 0) {
-		else if (strcmp(*argv,"-in") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             infile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-out") == 0) {
-		else if (strcmp(*argv,"-out") == 0)
+            if (--argc < 1)
-			{
+                goto bad;
-			if (--argc < 1) goto bad;
             outfile = *(++argv);
-			}
+        } else if (strcmp(*argv, "-noout") == 0)
-		else if (strcmp(*argv,"-noout") == 0)
             noout = 1;
         else if (strcmp(*argv, "-text") == 0)
             text = 1;
@@ -144,14 +137,13 @@ int MAIN(int argc, char **argv)
         else if (strcmp(*argv, "-print_certs") == 0)
             print_certs = 1;
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*argv,"-engine") == 0)
+        else if (strcmp(*argv, "-engine") == 0) {
-			{
+            if (--argc < 1)
-			if (--argc < 1) goto bad;
+                goto bad;
             engine = *(++argv);
         }
 #endif
-		else
+        else {
-			{
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badops = 1;
             break;
@@ -160,8 +152,7 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (badops)
+    if (badops) {
-		{
  bad:
         BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
         BIO_printf(bio_err, "where options are\n");
@@ -169,11 +160,14 @@ bad:
         BIO_printf(bio_err, " -outform arg  output format - DER or PEM\n");
         BIO_printf(bio_err, " -in arg       input file\n");
         BIO_printf(bio_err, " -out arg      output file\n");
-		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err," -text         print full details of certificates\n");
+                   " -print_certs  print any certs or crl in the input\n");
+        BIO_printf(bio_err,
+                   " -text         print full details of certificates\n");
         BIO_printf(bio_err, " -noout        don't output encoded data\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
         ret = 1;
         goto end;
@@ -182,24 +176,21 @@ bad:
     ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
     in = BIO_new(BIO_s_file());
     out = BIO_new(BIO_s_file());
-	if ((in == NULL) || (out == NULL))
+    if ((in == NULL) || (out == NULL)) {
-		{
         ERR_print_errors(bio_err);
         goto end;
     }
 
     if (infile == NULL)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
-	else
+    else {
-		{
         if (BIO_read_filename(in, infile) <= 0)
-		if (in == NULL)
+            if (in == NULL) {
-			{
                 perror(infile);
                 goto end;
             }
@@ -209,20 +200,17 @@ bad:
         p7 = d2i_PKCS7_bio(in, NULL);
     else if (informat == FORMAT_PEM)
         p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);
-	else
+    else {
-		{
         BIO_printf(bio_err, "bad input format specified for pkcs7 object\n");
         goto end;
     }
-	if (p7 == NULL)
+    if (p7 == NULL) {
-		{
         BIO_printf(bio_err, "unable to load PKCS7 object\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (outfile == NULL)
+    if (outfile == NULL) {
-		{
         BIO_set_fp(out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -230,11 +218,8 @@ bad:
             out = BIO_push(tmpbio, out);
         }
 #endif
-		}
+    } else {
-	else
+        if (BIO_write_filename(out, outfile) <= 0) {
-		{
-		if (BIO_write_filename(out,outfile) <= 0)
-			{
             perror(outfile);
             goto end;
         }
@@ -243,14 +228,12 @@ bad:
     if (p7_print)
         PKCS7_print_ctx(out, p7, 0, NULL);
 
-	if (print_certs)
+    if (print_certs) {
-		{
         STACK_OF(X509) *certs = NULL;
         STACK_OF(X509_CRL) *crls = NULL;
 
         i = OBJ_obj2nid(p7->type);
-		switch (i)
+        switch (i) {
-			{
         case NID_pkcs7_signed:
             certs = p7->d.sign->cert;
             crls = p7->d.sign->crl;
@@ -263,31 +246,31 @@ bad:
             break;
         }
 
-		if (certs != NULL)
+        if (certs != NULL) {
-			{
             X509 *x;
 
-			for (i=0; i<sk_X509_num(certs); i++)
+            for (i = 0; i < sk_X509_num(certs); i++) {
-				{
                 x = sk_X509_value(certs, i);
-				if(text) X509_print(out, x);
+                if (text)
-				else dump_cert_text(out, x);
+                    X509_print(out, x);
+                else
+                    dump_cert_text(out, x);
 
-				if(!noout) PEM_write_bio_X509(out,x);
+                if (!noout)
+                    PEM_write_bio_X509(out, x);
                 BIO_puts(out, "\n");
             }
         }
-		if (crls != NULL)
+        if (crls != NULL) {
-			{
             X509_CRL *crl;
 
-			for (i=0; i<sk_X509_CRL_num(crls); i++)
+            for (i = 0; i < sk_X509_CRL_num(crls); i++) {
-				{
                 crl = sk_X509_CRL_value(crls, i);
 
                 X509_CRL_print(out, crl);
 
-				if(!noout)PEM_write_bio_X509_CRL(out,crl);
+                if (!noout)
+                    PEM_write_bio_X509_CRL(out, crl);
                 BIO_puts(out, "\n");
             }
         }
@@ -306,8 +289,7 @@ bad:
             goto end;
         }
 
-		if (!i)
+        if (!i) {
-			{
             BIO_printf(bio_err, "unable to write pkcs7 object\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -315,9 +297,12 @@ bad:
     }
     ret = 0;
  end:
-	if (p7 != NULL) PKCS7_free(p7);
+    if (p7 != NULL)
-	if (in != NULL) BIO_free(in);
+        PKCS7_free(p7);
-	if (out != NULL) BIO_free_all(out);
+    if (in != NULL)
+        BIO_free(in);
+    if (out != NULL)
+        BIO_free_all(out);
     apps_shutdown();
     OPENSSL_EXIT(ret);
 }

apps/pkcs8.c

@@ -1,6 +1,7 @@
 /* pkcs8.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) 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.
@@ -56,6 +57,7 @@
  *
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "apps.h"
 #include <openssl/pem.h>
@@ -90,7 +92,8 @@ int MAIN(int argc, char **argv)
     char *engine = NULL;
 #endif
 
-	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
+    if (bio_err == NULL)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
@@ -101,63 +104,61 @@ int MAIN(int argc, char **argv)
     ERR_load_crypto_strings();
     OpenSSL_add_all_algorithms();
     args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-v2")) {
-		if (!strcmp(*args,"-v2"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 cipher = EVP_get_cipherbyname(*args);
-				if (!cipher)
+                if (!cipher) {
-					{
+                    BIO_printf(bio_err, "Unknown cipher %s\n", *args);
-					BIO_printf(bio_err,
-						 "Unknown cipher %s\n", *args);
                     badarg = 1;
                 }
-				}
+            } else
-			else
                 badarg = 1;
-			}
+        } else if (!strcmp(*args, "-v1")) {
-		else if (!strcmp(*args,"-v1"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 pbe_nid = OBJ_txt2nid(*args);
-				if (pbe_nid == NID_undef)
+                if (pbe_nid == NID_undef) {
-					{
+                    BIO_printf(bio_err, "Unknown PBE algorithm %s\n", *args);
-					BIO_printf(bio_err,
-						 "Unknown PBE algorithm %s\n", *args);
                     badarg = 1;
                 }
-				}
+            } else
-			else
+                badarg = 1;
+        } else if (!strcmp(*args, "-v2prf")) {
+            if (args[1]) {
+                args++;
+                pbe_nid = OBJ_txt2nid(*args);
+                if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
+                    BIO_printf(bio_err, "Unknown PRF algorithm %s\n", *args);
                     badarg = 1;
                 }
-		else if (!strcmp(*args,"-inform"))
+            } else
-			{
+                badarg = 1;
-			if (args[1])
+        } else if (!strcmp(*args, "-inform")) {
-				{
+            if (args[1]) {
                 args++;
                 informat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-outform")) {
-		else if (!strcmp(*args,"-outform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outformat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-topk8"))
-		else if (!strcmp (*args, "-topk8"))
             topk8 = 1;
         else if (!strcmp(*args, "-noiter"))
             iter = 1;
-		else if (!strcmp (*args, "-nocrypt"))
+        else if (!strcmp(*args, "-iter")) {
+            if (args[1]) {
+                iter = atoi(*(++args));
+                if (iter <= 0)
+                    badarg = 1;
+            } else
+                badarg = 1;
+        } else if (!strcmp(*args, "-nocrypt"))
             nocrypt = 1;
         else if (!strcmp(*args, "-nooct"))
             p8_broken = PKCS8_NO_OCTET;
@@ -165,76 +166,79 @@ int MAIN(int argc, char **argv)
             p8_broken = PKCS8_NS_DB;
         else if (!strcmp(*args, "-embed"))
             p8_broken = PKCS8_EMBEDDED_PARAM;
-		else if (!strcmp(*args,"-passin"))
+        else if (!strcmp(*args, "-passin")) {
-			{
+            if (args[1])
-			if (!args[1]) goto bad;
                 passargin = *(++args);
-			}
+            else
-		else if (!strcmp(*args,"-passout"))
+                badarg = 1;
-			{
+        } else if (!strcmp(*args, "-passout")) {
-			if (!args[1]) goto bad;
+            if (args[1])
                 passargout = *(++args);
+            else
+                badarg = 1;
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (args[1])
-			if (!args[1]) goto bad;
                 engine = *(++args);
+            else
+                badarg = 1;
         }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			if (args[1])
-				{
                 args++;
                 infile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-out")) {
-		else if (!strcmp (*args, "-out"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else
-		else badarg = 1;
+            badarg = 1;
         args++;
     }
 
-	if (badarg)
+    if (badarg) {
-		{
-		bad:
         BIO_printf(bio_err, "Usage pkcs8 [options]\n");
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, "-in file        input file\n");
         BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passin arg     input file pass phrase source\n");
         BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
         BIO_printf(bio_err, "-out file       output file\n");
-		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passout arg    output file pass phrase source\n");
         BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
+                   "-nooct          use (nonstandard) no octet format\n");
-		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+        BIO_printf(bio_err,
+                   "-embed          use (nonstandard) embedded DSA parameters format\n");
+        BIO_printf(bio_err,
+                   "-nsdb           use (nonstandard) DSA Netscape DB format\n");
+        BIO_printf(bio_err, "-iter count     use count as iteration count\n");
         BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
-		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
+        BIO_printf(bio_err,
-		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+                   "-nocrypt        use or expect unencrypted private key\n");
-		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
+                   "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
+        BIO_printf(bio_err,
+                   "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
         goto end;
     }
-
 #ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
         BIO_printf(bio_err, "Error getting passwords\n");
         goto end;
     }
@@ -242,29 +246,20 @@ int MAIN(int argc, char **argv)
     if ((pbe_nid == -1) && !cipher)
         pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
-	if (infile)
+    if (infile) {
-		{
+        if (!(in = BIO_new_file(infile, "rb"))) {
-		if (!(in = BIO_new_file(infile, "rb")))
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open input file %s\n", infile);
             goto end;
         }
-		}
+    } else
-	else
         in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open output file %s\n", outfile);
             goto end;
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -273,46 +268,37 @@ int MAIN(int argc, char **argv)
         }
 #endif
     }
-	if (topk8)
+    if (topk8) {
-		{
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-		BIO_free(in); /* Not needed in this section */
-		pkey = load_key(bio_err, infile, informat, 1,
-			passin, e, "key");
         if (!pkey)
             goto end;
-		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
+        if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-			{
             BIO_printf(bio_err, "Error converting key\n");
             ERR_print_errors(bio_err);
             goto end;
         }
-		if (nocrypt)
+        if (nocrypt) {
-			{
             if (outformat == FORMAT_PEM)
                 PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
             else if (outformat == FORMAT_ASN1)
                 i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
-			else
+            else {
-				{
                 BIO_printf(bio_err, "Bad format specified for key\n");
                 goto end;
             }
-			}
+        } else {
-		else
-			{
             if (passout)
                 p8pass = passout;
-			else
+            else {
-				{
                 p8pass = pass;
-				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
+                if (EVP_read_pw_string
+                    (pass, sizeof pass, "Enter Encryption Password:", 1))
                     goto end;
             }
             app_RAND_load_file(NULL, bio_err, 0);
             if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                      p8pass, strlen(p8pass),
-					NULL, 0, iter, p8inf)))
+                                     NULL, 0, iter, p8inf))) {
-				{
                 BIO_printf(bio_err, "Error encrypting key\n");
                 ERR_print_errors(bio_err);
                 goto end;
@@ -322,8 +308,7 @@ int MAIN(int argc, char **argv)
                 PEM_write_bio_PKCS8(out, p8);
             else if (outformat == FORMAT_ASN1)
                 i2d_PKCS8_bio(out, p8);
-			else
+            else {
-				{
                 BIO_printf(bio_err, "Bad format specified for key\n");
                 goto end;
             }
@@ -333,65 +318,54 @@ int MAIN(int argc, char **argv)
         goto end;
     }
 
-	if (nocrypt)
+    if (nocrypt) {
-		{
         if (informat == FORMAT_PEM)
             p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in, NULL, NULL, NULL);
         else if (informat == FORMAT_ASN1)
             p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
-		else
+        else {
-			{
             BIO_printf(bio_err, "Bad format specified for key\n");
             goto end;
         }
-		}
+    } else {
-	else
-		{
         if (informat == FORMAT_PEM)
             p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
         else if (informat == FORMAT_ASN1)
             p8 = d2i_PKCS8_bio(in, NULL);
-		else
+        else {
-			{
             BIO_printf(bio_err, "Bad format specified for key\n");
             goto end;
         }
 
-		if (!p8)
+        if (!p8) {
-			{
             BIO_printf(bio_err, "Error reading key\n");
             ERR_print_errors(bio_err);
             goto end;
         }
         if (passin)
             p8pass = passin;
-		else
+        else {
-			{
             p8pass = pass;
             EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
         }
         p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
     }
 
-	if (!p8inf)
+    if (!p8inf) {
-		{
         BIO_printf(bio_err, "Error decrypting key\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
+    if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-		{
         BIO_printf(bio_err, "Error converting key\n");
         ERR_print_errors(bio_err);
         goto end;
     }
 
-	if (p8inf->broken)
+    if (p8inf->broken) {
-		{
         BIO_printf(bio_err, "Warning: broken key encoding: ");
-		switch (p8inf->broken)
+        switch (p8inf->broken) {
-			{
         case PKCS8_NO_OCTET:
             BIO_printf(bio_err, "No Octet String in PrivateKey\n");
             break;
@@ -404,6 +378,10 @@ int MAIN(int argc, char **argv)
             BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
             break;
 
+        case PKCS8_NEG_PRIVKEY:
+            BIO_printf(bio_err, "DSA private key value is negative\n");
+            break;
+
         default:
             BIO_printf(bio_err, "Unknown broken type\n");
             break;
@@ -414,8 +392,7 @@ int MAIN(int argc, char **argv)
         PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
     else if (outformat == FORMAT_ASN1)
         i2d_PrivateKey_bio(out, pkey);
-	else
+    else {
-		{
         BIO_printf(bio_err, "Bad format specified for key\n");
         goto end;
     }

apps/pkey.c

@@ -1,6 +1,7 @@
 /* apps/pkey.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -95,129 +96,103 @@ int MAIN(int argc, char **argv)
     ERR_load_crypto_strings();
     OpenSSL_add_all_algorithms();
     args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-inform")) {
-		if (!strcmp(*args,"-inform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 informat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-outform")) {
-		else if (!strcmp(*args,"-outform"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outformat = str2fmt(*args);
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-passin")) {
-		else if (!strcmp(*args,"-passin"))
+            if (!args[1])
-			{
+                goto bad;
-			if (!args[1]) goto bad;
             passargin = *(++args);
-			}
+        } else if (!strcmp(*args, "-passout")) {
-		else if (!strcmp(*args,"-passout"))
+            if (!args[1])
-			{
+                goto bad;
-			if (!args[1]) goto bad;
             passargout = *(++args);
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
             engine = *(++args);
         }
 #endif
-		else if (!strcmp (*args, "-in"))
+        else if (!strcmp(*args, "-in")) {
-			{
+            if (args[1]) {
-			if (args[1])
-				{
                 args++;
                 infile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-out")) {
-		else if (!strcmp (*args, "-out"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (strcmp(*args, "-pubin") == 0) {
-		else if (strcmp(*args,"-pubin") == 0)
-			{
             pubin = 1;
             pubout = 1;
             pubtext = 1;
-			}
+        } else if (strcmp(*args, "-pubout") == 0)
-		else if (strcmp(*args,"-pubout") == 0)
             pubout = 1;
-		else if (strcmp(*args,"-text_pub") == 0)
+        else if (strcmp(*args, "-text_pub") == 0) {
-			{
             pubtext = 1;
             text = 1;
-			}
+        } else if (strcmp(*args, "-text") == 0)
-		else if (strcmp(*args,"-text") == 0)
             text = 1;
         else if (strcmp(*args, "-noout") == 0)
             noout = 1;
-		else
+        else {
-			{
             cipher = EVP_get_cipherbyname(*args + 1);
-			if (!cipher)
+            if (!cipher) {
-				{
+                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
-				BIO_printf(bio_err, "Unknown cipher %s\n",
-								*args + 1);
                 badarg = 1;
             }
         }
         args++;
     }
 
-	if (badarg)
+    if (badarg) {
-		{
  bad:
         BIO_printf(bio_err, "Usage pkey [options]\n");
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, "-in file        input file\n");
         BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passin arg     input file pass phrase source\n");
         BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
         BIO_printf(bio_err, "-out file       output file\n");
-		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
+        BIO_printf(bio_err,
+                   "-passout arg    output file pass phrase source\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
         return 1;
     }
-
 #ifndef OPENSSL_NO_ENGINE
     e = setup_engine(bio_err, engine, 0);
 #endif
 
-	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
+    if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
-		{
         BIO_printf(bio_err, "Error getting passwords\n");
         goto end;
     }
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if (!(out = BIO_new_file (outfile, "wb")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open output file %s\n", outfile);
             goto end;
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -231,38 +206,30 @@ int MAIN(int argc, char **argv)
         pkey = load_pubkey(bio_err, infile, informat, 1,
                            passin, e, "Public Key");
     else
-		pkey = load_key(bio_err, infile, informat, 1,
+        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
-			passin, e, "key");
     if (!pkey)
         goto end;
 
-	if (!noout)
+    if (!noout) {
-		{
+        if (outformat == FORMAT_PEM) {
-		if (outformat == FORMAT_PEM) 
-			{
             if (pubout)
                 PEM_write_bio_PUBKEY(out, pkey);
             else
                 PEM_write_bio_PrivateKey(out, pkey, cipher,
                                          NULL, 0, NULL, passout);
-			}
+        } else if (outformat == FORMAT_ASN1) {
-		else if (outformat == FORMAT_ASN1)
-			{
             if (pubout)
                 i2d_PUBKEY_bio(out, pkey);
             else
                 i2d_PrivateKey_bio(out, pkey);
-			}
+        } else {
-		else
-			{
             BIO_printf(bio_err, "Bad format specified for key\n");
             goto end;
         }
 
     }
 
-	if (text)
+    if (text) {
-		{
         if (pubtext)
             EVP_PKEY_print_public(out, pkey, 0, NULL);
         else

apps/pkeyparam.c

@@ -1,6 +1,7 @@
 /* apps/pkeyparam.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -74,7 +75,6 @@ int MAIN(int argc, char **argv)
     EVP_PKEY *pkey = NULL;
     int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
     char *engine = NULL;
 #endif
     int ret = 1;
@@ -88,30 +88,24 @@ int MAIN(int argc, char **argv)
     ERR_load_crypto_strings();
     OpenSSL_add_all_algorithms();
     args = argv + 1;
-	while (!badarg && *args && *args[0] == '-')
+    while (!badarg && *args && *args[0] == '-') {
-		{
+        if (!strcmp(*args, "-in")) {
-		if (!strcmp (*args, "-in"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 infile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
-			}
+        } else if (!strcmp(*args, "-out")) {
-		else if (!strcmp (*args, "-out"))
+            if (args[1]) {
-			{
-			if (args[1])
-				{
                 args++;
                 outfile = *args;
-				}
+            } else
-			else badarg = 1;
+                badarg = 1;
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(*args,"-engine") == 0)
+        else if (strcmp(*args, "-engine") == 0) {
-			{
+            if (!args[1])
-			if (!args[1]) goto bad;
+                goto bad;
             engine = *(++args);
         }
 #endif
@@ -123,8 +117,7 @@ int MAIN(int argc, char **argv)
         args++;
     }
 
-	if (badarg)
+    if (badarg) {
-		{
 #ifndef OPENSSL_NO_ENGINE
  bad:
 #endif
@@ -133,40 +126,32 @@ int MAIN(int argc, char **argv)
         BIO_printf(bio_err, "-in file        input file\n");
         BIO_printf(bio_err, "-out file       output file\n");
         BIO_printf(bio_err, "-text           print parameters as text\n");
-		BIO_printf(bio_err, "-noout          don't output encoded parameters\n");
+        BIO_printf(bio_err,
+                   "-noout          don't output encoded parameters\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
         return 1;
     }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
-	if (infile)
+    if (infile) {
-		{
+        if (!(in = BIO_new_file(infile, "r"))) {
-		if (!(in = BIO_new_file (infile, "r")))
+            BIO_printf(bio_err, "Can't open input file %s\n", infile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open input file %s\n", infile);
             goto end;
         }
-		}
+    } else
-	else
         in = BIO_new_fp(stdin, BIO_NOCLOSE);
 
-	if (outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "w"))) {
-		if (!(out = BIO_new_file (outfile, "w")))
+            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
-			{
-			BIO_printf(bio_err,
-				 "Can't open output file %s\n", outfile);
             goto end;
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -177,9 +162,8 @@ int MAIN(int argc, char **argv)
     }
 
     pkey = PEM_read_bio_Parameters(in, NULL);
-	if (!pkey)
+    if (!pkey) {
-		{
+        BIO_printf(bio_err, "Error reading parameters\n");
-		BIO_printf(bio_err, "Error reading paramters\n");
         ERR_print_errors(bio_err);
         goto end;
     }

apps/pkeyutl.c

@@ -1,5 +1,6 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
- * project 2006.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006.
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -55,7 +56,6 @@
  *
  */
 
-
 #include "apps.h"
 #include <string.h>
 #include <openssl/err.h>
@@ -107,73 +107,66 @@ int MAIN(int argc, char **argv)
     argc--;
     argv++;
 
-	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+    if (!bio_err)
+        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
     if (!load_config(bio_err, NULL))
         goto end;
     ERR_load_crypto_strings();
     OpenSSL_add_all_algorithms();
 
-	while(argc >= 1)
+    while (argc >= 1) {
-		{
+        if (!strcmp(*argv, "-in")) {
-		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,"-sigfile"))
-			{
-			if (--argc < 1) badarg = 1;
-			sigfile= *(++argv);
-			}
-		else if(!strcmp(*argv, "-inkey"))
-			{
             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, "-sigfile")) {
+            if (--argc < 1)
+                badarg = 1;
+            else
+                sigfile = *(++argv);
+        } else if (!strcmp(*argv, "-inkey")) {
+            if (--argc < 1)
+                badarg = 1;
+            else {
                 ctx = init_ctx(&keysize,
                                *(++argv), keyform, key_type,
                                passargin, pkey_op, e);
-				if (!ctx)
+                if (!ctx) {
-					{
+                    BIO_puts(bio_err, "Error initializing context\n");
-					BIO_puts(bio_err,
-						"Error initializing context\n");
                     ERR_print_errors(bio_err);
                     badarg = 1;
                 }
             }
-			}
+        } else if (!strcmp(*argv, "-peerkey")) {
-		else if (!strcmp(*argv,"-peerkey"))
-			{
             if (--argc < 1)
                 badarg = 1;
             else if (!setup_peer(bio_err, ctx, peerform, *(++argv)))
                 badarg = 1;
-			}
+        } else if (!strcmp(*argv, "-passin")) {
-		else if (!strcmp(*argv,"-passin"))
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
                 passargin = *(++argv);
-			}
+        } else if (strcmp(*argv, "-peerform") == 0) {
-		else if (strcmp(*argv,"-peerform") == 0)
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
                 peerform = str2fmt(*(++argv));
-			}
+        } else if (strcmp(*argv, "-keyform") == 0) {
-		else if (strcmp(*argv,"-keyform") == 0)
+            if (--argc < 1)
-			{
+                badarg = 1;
-			if (--argc < 1) badarg = 1;
+            else
                 keyform = str2fmt(*(++argv));
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if(!strcmp(*argv, "-engine"))
+        else if (!strcmp(*argv, "-engine")) {
-			{
             if (--argc < 1)
                 badarg = 1;
             else
@@ -202,26 +195,20 @@ int MAIN(int argc, char **argv)
             pkey_op = EVP_PKEY_OP_DECRYPT;
         else if (!strcmp(*argv, "-derive"))
             pkey_op = EVP_PKEY_OP_DERIVE;
-		else if (strcmp(*argv,"-pkeyopt") == 0)
+        else if (strcmp(*argv, "-pkeyopt") == 0) {
-			{
             if (--argc < 1)
                 badarg = 1;
-			else if (!ctx)
+            else if (!ctx) {
-				{
+                BIO_puts(bio_err, "-pkeyopt command before -inkey\n");
-				BIO_puts(bio_err,
-					"-pkeyopt command before -inkey\n");
                 badarg = 1;
-				}
+            } else if (pkey_ctrl_string(ctx, *(++argv)) <= 0) {
-			else if (pkey_ctrl_string(ctx, *(++argv)) <= 0)
-				{
                 BIO_puts(bio_err, "parameter setting error\n");
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else
-		else badarg = 1;
+            badarg = 1;
-		if(badarg)
+        if (badarg) {
-			{
             usage();
             goto end;
         }
@@ -229,20 +216,17 @@ int MAIN(int argc, char **argv)
         argv++;
     }
 
-	if (!ctx)
+    if (!ctx) {
-		{
         usage();
         goto end;
     }
 
-	if (sigfile && (pkey_op != EVP_PKEY_OP_VERIFY))
+    if (sigfile && (pkey_op != EVP_PKEY_OP_VERIFY)) {
-		{
         BIO_puts(bio_err, "Signature file specified for non verify\n");
         goto end;
     }
 
-	if (!sigfile && (pkey_op == EVP_PKEY_OP_VERIFY))
+    if (!sigfile && (pkey_op == EVP_PKEY_OP_VERIFY)) {
-		{
         BIO_puts(bio_err, "No signature file specified for verify\n");
         goto end;
     }
@@ -250,33 +234,24 @@ int MAIN(int argc, char **argv)
 /* FIXME: seed PRNG only if needed */
     app_RAND_load_file(NULL, bio_err, 0);
 
-	if (pkey_op != EVP_PKEY_OP_DERIVE)
+    if (pkey_op != EVP_PKEY_OP_DERIVE) {
-		{
+        if (infile) {
-		if(infile)
+            if (!(in = BIO_new_file(infile, "rb"))) {
-			{
+                BIO_puts(bio_err, "Error Opening Input File\n");
-			if(!(in = BIO_new_file(infile, "rb")))
-				{
-				BIO_puts(bio_err,
-					"Error Opening Input File\n");
                 ERR_print_errors(bio_err);
                 goto end;
             }
-			}
+        } else
-		else
             in = BIO_new_fp(stdin, BIO_NOCLOSE);
     }
 
-	if(outfile)
+    if (outfile) {
-		{
+        if (!(out = BIO_new_file(outfile, "wb"))) {
-		if(!(out = BIO_new_file(outfile, "wb")))
-			{
             BIO_printf(bio_err, "Error Creating Output File\n");
             ERR_print_errors(bio_err);
             goto end;
         }
-		}
+    } else {
-	else
-		{
         out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -286,40 +261,32 @@ int MAIN(int argc, char **argv)
 #endif
     }
 
-	if (sigfile)
+    if (sigfile) {
-		{
         BIO *sigbio = BIO_new_file(sigfile, "rb");
-		if (!sigbio)
+        if (!sigbio) {
-			{
+            BIO_printf(bio_err, "Can't open signature file %s\n", sigfile);
-			BIO_printf(bio_err, "Can't open signature file %s\n",
-								sigfile);
             goto end;
         }
         siglen = bio_to_mem(&sig, keysize * 10, sigbio);
         BIO_free(sigbio);
-		if (siglen <= 0)
+        if (siglen <= 0) {
-			{
             BIO_printf(bio_err, "Error reading signature data\n");
             goto end;
         }
     }
 
-	if (in)
+    if (in) {
-		{
         /* Read the input data */
         buf_inlen = bio_to_mem(&buf_in, keysize * 10, in);
-		if(buf_inlen <= 0)
+        if (buf_inlen <= 0) {
-			{
             BIO_printf(bio_err, "Error reading input Data\n");
             exit(1);
         }
-		if(rev)
+        if (rev) {
-			{
             size_t i;
             unsigned char ctmp;
             size_t l = (size_t)buf_inlen;
-			for(i = 0; i < l/2; i++)
+            for (i = 0; i < l / 2; i++) {
-				{
                 ctmp = buf_in[i];
                 buf_in[i] = buf_in[l - 1 - i];
                 buf_in[l - 1 - i] = ctmp;
@@ -327,8 +294,7 @@ int MAIN(int argc, char **argv)
         }
     }
 
-	if(pkey_op == EVP_PKEY_OP_VERIFY)
+    if (pkey_op == EVP_PKEY_OP_VERIFY) {
-		{
         rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
                              buf_in, (size_t)buf_inlen);
         if (rv == 0)
@@ -337,13 +303,10 @@ int MAIN(int argc, char **argv)
             BIO_puts(out, "Signature Verified Successfully\n");
         if (rv >= 0)
             goto end;
-		}
+    } else {
-	else
-		{	
         rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
                       buf_in, (size_t)buf_inlen);
-		if (rv > 0)
+        if (rv > 0) {
-			{
             buf_out = OPENSSL_malloc(buf_outlen);
             if (!buf_out)
                 rv = -1;
@@ -354,19 +317,16 @@ int MAIN(int argc, char **argv)
         }
     }
 
-	if(rv <= 0)
+    if (rv <= 0) {
-		{
         BIO_printf(bio_err, "Public Key operation error\n");
         ERR_print_errors(bio_err);
         goto end;
     }
     ret = 0;
-	if(asn1parse)
+    if (asn1parse) {
-		{
         if (!ASN1_parse_dump(out, buf_out, buf_outlen, 1, -1))
             ERR_print_errors(bio_err);
-		}
+    } else if (hexdump)
-	else if(hexdump)
         BIO_dump(out, (char *)buf_out, buf_outlen);
     else
         BIO_write(out, buf_out, buf_outlen);
@@ -390,21 +350,25 @@ static void usage()
     BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
     BIO_printf(bio_err, "-in file        input file\n");
     BIO_printf(bio_err, "-out file       output file\n");
-	BIO_printf(bio_err, "-signature file signature file (verify operation only)\n");
+    BIO_printf(bio_err,
+               "-sigfile file signature file (verify operation only)\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, "-pubin          input is a public key\n");
-	BIO_printf(bio_err, "-certin         input is a certificate carrying a public key\n");
+    BIO_printf(bio_err,
+               "-certin         input is a certificate carrying a public key\n");
     BIO_printf(bio_err, "-pkeyopt X:Y    public key options\n");
     BIO_printf(bio_err, "-sign           sign with private key\n");
     BIO_printf(bio_err, "-verify         verify with public key\n");
-	BIO_printf(bio_err, "-verifyrecover  verify with public key, recover original data\n");
+    BIO_printf(bio_err,
+               "-verifyrecover  verify with public key, recover original data\n");
     BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
     BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
     BIO_printf(bio_err, "-derive         derive shared secret\n");
     BIO_printf(bio_err, "-hexdump        hex dump output\n");
 #ifndef OPENSSL_NO_ENGINE
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    BIO_printf(bio_err,
+               "-engine e       use engine e, possibly a hardware device.\n");
 #endif
     BIO_printf(bio_err, "-passin arg     pass phrase source\n");
 
@@ -421,18 +385,15 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
     X509 *x;
     if (((pkey_op == EVP_PKEY_OP_SIGN) || (pkey_op == EVP_PKEY_OP_DECRYPT)
          || (pkey_op == EVP_PKEY_OP_DERIVE))
-		&& (key_type != KEY_PRIVKEY))
+        && (key_type != KEY_PRIVKEY)) {
-		{
         BIO_printf(bio_err, "A private key is needed for this operation\n");
         goto end;
     }
-	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
-		{
         BIO_printf(bio_err, "Error getting password\n");
         goto end;
     }
-	switch(key_type)
+    switch (key_type) {
-		{
     case KEY_PRIVKEY:
         pkey = load_key(bio_err, keyfile, keyform, 0,
                         passin, e, "Private Key");
@@ -444,10 +405,8 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
         break;
 
     case KEY_CERT:
-		x = load_cert(bio_err, keyfile, keyform,
+        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
-			NULL, e, "Certificate");
+        if (x) {
-		if(x)
-			{
             pkey = X509_get_pubkey(x);
             X509_free(x);
         }
@@ -467,8 +426,7 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
     if (!ctx)
         goto end;
 
-	switch(pkey_op)
+    switch (pkey_op) {
-		{
     case EVP_PKEY_OP_SIGN:
         rv = EVP_PKEY_sign_init(ctx);
         break;
@@ -494,8 +452,7 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
         break;
     }
 
-	if (rv <= 0)
+    if (rv <= 0) {
-		{
         EVP_PKEY_CTX_free(ctx);
         ctx = NULL;
     }
@@ -507,7 +464,6 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
 
     return ctx;
 
-
 }
 
 static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
@@ -515,16 +471,14 @@ static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
 {
     EVP_PKEY *peer = NULL;
     int ret;
-	if (!ctx)
+    if (!ctx) {
-		{
         BIO_puts(err, "-peerkey command before -inkey\n");
         return 0;
     }
 
     peer = load_pubkey(bio_err, file, peerform, 0, NULL, NULL, "Peer Key");
 
-	if (!peer)
+    if (!peer) {
-		{
         BIO_printf(bio_err, "Error reading peer key %s\n", file);
         ERR_print_errors(err);
         return 0;
@@ -543,8 +497,7 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
                     unsigned char *in, size_t inlen)
 {
     int rv = 0;
-	switch(pkey_op)
+    switch (pkey_op) {
-		{
     case EVP_PKEY_OP_VERIFYRECOVER:
         rv = EVP_PKEY_verify_recover(ctx, out, poutlen, in, inlen);
         break;

apps/prime.c

@@ -52,7 +52,6 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
-
 #undef PROG
 #define PROG prime_main
 
@@ -76,8 +75,7 @@ int MAIN(int argc, char **argv)
 
     --argc;
     ++argv;
-    while (argc >= 1 && **argv == '-')
+    while (argc >= 1 && **argv == '-') {
-	{
         if (!strcmp(*argv, "-hex"))
             hex = 1;
         else if (!strcmp(*argv, "-generate"))
@@ -94,8 +92,7 @@ int MAIN(int argc, char **argv)
                 goto bad;
             else
                 checks = atoi(*++argv);
-	else
+        else {
-	    {
             BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
             goto bad;
         }
@@ -103,14 +100,12 @@ int MAIN(int argc, char **argv)
         ++argv;
     }
 
-    if (argv[0] == NULL && !generate)
+    if (argv[0] == NULL && !generate) {
-	{
         BIO_printf(bio_err, "No prime specified\n");
         goto bad;
     }
 
-    if ((bio_out=BIO_new(BIO_s_file())) != NULL)
+    if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
-	{
         BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -120,12 +115,10 @@ int MAIN(int argc, char **argv)
 #endif
     }
 
-    if(generate)
+    if (generate) {
-	{
         char *s;
 
-	if(!bits)
+        if (!bits) {
-	    {
             BIO_printf(bio_err, "Specifiy the number of bits.\n");
             return 1;
         }
@@ -134,9 +127,7 @@ int MAIN(int argc, char **argv)
         s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
         BIO_printf(bio_out, "%s\n", s);
         OPENSSL_free(s);
-	}
+    } else {
-    else
-	{
         if (hex)
             BN_hex2bn(&bn, argv[0]);
         else

apps/privkey.pem

@@ -1,18 +1,16 @@
------BEGIN RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMo7DFNMqywUA1O/
-DEK-Info: DES-EDE3-CBC,BA26229A1653B7FF
+qvWqCOm6rGrUAcR+dKsSXw6y2qiKO7APDDyotc0b4Mxwqjga98npex2RBIwUoCGJ
-
+iEmMXo/a8RbXVUZ+ZwcAX7PC+XeXVC5qoajaBBkd2MvYmib/2PqnNrgvhHsUL5dO
-6nhWG8PKhTPO/s3ZvjUa6226NlKdvPDZFsNXOOoSUs9ejxpb/aj5huhs6qRYzsz9
+xhC7cRqxLM/g45k3Yyw+nGa+WkTdAgMBAAECgYBMBT5w4dVG0I8foGFnz+9hzWab
-Year47uaAZYhGD0vAagnNiBnYmjWEpN9G/wQxG7pgZThK1ZxDi63qn8aQ8UjuGHo
+Ee9IKjE5TcKmB93ilXQyjrWO5+zPmbc7ou6aAKk9IaPCTY1kCyzW7pho7Xdt+RFq
-F6RpnnBQIAnWTWqr/Qsybtc5EoNkrj/Cpx0OfbSr6gZsFBCxwX1R1hT3/mhJ45f3
+TgVXGZZfqtixO7f2/5oqZAkd00eOn9ZrhBpVMu4yXbbDvhDyFe4/oy0HGDjRUhxa
-XMofY32Vdfx9/vtw1O7HmlHXQnXaqnbd9/nn1EpvFJG9+UjPoW7gV4jCOLuR4deE
+Lf6ZlBuTherxm4eFkQJBAPBQwRs9UtqaMAQlagA9pV5UsQjV1WT4IxDURMPfXgCd
-jS8hm+cpkwXmFtk3VGjT9tQXPpMv3JpYfBqgGQoMAJ5Toq0DWcHi6Wg08PsD8lgy
+ETNkB6pP0SmxQm5xhv9N2HY1UtoWpug9s0OU5IJB15sCQQDXbfbjiujNbuOxCFNw
-vmTioPsRg+JGkJkJ8GnusgLpQdlQJbjzd7wGE6ElUFLfOxLo8bLlRHoriHNdWYhh
+68JZaCFVdNovyOWORkpenQLNEjVkmTCS9OayK09ADEYtsdpUGKeF+2EYBNkFr5px
-JjY0LyeTkovcmWxVjImc6ZyBz5Ly4t0BYf1gq3OkjsV91Q1taBxnhiavfizqMCAf
+CajnAkBMYI4PNz1HBuwt1SpMa0tMoMQnV7bbwVV7usskKbC5pzHZUHhzM6z5gEHp
-PPB3sLQnlXG77TOXkNxpqbZfEYrVZW2Nsqqdn8s07Uj4IMONZyq2odYKWFPMJBiM
+0iEisT4Ty7zKXZqsgzefSgoaMAzzAkEAoCIaUhtwXzwdPfvNYnOs3J6doJMimECB
-POYwXjMAOcmFMTHYsVlhcUJuV6LOuipw/FEbTtPH/MYMxLe4zx65dYo1rb4iLKLS
++lbfcyLM8TimvadtRt+KGEg/OYGmLNM2UiqdY+duzdbUpvhYGcwvYwJAQvaoi9z2
-gMtB0o/Wl4Xno3ZXh1ucicYnV2J7NpVcjVq+3SFiCRu2SrSkZHZ23EPS13Ec6fcz
+CkiwSs/PFrLaNlfLJmXRsUBzmiWYoh6+IQJJorEXz7ewI72ee9RBO4s746cgUFwH
-8X/YGA2vTJ8MAOozAzQUwHQYvLk7bIoQVekqDq4p0AZQbhdspHpArCk0Ifqqzg/v
+Ri+qO+HhZFUBqQ==
-Uyky/zZiQYanzDenTSRVI/8wac3olxpU8QvbySxYqmbkgq6bTpXJfYFQfnAttEsC
+-----END PRIVATE KEY-----
-dA4S5UFgyOPZluxCAM4yaJF3Ft6neutNwftuJQMbgCUi9vYg2tGdSw==
------END RSA PRIVATE KEY-----

apps/progs.h

@@ -46,6 +46,7 @@ extern int engine_main(int argc,char *argv[]);
 extern int ocsp_main(int argc, char *argv[]);
 extern int prime_main(int argc, char *argv[]);
 extern int ts_main(int argc, char *argv[]);
+extern int srp_main(int argc, char *argv[]);
 
 #define FUNC_TYPE_GENERAL       1
 #define FUNC_TYPE_MD            2
@@ -106,16 +107,16 @@ FUNCTION functions[] = {
     {FUNC_TYPE_GENERAL, "gendsa", gendsa_main},
 #endif
     {FUNC_TYPE_GENERAL, "genpkey", genpkey_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
     {FUNC_TYPE_GENERAL, "s_server", s_server_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
     {FUNC_TYPE_GENERAL, "s_client", s_client_main},
 #endif
 #ifndef OPENSSL_NO_SPEED
     {FUNC_TYPE_GENERAL, "speed", speed_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
     {FUNC_TYPE_GENERAL, "s_time", s_time_main},
 #endif
     {FUNC_TYPE_GENERAL, "version", version_main},
@@ -125,7 +126,7 @@ FUNCTION functions[] = {
 #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))
+#if !defined(OPENSSL_NO_SOCK)
     {FUNC_TYPE_GENERAL, "ciphers", ciphers_main},
 #endif
     {FUNC_TYPE_GENERAL, "nseq", nseq_main},
@@ -142,9 +143,14 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_ENGINE
     {FUNC_TYPE_GENERAL, "engine", engine_main},
 #endif
+#ifndef OPENSSL_NO_OCSP
     {FUNC_TYPE_GENERAL, "ocsp", ocsp_main},
+#endif
     {FUNC_TYPE_GENERAL, "prime", prime_main},
     {FUNC_TYPE_GENERAL, "ts", ts_main},
+#ifndef OPENSSL_NO_SRP
+    {FUNC_TYPE_GENERAL, "srp", srp_main},
+#endif
 #ifndef OPENSSL_NO_MD2
     {FUNC_TYPE_MD, "md2", dgst_main},
 #endif
@@ -166,6 +172,18 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_RMD160
     {FUNC_TYPE_MD, "rmd160", dgst_main},
 #endif
+#ifndef OPENSSL_NO_SHA224
+    {FUNC_TYPE_MD, "sha224", dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA256
+    {FUNC_TYPE_MD, "sha256", dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA384
+    {FUNC_TYPE_MD, "sha384", dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA512
+    {FUNC_TYPE_MD, "sha512", dgst_main},
+#endif
 #ifndef OPENSSL_NO_AES
     {FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main},
 #endif

apps/progs.pl

@@ -22,6 +22,7 @@ typedef struct {
 	const char *name;
 	int (*func)(int argc,char *argv[]);
 	} FUNCTION;
+DECLARE_LHASH_OF(FUNCTION);
 
 FUNCTION functions[] = {
 EOF
@@ -31,7 +32,7 @@ foreach (@ARGV)
 	push(@files,$_);
 	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 
 	elsif ( ($_ =~ /^speed$/))
 		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^engine$/))
@@ -48,11 +49,15 @@ foreach (@ARGV)
 		{ 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"; }
+	elsif ( ($_ =~ /^ocsp$/))
+		{ print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
+	elsif ( ($_ =~ /^srp$/))
+		{ print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
 	else
 		{ print $str; }
 	}
 
-foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
+foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160","sha224","sha256","sha384","sha512")
 	{
 	push(@files,$_);
 	printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";

apps/rand.c

@@ -66,7 +66,8 @@
 #undef PROG
 #define PROG rand_main
 
-/* -out file         - write to file
+/*-
+ * -out file         - write to file
  * -rand file:file   - PRNG seed files
  * -base64           - base64 encode output
  * -hex              - hex encode output
@@ -77,9 +78,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-#ifndef OPENSSL_NO_ENGINE
-	ENGINE *e = NULL;
-#endif
     int i, r, ret = 1;
     int badopt;
     char *outfile = NULL;
@@ -103,57 +101,44 @@ int MAIN(int argc, char **argv)
 
     badopt = 0;
     i = 0;
-	while (!badopt && argv[++i] != NULL)
+    while (!badopt && argv[++i] != NULL) {
-		{
+        if (strcmp(argv[i], "-out") == 0) {
-		if (strcmp(argv[i], "-out") == 0)
-			{
             if ((argv[i + 1] != NULL) && (outfile == NULL))
                 outfile = argv[++i];
             else
                 badopt = 1;
         }
 #ifndef OPENSSL_NO_ENGINE
-		else if (strcmp(argv[i], "-engine") == 0)
+        else if (strcmp(argv[i], "-engine") == 0) {
-			{
             if ((argv[i + 1] != NULL) && (engine == NULL))
                 engine = argv[++i];
             else
                 badopt = 1;
         }
 #endif
-		else if (strcmp(argv[i], "-rand") == 0)
+        else if (strcmp(argv[i], "-rand") == 0) {
-			{
             if ((argv[i + 1] != NULL) && (inrand == NULL))
                 inrand = argv[++i];
             else
                 badopt = 1;
-			}
+        } else if (strcmp(argv[i], "-base64") == 0) {
-		else if (strcmp(argv[i], "-base64") == 0)
-			{
             if (!base64)
                 base64 = 1;
             else
                 badopt = 1;
-			}
+        } else if (strcmp(argv[i], "-hex") == 0) {
-		else if (strcmp(argv[i], "-hex") == 0)
-			{
             if (!hex)
                 hex = 1;
             else
                 badopt = 1;
-			}
+        } else if (isdigit((unsigned char)argv[i][0])) {
-		else if (isdigit((unsigned char)argv[i][0]))
+            if (num < 0) {
-			{
-			if (num < 0)
-				{
                 r = sscanf(argv[i], "%d", &num);
                 if (r == 0 || num < 0)
                     badopt = 1;
-				}
+            } else
-			else
                 badopt = 1;
-			}
+        } else
-		else
             badopt = 1;
     }
 
@@ -163,22 +148,22 @@ int MAIN(int argc, char **argv)
     if (num < 0)
         badopt = 1;
 
-	if (badopt) 
+    if (badopt) {
-		{
         BIO_printf(bio_err, "Usage: rand [options] num\n");
         BIO_printf(bio_err, "where options are\n");
         BIO_printf(bio_err, "-out file             - write to file\n");
 #ifndef OPENSSL_NO_ENGINE
-		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+        BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n",
+                   LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
         BIO_printf(bio_err, "-base64               - base64 encode output\n");
         BIO_printf(bio_err, "-hex                  - hex encode output\n");
         goto err;
     }
-
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+    setup_engine(bio_err, engine, 0);
 #endif
 
     app_RAND_load_file(NULL, bio_err, (inrand != NULL));
@@ -191,8 +176,7 @@ int MAIN(int argc, char **argv)
         goto err;
     if (outfile != NULL)
         r = BIO_write_filename(out, outfile);
-	else
+    else {
-		{
         r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
         {
@@ -204,16 +188,14 @@ int MAIN(int argc, char **argv)
     if (r <= 0)
         goto err;
 
-	if (base64)
+    if (base64) {
-		{
         BIO *b64 = BIO_new(BIO_f_base64());
         if (b64 == NULL)
             goto err;
         out = BIO_push(b64, out);
     }
 
-	while (num > 0) 
+    while (num > 0) {
-		{
         unsigned char buf[4096];
         int chunk;
 
@@ -225,8 +207,7 @@ int MAIN(int argc, char **argv)
             goto err;
         if (!hex)
             BIO_write(out, buf, chunk);
-		else
+        else {
-			{
             for (i = 0; i < chunk; i++)
                 BIO_printf(out, "%02x", buf[i]);
         }