Avoid use of "echo -n" some platforms don't support it.

Update from 0.9.7-stable
Fix from 0.9.7-stable
2007-02-23 20:14:21 +00:00 · 2007-02-23 20:13:40 +00:00 · 2007-02-23 00:37:25 +00:00 · 2007-02-22 13:26:44 +00:00 · 2007-02-21 18:17:19 +00:00 · 2007-02-21 16:57:35 +00:00
2254 changed files with 236760 additions and 530814 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,21 @@
 openssl.pc
 Makefile
 MINFO
 makefile.one
 tmp
 out
 outinc
 rehash.time
 testlog
 make.log
 maketest.log
 cctest
 cctest.c
 cctest.a
 libcrypto.so.*
 libfips.so.*
 libssl.so.*
 libcrypto.sha1
 libcrypto.a.sha1
 *.flc
 semantic.cache
--- a/.gitignore
+++ b/.gitignore
@@ -1,119 +0,0 @@
 # Object files
 *.o
 *.obj
 # editor artefacts
 *.swp
 .#*
 #*#
 *~
 /.dir-locals.el
 # 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/*.ss
 /test/*.srl
 /test/.rnd
 /test/test*.pem
 /test/newkey.pem
 # Certificate symbolic links
 *.0
 # Links under apps
 /apps/CA.pl
 /apps/md4.c
 # Auto generated headers
 /crypto/buildinf.h
 /crypto/opensslconf.h
 # Auto generated assembly language source files
 *.s
 !/crypto/bn/asm/pa-risc2.s
 !/crypto/bn/asm/pa-risc2W.s
 crypto/aes/asm/a_win32.asm
 crypto/bf/asm/b_win32.asm
 crypto/bn/asm/bn_win32.asm
 crypto/bn/asm/co_win32.asm
 crypto/bn/asm/mt_win32.asm
 crypto/cast/asm/c_win32.asm
 crypto/cpu_win32.asm
 crypto/des/asm/d_win32.asm
 crypto/des/asm/y_win32.asm
 crypto/md5/asm/m5_win32.asm
 crypto/rc4/asm/r4_win32.asm
 crypto/rc5/asm/r5_win32.asm
 crypto/ripemd/asm/rm_win32.asm
 crypto/sha/asm/s1_win32.asm
 crypto/sha/asm/sha512-sse2.asm
 # Executables
 /apps/openssl
 /test/sha256t
 /test/sha512t
 /test/*test
 /test/fips_aesavs
 /test/fips_desmovs
 /test/fips_dhvs
 /test/fips_drbgvs
 /test/fips_dssvs
 /test/fips_ecdhvs
 /test/fips_ecdsavs
 /test/fips_rngvs
 /test/fips_test_suite
 *.so*
 *.dylib*
 *.dll*
 # Exceptions
 !/test/bctest
 !/crypto/des/times/486-50.sol
 # Misc auto generated files
 /tools/c_rehash
 /test/evptests.txt
 lib
 Makefile.save
 *.bak
 tags
 TAGS
 # Windows
 /tmp32
 /tmp32.dbg
 /tmp32dll
 /tmp32dll.dbg
 /out32
 /out32.dbg
 /out32dll
 /out32dll.dbg
 /inc32
 /MINFO
 ms/bcb.mak
 ms/libeay32.def
 ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
--- a/.travis-create-release.sh
+++ b/.travis-create-release.sh
@@ -1,10 +0,0 @@
 #! /bin/sh
 # $1 is expected to be $TRAVIS_OS_NAME
 if [ "$1" == osx ]; then
    make -f Makefile.org \
 	 DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist
 else
    make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist
 fi
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,60 +0,0 @@
 language: c
 addons:
    apt_packages:
        - binutils-mingw-w64
        - gcc-mingw-w64
 os:
    - linux
    - osx
 compiler:
    - clang
    - gcc
    - i686-w64-mingw32-gcc
    - x86_64-w64-mingw32-gcc
 env:
    - CONFIG_OPTS=""
    - CONFIG_OPTS="shared"
    - CONFIG_OPTS="-d --strict-warnings"
 matrix:
    exclude:
        - os: osx
          compiler: i686-w64-mingw32-gcc
        - os: osx
          compiler: x86_64-w64-mingw32-gcc
        - compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="-d --strict-warnings"
        - compiler: x86_64-w64-mingw32-gcc
          env: CONFIG_OPTS="-d --strict-warnings"
 before_script:
    - sh .travis-create-release.sh $TRAVIS_OS_NAME
    - tar -xvzf _srcdist.tar.gz
    - cd _srcdist
    - if [ "$CC" == i686-w64-mingw32-gcc ]; then
          export CROSS_COMPILE=${CC%%gcc}; unset CC;
          ./Configure mingw $CONFIG_OPTS;
      elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
          export CROSS_COMPILE=${CC%%gcc}; unset CC;
          ./Configure mingw64 $CONFIG_OPTS;
      else
          if [ "$CC" == gcc ]; then
              export CONFIG_OPTS="$CONFIG_OPTS -Wno-error=shadow";
          fi;
          ./config $CONFIG_OPTS;
      fi
    - cd ..
 script:
    - cd _srcdist
    - make
    - if [ -z "$CROSS_COMPILE" ]; then make test; fi
    - cd ..
 notifications:
    email:
        - openssl-commits@openssl.org
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
 Please https://www.openssl.org/community/thanks.html for the current
 acknowledgements.
--- a/4409
+++ b/4409
--- a/CHANGES.SSLeay
+++ b/CHANGES.SSLeay
@@ -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 few errors that were cause by malloc() not returning
+    - Fixed a new 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
--- a/38
+++ b/38
@@ -1,38 +0,0 @@
 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 rt@openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
 You can also make GitHub pull requests. If you do this, please also send
 mail to rt@openssl.org with a brief description and a link to the PR so
 that we can more easily keep track of it.
 If you are unsure as to whether a feature will be useful for the general
 OpenSSL community please discuss it on the openssl-dev mailing list first.
 Someone may be already working on the same thing or there may be a good
 reason as to why that feature isn't implemented.
 Patches should be as up to date as possible, preferably relative to the
 current Git or the last snapshot. They should follow our coding style
 (see https://www.openssl.org/policies/codingstyle.html) and compile without
 warnings using the --strict-warnings flag.  OpenSSL compiles on many varied
 platforms: try to ensure you only use portable features.
 Our preferred format for patch files is "git format-patch" output. For example
 to provide a patch file containing the last commit in your local git repository
 use the following command:
 # git format-patch --stdout HEAD^ >mydiffs.patch
 Another method of creating an acceptable patch file without using git is as
 follows:
 # cd openssl-work
 # [your changes]
 # ./Configure dist; make clean
 # cd ..
 # diff -ur openssl-orig openssl-work > mydiffs.patch
--- a/1597
+++ b/1597
--- a/815
+++ b/815
@@ -1,2 +1,813 @@
-The FAQ is now maintained on the web:
+OpenSSL  -  Frequently Asked Questions
-        https://www.openssl.org/docs/faq.html
+--------------------------------------
 [MISC] Miscellaneous questions
 * Which is the current version of OpenSSL?
 * Where is the documentation?
 * How can I contact the OpenSSL developers?
 * Where can I get a compiled version of OpenSSL?
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
 [LEGAL] Legal questions
 * Do I need patent licenses to use OpenSSL?
 * Can I use OpenSSL with GPL software? 
 [USER] Questions on using the OpenSSL applications
 * Why do I get a "PRNG not seeded" error message?
 * Why do I get an "unable to write 'random state'" error message?
 * How do I create certificates or certificate requests?
 * Why can't I create certificate requests?
 * Why does <SSL program> fail with a certificate verify error?
 * Why can I only use weak ciphers when I connect to a server using OpenSSL?
 * How can I create DSA certificates?
 * Why can't I make an SSL connection using a DSA certificate?
 * How can I remove the passphrase on a private key?
 * Why can't I use OpenSSL certificates with SSL client authentication?
 * Why does my browser give a warning about a mismatched hostname?
 * How do I install a CA certificate into a browser?
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 [BUILD] Questions about building and testing OpenSSL
 * Why does the linker complain about undefined symbols?
 * Why does the OpenSSL test fail with "bc: command not found"?
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
 * Why does the OpenSSL test fail with "bc: stack empty"?
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 * Why does the OpenSSL compilation fail on Win32 with VC++?
 * What is special about OpenSSL on Redhat?
 * Why does the OpenSSL compilation fail on MacOS X?
 * Why does the OpenSSL test suite fail on MacOS X?
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 [PROG] Questions about programming with OpenSSL
 * Is OpenSSL thread-safe?
 * I've compiled a program under Windows and it crashes: why?
 * How do I read or write a DER encoded buffer using the ASN1 functions?
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 * I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 * I've called <some function> and it fails, why?
 * I just get a load of numbers for the error output, what do they mean?
 * Why do I get errors about unknown algorithms?
 * Why can't the OpenSSH configure script detect OpenSSL?
 * Can I use OpenSSL's SSL library with non-blocking I/O?
 * Why doesn't my server application receive a client certificate?
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 * I think I've detected a memory leak, is this a bug?
 ===============================================================================
 [MISC] ========================================================================
 * Which is the current version of OpenSSL?
 The current version is available from <URL: http://www.openssl.org>.
 OpenSSL 0.9.7l was released on September 28, 2006.
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
 ftp://ftp.openssl.org/snapshot/>, or get it by anonymous CVS access.
 * Where is the documentation?
 OpenSSL is a library that provides cryptographic functionality to
 applications such as secure web servers.  Be sure to read the
 documentation of the application you want to use.  The INSTALL file
 explains how to install this library.
 OpenSSL includes a command line utility that can be used to perform a
 variety of cryptographic functions.  It is described in the openssl(1)
 manpage.  Documentation for developers is currently being written.  A
 few manual pages already are available; overviews over libcrypto and
 libssl are given in the crypto(3) and ssl(3) manpages.
 The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
 different directory if you specified one as described in INSTALL).
 In addition, you can read the most current versions at
 <URL: http://www.openssl.org/docs/>.
 For information on parts of libcrypto that are not yet documented, you
 might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
 predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
 of this still applies to OpenSSL.
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
 The original SSLeay documentation is included in OpenSSL as
 doc/ssleay.txt.  It may be useful when none of the other resources
 help, but please note that it reflects the obsolete version SSLeay
 0.6.6.
 * How can I contact the OpenSSL developers?
 The README file describes how to submit bug reports and patches to
 OpenSSL.  Information on the OpenSSL mailing lists is available from
 <URL: http://www.openssl.org>.
 * Where can I get a compiled version of OpenSSL?
 You can finder pointers to binary distributions in
 http://www.openssl.org/related/binaries.html .
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
 yourself; the application will include the required parts (e.g. DLLs).
 If you want to build OpenSSL on a Windows system and you don't have
 a C compiler, read the "Mingw32" section of INSTALL.W32 for information
 on how to obtain and install the free GNU C compiler.
 A number of Linux and *BSD distributions include OpenSSL.
 * Why aren't tools like 'autoconf' and 'libtool' used?
 autoconf will probably be used in future OpenSSL versions. If it was
 less Unix-centric, it might have been used much earlier.
 * What is an 'engine' version?
 With version 0.9.6 OpenSSL was extended to interface to external crypto
 hardware. This was realized in a special release '0.9.6-engine'. With
 version 0.9.7 the changes were merged into the main development line,
 so that the special release is no longer necessary.
 * How do I check the authenticity of the OpenSSL distribution?
 We provide MD5 digests and ASC signatures of each tarball.
 Use MD5 to check that a tarball from a mirror site is identical:
   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
 You can check authenticity using pgp or gpg. You need the OpenSSL team
 member public key used to sign it (download it from a key server). Then
 just do:
   pgp TARBALL.asc
 [LEGAL] =======================================================================
 * Do I need patent licenses to use OpenSSL?
 The patents section of the README file lists patents that may apply to
 you if you want to use OpenSSL.  For information on intellectual
 property rights, please consult a lawyer.  The OpenSSL team does not
 offer legal advice.
 You can configure OpenSSL so as not to use RC5 and IDEA by using
 ./config no-rc5 no-idea
 * Can I use OpenSSL with GPL software?
 On many systems including the major Linux and BSD distributions, yes (the
 GPL does not place restrictions on using libraries that are part of the
 normal operating system distribution).
 On other systems, the situation is less clear. Some GPL software copyright
 holders claim that you infringe on their rights if you use OpenSSL with
 their software on operating systems that don't normally include OpenSSL.
 If you develop open source software that uses OpenSSL, you may find it
 useful to choose an other license than the GPL, or state explicitly that
 "This program is released under the GPL with the additional exemption that
 compiling, linking, and/or using OpenSSL is allowed."  If you are using
 GPL software developed by others, you may want to ask the copyright holder
 for permission to use their software with OpenSSL.
 [USER] ========================================================================
 * Why do I get a "PRNG not seeded" error message?
 Cryptographic software needs a source of unpredictable data to work
 correctly.  Many open source operating systems provide a "randomness
 device" (/dev/urandom or /dev/random) that serves this purpose.
 All OpenSSL versions try to use /dev/urandom by default; starting with
 version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
 available.
 On other systems, applications have to call the RAND_add() or
 RAND_seed() function with appropriate data before generating keys or
 performing public key encryption. (These functions initialize the
 pseudo-random number generator, PRNG.)  Some broken applications do
 not do this.  As of version 0.9.5, the OpenSSL functions that need
 randomness report an error if the random number generator has not been
 seeded with at least 128 bits of randomness.  If this error occurs and
 is not discussed in the documentation of the application you are
 using, please contact the author of that application; it is likely
 that it never worked correctly.  OpenSSL 0.9.5 and later make the
 error visible by refusing to perform potentially insecure encryption.
 If you are using Solaris 8, you can add /dev/urandom and /dev/random
 devices by installing patch 112438 (Sparc) or 112439 (x86), which are
 available via the Patchfinder at <URL: http://sunsolve.sun.com>
 (Solaris 9 includes these devices by default). For /dev/random support
 for earlier Solaris versions, see Sun's statement at
 <URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
 (the SUNWski package is available in patch 105710).
 On systems without /dev/urandom and /dev/random, it is a good idea to
 use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
 details.  Starting with version 0.9.7, OpenSSL will automatically look
 for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
 /etc/entropy.
 Most components of the openssl command line utility automatically try
 to seed the random number generator from a file.  The name of the
 default seeding file is determined as follows: If environment variable
 RANDFILE is set, then it names the seeding file.  Otherwise if
 environment variable HOME is set, then the seeding file is $HOME/.rnd.
 If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
 use file .rnd in the current directory while OpenSSL 0.9.6a uses no
 default seeding file at all.  OpenSSL 0.9.6b and later will behave
 similarly to 0.9.6a, but will use a default of "C:\" for HOME on
 Windows systems if the environment variable has not been set.
 If the default seeding file does not exist or is too short, the "PRNG
 not seeded" error message may occur.
 The openssl command line utility will write back a new state to the
 default seeding file (and create this file if necessary) unless
 there was no sufficient seeding.
 Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
 Use the "-rand" option of the OpenSSL command line tools instead.
 The $RANDFILE environment variable and $HOME/.rnd are only used by the
 OpenSSL command line tools. Applications using the OpenSSL library
 provide their own configuration options to specify the entropy source,
 please check out the documentation coming the with application.
 * Why do I get an "unable to write 'random state'" error message?
 Sometimes the openssl command line utility does not abort with
 a "PRNG not seeded" error message, but complains that it is
 "unable to write 'random state'".  This message refers to the
 default seeding file (see previous answer).  A possible reason
 is that no default filename is known because neither RANDFILE
 nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
 current directory in this case, but this has changed with 0.9.6a.)
 * How do I create certificates or certificate requests?
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
 extensions documentation (currently in doc/openssl.txt).
 * Why can't I create certificate requests?
 You typically get the error:
 	unable to find 'distinguished_name' in config
 	problems making Certificate Request
 This is because it can't find the configuration file. Check out the
 DIAGNOSTICS section of req(1) for more information.
 * Why does <SSL program> fail with a certificate verify error?
 This problem is usually indicated by log messages saying something like
 "unable to get local issuer certificate" or "self signed certificate".
 When a certificate is verified its root CA must be "trusted" by OpenSSL
 this typically means that the CA certificate must be placed in a directory
 or file and the relevant program configured to read it. The OpenSSL program
 'verify' behaves in a similar way and issues similar error messages: check
 the verify(1) program manual page for more information.
 * Why can I only use weak ciphers when I connect to a server using OpenSSL?
 This is almost certainly because you are using an old "export grade" browser
 which only supports weak encryption. Upgrade your browser to support 128 bit
 ciphers.
 * How can I create DSA certificates?
 Check the CA.pl(1) manual page for a DSA certificate example.
 * Why can't I make an SSL connection to a server using a DSA certificate?
 Typically you'll see a message saying there are no shared ciphers when
 the same setup works fine with an RSA certificate. There are two possible
 causes. The client may not support connections to DSA servers most web
 browsers (including Netscape and MSIE) only support connections to servers
 supporting RSA cipher suites. The other cause is that a set of DH parameters
 has not been supplied to the server. DH parameters can be created with the
 dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
 check the source to s_server in apps/s_server.c for an example.
 * How can I remove the passphrase on a private key?
 Firstly you should be really *really* sure you want to do this. Leaving
 a private key unencrypted is a major security risk. If you decide that
 you do have to do this check the EXAMPLES sections of the rsa(1) and
 dsa(1) manual pages.
 * Why can't I use OpenSSL certificates with SSL client authentication?
 What will typically happen is that when a server requests authentication
 it will either not include your certificate or tell you that you have
 no client certificates (Netscape) or present you with an empty list box
 (MSIE). The reason for this is that when a server requests a client
 certificate it includes a list of CAs names which it will accept. Browsers
 will only let you select certificates from the list on the grounds that
 there is little point presenting a certificate which the server will
 reject.
 The solution is to add the relevant CA certificate to your servers "trusted
 CA list". How you do this depends on the server software in uses. You can
 print out the servers list of acceptable CAs using the OpenSSL s_client tool:
 openssl s_client -connect www.some.host:443 -prexit
 If your server only requests certificates on certain URLs then you may need
 to manually issue an HTTP GET command to get the list when s_client connects:
 GET /some/page/needing/a/certificate.html
 If your CA does not appear in the list then this confirms the problem.
 * Why does my browser give a warning about a mismatched hostname?
 Browsers expect the server's hostname to match the value in the commonName
 (CN) field of the certificate. If it does not then you get a warning.
 * How do I install a CA certificate into a browser?
 The usual way is to send the DER encoded certificate to the browser as
 MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
 link. On MSIE certain extensions such as .der or .cacert may also work, or you
 can import the certificate using the certificate import wizard.
 You can convert a certificate to DER form using the command:
 openssl x509 -in ca.pem -outform DER -out ca.der
 Occasionally someone suggests using a command such as:
 openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
 DO NOT DO THIS! This command will give away your CAs private key and
 reduces its security to zero: allowing anyone to forge certificates in
 whatever name they choose.
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 The ways to print out the oneline format of the DN (Distinguished Name) have
 been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
 interface, the "-nameopt" option could be introduded. See the manual
 page of the "openssl x509" commandline tool for details. The old behaviour
 has however been left as default for the sake of compatibility.
 [BUILD] =======================================================================
 * Why does the linker complain about undefined symbols?
 Maybe the compilation was interrupted, and make doesn't notice that
 something is missing.  Run "make clean; make".
 If you used ./Configure instead of ./config, make sure that you
 selected the right target.  File formats may differ slightly between
 OS versions (for example sparcv8/sparcv9, or a.out/elf).
 In case you get errors about the following symbols, use the config
 option "no-asm", as described in INSTALL:
 BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
 CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
 RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
 bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
 bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
 des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
 des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
 If none of these helps, you may want to try using the current snapshot.
 If the problem persists, please submit a bug report.
 * Why does the OpenSSL test fail with "bc: command not found"?
 You didn't install "bc", the Unix calculator.  If you want to run the
 tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
 On some SCO installations or versions, bc has a bug that gets triggered
 when you run the test suite (using "make test").  The message returned is
 "bc: 1 not implemented".
 The best way to deal with this is to find another implementation of bc
 and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 * Why does the OpenSSL test fail with "bc: stack empty"?
 On some DG/ux versions, bc seems to have a too small stack for calculations
 that the OpenSSL bntest throws at it.  This gets triggered when you run the
 test suite (using "make test").  The message returned is "bc: stack empty".
 The best way to deal with this is to find another implementation of bc
 and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 On some Alpha installations running Tru64 Unix and Compaq C, the compilation
 of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
 memory to continue compilation.'  As far as the tests have shown, this may be
 a compiler bug.  What happens is that it eats up a lot of resident memory
 to build something, probably a table.  The problem is clearly in the
 optimization code, because if one eliminates optimization completely (-O0),
 the compilation goes through (and the compiler consumes about 2MB of resident
 memory instead of 240MB or whatever one's limit is currently).
 There are three options to solve this problem:
 1. set your current data segment size soft limit higher.  Experience shows
 that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
 this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
 kbytes to set the limit to.
 2. If you have a hard limit that is lower than what you need and you can't
 get it changed, you can compile all of OpenSSL with -O0 as optimization
 level.  This is however not a very nice thing to do for those who expect to
 get the best result from OpenSSL.  A bit more complicated solution is the
 following:
 ----- snip:start -----
  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile | \
       sed -e 's/ -O[0-9] / -O0 /'`"
  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
  make
 ----- snip:end -----
 This will only compile sha_dgst.c with -O0, the rest with the optimization
 level chosen by the configuration process.  When the above is done, do the
 test and installation and you're set.
 3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It
 should not be used and is not used in SSL/TLS nor any other recognized
 protocol in either case.
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 Getting this message is quite usual on Solaris 2, because Sun has hidden
 away 'ar' and other development commands in directories that aren't in
 $PATH by default.  One of those directories is '/usr/ccs/bin'.  The
 quickest way to fix this is to do the following (it assumes you use sh
 or any sh-compatible shell):
 ----- snip:start -----
  PATH=${PATH}:/usr/ccs/bin; export PATH
 ----- snip:end -----
 and then redo the compilation.  What you should really do is make sure
 '/usr/ccs/bin' is permanently in your $PATH, for example through your
 '.profile' (again, assuming you use a sh-compatible shell).
 * Why does the OpenSSL compilation fail on Win32 with VC++?
 Sometimes, you may get reports from VC++ command line (cl) that it
 can't find standard include files like stdio.h and other weirdnesses.
 One possible cause is that the environment isn't correctly set up.
 To solve that problem for VC++ versions up to 6, one should run
 VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
 installation directory (somewhere under 'Program Files').  For VC++
 version 7 (and up?), which is also called VS.NET, the file is called
 VSVARS32.BAT instead.
 This needs to be done prior to running NMAKE, and the changes are only
 valid for the current DOS session.
 * What is special about OpenSSL on Redhat?
 Red Hat Linux (release 7.0 and later) include a preinstalled limited
 version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
 is disabled in this version. The same may apply to other Linux distributions.
 Users may therefore wish to install more or all of the features left out.
 To do this you MUST ensure that you do not overwrite the openssl that is in
 /usr/bin on your Red Hat machine. Several packages depend on this file,
 including sendmail and ssh. /usr/local/bin is a good alternative choice. The
 libraries that come with Red Hat 7.0 onwards have different names and so are
 not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
 /lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
 /lib/libcrypto.so.2 respectively).
 Please note that we have been advised by Red Hat attempting to recompile the
 openssl rpm with all the cryptography enabled will not work. All other
 packages depend on the original Red Hat supplied openssl package. It is also
 worth noting that due to the way Red Hat supplies its packages, updates to
 openssl on each distribution never change the package version, only the
 build number. For example, on Red Hat 7.1, the latest openssl package has
 version number 0.9.6 and build number 9 even though it contains all the
 relevant updates in packages up to and including 0.9.6b.
 A possible way around this is to persuade Red Hat to produce a non-US
 version of Red Hat Linux.
 FYI: Patent numbers and expiry dates of US patents:
 MDC-2: 4,908,861 13/03/2007
 IDEA:  5,214,703 25/05/2010
 RC5:   5,724,428 03/03/2015
 * Why does the OpenSSL compilation fail on MacOS X?
 If the failure happens when trying to build the "openssl" binary, with
 a large number of undefined symbols, it's very probable that you have
 OpenSSL 0.9.6b delivered with the operating system (you can find out by
 running '/usr/bin/openssl version') and that you were trying to build
 OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
 MacOS X has a misfeature that's quite difficult to go around.
 Look in the file PROBLEMS for a more detailed explanation and for possible
 solutions.
 * Why does the OpenSSL test suite fail on MacOS X?
 If the failure happens when running 'make test' and the RC4 test fails,
 it's very probable that you have OpenSSL 0.9.6b delivered with the
 operating system (you can find out by running '/usr/bin/openssl version')
 and that you were trying to build OpenSSL 0.9.6d.  The problem is that
 the loader ('ld') in MacOS X has a misfeature that's quite difficult to
 go around and has linked the programs "openssl" and the test programs
 with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
 libraries you just built.
 Look in the file PROBLEMS for a more detailed explanation and for possible
 solutions.
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 Failure in BN_sqr test is most likely caused by a failure to configure the
 toolkit for current platform or lack of support for the platform in question.
 Run './config -t' and './apps/openssl version -p'. Do these platform
 identifiers match? If they don't, then you most likely failed to run
 ./config and you're hereby advised to do so before filing a bug report.
 If ./config itself fails to run, then it's most likely problem with your
 local environment and you should turn to your system administrator (or
 similar). If identifiers match (and/or no alternative identifier is
 suggested by ./config script), then the platform is unsupported. There might
 or might not be a workaround. Most notably on SPARC64 platforms with GNU
 C compiler you should be able to produce a working build by running
 './config -m32'. I understand that -m32 might not be what you want/need,
 but the build should be operational. For further details turn to
 <openssl-dev@openssl.org>.
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 As of 0.9.7 assembler routines were overhauled for position independence
 of the machine code, which is essential for shared library support. For
 some reason OpenBSD is equipped with an out-of-date GNU assembler which
 finds the new code offensive. To work around the problem, configure with
 no-asm (and sacrifice a great deal of performance) or patch your assembler
 according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
 For your convenience a pre-compiled replacement binary is provided at
 <URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
 Reportedly elder *BSD a.out platforms also suffer from this problem and
 remedy should be same. Provided binary is statically linked and should be
 working across wider range of *BSD branches, not just OpenBSD.
 [PROG] ========================================================================
 * Is OpenSSL thread-safe?
 Yes (with limitations: an SSL connection may not concurrently be used
 by multiple threads).  On Windows and many Unix systems, OpenSSL
 automatically uses the multi-threaded versions of the standard
 libraries.  If your platform is not one of these, consult the INSTALL
 file.
 Multi-threaded applications must provide two callback functions to
 OpenSSL by calling CRYPTO_set_locking_callback() and
 CRYPTO_set_id_callback().  This is described in the threads(3)
 manpage.
 * I've compiled a program under Windows and it crashes: why?
 This is usually because you've missed the comment in INSTALL.W32.
 Your application must link against the same version of the Win32
 C-Runtime against which your openssl libraries were linked.  The
 default version for OpenSSL is /MD - "Multithreaded DLL".
 If you are using Microsoft Visual C++'s IDE (Visual Studio), in
 many cases, your new project most likely defaulted to "Debug
 Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
 program will crash, typically on the first BIO related read or write
 operation.
 For each of the six possible link stage configurations within Win32,
 your application must link  against the same by which OpenSSL was
 built.  If you are using MS Visual C++ (Studio) this can be changed
 by:
 1.  Select Settings... from the Project Menu.
 2.  Select the C/C++ Tab.
 3.  Select "Code Generation from the "Category" drop down list box
 4.  Select the Appropriate library (see table below) from the "Use
    run-time library" drop down list box.  Perform this step for both
    your debug and release versions of your application (look at the
    top left of the settings panel to change between the two)
    Single Threaded           /ML        -  MS VC++ often defaults to
                                            this for the release
                                            version of a new project.
    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
                                            this for the debug version
                                            of a new project.
    Multithreaded             /MT
    Debug Multithreaded       /MTd
    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
    Debug Multithreaded DLL   /MDd
 Note that debug and release libraries are NOT interchangeable.  If you
 built OpenSSL with /MD your application must use /MD and cannot use /MDd.
 * How do I read or write a DER encoded buffer using the ASN1 functions?
 You have two options. You can either use a memory BIO in conjunction
 with the i2d_XXX_bio() or d2i_XXX_bio() functions or you can use the
 i2d_XXX(), d2i_XXX() functions directly. Since these are often the
 cause of grief here are some code fragments using PKCS7 as an example:
 unsigned char *buf, *p;
 int len;
 len = i2d_PKCS7(p7, NULL);
 buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
 p = buf;
 i2d_PKCS7(p7, &p);
 At this point buf contains the len bytes of the DER encoding of
 p7.
 The opposite assumes we already have len bytes in buf:
 unsigned char *p;
 p = buf;
 p7 = d2i_PKCS7(NULL, &p, len);
 At this point p7 contains a valid PKCS7 structure of NULL if an error
 occurred. If an error occurred ERR_print_errors(bio) should give more
 information.
 The reason for the temporary variable 'p' is that the ASN1 functions
 increment the passed pointer so it is ready to read or write the next
 structure. This is often a cause of problems: without the temporary
 variable the buffer pointer is changed to point just after the data
 that has been read or written. This may well be uninitialized data
 and attempts to free the buffer will have unpredictable results
 because it no longer points to the same address.
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 The short answer is yes, because DER is a special case of BER and OpenSSL
 ASN1 decoders can process BER.
 The longer answer is that ASN1 structures can be encoded in a number of
 different ways. One set of ways is the Basic Encoding Rules (BER) with various
 permissible encodings. A restriction of BER is the Distinguished Encoding
 Rules (DER): these uniquely specify how a given structure is encoded.
 Therefore, because DER is a special case of BER, DER is an acceptable encoding
 for BER.
 * I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 This usually happens when you try compiling something using the PKCS#12
 macros with a C++ compiler. There is hardly ever any need to use the
 PKCS#12 macros in a program, it is much easier to parse and create
 PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
 documented in doc/openssl.txt and with examples in demos/pkcs12. The
 'pkcs12' application has to use the macros because it prints out 
 debugging information.
 * I've called <some function> and it fails, why?
 Before submitting a report or asking in one of the mailing lists, you
 should try to determine the cause. In particular, you should call
 ERR_print_errors() or ERR_print_errors_fp() after the failed call
 and see if the message helps. Note that the problem may occur earlier
 than you think -- you should check for errors after every call where
 it is possible, otherwise the actual problem may be hidden because
 some OpenSSL functions clear the error state.
 * I just get a load of numbers for the error output, what do they mean?
 The actual format is described in the ERR_print_errors() manual page.
 You should call the function ERR_load_crypto_strings() before hand and
 the message will be output in text form. If you can't do this (for example
 it is a pre-compiled binary) you can use the errstr utility on the error
 code itself (the hex digits after the second colon).
 * Why do I get errors about unknown algorithms?
 This can happen under several circumstances such as reading in an
 encrypted private key or attempting to decrypt a PKCS#12 file. The cause
 is forgetting to load OpenSSL's table of algorithms with
 OpenSSL_add_all_algorithms(). See the manual page for more information.
 * Why can't the OpenSSH configure script detect OpenSSL?
 Several reasons for problems with the automatic detection exist.
 OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
 Sometimes the distribution has installed an older version in the system
 locations that is detected instead of a new one installed. The OpenSSL
 library might have been compiled for another CPU or another mode (32/64 bits).
 Permissions might be wrong.
 The general answer is to check the config.log file generated when running
 the OpenSSH configure script. It should contain the detailed information
 on why the OpenSSL library was not detected or considered incompatible.
 * Can I use OpenSSL's SSL library with non-blocking I/O?
 Yes; make sure to read the SSL_get_error(3) manual page!
 A pitfall to avoid: Don't assume that SSL_read() will just read from
 the underlying transport or that SSL_write() will just write to it --
 it is also possible that SSL_write() cannot do any useful work until
 there is data to read, or that SSL_read() cannot do anything until it
 is possible to send data.  One reason for this is that the peer may
 request a new TLS/SSL handshake at any time during the protocol,
 requiring a bi-directional message exchange; both SSL_read() and
 SSL_write() will try to continue any pending handshake.
 * Why doesn't my server application receive a client certificate?
 Due to the TLS protocol definition, a client will only send a certificate,
 if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
 SSL_CTX_set_verify() function to enable the use of client certificates.
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
 versions, uniqueIdentifier was incorrectly used for X.509 certificates.
 The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
 Change your code to use the new name when compiling against OpenSSL 0.9.7.
 * I think I've detected a memory leak, is this a bug?
 In most cases the cause of an apparent memory leak is an OpenSSL internal table
 that is allocated when an application starts up. Since such tables do not grow
 in size over time they are harmless.
 These internal tables can be freed up when an application closes using various
 functions.  Currently these include following:
 Thread-local cleanup functions:
  ERR_remove_state()
 Application-global cleanup functions that are aware of usage (and therefore
 thread-safe):
  ENGINE_cleanup() and CONF_modules_unload()
 "Brutal" (thread-unsafe) Application-global cleanup functions:
  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
 ===============================================================================
--- a/8
+++ b/8
@@ -1,8 +0,0 @@
 #!/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 -f makefile.$BRANCH init
--- a/5
+++ b/5
@@ -1,5 +0,0 @@
 #!/bin/sh
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 make -f makefile.$BRANCH $@
--- a/60
+++ b/60
@@ -2,10 +2,8 @@
 INSTALLATION ON THE UNIX PLATFORM
 ---------------------------------
- [Installation on DOS (with djgpp), Windows, OpenVMS, MacOS (before MacOS X)
+ [Installation on DOS (with djgpp), Windows, OpenVMS and MacOS (before MacOS X)
-  and NetWare is described in INSTALL.DJGPP, INSTALL.W32, INSTALL.VMS,
+  is described in INSTALL.DJGPP, INSTALL.W32, INSTALL.VMS and INSTALL.MacOS.
  INSTALL.MacOS and INSTALL.NW.
  This document describes installation on operating systems in the Unix
  family.]
@@ -75,40 +73,18 @@
  no-asm        Do not use assembler code.
  386           Use the 80386 instruction set only (the default x86 code is
-                more efficient, but requires at least a 486). Note: Use
+                more efficient, but requires at least a 486).
                compiler flags for any other CPU specific configuration,
                e.g. "-m32" to build x86 code on an x64 system.
  no-sse2	Exclude SSE2 code pathes. Normally SSE2 extention is
 		detected at run-time, but the decision whether or not the
 		machine code will be executed is taken solely on CPU
 		capability vector. This means that if you happen to run OS
 		kernel which does not support SSE2 extension on Intel P4
 		processor, then your application might be exposed to
 		"illegal instruction" exception. There might be a way
 		to enable support in kernel, e.g. FreeBSD kernel can be
 		compiled with CPU_ENABLE_SSE, and there is a way to
 		disengage SSE2 code pathes upon application start-up,
 		but if you aim for wider "audience" running such kernel,
 		consider no-sse2. Both 386 and no-asm options above imply
 		no-sse2.
  no-<cipher>   Build without the specified cipher (bf, cast, des, dh, dsa,
                hmac, md2, md5, mdc2, rc2, rc4, rc5, rsa, sha).
                The crypto/<cipher> directory can be removed after running
                "make depend".
-  -Dxxx, -lxxx, -Lxxx, -fxxx, -mXXX, -Kxxx These system specific options will
+  -Dxxx, -lxxx, -Lxxx, -fxxx, -Kxxx These system specific options will
                be passed through to the compiler to allow you to
                define preprocessor symbols, specify additional libraries,
                library directories or other compiler options.
  -DHAVE_CRYPTODEV Enable the BSD cryptodev engine even if we are not using
 		BSD. Useful if you are running ocf-linux or something
 		similar. Once enabled you can also enable the use of
 		cryptodev digests, which is usually slower unless you have
 		large amounts data. Use -DUSE_CRYPTODEV_DIGESTS to force
 		it.
 Installation in Detail
 ----------------------
@@ -147,7 +123,7 @@
     generic configurations "cc" or "gcc" should usually work on 32 bit
     systems.
-     Configure creates the file Makefile.ssl from Makefile.org and
+     Configure creates the file Makefile from Makefile.org and
     defines various macros in crypto/opensslconf.h (generated from
     crypto/opensslconf.h.in).
@@ -164,10 +140,10 @@
     standard headers).  If it is a problem with OpenSSL itself, please
     report the problem to <openssl-bugs@openssl.org> (note that your
     message will be recorded in the request tracker publicly readable
-     at https://www.openssl.org/community/index.html#bugs and will be
+     via http://www.openssl.org/support/rt2.html and will be forwarded to a
-     forwarded to a public mailing list). Include the output of "make
+     public mailing list). Include the output of "make report" in your message.
-     report" in your message.  Please check out the request tracker. Maybe
+     Please check out the request tracker. Maybe the bug was already
-     the bug was already reported or has already been fixed.
+     reported or has already been fixed.
     [If you encounter assembler error messages, try the "no-asm"
     configuration option as an immediate fix.]
@@ -183,10 +159,10 @@
     the failure that isn't a problem in OpenSSL itself (like a missing
     or malfunctioning bc).  If it is a problem with OpenSSL itself,
     try removing any compiler optimization flags from the CFLAG line
-     in Makefile.ssl and run "make clean; make". Please send a bug
+     in Makefile and run "make clean; make". Please send a bug
     report to <openssl-bugs@openssl.org>, including the output of
     "make report" in order to be added to the request tracker at
-     http://www.openssl.org/support/rt.html.
+     http://www.openssl.org/support/rt2.html.
  4. If everything tests ok, install OpenSSL with
@@ -212,10 +188,6 @@
                       compile programs with libcrypto or libssl.
       lib             Contains the OpenSSL library files themselves.
     Use "make install_sw" to install the software without documentation,
     and "install_docs_html" to install HTML renditions of the manual
     pages.
     Package builders who want to configure the library for standard
     locations, but have the package installed somewhere else so that
     it can easily be packaged, can use
@@ -312,10 +284,10 @@
 Note on shared libraries
 ------------------------
- Shared libraries have certain caveats.  Binary backward compatibility
+ Shared library is currently an experimental feature.  The only reason to
- can't be guaranteed before OpenSSL version 1.0.  The only reason to
+ have them would be to conserve memory on systems where several program
- use them would be to conserve memory on systems where several programs
+ are using OpenSSL.  Binary backward compatibility can't be guaranteed
- are using OpenSSL.
+ before OpenSSL version 1.0.
 For some systems, the OpenSSL Configure script knows what is needed to
 build shared libraries for libcrypto and libssl.  On these systems,
@@ -340,7 +312,7 @@
 Note on support for multiple builds
 -----------------------------------
- OpenSSL is usually built in its source tree.  Unfortunately, this doesn't
+ OpenSSL is usually built in it's source tree.  Unfortunately, this doesn't
 support building for multiple platforms from the same source tree very well.
 It is however possible to build in a separate tree through the use of lots
 of symbolic links, which should be prepared like this:
--- a/INSTALL.NW
+++ b/INSTALL.NW
@@ -1,454 +0,0 @@
 INSTALLATION ON THE NETWARE PLATFORM
 ------------------------------------
 Notes about building OpenSSL for NetWare.
 BUILD PLATFORM:
 ---------------
 The build scripts (batch files, perl scripts, etc) have been developed and
 tested on W2K.  The scripts should run fine on other Windows platforms
 (NT, Win9x, WinXP) but they have not been tested.  They may require some
 modifications.
 Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
 -------------------------------------------------------
 OpenSSL can either use the WinSock interfaces introduced in NetWare 5,
 or the BSD socket interface.  Previous versions of NetWare, 4.x and 3.x,
 are only supported if OpenSSL is build for CLIB and BSD sockets;
 WinSock builds only support NetWare 5 and up.
 On NetWare there are two c-runtime libraries.  There is the legacy CLIB 
 interfaces and the newer LIBC interfaces.  Being ANSI-C libraries, the 
 functionality in CLIB and LIBC is similar but the LIBC interfaces are built 
 using Novell Kernal Services (NKS) which is designed to leverage 
 multi-processor environments.
 The NetWare port of OpenSSL can be configured to build using CLIB or LIBC.
 The CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LIBC 
 build was developed and tested using the NetWare 6.0 FCS.  
 The necessary LIBC functionality ships with NetWare 6.  However, earlier 
 NetWare 5.x versions will require updates in order to run the OpenSSL LIBC
 build (NetWare 5.1 SP8 is known to work).
 As of June 2005, the LIBC build can be configured to use BSD sockets instead
 of WinSock sockets. Call Configure (usually through netware\build.bat) using
 a target of "netware-libc-bsdsock" instead of "netware-libc".
 As of June 2007, support for CLIB and BSD sockets is also now available
 using a target of "netware-clib-bsdsock" instead of "netware-clib";
 also gcc builds are now supported on both Linux and Win32 (post 0.9.8e).
 REQUIRED TOOLS:
 ---------------
 Based upon the configuration and build options used, some or all of the
 following tools may be required:
 * Perl for Win32 - required (http://www.activestate.com/ActivePerl)
   Used to run the various perl scripts on the build platform.
 * Perl 5.8.0 for NetWare v3.20 (or later) - required 
   (http://developer.novell.com) Used to run the test script on NetWare 
   after building.
 * Compiler / Linker - required:
   Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare (commercial):
      Provides command line tools used for building.
      Tools:
      mwccnlm.exe  - C/C++ Compiler for NetWare
      mwldnlm.exe  - Linker for NetWare
      mwasmnlm.exe - x86 assembler for NetWare (if using assembly option)
   gcc / nlmconv Cross-Compiler, available from Novell Forge (free):
         http://forge.novell.com/modules/xfmod/project/?aunixnw
 * Assemblers - optional:
   If you intend to build using the assembly options you will need an
   assembler.  Work has been completed to support two assemblers, Metrowerks
   and NASM.  However, during development, a bug was found in the Metrowerks
   assembler which generates incorrect code.  Until this problem is fixed,
   the Metrowerks assembler cannot be used.
   mwasmnlm.exe - Metrowerks x86 assembler - part of CodeWarrior tools.
         (version 2.2 Built Aug 23, 1999 - not useable due to code
          generation bug)
   nasmw.exe - Netwide Assembler NASM
         version 0.98 was used in development and testing
 * Make Tool - required:
   In order to build you will need a make tool.  Two make tools are
   supported, GNU make (gmake.exe) or Microsoft nmake.exe.
   make.exe - GNU make for Windows (version 3.75 used for development)
         http://gnuwin32.sourceforge.net/packages/make.htm
   nmake.exe - Microsoft make (Version 6.00.8168.0 used for development)
         http://support.microsoft.com/kb/132084/EN-US/
 * Novell Developer Kit (NDK) - required: (http://developer.novell.com)
   CLIB - BUILDS:
      WinSock2 Developer Components for NetWare:
         For initial development, the October 27, 2000 version was used.
         However, future versions should also work.
         NOTE:  The WinSock2 components include headers & import files for
         NetWare, but you will also need the winsock2.h and supporting
         headers (pshpack4.h, poppack.h, qos.h) delivered in the
         Microsoft SDK.  Note: The winsock2.h support headers may change
         with various versions of winsock2.h.  Check the dependencies
         section on the NDK WinSock2 download page for the latest
         information on dependencies. These components are unsupported by
         Novell. They are provided as a courtesy, but it is strongly
         suggested that all development be done using LIBC, not CLIB.
         As of June 2005, the WinSock2 components are available at:
         http://forgeftp.novell.com//ws2comp/
      NLM and NetWare libraries for C (including CLIB and XPlat):
         If you are going to build a CLIB version of OpenSSL, you will
         need the CLIB headers and imports.  The March, 2001 NDK release or 
         later is recommended.
         Earlier versions should work but haven't been tested.  In recent
         versions the import files have been consolidated and function
         names moved.  This means you may run into link problems
         (undefined symbols) when using earlier versions.   The functions
         are available in earlier versions, but you will have to modifiy
         the make files to include additional import files (see
         openssl\util\pl\netware.pl).
   LIBC - BUILDS:
      Libraries for C (LIBC) - LIBC headers and import files
         If you are going to build a LIBC version of OpenSSL, you will
         need the LIBC headers and imports.  The March 14, 2002 NDK release or
         later is required.  
         NOTE: The LIBC SDK includes the necessary WinSock2 support.
         It is not necessary to download the WinSock2 NDK when building for
         LIBC. The LIBC SDK also includes the appropriate BSD socket support
         if configuring to use BSD sockets.
 BUILDING:
 ---------
 Before building, you will need to set a few environment variables.  You can
 set them manually or you can modify the "netware\set_env.bat" file.
 The set_env.bat file is a template you can use to set up the path
 and environment variables you will need to build.  Modify the
 various lines to point to YOUR tools and run set_env.bat.
   netware\set_env.bat <target> [compiler]
      target        - "netware-clib" - CLIB NetWare build
                    - "netware-libc" - LIBC NetWare build
      compiler      - "gnuc"         - GNU GCC Compiler
                    - "codewarrior"  - MetroWerks CodeWarrior (default)
 If you don't use set_env.bat, you will need to set up the following
 environment variables:
   PATH - Set PATH to point to the tools you will use.
   INCLUDE - The location of the NDK include files.
            CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm
            LIBC ex: set INCLUDE=c:\ndk\libc\include
   PRELUDE - The absolute path of the prelude object to link with.  For
            a CLIB build it is recommended you use the "clibpre.o" files shipped
            with the Metrowerks PDK for NetWare.  For a LIBC build you should 
            use the "libcpre.o" file delivered with the LIBC NDK components.
            CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
            LIBC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
   IMPORTS - The locaton of the NDK import files.
            CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
            LIBC ex: set IMPORTS=c:\ndk\libc\imports
 In order to build, you need to run the Perl scripts to configure the build
 process and generate a make file.  There is a batch file,
 "netware\build.bat", to automate the process.
 Build.bat runs the build configuration scripts and generates a make file.
 If an assembly option is specified, it also runs the scripts to generate 
 the assembly code.  Always run build.bat from the "openssl" directory.
   netware\build [target] [debug opts] [assembly opts] [configure opts]
      target        - "netware-clib" - CLIB NetWare build (WinSock Sockets)
                    - "netware-clib-bsdsock" - CLIB NetWare build (BSD Sockets)
                    - "netware-libc" - LIBC NetWare build (WinSock Sockets)
                    - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets)
      debug opts    - "debug"  - build debug
      assembly opts - "nw-mwasm" - use Metrowerks assembler
                      "nw-nasm"  - use NASM assembler
                      "no-asm"   - don't use assembly
      configure opts- all unrecognized arguments are passed to the
                      perl 'configure' script. See that script for
                      internal documentation regarding options that
                      are available.
   examples:
      CLIB build, debug, without assembly:
         netware\build.bat netware-clib debug no-asm
      LIBC build, non-debug, using NASM assembly, add mdc2 support:
         netware\build.bat netware-libc nw-nasm enable-mdc2
      LIBC build, BSD sockets, non-debug, without assembly:
         netware\build.bat netware-libc-bsdsock no-asm
 Running build.bat generates a make file to be processed by your make 
 tool (gmake or nmake):
   CLIB ex: gmake -f netware\nlm_clib_dbg.mak 
   LIBC ex: gmake -f netware\nlm_libc.mak 
   LIBC ex: gmake -f netware\nlm_libc_bsdsock.mak 
 You can also run the build scripts manually if you do not want to use the
 build.bat file.  Run the following scripts in the "\openssl"
 subdirectory (in the order listed below):
   perl configure no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock]
      configures no assembly build for specified netware environment
      (CLIB or LIBC).
   perl util\mkfiles.pl >MINFO
      generates a listing of source files (used by mk1mf)
   perl util\mk1mf.pl no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock >netware\nlm.mak
      generates the makefile for NetWare
   gmake -f netware\nlm.mak
      build with the make tool (nmake.exe also works)
 NOTE:  If you are building using the assembly option, you must also run the
 various Perl scripts to generate the assembly files.  See build.bat
 for an example of running the various assembly scripts.  You must use the
 "no-asm" option to build without assembly.  The configure and mk1mf scripts
 also have various other options.  See the scripts for more information.
 The output from the build is placed in the following directories:
   CLIB Debug build:
      out_nw_clib.dbg     - static libs & test nlm(s)
      tmp_nw_clib.dbg     - temporary build files
      outinc_nw_clib      - necessary include files
   CLIB Non-debug build:
      out_nw_clib         - static libs & test nlm(s)
      tmp_nw_clib         - temporary build files
      outinc_nw_clib      - necesary include files
   LIBC Debug build:
      out_nw_libc.dbg     - static libs & test nlm(s)
      tmp_nw_libc.dbg     - temporary build files
      outinc_nw_libc      - necessary include files
   LIBC Non-debug build:
      out_nw_libc         - static libs & test nlm(s)
      tmp_nw_libc         - temporary build files
      outinc_nw_libc      - necesary include files
 TESTING:
 --------
 The build process creates the OpenSSL static libs ( crypto.lib, ssl.lib,
 rsaglue.lib ) and several test programs.  You should copy the test programs
 to your NetWare server and run the tests.
 The batch file "netware\cpy_tests.bat" will copy all the necessary files
 to your server for testing.  In order to run the batch file, you need a
 drive mapped to your target server.  It will create an "OpenSSL" directory
 on the drive and copy the test files to it.  CAUTION: If a directory with the
 name of "OpenSSL" already exists, it will be deleted.
 To run cpy_tests.bat:
   netware\cpy_tests [output directory] [NetWare drive]
      output directory - "out_nw_clib.dbg", "out_nw_libc", etc.
      NetWare drive    - drive letter of mapped drive
      CLIB ex: netware\cpy_tests out_nw_clib m:
      LIBC ex: netware\cpy_tests out_nw_libc m:
 The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server
 should be used to execute the tests.  Before running the script, make sure
 your SEARCH PATH includes the "OpenSSL" directory.  For example, if you
 copied the files to the "sys:" volume you use the command:
   SEARCH ADD SYS:\OPENSSL
 To run do_tests.pl type (at the console prompt):
   perl \openssl\do_tests.pl [options]
      options:
         -p    - pause after executing each test
 The do_tests.pl script generates a log file "\openssl\test_out\tests.log"
 which should be reviewed for errors.  Any errors will be denoted by the word
 "ERROR" in the log.
 DEVELOPING WITH THE OPENSSL SDK:
 --------------------------------
 Now that everything is built and tested, you are ready to use the OpenSSL
 libraries in your development.
 There is no real installation procedure, just copy the static libs and
 headers to your build location.  The libs (crypto.lib & ssl.lib) are
 located in the appropriate "out_nw_XXXX" directory 
 (out_nw_clib, out_nw_libc, etc).  
 The headers are located in the appropriate "outinc_nw_XXX" directory 
 (outinc_nw_clib, outinc_nw_libc).  
 One suggestion is to create the following directory 
 structure for the OpenSSL SDK:
   \openssl
      |- bin
      |   |- openssl.nlm
      |   |- (other tests you want)
      |
      |- lib
      |   | - crypto.lib
      |   | - ssl.lib
      |
      |- include
      |   | - openssl
      |   |    | - (all the headers in "outinc_nw\openssl")
 The program "openssl.nlm" can be very useful.  It has dozens of
 options and you may want to keep it handy for debugging, testing, etc.
 When building your apps using OpenSSL, define "NETWARE".  It is needed by
 some of the OpenSSL headers.  One way to do this is with a compile option,
 for example "-DNETWARE".
 NOTES:
 ------
 Resource leaks in Tests
 ------------------------
 Some OpenSSL tests do not clean up resources and NetWare reports
 the resource leaks when the tests unload.  If this really bugs you,
 you can stop the messages by setting the developer option off at the console
 prompt (set developer option = off).  Or better yet, fix the tests to
 clean up the resources!
 Multi-threaded Development
 ---------------------------
 The NetWare version of OpenSSL is thread-safe, however multi-threaded
 applications must provide the necessary locking function callbacks.  This
 is described in doc\threads.doc.  The file "openssl-x.x.x\crypto\threads\mttest.c"
 is a multi-threaded test program and demonstrates the locking functions.
 What is openssl2.nlm?
 ---------------------
 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.
 Openssl2.nlm is functionally identical but uses the console screen.
 Openssl2 can be used when a non-interactive mode is desired.
 NOTE:  There are may other possibilities (command line options, etc)
 which could have been used to address the screen issue.  The openssl2.nlm
 option was chosen because it impacted only the build not the code.
 Why only static libraries?
 --------------------------
 Globals, globals, and more globals.  The OpenSSL code uses many global
 variables that are allocated and initialized when used for the first time.
 On NetWare, most applications (at least historically) run in the kernel.
 When running in the kernel, there is one instance of global variables.
 For regular application type NLM(s) this isn't a problem because they are
 the only ones using the globals.  However, for a library NLM (an NLM which
 exposes functions and has no threads of execution), the globals cause
 problems.  Applications could inadvertently step on each other if they
 change some globals.  Even worse, the first application that triggers a
 global to be allocated and initialized has the allocated memory charged to
 itself.  Now when that application unloads, NetWare will clean up all the
 applicaton's memory.  The global pointer variables inside OpenSSL now
 point to freed memory.  An abend waiting to happen!
 To work correctly in the kernel, library NLM(s) that use globals need to
 provide a set of globals (instance data) for each application.  Another
 option is to require the library only be loaded in a protected address
 space along with the application using it.
 Modifying the OpenSSL code to provide a set of globals (instance data) for
 each application isn't technically difficult, but due to the large number
 globals it would require substantial code changes and it wasn't done.  Hence,
 the build currently only builds static libraries which are then linked
 into each application.
 NOTE:  If you are building a library NLM that uses the OpenSSL static
 libraries, you will still have to deal with the global variable issue.
 This is because when you link in the OpenSSL code you bring in all the
 globals.  One possible solution for the global pointer variables is to
 register memory functions with OpenSSL which allocate memory and charge it
 to your library NLM (see the function CRYPTO_set_mem_functions).  However,
 be aware that now all memory allocated by OpenSSL is charged to your NLM.
 CodeWarrior Tools and W2K
 ---------------------------
 There have been problems reported with the CodeWarrior Linker
 (mwldnlm.exe) in the PDK 2.1 for NetWare when running on Windows 2000.  The
 problems cause the link step to fail.  The only work around is to obtain an
 updated linker from Metrowerks.  It is expected Metrowerks will release
 PDK 3.0 (in beta testing at this time - May, 2001) in the near future which
 will fix these problems.
 Makefile "vclean"
 ------------------
 The generated makefile has a "vclean" target which cleans up the build
 directories.  If you have been building successfully and suddenly
 experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry.
 "Undefined Symbol" Linker errors
 --------------------------------
 There have been linker errors reported when doing a CLIB build.  The problems
 occur because some versions of the CLIB SDK import files inadvertently 
 left out some symbols.  One symbol in particular is "_lrotl".  The missing
 functions are actually delivered in the binaries, but they were left out of
 the import files.  The issues should be fixed in the September 2001 release 
 of the NDK.  If you experience the problems you can temporarily
 work around it by manually adding the missing symbols to your version of 
 "clib.imp".
--- a/INSTALL.VMS
+++ b/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> <bits> <debug-p> [<compiler>]
+  @MAKEVMS <option> <rsaref-p> <debug-p> [<compiler>]
 <option> must be one of the following:
@@ -87,11 +87,24 @@ 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.
-<bits> must be one of the following:
+<rsaref-p> must be one of the following:
-      ""        compile using default pointer size
+      RSAREF    compile using the RSAREF Library
-      32        compile using 32 bit pointer size
+      NORSAREF  compile without using RSAREF
-      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:
@@ -104,13 +117,12 @@ directory.  The syntax is the following:
      GNUC      For GNU C.
-You will find the crypto library in [.xxx.EXE.CRYPTO] (where xxx is VAX,
+You will find the crypto library in [.xxx.EXE.CRYPTO], called LIBCRYPTO.OLB,
-ALPHA or IA64), called SSL_LIBCRYPTO32.OLB or SSL_LIBCRYPTO.OLB depending
+where xxx is VAX or AXP.  You will find the SSL library in [.xxx.EXE.SSL],
-on how it was built.  You will find the SSL library in [.xxx.EXE.SSL],
+named LIBSSL.OLB, and you will find a bunch of useful programs in
-named SSL_LIBSSL32.OLB or SSL_LIBSSL.OLB, and you will find a bunch of
+[.xxx.EXE.APPS].  However, these shouldn't be used right off unless it's
-useful programs in [.xxx.EXE.APPS].  However, these shouldn't be used
+just to test them.  For production use, make sure you install first, see
-right off unless it's just to test them.  For production use, make sure
+Installation below.
 you install first, see Installation below.
 Note 1: Some programs in this package require a TCP/IP library.
@@ -158,14 +170,12 @@ Installation:
 Installation is easy, just do the following:
-  @INSTALL <root> <bits>
+  @INSTALL <root>
 <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.
@@ -186,10 +196,6 @@ 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
@@ -197,6 +203,7 @@ 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.
@@ -204,9 +211,8 @@ 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 themselves:
+  SSLLIB        Contains the OpenSSL library files (LIBCRYPTO.OLB
-  		- SSL_LIBCRYPTO32.OLB and SSL_LIBSSL32.OLB or
+		and LIBSSL.OLB) themselves.
 		- SSL_LIBCRYPTO.OLB and SSL_LIBSSL.OLB
  OPENSSL	Same as SSLINCLUDE.  This is because the standard
 		way to include OpenSSL header files from version
@@ -290,4 +296,4 @@ have any ideas.
 --
 Richard Levitte <richard@levitte.org>
-2000-02-27, 2011-03-18
+2000-02-27
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -3,33 +3,21 @@
 ----------------------------------
 [Instructions for building for Windows CE can be found in INSTALL.WCE]
 [Instructions for building for Win64 can be found in INSTALL.W64]
- Here are a few comments about building OpenSSL for Win32 environments,
+ Heres a few comments about building OpenSSL in Windows environments.  Most
- such as Windows NT and Windows 9x. It should be noted though that
+ of this is tested on Win32 but it may also work in Win 3.1 with some
- Windows 9x are not ordinarily tested. Its mention merely means that we
+ modification.
 attempt to maintain certain programming discipline and pay attention
 to backward compatibility issues, in other words it's kind of expected
 to work on Windows 9x, but no regression tests are actually performed.
- On additional note newer OpenSSL versions are compiled and linked with
+ You need Perl for Win32.  Unless you will build on Cygwin, you will need
 Winsock 2. This means that minimum OS requirement was elevated to NT 4
 and Windows 98 [there is Winsock 2 update for Windows 95 though].
 - you need Perl for Win32.  Unless you will build on Cygwin, you will need
 ActiveState Perl, available from http://www.activestate.com/ActivePerl.
- - one of the following C compilers:
+ and one of the following C compilers:
  * Visual C++
  * Borland C
  * GNU C (Cygwin or MinGW)
- Netwide Assembler, a.k.a. NASM, available from http://nasm.sourceforge.net/
+ If you are compiling from a tarball or a CVS snapshot then the Win32 files
  is required if you intend to utilize assembler modules. Note that NASM
  is now the only supported assembler.
 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.
@@ -37,18 +25,38 @@
 Visual C++
 ----------
- If you want to compile in the assembly language routines with Visual
+ If you want to compile in the assembly language routines with Visual C++ then
- C++, then you will need already mentioned Netwide Assembler binary,
+ you will need an assembler. This is worth doing because it will result in
- nasmw.exe or nasm.exe, to be available on your %PATH%.
+ faster code: for example it will typically result in a 2 times speedup in the
 RSA routines. Currently the following assemblers are supported:
- Firstly you should run Configure with platform VC-WIN32:
+  * Microsoft MASM (aka "ml")
  * Free Netwide Assembler NASM.
- > perl Configure VC-WIN32 --prefix=c:\some\openssl\dir
+ MASM is distributed with most versions of VC++. For the versions where it is
 not included in VC++, it is also distributed with some Microsoft DDKs, for
 example the Windows NT 4.0 DDK and the Windows 98 DDK. If you do not have
 either of these DDKs then you can just download the binaries for the Windows
 98 DDK and extract and rename the two files XXXXXml.exe and XXXXXml.err, to
 ml.exe and ml.err and install somewhere on your PATH. Both DDKs can be
 downloaded from the Microsoft developers site www.msdn.com.
- Where the prefix argument specifies where OpenSSL will be installed to.
+ NASM is freely available. Version 0.98 was used during testing: other versions
 may also work. It is available from many places, see for example:
 http://www.kernel.org/pub/software/devel/nasm/binaries/win32/
 The NASM binary nasmw.exe needs to be installed anywhere on your PATH.
- Next you need to build the Makefiles and optionally the assembly
+ Firstly you should run Configure (to build a FIPS-certified variant of
- language files:
+ OpenSSL, add the option "fips"):
 > perl Configure VC-WIN32
 Next you need to build the Makefiles and optionally the assembly language
 files (to build a FIPS-certified variant of OpenSSL, add the argument "fips"):
 - If you are using MASM then run:
   > ms\do_masm
 - If you are using NASM then run:
@@ -56,7 +64,6 @@
 - 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
@@ -67,46 +74,39 @@
 > nmake -f ms\ntdll.mak
- If all is well it should compile and you will have some DLLs and
+ If all is well it should compile and you will have some DLLs and executables
- executables in out32dll. If you want to try the tests then do:
+ in out32dll. If you want to try the tests then do:
- > nmake -f ms\ntdll.mak test
+ > cd out32dll
-
+ > ..\ms\test
 To install OpenSSL to the specified location do:
 > nmake -f ms\ntdll.mak install
 Tweaks:
- There are various changes you can make to the Win32 compile
+ There are various changes you can make to the Win32 compile environment. By
- environment. By default the library is not compiled with debugging
+ default the library is not compiled with debugging symbols. If you add 'debug'
- symbols. If you use the platform debug-VC-WIN32 instead of VC-WIN32
+ to the mk1mf.pl lines in the do_* batch file then debugging symbols will be
- then debugging symbols will be compiled in.
+ compiled in. Note that mk1mf.pl expects the platform to be the last argument
-
+ on the command line, so 'debug' must appear before that, as all other options.
 By default in 1.0.0 OpenSSL will compile builtin ENGINES into the
 separate shared librariesy. If you specify the "enable-static-engine"
 option on the command line to Configure the shared library build
 (ms\ntdll.mak) will compile the engines into libeay32.dll instead.
 The default Win32 environment is to leave out any Windows NT specific
 features.
- If you want to enable the NT specific features of OpenSSL (currently
+ If you want to enable the NT specific features of OpenSSL (currently only the
- only the logging BIO) follow the instructions above but call the batch
+ logging BIO) follow the instructions above but call the batch file do_nt.bat
- file do_nt.bat instead of do_ms.bat.
+ instead of do_ms.bat.
 You can also build a static version of the library using the Makefile
 ms\nt.mak
 Borland C++ builder 5
 ---------------------
- * Configure for building with Borland Builder:
+ * Configure for building with Borland Builder (to build a FIPS-certified
   variant of OpenSSL, add the option "fips"):
   > perl Configure BC-32
- * Create the appropriate makefile
+ * Create the appropriate makefile (to build a FIPS-certified variant of
   OpenSSL, add the argument "fips")
   > ms\do_nasm
 * Build
@@ -125,13 +125,17 @@
 GNU C (Cygwin)
 --------------
- Cygwin implements a Posix/Unix runtime system (cygwin1.dll) on top of
+ Cygwin provides a bash shell and GNU tools environment running
- Win32 subsystem and provides a bash shell and GNU tools environment.
+ on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.
- Consequently, a make of OpenSSL with Cygwin is virtually identical to
+ Consequently, a make of OpenSSL with Cygwin is closer to a GNU
- Unix procedure. It is also possible to create Win32 binaries that only
+ bash environment such as Linux than to other the other Win32
- use the Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
+ makes.
- MinGW. MinGW can be used in the Cygwin development environment or in a
+
- standalone setup as described in the following section.
+ Cygwin implements a Posix/Unix runtime system (cygwin1.dll).
 It is also possible to create Win32 binaries that only use the
 Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
 MinGW. MinGW can be used in the Cygwin development environment
 or in a standalone setup as described in the following section.
 To build OpenSSL using Cygwin:
@@ -176,44 +180,37 @@
 non-fatal error in "make test" but is otherwise harmless.  If
 desired and needed, GNU bc can be built with Cygwin without change.
- GNU C (MinGW/MSYS)
+ GNU C (MinGW)
 -------------
- * Compiler and shell environment installation:
+ * Compiler installation:
-   MinGW and MSYS are available from http://www.mingw.org/, both are
+   MinGW is available from http://www.mingw.org. Run the installer and
-   required. Run the installers and do whatever magic they say it takes
+   set the MinGW bin directory to the PATH in "System Properties" or
-   to start MSYS bash shell with GNU tools on its PATH.
+   autoexec.bat.
   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
+   > ms\mingw32
   [...]
   $ make
   [...]
   $ make test
-   This will create the library and binaries in root source directory
+   This will create the library and binaries in out. In case any problems
-   and openssl.exe application in apps directory.
+   occur, try
-
+   > ms\mingw32 no-asm
-   It is also possible to cross-compile it on Linux by configuring
+   instead.
-   with './Configure --cross-compile-prefix=i386-mingw32- mingw ...'.
+   If you want to build a FIPS-certified variant of OpenSSL, add the argument
-   'make test' is naturally not applicable then.
+   "fips"
   libcrypto.a and libssl.a are the static libraries. To use the DLLs,
   link with libeay32.a and libssl32.a instead.
-   See troubleshooting if you get error messages about functions not
+   See troubleshooting if you get error messages about functions not having
-   having a number assigned.
+   a number assigned.
 * You can now try the tests:
   > cd out
   > ..\ms\test
 Installation
 ------------
@@ -257,7 +254,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 Git tree: so anything linked against this version of the
+ assigned in the CVS tree: so anything linked against this version of the
 library may need to be recompiled.
 If you get errors about unresolved symbols there are several possible
@@ -294,32 +291,3 @@
 (e.g. fopen()), and OpenSSL cannot change these; so in general you cannot
 rely on CRYPTO_malloc_init() solving your problem, and you should
 consistently use the multithreaded library.
 Linking your application
 ------------------------
 If you link with static OpenSSL libraries [those built with ms/nt.mak],
 then you're expected to additionally link your application with
 WS2_32.LIB, ADVAPI32.LIB, GDI32.LIB and USER32.LIB. Those developing
 non-interactive service applications might feel concerned about linking
 with the latter two, as they are justly associated with interactive
 desktop, which is not available to service processes. The toolkit is
 designed to detect in which context it's currently executed, GUI,
 console app or service, and act accordingly, namely whether or not to
 actually make GUI calls. 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
 OpenSSL BIO layer and your compiler run-time. Look up OPENSSL_Applink
 reference page for further details.
--- a/INSTALL.W64
+++ b/INSTALL.W64
@@ -1,66 +0,0 @@
 INSTALLATION ON THE WIN64 PLATFORM
 ----------------------------------
 Caveat lector
 -------------
 As of moment of this writing Win64 support is classified "initial"
 for the following reasons.
 - No assembler modules are engaged upon initial 0.9.8 release.
 - API might change within 0.9.8 life-span, *but* in a manner which
   doesn't break backward binary compatibility. Or in other words,
   application programs compiled with initial 0.9.8 headers will
   be expected to work with future minor release .DLL without need
   to re-compile, even if future minor release features modified API.
 - Above mentioned API modifications have everything to do with
   elimination of a number of limitations, which are normally
   considered inherent to 32-bit platforms. Which in turn is why they
   are treated as limitations on 64-bit platform such as Win64:-)
   The current list comprises [but not necessarily limited to]:
   - null-terminated strings may not be longer than 2G-1 bytes,
     longer strings are treated as zero-length;
   - dynamically and *internally* allocated chunks can't be larger
     than 2G-1 bytes;
   - inability to encrypt/decrypt chunks of data larger than 4GB
     [it's possibly to *hash* chunks of arbitrary size through];
   Neither of these is actually big deal and hardly encountered
   in real-life applications.
 Compiling procedure
 -------------------
 You will need Perl. You can run under Cygwin or you can download
 ActiveState Perl from http://www.activestate.com/ActivePerl.
 You will need Microsoft Platform SDK, available for download at
 http://www.microsoft.com/msdownload/platformsdk/sdkupdate/. As per
 April 2005 Platform SDK is equipped with Win64 compilers, as well
 as assemblers, but it might change in the future.
 To build for Win64/x64:
 > perl Configure VC-WIN64A
 > ms\do_win64a
 > nmake -f ms\ntdll.mak
 > cd out32dll
 > ..\ms\test
 To build for Win64/IA64:
 > perl Configure VC-WIN64I
 > ms\do_win64i
 > nmake -f ms\ntdll.mak
 > cd out32dll
 > ..\ms\test
 Naturally test-suite itself has to be executed on the target platform.
 Installation
 ------------
 TBD, for now see INSTALL.W32.
--- a/INSTALL.WCE
+++ b/INSTALL.WCE
@@ -4,36 +4,24 @@
 Building OpenSSL for Windows CE requires the following external tools:
-  * Microsoft eMbedded Visual C++ 3.0 or later
+  * Microsoft eMbedded Visual C++ 3.0
-  * Appropriate SDK might be required
+  * wcecompat compatibility library (www.essemer.com.au)
-  * Perl for Win32 [commonly recommended ActiveState Perl is available
+  * Optionally ceutils for running automated tests (www.essemer.com.au)
    from http://www.activestate.com/Products/ActivePerl/]
-  * wcecompat compatibility library available at
+ You also need Perl for Win32.  You will need ActiveState Perl, available
-    http://www.essemer.com.au/windowsce/
+ from http://www.activestate.com/ActivePerl.
  * Optionally ceutils for running automated tests (same location)
-  _or_
+ Windows CE support in OpenSSL relies on wcecompat.  All Windows CE specific
 issues should be directed to www.essemer.com.au.
-  * PocketConsole driver and PortSDK available at
+ The C Runtime Library implementation for Windows CE that is included with
-    http://www.symbolictools.de/public/pocketconsole/
+ Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
-  * CMD command interpreter (same location)
+ incorrect.  wcecompat plugs the holes and tries to bring the Windows CE
-
+ CRT to a level that is more compatible with ANSI C.  wcecompat goes further
- As Windows CE support in OpenSSL relies on 3rd party compatibility
+ and provides low-level IO and stream IO support for stdin/stdout/stderr
- library, it's appropriate to check corresponding URL for updates. For
+ (which Windows CE does not provide).  This IO functionality is not needed
- example if you choose wcecompat, note that as for the moment of this
+ by the OpenSSL library itself but is used for the tests and openssl.exe.
- writing version 1.2 is available and actually required for WCE 4.2
+ More information is available at www.essemer.com.au.
 and newer platforms. All wcecompat issues should be directed to
 www.essemer.com.au.
 Why compatibility library at all? The C Runtime Library implementation
 for Windows CE that is included with Microsoft eMbedded Visual C++ is
 incomplete and in some places incorrect.  Compatibility library plugs
 the holes and tries to bring the Windows CE CRT to [more] usable level.
 Most gaping hole in CRT is support for stdin/stdout/stderr IO, which
 proposed compatibility libraries solve in two different ways: wcecompat
 redirects IO to active sync link, while PortSDK - to NT-like console
 driver on the handheld itself.
 Building
 --------
@@ -43,21 +31,9 @@
 > "C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN\WCEARM.BAT"
- Next pick compatibility library according to your preferences.
+ Next indicate where wcecompat is located:
 1. To choose wcecompat set up WCECOMPAT environment variable pointing
    at the location of wcecompat tree "root":
 > set WCECOMPAT=C:\wcecompat
    > set PORTSDK_LIBPATH=
 2. To choose PortSDK set up PORTSDK_LIBPATH to point at hardware-
    specific location where your portlib.lib is installed:
    > set PORTSDK_LIBPATH=C:\PortSDK\lib\ARM
    > set WCECOMPAT=
 Note that you may not set both variables.
 Next you should run Configure:
@@ -73,16 +49,16 @@
 Then from the VC++ environment at a prompt do:
 - to build static libraries:
   > nmake -f ms\ce.mak
 - or to build DLLs:
   > nmake -f ms\cedll.mak
- [note that static builds are not supported under CE]
+ If all is well it should compile and you will have some static libraries and
-
+ executables in out32, or some DLLs and executables in out32dll.  If you want
 If all is well it should compile and you will have some DLLs and executables
 in out32dll*. 
 <<< everyting below needs revision in respect to wcecompat vs. PortSDK >>>
 If you want
 to try the tests then make sure the ceutils are in the path and do:
 > cd out32
--- a/2
+++ b/2
@@ -12,7 +12,7 @@
  ---------------
 /* ====================================================================
- * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/MacOS/GetHTTPS.src/ErrorHandling.hpp
+++ b/MacOS/GetHTTPS.src/ErrorHandling.hpp
@@ -29,7 +29,7 @@ OSErr AppendErrorMessageToHandle(Handle inoutHandle);
-//	A bunch of evil macros that would be unnecessary if I were always using C++ !
+//	A bunch of evil macros that would be uneccessary if I were always using C++ !
 #define SetErrorMessageAndBailIfNil(theArg,theMessage)								\
 {																					\
--- a/MacOS/GetHTTPS.src/MacSocket.h
+++ b/MacOS/GetHTTPS.src/MacSocket.h
@@ -5,98 +5,97 @@
 extern "C" {
 #endif
-enum {
+
 enum
 {
 	kMacSocket_TimeoutErr = -2
 };
 //	Since MacSocket does busy waiting, I do a callback while waiting
 typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
 //	Call this before anything else!
 OSErr MacSocket_Startup(void);
 //	Call this to cleanup before quitting
 OSErr MacSocket_Shutdown(void);
-// Call this to allocate a "socket" (reference number is returned in
+
-// outSocketNum)
+//	Call this to allocate a "socket" (reference number is returned in outSocketNum)
-// Note that inDoThreadSwitching is pretty much irrelevant right now, since I
+//	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
 // ignore it
 //	The inTimeoutTicks parameter is applied during reads/writes of data
-// The inIdleWaitCallback parameter specifies a callback which is called
+//	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
 // during busy-waiting periods
 //	The inUserRefPtr parameter is passed back to the idle-wait callback
-OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
+OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
-                       const long inTimeoutTicks,
+
                       MacSocket_IdleWaitCallback inIdleWaitCallback,
                       void *inUserRefPtr);
 //	Call this to connect to an IP/DNS address
-// Note that inTargetAddressAndPort is in "IP:port" format-- e.g.
+//	Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
 // 10.1.1.1:123
 OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
 //	Call this to listen on a port
-// Since this a low-performance implementation, I allow a maximum of 1 (one!)
+//	Since this a low-performance implementation, I allow a maximum of 1 (one!) incoming request when I listen
 // incoming request when I listen
 OSErr MacSocket_listen(const int inSocketNum,const int inPortNum);
 //	Call this to close a socket
 OSErr MacSocket_close(const int inSocketNum);
 // Call this to receive data on a socket
 // Most parameters' purpose are obvious-- except maybe "inBlock" which
 // controls whether I wait for data or return immediately
-int MacSocket_recv(const int inSocketNum, void *outBuff, int outBuffLength,
+//	Call this to receive data on a socket
-                   const Boolean inBlock);
+//	Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
 int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const Boolean inBlock);
 //	Call this to send data on a socket
-int MacSocket_send(const int inSocketNum, const void *inBuff,
+int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
                   int inBuffLength);
-// If zero bytes were read in a call to MacSocket_recv(), it may be that the
+
-// remote end has done a half-close
+//	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
 //	This function will let you check whether that's true or not
 Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
-// Call this to see if the listen has completed after a call to
+
-// MacSocket_listen()
+//	Call this to see if the listen has completed after a call to MacSocket_listen()
 Boolean MacSocket_ListenCompleted(const int inSocketNum);
 //	These really aren't very useful anymore
 Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
 Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
-// You may wish to change the userRefPtr for a socket callback-- use this to
+
-// do it
+//	You may wish to change the userRefPtr for a socket callback-- use this to do it
 void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
 //	Call these to get the socket's IP:port descriptor
-void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
+void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
-                                 const int inIPAndPortLength);
+void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
-void MacSocket_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
+
                                  const int inIPAndPortLength);
 //	Call this to get error info from a socket
-void MacSocket_GetSocketErrorInfo(const int inSocketNum,
+void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
                                  int *outSocketErrCode,
                                  char *outSocketErrString,
                                  const int inSocketErrStringMaxLength);
 #ifdef __cplusplus
--- a/MacOS/Randomizer.h
+++ b/MacOS/Randomizer.h
@@ -4,7 +4,8 @@
 #include <MacTypes.h>
-class CRandomizer {
+class CRandomizer
 {
 public:
 	CRandomizer (void);
 	void PeriodicAction (void);
--- a/MacOS/opensslconf.h
+++ b/MacOS/opensslconf.h
@@ -21,11 +21,9 @@
 #if defined(HEADER_RC4_H)
 #if !defined(RC4_INT)
 /* using int types make the structure larger but make the code faster
 * on most boxes I have tested - up to %20 faster. */
 /*
 * using int types make the structure larger but make the code faster on most
 * boxes I have tested - up to %20 faster.
 */
 /*-
 * I don't know what does "most" mean, but declaring "int" is a must on:
 * - Intel P6 because partial register stalls are very expensive;
 * - elder Alpha because it lacks byte load/store instructions;
@@ -42,10 +40,8 @@
 #endif
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
-/*
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * If this is set to 'unsigned int' on a DEC Alpha, this gives about a %20
+ * %20 speed up (longs are 8 bytes, int's are 4). */
 * speed up (longs are 8 bytes, int's are 4).
 */
 #ifndef DES_LONG
 #define DES_LONG unsigned long
 #endif
@@ -62,10 +58,9 @@
 /* Should we define BN_DIV2W here? */
 /* Only one for the following should be defined */
-/*
+/* The prime number generation stuff may not work when
- * The prime number generation stuff may not work when EIGHT_BIT but I don't
+ * EIGHT_BIT but I don't care since I've only used this mode
- * care since I've only used this mode for debuging the bignum libraries
+ * for debuging the bignum libraries */
 */
 #undef SIXTY_FOUR_BIT_LONG
 #undef SIXTY_FOUR_BIT
 #define THIRTY_TWO_BIT
@@ -75,10 +70,8 @@
 #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
- * if this is defined data[i] is used instead of *data, this is a %20 speedup
+ * speedup on x86 */
 * on x86
 */
 #undef RC4_INDEX
 #endif
@@ -89,19 +82,15 @@
 #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
- * the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
 * protected undef/define
 */
 #ifndef DES_PTR
 #define DES_PTR
 #endif
-/*
+/* This helps C compiler generate the correct code for multiple functional
 * This helps C compiler generate the correct code for multiple functional
 * units.  It reduces register dependancies at the expense of 2 more
- * registers
+ * registers */
 */
 #ifndef DES_RISC1
 #define DES_RISC1
 #endif
@@ -113,14 +102,15 @@
 #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
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * CPU dependant
+ * Very mucy CPU dependant */
 */
 #ifndef DES_UNROLL
 #define DES_UNROLL
 #endif
 #endif /* HEADER_DES_LOCL_H */
 #ifndef __POWERPC__
 #define MD32_XARRAY
 #endif
--- a/Makefile.org
+++ b/Makefile.org
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,655 +0,0 @@
 #
 # Helper makefile to link shared libraries in a portable way.
 # This is much simpler than libtool, and hopefully not too error-prone.
 #
 # The following variables need to be set on the command line to build
 # properly
 # CC contains the current compiler.  This one MUST be defined
 CC=cc
 CFLAGS=$(CFLAG)
 # LDFLAGS contains flags to be used when temporary object files (when building
 # shared libraries) are created, or when an application is linked.
 # SHARED_LDFLAGS contains flags to be used when the shared library is created.
 LDFLAGS=
 SHARED_LDFLAGS=
 NM=nm
 # LIBNAME contains just the name of the library, without prefix ("lib"
 # on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
 # .dll, ...).  This one MUST have a value when using this makefile to
 # build shared libraries.
 # For example, to build libfoo.so, you need to do the following:
 #LIBNAME=foo
 LIBNAME=
 # APPNAME contains just the name of the application, without suffix (""
 # on Unix, ".exe" on Windows, ...).  This one MUST have a value when using
 # this makefile to build applications.
 # For example, to build foo, you need to do the following:
 #APPNAME=foo
 APPNAME=
 # OBJECTS contains all the object files to link together into the application.
 # This must contain at least one object file.
 #OBJECTS=foo.o
 OBJECTS=
 # LIBEXTRAS contains extra modules to link together with the library.
 # For example, if a second library, say libbar.a needs to be linked into
 # libfoo.so, you need to do the following:
 #LIBEXTRAS=libbar.a
 # Note that this MUST be used when using the link_o targets, to hold the
 # names of all object files that go into the target library.
 LIBEXTRAS=
 # LIBVERSION contains the current version of the library.
 # For example, to build libfoo.so.1.2, you need to do the following:
 #LIBVERSION=1.2
 LIBVERSION=
 # LIBCOMPATVERSIONS contains the compatibility versions (a list) of
 # the library.  They MUST be in decreasing order.
 # For example, if libfoo.so.1.2.1 is backward compatible with libfoo.so.1.2
 # and libfoo.so.1, you need to do the following:
 #LIBCOMPATVERSIONS=1.2 1
 # Note that on systems that use sonames, the last number will appear as
 # part of it.
 # It's also possible, for systems that support it (Tru64, for example),
 # to add extra compatibility info with more precision, by adding a second
 # list of versions, separated from the first with a semicolon, like this:
 #LIBCOMPATVERSIONS=1.2 1;1.2.0 1.1.2 1.1.1 1.1.0 1.0.0
 LIBCOMPATVERSIONS=
 # LIBDEPS contains all the flags necessary to cover all necessary
 # dependencies to other libraries.
 LIBDEPS=
 #------------------------------------------------------------------------------
 # The rest is private to this makefile.
 SET_X=:
 #SET_X=set -x
 top:
 	echo "Trying to use this makefile interactively?  Don't."
 CALC_VERSIONS=	\
 	SHLIB_COMPAT=; SHLIB_SOVER=; \
 	if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \
 		prev=""; \
 		for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
 			SHLIB_SOVER_NODOT=$$v; \
 			SHLIB_SOVER=.$$v; \
 			if [ -n "$$prev" ]; then \
 				SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
 			fi; \
 			prev=$$v; \
 		done; \
 	fi
 LINK_APP=	\
  ( $(SET_X);   \
    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
 LINK_SO=	\
  ( $(SET_X);   \
    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
    LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
    $${SHAREDCMD} $${SHAREDFLAGS} \
 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
 	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
  ) && $(SYMLINK_SO)
 SYMLINK_SO=	\
 	if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
 		prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 		if [ -n "$$SHLIB_COMPAT" ]; then \
 			for x in $$SHLIB_COMPAT; do \
 				( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
 				  ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
 				prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
 			done; \
 		fi; \
 		if [ -n "$$SHLIB_SOVER" ]; then \
 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
 		fi; \
 	fi
 LINK_SO_A=	SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_O=	SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
 LINK_SO_A_VIA_O=	\
  SHOBJECTS=lib$(LIBNAME).o; \
  ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
  ( $(SET_X); \
    ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
  $(LINK_SO) && rm -f lib$(LIBNAME).o
 LINK_SO_A_UNPACKED=	\
  UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
  (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
  ([ -z "$(LIBEXTRAS)" ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
  SHOBJECTS=$$UNPACKDIR/*.o; \
  $(LINK_SO) && rm -rf $$UNPACKDIR
 DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 DO_GNU_SO=$(CALC_VERSIONS); \
 	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_SOVER$$SHLIB_SUFFIX"
 DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
 #This is rather special.  It's a special target with which one can link
 #applications without bothering with any features that have anything to
 #do with shared libraries, for example when linking against static
 #libraries.  It's mostly here to avoid a lot of conditionals everywhere
 #else...
 link_app.:
 	$(LINK_APP)
 link_o.gnu:
 	@ $(DO_GNU_SO); $(LINK_SO_O)
 link_a.gnu:
 	@ $(DO_GNU_SO); $(LINK_SO_A)
 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); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	LIBDEPS=" "; \
 	ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
 	NOALLSYMSFLAGS=; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 	fi; $(LINK_SO_O)
 link_a.bsd:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	LIBDEPS=" "; \
 	ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
 	NOALLSYMSFLAGS=; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 	fi; $(LINK_SO_A)
 link_app.bsd:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
 	LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \
 	fi; $(LINK_APP)
 # For Darwin AKA Mac OS/X (dyld)
 # Originally link_o.darwin produced .so, because it was hard-coded
 # in dso_dlfcn module. At later point dso_dlfcn switched to .dylib
 # extension in order to allow for run-time linking with vendor-
 # 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=.dylib; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
 	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME); \
 	SHLIB_SUFFIX=.dylib; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
 	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 	fi; \
 	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/$(LIBDIR)/$$SHLIB$(SHLIB_EXT)"; \
 	$(LINK_SO_A)
 link_app.darwin:	# is there run-path on darwin?
 	$(LINK_APP)
 link_o.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
 	SHLIB=cyg$(LIBNAME); \
 	base=-Wl,--enable-auto-image-base; \
 	deffile=; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 		SHLIB=$(LIBNAME)eay32; base=; \
 		if test -f $(LIBNAME)eay32.def; then \
 			deffile=$(LIBNAME)eay32.def; \
 		fi; \
 	fi; \
 	SHLIB_SUFFIX=.dll; \
 	LIBVERSION="$(LIBVERSION)"; \
 	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base $$deffile -Wl,-Bsymbolic"; \
 	$(LINK_SO_O)
 #for mingw target if def-file is in use dll-name should match library-name
 link_a.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
 	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
 	base=-Wl,--enable-auto-image-base; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 		case $(LIBNAME) in \
 			crypto) SHLIB=libeay;; \
 			ssl) SHLIB=ssleay;; \
 		esac; \
 		SHLIB_SOVER=32; \
 		extras="$(LIBNAME).def"; \
 		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
 		base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \
 	fi; \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
 	$(PERL) util/mkrc.pl $$dll_name | \
 		$(CROSS_COMPILE)windres -o rc.o; \
 	extras="$$extras rc.o"; \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
 	[ -f apps/$$dll_name ] && rm apps/$$dll_name; \
 	[ -f test/$$dll_name ] && rm test/$$dll_name; \
 	$(LINK_SO_A) || exit 1; \
 	rm $$extras; \
 	cp -p $$dll_name apps/; \
 	cp -p $$dll_name test/
 link_app.cygwin:
 	@if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \
 		LIBDEPS="$(TOP)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \
 		export LIBDEPS; \
 	fi; \
 	$(LINK_APP)
 link_o.alpha-osf1:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
 		else \
 			SHLIB_HIST="$(LIBVERSION)"; \
 		fi; \
 		SHLIB_SOVER=; \
 		ALLSYMSFLAGS='-all'; \
 		NOALLSYMSFLAGS='-none'; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 		fi; \
 	fi; \
 	$(LINK_SO_O)
 link_a.alpha-osf1:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
 		else \
 			SHLIB_HIST="$(LIBVERSION)"; \
 		fi; \
 		SHLIB_SOVER=; \
 		ALLSYMSFLAGS='-all'; \
 		NOALLSYMSFLAGS='-none'; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
 		if [ -n "$$SHLIB_HIST" ]; then \
 			SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
 		fi; \
 	fi; \
 	$(LINK_SO_A)
 link_app.alpha-osf1:
 	@if $(DETECT_GNU_LD); then \
 		$(DO_GNU_APP); \
 	else \
 		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
 	fi; \
 	$(LINK_APP)
 link_o.solaris:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		MINUSZ='-z '; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.solaris:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		MINUSZ='-z '; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=;\
 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 	fi; \
 	$(LINK_SO_A)
 link_app.solaris:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_APP); \
 	else \
 		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
 	fi; \
 	$(LINK_APP)
 # OpenServer 5 native compilers used
 link_o.svr3:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS=''; \
 		NOALLSYMSFLAGS=''; \
 		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.svr3:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS=''; \
 		NOALLSYMSFLAGS=''; \
 		SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 	fi; \
 	$(LINK_SO_A_UNPACKED)
 link_app.svr3:
 	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \
 	$(LINK_APP)
 # UnixWare 7 and OpenUNIX 8 native compilers used
 link_o.svr5:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHARE_FLAG='-G'; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS=''; \
 		NOALLSYMSFLAGS=''; \
 		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.svr5:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHARE_FLAG='-G'; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS=''; \
 		NOALLSYMSFLAGS=''; \
 		SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
 	fi; \
 	$(LINK_SO_A_UNPACKED)
 link_app.svr5:
 	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \
 	$(LINK_APP)
 link_o.irix:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		MINUSWL=""; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 	fi; \
 	$(LINK_SO_O)
 link_a.irix:
 	@ if $(DETECT_GNU_LD); then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		MINUSWL=""; \
 		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
 		ALLSYMSFLAGS="$${MINUSWL}-all"; \
 		NOALLSYMSFLAGS="$${MINUSWL}-none"; \
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
 	fi; \
 	$(LINK_SO_A)
 link_app.irix:
 	@LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
 	$(LINK_APP)
 # 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
 # we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite
 # rules imply that we can only link one level down in catalog structure,
 # but that's what takes place for the moment of this writing. +cdp option
 # was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link
 # editor context only [it's simply ignored in other cases, which are all
 # ELFs by the way].
 #
 link_o.hpux:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).sl; \
 	expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,-Fl'; \
 	NOALLSYMSFLAGS=''; \
 	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 	fi; \
 	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 	$(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_a.hpux:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).sl; \
 	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-Wl,-Fl'; \
 	NOALLSYMSFLAGS=''; \
 	expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
 	fi; \
 	rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
 	$(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
 link_app.hpux:
 	@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
 	LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
 	fi; \
 	$(LINK_APP)
 link_o.aix:
 	@ $(CALC_VERSIONS); \
 	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \
 	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS=''; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_O);
 link_a.aix:
 	@ $(CALC_VERSIONS); \
 	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
 	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS='-bnogc'; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_A_VIA_O)
 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:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	$(SYMLINK_SO)
 symlink.darwin:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME); \
 	SHLIB_SUFFIX=.dylib; \
 	$(SYMLINK_SO)
 symlink.hpux:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).sl; \
 	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:
 # Compatibility targets
 link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
 link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
 link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
 symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
 link_o.bsd-shared: link_o.bsd
 link_a.bsd-shared: link_a.bsd
 link_app.bsd-shared: link_app.bsd
 link_o.darwin-shared: link_o.darwin
 link_a.darwin-shared: link_a.darwin
 link_app.darwin-shared: link_app.darwin
 symlink.darwin-shared: symlink.darwin
 link_o.cygwin-shared: link_o.cygwin
 link_a.cygwin-shared: link_a.cygwin
 link_app.cygwin-shared: link_app.cygwin
 symlink.cygwin-shared: symlink.cygwin
 link_o.alpha-osf1-shared: link_o.alpha-osf1
 link_a.alpha-osf1-shared: link_a.alpha-osf1
 link_app.alpha-osf1-shared: link_app.alpha-osf1
 symlink.alpha-osf1-shared: symlink.alpha-osf1
 link_o.tru64-shared: link_o.tru64
 link_a.tru64-shared: link_a.tru64
 link_app.tru64-shared: link_app.tru64
 symlink.tru64-shared: symlink.tru64
 link_o.tru64-shared-rpath: link_o.tru64-rpath
 link_a.tru64-shared-rpath: link_a.tru64-rpath
 link_app.tru64-shared-rpath: link_app.tru64-rpath
 symlink.tru64-shared-rpath: symlink.tru64-rpath
 link_o.solaris-shared: link_o.solaris
 link_a.solaris-shared: link_a.solaris
 link_app.solaris-shared: link_app.solaris
 symlink.solaris-shared: symlink.solaris
 link_o.svr3-shared: link_o.svr3
 link_a.svr3-shared: link_a.svr3
 link_app.svr3-shared: link_app.svr3
 symlink.svr3-shared: symlink.svr3
 link_o.svr5-shared: link_o.svr5
 link_a.svr5-shared: link_a.svr5
 link_app.svr5-shared: link_app.svr5
 symlink.svr5-shared: symlink.svr5
 link_o.irix-shared: link_o.irix
 link_a.irix-shared: link_a.irix
 link_app.irix-shared: link_app.irix
 symlink.irix-shared: symlink.irix
 link_o.hpux-shared: link_o.hpux
 link_a.hpux-shared: link_a.hpux
 link_app.hpux-shared: link_app.hpux
 symlink.hpux-shared: symlink.hpux
 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
--- a/467
+++ b/467
@@ -5,436 +5,31 @@
  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 1.0.2f and OpenSSL 1.0.2g [1 Mar 2016]
+  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
      o Disable weak ciphers in SSLv3 and up in default builds of OpenSSL.
      o Disable SSLv2 default build, default negotiation and weak ciphers
        (CVE-2016-0800)
      o Fix a double-free in DSA code (CVE-2016-0705)
      o Disable SRP fake user seed to address a server memory leak
        (CVE-2016-0798)
      o Fix BN_hex2bn/BN_dec2bn NULL pointer deref/heap corruption
        (CVE-2016-0797)
      o Fix memory issues in BIO_*printf functions (CVE-2016-0799)
      o Fix side channel attack on modular exponentiation (CVE-2016-0702)
  Major changes between OpenSSL 1.0.2e and OpenSSL 1.0.2f [28 Jan 2016]
      o DH small subgroups (CVE-2016-0701)
      o SSLv2 doesn't block disabled ciphers (CVE-2015-3197)
  Major changes between OpenSSL 1.0.2d and OpenSSL 1.0.2e [3 Dec 2015]
      o BN_mod_exp may produce incorrect results on x86_64 (CVE-2015-3193)
      o Certificate verify crash with missing PSS parameter (CVE-2015-3194)
      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
      o Rewrite EVP_DecodeUpdate (base64 decoding) to fix several bugs
      o In DSA_generate_parameters_ex, if the provided seed is too short,
        return an error
  Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [9 Jul 2015]
      o Alternate chains certificate forgery (CVE-2015-1793)
      o Race condition handling PSK identify hint (CVE-2015-3196)
  Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
      o Fix HMAC ABI incompatibility
  Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015]
      o Malformed ECParameters causes infinite loop (CVE-2015-1788)
      o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
      o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
      o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
      o Race condition handling NewSessionTicket (CVE-2015-1791)
  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [19 Mar 2015]
      o OpenSSL 1.0.2 ClientHello sigalgs DoS fix (CVE-2015-0291)
      o Multiblock corrupted pointer fix (CVE-2015-0290)
      o Segmentation fault in DTLSv1_listen fix (CVE-2015-0207)
      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
      o Segmentation fault for invalid PSS parameters fix (CVE-2015-0208)
      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
      o Empty CKE with client auth and DHE fix (CVE-2015-1787)
      o Handshake with unseeded PRNG fix (CVE-2015-0285)
      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
      o Removed the export ciphers from the DEFAULT ciphers
  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
      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.1k and OpenSSL 1.0.1l [15 Jan 2015]
      o Build fixes for the Windows and OpenVMS platforms
  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
      o Fix for CVE-2014-3571
      o Fix for CVE-2015-0206
      o Fix for CVE-2014-3569
      o Fix for CVE-2014-3572
      o Fix for CVE-2015-0204
      o Fix for CVE-2015-0205
      o Fix for CVE-2014-8275
      o Fix for CVE-2014-3570
  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-0198
      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.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 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.
      o Whirlpool hash algorithm added.
      o RFC3161 time stamp support.
      o New generalised public key API supporting ENGINE based algorithms.
      o New generalised public key API utilities.
      o New ENGINE supporting GOST algorithms.
      o SSL/TLS GOST ciphersuite support.
      o PKCS#7 and CMS GOST support.
      o RFC4279 PSK ciphersuite support.
      o Supported points format extension for ECC ciphersuites.
      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.8m and OpenSSL 0.9.8n [24 Mar 2010]:
      o CFB cipher definition fixes.
      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
      o Cipher definition fixes.
      o Workaround for slow RAND_poll() on some WIN32 versions.
      o Remove MD2 from algorithm tables.
      o SPKAC handling fixes.
      o Support for RFC5746 TLS renegotiation extension.
      o Compression memory leak fixed.
      o Compression session resumption fixed.
      o Ticket and SNI coexistence fixes.
      o Many fixes to DTLS handling. 
  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
      o Temporary work around for CVE-2009-3555: disable renegotiation.
  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
      o Fix various build issues.
      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
      o Fix security issue (CVE-2008-5077)
      o Merge FIPS 140-2 branch code.
  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
      o CryptoAPI ENGINE support.
      o Various precautionary measures.
      o Fix for bugs affecting certificate request creation.
      o Support for local machine keyset attribute in PKCS#12 files.
  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
      o Backport of CMS functionality to 0.9.8.
      o Fixes for bugs introduced with 0.9.8f.
  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
      o Add gcc 4.2 support.
      o Add support for AES and SSE2 assembly lanugauge optimization
        for VC++ build.
      o Support for RFC4507bis and server name extensions if explicitly 
        selected at compile time.
      o DTLS improvements.
      o RFC4507bis support.
      o TLS Extensions support.
  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
      o Various ciphersuite selection fixes.
      o RFC3779 support.
  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
      o Changes to ciphersuite selection algorithm
  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c [5 Sep 2006]:
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
      o New cipher Camellia
  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
      o Cipher string fixes.
      o Fixes for VC++ 2005.
      o Updated ECC cipher suite support.
      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
      o Zlib compression usage fixes.
      o Built in dynamic engine compilation support on Win32.
      o Fixes auto dynamic engine loading in Win32.
  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
      o Fix potential SSL 2.0 rollback, CVE-2005-2969
      o Extended Windows CE support
  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8 [5 Jul 2005]:
      o Major work on the BIGNUM library for higher efficiency and to
        make operations more streamlined and less contradictory.  This
        is the result of a major audit of the BIGNUM library.
      o Addition of BIGNUM functions for fields GF(2^m) and NIST
        curves, to support the Elliptic Crypto functions.
      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
        the use through EVP, X509 and ENGINE.
      o New ASN.1 mini-compiler that's usable through the OpenSSL
        configuration file.
      o Added support for ASN.1 indefinite length constructed encoding.
      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
      o Complete rework of shared library construction and linking
        programs with shared or static libraries, through a separate
        Makefile.shared.
      o Rework of the passing of parameters from one Makefile to another.
      o Changed ENGINE framework to load dynamic engine modules
        automatically from specifically given directories.
      o New structure and ASN.1 functions for CertificatePair.
      o Changed the ZLIB compression method to be stateful.
      o Changed the key-generation and primality testing "progress"
        mechanism to take a structure that contains the ticker
        function and an argument.
      o New engine module: GMP (performs private key exponentiation).
      o New engine module: VIA PadLOck ACE extension in VIA C3
        Nehemiah processors.
      o Added support for IPv6 addresses in certificate extensions.
        See RFC 1884, section 2.2.
      o Added support for certificate policy mappings, policy
        constraints and name constraints.
      o Added support for multi-valued AVAs in the OpenSSL
        configuration file.
      o Added support for multiple certificates with the same subject
        in the 'openssl ca' index file.
      o Make it possible to create self-signed certificates using
        'openssl ca -selfsign'.
      o Make it possible to generate a serial number file with
        'openssl ca -create_serial'.
      o New binary search functions with extended functionality.
      o New BUF functions.
      o New STORE structure and library to provide an interface to all
        sorts of data repositories.  Supports storage of public and
        private keys, certificates, CRLs, numbers and arbitrary blobs.
 	This library is unfortunately unfinished and unused withing
 	OpenSSL.
      o New control functions for the error stack.
      o Changed the PKCS#7 library to support one-pass S/MIME
        processing.
      o Added the possibility to compile without old deprecated
        functionality with the OPENSSL_NO_DEPRECATED macro or the
        'no-deprecated' argument to the config and Configure scripts.
      o Constification of all ASN.1 conversion functions, and other
        affected functions.
      o Improved platform support for PowerPC.
      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
      o New X509_VERIFY_PARAM structure to support parametrisation
        of X.509 path validation.
      o Major overhaul of RC4 performance on Intel P4, IA-64 and
        AMD64.
      o Changed the Configure script to have some algorithms disabled
        by default.  Those can be explicitely enabled with the new
        argument form 'enable-xxx'.
      o Change the default digest in 'openssl' commands from MD5 to
        SHA-1.
      o Added support for DTLS.
      o New BIGNUM blinding.
      o Added support for the RSA-PSS encryption scheme
      o Added support for the RSA X.931 padding.
      o Added support for BSD sockets on NetWare.
      o Added support for files larger than 2GB.
      o Added initial support for Win64.
      o Added alternate pkg-config files.
  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m [23 Feb 2007]:
      o FIPS 1.1.1 module linking.
      o Various ciphersuite selection fixes.
  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
-  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
+  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
-  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
+  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
      o Visual C++ 2005 fixes.
      o Update Windows build system for FIPS.
-  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
      o Fix SSL 2.0 Rollback, CVE-2005-2969
      o Allow use of fixed-length exponent on DSA signing
      o Default fixed-window RSA, DSA, DH private-key operations
-  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
+  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
      o More compilation issues fixed.
      o Adaptation to more modern Kerberos API.
@@ -443,7 +38,7 @@
      o More constification.
      o Added processing of proxy certificates (RFC 3820).
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
      o Several compilation issues fixed.
      o Many memory allocation failure checks added.
@@ -451,12 +46,12 @@
      o Mandatory basic checks on certificates.
      o Performance improvements.
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
      o Fix race condition in CRL checking code.
      o Fixes to PKCS#7 (S/MIME) code.
-  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
      o Security: Fix null-pointer assignment in do_change_cipher_spec()
@@ -464,14 +59,14 @@
      o Multiple X509 verification fixes
      o Speed up HMAC and other operations
-  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
      o Security: fix various ASN1 parsing bugs.
      o New -ignore_err option to OCSP utility.
      o Various interop and bug fixes in S/MIME code.
      o SSL/TLS protocol fix for unrequested client certificates.
-  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
      o Security: counter the Klima-Pokorny-Rosa extension of
        Bleichbacher's attack 
@@ -482,7 +77,7 @@
      o ASN.1: treat domainComponent correctly.
      o Documentation: fixes and additions.
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
      o Security: Important security related bugfixes.
      o Enhanced compatibility with MIT Kerberos.
@@ -493,7 +88,7 @@
      o SSL/TLS: now handles manual certificate chain building.
      o SSL/TLS: certain session ID malfunctions corrected.
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
      o New library section OCSP.
      o Complete rewrite of ASN1 code.
@@ -539,23 +134,23 @@
      o SSL/TLS: add callback to retrieve SSL/TLS messages.
      o SSL/TLS: support AES cipher suites (RFC3268).
-  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
      o Security: fix various ASN1 parsing bugs.
      o SSL/TLS protocol fix for unrequested client certificates.
-  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
      o Security: counter the Klima-Pokorny-Rosa extension of
        Bleichbacher's attack 
      o Security: make RSA blinding default.
      o Build: shared library support fixes.
-  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
      o Important security related bugfixes.
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
      o New configuration targets for Tandem OSS and A/UX.
      o New OIDs for Microsoft attributes.
@@ -569,25 +164,25 @@
      o Fixes for smaller building problems.
      o Updates of manuals, FAQ and other instructive documents.
-  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g [9 Aug 2002]:
+  Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
      o Important building fixes on Unix.
-  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f [8 Aug 2002]:
+  Major changes between OpenSSL 0.9.6e and OpenSSL 0.9.6f:
      o Various important bugfixes.
-  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e [30 Jul 2002]:
+  Major changes between OpenSSL 0.9.6d and OpenSSL 0.9.6e:
      o Important security related bugfixes.
      o Various SSL/TLS library bugfixes.
-  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d [9 May 2002]:
+  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
      o Various SSL/TLS library bugfixes.
      o Fix DH parameter generation for 'non-standard' generators.
-  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c [21 Dec 2001]:
+  Major changes between OpenSSL 0.9.6b and OpenSSL 0.9.6c:
      o Various SSL/TLS library bugfixes.
      o BIGNUM library fixes.
@@ -600,7 +195,7 @@
        Broadcom and Cryptographic Appliance's keyserver
        [in 0.9.6c-engine release].
-  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b [9 Jul 2001]:
+  Major changes between OpenSSL 0.9.6a and OpenSSL 0.9.6b:
      o Security fix: PRNG improvements.
      o Security fix: RSA OAEP check.
@@ -617,7 +212,7 @@
      o Increase default size for BIO buffering filter.
      o Compatibility fixes in some scripts.
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a [5 Apr 2001]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.6a:
      o Security fix: change behavior of OpenSSL to avoid using
        environment variables when running as root.
@@ -642,7 +237,7 @@
      o New function BN_rand_range().
      o Add "-rand" option to openssl s_client and s_server.
-  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6 [10 Oct 2000]:
+  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:
      o Some documentation for BIO and SSL libraries.
      o Enhanced chain verification using key identifiers.
@@ -657,7 +252,7 @@
    [1] The support for external crypto devices is currently a separate
        distribution.  See the file README.ENGINE.
-  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a [1 Apr 2000]:
+  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:
      o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8 
      o Shared library support for HPUX and Solaris-gcc
@@ -666,7 +261,7 @@
      o New 'rand' application
      o New way to check for existence of algorithms from scripts
-  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5 [25 May 2000]:
+  Major changes between OpenSSL 0.9.4 and OpenSSL 0.9.5:
      o S/MIME support in new 'smime' command
      o Documentation for the OpenSSL command line application
@@ -702,7 +297,7 @@
      o Enhanced support for Alpha Linux
      o Experimental MacOS support
-  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4 [9 Aug 1999]:
+  Major changes between OpenSSL 0.9.3 and OpenSSL 0.9.4:
      o Transparent support for PKCS#8 format private keys: these are used
        by several software packages and are more secure than the standard
@@ -713,7 +308,7 @@
      o New pipe-like BIO that allows using the SSL library when actual I/O
        must be handled by the application (BIO pair)
-  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3 [24 May 1999]:
+  Major changes between OpenSSL 0.9.2b and OpenSSL 0.9.3:
      o Lots of enhancements and cleanups to the Configuration mechanism
      o RSA OEAP related fixes
      o Added `openssl ca -revoke' option for revoking a certificate
@@ -727,7 +322,7 @@
      o Sparc assembler bignum implementation, optimized hash functions
      o Option to disable selected ciphers
-  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b [22 Mar 1999]:
+  Major changes between OpenSSL 0.9.1c and OpenSSL 0.9.2b:
      o Fixed a security hole related to session resumption
      o Fixed RSA encryption routines for the p < q case
      o "ALL" in cipher lists now means "everything except NULL ciphers"
@@ -749,7 +344,7 @@
      o Lots of memory leak fixes.
      o Lots of bug fixes.
-  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c [23 Dec 1998]:
+  Major changes between SSLeay 0.9.0b and OpenSSL 0.9.1c:
      o Integration of the popular NO_RSA/NO_DSA patches
      o Initial support for compression inside the SSL record layer
      o Added BIO proxy and filtering functionality
--- a/Netware/build.bat
+++ b/Netware/build.bat
@@ -1,235 +0,0 @@
@echo off
 rem ========================================================================
 rem   Batch file to automate building OpenSSL for NetWare.
 rem
 rem   usage:
 rem      build [target] [debug opts] [assembly opts] [configure opts]
 rem
 rem      target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
 rem                    - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
 rem                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
 rem                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 rem 
 rem      debug opts    - "debug"  - build debug
 rem
 rem      assembly opts - "nw-mwasm" - use Metrowerks assembler
 rem                    - "nw-nasm"  - use NASM assembler
 rem                    - "no-asm"   - don't use assembly
 rem
 rem      configure opts- all unrecognized arguments are passed to the
 rem                       perl configure script
 rem
 rem   If no arguments are specified the default is to build non-debug with
 rem   no assembly.  NOTE: there is no default BLD_TARGET.
 rem
 rem   No assembly is the default - Uncomment section below to change
 rem   the assembler default
 set ASM_MODE=
 set ASSEMBLER=
 set NO_ASM=no-asm
 rem   Uncomment to default to the Metrowerks assembler
 rem set ASM_MODE=nw-mwasm
 rem set ASSEMBLER=Metrowerks
 rem set NO_ASM=
 rem   Uncomment to default to the NASM assembler
 rem set ASM_MODE=nw-nasm
 rem set ASSEMBLER=NASM
 rem set NO_ASM=
 rem   No default Bld target
 set BLD_TARGET=no_target
 rem set BLD_TARGET=netware-clib
 rem set BLD_TARGET=netware-libc
 rem   Default to build non-debug
 set DEBUG=
 rem   Uncomment to default to debug build
 rem set DEBUG=debug
 set CONFIG_OPTS=
 set ARG_PROCESSED=NO
 rem   Process command line args
 :opts
 if "a%1" == "a" goto endopt
 if "%1" == "no-asm"   set NO_ASM=no-asm
 if "%1" == "no-asm"   set ARG_PROCESSED=YES
 if "%1" == "debug"    set DEBUG=debug
 if "%1" == "debug"    set ARG_PROCESSED=YES
 if "%1" == "nw-nasm"  set ASM_MODE=nw-nasm
 if "%1" == "nw-nasm"  set ASSEMBLER=NASM
 if "%1" == "nw-nasm"  set NO_ASM=
 if "%1" == "nw-nasm"  set ARG_PROCESSED=YES
 if "%1" == "nw-mwasm" set ASM_MODE=nw-mwasm
 if "%1" == "nw-mwasm" set ASSEMBLER=Metrowerks
 if "%1" == "nw-mwasm" set NO_ASM=
 if "%1" == "nw-mwasm" set ARG_PROCESSED=YES
 if "%1" == "netware-clib" set BLD_TARGET=netware-clib
 if "%1" == "netware-clib" set ARG_PROCESSED=YES
 if "%1" == "netware-clib-bsdsock" set BLD_TARGET=netware-clib-bsdsock
 if "%1" == "netware-clib-bsdsock" set ARG_PROCESSED=YES
 if "%1" == "netware-libc" set BLD_TARGET=netware-libc
 if "%1" == "netware-libc" set ARG_PROCESSED=YES
 if "%1" == "netware-libc-bsdsock" set BLD_TARGET=netware-libc-bsdsock
 if "%1" == "netware-libc-bsdsock" set ARG_PROCESSED=YES
 rem   If we didn't recognize the argument, consider it an option for config
 if "%ARG_PROCESSED%" == "NO" set CONFIG_OPTS=%CONFIG_OPTS% %1
 if "%ARG_PROCESSED%" == "YES" set ARG_PROCESSED=NO
 shift
 goto opts
 :endopt
 rem make sure a valid BLD_TARGET was specified
 if "%BLD_TARGET%" == "no_target" goto no_target
 rem build the nlm make file name which includes target and debug info
 set NLM_MAKE=
 if "%BLD_TARGET%" == "netware-clib" set NLM_MAKE=netware\nlm_clib
 if "%BLD_TARGET%" == "netware-clib-bsdsock" set NLM_MAKE=netware\nlm_clib_bsdsock
 if "%BLD_TARGET%" == "netware-libc" set NLM_MAKE=netware\nlm_libc
 if "%BLD_TARGET%" == "netware-libc-bsdsock" set NLM_MAKE=netware\nlm_libc_bsdsock
 if "%DEBUG%" == "" set NLM_MAKE=%NLM_MAKE%.mak
 if "%DEBUG%" == "debug" set NLM_MAKE=%NLM_MAKE%_dbg.mak
 if "%NO_ASM%" == "no-asm" set ASM_MODE=
 if "%NO_ASM%" == "no-asm" set ASSEMBLER=
 if "%NO_ASM%" == "no-asm" set CONFIG_OPTS=%CONFIG_OPTS% no-asm
 if "%NO_ASM%" == "no-asm" goto do_config
 rem ==================================================
 echo Generating x86 for %ASSEMBLER% assembler
 echo Bignum
 cd crypto\bn\asm
 rem perl x86.pl %ASM_MODE% > bn-nw.asm
 perl bn-586.pl %ASM_MODE% > bn-nw.asm
 perl co-586.pl %ASM_MODE% > co-nw.asm
 cd ..\..\..
 echo AES
 cd crypto\aes\asm
 perl aes-586.pl %ASM_MODE% > a-nw.asm
 cd ..\..\..
 echo DES
 cd crypto\des\asm
 perl des-586.pl %ASM_MODE% > d-nw.asm
 cd ..\..\..
 echo "crypt(3)"
 cd crypto\des\asm
 perl crypt586.pl %ASM_MODE% > y-nw.asm
 cd ..\..\..
 echo Blowfish
 cd crypto\bf\asm
 perl bf-586.pl %ASM_MODE% > b-nw.asm
 cd ..\..\..
 echo CAST5
 cd crypto\cast\asm
 perl cast-586.pl %ASM_MODE% > c-nw.asm
 cd ..\..\..
 echo RC4
 cd crypto\rc4\asm
 perl rc4-586.pl %ASM_MODE% > r4-nw.asm
 cd ..\..\..
 echo MD5
 cd crypto\md5\asm
 perl md5-586.pl %ASM_MODE% > m5-nw.asm
 cd ..\..\..
 echo SHA1
 cd crypto\sha\asm
 perl sha1-586.pl %ASM_MODE% > s1-nw.asm
 perl sha256-586.pl %ASM_MODE% > sha256-nw.asm
 perl sha512-586.pl %ASM_MODE% > sha512-nw.asm
 cd ..\..\..
 echo RIPEMD160
 cd crypto\ripemd\asm
 perl rmd-586.pl %ASM_MODE% > rm-nw.asm
 cd ..\..\..
 echo RC5\32
 cd crypto\rc5\asm
 perl rc5-586.pl %ASM_MODE% > r5-nw.asm
 cd ..\..\..
 echo WHIRLPOOL
 cd crypto\whrlpool\asm
 perl wp-mmx.pl %ASM_MODE% > wp-nw.asm
 cd ..\..\..
 echo CPUID
 cd crypto
 perl x86cpuid.pl %ASM_MODE% > x86cpuid-nw.asm
 cd ..\
 rem ===============================================================
 rem
 :do_config
 echo .
 echo configure options: %CONFIG_OPTS% %BLD_TARGET%
 echo .
 perl configure %CONFIG_OPTS% %BLD_TARGET%
 perl util\mkfiles.pl >MINFO
 echo .
 echo mk1mf.pl options: %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET%
 echo .
 perl util\mk1mf.pl %DEBUG% %ASM_MODE% %CONFIG_OPTS% %BLD_TARGET% >%NLM_MAKE%
 make -f %NLM_MAKE% vclean
 echo .
 echo The makefile "%NLM_MAKE%" has been created use your maketool to
 echo build (ex: make -f %NLM_MAKE%)
 goto end
 rem ===============================================================
 rem
 :no_target
 echo .
 echo .  No build target specified!!!
 echo .
 echo .  usage: build [target] [debug opts] [assembly opts] [configure opts]
 echo .
 echo .     target        - "netware-clib" - CLib NetWare build (WinSock Sockets)
 echo .                   - "netware-clib-bsdsock" - CLib NetWare build (BSD Sockets)
 echo .                   - "netware-libc" - LibC NetWare build (WinSock Sockets)
 echo .                   - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 echo .
 echo .     debug opts    - "debug"  - build debug
 echo .
 echo .     assembly opts - "nw-mwasm" - use Metrowerks assembler
 echo .                     "nw-nasm"  - use NASM assembler
 echo .                     "no-asm"   - don't use assembly
 echo .
 echo .     configure opts- all unrecognized arguments are passed to the
 echo .                      perl configure script
 echo .
 echo .  If no debug or assembly opts are specified the default is to build
 echo .  non-debug without assembly
 echo .
 :end        
--- a/Netware/cpy_tests.bat
+++ b/Netware/cpy_tests.bat
@@ -1,113 +0,0 @@
@echo off
 rem   Batch file to copy OpenSSL stuff to a NetWare server for testing
 rem   This batch file will create an "opensssl" directory at the root of the
 rem   specified NetWare drive and copy the required files to run the tests.
 rem   It should be run from inside the "openssl\netware" subdirectory.
 rem   Usage:
 rem      cpy_tests.bat <test subdirectory> <NetWare drive>
 rem          <test subdirectory> - out_nw.dbg | out_nw
 rem          <NetWare drive> - any mapped drive letter
 rem
 rem      example ( copy from debug build to m: dirve ):
 rem              cpy_tests.bat out_nw.dbg m:
 rem
 rem      CAUTION:  If a directory named OpenSSL exists on the target drive
 rem                it will be deleted first.
 if "%1" == "" goto usage
 if "%2" == "" goto usage
 rem   Assume running in \openssl directory unless cpy_tests.bat exists then
 rem   it must be the \openssl\netware directory
 set loc=.
 if exist cpy_tests.bat set loc=..
 rem   make sure the local build subdirectory specified is valid
 if not exist %loc%\%1\NUL goto invalid_dir
 rem   make sure target drive is valid
 if not exist %2\NUL goto invalid_drive
 rem   If an OpenSSL directory exists on the target drive, remove it
 if exist %2\openssl\NUL goto remove_openssl
 goto do_copy
 :remove_openssl
 echo .
 echo OpenSSL directory exists on %2 - it will be removed!
 pause
 rmdir %2\openssl /s /q
 :do_copy
 rem   make an "openssl" directory and others at the root of the NetWare drive
 mkdir %2\openssl
 mkdir %2\openssl\test_out
 mkdir %2\openssl\apps
 mkdir %2\openssl\certs
 mkdir %2\openssl\test
 rem   copy the test nlms
 copy %loc%\%1\*.nlm %2\openssl\
 rem   copy the test perl script
 copy %loc%\netware\do_tests.pl %2\openssl\
 rem   copy the certs directory stuff
 xcopy %loc%\certs\*.*         %2\openssl\certs\ /s
 rem   copy the test directory stuff
 copy %loc%\test\CAss.cnf      %2\openssl\test\
 copy %loc%\test\Uss.cnf       %2\openssl\test\
 copy %loc%\test\pkcs7.pem     %2\openssl\test\
 copy %loc%\test\pkcs7-1.pem   %2\openssl\test\
 copy %loc%\test\testcrl.pem   %2\openssl\test\
 copy %loc%\test\testp7.pem    %2\openssl\test\
 copy %loc%\test\testreq2.pem  %2\openssl\test\
 copy %loc%\test\testrsa.pem   %2\openssl\test\
 copy %loc%\test\testsid.pem   %2\openssl\test\
 copy %loc%\test\testx509.pem  %2\openssl\test\
 copy %loc%\test\v3-cert1.pem  %2\openssl\test\
 copy %loc%\test\v3-cert2.pem  %2\openssl\test\
 copy %loc%\crypto\evp\evptests.txt %2\openssl\test\
 rem   copy the apps directory stuff
 copy %loc%\apps\client.pem    %2\openssl\apps\
 copy %loc%\apps\server.pem    %2\openssl\apps\
 copy %loc%\apps\openssl.cnf   %2\openssl\apps\
 echo .
 echo Tests copied
 echo Run the test script at the console by typing:
 echo     "Perl \openssl\do_tests.pl"
 echo .
 echo Make sure the Search path includes the OpenSSL subdirectory
 goto end
 :invalid_dir
 echo.
 echo Invalid build directory specified: %1
 echo.
 goto usage
 :invalid_drive
 echo.
 echo Invalid drive: %2
 echo.
 goto usage
 :usage
 echo.
 echo usage: cpy_tests.bat [test subdirectory] [NetWare drive]
 echo     [test subdirectory] - out_nw_clib.dbg, out_nw_libc.dbg, etc. 
 echo     [NetWare drive]     - any mapped drive letter
 echo.
 echo example: cpy_test out_nw_clib.dbg M:
 echo  (copy from clib debug build area to M: drive)
 :end
--- a/Netware/do_tests.pl
+++ b/Netware/do_tests.pl
@@ -1,624 +0,0 @@
 # perl script to run OpenSSL tests
 my $base_path      = "\\openssl";
 my $output_path    = "$base_path\\test_out";
 my $cert_path      = "$base_path\\certs";
 my $test_path      = "$base_path\\test";
 my $app_path       = "$base_path\\apps";
 my $tmp_cert       = "$output_path\\cert.tmp";
 my $OpenSSL_config = "$app_path\\openssl.cnf";
 my $log_file       = "$output_path\\tests.log";
 my $pause = 0;
 #  process the command line args to see if they wanted us to pause
 #  between executing each command
 foreach $i (@ARGV)
 {
   if ($i =~ /^-p$/)
   { $pause=1; }
 }
 main();
 ############################################################################
 sub main()
 {
   # delete all the output files in the output directory
   unlink <$output_path\\*.*>;
   # open the main log file
   open(OUT, ">$log_file") || die "unable to open $log_file\n";
   print( OUT "========================================================\n");
   my $outFile = "$output_path\\version.out";
   system("openssl2 version (CLIB_OPT)/>$outFile");
   log_output("CHECKING FOR OPENSSL VERSION:", $outFile);
   algorithm_tests();
   encryption_tests();
   evp_tests();
   pem_tests();
   verify_tests();
   ca_tests();
   ssl_tests();
   close(OUT);
   print("\nCompleted running tests.\n\n");
   print("Check log file for errors: $log_file\n");
 }
 ############################################################################
 sub algorithm_tests
 {
   my $i;
   my $outFile;
   my @tests = ( rsa_test, destest, ideatest, bftest, bntest, shatest, sha1test,
                 sha256t, sha512t, dsatest, md2test, md4test, md5test, mdc2test,
                 rc2test, rc4test, rc5test, randtest, rmdtest, dhtest, ecdhtest,
                 ecdsatest, ectest, exptest, casttest, hmactest );
   print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "CRYPTO ALGORITHM TESTS:\n\n");
   foreach $i (@tests)
   {
      if (-e "$base_path\\$i.nlm")
      {
         $outFile = "$output_path\\$i.out";
         system("$i (CLIB_OPT)/>$outFile");
         log_desc("Test: $i\.nlm:");
         log_output("", $outFile );
      }
      else
      {
         log_desc("Test: $i\.nlm: file not found");
      }
   }
 }
 ############################################################################
 sub encryption_tests
 {
   my $i;
   my $outFile;
   my @enc_tests = ( "enc", "rc4", "des-cfb", "des-ede-cfb", "des-ede3-cfb",
                     "des-ofb", "des-ede-ofb", "des-ede3-ofb",
                     "des-ecb", "des-ede", "des-ede3", "des-cbc",
                     "des-ede-cbc", "des-ede3-cbc", "idea-ecb", "idea-cfb",
                     "idea-ofb", "idea-cbc", "rc2-ecb", "rc2-cfb",
                     "rc2-ofb", "rc2-cbc", "bf-ecb", "bf-cfb",
                     "bf-ofb", "bf-cbc" );
   my $input = "$base_path\\do_tests.pl";
   my $cipher = "$output_path\\cipher.out";
   my $clear = "$output_path\\clear.out";
   print( "\nRUNNING ENCRYPTION & DECRYPTION TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "FILE ENCRYPTION & DECRYPTION TESTS:\n\n");
   foreach $i (@enc_tests)
   {
      log_desc("Testing: $i");
      # do encryption
      $outFile = "$output_path\\enc.out";
      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile" );
      log_output("Encrypting: $input --> $cipher", $outFile);
      # do decryption
      $outFile = "$output_path\\dec.out";
      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
      log_output("Decrypting: $cipher --> $clear", $outFile);
      # compare files
      $x = compare_files( $input, $clear, 1);
      if ( $x == 0 )
      {
         print( "\rSUCCESS - files match: $input, $clear\n");
         print( OUT "SUCCESS - files match: $input, $clear\n");
      }
      else
      {
         print( "\rERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
      do_wait();
      # Now do the same encryption but use Base64
      # do encryption B64
      $outFile = "$output_path\\B64enc.out";
      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile");
      log_output("Encrypting(B64): $cipher --> $clear", $outFile);
      # do decryption B64
      $outFile = "$output_path\\B64dec.out";
      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear (CLIB_OPT)/>$outFile");
      log_output("Decrypting(B64): $cipher --> $clear", $outFile);
      # compare files
      $x = compare_files( $input, $clear, 1);
      if ( $x == 0 )
      {
         print( "\rSUCCESS - files match: $input, $clear\n");
         print( OUT "SUCCESS - files match: $input, $clear\n");
      }
      else
      {
         print( "\rERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
      do_wait();
   } # end foreach
   # delete the temporary files
   unlink($cipher);
   unlink($clear);
 }
 ############################################################################
 sub pem_tests
 {
   my $i;
   my $tmp_out;
   my $outFile = "$output_path\\pem.out";
   my %pem_tests = (
         "crl"      => "testcrl.pem",
          "pkcs7"   => "testp7.pem",
          "req"     => "testreq2.pem",
          "rsa"     => "testrsa.pem",
          "x509"    => "testx509.pem",
          "x509"    => "v3-cert1.pem",
          "sess_id" => "testsid.pem"  );
   print( "\nRUNNING PEM TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "PEM TESTS:\n\n");
   foreach $i (keys(%pem_tests))
   {
      log_desc( "Testing: $i");
      my $input = "$test_path\\$pem_tests{$i}";
      $tmp_out = "$output_path\\$pem_tests{$i}";
      if ($i ne "req" )
      {
         system("openssl2 $i -in $input -out $tmp_out (CLIB_OPT)/>$outFile");
         log_output( "openssl2 $i -in $input -out $tmp_out", $outFile);
      }
      else
      {
         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config (CLIB_OPT)/>$outFile");
         log_output( "openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config", $outFile );
      }
      $x = compare_files( $input, $tmp_out);
      if ( $x == 0 )
      {
         print( "\rSUCCESS - files match: $input, $tmp_out\n");
         print( OUT "SUCCESS - files match: $input, $tmp_out\n");
      }
      else
      {
         print( "\rERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
      do_wait();
   } # end foreach
 }
 ############################################################################
 sub verify_tests
 {
   my $i;
   my $outFile = "$output_path\\verify.out";
   $cert_path =~ s/\\/\//g;
   my @cert_files = <$cert_path/*.pem>;
   print( "\nRUNNING VERIFY TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "VERIFY TESTS:\n\n");
   make_tmp_cert_file();
   foreach $i (@cert_files)
   {
      system("openssl2 verify -CAfile $tmp_cert $i (CLIB_OPT)/>$outFile");
      log_desc("Verifying cert: $i");
      log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile);
   }
 }
 ############################################################################
 sub ssl_tests
 {
   my $outFile = "$output_path\\ssl_tst.out";
   my($CAcert) = "$output_path\\certCA.ss";
   my($Ukey)   = "$output_path\\keyU.ss";
   my($Ucert)  = "$output_path\\certU.ss";
   my($ssltest)= "ssltest -key $Ukey -cert $Ucert -c_key $Ukey -c_cert $Ucert -CAfile $CAcert";
   print( "\nRUNNING SSL TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "SSL TESTS:\n\n");
   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);
   system("$ssltest -ssl3 -server_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with server authentication:");
   log_output("$ssltest -ssl3 -server_auth", $outFile);
   system("$ssltest -ssl3 -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with client authentication:");
   log_output("$ssltest -ssl3 -client_auth", $outFile);
   system("$ssltest -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with both client and server authentication:");
   log_output("$ssltest -ssl3 -server_auth -client_auth", $outFile);
   system("ssltest (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3:");
   log_output("ssltest", $outFile);
   system("$ssltest -server_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with server authentication:");
   log_output("$ssltest -server_auth", $outFile);
   system("$ssltest -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with client authentication:");
   log_output("$ssltest -client_auth ", $outFile);
   system("$ssltest -server_auth -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with both client and server authentication:");
   log_output("$ssltest -server_auth -client_auth", $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);
   system("$ssltest -bio_pair -ssl3 -server_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -ssl3 -server_auth", $outFile);
   system("$ssltest -bio_pair -ssl3 -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with client authentication  via BIO pair:");
   log_output("$ssltest -bio_pair -ssl3 -client_auth", $outFile);
   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv3 with both client and server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -ssl3 -server_auth -client_auth", $outFile);
   system("ssltest -bio_pair (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 via BIO pair:");
   log_output("ssltest -bio_pair", $outFile);
   system("$ssltest -bio_pair -server_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -server_auth", $outFile);
   system("$ssltest -bio_pair -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with client authentication via BIO pair:");
   log_output("$ssltest -bio_pair -client_auth", $outFile);
   system("$ssltest -bio_pair -server_auth -client_auth (CLIB_OPT)/>$outFile");
   log_desc("Testing sslv2/sslv3 with both client and server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -server_auth -client_auth", $outFile);
 }
 ############################################################################
 sub ca_tests
 {
   my $outFile = "$output_path\\ca_tst.out";
   my($CAkey)     = "$output_path\\keyCA.ss";
   my($CAcert)    = "$output_path\\certCA.ss";
   my($CAserial)  = "$output_path\\certCA.srl";
   my($CAreq)     = "$output_path\\reqCA.ss";
   my($CAreq2)    = "$output_path\\req2CA.ss";
   my($CAconf)    = "$test_path\\CAss.cnf";
   my($Uconf)     = "$test_path\\Uss.cnf";
   my($Ukey)      = "$output_path\\keyU.ss";
   my($Ureq)      = "$output_path\\reqU.ss";
   my($Ucert)     = "$output_path\\certU.ss";
   print( "\nRUNNING CA TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "CA TESTS:\n");
   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new (CLIB_OPT)/>$outFile");
   log_desc("Make a certificate request using req:");
   log_output("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new", $outFile);
   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey (CLIB_OPT)/>$outFile");
   log_desc("Convert the certificate request into a self signed certificate using x509:");
   log_output("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey", $outFile);
   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 (CLIB_OPT)/>$outFile");
   log_desc("Convert a certificate into a certificate request using 'x509':");
   log_output("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2", $outFile);
   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout (CLIB_OPT)/>$outFile");
   log_output("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout", $outFile);
   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout (CLIB_OPT)/>$outFile");
   log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile);
   system("openssl2 verify -CAfile $CAcert $CAcert (CLIB_OPT)/>$outFile");
   log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile);
   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new (CLIB_OPT)/>$outFile");
   log_desc("Make another certificate request using req:");
   log_output("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new", $outFile);
   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial (CLIB_OPT)/>$outFile");
   log_desc("Sign certificate request with the just created CA via x509:");
   log_output("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial", $outFile);
   system("openssl2 verify -CAfile $CAcert $Ucert (CLIB_OPT)/>$outFile");
   log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile);
   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert (CLIB_OPT)/>$outFile");
   log_desc("Certificate details");
   log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile);
   print(OUT "--\n");
   print(OUT "The generated CA certificate is $CAcert\n");
   print(OUT "The generated CA private key is $CAkey\n");
   print(OUT "The current CA signing serial number is in $CAserial\n");
   print(OUT "The generated user certificate is $Ucert\n");
   print(OUT "The generated user private key is $Ukey\n");
   print(OUT "--\n");
 }
 ############################################################################
 sub evp_tests
 {
   my $i = 'evp_test';
   print( "\nRUNNING EVP TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "EVP TESTS:\n\n");
   if (-e "$base_path\\$i.nlm")
   {
       my $outFile = "$output_path\\$i.out";
       system("$i $test_path\\evptests.txt (CLIB_OPT)/>$outFile");
       log_desc("Test: $i\.nlm:");
       log_output("", $outFile );
   }
   else
   {
       log_desc("Test: $i\.nlm: file not found");
   }
 }
 ############################################################################
 sub log_output( $ $ )
 {
   my( $desc, $file ) = @_;
   my($error) = 0;
   my($key);
   my($msg);
   if ($desc)
   {
      print("\r$desc\n");
      print(OUT "$desc\n");
   }
      # loop waiting for test program to complete
   while ( stat($file) == 0)
      { print(". "); sleep(1); }
      # copy test output to log file
   open(IN, "<$file");
   while (<IN>)
   {
      print(OUT $_);
      if ( $_ =~ /ERROR/ )
      {
         $error = 1;
      }
   }
      # close and delete the temporary test output file
   close(IN);
   unlink($file);
   if ( $error == 0 )
   {
      $msg = "Test Succeeded";
   }
   else
   {
      $msg = "Test Failed";
   }
   print(OUT "$msg\n");
   if ($pause)
   {
      print("$msg - press ENTER to continue...");
      $key = getc;
      print("\n");
   }
      # Several of the testing scripts run a loop loading the
      # same NLM with different options.
      # On slow NetWare machines there appears to be some delay in the
      # OS actually unloading the test nlms and the OS complains about.
      # the NLM already being loaded.  This additional pause is to
      # to help provide a little more time for unloading before trying to
      # load again.
   sleep(1);
 }
 ############################################################################
 sub log_desc( $ )
 {
   my( $desc ) = @_;
   print("\n");
   print("$desc\n");
   print(OUT "\n");
   print(OUT "$desc\n");
   print(OUT "======================================\n");
 }
 ############################################################################
 sub compare_files( $ $ $ )
 {
   my( $file1, $file2, $binary ) = @_;
   my( $n1, $n2, $b1, $b2 );
   my($ret) = 1;
   open(IN0, $file1) || die "\nunable to open $file1\n";
   open(IN1, $file2) || die "\nunable to open $file2\n";
  if ($binary)
  {
      binmode IN0;
      binmode IN1;
  }
   for (;;)
   {
      $n1 = read(IN0, $b1, 512);
      $n2 = read(IN1, $b2, 512);
      if ($n1 != $n2) {last;}
      if ($b1 != $b2) {last;}
      if ($n1 == 0)
      {
         $ret = 0;
         last;
      }
   }
   close(IN0);
   close(IN1);
   return($ret);
 }
 ############################################################################
 sub do_wait()
 {
   my($key);
   if ($pause)
   {
      print("Press ENTER to continue...");
      $key = getc;
      print("\n");
   }
 }
 ############################################################################
 sub make_tmp_cert_file()
 {
   my @cert_files = <$cert_path/*.pem>;
      # delete the file if it already exists
   unlink($tmp_cert);
   open( TMP_CERT, ">$tmp_cert") || die "\nunable to open $tmp_cert\n";
   print("building temporary cert file\n");
   # create a temporary cert file that contains all the certs
   foreach $i (@cert_files)
   {
      open( IN_CERT, $i ) || die "\nunable to open $i\n";
      for(;;)
      {
         $n = sysread(IN_CERT, $data, 1024);
         if ($n == 0)
         {
            close(IN_CERT);
            last;
         };
         syswrite(TMP_CERT, $data, $n);
      }
   }
   close( TMP_CERT );
 }
--- a/Netware/globals.txt
+++ b/Netware/globals.txt
@@ -1,254 +0,0 @@
 An initial review of the OpenSSL code was done to determine how many 
 global variables where present.  The idea was to determine the amount of 
 work required to pull the globals into an instance data structure in 
 order to build a Library NLM for NetWare.  This file contains the results 
 of the review.  Each file is listed along with the globals in the file.  
 The initial review was done very quickly so this list is probably
 not a comprehensive list.
 cryptlib.c
 ===========================================
 static STACK *app_locks=NULL;
 static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL;
 static void (MS_FAR *locking_callback)(int mode,int type,
   const char *file,int line)=NULL;
 static int (MS_FAR *add_lock_callback)(int *pointer,int amount,
   int type,const char *file,int line)=NULL;
 static unsigned long (MS_FAR *id_callback)(void)=NULL;
 static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback)
   (const char *file,int line)=NULL;
 static void (MS_FAR *dynlock_lock_callback)(int mode,
   struct CRYPTO_dynlock_value *l, const char *file,int line)=NULL;
 static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l,
   const char *file,int line)=NULL;
 mem.c
 ===========================================
 static int allow_customize = 1;      /* we provide flexible functions for */
 static int allow_customize_debug = 1;/* exchanging memory-related functions at
 /* may be changed as long as `allow_customize' is set */
 static void *(*malloc_locked_func)(size_t)  = malloc;
 static void (*free_locked_func)(void *)     = free;
 static void *(*malloc_func)(size_t)         = malloc;
 static void *(*realloc_func)(void *, size_t)= realloc;
 static void (*free_func)(void *)            = free;
 /* use default functions from mem_dbg.c */
 static void (*malloc_debug_func)(void *,int,const char *,int,int)
   = CRYPTO_dbg_malloc;
 static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
   = CRYPTO_dbg_realloc;
 static void (*free_debug_func)(void *,int) = CRYPTO_dbg_free;
 static void (*set_debug_options_func)(long) = CRYPTO_dbg_set_options;
 static long (*get_debug_options_func)(void) = CRYPTO_dbg_get_options;
 mem_dbg.c
 ===========================================
 static int mh_mode=CRYPTO_MEM_CHECK_OFF;
 static unsigned long order = 0; /* number of memory requests */
 static LHASH *mh=NULL; /* hash-table of memory requests (address as key) */
 static LHASH *amih=NULL; /* hash-table with those app_mem_info_st's */
 static long options =             /* extra information to be recorded */
 static unsigned long disabling_thread = 0;
 err.c
 ===========================================
 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 )
   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.
   files:
      pem_err.c
      cpt_err.c
      pk12err.c
      asn1_err.c
      bio_err.c
      bn_err.c
      buf_err.c
      comp_err.c
      conf_err.c
      cpt_err.c
      dh_err.c
      dsa_err.c
      dso_err.c
      evp_err.c
      obj_err.c
      pkcs7err.c
      rand_err.c
      rsa_err.c
      rsar_err.c
      ssl_err.c
      x509_err.c
      v3err.c
 		err.c
 These file have similar "init" globals but they are for other stuff not
 error strings:
 		bn_lib.c
 		ecc_enc.c
 		s23_clnt.c
 		s23_meth.c
 		s23_srvr.c
 		s2_clnt.c
 		s2_lib.c
 		s2_meth.c
 		s2_srvr.c
 		s3_clnt.c
 		s3_lib.c
 		s3_srvr.c
 		t1_clnt.c
 		t1_meth.c
 		t1_srvr.c
 rand_lib.c
 ===========================================
 static RAND_METHOD *rand_meth= &rand_ssleay_meth;
 md_rand.c
 ===========================================
 static int state_num=0,state_index=0;
 static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
 static unsigned char md[MD_DIGEST_LENGTH];
 static long md_count[2]={0,0};
 static double entropy=0;
 static int initialized=0;
 /* This should be set to 1 only when ssleay_rand_add() is called inside
   an already locked state, so it doesn't try to lock and thereby cause
   a hang.  And it should always be reset back to 0 before unlocking. */
 static int add_do_not_lock=0;
 obj_dat.c
 ============================================
 static int new_nid=NUM_NID;
 static LHASH *added=NULL;
 b_sock.c
 ===========================================
 static unsigned long BIO_ghbn_hits=0L;
 static unsigned long BIO_ghbn_miss=0L;
 static struct ghbn_cache_st
   {
   char name[129];
   struct hostent *ent;
   unsigned long order;
   } ghbn_cache[GHBN_NUM];
 static int wsa_init_done=0;
 bio_lib.c
 ===========================================
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *bio_meth=NULL;
 static int bio_meth_num=0;
 bn_lib.c
 ========================================
 static int bn_limit_bits=0;
 static int bn_limit_num=8;        /* (1<<bn_limit_bits) */
 static int bn_limit_bits_low=0;
 static int bn_limit_num_low=8;    /* (1<<bn_limit_bits_low) */
 static int bn_limit_bits_high=0;
 static int bn_limit_num_high=8;   /* (1<<bn_limit_bits_high) */
 static int bn_limit_bits_mont=0;
 static int bn_limit_num_mont=8;   /* (1<<bn_limit_bits_mont) */
 conf_lib.c
 ========================================
 static CONF_METHOD *default_CONF_method=NULL;
 dh_lib.c
 ========================================
 static DH_METHOD *default_DH_method;
 static int dh_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
 dsa_lib.c
 ========================================
 static DSA_METHOD *default_DSA_method;
 static int dsa_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dsa_meth = NULL;
 dso_lib.c
 ========================================
 static DSO_METHOD *default_DSO_meth = NULL;
 rsa_lib.c
 ========================================
 static RSA_METHOD *default_RSA_meth=NULL;
 static int rsa_meth_num=0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *rsa_meth=NULL;
 x509_trs.c
 =======================================
 static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
 static STACK_OF(X509_TRUST) *trtable = NULL;
 x509_req.c
 =======================================
 static int *ext_nids = ext_nid_list;
 o_names.c
 ======================================
 static LHASH *names_lh=NULL;
 static STACK_OF(NAME_FUNCS) *name_funcs_stack;
 static int free_type;
 static int names_type_num=OBJ_NAME_TYPE_NUM;
 th-lock.c - NEED to add support for locking for NetWare
 ==============================================
 static long *lock_count;
 (other platform specific globals)
 x_x509.c
 ==============================================
 static int x509_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;
 evp_pbe.c
 ============================================
 static STACK *pbe_algs;
 evp_key.c
 ============================================
 static char prompt_string[80];
 ssl_ciph.c
 ============================================
 static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL;
 ssl_lib.c
 =============================================
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_meth=NULL;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_ctx_meth=NULL;
 static int ssl_meth_num=0;
 static int ssl_ctx_meth_num=0;
 ssl_sess.c
 =============================================
 static int ssl_session_num=0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *ssl_session_meth=NULL;
 x509_vfy.c
 ============================================
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_store_ctx_method=NULL;
 static int x509_store_ctx_num=0;
--- a/Netware/readme.txt
+++ b/Netware/readme.txt
@@ -1,19 +0,0 @@
 Contents of the openssl\netware directory
 ==========================================
 Regular files:
 readme.txt     - this file
 do_tests.pl    - perl script used to run the OpenSSL tests on NetWare
 cpy_tests.bat  - batch to to copy test stuff to NetWare server
 build.bat      - batch file to help with builds
 set_env.bat    - batch file to help setup build environments
 globals.txt    - results of initial code review to identify OpenSSL global variables
 The following files are generated by the various scripts.  They are
 recreated each time and it is okay to delete them.
 *.def - command files used by Metrowerks linker
 *.mak - make files generated by mk1mf.pl
--- a/Netware/set_env.bat
+++ b/Netware/set_env.bat
@@ -1,112 +0,0 @@
@echo off
 rem ========================================================================
 rem   Batch file to assist in setting up the necessary enviroment for
 rem   building OpenSSL for NetWare.
 rem
 rem   usage:
 rem      set_env [target]
 rem
 rem      target      - "netware-clib" - Clib build
 rem                  - "netware-libc" - LibC build
 rem
 rem
 if "a%1" == "a" goto usage
 set LIBC_BUILD=
 set CLIB_BUILD=
 set GNUC=
 if "%1" == "netware-clib" set CLIB_BUILD=Y
 if "%1" == "netware-clib" set LIBC_BUILD=
 if "%1" == "netware-libc" set LIBC_BUILD=Y
 if "%1" == "netware-libc" set CLIB_BUILD=
 if "%2" == "gnuc" set GNUC=Y
 if "%2" == "codewarrior" set GNUC=
 rem   Location of tools (compiler, linker, etc)
 if "%NDKBASE%" == "" set NDKBASE=c:\Novell
 rem   If Perl for Win32 is not already in your path, add it here
 set PERL_PATH=
 rem   Define path to the Metrowerks command line tools
 rem   or GNU Crosscompiler gcc / nlmconv
 rem   ( compiler, assembler, linker)
 if "%GNUC%" == "Y" set COMPILER_PATH=c:\usr\i586-netware\bin;c:\usr\bin
 if "%GNUC%" == "" set COMPILER_PATH=c:\prg\cwcmdl40
 rem   If using gnu make define path to utility
 rem set GNU_MAKE_PATH=%NDKBASE%\gnu
 set GNU_MAKE_PATH=c:\prg\tools
 rem   If using ms nmake define path to nmake
 rem set MS_NMAKE_PATH=%NDKBASE%\msvc\600\bin
 rem   If using NASM assembler define path
 rem set NASM_PATH=%NDKBASE%\nasm
 set NASM_PATH=c:\prg\tools
 rem   Update path to include tool paths
 set path=%path%;%COMPILER_PATH%
 if not "%GNU_MAKE_PATH%" == "" set path=%path%;%GNU_MAKE_PATH%
 if not "%MS_NMAKE_PATH%" == "" set path=%path%;%MS_NMAKE_PATH%
 if not "%NASM_PATH%"     == "" set path=%path%;%NASM_PATH%
 if not "%PERL_PATH%"     == "" set path=%path%;%PERL_PATH%
 rem   Set INCLUDES to location of Novell NDK includes
 if "%LIBC_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\libc\include;%NDKBASE%\ndk\libc\include\winsock
 if "%CLIB_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\nwsdk\include\nlm;%NDKBASE%\ws295sdk\include
 rem   Set Imports to location of Novell NDK import files
 if "%LIBC_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\libc\imports
 if "%CLIB_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\nwsdk\imports
 rem   Set PRELUDE to the absolute path of the prelude object to link with in
 rem   the Metrowerks NetWare PDK - NOTE: for Clib builds "clibpre.o" is 
 rem   recommended, for LibC NKS builds libcpre.o must be used
 if "%GNUC%" == "Y" goto gnuc
 if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.o
 rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.o
 if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.o
 echo using MetroWerks CodeWarrior 
 goto info
 :gnuc
 if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.gcc.o
 rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.gcc.o
 if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.gcc.o
 echo using GNU GCC Compiler 
 :info
 echo.
 if "%LIBC_BUILD%" == "Y" echo Enviroment configured for LibC build
 if "%LIBC_BUILD%" == "Y" echo use "netware\build.bat netware-libc ..." 
 if "%CLIB_BUILD%" == "Y" echo Enviroment configured for CLib build
 if "%CLIB_BUILD%" == "Y" echo use "netware\build.bat netware-clib ..." 
 goto end
 :usage
 rem ===============================================================
 echo.
 echo No target build specified!
 echo.
 echo usage: set_env [target] [compiler]
 echo.
 echo target      - "netware-clib" - Clib build
 echo             - "netware-libc" - LibC build
 echo.
 echo compiler    - "gnuc"         - GNU GCC Compiler
 echo             - "codewarrior"  - MetroWerks CodeWarrior (default)
 echo.
 :end
 echo.
--- a/51
+++ b/51
@@ -36,9 +36,7 @@ may differ on your machine.
 As long as Apple doesn't fix the problem with ld, this problem building
-OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by
+OpenSSL will remain as is.
 passing -Wl,-search_paths_first, but it's unknown if the flag was
 supported from the initial MacOS X release.
 * Parallell make leads to errors
@@ -73,12 +71,6 @@ The solution is simple for now: don't run parallell make when testing.
  The recomendation is to upgrade your compiler. This naturally applies to
  other similar cases.
 - There is a subtle Solaris x86-specific gcc run-time environment bug, which
  "falls between" OpenSSL [0.9.8 and later], Solaris ld and GCC. The bug
  manifests itself as Segmentation Fault upon early application start-up.
  The problem can be worked around by patching the environment according to
  http://www.openssl.org/~appro/values.c.
 * solaris64-sparcv9-cc SHA-1 performance with WorkShop 6 compiler.
 As subject suggests SHA-1 might perform poorly (4 times slower)
@@ -170,44 +162,3 @@ hire /bin/ksh to do the job /bin/sh fails to do.
   your $PATH with chosen location, e.g. PATH=/tmp:$PATH. Alter-
   natively just replace system /bin/test and /bin/[ with the
   above script.
 * hpux64-ia64-cc fails blowfish test.
 Compiler bug, presumably at particular patch level. It should be noted
 that same compiler generates correct 32-bit code, a.k.a. hpux-ia64-cc
 target. Drop optimization level to +O2 when compiling 64-bit bf_skey.o.
 * no-engines generates errors.
 Unfortunately, the 'no-engines' configuration option currently doesn't
 work properly.  Use 'no-hw' and you'll will at least get no hardware
 support.  We'll see how we fix that on OpenSSL versions past 0.9.8.
 * 'make test' fails in BN_sqr [commonly with "error 139" denoting SIGSEGV]
  if elder GNU binutils were deployed to link shared libcrypto.so.
 As subject suggests the failure is caused by a bug in elder binutils,
 either as or ld, and was observed on FreeBSD and Linux. There are two
 options. First is naturally to upgrade binutils, the second one - to
 reconfigure with additional no-sse2 [or 386] option passed to ./config.
 * If configured with ./config no-dso, toolkit still gets linked with -ldl,
  which most notably poses a problem when linking with dietlibc.
 We don't have framework to associate -ldl with no-dso, therefore the only
 way is to edit Makefile right after ./config no-dso and remove -ldl from
 EX_LIBS line.
 * 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
--- a/189
+++ b/189
@@ -1,7 +1,7 @@
- OpenSSL 1.0.2g 1 Mar 2016
+ OpenSSL 0.9.7m-dev xx XXX xxxx
- Copyright (c) 1998-2015 The OpenSSL Project
+ Copyright (c) 1998-2007 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 All rights reserved.
@@ -10,17 +10,17 @@
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, fully featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSLv3) and Transport Layer Security (TLS) protocols as
+ Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- well as a full-strength general purpose cryptograpic library. The project is
+ protocols as well as a full-strength general purpose cryptography library.
- managed by a worldwide community of volunteers that use the Internet to
+ The project is managed by a worldwide community of volunteers that use the
- communicate, plan, and develop the OpenSSL toolkit and its related
+ Internet to communicate, plan, and develop the OpenSSL toolkit and its
- documentation.
+ related documentation.
- OpenSSL is descended from the SSLeay library developed by Eric A. Young
+ OpenSSL is based on the excellent SSLeay library developed from Eric A. Young
 and Tim J. Hudson.  The OpenSSL toolkit is licensed under a dual-license (the
- OpenSSL license plus the SSLeay license), which means that you are free to
+ OpenSSL license plus the SSLeay license) situation, which basically means
- get and use it for commercial and non-commercial purposes as long as you
+ that you are free to get and use it for commercial and non-commercial
- fulfill the conditions of both licenses.
+ purposes as long as you fulfill the conditions of both licenses.
 OVERVIEW
 --------
@@ -28,41 +28,112 @@
 The OpenSSL toolkit includes:
 libssl.a:
-     Provides the client and server-side implementations for SSLv3 and TLS.
+     Implementation of SSLv2, SSLv3, TLSv1 and the required code to support
     both SSLv2, SSLv3 and TLSv1 in the one server and client.
 libcrypto.a:
-     Provides general cryptographic and X.509 support needed by SSL/TLS but
+     General encryption and X.509 v1/v3 stuff needed by SSL/TLS but not
-     not logically part of it.
+     actually logically part of it. It includes routines for the following:
     Ciphers
        libdes - EAY's libdes DES encryption package which has been floating
                 around the net for a few years.  It includes 15
                 'modes/variations' of DES (1, 2 and 3 key versions of ecb,
                 cbc, cfb and ofb; pcbc and a more general form of cfb and
                 ofb) including desx in cbc mode, a fast crypt(3), and
                 routines to read passwords from the keyboard.
        RC4 encryption,
        RC2 encryption      - 4 different modes, ecb, cbc, cfb and ofb.
        Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb.
        IDEA encryption     - 4 different modes, ecb, cbc, cfb and ofb.
     Digests
        MD5 and MD2 message digest algorithms, fast implementations,
        SHA (SHA-0) and SHA-1 message digest algorithms,
        MDC2 message digest. A DES based hash that is popular on smart cards.
     Public Key
        RSA encryption/decryption/generation.
            There is no limit on the number of bits.
        DSA encryption/decryption/generation.
            There is no limit on the number of bits.
        Diffie-Hellman key-exchange/key generation.
            There is no limit on the number of bits.
     X.509v3 certificates
        X509 encoding/decoding into/from binary ASN1 and a PEM
             based ASCII-binary encoding which supports encryption with a
             private key.  Program to generate RSA and DSA certificate
             requests and to generate RSA and DSA certificates.
     Systems
        The normal digital envelope routines and base64 encoding.  Higher
        level access to ciphers and digests by name.  New ciphers can be
        loaded at run time.  The BIO io system which is a simple non-blocking
        IO abstraction.  Current methods supported are file descriptors,
        sockets, socket accept, socket connect, memory buffer, buffering, SSL
        client/server, file pointer, encryption, digest, non-blocking testing
        and null.
     Data structures
        A dynamically growing hashing system
        A simple stack.
        A Configuration loader that uses a format similar to MS .ini files.
 openssl:
     A command line tool that can be used for:
-        Creation of key parameters
+        Creation of RSA, DH and DSA key parameters
        Creation of X.509 certificates, CSRs and CRLs
-        Calculation of message digests
+        Calculation of Message Digests
-        Encryption and decryption
+        Encryption and Decryption with Ciphers
-        SSL/TLS client and server tests
+        SSL/TLS Client and Server Tests
        Handling of S/MIME signed or encrypted mail
-        And more...
+
 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.
 INSTALLATION
 ------------
- See the appropriate file:
+ To install this package under a Unix derivative, read the INSTALL file.  For
-        INSTALL         Linux, Unix, etc.
+ a Win32 platform, read the INSTALL.W32 file.  For OpenVMS systems, read
-        INSTALL.DJGPP   DOS platform with DJGPP
+ INSTALL.VMS.
-        INSTALL.NW      Netware
+
-        INSTALL.OS2     OS/2
+ Read the documentation in the doc/ directory.  It is quite rough, but it
-        INSTALL.VMS     VMS
+ lists the functions; you will probably have to look at the code to work out
-        INSTALL.W32     Windows (32bit)
+ how to use them. Look at the example programs.
-        INSTALL.W64     Windows (64bit)
+
-        INSTALL.WCE     Windows CE
+ PROBLEMS
 --------
 For some platforms, there are some known problems that may affect the user
 or application author.  We try to collect those in doc/PROBLEMS, with current
 thoughts on how they should be solved in a future of OpenSSL.
 SUPPORT
 -------
 See the OpenSSL website www.openssl.org for details on how to obtain
 commercial technical support.
 If you have any problems with OpenSSL then please take the following steps
 first:
@@ -84,36 +155,42 @@
    - Problem Description (steps that will reproduce the problem, if known)
    - Stack Traceback (if the application dumps core)
- Email the report to:
+ Report the bug to the OpenSSL project via the Request Tracker
 (http://www.openssl.org/support/rt2.html) by mail to:
-    rt@openssl.org
+    openssl-bugs@openssl.org
- In order to avoid spam, this is a moderated mailing list, and it might
+ Note that mail to openssl-bugs@openssl.org is recorded in the publicly
- take a day for the ticket to show up.  (We also scan posts to make sure
+ readable request tracker database and is forwarded to a public
- that security disclosures aren't publically posted by mistake.) Mail
+ mailing list. Confidential mail may be sent to openssl-security@openssl.org
- to this address is recorded in the public RT (request tracker) database
+ (PGP key available from the key servers).
 (see https://www.openssl.org/community/index.html#bugs for details) and
 also forwarded the public openssl-dev mailing list.  Confidential mail
 may be sent to openssl-security@openssl.org (PGP key available from the
 key servers).
 Please do NOT use this for general assistance or support queries.
 Just because something doesn't work the way you expect does not mean it
 is necessarily a bug in OpenSSL.
 You can also make GitHub pull requests. If you do this, please also send
 mail to rt@openssl.org with a link to the PR so that we can more easily
 keep track of it.
 HOW TO CONTRIBUTE TO OpenSSL
 ----------------------------
- See CONTRIBUTING
+ 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
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
- LEGALITIES
+ 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;
 please take some time to look at
    http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
 and
    http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
 for the details. If "your encryption source code is too large to serve as
 an email attachment", they are glad to receive it by fax instead; hope you
 have a cheap long-distance plan.
 Our preferred format for changes is "diff -u" output. You might
 generate it like this:
 # cd openssl-work
 # [your changes]
 # ./Configure dist; make clean
 # cd ..
 # diff -ur openssl-orig openssl-work > mydiffs.patch
 A number of nations, in particular the U.S., restrict the use or export
 of cryptography. If you are potentially subject to such restrictions
 you should seek competent professional legal advice before attempting to
 develop or distribute cryptographic code.
--- a/126
+++ b/126
@@ -0,0 +1,126 @@
  OpenSSL STATUS                           Last modified at
  ______________                           $Date: 2006/09/28 11:56:56 $
  DEVELOPMENT STATE
    o  OpenSSL 0.9.9:  Under development...
    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.7l: Released on September 28th, 2006
    o  OpenSSL 0.9.7k: Released on September  5th, 2006
    o  OpenSSL 0.9.7j: Released on May        4th, 2006
    o  OpenSSL 0.9.7i: Released on October   14th, 2005
    o  OpenSSL 0.9.7h: Released on October   11th, 2005
    o  OpenSSL 0.9.7g: Released on April     11th, 2005
    o  OpenSSL 0.9.7f: Released on March     22nd, 2005
    o  OpenSSL 0.9.7e: Released on October   25th, 2004
    o  OpenSSL 0.9.7d: Released on March     17th, 2004
    o  OpenSSL 0.9.7c: Released on September 30th, 2003
    o  OpenSSL 0.9.7b: Released on April     10th, 2003
    o  OpenSSL 0.9.7a: Released on February  19th, 2003
    o  OpenSSL 0.9.7:  Released on December  31st, 2002
    o  OpenSSL 0.9.6m: Released on March     17th, 2004
    o  OpenSSL 0.9.6l: Released on November   4th, 2003
    o  OpenSSL 0.9.6k: Released on September 30th, 2003
    o  OpenSSL 0.9.6j: Released on April     10th, 2003
    o  OpenSSL 0.9.6i: Released on February  19th, 2003
    o  OpenSSL 0.9.6h: Released on December   5th, 2002
    o  OpenSSL 0.9.6g: Released on August     9th, 2002
    o  OpenSSL 0.9.6f: Released on August     8th, 2002
    o  OpenSSL 0.9.6e: Released on July      30th, 2002
    o  OpenSSL 0.9.6d: Released on May        9th, 2002
    o  OpenSSL 0.9.6c: Released on December  21st, 2001
    o  OpenSSL 0.9.6b: Released on July       9th, 2001
    o  OpenSSL 0.9.6a: Released on April      5th, 2001
    o  OpenSSL 0.9.6:  Released on September 24th, 2000
    o  OpenSSL 0.9.5a: Released on April      1st, 2000
    o  OpenSSL 0.9.5:  Released on February  28th, 2000
    o  OpenSSL 0.9.4:  Released on August    09th, 1999
    o  OpenSSL 0.9.3a: Released on May       29th, 1999
    o  OpenSSL 0.9.3:  Released on May       25th, 1999
    o  OpenSSL 0.9.2b: Released on March     22th, 1999
    o  OpenSSL 0.9.1c: Released on December  23th, 1998
  [See also http://www.openssl.org/support/rt2.html]
  RELEASE SHOWSTOPPERS
    o 
  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 Geoff and Richard are currently working on:
 	ENGINE (the new code that gives hardware support among others).
    o Richard is currently working on:
 	UI (User Interface)
 	UTIL (a new set of library functions to support some higher level
 	      functionality that is currently missing).
 	Shared library support for VMS.
 	Kerberos 5 authentication (Heimdal)
 	Constification
  NEEDS PATCH
    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.
--- a/6389
+++ b/6389
--- a/VMS/install-vms.com
+++ b/VMS/install-vms.com
@@ -1,67 +0,0 @@
 $! 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
 $!
--- a/VMS/install.com
+++ b/VMS/install.com
@@ -0,0 +1,72 @@
 $! 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
--- a/VMS/mkshared.com
+++ b/VMS/mkshared.com
@@ -1,168 +1,77 @@
-$! MKSHARED.COM -- Create shareable images.
+$! MKSHARED.COM -- script to created shareable images on VMS
 $!
-$! P1: "64" for 64-bit pointers.
+$! No command line parameters.  This should be run at the start of the source
 $! tree (the same directory where one finds INSTALL.VMS).
 $!
-$! P2: Zlib object library path (optional).
+$! Input:	[.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
-$!
+$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
-$! Input:	[.UTIL]LIBEAY.NUM,[.xxx.EXE.CRYPTO]SSL_LIBCRYPTO[32].OLB
+$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
-$!		[.UTIL]SSLEAY.NUM,[.xxx.EXE.SSL]SSL_LIBSSL[32].OLB
+$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
 $!		[.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..."
 $   go to tidy:
 $ endif
 $
 $ if (f$getsyi("cpu") .lt. 128)
 $ then
 $   arch_vax = 1
 $   arch = "VAX"
 $ 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
+$ if f$getsyi("CPU") .ge. 128
 $!
 $! ----- 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
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
 $   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
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''ARCHD'.EXE.CRYPTO]"
+$   libdir = "[.VAX.EXE.CRYPTO]"
-$   libmar = "''libdir'SSL_LIBCRYPTO_''shr'.MAR"
+$   libmar = "''libdir'LIBCRYPTO.MAR"
-$   libolb = "''libdir'SSL_LIBCRYPTO''lib32'.OLB"
+$   libolb = "''libdir'LIBCRYPTO.OLB"
-$   libopt = "''libdir'SSL_LIBCRYPTO_''shr'.OPT"
+$   libopt = "''libdir'LIBCRYPTO.OPT"
-$   libobj = "''libdir'SSL_LIBCRYPTO_''shr'.OBJ"
+$   libobj = "''libdir'LIBCRYPTO.OBJ"
-$   libmap = "''libdir'SSL_LIBCRYPTO_''shr'.MAP"
+$   libmap = "''libdir'LIBCRYPTO.MAP"
-$   libgoal= "''libdir'SSL_LIBCRYPTO_''shr'.EXE"
+$   libgoal= "''libdir'LIBCRYPTO.EXE"
 $   libref = ""
 $   libvec = "LIBCRYPTO"
-$   if f$search( libolb) .nes. "" then gosub create_vax_shr
+$   gosub create_vax_shr
 $   libtit = "SSL_TRANSFER_VECTOR"
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.''ARCHD'.EXE.SSL]"
+$   libdir = "[.VAX.EXE.SSL]"
-$   libmar = "''libdir'SSL_LIBSSL_''shr'.MAR"
+$   libmar = "''libdir'LIBSSL.MAR"
-$   libolb = "''libdir'SSL_LIBSSL''lib32'.OLB"
+$   libolb = "''libdir'LIBSSL.OLB"
-$   libopt = "''libdir'SSL_LIBSSL_''shr'.OPT"
+$   libopt = "''libdir'LIBSSL.OPT"
-$   libobj = "''libdir'SSL_LIBSSL_''shr'.OBJ"
+$   libobj = "''libdir'LIBSSL.OBJ"
-$   libmap = "''libdir'SSL_LIBSSL_''shr'.MAP"
+$   libmap = "''libdir'LIBSSL.MAP"
-$   libgoal= "''libdir'SSL_LIBSSL_''shr'.EXE"
+$   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.''ARCHD'.EXE.CRYPTO]SSL_LIBCRYPTO_''shr'.EXE"
+$   libref = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
 $   libvec = "LIBSSL"
-$   if f$search( libolb) .nes. "" then gosub create_vax_shr
+$   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
 $
-$! ----- Subroutines to build the shareable libraries
+$! ----- Soubroutines to actually build the shareable libraries
-$! For each supported architecture, there's a main shareable library
+$! The way things work, there's a main shareable library creator for each
-$! creator, which is called from the main code above.
+$! supported architecture, which is called from the main code above.
 $! The creator will define a number of variables to tell the next levels of
 $! subroutines what routines to use to write to the option files, call the
 $! main processor, read_func_num, and when that is done, it will write version
@@ -188,29 +97,28 @@ $! read_func_num depends on the following variables from the creator:
 $! libwriter	The name of the writer routine to call for each .num file line
 $! -----
 $
-$! ----- Subroutines for non-VAX
+$! ----- Subroutines for AXP
 $! -----
 $! The creator routine
-$ create_nonvax_shr:
+$ create_axp_shr:
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
-$   write opt libolb, " /library"
+$   write opt libolb,"/lib"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   write opt "SYMBOL_VECTOR=(-"
 $   libfirstentry := true
 $   libwrch   := opt
-$   libwriter := write_nonvax_transfer_entry
+$   libwriter := write_axp_transfer_entry
 $   textcount = 0
 $   gosub read_func_num
 $   write opt ")"
 $   write opt "GSMATCH=",libvmatch,",",libver
 $   close opt
-$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+$   link/map='libmap'/full/share='libgoal' 'libopt'/option
     'zlib_lib'
 $   return
 $
 $! The record writer routine
-$ write_nonvax_transfer_entry:
+$ write_axp_transfer_entry:
 $   if libentry .eqs. ".dummy" then return
 $   if info_kind .eqs. "VARIABLE"
 $   then
@@ -236,7 +144,7 @@ $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for VAX
+$! ----- Subroutines for AXP
 $! -----
 $! The creator routine
 $ create_vax_shr:
@@ -278,7 +186,7 @@ $   close mar
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
 $   write opt libobj
-$   write opt libolb, " /library"
+$   write opt libolb,"/lib"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   type sys$input:/out=opt:
 !
@@ -297,8 +205,7 @@ $   libwriter := write_vax_psect_attr
 $   gosub read_func_num
 $   close opt
 $   macro/obj='libobj' 'libmar'
-$   link /map = 'libmap' /full /share = 'libgoal' 'libopt' /options -
+$   link/map='libmap'/full/share='libgoal' 'libopt'/option
     'zlib_lib'
 $   return
 $
 $! The record writer routine for VAX functions
@@ -320,9 +227,9 @@ $   return
 $
 $! ----- Common subroutines
 $! -----
-$! The .num file reader.  This one has great responsibility.
+$! The .num file reader.  This one has great responsability.
 $ read_func_num:
-$   open /read libnum 'libnum'
+$   open libnum 'libnum'
 $   goto read_nums
 $
 $ read_nums:
@@ -331,12 +238,9 @@ $   liblastentry:=false
 $   entrycount=0
 $   loop:
 $     read/end=loop_end/err=loop_end libnum line
-$     lin = f$edit( line, "COMPRESS,TRIM")
+$     entrynum=f$int(f$element(1," ",f$edit(line,"COMPRESS,TRIM")))
-$!    Skip a "#" comment line.
+$     entryinfo=f$element(2," ",f$edit(line,"COMPRESS,TRIM"))
-$     if (f$extract( 0, 1, lin) .eqs. "#") then goto loop
+$     curentry=f$element(0," ",f$edit(line,"COMPRESS,TRIM"))
 $     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)
@@ -353,23 +257,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 (arch_vax)
+$         if f$getsyi("CPU") .lt. 128
 $         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") .or. -
+$         if plat_entry .eqs. "!VMS" then falsesum = falsesum + 1
-            ((plat_entry .eqs. "ZLIB") .and. (ZLIB .nes. "")) .or. -
+$         if f$trnlnm("OPENSSL_FIPS") .nes. ""
-            (arch_vax .and. (plat_entry .eqs. "VMSVAX"))) then -
+$         then
-            truesum = truesum + 1
+$           if plat_entry .eqs. "OPENSSL_FIPS" then truesum = truesum + 1
-$!
+$           if plat_entry .eqs. "!OPENSSL_FIPS" then falsesum = falsesum + 1
-$         if ((plat_entry .eqs. "!VMS") .or. -
+$         else
-            (arch_vax .and. (plat_entry .eqs. "!VMSVAX"))) then -
+$           if plat_entry .eqs. "OPENSSL_FIPS" then falsesum = falsesum + 1
-            falsesum = falsesum + 1
+$           if plat_entry .eqs. "!OPENSSL_FIPS" then truesum = truesum + 1
-$!
+$         endif
 $	  goto loop1
 $       endif
 $     endloop1:
@@ -388,7 +292,7 @@ $	alg_i = alg_i + 1
 $       if alg_entry .eqs. "" then goto loop2
 $       if alg_entry .nes. ","
 $       then
-$	  if disabled_algorithms - ("," + alg_entry + ",") .nes disabled_algorithms then goto loop
+$         if alg_entry .eqs. "KRB5" then goto loop ! Special for now
 $         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
 $	  goto loop2
 $       endif
@@ -455,22 +359,3 @@ $     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
--- a/VMS/openssl_startup.com
+++ b/VMS/openssl_startup.com
@@ -1,108 +0,0 @@
 $!
 $! 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'
 $!
--- a/VMS/openssl_undo.com
+++ b/VMS/openssl_undo.com
@@ -1,20 +0,0 @@
 $!
 $! 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
 $!
--- a/VMS/openssl_utils.com
+++ b/VMS/openssl_utils.com
@@ -8,17 +8,10 @@ $!
 $!
 $! Slightly modified by Richard Levitte <richard@levitte.org>
 $!
 $!
 $! Always define OPENSSL.  Others are optional (non-null P1).
 $!
 $ OPENSSL  :== $SSLEXE:OPENSSL
 $
 $ IF (P1 .NES. "")
 $ THEN
 $ VERIFY   :== $SSLEXE:OPENSSL VERIFY
 $ ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
-$! REQ could conflict with REQUEST.
+$ REQ      :== $SSLEXE:OPENSSL REQ
 $     OREQ     :== $SSLEXE:OPENSSL REQ
 $ DGST     :== $SSLEXE:OPENSSL DGST
 $ DH       :== $SSLEXE:OPENSSL DH
 $ ENC      :== $SSLEXE:OPENSSL ENC
@@ -43,4 +36,3 @@ $     SESS_ID  :== $SSLEXE:OPENSSL SESS_ID
 $ CIPHERS  :== $SSLEXE:OPENSSL CIPHERS
 $ NSEQ     :== $SSLEXE:OPENSSL NSEQ
 $ PKCS12   :== $SSLEXE:OPENSSL PKCS12
 $ ENDIF
--- a/apps/.cvsignore
+++ b/apps/.cvsignore
@@ -0,0 +1,8 @@
 openssl
 Makefile.save
 der_chop
 der_chop.bak
 CA.pl
 openssl.sha1
 *.flc
 semantic.cache
--- a/apps/CA.com
+++ b/apps/CA.com
@@ -37,25 +37,14 @@ $ VERIFY = openssl + " verify"
 $ X509   = openssl + " x509"
 $ PKCS12 = openssl + " pkcs12"
 $ echo   = "write sys$Output"
 $ RET = 1
 $!
-$! 2010-12-20 SMS.
+$ s = F$PARSE(F$ENVIRONMENT("DEFAULT"),"[]") - "].;"
-$! Use a concealed logical name to reduce command line lengths, to
+$ CATOP  := 's'.demoCA
-$! avoid DCL errors on VAX:
+$ CAKEY  := ]cakey.pem
-$!     %DCL-W-TKNOVF, command element is too long - shorten
+$ CACERT := ]cacert.pem
 $! (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:
@@ -66,7 +55,7 @@ $
 $ IF (prog_opt .EQS. "?" .OR. prog_opt .EQS. "-h" .OR. prog_opt .EQS. "-help") 
 $ THEN
 $   echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" 
-$   goto clean_up
+$   exit
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-input")
@@ -80,7 +69,7 @@ $!
 $ IF (prog_opt .EQS. "-newcert")
 $ THEN
 $   ! Create a certificate.
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   REQ -new -x509 -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Certificate (and private key) is in newreq.pem"
@@ -90,7 +79,7 @@ $!
 $ IF (prog_opt .EQS. "-newreq")
 $ THEN
 $   ! Create a certificate request
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   REQ -new -keyout newreq.pem -out newreq.pem 'DAYS'
 $   RET=$STATUS
 $   echo "Request (and private key) is in newreq.pem"
@@ -101,39 +90,40 @@ $ 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:[000000]serial.") .EQS. ""
+$   IF F$SEARCH(CATOP+"]serial.") .EQS. ""
 $   THEN
-$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[000000]
+$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP']
-$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[certs]
+$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.certs]
-$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[crl]
+$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.crl]
-$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[newcerts]
+$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.newcerts]
-$     CREATE /DIRECTORY /PROTECTION=OWNER:RWED CATOP:[private]
+$     CREATE /DIR /PROTECTION=OWNER:RWED 'CATOP'.private]
 $
-$     OPEN /WRITE ser_file CATOP:[000000]serial. 
+$     OPEN   /WRITE ser_file 'CATOP']serial. 
 $     WRITE ser_file "01"
 $     CLOSE ser_file
-$     APPEND /NEW_VERSION NL: CATOP:[000000]index.txt
+$     APPEND/NEW NL: 'CATOP']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( CAKEY) .EQS. ""
+$   IF F$SEARCH(CATOP+".private"+CAKEY) .EQS. ""
 $   THEN
 $     READ '__INPUT' FILE -
-       /PROMPT="CA certificate filename (or enter to create): "
+	   /PROMT="CA certificate filename (or enter to create)"
-$     IF (FILE .NES. "") .AND. (F$SEARCH(FILE) .NES. "")
+$     IF F$SEARCH(FILE) .NES. ""
 $     THEN
-$       COPY 'FILE' 'CAKEY'
+$       COPY 'FILE' 'CATOP'.private'CAKEY'
 $	RET=$STATUS
 $     ELSE
 $       echo "Making CA certificate ..."
-$       DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$       DEFINE/USER SYS$INPUT '__INPUT'
-$       REQ -new -x509 -keyout 'CAKEY' -out 'CACERT' 'DAYS'
+$       REQ -new -x509 -keyout 'CATOP'.private'CAKEY' -
 		       -out 'CATOP''CACERT' 'DAYS'
 $	RET=$STATUS
 $     ENDIF
 $   ENDIF
@@ -145,16 +135,16 @@ $ THEN
 $   i = i + 1
 $   cname = P'i'
 $   IF cname .EQS. "" THEN cname = "My certificate"
-$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CACERT' -
+$   PKCS12 -in newcert.pem -inkey newreq.pem -certfile 'CATOP''CACERT -
 	   -out newcert.p12 -export -name "''cname'"
 $   RET=$STATUS
-$   goto clean_up
+$   exit RET
 $ ENDIF
 $!
 $ IF (prog_opt .EQS. "-xsign")
 $ THEN
 $!
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -infiles newreq.pem
 $   RET=$STATUS
 $   GOTO opt_loop_continue
@@ -163,7 +153,7 @@ $!
 $ IF ((prog_opt .EQS. "-sign") .OR. (prog_opt .EQS. "-signreq"))
 $ THEN
 $!   
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles newreq.pem
 $   RET=$STATUS
 $   type newcert.pem
@@ -175,9 +165,9 @@ $ IF (prog_opt .EQS. "-signcert")
 $  THEN
 $!   
 $   echo "Cert passphrase will be requested twice - bug?"
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
-$   DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$   DEFINE/USER SYS$INPUT '__INPUT'
 $   CA -policy policy_anything -out newcert.pem -infiles tmp.pem
 y
 y
@@ -192,17 +182,17 @@ $!
 $   i = i + 1
 $   IF (p'i' .EQS. "")
 $   THEN
-$     DEFINE /USER_MODE SYS$INPUT '__INPUT'
+$     DEFINE/USER SYS$INPUT '__INPUT'
-$     VERIFY "-CAfile" 'CACERT' newcert.pem
+$     VERIFY "-CAfile" 'CATOP''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_MODE SYS$INPUT '__INPUT'
+$       DEFINE/USER SYS$INPUT '__INPUT'
 $       __tmp = p'j'
-$       VERIFY "-CAfile" 'CACERT' '__tmp'
+$       VERIFY "-CAfile" 'CATOP''CACERT' '__tmp'
 $       tmp=$STATUS
 $       IF tmp .NE. 0 THEN RET=tmp
 $     ENDIF
@@ -218,8 +208,8 @@ $ IF (prog_opt .NES. "")
 $ THEN
 $!   
 $   echo "Unknown argument ''prog_opt'"
-$   RET = 3
+$   
-$   goto clean_up
+$   EXIT 3
 $ ENDIF
 $
 $opt_loop_continue:
@@ -227,10 +217,4 @@ $ i = i + 1
 $ GOTO opt_loop
 $
 $opt_loop_end:
 $!
 $clean_up:
 $!
 $ if f$trnlnm( "CATOP", "LNM$PROCESS") .nes. "" then -
   deassign /process CATOP
 $!
 $ EXIT 'RET'
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -45,8 +45,7 @@ if(defined $ENV{OPENSSL}) {
 }
 $SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
-$DAYS="-days 365";	# 1 year
+$DAYS="-days 365";
 $CADAYS="-days 1095";	# 3 years
 $REQ="$openssl req $SSLEAY_CONFIG";
 $CA="$openssl ca $SSLEAY_CONFIG";
 $VERIFY="$openssl verify";
@@ -55,7 +54,6 @@ $PKCS12="$openssl pkcs12";
 $CATOP="./demoCA";
 $CAKEY="cakey.pem";
 $CAREQ="careq.pem";
 $CACERT="cacert.pem";
 $DIRMODE = 0777;
@@ -94,9 +92,6 @@ foreach (@ARGV) {
 		mkdir "${CATOP}/private", $DIRMODE;
 		open OUT, ">${CATOP}/index.txt";
 		close OUT;
 		open OUT, ">${CATOP}/crlnumber";
 		print OUT "01\n";
 		close OUT;
 	    }
 	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
 		print "CA certificate filename (or enter to create)\n";
@@ -111,16 +106,15 @@ foreach (@ARGV) {
 		    $RET=$?;
 		} else {
 		    print "Making CA certificate ...\n";
-		    system ("$REQ -new -keyout " .
+		    system ("$REQ -new -x509 -keyout " .
-			"${CATOP}/private/$CAKEY -out ${CATOP}/$CAREQ");
+			"${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
 		    system ("$CA -create_serial " .
 			"-out ${CATOP}/$CACERT $CADAYS -batch " . 
 			"-keyfile ${CATOP}/private/$CAKEY -selfsign " .
 			"-extensions v3_ca " .
 			"-infiles ${CATOP}/$CAREQ ");
 		    $RET=$?;
 		}
 	    }
 	    if (! -f "${CATOP}/serial" ) {
 		system ("$X509 -in ${CATOP}/$CACERT -noout "
 			. "-next_serial -out ${CATOP}/serial");
 	    }
 	} elsif (/^-pkcs12$/) {
 	    my $cname = $ARGV[1];
 	    $cname = "My Certificate" unless defined $cname;
--- a/apps/CA.sh
+++ b/apps/CA.sh
@@ -29,56 +29,24 @@
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
 cp_pem() {
    infile=$1
    outfile=$2
    bound=$3
    flag=0
    exec <$infile;
    while read line; do
 	if [ $flag -eq 1 ]; then
 		echo $line|grep "^-----END.*$bound"  2>/dev/null 1>/dev/null
 		if [ $? -eq 0 ] ; then
 			echo $line >>$outfile
 			break
 		else
 			echo $line >>$outfile
 		fi
 	fi
 	echo $line|grep "^-----BEGIN.*$bound"  2>/dev/null 1>/dev/null
 	if [ $? -eq 0 ]; then
 		echo $line >$outfile
 		flag=1
 	fi
    done
 }
 usage() {
 echo "usage: $0 -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify" >&2
 }
 if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
-if [ -z "$DAYS" ] ; then DAYS="-days 365" ; fi	# 1 year
+DAYS="-days 365"
 CADAYS="-days 1095"	# 3 years
 REQ="$OPENSSL req $SSLEAY_CONFIG"
 CA="$OPENSSL ca $SSLEAY_CONFIG"
 VERIFY="$OPENSSL verify"
 X509="$OPENSSL x509"
 PKCS12="openssl pkcs12"
-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
+CATOP=./demoCA
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
-RET=0
+for i
-
+do
-while [ "$1" != "" ] ; do
+case $i in
 case $1 in
 -\?|-h|-help)
-    usage
+    echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" >&2
    exit 0
    ;;
 -newcert) 
@@ -93,23 +61,18 @@ case $1 in
    RET=$?
    echo "Request is in newreq.pem, private key is in newkey.pem"
    ;;
 -newreq-nodes) 
    # create a certificate request
    $REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS
    RET=$?
    echo "Request (and private key) is in newreq.pem"
    ;;
 -newca)     
    # if explicitly asked for or it doesn't exist then setup the directory
    # structure that Eric likes to manage things 
    NEW="1"
    if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
 	# create the directory hierarchy
-	mkdir -p ${CATOP}
+	mkdir ${CATOP} 
-	mkdir -p ${CATOP}/certs
+	mkdir ${CATOP}/certs 
-	mkdir -p ${CATOP}/crl
+	mkdir ${CATOP}/crl 
-	mkdir -p ${CATOP}/newcerts
+	mkdir ${CATOP}/newcerts
-	mkdir -p ${CATOP}/private
+	mkdir ${CATOP}/private
 	echo "01" > ${CATOP}/serial
 	touch ${CATOP}/index.txt
    fi
    if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@ -118,21 +81,12 @@ case $1 in
 	# ask user for existing CA certificate
 	if [ "$FILE" ]; then
-	    cp_pem $FILE ${CATOP}/private/$CAKEY PRIVATE
+	    cp $FILE ${CATOP}/private/$CAKEY
 	    cp_pem $FILE ${CATOP}/$CACERT CERTIFICATE
 	    RET=$?
 	    if [ ! -f "${CATOP}/serial" ]; then
 		$X509 -in ${CATOP}/$CACERT -noout -next_serial \
 		      -out ${CATOP}/serial
 	    fi
 	else
 	    echo "Making CA certificate ..."
-	    $REQ -new -keyout ${CATOP}/private/$CAKEY \
+	    $REQ -new -x509 -keyout ${CATOP}/private/$CAKEY \
-			   -out ${CATOP}/$CAREQ
+			   -out ${CATOP}/$CACERT $DAYS
 	    $CA -create_serial -out ${CATOP}/$CACERT $CADAYS -batch \
 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
 			   -extensions v3_ca \
 			   -infiles ${CATOP}/$CAREQ
 	    RET=$?
 	fi
    fi
@@ -141,33 +95,16 @@ case $1 in
    $CA -policy policy_anything -infiles newreq.pem 
    RET=$?
    ;;
 -pkcs12)
    if [ -z "$2" ] ; then
 	CNAME="My Certificate"
    else
 	CNAME="$2"
    fi
    $PKCS12 -in newcert.pem -inkey newreq.pem -certfile ${CATOP}/$CACERT \
 	    -out newcert.p12 -export -name "$CNAME"
    RET=$?
    exit $RET
    ;;
 -sign|-signreq) 
    $CA -policy policy_anything -out newcert.pem -infiles newreq.pem
    RET=$?
    cat newcert.pem
    echo "Signed certificate is in newcert.pem"
    ;;
 -signCA)
    $CA -policy policy_anything -out newcert.pem -extensions v3_ca -infiles newreq.pem
    RET=$?
    echo "Signed CA certificate is in newcert.pem"
    ;;
 -signcert) 
    echo "Cert passphrase will be requested twice - bug?"
    $X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
    $CA -policy policy_anything -out newcert.pem -infiles tmp.pem
    RET=$?
    cat newcert.pem
    echo "Signed certificate is in newcert.pem"
    ;;
@@ -185,14 +122,13 @@ case $1 in
 	    fi
 	done
    fi
-    exit $RET
+    exit 0
    ;;
 *)
-    echo "Unknown arg $i" >&2
+    echo "Unknown arg $i";
    usage
    exit 1
    ;;
 esac
 shift
 done
 exit $RET
--- a/apps/Makefile
+++ b/apps/Makefile
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -115,6 +115,7 @@
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 static int seeded = 0;
 static int egdsocket = 0;
@@ -124,32 +125,34 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 	char buffer[200];
 #ifdef OPENSSL_SYS_WINDOWS
 	BIO_printf(bio_e,"Loading 'screen' into random state -");
 	BIO_flush(bio_e);
 	RAND_screen();
 	BIO_printf(bio_e," done\n");
 #endif
 	if (file == NULL)
 		file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
+	else if (RAND_egd(file) > 0)
-        /*
+		{
-         * we try if the given filename is an EGD socket. if it is, we don't
+		/* we try if the given filename is an EGD socket.
-         * write anything back to the file.
+		   if it is, we don't write anything back to the file. */
         */
 		egdsocket = 1;
 		return 1;
 		}
-    if (file == NULL || !RAND_load_file(file, -1)) {
+	if (file == NULL || !RAND_load_file(file, -1))
-        if (RAND_status() == 0) {
+		{
-            if (!dont_warn) {
+		if (RAND_status() == 0)
 			{
 			if (!dont_warn)
 				{
 				BIO_printf(bio_e,"unable to load 'random state'\n");
-                BIO_printf(bio_e,
+				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
                           "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
+				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
-                                          * file is explicitly named */
+					{
-                    BIO_printf(bio_e,
+					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
+					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
                    BIO_printf(bio_e,
                               "'random' data can be kept in (the file will be overwritten).\n");
 					}
 				}
 			return 0;
@@ -166,24 +169,22 @@ 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')
+		if (*p == '\0') last=1;
            last = 1;
 		*p='\0';
 		n=name;
 		name=p+1;
-        if (*n == '\0')
+		if (*n == '\0') break;
            break;
 		egd=RAND_egd(n);
 		if (egd > 0)
 			tot+=egd;
 		else
 			tot+=RAND_load_file(n,-1);
-        if (last)
+		if (last) break;
            break;
 		}
 	if (tot > 512)
 		app_RAND_allow_write_file();
@@ -195,16 +196,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,
-         * If we did not manage to read the seed file, we should not write a
+		 * we should not write a low-entropy seed file back --
-         * low-entropy seed file back -- it would suppress a crucial warning
+		 * it would suppress a crucial warning the next time
-         * the next time we want to use it.
+		 * we want to use it. */
         */
 		return 0;
 	if (file == NULL)
 		file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
+	if (file == NULL || !RAND_write_file(file))
 		{
 		BIO_printf(bio_e,"unable to write 'random state'\n");
 		return 0;
 		}
--- a/apps/apps.c
+++ b/apps/apps.c
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -114,7 +114,9 @@
 #include "e_os.h"
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
@@ -122,22 +124,23 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 # ifndef OPENSSL_NO_OCSP
 #  include <openssl/ocsp.h>
 # endif
 #include <openssl/ossl_typ.h>
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
-/*
+/* When `file' is NULL, use defaults.
- * When `file' is NULL, use defaults. `bio_e' is for error messages.
+ * `bio_e' is for error messages. */
 */
 void app_RAND_allow_write_file(void);
 long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                       * separated by LIST_SEPARATOR_CHAR
                                       * (see e_os.h).  The string is
                                       * destroyed! */
 #ifdef OPENSSL_SYS_WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
 #endif
 #ifndef MONOLITH
 #define MAIN(a,v)	main(a,v)
@@ -145,9 +148,11 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
 #ifndef NON_MAIN
 CONF *config=NULL;
 BIO *bio_err=NULL;
 int in_FIPS_mode=0;
 #else
 extern CONF *config;
 extern BIO *bio_err;
 extern int in_FIPS_mode;
 #endif
 #else
@@ -156,12 +161,11 @@ extern BIO *bio_err;
 extern CONF *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 extern int in_FIPS_mode;
 #endif
 # ifndef OPENSSL_SYS_NETWARE
 #include <signal.h>
 # endif
 #ifdef SIGPIPE
 #define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
@@ -169,60 +173,79 @@ 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()
 #  define apps_shutdown()
 #else
 #  ifndef OPENSSL_NO_ENGINE
 #    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
     defined(OPENSSL_SYS_WIN32)
 #      ifdef _O_BINARY
 #        define apps_startup() \
-                        do { do_pipe_sig(); CRYPTO_malloc_init(); \
+			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 #   define apps_shutdown() \
                        do { CONF_modules_unload(1); destroy_ui_method(); \
                        OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
                        CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
                        RAND_cleanup(); \
                        ERR_free_strings(); zlib_cleanup();} while(0)
 #      else
 #        define apps_startup() \
-                        do { do_pipe_sig(); CRYPTO_malloc_init(); \
+			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 #      endif
 #    else
 #      define apps_startup() \
 			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 			ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
 			setup_ui_method(); } while(0)
 #    endif
 #    define apps_shutdown() \
 			do { CONF_modules_unload(1); destroy_ui_method(); \
-                        OBJ_cleanup(); EVP_cleanup(); \
+			EVP_cleanup(); ENGINE_cleanup(); \
-                        CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
+			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
-                        RAND_cleanup(); \
+			ERR_free_strings(); } while(0)
                        ERR_free_strings(); zlib_cleanup(); } while(0)
 #  endif
 # endif
 # 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)
+#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
     defined(OPENSSL_SYS_WIN32)
 #      ifdef _O_BINARY
 #        define apps_startup() \
 			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			setup_ui_method(); } while(0)
 #      else
 #        define apps_startup() \
 			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			setup_ui_method(); } while(0)
 #      endif
 #    else
 #      define apps_startup() \
 			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 			ERR_load_crypto_strings(); \
 			setup_ui_method(); } while(0)
 #    endif
 #    define apps_shutdown() \
 			do { CONF_modules_unload(1); destroy_ui_method(); \
 			EVP_cleanup(); \
 			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 			ERR_free_strings(); } while(0)
 #  endif
 #endif
-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, PW_CB_DATA *cb_data);
+int password_callback(char *buf, int bufsiz, int verify,
 	PW_CB_DATA *cb_data);
 int setup_ui_method(void);
 void destroy_ui_method(void);
@@ -234,8 +257,7 @@ 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,
+void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags);
                unsigned long lflags);
 #endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
@@ -245,108 +267,58 @@ 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 *pass, ENGINE *e, const char *cert_descrip);
                           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);
 #endif
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
                                 const char *host, const char *path,
                                 const char *port, int use_ssl,
                                 const STACK_OF(CONF_VALUE) *headers,
                                 int req_timeout);
 # endif
 int load_config(BIO *err, CONF *cnf);
 char *make_config_name(void);
 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-                   ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+			ASN1_GENERALIZEDTIME **pinvtm, char *str);
 #define DB_type         0
 #define DB_exp_date     1
 #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
+#define DB_name         5       /* index - unique when active and not disabled */
                                 * 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,
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
                ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
-int save_index(const char *dbfile, const char *suffix, CA_DB *db);
+int save_index(char *dbfile, char *suffix, CA_DB *db);
-int rotate_index(const char *dbfile, const char *new_suffix,
+int rotate_index(char *dbfile, char *new_suffix, char *old_suffix);
                 const char *old_suffix);
 void free_index(CA_DB *db);
-# define index_name_cmp_noconst(a, b) \
+int index_name_cmp(const char **a, const char **b);
        index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
        (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, 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);
+X509_NAME *do_subject(char *str, long chtype);
 int args_verify(char ***pargs, int *pargc,
                int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 void policies_print(BIO *out, X509_STORE_CTX *ctx);
 int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const 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
 # ifndef OPENSSL_NO_JPAKE
 void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 # endif
 # 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
@@ -358,11 +330,6 @@ void store_setup_crl_download(X509_STORE *st);
 #define FORMAT_ENGINE   7
 #define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
 				 * adding yet another param to load_*key() */
 # define FORMAT_PEMRSA   9      /* PEM RSAPubicKey format */
 # 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 EXT_COPY_NONE	0
 #define EXT_COPY_ADD	1
@@ -374,14 +341,4 @@ void store_setup_crl_download(X509_STORE *st);
 #define SERIAL_RAND_BITS	64
 int app_isdir(const char *);
 int raw_read_stdin(void *, int);
 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
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -56,9 +56,8 @@
 * [including the GNU Public Licence.]
 */
-/*
+/* A nice addition from Dr Stephen Henson <shenson@bigfoot.com> to 
- * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * add the -strparse option which parses nested binary structures
 * -strparse option which parses nested binary structures
 */
 #include <stdio.h>
@@ -70,8 +69,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
 * -inform arg  - input format - default PEM (DER or PEM)
 * -in arg	- input file - default stdin
 * -i		- indent the details by depth
 * -offset	- where in the file to start
@@ -84,8 +82,6 @@
 int MAIN(int, char **);
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 int MAIN(int argc, char **argv)
 	{
 	int i,badops=0,offset=0,ret=1,j;
@@ -94,11 +90,9 @@ int MAIN(int argc, char **argv)
 	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
 	int informat,indent=0, noout = 0, dump = 0;
 	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL;
    char *genstr = NULL, *genconf = NULL;
 	unsigned char *tmpbuf;
    const unsigned char *ctmpbuf;
 	BUF_MEM *buf=NULL;
-    STACK_OF(OPENSSL_STRING) *osk = NULL;
+	STACK *osk=NULL;
 	ASN1_TYPE *at=NULL;
 	informat=FORMAT_PEM;
@@ -115,62 +109,66 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    if ((osk = sk_OPENSSL_STRING_new_null()) == NULL) {
+	if ((osk=sk_new_null()) == NULL)
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto end;
 		}
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                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)
+			}
-            noout = 1;
+		else if (strcmp(*argv,"-noout") == 0) noout = 1;
-        else if (strcmp(*argv, "-oid") == 0) {
+		else if (strcmp(*argv,"-oid") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			oidfile= *(++argv);
-        } else if (strcmp(*argv, "-offset") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-offset") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			offset= atoi(*(++argv));
-        } else if (strcmp(*argv, "-length") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-length") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			length= atoi(*(++argv));
-            if (length == 0)
+			if (length == 0) goto bad;
-                goto bad;
+			}
-        } else if (strcmp(*argv, "-dump") == 0) {
+		else if (strcmp(*argv,"-dump") == 0)
 			{
 			dump= -1;
-        } else if (strcmp(*argv, "-dlimit") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-dlimit") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			dump= atoi(*(++argv));
-            if (dump <= 0)
+			if (dump <= 0) goto bad;
-                goto bad;
+			}
-        } else if (strcmp(*argv, "-strparse") == 0) {
+		else if (strcmp(*argv,"-strparse") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            sk_OPENSSL_STRING_push(osk, *(++argv));
+			sk_push(osk,*(++argv));
-        } else if (strcmp(*argv, "-genstr") == 0) {
+			}
-            if (--argc < 1)
+		else
-                goto bad;
+			{
            genstr = *(++argv);
        } else if (strcmp(*argv, "-genconf") == 0) {
            if (--argc < 1)
                goto bad;
            genconf = *(++argv);
        } else {
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
@@ -179,30 +177,24 @@ 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,
+		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
                   " -out arg      output file (output format is always DER\n");
 		BIO_printf(bio_err," -noout arg    don't produce any output\n");
 		BIO_printf(bio_err," -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,
+		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
                   " -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
 		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
 		BIO_printf(bio_err," -strparse offset\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
                   "               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,
                   " -genconf file file to generate ASN1 structure from\n");
 		goto end;
 		}
@@ -210,7 +202,8 @@ int MAIN(int argc, char **argv)
 	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;
 		}
@@ -222,8 +215,10 @@ int MAIN(int argc, char **argv)
 	}
 #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;
@@ -233,8 +228,10 @@ int MAIN(int argc, char **argv)
 	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;
 			}
@@ -248,22 +245,11 @@ int MAIN(int argc, char **argv)
 		}
 	}
-    if ((buf = BUF_MEM_new()) == NULL)
+	if ((buf=BUF_MEM_new()) == NULL) goto end;
-        goto end;
+	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
    if (!BUF_MEM_grow(buf, BUFSIZ * 8))
        goto end;               /* Pre-allocate :-) */
-    if (genstr || genconf) {
+	if (informat == FORMAT_PEM)
-        num = do_generate(bio_err, genstr, genconf, buf);
+		{
        if (num < 0) {
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    else {
        if (informat == FORMAT_PEM) {
 		BIO *tmp;
 		if ((b64=BIO_new(BIO_f_base64())) == NULL)
@@ -275,47 +261,48 @@ int MAIN(int argc, char **argv)
 		}
 	num=0;
-        for (;;) {
+	for (;;)
-            if (!BUF_MEM_grow(buf, (int)num + BUFSIZ))
+		{
-                goto end;
+		if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
 		i=BIO_read(in,&(buf->data[num]),BUFSIZ);
-            if (i <= 0)
+		if (i <= 0) break;
                break;
 		num+=i;
 		}
    }
 	str=buf->data;
 	/* If any structs to parse go through in sequence */
-    if (sk_OPENSSL_STRING_num(osk)) {
+	if (sk_num(osk))
 		{
 		tmpbuf=(unsigned char *)str;
 		tmplen=num;
-        for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) {
+		for (i=0; i<sk_num(osk); i++)
-            ASN1_TYPE *atmp;
+			{
 			int typ;
-            j = atoi(sk_OPENSSL_STRING_value(osk, i));
+			ASN1_TYPE *atmp;
-            if (j == 0) {
+			j=atoi(sk_value(osk,i));
-                BIO_printf(bio_err, "'%s' is an invalid number\n",
+			if (j == 0)
-                           sk_OPENSSL_STRING_value(osk, i));
+				{
 				BIO_printf(bio_err,"'%s' is an invalid number\n",sk_value(osk,i));
 				continue;
 				}
 			tmpbuf+=j;
 			tmplen-=j;
 			atmp = at;
-            ctmpbuf = tmpbuf;
+			at = d2i_ASN1_TYPE(NULL,&tmpbuf,tmplen);
            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_BOOLEAN)
+				|| (typ == V_ASN1_NULL))
-                || (typ == V_ASN1_NULL)) {
+				{
-                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
+				BIO_printf(bio_err, "Can't parse %s type\n",
 					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -327,15 +314,15 @@ int MAIN(int argc, char **argv)
 		num=tmplen;
 		}
-    if (offset >= num) {
+	if (offset >= num)
 		{
 		BIO_printf(bio_err, "Error: offset too large\n");
 		goto end;
 		}
 	num -= offset;
-    if ((length == 0) || ((long)length > num))
+	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
        length = (unsigned int)num;
 	if(derout) {
 		if(BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
@@ -345,86 +332,24 @@ int MAIN(int argc, char **argv)
 	}
 	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)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (b64 != NULL) BIO_free(b64);
        BIO_free_all(out);
    if (b64 != NULL)
        BIO_free(b64);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (buf != NULL)
+	if (buf != NULL) BUF_MEM_free(buf);
-        BUF_MEM_free(buf);
+	if (at != NULL) ASN1_TYPE_free(at);
-    if (at != NULL)
+	if (osk != NULL) sk_free(osk);
        ASN1_TYPE_free(at);
    if (osk != NULL)
        sk_OPENSSL_STRING_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 {
    CONF *cnf = NULL;
    int len;
    long errline = 0;
    unsigned char *p;
    ASN1_TYPE *atyp = NULL;
    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) {
            BIO_printf(bio, "Can't find 'asn1' in '%s'\n", genconf);
            goto err;
        }
    }
    atyp = ASN1_generate_nconf(genstr, cnf);
    NCONF_free(cnf);
    cnf = NULL;
    if (!atyp)
        return -1;
    len = i2d_ASN1_TYPE(atyp, NULL);
    if (len <= 0)
        goto err;
    if (!BUF_MEM_grow(buf, len))
        goto err;
    p = (unsigned char *)buf->data;
    i2d_ASN1_TYPE(atyp, &p);
    ASN1_TYPE_free(atyp);
    return len;
 conferr:
    if (errline > 0)
        BIO_printf(bio, "Error on line %ld of config file '%s'\n",
                   errline, genconf);
    else
        BIO_printf(bio, "Error loading config file '%s'\n", genconf);
 err:
    NCONF_free(cnf);
    ASN1_TYPE_free(atyp);
    return -1;
 }
--- a/apps/ca.c
+++ b/apps/ca.c
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -69,10 +69,9 @@
 #undef PROG
 #define PROG	ciphers_main
-static const char *ciphers_usage[] = {
+static char *ciphers_usage[]={
 "usage: ciphers args\n",
-    " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
+" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
    " -V          - even more verbose\n",
 " -ssl2       - SSL2 mode\n",
 " -ssl3       - SSL3 mode\n",
 " -tls1       - TLS1 mode\n",
@@ -84,22 +83,25 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	int ret=1,i;
-    int verbose = 0, Verbose = 0;
+	int verbose=0;
-#ifndef OPENSSL_NO_SSL_TRACE
+	char **pp;
    int stdname = 0;
 #endif
    const char **pp;
 	const char *p;
 	int badops=0;
 	SSL_CTX *ctx=NULL;
 	SSL *ssl=NULL;
 	char *ciphers=NULL;
-    const SSL_METHOD *meth = NULL;
+	SSL_METHOD *meth=NULL;
 	STACK_OF(SSL_CIPHER) *sk;
 	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();
@@ -112,20 +114,13 @@ int MAIN(int argc, char **argv)
 	STDout = BIO_push(tmpbio, STDout);
 	}
 #endif
    if (!load_config(bio_err, NULL))
        goto end;
 	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_SSL_TRACE
        else if (strcmp(*argv, "-stdname") == 0)
            stdname = verbose = 1;
 #endif
 #ifndef OPENSSL_NO_SSL2
 		else if (strcmp(*argv,"-ssl2") == 0)
 			meth=SSLv2_client_method();
@@ -138,17 +133,22 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-tls1") == 0)
 			meth=TLSv1_client_method();
 #endif
-        else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
+		else if ((strncmp(*argv,"-h",2) == 0) ||
 			 (strcmp(*argv,"-?") == 0))
 			{
 			badops=1;
 			break;
-        } else {
+			}
 		else
 			{
 			ciphers= *argv;
 			}
 		argc--;
 		argv++;
 		}
-    if (badops) {
+	if (badops)
 		{
 		for (pp=ciphers_usage; (*pp != NULL); pp++)
 			BIO_printf(bio_err,"%s",*pp);
 		goto end;
@@ -157,8 +157,7 @@ int MAIN(int argc, char **argv)
 	OpenSSL_add_ssl_algorithms();
 	ctx=SSL_CTX_new(meth);
-    if (ctx == NULL)
+	if (ctx == NULL) goto err;
        goto err;
 	if (ciphers != NULL) {
 		if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
 			BIO_printf(bio_err, "Error in cipher list\n");
@@ -166,74 +165,44 @@ int MAIN(int argc, char **argv)
 		}
 	}
 	ssl=SSL_new(ctx);
-    if (ssl == NULL)
+	if (ssl == NULL) goto err;
        goto err;
-    if (!verbose) {
+
-        for (i = 0;; i++) {
+	if (!verbose)
 		{
 		for (i=0; ; i++)
 			{
 			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
 		{
 		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;
+			{
-
+			BIO_puts(STDout,SSL_CIPHER_description(
-            c = sk_SSL_CIPHER_value(sk, i);
+				sk_SSL_CIPHER_value(sk,i),
-
+				buf,sizeof buf));
            if (Verbose) {
                unsigned long id = SSL_CIPHER_get_id(c);
                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) {
                    /* SSL2 cipher */
                    BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1,
                               id2, id3);
                } else if ((id & 0xff000000L) == 0x03000000L) {
                    /* SSL3 cipher */
                    BIO_printf(STDout, "          0x%02X,0x%02X - ", id2,
                               id3);
                } else {
                    /* 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)
+	if (ctx != NULL) SSL_CTX_free(ctx);
-        SSL_CTX_free(ctx);
+	if (ssl != NULL) SSL_free(ssl);
-    if (ssl != NULL)
+	if (STDout != NULL) BIO_free_all(STDout);
        SSL_free(ssl);
    if (STDout != NULL)
        BIO_free_all(STDout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
--- a/apps/client.pem
+++ b/apps/client.pem
@@ -1,52 +1,24 @@
-subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Client Cert
+issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
-issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
+subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Client test cert (512 bit)
 -----BEGIN CERTIFICATE-----
-MIID5zCCAs+gAwIBAgIJALnu1NlVpZ6yMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+MIIB6TCCAVICAQIwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
-BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
+BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
-VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
+VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzU2WhcNOTgwNjA5
-ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZDELMAkG
+MTM1NzU2WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
-A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
+A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGkNsaWVudCB0ZXN0IGNl
-RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgQ2xpZW50IENlcnQw
+cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALtv55QyzG6i2Plw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0ranbHRLcLVqN+0BzcZpY
+Z1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexmq/R4KedLjFEIYjocDui+IXs62NNt
-+yOLqxzDWT1LD9eW1stC4NzXX9/DCtSIVyN7YIHdGLrIPr64IDdXXaMRzgZ2rOKs
+XrT8odkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQBwtMmI7oGUG8nKmftQssATViH5
-lmHCAiFpO/ja99gGCJRxH0xwQatqAULfJVHeUhs7OEGOZc2nWifjqKvGfNTilP7D
+NRRtoEw07DxJp/LfatHdrhqQB73eGdL5WILZJXk46Xz2e9WMSUjVCSYhdKxtflU3
-nwi69ipQFq9oS19FmhwVHk2wg7KZGHI1qDyG04UrfCZMRitvS9+UVhPpIPjuiBi2
+UR2Ajv1Oo0sTNdfz0wDqJNirLNtzyhhsaq8qMTrLwXrCP31VxBiigFSQSUFnZyTE
-x3/FZIpL5gXJvvFK6xHY63oq2asyzBATntBgnP4qJFWWcvRx24wF1PnZabxuVoL2
+9TKwhS4GlwbtCfxSKQ==
 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-----
-MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f
+MIIBOwIBAAJBALtv55QyzG6i2PlwZ1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexm
-wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr
+q/R4KedLjFEIYjocDui+IXs62NNtXrT8odkCAwEAAQJAbwXq0vJ/+uyEvsNgxLko
-agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy
+/V86mGXQ/KrSkeKlL0r4ENxjcyeMAGoKu6J9yMY7+X9+Zm4nxShNfTsf/+Freoe1
-mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr
+HQIhAPOSm5Q1YI+KIsII2GeVJx1U69+wnd71OasIPakS1L1XAiEAxQAW+J3/JWE0
-MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x
+ftEYakbhUOKL8tD1OaFZS71/5GdG7E8CIQCefUMmySSvwd6kC0VlATSWbW+d+jp/
-HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L
+nWmM1KvqnAo5uQIhALqEADu5U1Wvt8UN8UDGBRPQulHWNycuNV45d3nnskWPAiAw
-p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT
+ueTyr6WsZ5+SD8g/Hy3xuvF3nPmJRH+rwvVihlcFOg==
 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-----
--- a/apps/cms.c
+++ b/apps/cms.c
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -72,7 +72,7 @@
 #undef POSTFIX
 #define	POSTFIX	".rvk"
-static const char *crl_usage[] = {
+static char *crl_usage[]={
 "usage: crl args\n",
 "\n",
 " -inform arg     - input format - default PEM (DER or PEM)\n",
@@ -81,14 +81,10 @@ 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",
 " -nextupdate     - nextUpdate field\n",
    " -crlnumber      - print CRL number\n",
 " -noout          - no CRL output\n",
 " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
 " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
@@ -96,6 +92,7 @@ static const char *crl_usage[] = {
 NULL
 };
 static X509_CRL *load_crl(char *file, int format);
 static BIO *bio_out=NULL;
 int MAIN(int, char **);
@@ -105,24 +102,20 @@ 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, badsig = 0;
+	int ret=1,i,num,badops=0;
 	BIO *out=NULL;
-    int informat, outformat, keyformat;
+	int informat,outformat;
-    char *infile = NULL, *outfile = NULL, *crldiff = NULL, *keyfile = NULL;
+	char *infile=NULL,*outfile=NULL;
-    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout =
+	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
-        0, text = 0;
+	int fingerprint = 0;
-#ifndef OPENSSL_NO_MD5
+	char **pp;
    int hash_old = 0;
 #endif
    int fingerprint = 0, crlnumber = 0;
    const char **pp;
 	X509_STORE *store = NULL;
 	X509_STORE_CTX ctx;
 	X509_LOOKUP *lookup = NULL;
 	X509_OBJECT xobj;
 	EVP_PKEY *pkey;
 	int do_ver = 0;
-    const EVP_MD *md_alg, *digest = EVP_sha1();
+	const EVP_MD *md_alg,*digest=EVP_md5();
 	apps_startup();
@@ -134,7 +127,8 @@ 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
 			{
@@ -146,75 +140,63 @@ 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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
-            if (!args_from_file(++argv, Nargc, Nargv)) {
+			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
                goto end;
 			}
        */}
 #endif
-        if (strcmp(*argv, "-inform") == 0) {
+		if 	(strcmp(*argv,"-inform") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-gendelta") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                goto bad;
+			{
-            crldiff = *(++argv);
+			if (--argc < 1) goto bad;
        } 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) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-CApath") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			CApath = *(++argv);
 			do_ver = 1;
-        } else if (strcmp(*argv, "-CAfile") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-CAfile") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			CAfile = *(++argv);
 			do_ver = 1;
-        } else if (strcmp(*argv, "-verify") == 0)
+			}
 		else if (strcmp(*argv,"-verify") == 0)
 			do_ver = 1;
 		else if (strcmp(*argv,"-text") == 0)
 			text = 1;
 		else if (strcmp(*argv,"-hash") == 0)
 			hash= ++num;
-#ifndef OPENSSL_NO_MD5
+		else if (strcmp(*argv,"-nameopt") == 0)
-        else if (strcmp(*argv, "-hash_old") == 0)
+			{
-            hash_old = ++num;
+			if (--argc < 1) goto bad;
-#endif
+			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
-        else if (strcmp(*argv, "-nameopt") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-issuer") == 0)
                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;
@@ -224,14 +206,13 @@ int MAIN(int argc, char **argv)
 			noout= ++num;
 		else if (strcmp(*argv,"-fingerprint") == 0)
 			fingerprint= ++num;
-        else if (strcmp(*argv, "-crlnumber") == 0)
+		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
-            crlnumber = ++num;
+			{
        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;
@@ -240,7 +221,8 @@ 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);
@@ -249,132 +231,96 @@ int MAIN(int argc, char **argv)
 	ERR_load_crypto_strings();
 	x=load_crl(infile,informat);
-    if (x == NULL) {
+	if (x == NULL) { goto end; }
        goto end;
    }
 	if(do_ver) {
 		store = X509_STORE_new();
 		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
-        if (lookup == NULL)
+		if (lookup == NULL) goto end;
            goto end;
 		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
 			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
 		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
-        if (lookup == NULL)
+		if (lookup == NULL) goto end;
            goto end;
 		if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
 			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, "Error initialising X509 store\n");
+			BIO_printf(bio_err,
 				"Error initialising X509 store\n");
 			goto end;
 		}
 		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
 					X509_CRL_get_issuer(x), &xobj);
 		if(i <= 0) {
-            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
+			BIO_printf(bio_err,
 				"Error getting CRL issuer certificate\n");
 			goto end;
 		}
 		pkey = X509_get_pubkey(xobj.data.x509);
 		X509_OBJECT_free_contents(&xobj);
 		if(!pkey) {
-            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
+			BIO_printf(bio_err,
 				"Error getting CRL issuer public key\n");
 			goto end;
 		}
 		i = X509_CRL_verify(x, pkey);
 		EVP_PKEY_free(pkey);
-        if (i < 0)
+		if(i < 0) goto end;
-            goto end;
+		if(i == 0) BIO_printf(bio_err, "verify failure\n");
-        if (i == 0)
+		else BIO_printf(bio_err, "verify OK\n");
            BIO_printf(bio_err, "verify failure\n");
        else
            BIO_printf(bio_err, "verify OK\n");
 	}
-    if (crldiff) {
+	if (num)
-        X509_CRL *newcrl, *delta;
+		{
-        if (!keyfile) {
+		for (i=1; i<=num; i++)
-            BIO_puts(bio_err, "Missing CRL signing key\n");
+			{
-            goto end;
+			if (issuer == i)
-        }
+				{
-        newcrl = load_crl(crldiff, informat);
+				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
        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) {
+			if (hash == i)
-        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, NULL, NULL);
                BIO_printf(bio_out, "crlNumber=");
                if (crlnum) {
                    i2a_ASN1_INTEGER(bio_out, crlnum);
                    ASN1_INTEGER_free(crlnum);
                } else
                    BIO_puts(bio_out, "<NONE>");
                BIO_printf(bio_out, "\n");
            }
            if (hash == i) {
 				BIO_printf(bio_out,"%08lx\n",
 					X509_NAME_hash(X509_CRL_get_issuer(x)));
 				}
-#ifndef OPENSSL_NO_MD5
+			if (lastupdate == i)
-            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, X509_CRL_get_lastUpdate(x));
+				ASN1_TIME_print(bio_out,
 						X509_CRL_get_lastUpdate(x));
 				BIO_printf(bio_out,"\n");
 				}
-            if (nextupdate == i) {
+			if (nextupdate == i)
 				{
 				BIO_printf(bio_out,"nextUpdate=");
 				if (X509_CRL_get_nextUpdate(x)) 
-                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
+					ASN1_TIME_print(bio_out,
 						X509_CRL_get_nextUpdate(x));
 				else
 					BIO_printf(bio_out,"NONE");
 				BIO_printf(bio_out,"\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':':');
 					}
 				}
@@ -382,12 +328,14 @@ int MAIN(int argc, char **argv)
 		}
 	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
 		{
@@ -395,40 +343,36 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-    if (text)
+	if (text) X509_CRL_print(out, x);
        X509_CRL_print(out, x);
-    if (noout) {
+	if (noout) 
 		{
 		ret = 0;
 		goto end;
 		}
    if (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) {
+	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
        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;
@@ -440,3 +384,46 @@ int MAIN(int argc, char **argv)
 	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);
 	}
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -56,15 +56,14 @@
 * [including the GNU Public Licence.]
 */
-/*
+/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
- * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
+ * and donated 'to the cause' along with lots and lots of other fixes to
- * donated 'to the cause' along with lots and lots of other fixes to the
+ * the library. */
 * library.
 */
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -77,8 +76,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG	crl2pkcs7_main
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
 * -inform arg  - input format - default PEM (DER or PEM)
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
@@ -95,7 +93,7 @@ int MAIN(int argc, char **argv)
 	PKCS7 *p7 = NULL;
 	PKCS7_SIGNED *p7s = NULL;
 	X509_CRL *crl=NULL;
-    STACK_OF(OPENSSL_STRING) *certflst = NULL;
+	STACK *certflst=NULL;
 	STACK_OF(X509_CRL) *crl_stack=NULL;
 	STACK_OF(X509) *cert_stack=NULL;
 	int ret=1,nocrl=0;
@@ -114,37 +112,40 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
        } else if (strcmp(*argv, "-outform") == 0) {
            if (--argc < 1)
                goto bad;
            outformat = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-in") == 0) {
            if (--argc < 1)
                goto bad;
            infile = *(++argv);
        } else if (strcmp(*argv, "-nocrl") == 0) {
            nocrl = 1;
        } else if (strcmp(*argv, "-out") == 0) {
            if (--argc < 1)
                goto bad;
            outfile = *(++argv);
        } else if (strcmp(*argv, "-certfile") == 0) {
            if (--argc < 1)
                goto bad;
            if (!certflst)
                certflst = sk_OPENSSL_STRING_new_null();
            if (!certflst)
                goto end;
            if (!sk_OPENSSL_STRING_push(certflst, *(++argv))) {
                sk_OPENSSL_STRING_free(certflst);
                goto end;
 			}
-        } else {
+		else if (strcmp(*argv,"-outform") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
 			}
 		else if (strcmp(*argv,"-in") == 0)
 			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
 			}
 		else if (strcmp(*argv,"-nocrl") == 0)
 			{
 			nocrl=1;
 			}
 		else if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-certfile") == 0)
 			{
 			if (--argc < 1) goto bad;
 			if(!certflst) certflst = sk_new_null();
 			sk_push(certflst,*(++argv));
 			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
@@ -153,7 +154,8 @@ 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");
@@ -161,11 +163,9 @@ int MAIN(int argc, char **argv)
 		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,
+		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
                   " -certfile arg  certificates file of chain to a trusted CA\n");
 		BIO_printf(bio_err,"                (can be used more than once)\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
                   " -nocrl         no crl to load, just certs from '-certfile'\n");
 		ret = 1;
 		goto end;
 		}
@@ -174,16 +174,20 @@ int MAIN(int argc, char **argv)
 	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;
 				}
@@ -197,48 +201,46 @@ int MAIN(int argc, char **argv)
 			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)
+	if ((p7=PKCS7_new()) == NULL) goto end;
-        goto end;
+	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
    if ((p7s = PKCS7_SIGNED_new()) == NULL)
        goto end;
 	p7->type=OBJ_nid2obj(NID_pkcs7_signed);
 	p7->d.sign=p7s;
 	p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
-    if (!ASN1_INTEGER_set(p7s->version, 1))
+	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
-        goto end;
+	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
        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)
+	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
        goto end;
 	p7s->cert=cert_stack;
-    if (certflst)
+	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
-        for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+		certfile = sk_value(certflst, i);
-            certfile = sk_OPENSSL_STRING_value(certflst, i);
+		if (add_certs_from_file(cert_stack,certfile) < 0)
-            if (add_certs_from_file(cert_stack, certfile) < 0) {
+			{
 			BIO_printf(bio_err, "error loading certificates\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 	}
-    sk_OPENSSL_STRING_free(certflst);
+	sk_free(certflst);
-    if (outfile == NULL) {
+	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -246,8 +248,11 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
@@ -261,27 +266,24 @@ int MAIN(int argc, char **argv)
 		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)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (p7 != NULL) PKCS7_free(p7);
-        BIO_free_all(out);
+	if (crl != NULL) X509_CRL_free(crl);
    if (p7 != NULL)
        PKCS7_free(p7);
    if (crl != NULL)
        X509_CRL_free(crl);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-/*-
+/*
 *----------------------------------------------------------------------
 * int add_certs_from_file
 *
@@ -293,14 +295,22 @@ int MAIN(int argc, char **argv)
 */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 	{
 	struct stat st;
 	BIO *in=NULL;
 	int count=0;
 	int ret= -1;
 	STACK_OF(X509_INFO) *sk=NULL;
 	X509_INFO *xi;
 	if ((stat(certfile,&st) != 0))
 		{
 		BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
 		goto end;
 		}
 	in=BIO_new(BIO_s_file());
-    if ((in == NULL) || (BIO_read_filename(in, certfile) <= 0)) {
+	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
 		{
 		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
 		goto end;
 		}
@@ -313,9 +323,11 @@ 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++;
@@ -326,9 +338,8 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
 	ret=count;
 end:
 	/* never need to OPENSSL_free x */
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (sk != NULL) sk_X509_INFO_free(sk);
    if (sk != NULL)
        sk_X509_INFO_free(sk);
 	return(ret);
 	}
--- a/apps/demoSRP/srp_verifier.txt
+++ b/apps/demoSRP/srp_verifier.txt
@@ -1,6 +0,0 @@
 # 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.  
--- a/apps/demoSRP/srp_verifier.txt.attr
+++ b/apps/demoSRP/srp_verifier.txt.attr
@@ -1 +0,0 @@
 unique_subject = yes
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -74,42 +74,24 @@
 #undef PROG
 #define PROG	dgst_main
-int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
+static HMAC_CTX hmac_ctx;
          EVP_PKEY *key, unsigned char *sigin, int siglen,
          const char *sig_name, const char *md_name,
          const char *file, BIO *bmd);
-static void list_md_fn(const EVP_MD *m,
+int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-                       const char *from, const char *to, void *arg)
+	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-{
+	  const char *file,BIO *bmd,const char *hmac_key, int non_fips_allow);
    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, *impl = NULL;
+	ENGINE *e = NULL;
 	unsigned char *buf=NULL;
-    int i, err = 1;
+	int i,err=0;
 	const EVP_MD *md=NULL,*m;
 	BIO *in=NULL,*inp;
 	BIO *bmd=NULL;
 	BIO *out = NULL;
 	const char *name;
 #define PROG_NAME_SIZE  39
 	char pname[PROG_NAME_SIZE+1];
 	int separator=0;
@@ -124,16 +106,14 @@ 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;
 	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;
 		}
@@ -151,57 +131,61 @@ int MAIN(int argc, char **argv)
 	argc--;
 	argv++;
-    while (argc > 0) {
+	while (argc > 0)
-        if ((*argv)[0] != '-')
+		{
-            break;
+		if ((*argv)[0] != '-') break;
 		if (strcmp(*argv,"-c") == 0)
 			separator=1;
-        else if (strcmp(*argv, "-r") == 0)
+		else if (strcmp(*argv,"-rand") == 0)
-            separator = 2;
+			{
-        else if (strcmp(*argv, "-rand") == 0) {
+			if (--argc < 1) break;
            if (--argc < 1)
                break;
 			randfile=*(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                break;
+			{
 			if (--argc < 1) break;
 			outfile=*(++argv);
-        } else if (strcmp(*argv, "-sign") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-sign") == 0)
-                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) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-verify") == 0)
-                break;
+			{
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			want_pub = 1;
 			do_verify = 1;
-        } else if (strcmp(*argv, "-prverify") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-prverify") == 0)
-                break;
+			{
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			do_verify = 1;
-        } else if (strcmp(*argv, "-signature") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-signature") == 0)
-                break;
+			{
 			if (--argc < 1) break;
 			sigfile=*(++argv);
-        } else if (strcmp(*argv, "-keyform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-keyform") == 0)
-                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)
+			{
-                break;
+			if (--argc < 1) 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;
@@ -209,33 +193,15 @@ int MAIN(int argc, char **argv)
 			out_bin = 1;
 		else if (strcmp(*argv,"-d") == 0)
 			debug=1;
        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")) {
+		else if (!strcmp(*argv,"-hmac"))
 			{
 			if (--argc < 1)
 				break;
 			hmac_key=*++argv;
-        } else if (!strcmp(*argv, "-mac")) {
+			}
-            if (--argc < 1)
+		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
                break;
            mac_name = *++argv;
        } else if (strcmp(*argv, "-sigopt") == 0) {
            if (--argc < 1)
                break;
            if (!sigopts)
                sigopts = sk_OPENSSL_STRING_new_null();
            if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
                break;
        } else if (strcmp(*argv, "-macopt") == 0) {
            if (--argc < 1)
                break;
            if (!macopts)
                macopts = sk_OPENSSL_STRING_new_null();
            if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
                break;
        } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL)
 			md=m;
 		else
 			break;
@@ -243,77 +209,79 @@ int MAIN(int argc, char **argv)
 		argv++;
 		}
 	if (md == NULL)
 		md=EVP_md5();
 	if(do_verify && !sigfile) {
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
-                   "No signature to verify: use the -signature option\n");
+		err = 1; 
 		goto end;
 	}
-    if ((argc > 0) && (argv[0][0] == '-')) { /* bad option */
+	if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
 		{
 		BIO_printf(bio_err,"unknown option '%s'\n",*argv);
 		BIO_printf(bio_err,"options are\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
                   "-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, "-hmac arg       set the HMAC key to arg\n");
+		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
-        BIO_printf(bio_err, "-non-fips-allow allow use of non FIPS digest\n");
+		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
-                   "-sign   file    sign digest using private key in file\n");
+		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\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,"-binary         output in binary form\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,
+		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
-        EVP_MD_do_all_sorted(list_md_fn, bio_err);
+		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
 			LN_md5,LN_md5);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_md4,LN_md4);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_md2,LN_md2);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_sha1,LN_sha1);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_sha,LN_sha);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_mdc2,LN_mdc2);
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
 			LN_ripemd160,LN_ripemd160);
 		err=1;
 		goto end;
 		}
 #ifndef OPENSSL_NO_ENGINE
-    if (engine_impl)
+	e = setup_engine(bio_err, engine, 0);
        impl = e;
 #endif
 	in=BIO_new(BIO_s_file());
 	bmd=BIO_new(BIO_f_md());
-    if ((in == NULL) || (bmd == NULL)) {
+	if (debug)
-        ERR_print_errors(bio_err);
+		{
        goto end;
    }
    if (debug) {
 		BIO_set_callback(in,BIO_debug_callback);
 		/* needed for windows 3.1 */
-        BIO_set_callback_arg(in, (char *)bio_err);
+		BIO_set_callback_arg(in,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))
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if(out_bin == -1) {
-        if (keyfile)
+		if(keyfile) out_bin = 1;
-            out_bin = 1;
+		else out_bin = 0;
        else
            out_bin = 0;
 	}
 	if(randfile)
@@ -322,8 +290,7 @@ int MAIN(int argc, char **argv)
 	if(outfile) {
 		if(out_bin)
 			out = BIO_new_file(outfile, "wb");
-        else
+		else    out = BIO_new_file(outfile, "w");
            out = BIO_new_file(outfile, "w");
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
@@ -340,112 +307,19 @@ int MAIN(int argc, char **argv)
 		ERR_print_errors(bio_err);
 		goto end;
 	}
    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) {
            /*
             * load_[pub]key() has already printed an appropriate message
             */
            goto end;
        }
    }
    if (mac_name) {
        EVP_PKEY_CTX *mac_ctx = NULL;
        int r = 0;
        if (!init_gen_str(bio_err, &mac_ctx, mac_name, impl, 0))
            goto mac_end;
        if (macopts) {
            char *macopt;
            for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++) {
                macopt = sk_OPENSSL_STRING_value(macopts, i);
                if (pkey_ctrl_string(mac_ctx, macopt) <= 0) {
                    BIO_printf(bio_err,
                               "MAC parameter error \"%s\"\n", macopt);
                    ERR_print_errors(bio_err);
                    goto mac_end;
                }
            }
        }
        if (EVP_PKEY_keygen(mac_ctx, &sigkey) <= 0) {
            BIO_puts(bio_err, "Error generating key\n");
            ERR_print_errors(bio_err);
            goto mac_end;
        }
        r = 1;
 mac_end:
        if (mac_ctx)
            EVP_PKEY_CTX_free(mac_ctx);
        if (r == 0)
            goto end;
    }
    if (non_fips_allow) {
        EVP_MD_CTX *md_ctx;
        BIO_get_md_ctx(bmd, &md_ctx);
        EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
    }
    if (hmac_key) {
        sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, impl,
                                      (unsigned char *)hmac_key, -1);
 		if (!sigkey)
-            goto end;
+			{
-    }
+			/* load_[pub]key() has already printed an appropriate
-
+			   message */
    if (sigkey) {
        EVP_MD_CTX *mctx = NULL;
        EVP_PKEY_CTX *pctx = NULL;
        int r;
        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, impl, sigkey);
        else
            r = EVP_DigestSignInit(mctx, &pctx, md, impl, sigkey);
        if (!r) {
            BIO_printf(bio_err, "Error setting context\n");
            ERR_print_errors(bio_err);
            goto end;
        }
        if (sigopts) {
            char *sigopt;
            for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++) {
                sigopt = sk_OPENSSL_STRING_value(sigopts, i);
                if (pkey_ctrl_string(pctx, sigopt) <= 0) {
                    BIO_printf(bio_err, "parameter error \"%s\"\n", sigopt);
                    ERR_print_errors(bio_err);
                    goto end;
                }
            }
        }
    }
    /* we use md as a filter, reading from 'in' */
    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 (!EVP_DigestInit_ex(mctx, md, impl)) {
            BIO_printf(bio_err, "Error setting digest %s\n", pname);
            ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
@@ -456,159 +330,181 @@ 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", sigfile);
+			BIO_printf(bio_err, "Error opening signature file %s\n",
-            ERR_print_errors(bio_err);
+								sigfile);
            goto end;
        }
        if (!sigbuf) {
            BIO_printf(bio_err, "Out of memory\n");
 			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", sigfile);
+			BIO_printf(bio_err, "Error reading signature file %s\n",
 								sigfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 	if (non_fips_allow)
 		{
 		EVP_MD_CTX *md_ctx;
 		BIO_get_md_ctx(bmd,&md_ctx);
 		EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 		}
 	/* we use md as a filter, reading from 'in' */
 	if (!BIO_set_md(bmd,md))
 		{
 		BIO_printf(bio_err, "Error setting digest %s\n",
 							EVP_MD_name(md));
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	inp=BIO_push(bmd,in);
-    if (md == NULL) {
+	if (argc == 0)
-        EVP_MD_CTX *tctx;
+		{
        BIO_get_md_ctx(bmd, &tctx);
        md = EVP_MD_CTX_md(tctx);
    }
    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);
+			  siglen,"","(stdin)",bmd,hmac_key, non_fips_allow);
    } else {
        const char *md_name = NULL, *sig_name = NULL;
        if (!out_bin) {
            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)
+	else
-                md_name = EVP_MD_name(md);
+		{
-        }
+		name=OBJ_nid2sn(md->type);
-        err = 0;
+		for (i=0; i<argc; i++)
-        for (i = 0; i < argc; i++) {
+			{
 			char *tmp,*tofree=NULL;
 			int r;
-            if (BIO_read_filename(in, argv[i]) <= 0) {
+
 			if (BIO_read_filename(in,argv[i]) <= 0)
 				{
 				perror(argv[i]);
 				err++;
 				continue;
-            } else
+				}
 			if(!out_bin)
 				{
 				size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
 				tmp=tofree=OPENSSL_malloc(len);
 				BIO_snprintf(tmp,len,"%s%s(%s)= ",
 							 hmac_key ? "HMAC-" : "",name,argv[i]);
 				}
 			else
 				tmp="";
 			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
-                          siglen, sig_name, md_name, argv[i], bmd);
+				siglen,tmp,argv[i],bmd,hmac_key,non_fips_allow);
 			if(r)
 			    err=r;
 			if(tofree)
 				OPENSSL_free(tofree);
 			(void)BIO_reset(bmd);
 			}
 		}
 end:
-    if (buf != NULL) {
+	if (buf != NULL)
 		{
 		OPENSSL_cleanse(buf,BUFSIZE);
 		OPENSSL_free(buf);
 		}
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
        BIO_free(in);
 	if (passin)
 		OPENSSL_free(passin);
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
-    if (sigopts)
+	if(sigbuf) OPENSSL_free(sigbuf);
-        sk_OPENSSL_STRING_free(sigopts);
+	if (bmd != NULL) BIO_free(bmd);
    if (macopts)
        sk_OPENSSL_STRING_free(macopts);
    if (sigbuf)
        OPENSSL_free(sigbuf);
    if (bmd != NULL)
        BIO_free(bmd);
 	apps_shutdown();
 	OPENSSL_EXIT(err);
 	}
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-          EVP_PKEY *key, unsigned char *sigin, int siglen,
+	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-          const char *sig_name, const char *md_name,
+	  const char *file,BIO *bmd,const char *hmac_key, int non_fips_allow)
          const char *file, BIO *bmd)
 	{
-    size_t len;
+	unsigned int len;
 	int i;
 	EVP_MD_CTX *md_ctx;
-    for (;;) {
+	if (hmac_key)
 		{
 		EVP_MD *md;
 		BIO_get_md(bmd,&md);
 		HMAC_CTX_init(&hmac_ctx);
 		if (non_fips_allow)
 			HMAC_CTX_set_flags(&hmac_ctx,
 					EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
 		HMAC_Init_ex(&hmac_ctx,hmac_key,strlen(hmac_key),md, NULL);
 		BIO_get_md_ctx(bmd,&md_ctx);
 		BIO_set_md_ctx(bmd,&hmac_ctx.md_ctx);
 		}
 	for (;;)
 		{
 		i=BIO_read(bp,(char *)buf,BUFSIZE);
-        if (i < 0) {
+		if(i < 0)
 			{
 			BIO_printf(bio_err, "Read Error in %s\n",file);
 			ERR_print_errors(bio_err);
 			return 1;
 			}
-        if (i == 0)
+		if (i == 0) break;
            break;
 		}
-    if (sigin) {
+	if(sigin)
 		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
-        i = EVP_DigestVerifyFinal(ctx, sigin, (unsigned int)siglen);
+		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
 		if(i > 0)
 			BIO_printf(out, "Verified OK\n");
-        else if (i == 0) {
+		else if(i == 0)
 			{
 			BIO_printf(out, "Verification Failure\n");
 			return 1;
-        } else {
+			}
 		else
 			{
 			BIO_printf(bio_err, "Error Verifying Data\n");
 			ERR_print_errors(bio_err);
 			return 1;
 			}
 		return 0;
 		}
-    if (key) {
+	if(key)
 		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
-        len = BUFSIZE;
+		if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) 
-        if (!EVP_DigestSignFinal(ctx, buf, &len)) {
+			{
 			BIO_printf(bio_err, "Error Signing Data\n");
 			ERR_print_errors(bio_err);
 			return 1;
 			}
    } else {
        len = BIO_gets(bp, (char *)buf, BUFSIZE);
        if ((int)len < 0) {
            ERR_print_errors(bio_err);
            return 1;
 		}
 	else if(hmac_key)
 		{
 		HMAC_Final(&hmac_ctx,buf,&len);
 		HMAC_CTX_cleanup(&hmac_ctx);
 		}
    if (binout)
        BIO_write(out, buf, len);
    else if (sep == 2) {
        for (i = 0; i < (int)len; i++)
            BIO_printf(out, "%02x", buf[i]);
        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);
+		len=BIO_gets(bp,(char *)buf,BUFSIZE);
-        for (i = 0; i < (int)len; i++) {
+
 	if(binout) BIO_write(out, buf, len);
 	else 
 		{
 		BIO_write(out,title,strlen(title));
 		for (i=0; (unsigned int)i<len; i++)
 			{
 			if (sep && (i != 0))
 				BIO_printf(out, ":");
 			BIO_printf(out, "%02x",buf[i]);
 			}
 		BIO_printf(out, "\n");
 		}
 	if (hmac_key)
 		{
 		BIO_set_md_ctx(bmd,md_ctx);
 		}
 	return 0;
 	}
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -57,7 +57,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <stdlib.h>
@@ -74,8 +73,7 @@
 #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
@@ -89,6 +87,9 @@ 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;
@@ -118,28 +119,32 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
@@ -151,7 +156,8 @@ 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;
@@ -160,23 +166,21 @@ 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,
+		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
                   " -outform arg  output format - one of DER PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file\n");
 		BIO_printf(bio_err," -check        check the DH parameters\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
                   " -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -noout        no output\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		goto end;
 		}
@@ -184,25 +188,29 @@ int MAIN(int argc, char **argv)
 	ERR_load_crypto_strings();
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 	in=BIO_new(BIO_s_file());
 	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
 		{
@@ -210,8 +218,11 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
@@ -221,17 +232,22 @@ int MAIN(int argc, char **argv)
 		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=");
@@ -244,8 +260,10 @@ int MAIN(int argc, char **argv)
 #endif
 		}
-    if (check) {
+	if (check)
-        if (!DH_check(dh, &i)) {
+		{
 		if (!DH_check(dh,&i))
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
@@ -260,31 +278,33 @@ int MAIN(int argc, char **argv)
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
-    if (C) {
+	if (C)
 		{
 		unsigned char *data;
 		int len,l,bits;
 		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)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) 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)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
@@ -302,7 +322,9 @@ int MAIN(int argc, char **argv)
 		OPENSSL_free(data);
 		}
-    if (!noout) {
+
 	if (!noout)
 		{
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
@@ -311,7 +333,8 @@ int MAIN(int argc, char **argv)
 			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;
@@ -319,19 +342,10 @@ int MAIN(int argc, char **argv)
 		}
 	ret=0;
 end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dh != NULL) DH_free(dh);
        BIO_free_all(out);
    if (dh != NULL)
        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #else                           /* !OPENSSL_NO_DH */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -109,7 +109,6 @@
 *
 */
 #include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <stdlib.h>
@@ -130,10 +129,9 @@
 #undef PROG
 #define PROG	dhparam_main
-# define DEFBITS 2048
+#define DEFBITS	512
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
 * -inform arg  - input format - default PEM (DER or PEM)
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
@@ -144,12 +142,15 @@
 * -C
 */
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
+static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 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
@@ -181,28 +182,32 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
@@ -222,47 +227,40 @@ 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)
+			{
-                goto bad;
+			if (--argc < 1) 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,
+		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
                   " -outform arg  output format - one of DER PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file\n");
 #ifndef OPENSSL_NO_DSA
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
                   " -dsaparam     read or generate DSA parameters, convert to DH\n");
 #endif
 		BIO_printf(bio_err," -check        check the DH parameters\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
                   " -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -C            Output C code\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
-                   " -2            generate parameters using  2 as the generator value\n");
+		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
                   " -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,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
        BIO_printf(bio_err,
                   "               - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"               the random number generator\n");
 		BIO_printf(bio_err," -noout        no output\n");
 		goto end;
@@ -271,20 +269,22 @@ int MAIN(int argc, char **argv)
 	ERR_load_crypto_strings();
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 	if (g && !num)
 		num = DEFBITS;
 #ifndef OPENSSL_NO_DSA
-    if (dsaparam) {
+	if (dsaparam)
-        if (g) {
+		{
-            BIO_printf(bio_err,
+		if (g)
-                       "generator may not be chosen for DSA parameters\n");
+			{
 			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
 			goto end;
 			}
-    } else
+		}
 	else
 #endif
 		{
 		/* DH parameters */
@@ -294,46 +294,44 @@ int MAIN(int argc, char **argv)
 	if(num) {
-        BN_GENCB cb;
+		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-        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");
            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();
+			{
 			DSA *dsa;
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-                       "Generating DSA parameters, %d bit long prime\n", num);
+			dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, bio_err);
-            if (!dsa
+			if (dsa == NULL)
-                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
+				{
                                               &cb)) {
                if (dsa)
                    DSA_free(dsa);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			dh = DSA_dup_DH(dsa);
 			DSA_free(dsa);
-            if (dh == NULL) {
+			if (dh == NULL)
 				{
 				ERR_print_errors(bio_err);
 				goto end;
 				}
-        } else
+			}
 		else
 #endif
 			{
-            dh = DH_new();
+			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
            BIO_printf(bio_err,
                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
                       num, g);
 			BIO_printf(bio_err,"This is going to take a long time\n");
-            if (!dh || !DH_generate_parameters_ex(dh, num, g, &cb)) {
+			dh=DH_generate_parameters(num,g,dh_cb,bio_err);
 			if (dh == NULL)
 				{
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -343,25 +341,31 @@ int MAIN(int argc, char **argv)
 	} 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)
@@ -369,7 +373,8 @@ int MAIN(int argc, char **argv)
 			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;
@@ -377,11 +382,13 @@ int MAIN(int argc, char **argv)
 			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)
@@ -389,7 +396,8 @@ int MAIN(int argc, char **argv)
 			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;
@@ -400,11 +408,13 @@ int MAIN(int argc, char **argv)
 	}
 	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
 		{
@@ -412,19 +422,26 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-    if (text) {
+
 	if (text)
 		{
 		DHparams_print(out,dh);
 		}
-    if (check) {
+	if (check)
-        if (!DH_check(dh, &i)) {
+		{
 		if (!DH_check(dh,&i))
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
@@ -439,35 +456,38 @@ int MAIN(int argc, char **argv)
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
-    if (C) {
+	if (C)
 		{
 		unsigned char *data;
 		int len,l,bits;
 		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" "#endif\n");
+		       "#include <openssl/dh.h>\n"
 		       "#endif\n");
 		printf("DH *get_dh%d()\n\t{\n",bits);
 		l=BN_bn2bin(dh->p,data);
 		printf("\tstatic unsigned char dh%d_p[]={",bits);
-        for (i = 0; i < l; i++) {
+		for (i=0; i<l; i++)
-            if ((i % 12) == 0)
+			{
-                printf("\n\t\t");
+			if ((i%12) == 0) printf("\n\t\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\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)
+			{
-                printf("\n\t\t");
+			if ((i%12) == 0) printf("\n\t\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t\t};\n");
@@ -486,19 +506,19 @@ int MAIN(int argc, char **argv)
 		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;
@@ -506,41 +526,27 @@ int MAIN(int argc, char **argv)
 		}
 	ret=0;
 end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dh != NULL) DH_free(dh);
        BIO_free_all(out);
    if (dh != NULL)
        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 	{
 	char c='*';
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write((BIO *)arg,&c,1);
-        c = '*';
+	(void)BIO_flush((BIO *)arg);
    if (p == 3)
        c = '\n';
    BIO_write(cb->arg, &c, 1);
    (void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
    return 1;
 	}
 #else                           /* !OPENSSL_NO_DH */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -56,7 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,13 +68,11 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 # include <openssl/bn.h>
 #undef PROG
 #define PROG	dsa_main
-/*-
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
 * -inform arg  - input format - default PEM (one of DER, NET or PEM)
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
@@ -85,10 +82,6 @@
 * -aes128	- encrypt output if PEM format
 * -aes192	- encrypt output if PEM format
 * -aes256	- encrypt output if PEM format
 * -camellia128 - encrypt output if PEM format
 * -camellia192 - encrypt output if PEM format
 * -camellia256 - encrypt output if PEM format
 * -seed        - encrypt output if PEM format
 * -text	- print a text version
 * -modulus	- print the DSA public key
 */
@@ -97,7 +90,9 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	int ret=1;
 	DSA *dsa=NULL;
 	int i,badops=0;
@@ -113,8 +108,6 @@ int MAIN(int argc, char **argv)
 	char *passin = NULL, *passout = NULL;
 	int modulus=0;
    int pvk_encr = 2;
 	apps_startup();
 	if (bio_err == NULL)
@@ -135,45 +128,45 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } else if (strcmp(*argv, "-passin") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passin") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			passargin= *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passout") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
        else if (strcmp(*argv, "-pvk-strong") == 0)
            pvk_encr = 2;
        else if (strcmp(*argv, "-pvk-weak") == 0)
            pvk_encr = 1;
        else if (strcmp(*argv, "-pvk-none") == 0)
            pvk_encr = 0;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -184,7 +177,8 @@ 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;
@@ -193,43 +187,28 @@ 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,
+		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
                   " -passin arg     input file pass phrase source\n");
 		BIO_printf(bio_err," -out arg        output file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
                   " -passout arg    output file pass phrase source\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\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");
        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,
+		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
                   " -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,
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc camellia\n");
 # endif
 # ifndef OPENSSL_NO_SEED
        BIO_printf(bio_err,
                   " -seed           encrypt PEM output with cbc seed\n");
 #endif
 		BIO_printf(bio_err," -text           print the key in text\n");
 		BIO_printf(bio_err," -noout          don't print key out\n");
@@ -250,44 +229,44 @@ int MAIN(int argc, char **argv)
 	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 DSA key\n");
-
+	if	(informat == FORMAT_ASN1) {
 		if(pubin) dsa=d2i_DSA_PUBKEY_bio(in,NULL);
 		else dsa=d2i_DSAPrivateKey_bio(in,NULL);
 	} else if (informat == FORMAT_PEM) {
 		if(pubin) dsa=PEM_read_bio_DSA_PUBKEY(in,NULL, NULL, NULL);
 		else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,passin);
 	} else
 		{
-        EVP_PKEY *pkey;
+		BIO_printf(bio_err,"bad input format specified for key\n");
-
+		goto end;
        if (pubin)
            pkey = load_pubkey(bio_err, infile, informat, 1,
                               passin, e, "Public Key");
        else
            pkey = load_key(bio_err, infile, informat, 1,
                            passin, e, "Private Key");
        if (pkey) {
            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
 		{
@@ -295,80 +274,59 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 	if (text) 
-        if (!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)
+	if (noout) goto end;
        goto end;
 	BIO_printf(bio_err,"writing DSA key\n");
 	if 	(outformat == FORMAT_ASN1) {
-        if (pubin || pubout)
+		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
-            i = i2d_DSA_PUBKEY_bio(out, dsa);
+		else i=i2d_DSAPrivateKey_bio(out,dsa);
        else
            i = i2d_DSAPrivateKey_bio(out, dsa);
 	} else if (outformat == FORMAT_PEM) {
 		if(pubin || pubout)
 			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
-        else
+		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
 							NULL,0,NULL, passout);
 # if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
        EVP_PKEY *pk;
        pk = EVP_PKEY_new();
        EVP_PKEY_set1_DSA(pk, dsa);
        if (outformat == FORMAT_PVK)
            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
        else if (pubin || pubout)
            i = i2b_PublicKey_bio(out, pk);
        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 <= 0) {
+	if (!i)
 		{
 		BIO_printf(bio_err,"unable to write private key\n");
 		ERR_print_errors(bio_err);
-    } else
+		}
 	else
 		ret=0;
 end:
-    if (in != NULL)
+	if(in != NULL) BIO_free(in);
-        BIO_free(in);
+	if(out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if(dsa != NULL) DSA_free(dsa);
-        BIO_free_all(out);
+	if(passin) OPENSSL_free(passin);
-    if (dsa != NULL)
+	if(passout) OPENSSL_free(passout);
        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
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -56,15 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #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>
 #include <stdio.h>
@@ -82,8 +73,7 @@
 #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
@@ -92,28 +82,17 @@
 * -C
 * -noout
 * -genkey
 *  #ifdef GENCB_TEST
 * -timebomb n  - interrupt keygen after <n> seconds
 *  #endif
 */
-# ifdef GENCB_TEST
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
 static int stop_keygen_flag = 0;
 static void timebomb_sigalarm(int foo)
 {
    stop_keygen_flag = 1;
 }
 # endif
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	DSA *dsa=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
@@ -124,9 +103,6 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 # ifdef GENCB_TEST
    int timebomb = 0;
 # endif
 	apps_startup();
@@ -145,57 +121,60 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine = *(++argv);
 			}
 # endif
 # ifdef GENCB_TEST
        else if (strcmp(*argv, "-timebomb") == 0) {
            if (--argc < 1)
                goto bad;
            timebomb = atoi(*(++argv));
        }
 #endif
 		else if (strcmp(*argv,"-text") == 0)
 			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) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-rand") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			need_rand=1;
-        } else if (strcmp(*argv, "-noout") == 0)
+			}
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
-        else if (sscanf(*argv, "%d", &num) == 1) {
+		else if (sscanf(*argv,"%d",&num) == 1)
 			{
 			/* generate a key */
 			numbits=num;
 			need_rand=1;
-        } else {
+			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
@@ -204,7 +183,8 @@ 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");
@@ -216,18 +196,11 @@ int MAIN(int argc, char **argv)
 		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,
+		BIO_printf(bio_err," -rand         files to use for random number input\n");
                   " -rand         files to use for random number input\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
-# ifdef GENCB_TEST
+		BIO_printf(bio_err," number        number of bits to use for generating private key\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");
 		goto end;
 		}
@@ -235,20 +208,24 @@ int MAIN(int argc, char **argv)
 	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
 		{
@@ -256,116 +233,94 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
-    if (need_rand) {
+	if (need_rand)
 		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 		if (inrand != NULL)
 			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 		}
-    if (numbits > 0) {
+	if (numbits > 0)
-        BN_GENCB cb;
+		{
        BN_GENCB_set(&cb, dsa_cb, bio_err);
 		assert(need_rand);
-        dsa = DSA_new();
+		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
        if (!dsa) {
            BIO_printf(bio_err, "Error allocating DSA object\n");
            goto end;
        }
        BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
                   num);
 	        BIO_printf(bio_err,"This could take some time\n");
-# ifdef GENCB_TEST
+	        dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL, dsa_cb,bio_err);
        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",
                       timebomb);
            if (sigaction(SIGALRM, &act, NULL) != 0) {
                BIO_printf(bio_err, "Error, couldn't set SIGALRM handler\n");
                goto end;
 		}
-            alarm(timebomb);
+	else if	(informat == FORMAT_ASN1)
        }
 # endif
        if (!DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL, &cb)) {
 # ifdef GENCB_TEST
            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)
 		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;
+		int l,len,bits_p,bits_q,bits_g;
 		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)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) 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)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) 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)
+			{
-                printf("\n\t");
+			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
@@ -379,13 +334,14 @@ int MAIN(int argc, char **argv)
 			bits_p,bits_p);
 		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
 			bits_p,bits_p);
-        printf
+		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
            ("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
 		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
 		printf("\treturn(dsa);\n\t}\n");
 		}
-    if (!noout) {
+
 	if (!noout)
 		{
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DSAparams_bio(out,dsa);
 		else if (outformat == FORMAT_PEM)
@@ -394,31 +350,26 @@ int MAIN(int argc, char **argv)
 			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)
+		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
-            goto end;
+		if (!DSA_generate_key(dsakey)) goto end;
        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,
+			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
                                            NULL);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
            DSA_free(dsakey);
 			goto end;
 			}
 		DSA_free(dsakey);
@@ -427,43 +378,25 @@ int MAIN(int argc, char **argv)
 		app_RAND_write_file(NULL, bio_err);
 	ret=0;
 end:
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dsa != NULL) DSA_free(dsa);
        BIO_free_all(out);
    if (dsa != NULL)
        DSA_free(dsa);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
 	{
 	char c='*';
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write(arg,&c,1);
-        c = '*';
+	(void)BIO_flush(arg);
    if (p == 3)
        c = '\n';
    BIO_write(cb->arg, &c, 1);
    (void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
 # ifdef GENCB_TEST
    if (stop_keygen_flag)
        return 0;
 # endif
    return 1;
 	}
 #else                           /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -1,365 +0,0 @@
 /* apps/ec.c */
 /*
 * Written by Nils Larsch for the OpenSSL project.
 */
 /* ====================================================================
 * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    openssl-core@openssl.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
 # include "apps.h"
 # include <openssl/bio.h>
 # include <openssl/err.h>
 # include <openssl/evp.h>
 # include <openssl/pem.h>
 # undef PROG
 # define PROG    ec_main
 /*-
 * -inform arg    - input format - default PEM (one of DER, NET or PEM)
 * -outform arg   - output format - default PEM
 * -in arg        - input file - default stdin
 * -out arg       - output file - default stdout
 * -des           - encrypt output if PEM format with DES in cbc mode
 * -text          - print a text version
 * -param_out     - print the elliptic curve parameters
 * -conv_form arg - specifies the point encoding form
 * -param_enc arg - specifies the parameter encoding
 */
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
    int ret = 1;
    EC_KEY *eckey = NULL;
    const EC_GROUP *group;
    int i, badops = 0;
    const EVP_CIPHER *enc = NULL;
    BIO *in = NULL, *out = NULL;
    int informat, outformat, text = 0, noout = 0;
    int pubin = 0, pubout = 0, param_out = 0;
    char *infile, *outfile, *prog, *engine;
    char *passargin = NULL, *passargout = NULL;
    char *passin = NULL, *passout = NULL;
    point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
    int new_form = 0;
    int asn1_flag = OPENSSL_EC_NAMED_CURVE;
    int new_asn1_flag = 0;
    apps_startup();
    if (bio_err == NULL)
        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
    if (!load_config(bio_err, NULL))
        goto end;
    engine = NULL;
    infile = NULL;
    outfile = NULL;
    informat = FORMAT_PEM;
    outformat = FORMAT_PEM;
    prog = argv[0];
    argc--;
    argv++;
    while (argc >= 1) {
        if (strcmp(*argv, "-inform") == 0) {
            if (--argc < 1)
                goto bad;
            informat = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-outform") == 0) {
            if (--argc < 1)
                goto bad;
            outformat = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-in") == 0) {
            if (--argc < 1)
                goto bad;
            infile = *(++argv);
        } else if (strcmp(*argv, "-out") == 0) {
            if (--argc < 1)
                goto bad;
            outfile = *(++argv);
        } else if (strcmp(*argv, "-passin") == 0) {
            if (--argc < 1)
                goto bad;
            passargin = *(++argv);
        } else if (strcmp(*argv, "-passout") == 0) {
            if (--argc < 1)
                goto bad;
            passargout = *(++argv);
        } else if (strcmp(*argv, "-engine") == 0) {
            if (--argc < 1)
                goto bad;
            engine = *(++argv);
        } else if (strcmp(*argv, "-noout") == 0)
            noout = 1;
        else if (strcmp(*argv, "-text") == 0)
            text = 1;
        else if (strcmp(*argv, "-conv_form") == 0) {
            if (--argc < 1)
                goto bad;
            ++argv;
            new_form = 1;
            if (strcmp(*argv, "compressed") == 0)
                form = POINT_CONVERSION_COMPRESSED;
            else if (strcmp(*argv, "uncompressed") == 0)
                form = POINT_CONVERSION_UNCOMPRESSED;
            else if (strcmp(*argv, "hybrid") == 0)
                form = POINT_CONVERSION_HYBRID;
            else
                goto bad;
        } else if (strcmp(*argv, "-param_enc") == 0) {
            if (--argc < 1)
                goto bad;
            ++argv;
            new_asn1_flag = 1;
            if (strcmp(*argv, "named_curve") == 0)
                asn1_flag = OPENSSL_EC_NAMED_CURVE;
            else if (strcmp(*argv, "explicit") == 0)
                asn1_flag = 0;
            else
                goto bad;
        } 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) {
            BIO_printf(bio_err, "unknown option %s\n", *argv);
            badops = 1;
            break;
        }
        argc--;
        argv++;
    }
    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, " -out arg        output file\n");
        BIO_printf(bio_err, " -passout arg    output file pass "
                   "phrase source\n");
        BIO_printf(bio_err, " -engine e       use engine e, "
                   "possibly a hardware device.\n");
        BIO_printf(bio_err, " -des            encrypt PEM output, "
                   "instead of 'des' every other \n"
                   "                 cipher "
                   "supported by OpenSSL can be used\n");
        BIO_printf(bio_err, " -text           print the key\n");
        BIO_printf(bio_err, " -noout          don't print key out\n");
        BIO_printf(bio_err, " -param_out      print the elliptic "
                   "curve parameters\n");
        BIO_printf(bio_err, " -conv_form arg  specifies the "
                   "point conversion form \n");
        BIO_printf(bio_err, "                 possible values:"
                   " compressed\n");
        BIO_printf(bio_err, "                                 "
                   " uncompressed (default)\n");
        BIO_printf(bio_err, "                                  " " hybrid\n");
        BIO_printf(bio_err, " -param_enc arg  specifies the way"
                   " the ec parameters are encoded\n");
        BIO_printf(bio_err, "                 in the asn1 der " "encoding\n");
        BIO_printf(bio_err, "                 possible values:"
                   " named_curve (default)\n");
        BIO_printf(bio_err, "                                  "
                   "explicit\n");
        goto end;
    }
    ERR_load_crypto_strings();
 # ifndef OPENSSL_NO_ENGINE
    setup_engine(bio_err, engine, 0);
 # endif
    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)) {
        ERR_print_errors(bio_err);
        goto end;
    }
    if (infile == NULL)
        BIO_set_fp(in, stdin, BIO_NOCLOSE);
    else {
        if (BIO_read_filename(in, infile) <= 0) {
            perror(infile);
            goto end;
        }
    }
    BIO_printf(bio_err, "read EC key\n");
    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) {
        if (pubin)
            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
        else
            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
    } else {
        BIO_printf(bio_err, "bad input format specified for key\n");
        goto end;
    }
    if (eckey == NULL) {
        BIO_printf(bio_err, "unable to load Key\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (outfile == NULL) {
        BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 # endif
    } else {
        if (BIO_write_filename(out, outfile) <= 0) {
            perror(outfile);
            goto end;
        }
    }
    group = EC_KEY_get0_group(eckey);
    if (new_form)
        EC_KEY_set_conv_form(eckey, form);
    if (new_asn1_flag)
        EC_KEY_set_asn1_flag(eckey, asn1_flag);
    if (text)
        if (!EC_KEY_print(out, eckey, 0)) {
            perror(outfile);
            ERR_print_errors(bio_err);
            goto end;
        }
    if (noout) {
        ret = 0;
        goto end;
    }
    BIO_printf(bio_err, "writing EC key\n");
    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) {
        if (param_out)
            i = PEM_write_bio_ECPKParameters(out, group);
        else if (pubin || pubout)
            i = PEM_write_bio_EC_PUBKEY(out, eckey);
        else
            i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
                                           NULL, 0, NULL, passout);
    } else {
        BIO_printf(bio_err, "bad output format specified for " "outfile\n");
        goto end;
    }
    if (!i) {
        BIO_printf(bio_err, "unable to write private key\n");
        ERR_print_errors(bio_err);
    } else
        ret = 0;
 end:
    if (in)
        BIO_free(in);
    if (out)
        BIO_free_all(out);
    if (eckey)
        EC_KEY_free(eckey);
    if (passin)
        OPENSSL_free(passin);
    if (passout)
        OPENSSL_free(passout);
    apps_shutdown();
    OPENSSL_EXIT(ret);
 }
 #else                           /* !OPENSSL_NO_EC */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -1,661 +0,0 @@
 /* apps/ecparam.c */
 /*
 * Written by Nils Larsch for the OpenSSL project.
 */
 /* ====================================================================
 * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    openssl-core@openssl.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 /* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 *
 * Portions of the attached software ("Contribution") are developed by
 * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
 *
 * The Contribution is licensed pursuant to the OpenSSL open source
 * license provided above.
 *
 * The elliptic curve binary polynomial software is originally written by
 * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
 *
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
 # include <assert.h>
 # include <stdio.h>
 # include <stdlib.h>
 # include <time.h>
 # include <string.h>
 # include "apps.h"
 # include <openssl/bio.h>
 # include <openssl/err.h>
 # include <openssl/bn.h>
 # include <openssl/ec.h>
 # include <openssl/x509.h>
 # include <openssl/pem.h>
 # undef PROG
 # define PROG    ecparam_main
 /*-
 * -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
 * -noout           - do not print the ec parameter
 * -text            - print the ec parameters in text form
 * -check           - validate the ec parameters
 * -C               - print a 'C' function creating the parameters
 * -name arg        - use the ec parameters with 'short name' name
 * -list_curves     - prints a list of all currently available curve 'short names'
 * -conv_form arg   - specifies the point conversion form
 *                  - possible values: compressed
 *                                     uncompressed (default)
 *                                     hybrid
 * -param_enc arg   - specifies the way the ec parameters are encoded
 *                    in the asn1 der encoding
 *                    possible values: named_curve (default)
 *                                     explicit
 * -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,
                             unsigned char *);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
    EC_GROUP *group = NULL;
    point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
    int new_form = 0;
    int asn1_flag = OPENSSL_EC_NAMED_CURVE;
    int new_asn1_flag = 0;
    char *curve_name = NULL, *inrand = NULL;
    int list_curves = 0, no_seed = 0, check = 0,
        badops = 0, text = 0, i, need_rand = 0, genkey = 0;
    char *infile = NULL, *outfile = NULL, *prog;
    BIO *in = NULL, *out = NULL;
    int informat, outformat, noout = 0, C = 0, ret = 1;
    char *engine = NULL;
    BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
        *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
    unsigned char *buffer = NULL;
    apps_startup();
    if (bio_err == NULL)
        if ((bio_err = BIO_new(BIO_s_file())) != NULL)
            BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
    if (!load_config(bio_err, NULL))
        goto end;
    informat = FORMAT_PEM;
    outformat = FORMAT_PEM;
    prog = argv[0];
    argc--;
    argv++;
    while (argc >= 1) {
        if (strcmp(*argv, "-inform") == 0) {
            if (--argc < 1)
                goto bad;
            informat = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-outform") == 0) {
            if (--argc < 1)
                goto bad;
            outformat = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-in") == 0) {
            if (--argc < 1)
                goto bad;
            infile = *(++argv);
        } else if (strcmp(*argv, "-out") == 0) {
            if (--argc < 1)
                goto bad;
            outfile = *(++argv);
        } else if (strcmp(*argv, "-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) {
            if (--argc < 1)
                goto bad;
            curve_name = *(++argv);
        } else if (strcmp(*argv, "-list_curves") == 0)
            list_curves = 1;
        else if (strcmp(*argv, "-conv_form") == 0) {
            if (--argc < 1)
                goto bad;
            ++argv;
            new_form = 1;
            if (strcmp(*argv, "compressed") == 0)
                form = POINT_CONVERSION_COMPRESSED;
            else if (strcmp(*argv, "uncompressed") == 0)
                form = POINT_CONVERSION_UNCOMPRESSED;
            else if (strcmp(*argv, "hybrid") == 0)
                form = POINT_CONVERSION_HYBRID;
            else
                goto bad;
        } else if (strcmp(*argv, "-param_enc") == 0) {
            if (--argc < 1)
                goto bad;
            ++argv;
            new_asn1_flag = 1;
            if (strcmp(*argv, "named_curve") == 0)
                asn1_flag = OPENSSL_EC_NAMED_CURVE;
            else if (strcmp(*argv, "explicit") == 0)
                asn1_flag = 0;
            else
                goto bad;
        } else if (strcmp(*argv, "-no_seed") == 0)
            no_seed = 1;
        else if (strcmp(*argv, "-noout") == 0)
            noout = 1;
        else if (strcmp(*argv, "-genkey") == 0) {
            genkey = 1;
            need_rand = 1;
        } else if (strcmp(*argv, "-rand") == 0) {
            if (--argc < 1)
                goto bad;
            inrand = *(++argv);
            need_rand = 1;
        } else if (strcmp(*argv, "-engine") == 0) {
            if (--argc < 1)
                goto bad;
            engine = *(++argv);
        } else {
            BIO_printf(bio_err, "unknown option %s\n", *argv);
            badops = 1;
            break;
        }
        argc--;
        argv++;
    }
    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 - "
                   "default PEM (DER or PEM)\n");
        BIO_printf(bio_err, " -outform arg      output format - "
                   "default PEM\n");
        BIO_printf(bio_err, " -in  arg          input file  - "
                   "default stdin\n");
        BIO_printf(bio_err, " -out arg          output file - "
                   "default stdout\n");
        BIO_printf(bio_err, " -noout            do not print the "
                   "ec parameter\n");
        BIO_printf(bio_err, " -text             print the ec "
                   "parameters in text form\n");
        BIO_printf(bio_err, " -check            validate the ec "
                   "parameters\n");
        BIO_printf(bio_err, " -C                print a 'C' "
                   "function creating the parameters\n");
        BIO_printf(bio_err, " -name arg         use the "
                   "ec parameters with 'short name' name\n");
        BIO_printf(bio_err, " -list_curves      prints a list of "
                   "all currently available curve 'short names'\n");
        BIO_printf(bio_err, " -conv_form arg    specifies the "
                   "point conversion form \n");
        BIO_printf(bio_err, "                   possible values:"
                   " compressed\n");
        BIO_printf(bio_err, "                                   "
                   " uncompressed (default)\n");
        BIO_printf(bio_err, "                                   "
                   " hybrid\n");
        BIO_printf(bio_err, " -param_enc arg    specifies the way"
                   " the ec parameters are encoded\n");
        BIO_printf(bio_err, "                   in the asn1 der "
                   "encoding\n");
        BIO_printf(bio_err, "                   possible values:"
                   " named_curve (default)\n");
        BIO_printf(bio_err, "                                   "
                   " explicit\n");
        BIO_printf(bio_err, " -no_seed          if 'explicit'"
                   " parameters are chosen do not" " use the seed\n");
        BIO_printf(bio_err, " -genkey           generate ec" " key\n");
        BIO_printf(bio_err, " -rand file        files to use for"
                   " random number input\n");
        BIO_printf(bio_err, " -engine e         use engine e, "
                   "possibly a hardware device\n");
        goto end;
    }
    ERR_load_crypto_strings();
    in = BIO_new(BIO_s_file());
    out = BIO_new(BIO_s_file());
    if ((in == NULL) || (out == NULL)) {
        ERR_print_errors(bio_err);
        goto end;
    }
    if (infile == NULL)
        BIO_set_fp(in, stdin, BIO_NOCLOSE);
    else {
        if (BIO_read_filename(in, infile) <= 0) {
            perror(infile);
            goto end;
        }
    }
    if (outfile == NULL) {
        BIO_set_fp(out, stdout, BIO_NOCLOSE);
 # ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 # endif
    } else {
        if (BIO_write_filename(out, outfile) <= 0) {
            perror(outfile);
            goto end;
        }
    }
 # ifndef OPENSSL_NO_ENGINE
    setup_engine(bio_err, engine, 0);
 # endif
    if (list_curves) {
        EC_builtin_curve *curves = NULL;
        size_t crv_len = 0;
        size_t n = 0;
        crv_len = EC_get_builtin_curves(NULL, 0);
        curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len));
        if (curves == NULL)
            goto end;
        if (!EC_get_builtin_curves(curves, crv_len)) {
            OPENSSL_free(curves);
            goto end;
        }
        for (n = 0; n < crv_len; n++) {
            const char *comment;
            const char *sname;
            comment = curves[n].comment;
            sname = OBJ_nid2sn(curves[n].nid);
            if (comment == NULL)
                comment = "CURVE DESCRIPTION NOT AVAILABLE";
            if (sname == NULL)
                sname = "";
            BIO_printf(out, "  %-10s: ", sname);
            BIO_printf(out, "%s\n", comment);
        }
        OPENSSL_free(curves);
        ret = 0;
        goto end;
    }
    if (curve_name != NULL) {
        int nid;
        /*
         * workaround for the SECG curve names secp192r1 and secp256r1 (which
         * are the same as the curves prime192v1 and prime256v1 defined in
         * X9.62)
         */
        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")) {
            BIO_printf(bio_err, "using curve name prime256v1 "
                       "instead of secp256r1\n");
            nid = NID_X9_62_prime256v1;
        } else
            nid = OBJ_sn2nid(curve_name);
        if (nid == 0)
            nid = EC_curve_nist2nid(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) {
            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) {
        group = d2i_ECPKParameters_bio(in, NULL);
    } else if (informat == FORMAT_PEM) {
        group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
    } else {
        BIO_printf(bio_err, "bad input format specified\n");
        goto end;
    }
    if (group == NULL) {
        BIO_printf(bio_err, "unable to load elliptic curve parameters\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (new_form)
        EC_GROUP_set_point_conversion_form(group, form);
    if (new_asn1_flag)
        EC_GROUP_set_asn1_flag(group, asn1_flag);
    if (no_seed) {
        EC_GROUP_set_seed(group, NULL, 0);
    }
    if (text) {
        if (!ECPKParameters_print(out, group, 0))
            goto end;
    }
    if (check) {
        BIO_printf(bio_err, "checking elliptic curve parameters: ");
        if (!EC_GROUP_check(group, NULL)) {
            BIO_printf(bio_err, "failed\n");
            ERR_print_errors(bio_err);
            goto end;
        }
        BIO_printf(bio_err, "ok\n");
    }
    if (C) {
        size_t buf_len = 0, tmp_len = 0;
        const EC_POINT *point;
        int is_prime, len = 0;
        const EC_METHOD *meth = EC_GROUP_method_of(group);
        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) {
            perror("OPENSSL_malloc");
            goto end;
        }
        is_prime = (EC_METHOD_get_field_type(meth) == NID_X9_62_prime_field);
        if (is_prime) {
            if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
                goto end;
        } else {
            /* TODO */
            goto end;
        }
        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, NULL))
            goto end;
        if (!EC_GROUP_get_order(group, ec_order, NULL))
            goto end;
        if (!EC_GROUP_get_cofactor(group, ec_cofactor, NULL))
            goto end;
        if (!ec_p || !ec_a || !ec_b || !ec_gen || !ec_order || !ec_cofactor)
            goto end;
        len = BN_num_bits(ec_order);
        if ((tmp_len = (size_t)BN_num_bytes(ec_p)) > buf_len)
            buf_len = tmp_len;
        if ((tmp_len = (size_t)BN_num_bytes(ec_a)) > buf_len)
            buf_len = tmp_len;
        if ((tmp_len = (size_t)BN_num_bytes(ec_b)) > buf_len)
            buf_len = tmp_len;
        if ((tmp_len = (size_t)BN_num_bytes(ec_gen)) > buf_len)
            buf_len = tmp_len;
        if ((tmp_len = (size_t)BN_num_bytes(ec_order)) > buf_len)
            buf_len = tmp_len;
        if ((tmp_len = (size_t)BN_num_bytes(ec_cofactor)) > buf_len)
            buf_len = tmp_len;
        buffer = (unsigned char *)OPENSSL_malloc(buf_len);
        if (buffer == NULL) {
            perror("OPENSSL_malloc");
            goto end;
        }
        ecparam_print_var(out, ec_p, "ec_p", len, buffer);
        ecparam_print_var(out, ec_a, "ec_a", len, buffer);
        ecparam_print_var(out, ec_b, "ec_b", len, buffer);
        ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
        ecparam_print_var(out, ec_order, "ec_order", len, buffer);
        ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
        BIO_printf(out, "\n\n");
        BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n\t{\n", len);
        BIO_printf(out, "\tint ok=0;\n");
        BIO_printf(out, "\tEC_GROUP *group = NULL;\n");
        BIO_printf(out, "\tEC_POINT *point = NULL;\n");
        BIO_printf(out, "\tBIGNUM   *tmp_1 = NULL, *tmp_2 = NULL, "
                   "*tmp_3 = NULL;\n\n");
        BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_p_%d, "
                   "sizeof(ec_p_%d), NULL)) == NULL)\n\t\t"
                   "goto err;\n", len, len);
        BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_a_%d, "
                   "sizeof(ec_a_%d), NULL)) == NULL)\n\t\t"
                   "goto err;\n", len, len);
        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) {
            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 {
            /* TODO */
            goto end;
        }
        BIO_printf(out, "\t/* build generator */\n");
        BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
                   "sizeof(ec_gen_%d), tmp_1)) == NULL)"
                   "\n\t\tgoto err;\n", len, len);
        BIO_printf(out, "\tpoint = EC_POINT_bn2point(group, tmp_1, "
                   "NULL, NULL);\n");
        BIO_printf(out, "\tif (point == NULL)\n\t\tgoto err;\n");
        BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_order_%d, "
                   "sizeof(ec_order_%d), tmp_2)) == NULL)"
                   "\n\t\tgoto err;\n", len, len);
        BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_cofactor_%d, "
                   "sizeof(ec_cofactor_%d), tmp_3)) == NULL)"
                   "\n\t\tgoto err;\n", len, len);
        BIO_printf(out, "\tif (!EC_GROUP_set_generator(group, point,"
                   " tmp_2, tmp_3))\n\t\tgoto err;\n");
        BIO_printf(out, "\n\tok=1;\n");
        BIO_printf(out, "err:\n");
        BIO_printf(out, "\tif (tmp_1)\n\t\tBN_free(tmp_1);\n");
        BIO_printf(out, "\tif (tmp_2)\n\t\tBN_free(tmp_2);\n");
        BIO_printf(out, "\tif (tmp_3)\n\t\tBN_free(tmp_3);\n");
        BIO_printf(out, "\tif (point)\n\t\tEC_POINT_free(point);\n");
        BIO_printf(out, "\tif (!ok)\n");
        BIO_printf(out, "\t\t{\n");
        BIO_printf(out, "\t\tEC_GROUP_free(group);\n");
        BIO_printf(out, "\t\tgroup = NULL;\n");
        BIO_printf(out, "\t\t}\n");
        BIO_printf(out, "\treturn(group);\n\t}\n");
    }
    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 {
            BIO_printf(bio_err, "bad output format specified for"
                       " outfile\n");
            goto end;
        }
        if (!i) {
            BIO_printf(bio_err, "unable to write elliptic "
                       "curve parameters\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    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) {
        EC_KEY *eckey = EC_KEY_new();
        if (eckey == NULL)
            goto end;
        assert(need_rand);
        if (EC_KEY_set_group(eckey, group) == 0)
            goto end;
        if (!EC_KEY_generate_key(eckey)) {
            EC_KEY_free(eckey);
            goto end;
        }
        if (outformat == FORMAT_ASN1)
            i = i2d_ECPrivateKey_bio(out, eckey);
        else if (outformat == FORMAT_PEM)
            i = PEM_write_bio_ECPrivateKey(out, eckey, NULL,
                                           NULL, 0, NULL, NULL);
        else {
            BIO_printf(bio_err, "bad output format specified "
                       "for outfile\n");
            EC_KEY_free(eckey);
            goto end;
        }
        EC_KEY_free(eckey);
    }
    if (need_rand)
        app_RAND_write_file(NULL, bio_err);
    ret = 0;
 end:
    if (ec_p)
        BN_free(ec_p);
    if (ec_a)
        BN_free(ec_a);
    if (ec_b)
        BN_free(ec_b);
    if (ec_gen)
        BN_free(ec_gen);
    if (ec_order)
        BN_free(ec_order);
    if (ec_cofactor)
        BN_free(ec_cofactor);
    if (buffer)
        OPENSSL_free(buffer);
    if (in != NULL)
        BIO_free(in);
    if (out != NULL)
        BIO_free_all(out);
    if (group != NULL)
        EC_GROUP_free(group);
    apps_shutdown();
    OPENSSL_EXIT(ret);
 }
 static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
                             int len, unsigned char *buffer)
 {
    BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
    if (BN_is_zero(in))
        BIO_printf(out, "\n\t0x00");
    else {
        int i, l;
        l = BN_bn2bin(in, buffer);
        for (i = 0; i < l - 1; i++) {
            if ((i % 12) == 0)
                BIO_printf(out, "\n\t");
            BIO_printf(out, "0x%02X,", buffer[i]);
        }
        if ((i % 12) == 0)
            BIO_printf(out, "\n\t");
        BIO_printf(out, "0x%02X", buffer[i]);
    }
    BIO_printf(out, "\n\t};\n\n");
    return 1;
 }
 #else                           /* !OPENSSL_NO_EC */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -67,9 +67,6 @@
 #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);
@@ -90,10 +87,12 @@ 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,6 +100,9 @@ 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;
@@ -114,16 +116,11 @@ int MAIN(int argc, char **argv)
 	char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
 	char *md=NULL;
 	int enc=1,printkey=0,i,base64=0;
 #ifdef ZLIB
    int do_zlib = 0;
    BIO *bzl = NULL;
 #endif
 	int debug=0,olb64=0,nosalt=0;
 	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 =
+	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
        NULL, *wbio = NULL;
 #define PROG_NAME_SIZE  39
 	char pname[PROG_NAME_SIZE+1];
 #ifndef OPENSSL_NO_ENGINE
@@ -145,18 +142,9 @@ int MAIN(int argc, char **argv)
 	program_name(argv[0],pname,sizeof pname);
 	if (strcmp(pname,"base64") == 0)
 		base64=1;
 #ifdef ZLIB
    if (strcmp(pname, "zlib") == 0)
        do_zlib = 1;
 #endif
 	cipher=EVP_get_cipherbyname(pname);
 #ifdef ZLIB
    if (!do_zlib && !base64 && (cipher == NULL)
        && (strcmp(pname, "enc") != 0))
 #else
 	if (!base64 && (cipher == NULL) && (strcmp(pname,"enc") != 0))
 #endif
 		{
 		BIO_printf(bio_err,"%s is an unknown cipher\n",pname);
 		goto bad;
@@ -164,26 +152,29 @@ 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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			inf= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outf= *(++argv);
-        } else if (strcmp(*argv, "-pass") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-pass") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
@@ -209,71 +200,79 @@ int MAIN(int argc, char **argv)
 			base64=1;
 		else if	(strcmp(*argv,"-base64") == 0)
 			base64=1;
-#ifdef ZLIB
+		else if (strcmp(*argv,"-bufsize") == 0)
-        else if (strcmp(*argv, "-z") == 0)
+			{
-            do_zlib = 1;
+			if (--argc < 1) goto bad;
 #endif
        else if (strcmp(*argv, "-bufsize") == 0) {
            if (--argc < 1)
                goto bad;
 			bufsize=(unsigned char *)*(++argv);
-        } else if (strcmp(*argv, "-k") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-k") == 0)
-                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)
+			if (--argc < 1) goto bad;
                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';
-            if (!fgets(buf, sizeof buf, infile)) {
+			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) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
+			if ((i > 0) &&
 				((buf[i-1] == '\n') || (buf[i-1] == '\r')))
 				buf[--i]='\0';
-            if ((i > 0) && ((buf[i - 1] == '\n') || (buf[i - 1] == '\r')))
+			if ((i > 0) &&
 				((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) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-K") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			hkey= *(++argv);
-        } else if (strcmp(*argv, "-S") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-S") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			hsalt= *(++argv);
-        } else if (strcmp(*argv, "-iv") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-iv") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			hiv= *(++argv);
-        } else if (strcmp(*argv, "-md") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-md") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			md= *(++argv);
-        } else if (strcmp(*argv, "-non-fips-allow") == 0)
+			}
 		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");
@@ -282,38 +281,22 @@ int MAIN(int argc, char **argv)
 			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,
+			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
-                       "%-14s base64 encode/decode, depending on encryption flag\n",
+			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
-                       "-a/-base64");
+			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
-            BIO_printf(bio_err, "%-14s passphrase is the next argument\n",
+			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
-                       "-k");
+			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
-                       "%-14s 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");
 #ifndef OPENSSL_NO_ENGINE
-            BIO_printf(bio_err,
+			BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
                       "%-14s use engine e, possibly a hardware device.\n",
                       "-engine e");
 #endif
 			BIO_printf(bio_err,"Cipher Types\n");
 			OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-                                   show_ciphers, bio_err);
+					       show_ciphers,
 					       bio_err);
 			BIO_printf(bio_err,"\n");
 			goto end;
@@ -323,86 +306,85 @@ int MAIN(int argc, char **argv)
 		}
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
-    if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
+	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
-        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)
 		{
 		if (in_FIPS_mode)
 			dgst = EVP_sha1();
 		else
 			dgst = EVP_md5();
 		}
-    if (bufsize != NULL) {
+	if (bufsize != NULL)
 		{
 		unsigned long n;
-        for (n = 0; *bufsize; bufsize++) {
+		for (n=0; *bufsize; bufsize++)
 			{
 			i= *bufsize;
 			if ((i <= '9') && (i >= '0'))
 				n=n*10+i-'0';
-            else if (i == 'k') {
+			else if (i == 'k')
 				{
 				n*=1024;
 				bufsize++;
 				break;
 				}
 			}
-        if (*bufsize != '\0') {
+		if (*bufsize != '\0')
 			{
 			BIO_printf(bio_err,"invalid 'bufsize' specified.\n");
 			goto end;
 			}
 		/* It must be large enough for a base64 encoded line */
-        if (base64 && n < 80)
+		if (base64 && n < 80) n=80;
            n = 80;
 		bsize=(int)n;
-        if (verbose)
+		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
            BIO_printf(bio_err, "bufsize=%d\n", bsize);
 		}
 	strbuf=OPENSSL_malloc(SIZE);
 	buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize));
-    if ((buff == NULL) || (strbuf == NULL)) {
+	if ((buff == NULL) || (strbuf == NULL))
-        BIO_printf(bio_err, "OPENSSL_malloc failure %ld\n",
+		{
-                   (long)EVP_ENCODE_LENGTH(bsize));
+		BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize));
 		goto end;
 		}
 	in=BIO_new(BIO_s_file());
 	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(in,bio_err);
-        BIO_set_callback_arg(out, (char *)bio_err);
+		BIO_set_callback_arg(out,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 {
+	        }
-        if (BIO_read_filename(in, inf) <= 0) {
+	else
 		{
 		if (BIO_read_filename(in,inf) <= 0)
 			{
 			perror(inf);
 			goto end;
 			}
@@ -416,8 +398,10 @@ int MAIN(int argc, char **argv)
 		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:",
@@ -425,35 +409,41 @@ int MAIN(int argc, char **argv)
 				     (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 {
+		}
-        if (BIO_write_filename(out, outf) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outf) <= 0)
 			{
 			perror(outf);
 			goto end;
 			}
@@ -462,24 +452,14 @@ int MAIN(int argc, char **argv)
 	rbio=in;
 	wbio=out;
-#ifdef ZLIB
+	if (base64)
-
+		{
    if (do_zlib) {
        if ((bzl = BIO_new(BIO_f_zlib())) == NULL)
            goto end;
        if (enc)
            wbio = BIO_push(bzl, wbio);
        else
            rbio = BIO_push(bzl, rbio);
    }
 #endif
    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);
+			BIO_set_callback_arg(b64,bio_err);
 			}
 		if (olb64)
 			BIO_set_flags(b64,BIO_FLAGS_BASE64_NO_NL);
@@ -489,31 +469,30 @@ int MAIN(int argc, char **argv)
 			rbio=BIO_push(b64,rbio);
 		}
-    if (cipher != NULL) {
+	if (cipher != NULL)
-        /*
+		{
-         * Note that str is NULL if a key was passed on the command line, so
+		/* Note that str is NULL if a key was passed on the command
-         * we get no salt in that case. Is this a bug?
+		 * line, so we get no salt in that case. Is this a bug?
 		 */
-        if (str != NULL) {
+		if (str != NULL)
-            /*
+			{
-             * Salt handling: if encrypting generate a salt and write to
+			/* Salt handling: if encrypting generate a salt and
-             * output BIO. If decrypting read salt from input BIO.
+			 * write to output BIO. If decrypting read salt from
 			 * input BIO.
 			 */
 			unsigned char *sptr;
-            if (nosalt)
+			if(nosalt) sptr = NULL;
                sptr = NULL;
 			else {
 				if(enc) {
 					if(hsalt) {
 						if(!set_hex(hsalt,salt,sizeof salt)) {
-                            BIO_printf(bio_err, "invalid hex salt value\n");
+							BIO_printf(bio_err,
 								"invalid hex salt value\n");
 							goto end;
 						}
 					} else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
 						goto end;
-                    /*
+					/* If -P option then don't bother writing */
                     * If -P option then don't bother writing
                     */
 					if((printkey != 2)
 					   && (BIO_write(wbio,magic,
 							 sizeof magic-1) != sizeof magic-1
@@ -538,36 +517,32 @@ int MAIN(int argc, char **argv)
 			}
 			EVP_BytesToKey(cipher,dgst,sptr,
-                           (unsigned char *)str, strlen(str), 1, key, iv);
+				(unsigned char *)str,
-            /*
+				strlen(str),1,key,iv);
-             * zero the complete buffer or the string passed from the command
+			/* zero the complete buffer or the string
-             * line bug picked up by Larry J. Hughes Jr. <hughes@indiana.edu>
+			 * passed from the command line
-             */
+			 * bug picked up by
 			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 			if (str == strbuf)
 				OPENSSL_cleanse(str,SIZE);
 			else
 				OPENSSL_cleanse(str,strlen(str));
 			}
-        if (hiv != NULL) {
+		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
-            int siz = EVP_CIPHER_iv_length(cipher);
+			{
            if (siz == 0) {
                BIO_printf(bio_err, "warning: iv not use by this cipher\n");
            } else if (!set_hex(hiv, iv, sizeof iv)) {
 			BIO_printf(bio_err,"invalid hex iv value\n");
 			goto end;
 			}
-        }
+		if ((hiv == NULL) && (str == NULL))
-        if ((hiv == NULL) && (str == NULL)
+			{
-            && EVP_CIPHER_iv_length(cipher) != 0) {
+			/* No IV was explicitly set and no IV was generated
-            /*
+			 * during EVP_BytesToKey. Hence the IV is undefined,
-             * No IV was explicitly set and no IV was generated during
+			 * making correct decryption impossible. */
             * EVP_BytesToKey. Hence the IV is undefined, making correct
             * decryption impossible.
             */
 			BIO_printf(bio_err, "iv undefined\n");
 			goto end;
 			}
-        if ((hkey != NULL) && !set_hex(hkey, key, EVP_CIPHER_key_length(cipher))) {
+		if ((hkey != NULL) && !set_hex(hkey,key,sizeof key))
 			{
 			BIO_printf(bio_err,"invalid hex key value\n");
 			goto end;
 			}
@@ -575,17 +550,25 @@ int MAIN(int argc, char **argv)
 		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
 			goto end;
-        /*
+		/* Since we may be changing parameters work on the encryption
-         * Since we may be changing parameters work on the encryption context
+		 * context rather than calling BIO_set_cipher().
         * rather than calling BIO_set_cipher().
 		 */
 		BIO_get_cipher_ctx(benc, &ctx);
 		if (!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);
 			goto end;
 			}
 		if (non_fips_allow)
-            EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_NON_FIPS_ALLOW);
+			EVP_CIPHER_CTX_set_flags(ctx,
 				EVP_CIPH_FLAG_NON_FIPS_ALLOW);
-        if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)) {
+		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
 			{
 			BIO_printf(bio_err, "Error setting cipher %s\n",
 					EVP_CIPHER_name(cipher));
 			ERR_print_errors(bio_err);
@@ -595,38 +578,45 @@ int MAIN(int argc, char **argv)
 		if (nopad)
 			EVP_CIPHER_CTX_set_padding(ctx, 0);
-        if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc)) {
+		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
 			{
 			BIO_printf(bio_err, "Error setting cipher %s\n",
 					EVP_CIPHER_name(cipher));
 			ERR_print_errors(bio_err);
 			goto end;
 			}
-        if (debug) {
+		if (debug)
 			{
 			BIO_set_callback(benc,BIO_debug_callback);
-            BIO_set_callback_arg(benc, (char *)bio_err);
+			BIO_set_callback_arg(benc,bio_err);
 			}
-        if (printkey) {
+		if (printkey)
-            if (!nosalt) {
+			{
 			if (!nosalt)
 				{
 				printf("salt=");
-                for (i = 0; i < (int)sizeof(salt); i++)
+				for (i=0; i<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;
 				}
@@ -637,45 +627,37 @@ int MAIN(int argc, char **argv)
 	if (benc != NULL)
 		wbio=BIO_push(benc,wbio);
-    for (;;) {
+	for (;;)
 		{
 		inl=BIO_read(rbio,(char *)buff,bsize);
-        if (inl <= 0)
+		if (inl <= 0) break;
-            break;
+		if (BIO_write(wbio,(char *)buff,inl) != inl)
-        if (BIO_write(wbio, (char *)buff, inl) != inl) {
+			{
 			BIO_printf(bio_err,"error writing output file\n");
 			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)
+	if (strbuf != NULL) OPENSSL_free(strbuf);
-        OPENSSL_free(strbuf);
+	if (buff != NULL) OPENSSL_free(buff);
-    if (buff != NULL)
+	if (in != NULL) BIO_free(in);
-        OPENSSL_free(buff);
+	if (out != NULL) BIO_free_all(out);
-    if (in != NULL)
+	if (benc != NULL) BIO_free(benc);
-        BIO_free(in);
+	if (b64 != NULL) BIO_free(b64);
-    if (out != NULL)
+	if(pass) OPENSSL_free(pass);
        BIO_free_all(out);
    if (benc != NULL)
        BIO_free(benc);
    if (b64 != NULL)
        BIO_free(b64);
 #ifdef ZLIB
    if (bzl != NULL)
        BIO_free(bzl);
 #endif
    if (pass)
        OPENSSL_free(pass);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
@@ -686,23 +668,25 @@ 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)
+		if (j == 0) break;
            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);
 			}
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -1,7 +1,6 @@
-/* apps/engine.c */
+/* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/*
+/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
- * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * project 2000.
 * 2000.
 */
 /* ====================================================================
 * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -57,6 +56,8 @@
 *
 */
 #ifndef OPENSSL_NO_ENGINE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -65,22 +66,20 @@
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #include <openssl/ssl.h>
 #undef PROG
 #define PROG	engine_main
-static const char *engine_usage[] = {
+static char *engine_usage[]={
 "usage: engine opts [engine ...]\n",
 " -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
 "               -vv will additionally display each command's description\n",
 "               -vvv will also add the input flags for each command\n",
 "               -vvvv will also show internal input flags\n",
 " -c          - for each engine, also list the capabilities\n",
-    " -t[t]       - for each engine, check that they are really available\n",
+" -t          - for each engine, check that they are really available\n",
    "               -tt will display error trace for unavailable engines\n",
 " -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
 "               to load it (if -t is used)\n",
 " -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
@@ -92,14 +91,17 @@ static const char *engine_usage[] = {
 NULL
 };
-static void identity(char *ptr)
+static void identity(void *ptr)
 	{
 	return;
 	}
 static int append_buf(char **buf, const char *s, int *size, int step)
 	{
-    if (*buf == NULL) {
+	int l = strlen(s);
 	if (*buf == NULL)
 		{
 		*size = step;
 		*buf = OPENSSL_malloc(*size);
 		if (*buf == NULL)
@@ -107,7 +109,11 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 		**buf = '\0';
 		}
-    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
+	if (**buf != '\0')
 		l += 2;		/* ", " */
 	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
 		{
 		*size += step;
 		*buf = OPENSSL_realloc(*buf, *size);
 		}
@@ -127,38 +133,46 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
 	int started = 0, err = 0;
 	/* Indent before displaying input flags */
 	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-    if (flags == 0) {
+	if(flags == 0)
 		{
 		BIO_printf(bio_out, "<no flags>\n");
 		return 1;
 		}
-    /*
+        /* If the object is internal, mark it in a way that shows instead of
-     * If the object is internal, mark it in a way that shows instead of
+         * having it part of all the other flags, even if it really is. */
-     * having it part of all the other flags, even if it really is.
+	if(flags & ENGINE_CMD_FLAG_INTERNAL)
-     */
+		{
    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
 		BIO_printf(bio_out, "[Internal] ");
 		}
-    if (flags & ENGINE_CMD_FLAG_NUMERIC) {
+	if(flags & ENGINE_CMD_FLAG_NUMERIC)
 		{
 		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "NUMERIC");
 		started = 1;
 		}
-    /*
+	/* Now we check that no combinations of the mutually exclusive NUMERIC,
     * Now we check that no combinations of the mutually exclusive NUMERIC,
 	 * STRING, and NO_INPUT flags have been used. Future flags that can be
 	 * OR'd together with these would need to added after these to preserve
-     * the testing logic.
+	 * the testing logic. */
-     */
+	if(flags & ENGINE_CMD_FLAG_STRING)
-    if (flags & ENGINE_CMD_FLAG_STRING) {
+		{
-        if (started) {
+		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "STRING");
 		started = 1;
 		}
-    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
+	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
-        if (started) {
+		{
 		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
@@ -168,10 +182,11 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
 	/* Check for unknown flags */
 	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
 			~ENGINE_CMD_FLAG_STRING &
-        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
+			~ENGINE_CMD_FLAG_NO_INPUT &
-    if (flags) {
+			~ENGINE_CMD_FLAG_INTERNAL;
-        if (started)
+	if(flags)
-            BIO_printf(bio_out, "|");
+		{
 		if(started) BIO_printf(bio_out, "|");
 		BIO_printf(bio_out, "<0x%04X>", flags);
 		}
 	if(err)
@@ -180,8 +195,7 @@ 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,
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
                        const char *indent)
 	{
 	static const int line_wrap = 78;
 	int num;
@@ -190,17 +204,18 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
 	char *desc = NULL;
 	int flags;
 	int xpos = 0;
-    STACK_OF(OPENSSL_STRING) *cmds = NULL;
+	STACK *cmds = NULL;
 	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
 			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-                            0, NULL, NULL)) <= 0)) {
+					0, NULL, NULL)) <= 0))
 		{
 #if 0
 		BIO_printf(bio_out, "%s<no control commands>\n", indent);
 #endif
 		return 1;
 		}
-    cmds = sk_OPENSSL_STRING_new_null();
+	cmds = sk_new_null();
 	if(!cmds)
 		goto err;
@@ -210,7 +225,8 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
 		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)
@@ -224,7 +240,8 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
                        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,
@@ -234,72 +251,73 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
                        /* Now decide on the output */
                        if(xpos == 0)
                                /* Do an indent */
-                xpos = BIO_puts(bio_out, indent);
+                                xpos = BIO_printf(bio_out, indent);
                        else
                                /* Otherwise prepend a ", " */
                                xpos += BIO_printf(bio_out, ", ");
-            if (verbose == 1) {
+                        if(verbose == 1)
-                /*
+                                {
-                 * We're just listing names, comma-delimited
+                                /* We're just listing names, comma-delimited */
                 */
                                if((xpos > (int)strlen(indent)) &&
-                    (xpos + (int)strlen(name) > line_wrap)) {
+					(xpos + (int)strlen(name) > line_wrap))
                                        {
                                        BIO_printf(bio_out, "\n");
-                    xpos = BIO_puts(bio_out, indent);
+                                        xpos = BIO_printf(bio_out, indent);
                                        }
                                xpos += BIO_printf(bio_out, "%s", name);
-            } else {
+                                }
                        else
                                {
                                /* We're listing names plus descriptions */
                                BIO_printf(bio_out, "%s: %s\n", name,
                                        (desc == NULL) ? "<no description>" : desc);
                                /* ... and sometimes input flags */
-                if ((verbose >= 3) && !util_flags(bio_out, flags, indent))
+                                if((verbose >= 3) && !util_flags(bio_out, flags,
                                        indent))
                                        goto err;
                                xpos = 0;
                                }
                        }
-        OPENSSL_free(name);
+		OPENSSL_free(name); name = NULL;
-        name = NULL;
+		if(desc) { OPENSSL_free(desc); desc = NULL; }
        if (desc) {
            OPENSSL_free(desc);
            desc = NULL;
        }
 		/* Move to the next command */
-        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
+		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
 					num, NULL, NULL);
 		} while(num > 0);
 	if(xpos > 0)
 		BIO_printf(bio_out, "\n");
 	ret = 1;
 err:
-    if (cmds)
+	if(cmds) sk_pop_free(cmds, identity);
-        sk_OPENSSL_STRING_pop_free(cmds, identity);
+	if(name) OPENSSL_free(name);
-    if (name)
+	if(desc) OPENSSL_free(desc);
        OPENSSL_free(name);
    if (desc)
        OPENSSL_free(desc);
 	return ret;
 	}
-static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
+static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
-                         BIO *bio_out, const char *indent)
+	{
 	int loop, res, num = sk_num(cmds);
 	if(num < 0)
 		{
    int loop, res, num = sk_OPENSSL_STRING_num(cmds);
    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_OPENSSL_STRING_value(cmds, loop);
+		cmd = sk_value(cmds, loop);
 		res = 1; /* assume success */
 		/* Check if this command has no ":arg" */
-        if ((arg = strstr(cmd, ":")) == NULL) {
+		if((arg = strstr(cmd, ":")) == NULL)
 			{
 			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
 				res = 0;
-        } else {
+			}
-            if ((int)(arg - cmd) > 254) {
+		else
 			{
 			if((int)(arg - cmd) > 254)
 				{
 				BIO_printf(bio_out,"[Error]: command name too long\n");
 				return;
 				}
@@ -312,7 +330,8 @@ static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
 			}
 		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);
 			}
@@ -324,12 +343,12 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	int ret=1,i;
-    const char **pp;
+	char **pp;
-    int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
+	int verbose=0, list_cap=0, test_avail=0;
 	ENGINE *e;
-    STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
+	STACK *engines = sk_new_null();
-    STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
+	STACK *pre_cmds = sk_new_null();
-    STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
+	STACK *post_cmds = sk_new_null();
 	int badops=1;
 	BIO *bio_out=NULL;
 	const char *indent = "     ";
@@ -352,37 +371,38 @@ 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 (strcmp(*argv,"-t") == 0)
 			test_avail=1;
-            if (strspn(*argv + 1, "t") < strlen(*argv + 1))
+		else if (strcmp(*argv,"-pre") == 0)
-                goto skip_arg_loop;
+			{
-            if ((test_avail_noise = strlen(*argv + 1) - 1) > 1)
+			argc--; argv++;
                goto skip_arg_loop;
        } else if (strcmp(*argv, "-pre") == 0) {
            argc--;
            argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-            sk_OPENSSL_STRING_push(pre_cmds, *argv);
+			sk_push(pre_cmds,*argv);
-        } else if (strcmp(*argv, "-post") == 0) {
+			}
-            argc--;
+		else if (strcmp(*argv,"-post") == 0)
-            argv++;
+			{
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
-            sk_OPENSSL_STRING_push(post_cmds, *argv);
+			sk_push(post_cmds,*argv);
-        } else if ((strncmp(*argv, "-h", 2) == 0) ||
+			}
 		else if ((strncmp(*argv,"-h",2) == 0) ||
 				(strcmp(*argv,"-?") == 0))
 			goto skip_arg_loop;
 		else
-            sk_OPENSSL_STRING_push(engines, *argv);
+			sk_push(engines,*argv);
 		argc--;
 		argv++;
 		}
@@ -390,96 +410,98 @@ 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_OPENSSL_STRING_num(engines) == 0) {
+	if (sk_num(engines) == 0)
-        for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
+		{
-            sk_OPENSSL_STRING_push(engines, (char *)ENGINE_get_id(e));
+		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
 			{
 			sk_push(engines,(char *)ENGINE_get_id(e));
 			}
 		}
-    for (i = 0; i < sk_OPENSSL_STRING_num(engines); i++) {
+	for (i=0; i<sk_num(engines); i++)
-        const char *id = sk_OPENSSL_STRING_value(engines, i);
+		{
-        if ((e = ENGINE_by_id(id)) != NULL) {
+		const char *id = sk_value(engines,i);
 		if ((e = ENGINE_by_id(id)) != NULL)
 			{
 			const char *name = ENGINE_get_name(e);
-            /*
+			/* Do "id" first, then "name". Easier to auto-parse. */
             * Do "id" first, then "name". Easier to auto-parse.
             */
 			BIO_printf(bio_out, "(%s) %s\n", id, name);
 			util_do_cmds(e, pre_cmds, bio_out, indent);
-            if (strcmp(ENGINE_get_id(e), id) != 0) {
+			if (strcmp(ENGINE_get_id(e), id) != 0)
 				{
 				BIO_printf(bio_out, "Loaded: (%s) %s\n",
 					ENGINE_get_id(e), ENGINE_get_name(e));
 				}
-            if (list_cap) {
+			if (list_cap)
 				{
 				int cap_size = 256;
 				char *cap_buf = NULL;
 				int k,n;
 				const int *nids;
 				ENGINE_CIPHERS_PTR fn_c;
 				ENGINE_DIGESTS_PTR fn_d;
                ENGINE_PKEY_METHS_PTR fn_pk;
 				if (ENGINE_get_RSA(e) != NULL
-                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
+					&& !append_buf(&cap_buf, "RSA",
 						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_DSA(e) != NULL
-                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
+					&& !append_buf(&cap_buf, "DSA",
 						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_DH(e) != NULL
-                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
+					&& !append_buf(&cap_buf, "DH",
 						&cap_size, 256))
 					goto end;
 				if (ENGINE_get_RAND(e) != NULL
-                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
+					&& !append_buf(&cap_buf, "RAND",
 						&cap_size, 256))
 					goto end;
 				fn_c = ENGINE_get_ciphers(e);
-                if (!fn_c)
+				if(!fn_c) goto skip_ciphers;
                    goto skip_ciphers;
 				n = fn_c(e, NULL, &nids, 0);
 				for(k=0 ; k < n ; ++k)
 					if(!append_buf(&cap_buf,
-                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
+						       OBJ_nid2sn(nids[k]),
 						       &cap_size, 256))
 						goto end;
 skip_ciphers:
 				fn_d = ENGINE_get_digests(e);
-                if (!fn_d)
+				if(!fn_d) goto skip_digests;
                    goto skip_digests;
 				n = fn_d(e, NULL, &nids, 0);
 				for(k=0 ; k < n ; ++k)
 					if(!append_buf(&cap_buf,
-                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
+						       OBJ_nid2sn(nids[k]),
 						       &cap_size, 256))
 						goto end;
 skip_digests:
                fn_pk = ENGINE_get_pkey_meths(e);
                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]), &cap_size, 256))
                        goto end;
 skip_pmeths:
 				if (cap_buf && (*cap_buf != '\0'))
 					BIO_printf(bio_out, " [%s]\n", cap_buf);
 				OPENSSL_free(cap_buf);
 				}
-            if (test_avail) {
+			if(test_avail)
 				{
 				BIO_printf(bio_out, "%s", indent);
-                if (ENGINE_init(e)) {
+				if (ENGINE_init(e))
 					{
 					BIO_printf(bio_out, "[ available ]\n");
 					util_do_cmds(e, post_cmds, bio_out, indent);
 					ENGINE_finish(e);
-                } else {
+					}
 				else
 					{
 					BIO_printf(bio_out, "[ unavailable ]\n");
                    if (test_avail_noise)
 					ERR_print_errors_fp(stdout);
 					ERR_clear_error();
 					}
@@ -487,19 +509,18 @@ int MAIN(int argc, char **argv)
 			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
 				goto end;
 			ENGINE_free(e);
-        } else
+			}
 		else
 			ERR_print_errors(bio_err);
 		}
 	ret=0;
 end:
 	ERR_print_errors(bio_err);
-    sk_OPENSSL_STRING_pop_free(engines, identity);
+	sk_pop_free(engines, identity);
-    sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
+	sk_pop_free(pre_cmds, identity);
-    sk_OPENSSL_STRING_pop_free(post_cmds, identity);
+	sk_pop_free(post_cmds, identity);
-    if (bio_out != NULL)
+	if (bio_out != NULL) BIO_free_all(bio_out);
        BIO_free_all(bio_out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -84,33 +84,38 @@ 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(ERR_get_string_table(), out);
+			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
-            lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(), out);
+			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
-            lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
+			lh_node_usage_stats_bio((LHASH *)
-                                                    out);
+				ERR_get_string_table(),out);
 			}
-        if (out != NULL)
+		if (out != NULL) BIO_free_all(out);
            BIO_free_all(out);
 		argc--;
 		argv++;
 		}
-    for (i = 1; i < argc; i++) {
+	for (i=1; i<argc; i++)
-        if (sscanf(argv[i], "%lx", &l)) {
+		{
 		if (sscanf(argv[i],"%lx",&l))
 			{
 			ERR_error_string_n(l, buf, sizeof buf);
 			printf("%s\n",buf);
-        } else {
+			}
 		else
 			{
 			printf("%s: bad error code\n",argv[i]);
 			printf("usage: errstr [-stats] <errno> ...\n");
 			ret++;
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -57,15 +57,6 @@
 * [including the GNU Public Licence.]
 */
 #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>
 #include <string.h>
@@ -80,17 +71,19 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-# define DEFBITS 2048
+#define DEFBITS	512
 #undef PROG
 #define PROG gendh_main
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
+static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
-    BN_GENCB cb;
+#ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	DH *dh=NULL;
 	int ret=1,num=DEFBITS;
 	int g=2;
@@ -103,7 +96,6 @@ 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);
@@ -113,66 +105,67 @@ int MAIN(int argc, char **argv)
 	argv++;
 	argc--;
-    for (;;) {
+	for (;;)
-        if (argc <= 0)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } 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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-rand") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			inrand= *(++argv);
-        } 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,
+		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
                   " -engine e - use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
        BIO_printf(bio_err,
                   "           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
 		goto end;
 		}
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = 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
 		{
@@ -180,29 +173,29 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
-    BIO_printf(bio_err,
+	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
               "Generating DH parameters, %d bit long safe prime, generator %d\n",
               num, g);
 	BIO_printf(bio_err,"This is going to take a long time\n");
 	dh=DH_generate_parameters(num,g,dh_cb,bio_err);
-    if (((dh = DH_new()) == NULL)
+	if (dh == NULL) goto end;
        || !DH_generate_parameters_ex(dh, num, g, &cb))
        goto end;
 	app_RAND_write_file(NULL, bio_err);
@@ -212,37 +205,24 @@ int MAIN(int argc, char **argv)
 end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (out != NULL)
+	if (out != NULL) BIO_free_all(out);
-        BIO_free_all(out);
+	if (dh != NULL) DH_free(dh);
    if (dh != NULL)
        DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 	{
 	char c='*';
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write((BIO *)arg,&c,1);
-        c = '*';
+	(void)BIO_flush((BIO *)arg);
    if (p == 3)
        c = '\n';
    BIO_write(cb->arg, &c, 1);
    (void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
    return 1;
 	}
 #else                           /* !OPENSSL_NO_DH */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -56,7 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <string.h>
@@ -78,6 +77,9 @@ 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;
@@ -100,30 +102,32 @@ int MAIN(int argc, char **argv)
 	argv++;
 	argc--;
-    for (;;) {
+	for (;;)
-        if (argc <= 0)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passout") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-rand") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			inrand= *(++argv);
-        } else if (strcmp(*argv, "-") == 0)
+			}
 		else if (strcmp(*argv,"-") == 0)
 			goto bad;
 #ifndef OPENSSL_NO_DES
 		else if (strcmp(*argv,"-des") == 0)
@@ -135,10 +139,6 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-idea") == 0)
 			enc=EVP_idea_cbc();
 #endif
 # ifndef OPENSSL_NO_SEED
        else if (strcmp(*argv, "-seed") == 0)
            enc = EVP_seed_cbc();
 # endif
 #ifndef OPENSSL_NO_AES
 		else if (strcmp(*argv,"-aes128") == 0)
 			enc=EVP_aes_128_cbc();
@@ -147,67 +147,45 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-aes256") == 0)
 			enc=EVP_aes_256_cbc();
 #endif
-# ifndef OPENSSL_NO_CAMELLIA
+		else if (**argv != '-' && dsaparams == NULL)
-        else if (strcmp(*argv, "-camellia128") == 0)
+			{
            enc = EVP_camellia_128_cbc();
        else if (strcmp(*argv, "-camellia192") == 0)
            enc = EVP_camellia_192_cbc();
        else if (strcmp(*argv, "-camellia256") == 0)
            enc = EVP_camellia_256_cbc();
 # endif
        else if (**argv != '-' && dsaparams == NULL) {
 			dsaparams = *argv;
-        } else
+			}
 		else
 			goto bad;
 		argv++;
 		argc--;
 		}
-    if (dsaparams == NULL) {
+	if (dsaparams == NULL)
 		{
 bad:
 		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
 		BIO_printf(bio_err," -out file - output the key to 'file'\n");
 #ifndef OPENSSL_NO_DES
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\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");
        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,
+		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
                   " -idea     - encrypt the generated key with IDEA in cbc mode\n");
 # endif
 # ifndef OPENSSL_NO_SEED
        BIO_printf(bio_err, " -seed\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc camellia\n");
 #endif
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
                   " -engine e - use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
        BIO_printf(bio_err,
                   "           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
 		BIO_printf(bio_err," dsaparam-file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
                   "           - a DSA parameter file as generated by the dsaparam command\n");
 		goto end;
 		}
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
@@ -215,13 +193,16 @@ int MAIN(int argc, char **argv)
 		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;
 		}
@@ -229,10 +210,10 @@ int MAIN(int argc, char **argv)
 	in = NULL;
 	out=BIO_new(BIO_s_file());
-    if (out == NULL)
+	if (out == NULL) goto end;
        goto end;
-    if (outfile == NULL) {
+	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -240,24 +221,27 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-    if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) {
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
-    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
+	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
-    if (!DSA_generate_key(dsa))
+							BN_num_bits(dsa->p));
-        goto end;
+	if (!DSA_generate_key(dsa)) goto end;
 	app_RAND_write_file(NULL, bio_err);
@@ -267,21 +251,11 @@ int MAIN(int argc, char **argv)
 end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-    if (in != NULL)
+	if (in != NULL) BIO_free(in);
-        BIO_free(in);
+	if (out != NULL) BIO_free_all(out);
-    if (out != NULL)
+	if (dsa != NULL) DSA_free(dsa);
-        BIO_free_all(out);
+	if(passout) OPENSSL_free(passout);
    if (dsa != NULL)
        DSA_free(dsa);
    if (passout)
        OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #else                           /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,405 +0,0 @@
 /* apps/genpkey.c */
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
 * 2006
 */
 /* ====================================================================
 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <stdio.h>
 #include <string.h>
 #include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
 # include <openssl/engine.h>
 #endif
 static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
                            const char *file, ENGINE *e);
 static int genpkey_cb(EVP_PKEY_CTX *ctx);
 #define PROG genpkey_main
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
    ENGINE *e = NULL;
    char **args, *outfile = NULL;
    char *passarg = NULL;
    BIO *in = NULL, *out = NULL;
    const EVP_CIPHER *cipher = NULL;
    int outformat;
    int text = 0;
    EVP_PKEY *pkey = NULL;
    EVP_PKEY_CTX *ctx = NULL;
    char *pass = NULL;
    int badarg = 0;
    int ret = 1, rv;
    int do_param = 0;
    if (bio_err == NULL)
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
    if (!load_config(bio_err, NULL))
        goto end;
    outformat = FORMAT_PEM;
    ERR_load_crypto_strings();
    OpenSSL_add_all_algorithms();
    args = argv + 1;
    while (!badarg && *args && *args[0] == '-') {
        if (!strcmp(*args, "-outform")) {
            if (args[1]) {
                args++;
                outformat = str2fmt(*args);
            } else
                badarg = 1;
        } else if (!strcmp(*args, "-pass")) {
            if (!args[1])
                goto bad;
            passarg = *(++args);
        }
 #ifndef OPENSSL_NO_ENGINE
        else if (strcmp(*args, "-engine") == 0) {
            if (!args[1])
                goto bad;
            e = setup_engine(bio_err, *(++args), 0);
        }
 #endif
        else if (!strcmp(*args, "-paramfile")) {
            if (!args[1])
                goto bad;
            args++;
            if (do_param == 1)
                goto bad;
            if (!init_keygen_file(bio_err, &ctx, *args, e))
                goto end;
        } else if (!strcmp(*args, "-out")) {
            if (args[1]) {
                args++;
                outfile = *args;
            } else
                badarg = 1;
        } 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) {
            if (!args[1])
                goto bad;
            if (!ctx) {
                BIO_puts(bio_err, "No keytype specified\n");
                goto bad;
            } 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) {
            if (ctx)
                goto bad;
            do_param = 1;
        } else if (strcmp(*args, "-text") == 0)
            text = 1;
        else {
            cipher = EVP_get_cipherbyname(*args + 1);
            if (!cipher) {
                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
                badarg = 1;
            }
            if (do_param == 1)
                badarg = 1;
        }
        args++;
    }
    if (!ctx)
        badarg = 1;
    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,
                   "-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");
 #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"
                   "                   to value <value>\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");
        goto end;
    }
    if (!app_passwd(bio_err, passarg, NULL, &pass, NULL)) {
        BIO_puts(bio_err, "Error getting password\n");
        goto end;
    }
    if (outfile) {
        if (!(out = BIO_new_file(outfile, "wb"))) {
            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
            goto end;
        }
    } else {
        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 #endif
    }
    EVP_PKEY_CTX_set_cb(ctx, genpkey_cb);
    EVP_PKEY_CTX_set_app_data(ctx, bio_err);
    if (do_param) {
        if (EVP_PKEY_paramgen(ctx, &pkey) <= 0) {
            BIO_puts(bio_err, "Error generating parameters\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    } else {
        if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
            BIO_puts(bio_err, "Error generating key\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    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, NULL, pass);
    else if (outformat == FORMAT_ASN1)
        rv = i2d_PrivateKey_bio(out, pkey);
    else {
        BIO_printf(bio_err, "Bad format specified for key\n");
        goto end;
    }
    if (rv <= 0) {
        BIO_puts(bio_err, "Error writing key\n");
        ERR_print_errors(bio_err);
    }
    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) {
            BIO_puts(bio_err, "Error printing key\n");
            ERR_print_errors(bio_err);
        }
    }
    ret = 0;
 end:
    if (pkey)
        EVP_PKEY_free(pkey);
    if (ctx)
        EVP_PKEY_CTX_free(ctx);
    if (out)
        BIO_free_all(out);
    BIO_free(in);
    if (pass)
        OPENSSL_free(pass);
    return ret;
 }
 static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
                            const char *file, ENGINE *e)
 {
    BIO *pbio;
    EVP_PKEY *pkey = NULL;
    EVP_PKEY_CTX *ctx = NULL;
    if (*pctx) {
        BIO_puts(err, "Parameters already set!\n");
        return 0;
    }
    pbio = BIO_new_file(file, "r");
    if (!pbio) {
        BIO_printf(err, "Can't open parameter file %s\n", file);
        return 0;
    }
    pkey = PEM_read_bio_Parameters(pbio, NULL);
    BIO_free(pbio);
    if (!pkey) {
        BIO_printf(bio_err, "Error reading parameter file %s\n", file);
        return 0;
    }
    ctx = EVP_PKEY_CTX_new(pkey, e);
    if (!ctx)
        goto err;
    if (EVP_PKEY_keygen_init(ctx) <= 0)
        goto err;
    EVP_PKEY_free(pkey);
    *pctx = ctx;
    return 1;
 err:
    BIO_puts(err, "Error initializing context\n");
    ERR_print_errors(err);
    if (ctx)
        EVP_PKEY_CTX_free(ctx);
    if (pkey)
        EVP_PKEY_free(pkey);
    return 0;
 }
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
                 const char *algname, ENGINE *e, int do_param)
 {
    EVP_PKEY_CTX *ctx = NULL;
    const EVP_PKEY_ASN1_METHOD *ameth;
    ENGINE *tmpeng = NULL;
    int pkey_id;
    if (*pctx) {
        BIO_puts(err, "Algorithm already set!\n");
        return 0;
    }
    ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
 #ifndef OPENSSL_NO_ENGINE
    if (!ameth && e)
        ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
 #endif
    if (!ameth) {
        BIO_printf(bio_err, "Algorithm %s not found\n", algname);
        return 0;
    }
    ERR_clear_error();
    EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
 #ifndef OPENSSL_NO_ENGINE
    if (tmpeng)
        ENGINE_finish(tmpeng);
 #endif
    ctx = EVP_PKEY_CTX_new_id(pkey_id, e);
    if (!ctx)
        goto err;
    if (do_param) {
        if (EVP_PKEY_paramgen_init(ctx) <= 0)
            goto err;
    } else {
        if (EVP_PKEY_keygen_init(ctx) <= 0)
            goto err;
    }
    *pctx = ctx;
    return 1;
 err:
    BIO_printf(err, "Error initializing %s context\n", algname);
    ERR_print_errors(err);
    if (ctx)
        EVP_PKEY_CTX_free(ctx);
    return 0;
 }
 static int genpkey_cb(EVP_PKEY_CTX *ctx)
 {
    char c = '*';
    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 == 1)
        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;
 }
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -56,15 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #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>
 #include <string.h>
@@ -80,23 +71,26 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
-# define DEFBITS 2048
+#define DEFBITS	512
 #undef PROG
 #define PROG genrsa_main
-static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
+static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
    BN_GENCB cb;
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	int ret=1;
 	RSA *rsa=NULL;
 	int i,num=DEFBITS;
 	long l;
 #ifdef OPENSSL_FIPS
 	int use_x931 = 0;
 #endif
 	const EVP_CIPHER *enc=NULL;
 	unsigned long f4=RSA_F4;
 	char *outfile=NULL;
@@ -106,14 +100,8 @@ int MAIN(int argc, char **argv)
 #endif
 	char *inrand=NULL;
 	BIO *out=NULL;
    BIGNUM *bn = BN_new();
    RSA *rsa = NULL;
    if (!bn)
        goto err;
 	apps_startup();
    BN_GENCB_set(&cb, genrsa_cb, bio_err);
 	if (bio_err == NULL)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
@@ -121,34 +109,40 @@ 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)
+		{
-            break;
+		if (argc <= 0) break;
-        if (strcmp(*argv, "-out") == 0) {
+		if (strcmp(*argv,"-out") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } 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;
 #ifdef OPENSSL_FIPS
 		else if (strcmp(*argv,"-x931") == 0)
 			use_x931 = 1;
 #endif
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
-        else if (strcmp(*argv, "-rand") == 0) {
+		else if (strcmp(*argv,"-rand") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			}
 #ifndef OPENSSL_NO_DES
@@ -161,10 +155,6 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-idea") == 0)
 			enc=EVP_idea_cbc();
 #endif
 # ifndef OPENSSL_NO_SEED
        else if (strcmp(*argv, "-seed") == 0)
            enc = EVP_seed_cbc();
 # endif
 #ifndef OPENSSL_NO_AES
 		else if (strcmp(*argv,"-aes128") == 0)
 			enc=EVP_aes_128_cbc();
@@ -173,63 +163,38 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-aes256") == 0)
 			enc=EVP_aes_256_cbc();
 #endif
-# ifndef OPENSSL_NO_CAMELLIA
+		else if (strcmp(*argv,"-passout") == 0)
-        else if (strcmp(*argv, "-camellia128") == 0)
+			{
-            enc = EVP_camellia_128_cbc();
+			if (--argc < 1) goto bad;
        else if (strcmp(*argv, "-camellia192") == 0)
            enc = EVP_camellia_192_cbc();
        else if (strcmp(*argv, "-camellia256") == 0)
            enc = EVP_camellia_256_cbc();
 # endif
        else if (strcmp(*argv, "-passout") == 0) {
            if (--argc < 1)
                goto bad;
 			passargout= *(++argv);
-        } else
+			}
 		else
 			break;
 		argv++;
 		argc--;
 		}
-    if ((argc >= 1) && ((sscanf(*argv, "%d", &num) == 0) || (num < 0))) {
+	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
 		{
 bad:
 		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\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");
        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,
+		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
                   " -idea           encrypt the generated key with IDEA in cbc mode\n");
 # endif
 # ifndef OPENSSL_NO_SEED
        BIO_printf(bio_err, " -seed\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc camellia\n");
 #endif
 		BIO_printf(bio_err," -out file       output the key to 'file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-                   " -passout arg    output file pass phrase source\n");
+		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\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,
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
+		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
        BIO_printf(bio_err,
                   "                 load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"                 the random number generator\n");
 		goto err;
 		}
@@ -240,11 +205,13 @@ int MAIN(int argc, char **argv)
 		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
 		{
@@ -252,17 +219,20 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto err;
 			}
 		}
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-        && !RAND_status()) {
+		&& !RAND_status())
-        BIO_printf(bio_err,
+		{
-                   "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
@@ -270,25 +240,33 @@ int MAIN(int argc, char **argv)
 	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
 		num);
-# ifdef OPENSSL_NO_ENGINE
+#ifdef OPENSSL_FIPS
-    rsa = RSA_new();
+	if (use_x931)
-# else
+		{
-    rsa = RSA_new_method(e);
+		BIGNUM *pubexp;
 		pubexp = BN_new();
 		BN_set_word(pubexp, f4);
 		rsa = RSA_X931_generate_key(num, pubexp, genrsa_cb, bio_err);
 		BN_free(pubexp);
 		}
 	else
 #endif
-    if (!rsa)
+		rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);
        goto err;
    if (!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
        goto err;
 	app_RAND_write_file(NULL, bio_err);
-    /*
+	if (rsa == NULL)
-     * We need to do the following for when the base number size is < long,
+		{
-     * esp windows 3.1 :-(.
+		BIO_printf(bio_err, "Key Generation error\n");
-     */
+
 		goto err;
 		}
 	/* We need to do the following for when the base number size is <
 	 * long, esp windows 3.1 :-(. */
 	l=0L;
-    for (i = 0; i < rsa->e->top; i++) {
+	for (i=0; i<rsa->e->top; i++)
 		{
 #ifndef SIXTY_FOUR_BIT
 		l<<=BN_BITS4;
 		l<<=BN_BITS4;
@@ -301,45 +279,34 @@ int MAIN(int argc, char **argv)
 	cb_data.password = passout;
 	cb_data.prompt_info = outfile;
 	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
-                                         (pem_password_cb *)password_callback,
+		(pem_password_cb *)password_callback,&cb_data))
                                         &cb_data))
 		goto err;
 	}
 	ret=0;
 err:
-    if (bn)
+	if (rsa != NULL) RSA_free(rsa);
-        BN_free(bn);
+	if (out != NULL) BIO_free_all(out);
-    if (rsa)
+	if(passout) OPENSSL_free(passout);
        RSA_free(rsa);
    if (out)
        BIO_free_all(out);
    if (passout)
        OPENSSL_free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
 	{
 	char c='*';
-    if (p == 0)
+	if (p == 0) c='.';
-        c = '.';
+	if (p == 1) c='+';
-    if (p == 1)
+	if (p == 2) c='*';
-        c = '+';
+	if (p == 3) c='\n';
-    if (p == 2)
+	BIO_write((BIO *)arg,&c,1);
-        c = '*';
+	(void)BIO_flush((BIO *)arg);
    if (p == 3)
        c = '\n';
    BIO_write(cb->arg, &c, 1);
    (void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
    return 1;
 	}
 #else /* !OPENSSL_NO_RSA */
--- a/apps/install-apps.com
+++ b/apps/install-apps.com
@@ -1,107 +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
 $! 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
 $!
--- a/apps/install.com
+++ b/apps/install.com
@@ -0,0 +1,69 @@
 $! 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
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -6,12 +6,11 @@ $!               A-Com Computing, Inc.
 $!               byer@mail.all-net.net
 $!
 $!  Changes by Richard Levitte <richard@levitte.org>
 $!             Zoltan Arpadffy <zoli@polarhome.com>   
 $!
 $!  This command files compiles and creates all the various different
 $!  "application" programs for the different types of encryption for OpenSSL.
 $!  The EXE's are placed in the directory [.xxx.EXE.APPS] where "xxx" denotes
-$!  ALPHA, IA64 or VAX, depending on your machine architecture.
+$!  either AXP or VAX depending on your machine architecture.
 $!
 $!  It was written so it would try to determine what "C" compiler to
 $!  use or you can specify which "C" compiler to use.
@@ -25,7 +24,7 @@ $!	   VAXC	 For VAX C.
 $!	   DECC	 For DEC C.
 $!	   GNUC	 For GNU C.
 $!
-$!  If you don't specify a compiler, it will try to determine which
+$!  If you don't speficy 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
@@ -39,105 +38,64 @@ $!  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").LT.128)
+$ IF (F$GETSYI("CPU").GE.128)
 $ THEN
 $!
-$!  The Architecture Is VAX.
+$!  The Architecture Is AXP.
 $!
-$   ARCH = "VAX"
+$   ARCH := AXP
 $!
 $! Else...
 $!
 $ ELSE
 $!
-$!  The Architecture Is Alpha, IA64 or whatever comes in the future.
+$!  The Architecture Is VAX.
 $!
-$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
+$   ARCH := VAX
 $   IF (ARCH .EQS. "") THEN ARCH = "UNK"
 $!
 $! End The Architecture Check.
 $!
 $ ENDIF
 $!
 $ ARCHD = ARCH
 $ LIB32 = "32"
 $ OPT_FILE = ""
 $ POINTER_SIZE = ""
 $!
 $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
 $!$ PROGRAMS := VERIFY,ASN1PARS,REQ,DGST,DH,ENC,PASSWD,GENDH,ERRSTR,CA,CRL,-
 $!	      RSA,DSA,DSAPARAM,-
 $!	      X509,GENRSA,GENDSA,S_SERVER,S_CLIENT,SPEED,-
 $!	      S_TIME,VERSION,PKCS7,CRL2P7,SESS_ID,CIPHERS,NSEQ,
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
 $ GOSUB CHECK_OPTIONS
 $!
 $! 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 "Host system architecture: ''ARCHD'"
+$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
 $!
 $! Define The CRYPTO Library.
 $!
 $ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
 $!
 $! Define The SSL Library.
 $!
 $ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
 $!
 $! Define The OBJ Directory.
 $!
 $ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
 $!
 $! Check To See If The OBJ Directory Exists.
 $!
@@ -152,6 +110,10 @@ $! End The OBJ Directory Check.
 $!
 $ ENDIF
 $!
 $! Define The EXE Directory.
 $!
 $ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
 $!
 $! Check To See If The EXE Directory Exists.
 $!
 $ IF (F$PARSE(EXE_DIR).EQS."")
@@ -174,104 +136,81 @@ $!
 $ 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,"+-
 	      	"RSA,RSAUTL,DSA,DSAPARAM,EC,ECPARAM,"+-
 	      	"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,SRP"
 $!
 $ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT"
 $!
 $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
 	      "CA;PKCS7;CRL2P7;CRL;"+-
 	      "RSA;RSAUTL;DSA;DSAPARAM;"+-
 	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
 	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
 	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP;PRIME"
 $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
 	       CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
 	       RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
 	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
 	       S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
 	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ,ENGINE.OBJ,OCSP.OBJ,PRIME.OBJ
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
     TCPIP_PROGRAMS = ",OPENSSL,"
 $!$ APP_FILES := VERIFY;ASN1PARS;REQ;DGST;DH;ENC;GENDH;ERRSTR;CA;-
 $!	       PKCS7;CRL2P7;CRL;-
 $!	       RSA;DSA;DSAPARAM;-
 $!	       X509;GENRSA;GENDSA;-
 $!	       S_SERVER,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
 $!	       S_CLIENT,'OBJ_DIR'S_SOCKET.OBJ,'OBJ_DIR'S_CB.OBJ;-
 $!	       SPEED;-
 $!	       S_TIME,'OBJ_DIR'S_CB.OBJ;VERSION;SESS_ID;CIPHERS;NSEQ
 $!$ TCPIP_PROGRAMS = ",,"
 $!$ IF COMPILER .EQS. "VAXC" THEN -
 $!     TCPIP_PROGRAMS = ",S_SERVER,S_CLIENT,SESS_ID,CIPHERS,S_TIME,"
 $!
 $! Setup exceptional compilations
 $!
-$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
 $!
 $ PHASE := LIB
 $!
 $ RESTART: 
 $!
-$!  Define An App Counter And Set It To "0".
+$!  Define A File Counter And Set It To "0".
 $!
-$ APP_COUNTER = 0
+$ FILE_COUNTER = 0
 $!
-$!  Top Of The App Loop.
+$! Top Of The File Loop.
 $!
-$ NEXT_APP:
+$ NEXT_FILE:
 $!
-$!  Make The Application File Name
+$! O.K, Extract The File Name From The File List.
 $!
-$ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
+$ FILE_NAME0 = F$EDIT(F$ELEMENT(FILE_COUNTER,";",'PHASE'_FILES),"TRIM")
-$!
+$ FILE_NAME = F$EDIT(F$ELEMENT(0,",",FILE_NAME0),"TRIM")
-$!  Create The Executable File Name.
+$ EXTRA_OBJ = FILE_NAME0 - FILE_NAME
 $!
 $   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
 $!
 $! Check To See If We Are At The End Of The File List.
 $!
-$ IF (CURRENT_APP.EQS.",")
+$ IF (FILE_NAME0.EQS.";")
 $ THEN
 $   IF (PHASE.EQS."LIB")
 $   THEN
 $     PHASE := APP
 $     GOTO RESTART
 $   ELSE
-$     GOTO APP_DONE
+$     GOTO FILE_DONE
 $   ENDIF
 $ ENDIF
 $!
 $! Increment The Counter.
 $!
-$ APP_COUNTER = APP_COUNTER + 1
+$ FILE_COUNTER = FILE_COUNTER + 1
 $!
-$!  Decide if we're building the object files or not.
+$! Check to see if this program should actually be compiled
 $!
-$ IF (PHASE.EQS."LIB")
+$ IF PHASE .EQS. "APP" .AND. -
     ","+PROGRAMS+"," - (","+F$EDIT(FILE_NAME,"UPCASE")+",") .EQS. ","+PROGRAMS+","
 $ THEN
-$!
+$   GOTO NEXT_FILE
 $!  Define A Library File Counter And Set It To "-1".
 $!  -1 Means The Application File Name Is To Be Used.
 $!
 $   LIB_COUNTER = -1
 $!
 $!  Create a .OPT file for the object files
 $!
 $   OPEN /WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
 $!
 $!  Top Of The File Loop.
 $!
 $  NEXT_LIB:
 $!
 $!  O.K, Extract The File Name From The File List.
 $!
 $   IF LIB_COUNTER .GE. 0
 $   THEN
 $     FILE_NAME = F$EDIT(F$ELEMENT(LIB_COUNTER,",",LIB_'CURRENT_APP'),"TRIM")
 $   ELSE
 $     FILE_NAME = CURRENT_APP
 $ ENDIF
 $!
 $!  Check To See If We Are At The End Of The File List.
 $!
 $   IF (FILE_NAME.EQS.",")
 $   THEN
 $     CLOSE OBJECTS
 $     GOTO NEXT_APP
 $   ENDIF
 $!
 $!  Increment The Counter.
 $!
 $   LIB_COUNTER = LIB_COUNTER + 1
 $!
 $! Create The Source File Name.
 $!
 $ SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C"
@@ -279,7 +218,11 @@ $!
 $! Create The Object File Name.
 $!
 $ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
-$   ON WARNING THEN GOTO NEXT_LIB
+$!
 $! Create The Executable File Name.
 $!
 $ EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"
 $ ON WARNING THEN GOTO NEXT_FILE
 $!
 $! Check To See If The File We Want To Compile Actually Exists.
 $!
@@ -311,47 +254,64 @@ $   ENDIF
 $!
 $! Compile The File.
 $!
-$   ON ERROR THEN GOTO NEXT_LIB
+$ ON ERROR THEN GOTO NEXT_FILE
 $ IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
 $ THEN
 $   CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ELSE
 $   CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ENDIF
 $   WRITE OBJECTS OBJECT_FILE
 $!
-$   GOTO NEXT_LIB
+$ ON WARNING THEN GOTO NEXT_FILE
 $!
 $ IF (PHASE.EQS."LIB") 
 $ THEN 
 $   GOTO NEXT_FILE
 $ ENDIF
 $!
 $!  Check if this program works well without a TCPIP library
 $!
-$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - CURRENT_APP .NES. TCPIP_PROGRAMS
+$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - FILE_NAME .NES. TCPIP_PROGRAMS
 $ THEN
-$   WRITE SYS$OUTPUT CURRENT_APP," needs a TCP/IP library.  Can't link.  Skipping..."
+$   WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library.  Can't link.  Skipping..."
-$   GOTO NEXT_APP
+$   GOTO NEXT_FILE
 $ ENDIF
 $!
 $! Link The Program.
 $! Check To See If We Are To Link With A Specific TCP/IP Library.
 $!
-$ ON WARNING THEN GOTO NEXT_APP
+$ IF (TCPIP_LIB.NES."")
 $ THEN
 $!
 $! Don't Link With The RSAREF Routines And TCP/IP Library.
 $!
-$ LINK /'DEBUGGER' /'LINKMAP' /'TRACEBACK' /EXE='EXE_FILE' -
+$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-  'EXE_DIR''CURRENT_APP'.OPT /OPTIONS, -
+	'OBJECT_FILE''EXTRA_OBJ', -
-  'SSL_LIB' /LIBRARY, -
+        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
-  'CRYPTO_LIB' /LIBRARY -
+        'TCPIP_LIB','OPT_FILE'/OPTION
-  'TCPIP_LIB' -
+$!
-  'ZLIB_LIB' -
+$! Else...
-  ,'OPT_FILE' /OPTIONS
+$!
 $ ELSE
 $!
 $! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
 $!
 $   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 	'OBJECT_FILE''EXTRA_OBJ', -
        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
        'OPT_FILE'/OPTION
 $!
 $! End The TCP/IP Library Check.
 $!
 $ ENDIF
 $!
 $! Go Back And Do It Again.
 $!
-$ GOTO NEXT_APP
+$ GOTO NEXT_FILE
 $!
 $! All Done With This File.
 $!
-$ APP_DONE:
+$ FILE_DONE:
 $ EXIT:
 $!
 $! All Done, Time To Clean Up And Exit.
@@ -378,7 +338,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Against 
+! Default System Options File To Link Agianst 
 ! The Sharable VAX C Runtime Library.
 !
 SYS$SHARE:VAXCRTL.EXE/SHARE
@@ -407,7 +367,7 @@ $!
 $     CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Against 
+! Default System Options File To Link Agianst 
 ! The Sharable C Runtime Library.
 !
 GNU_CC:[000000]GCCLIB/LIBRARY
@@ -442,7 +402,7 @@ $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File To Link Against 
+! Default System Options File To Link Agianst 
 ! The Sharable DEC C Runtime Library.
 !
 SYS$SHARE:DECC$SHR.EXE/SHARE
@@ -452,19 +412,19 @@ $!    Else...
 $!
 $     ELSE
 $!
-$!      Create The non-VAX Linker Option File.
+$!      Create The AXP Linker Option File.
 $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
-! Default System Options File For non-VAX To Link Against 
+! Default System Options File For AXP To Link Agianst 
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
 SYS$SHARE:CMA$OPEN_RTL/SHARE
 $EOD
 $!
-$!    End The DEC C Option File Check.
+$!    End The VAX/AXP DEC C Option File Check.
 $!
 $     ENDIF
 $!
@@ -544,7 +504,6 @@ $!
 $!   P1 Is NODEBUG, So Compile Without Debugger Information.
 $!
 $    DEBUGGER  = "NODEBUG"
 $   LINKMAP = "NOMAP"
 $    TRACEBACK = "NOTRACEBACK" 
 $    GCC_OPTIMIZE = "OPTIMIZE"
 $    CC_OPTIMIZE = "OPTIMIZE"
@@ -563,7 +522,6 @@ $!
 $!    Compile With Debugger Information.
 $!
 $     DEBUGGER  = "DEBUG"
 $     LINKMAP = "MAP"
 $     TRACEBACK = "TRACEBACK"
 $     GCC_OPTIMIZE = "NOOPTIMIZE"
 $     CC_OPTIMIZE = "NOOPTIMIZE"
@@ -571,7 +529,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:"
@@ -584,7 +542,7 @@ $!    Time To EXIT.
 $!
 $     EXIT
 $!
-$!  End The Valid Argument Check.
+$!  End The Valid Arguement Check.
 $!
 $   ENDIF
 $!
@@ -592,87 +550,6 @@ $! 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."")
@@ -696,7 +573,7 @@ $   ELSE
 $!
 $!  Check To See If We Have VAXC Or DECC.
 $!
-$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
+$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
 $     THEN 
 $!
 $!      Looks Like DECC, Set To Use DECC.
@@ -773,67 +650,11 @@ $ 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 = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
+$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
-$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. ""
+$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
-$ THEN
+	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 $     IF CCDISABLEWARNINGS .NES. THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + ","
 $     CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS
 $ ENDIF
 $!
-$! Check To See If We Have A ZLIB Option.
+$!  Check To See If The User Entered A Valid Paramter.
 $!
 $ 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
@@ -856,13 +677,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=RELAXED"+ -
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-       "''POINTER_SIZE' /NOLIST /PREFIX=ALL" + -
+           "/NOLIST/PREFIX=ALL" + -
-       " /INCLUDE=(''CC_INCLUDES') " + CCEXTRAFLAGS
+	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -883,14 +704,14 @@ $!
 $!    Compile Using VAXC.
 $!
 $     CC = "CC"
-$     IF ARCH.NES."VAX"
+$     IF ARCH.EQS."AXP"
 $     THEN
-$	WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"
+$	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
 $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
+	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -899,7 +720,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -922,11 +743,11 @@ $!    Use GNU C...
 $!
 $     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
 $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-	   "/INCLUDE=(''CC_INCLUDES')" + CCEXTRAFLAGS
+	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -936,7 +757,7 @@ $!  Set up default defines
 $!
 $   CCDEFS = """FLAT_INC=1""," + CCDEFS
 $!
-$!  Else The User Entered An Invalid Argument.
+$!  Else The User Entered An Invalid Arguement.
 $!
 $ ELSE
 $!
@@ -968,7 +789,7 @@ $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
-$     TCPIP_LIB = ",SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS"
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
 $!
 $!    Done with SOCKETSHR
 $!
@@ -994,13 +815,13 @@ $   THEN
 $!
 $!    Set the library to use UCX.
 $!
-$     TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS"
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
-$       TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS"
+$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-	  TCPIP_LIB = ",SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS"
+	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
 $     ENDIF
 $!
 $!    Done with UCX
@@ -1014,7 +835,7 @@ $   THEN
 $!
 $!    Set the library to use TCPIP.
 $!
-$     TCPIP_LIB = ",SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS"
+$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
 $!
 $!    Done with TCPIP
 $!
@@ -1039,9 +860,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 Argument.
+$!  Else The User Entered An Invalid Arguement.
 $!
 $ ELSE
 $!
@@ -1067,18 +888,6 @@ $! Finish up the definition of CC.
 $!
 $ IF COMPILER .EQS. "DECC"
 $ THEN
 $!  Not all compiler versions support MAYLOSEDATA3.
 $   OPT_TEST = "MAYLOSEDATA3"
 $   DEFINE /USER_MODE SYS$ERROR NL:
 $   DEFINE /USER_MODE SYS$OUTPUT NL:
 $   'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT -
      /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL:
 $   IF ($SEVERITY)
 $   THEN
 $     IF CCDISABLEWARNINGS .NES. "" THEN -
        CCDISABLEWARNINGS = CCDISABLEWARNINGS+ ","
 $     CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST
 $   ENDIF
 $   IF CCDISABLEWARNINGS .NES. ""
 $   THEN
 $     CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
@@ -1161,24 +970,15 @@ $ RETURN
 $!
 $ CLEANUP:
 $!
-$! Restore the saved logical name OPENSSL, if it had a value.
+$! Restore the 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
 $!
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -1,7 +1,6 @@
 /* nseq.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 1999.
 * 1999.
 */
 /* ====================================================================
 * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -77,27 +76,22 @@ int MAIN(int argc, char **argv)
 	NETSCAPE_CERT_SEQUENCE *seq = NULL;
 	int i, ret = 1;
 	int badarg = 0;
-    if (bio_err == NULL)
+	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 	ERR_load_crypto_strings();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
-        if (!strcmp(*args, "-toseq"))
+		if (!strcmp (*args, "-toseq")) toseq = 1;
            toseq = 1;
 		else if (!strcmp (*args, "-in")) {
 			if (args[1]) {
 				args++;
 				infile = *args;
-            } else
+			} else badarg = 1;
                badarg = 1;
 		} else if (!strcmp (*args, "-out")) {
 			if (args[1]) {
 				args++;
 				outfile = *args;
-            } else
+			} else badarg = 1;
-                badarg = 1;
+		} else badarg = 1;
        } else
            badarg = 1;
 		args++;
 	}
@@ -113,15 +107,16 @@ int MAIN(int argc, char **argv)
 	if (infile) {
 		if (!(in = BIO_new_file (infile, "r"))) {
-            BIO_printf(bio_err, "Can't open input file %s\n", infile);
+			BIO_printf (bio_err,
 				 "Can't open input file %s\n", infile);
 			goto end;
 		}
-    } else
+	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 	if (outfile) {
 		if (!(out = BIO_new_file (outfile, "w"))) {
-            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 {
@@ -139,7 +134,8 @@ 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;
@@ -168,3 +164,4 @@ int MAIN(int argc, char **argv)
 	OPENSSL_EXIT(ret);
 }
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -21,17 +21,12 @@ oid_section		= new_oids
 [ new_oids ]
-# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# We can add new OIDs in here for use by 'ca' and 'req'.
 # Add a simple OID like this:
 # testoid1=1.2.3.4
 # Or use config file substitution like this:
 # testoid2=${testoid1}.5.6
 # Policies used by the TSA examples.
 tsa_policy1 = 1.2.3.4.1
 tsa_policy2 = 1.2.3.4.5.6
 tsa_policy3 = 1.2.3.4.5.7
 ####################################################################
 [ ca ]
 default_ca	= CA_default		# The default ca section
@@ -49,8 +44,8 @@ new_certs_dir	= $dir.newcerts]		# default place for new certs.
 certificate	= $dir]cacert.pem 	# The CA certificate
 serial		= $dir]serial. 		# The current serial number
-crlnumber	= $dir]crlnumber.	# the current crl number
+#crlnumber	= $dir]crlnumber.	# the current crl number must be
-					# must be commented out to leave a V1 CRL
+					# commented out to leave a V1 CRL
 crl		= $dir]crl.pem 		# The current CRL
 private_key	= $dir.private]cakey.pem# The private key
 RANDFILE	= $dir.private].rand	# private random number file
@@ -72,7 +67,7 @@ cert_opt 	= ca_default		# Certificate field options
 default_days	= 365			# how long to certify for
 default_crl_days= 30			# how long before next CRL
-default_md	= default		# use public key default MD
+default_md	= md5			# which md to use.
 preserve	= no			# keep passed DN ordering
 # A few difference way of specifying how similar the request should look
@@ -103,7 +98,7 @@ emailAddress		= optional
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
@@ -115,12 +110,13 @@ x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # This sets a mask for permitted string types. There are several options. 
 # default: PrintableString, T61String, BMPString.
-# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# pkix	 : PrintableString, BMPString.
-# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# utf8only: only UTF8Strings.
 # nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
 # MASK:XXXX a literal mask value.
-# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
-string_mask = utf8only
+# so use this option with caution!
 string_mask = nombstr
 # req_extensions = v3_req # The extensions to add to a certificate request
@@ -145,7 +141,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
-commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName			= Common Name (eg, YOUR name)
 commonName_max			= 64
 emailAddress			= Email Address
@@ -192,7 +188,7 @@ nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
+authorityKeyIdentifier=keyid,issuer:always
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
@@ -211,9 +207,6 @@ authorityKeyIdentifier=keyid,issuer
 #nsCaPolicyUrl
 #nsSslServerName
 # This is required for TSA certificates.
 # extendedKeyUsage = critical,timeStamping
 [ v3_req ]
 # Extensions to add to a certificate request
@@ -231,7 +224,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer
+authorityKeyIdentifier=keyid:always,issuer:always
 # This is what PKIX recommends but some broken software chokes on critical
 # extensions.
@@ -264,7 +257,7 @@ basicConstraints = CA:true
 # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
 # issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always
+authorityKeyIdentifier=keyid:always,issuer:always
 [ proxy_cert_ext ]
 # These extensions should be added when creating a proxy certificate
@@ -297,7 +290,7 @@ nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
+authorityKeyIdentifier=keyid,issuer:always
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
@@ -318,33 +311,3 @@ authorityKeyIdentifier=keyid,issuer
 # This really needs to be in place for it to be a proxy certificate.
 proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
 ####################################################################
 [ tsa ]
 default_tsa = tsa_config1	# the default TSA section
 [ tsa_config1 ]
 # These are used by the TSA reply generation only.
 dir		= sys\$disk:[.demoCA		# TSA root directory
 serial		= $dir]tsaserial.	# The current serial number (mandatory)
 crypto_device	= builtin		# OpenSSL engine to use for signing
 signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
 					# (optional)
 certs		= $dir.cacert.pem]	# Certificate chain to include in reply
 					# (optional)
 signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
 default_policy	= tsa_policy1		# Policy if request did not specify it
 					# (optional)
 other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
 digests		= md5, sha1		# Acceptable message digests (mandatory)
 accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
 clock_precision_digits  = 0	# number of digits after dot. (optional)
 ordering		= yes	# Is ordering defined for timestamps?
 				# (optional, default: no)
 tsa_name		= yes	# Must the TSA name be included in the reply?
 				# (optional, default: no)
 ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
 				# (optional, default: no)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -56,7 +56,7 @@
 * [including the GNU Public Licence.]
 */
 /* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -109,15 +109,14 @@
 *
 */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#define OPENSSL_C               /* tells apps.h to use complete
+#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
                                 * apps_startup() */
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/x509.h>
@@ -126,35 +125,33 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
-#define USE_SOCKETS             /* needed for the _O_BINARY defs in the MS
+#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
                                 * world */
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
 #endif
-/*
+/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
- * The LHASH callbacks ("hash" & "cmp") have been replaced by functions with
+ * base prototypes (we cast each variable inside the function to the required
- * the base prototypes (we cast each variable inside the function to the
+ * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
- * required type of "FUNCTION*"). This removes the necessity for
+ * functions. */
 * macro-generated wrapper functions.
 */
-static LHASH_OF(FUNCTION) *prog_init(void);
+/* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
-static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[]);
+static unsigned long MS_CALLBACK hash(const void *a_void);
-static void list_pkey(BIO *out);
+/* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
-static void list_cipher(BIO *out);
+static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
-static void list_md(BIO *out);
+static LHASH *prog_init(void );
 static int do_cmd(LHASH *prog,int argc,char *argv[]);
 char *default_config_file=NULL;
 /* Make sure there is only one when MONOLITH is defined */
 #ifdef MONOLITH
 CONF *config=NULL;
 BIO *bio_err=NULL;
 int in_FIPS_mode=0;
 #endif
 static void lock_dbg_cb(int mode, int type, const char *file, int line)
 	{
 	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
@@ -162,139 +159,105 @@ 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
-             * must not happen in a single-threaded program (would deadlock)
+			 * (would deadlock) */
             */
 			goto err;
 			}
 		modes[type] = rw;
-    } else if (mode & CRYPTO_UNLOCK) {
+		}
-        if (!modes[type]) {
+	else if (mode & CRYPTO_UNLOCK)
 		{
 		if (!modes[type])
 			{
 			errstr = "not locked";
 			goto err;
 			}
-        if (modes[type] != rw) {
+		if (modes[type] != rw)
 			{
 			errstr = (rw == CRYPTO_READ) ?
 				"CRYPTO_r_unlock on write lock" :
 				"CRYPTO_w_unlock on read lock";
 			}
 		modes[type] = 0;
-    } else {
+		}
 	else
 		{
 		errstr = "invalid mode";
 		goto err;
 		}
 err:
-    if (errstr) {
+	if (errstr)
 		{
 		/* we cannot use bio_err here */
-        fprintf(stderr,
+		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
                "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
 			errstr, mode, type, file, line);
 		}
 	}
 #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
 	char pname[PROG_NAME_SIZE+1];
 	FUNCTION f,*fp;
-    MS_STATIC const char *prompt;
+	MS_STATIC char *prompt,buf[1024];
    MS_STATIC char buf[1024];
 	char *to_free=NULL;
 	int n,i,ret=0;
 	int argc;
 	char **argv,*p;
-    LHASH_OF(FUNCTION) *prog = NULL;
+	LHASH *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;
 	in_FIPS_mode = 0;
 #ifdef OPENSSL_FIPS
 	if(getenv("OPENSSL_FIPS")) {
 		if (!FIPS_mode_set(1)) {
 			ERR_load_crypto_strings();
 			ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
 			EXIT(1);
 		}
 		in_FIPS_mode = 1;
 		}
 #endif
 	if (bio_err == NULL)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-    if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) { /* if not defined, use
+	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
-                                                   * compiled-in library
+		{
-                                                   * defaults */
+		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
-        if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))) {
+			{
 			CRYPTO_malloc_debug_init();
 			CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-        } else {
+			}
 		else
 			{
 			/* OPENSSL_DEBUG_MEMORY=off */
 			CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
 			}
@@ -308,19 +271,6 @@ 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 */
@@ -334,18 +284,11 @@ 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) {
            BIO_printf(bio_err, "WARNING: can't open config file: %s\n", p);
            ERR_clear_error();
 		NCONF_free(config);
 		config = NULL;
-        } else {
+		ERR_clear_error();
            ERR_print_errors(bio_err);
            NCONF_free(config);
            exit(1);
        }
 		}
 	prog=prog_init();
@@ -354,59 +297,55 @@ int main(int Argc, char *ARGV[])
 	program_name(Argv[0],pname,sizeof pname);
 	f.name=pname;
-    fp = lh_FUNCTION_retrieve(prog, &f);
+	fp=(FUNCTION *)lh_retrieve(prog,&f);
-    if (fp != NULL) {
+	if (fp != NULL)
 		{
 		Argv[0]=pname;
 		ret=fp->func(Argc,Argv);
 		goto end;
 		}
-    /*
+	/* ok, now check that there are not arguments, if there are,
-     * ok, now check that there are not arguments, if there are, run with
+	 * run with them, shifting the ssleay off the front */
-     * them, shifting the ssleay off the front
+	if (Argc != 1)
-     */
+		{
    if (Argc != 1) {
 		Argc--;
 		Argv++;
 		ret=do_cmd(prog,Argc,Argv);
-        if (ret < 0)
+		if (ret < 0) ret=0;
            ret = 0;
 		goto end;
 		}
 	/* ok, lets enter the old 'OpenSSL>' mode */
-    for (;;) {
+	for (;;)
 		{
 		ret=0;
 		p=buf;
 		n=sizeof buf;
 		i=0;
-        for (;;) {
+		for (;;)
 			{
 			p[0]='\0';
 			if (i++)
 				prompt=">";
-            else
+			else	prompt="OpenSSL> ";
                prompt = "OpenSSL> ";
 			fputs(prompt,stdout);
 			fflush(stdout);
-            if (!fgets(p, n, stdin))
+			fgets(p,n,stdin);
-                goto end;
+			if (p[0] == '\0') goto end;
            if (p[0] == '\0')
                goto end;
 			i=strlen(p);
-            if (i <= 1)
+			if (i <= 1) break;
-                break;
+			if (p[i-2] != '\\') break;
            if (p[i - 2] != '\\')
                break;
 			i-=2;
 			p+=i;
 			n-=i;
 			}
-        if (!chopup_args(&arg, buf, &argc, &argv))
+		if (!chopup_args(&arg,buf,&argc,&argv)) break;
            break;
 		ret=do_cmd(prog,argc,argv);
-        if (ret < 0) {
+		if (ret < 0)
 			{
 			ret=0;
 			goto end;
 			}
@@ -419,63 +358,44 @@ 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)
+	if (prog != NULL) lh_free(prog);
-        lh_FUNCTION_free(prog);
+	if (arg.data != NULL) OPENSSL_free(arg.data);
    if (arg.data != NULL)
        OPENSSL_free(arg.data);
 #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);
-    if (bio_err != NULL) {
+	if (bio_err != NULL)
 		{
 		BIO_free(bio_err);
 		bio_err=NULL;
 		}
 	OPENSSL_EXIT(ret);
 	}
 #define LIST_STANDARD_COMMANDS "list-standard-commands"
 #define LIST_MESSAGE_DIGEST_COMMANDS "list-message-digest-commands"
 #define LIST_MESSAGE_DIGEST_ALGORITHMS "list-message-digest-algorithms"
 #define LIST_CIPHER_COMMANDS "list-cipher-commands"
 #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[])
+static int do_cmd(LHASH *prog, int argc, char *argv[])
 	{
 	FUNCTION f,*fp;
 	int i,ret=1,tp,nl;
-    if ((argc <= 0) || (argv[0] == NULL)) {
+	if ((argc <= 0) || (argv[0] == NULL))
-        ret = 0;
+		{ ret=0; goto end; }
        goto end;
    }
 	f.name=argv[0];
-    fp = lh_FUNCTION_retrieve(prog, &f);
+	fp=(FUNCTION *)lh_retrieve(prog,&f);
-    if (fp == NULL) {
+	if (fp != NULL)
-        if (EVP_get_digestbyname(argv[0])) {
+		{
            f.type = FUNC_TYPE_MD;
            f.func = dgst_main;
            fp = &f;
        } else if (EVP_get_cipherbyname(argv[0])) {
            f.type = FUNC_TYPE_CIPHER;
            f.func = enc_main;
            fp = &f;
        }
    }
    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
 		{
@@ -484,25 +404,26 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 		}
 #endif
 		f.name=argv[0]+3;
-        ret = (lh_FUNCTION_retrieve(prog, &f) != NULL);
+		ret = (lh_retrieve(prog,&f) != NULL);
 		if (!ret)
 			BIO_printf(bio_stdout, "%s\n", argv[0]);
 		else
 			BIO_printf(bio_stdout, "%s\n", argv[0]+3);
 		BIO_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_COMMANDS) == 0) ||
+		{
               (strcmp(argv[0], LIST_CIPHER_ALGORITHMS) == 0) ||
               (strcmp(argv[0], LIST_PUBLIC_KEY_ALGORITHMS) == 0)) {
 		int list_type;
 		BIO *bio_stdout;
@@ -510,12 +431,6 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 			list_type = FUNC_TYPE_GENERAL;
 		else if (strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0)
 			list_type = FUNC_TYPE_MD;
        else if (strcmp(argv[0], LIST_MESSAGE_DIGEST_ALGORITHMS) == 0)
            list_type = FUNC_TYPE_MD_ALG;
        else if (strcmp(argv[0], LIST_PUBLIC_KEY_ALGORITHMS) == 0)
            list_type = FUNC_TYPE_PKEY;
        else if (strcmp(argv[0], LIST_CIPHER_ALGORITHMS) == 0)
            list_type = FUNC_TYPE_CIPHER_ALG;
 		else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
 			list_type = FUNC_TYPE_CIPHER;
 		bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
@@ -526,59 +441,45 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 		}
 #endif
        if (!load_config(bio_err, NULL))
            goto end;
        if (list_type == FUNC_TYPE_PKEY)
            list_pkey(bio_stdout);
        if (list_type == FUNC_TYPE_MD_ALG)
            list_md(bio_stdout);
        if (list_type == FUNC_TYPE_CIPHER_ALG)
            list_cipher(bio_stdout);
        else {
 		for (fp=functions; fp->name != NULL; fp++)
 			if (fp->type == list_type)
 				BIO_printf(bio_stdout, "%s\n", fp->name);
        }
 		BIO_free_all(bio_stdout);
 		ret=0;
 		goto end;
-    } else {
+		}
 	else
 		{
 		BIO_printf(bio_err,"openssl:Error: '%s' is an invalid command.\n",
 			argv[0]);
 		BIO_printf(bio_err, "\nStandard commands");
 		i=0;
 		tp=0;
-        for (fp = functions; fp->name != NULL; fp++) {
+		for (fp=functions; fp->name != NULL; fp++)
 			{
 			nl=0;
 #ifdef OPENSSL_NO_CAMELLIA
 			if (((i++) % 5) == 0)
 #else
            if (((i++) % 4) == 0)
 #endif
 				{
 				BIO_printf(bio_err,"\n");
 				nl=1;
 				}
-            if (fp->type != tp) {
+			if (fp->type != tp)
 				{
 				tp=fp->type;
-                if (!nl)
+				if (!nl) BIO_printf(bio_err,"\n");
-                    BIO_printf(bio_err, "\n");
+				if (tp == FUNC_TYPE_MD)
-                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,
+					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
                               "\nCipher commands (see the `enc' command for more details)\n");
 					}
 				}
 #ifdef OPENSSL_NO_CAMELLIA
 			BIO_printf(bio_err,"%-15s",fp->name);
 #else
            BIO_printf(bio_err, "%-18s", fp->name);
 #endif
 			}
 		BIO_printf(bio_err,"\n\n");
 		ret=0;
@@ -597,100 +498,34 @@ static int SortFnByName(const void *_f1, const void *_f2)
    return strcmp(f1->name,f2->name);
    }
-static void list_pkey(BIO *out)
+static LHASH *prog_init(void)
 	{
-    int i;
+	LHASH *ret;
    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) {
            BIO_printf(out, "Name: %s\n", OBJ_nid2ln(pkey_id));
            BIO_printf(out, "\tType: Alias to %s\n",
                       OBJ_nid2ln(pkey_base_id));
        } else {
            BIO_printf(out, "Name: %s\n", pinfo);
            BIO_printf(out, "\tType: %s Algorithm\n",
                       pkey_flags & ASN1_PKEY_DYNAMIC ?
                       "External" : "Builtin");
            BIO_printf(out, "\tOID: %s\n", OBJ_nid2ln(pkey_id));
            if (pem_str == NULL)
                pem_str = "(none)";
            BIO_printf(out, "\tPEM string: %s\n", pem_str);
        }
    }
 }
 static void list_cipher_fn(const EVP_CIPHER *c,
                           const char *from, const char *to, void *arg)
 {
    if (c)
        BIO_printf(arg, "%s\n", EVP_CIPHER_name(c));
    else {
        if (!from)
            from = "<undefined>";
        if (!to)
            to = "<undefined>";
        BIO_printf(arg, "%s => %s\n", from, to);
    }
 }
 static void list_cipher(BIO *out)
 {
    EVP_CIPHER_do_all_sorted(list_cipher_fn, out);
 }
 static void list_md_fn(const EVP_MD *m,
                       const char *from, const char *to, void *arg)
 {
    if (m)
        BIO_printf(arg, "%s\n", EVP_MD_name(m));
    else {
        if (!from)
            from = "<undefined>";
        if (!to)
            to = "<undefined>";
        BIO_printf(arg, "%s => %s\n", from, to);
    }
 }
 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)
 {
    return strncmp(a->name, b->name, 8);
 }
 static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION)
 static unsigned long MS_CALLBACK function_hash(const FUNCTION * a)
 {
    return lh_strhash(a->name);
 }
 static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION)
 static LHASH_OF(FUNCTION) *prog_init(void)
 {
    LHASH_OF(FUNCTION) *ret;
 	FUNCTION *f;
-    size_t i;
+	int 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)
+	if ((ret=lh_new(hash, cmp)) == NULL)
 		return(NULL);
 	for (f=functions; f->name != NULL; f++)
-        (void)lh_FUNCTION_insert(ret, f);
+		lh_insert(ret,f);
 	return(ret);
 	}
 /* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
 static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
 	{
 	return(strncmp(((FUNCTION *)a_void)->name,
 			((FUNCTION *)b_void)->name,8));
 	}
 /* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
 static unsigned long MS_CALLBACK hash(const void *a_void)
 	{
 	return(lh_strhash(((FUNCTION *)a_void)->name));
 	}
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -21,17 +21,12 @@ oid_section		= new_oids
 [ new_oids ]
-# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# We can add new OIDs in here for use by 'ca' and 'req'.
 # Add a simple OID like this:
 # testoid1=1.2.3.4
 # Or use config file substitution like this:
 # testoid2=${testoid1}.5.6
 # Policies used by the TSA examples.
 tsa_policy1 = 1.2.3.4.1
 tsa_policy2 = 1.2.3.4.5.6
 tsa_policy3 = 1.2.3.4.5.7
 ####################################################################
 [ ca ]
 default_ca	= CA_default		# The default ca section
@@ -49,8 +44,8 @@ new_certs_dir	= $dir/newcerts		# default place for new certs.
 certificate	= $dir/cacert.pem 	# The CA certificate
 serial		= $dir/serial 		# The current serial number
-crlnumber	= $dir/crlnumber	# the current crl number
+#crlnumber	= $dir/crlnumber	# the current crl number must be
-					# must be commented out to leave a V1 CRL
+					# commented out to leave a V1 CRL
 crl		= $dir/crl.pem 		# The current CRL
 private_key	= $dir/private/cakey.pem# The private key
 RANDFILE	= $dir/private/.rand	# private random number file
@@ -72,7 +67,7 @@ cert_opt 	= ca_default		# Certificate field options
 default_days	= 365			# how long to certify for
 default_crl_days= 30			# how long before next CRL
-default_md	= default		# use public key default MD
+default_md	= md5			# which md to use.
 preserve	= no			# keep passed DN ordering
 # A few difference way of specifying how similar the request should look
@@ -103,7 +98,7 @@ emailAddress		= optional
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
@@ -115,12 +110,13 @@ x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # This sets a mask for permitted string types. There are several options. 
 # default: PrintableString, T61String, BMPString.
-# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# pkix	 : PrintableString, BMPString.
-# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# utf8only: only UTF8Strings.
 # nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
 # MASK:XXXX a literal mask value.
-# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
-string_mask = utf8only
+# so use this option with caution!
 string_mask = nombstr
 # req_extensions = v3_req # The extensions to add to a certificate request
@@ -145,7 +141,7 @@ localityName			= Locality Name (eg, city)
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
-commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName			= Common Name (eg, YOUR name)
 commonName_max			= 64
 emailAddress			= Email Address
@@ -192,7 +188,7 @@ nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
+authorityKeyIdentifier=keyid,issuer:always
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
@@ -211,9 +207,6 @@ authorityKeyIdentifier=keyid,issuer
 #nsCaPolicyUrl
 #nsSslServerName
 # This is required for TSA certificates.
 # extendedKeyUsage = critical,timeStamping
 [ v3_req ]
 # Extensions to add to a certificate request
@@ -231,7 +224,7 @@ keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer
+authorityKeyIdentifier=keyid:always,issuer:always
 # This is what PKIX recommends but some broken software chokes on critical
 # extensions.
@@ -264,7 +257,7 @@ basicConstraints = CA:true
 # Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
 # issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always
+authorityKeyIdentifier=keyid:always,issuer:always
 [ proxy_cert_ext ]
 # These extensions should be added when creating a proxy certificate
@@ -297,7 +290,7 @@ nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
+authorityKeyIdentifier=keyid,issuer:always
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
@@ -318,33 +311,3 @@ authorityKeyIdentifier=keyid,issuer
 # This really needs to be in place for it to be a proxy certificate.
 proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
 ####################################################################
 [ tsa ]
 default_tsa = tsa_config1	# the default TSA section
 [ tsa_config1 ]
 # These are used by the TSA reply generation only.
 dir		= ./demoCA		# TSA root directory
 serial		= $dir/tsaserial	# The current serial number (mandatory)
 crypto_device	= builtin		# OpenSSL engine to use for signing
 signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
 					# (optional)
 certs		= $dir/cacert.pem	# Certificate chain to include in reply
 					# (optional)
 signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
 default_policy	= tsa_policy1		# Policy if request did not specify it
 					# (optional)
 other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
 digests		= md5, sha1		# Acceptable message digests (mandatory)
 accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
 clock_precision_digits  = 0	# number of digits after dot. (optional)
 ordering		= yes	# Is ordering defined for timestamps?
 				# (optional, default: no)
 tsa_name		= yes	# Must the TSA name be included in the reply?
 				# (optional, default: no)
 ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
 				# (optional, default: no)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -22,9 +22,11 @@
 # 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,
@@ -38,12 +40,10 @@ 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,
+	char *passwd, BIO *out, int quiet, int table, int reverse,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
                     int useapr1);
-/*-
+/* -crypt        - standard Unix password algorithm (default)
 * -crypt        - standard Unix password algorithm (default)
 * -1            - MD5-based password algorithm
 * -apr1         - MD5-based password algorithm, Apache variant
 * -salt string  - salt
@@ -94,32 +94,45 @@ 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) {
+			}
-            if ((argv[i + 1] != NULL) && !pw_source_defined) {
+		else if (strcmp(argv[i], "-in") == 0)
 			{
 			if ((argv[i+1] != NULL) && !pw_source_defined)
 				{
 				pw_source_defined = 1;
 				infile = argv[++i];
-            } else
+				}
 			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-stdin") == 0) {
+			}
-            if (!pw_source_defined) {
+		else if (strcmp(argv[i], "-stdin") == 0)
 			{
 			if (!pw_source_defined)
 				{
 				pw_source_defined = 1;
 				in_stdin = 1;
-            } else
+				}
 			else
 				badopt = 1;
-        } else if (strcmp(argv[i], "-noverify") == 0)
+			}
 		else if (strcmp(argv[i], "-noverify") == 0)
 			in_noverify = 1;
 		else if (strcmp(argv[i], "-quiet") == 0)
 			quiet = 1;
@@ -135,7 +148,8 @@ int MAIN(int argc, char **argv)
 			pw_source_defined = 1;
 			passwds = &argv[i];
 			opt_done = 1;
-        } else
+			}
 		else
 			badopt = 1;
 		}
@@ -146,32 +160,27 @@ int MAIN(int argc, char **argv)
 	/* reject unsupported algorithms */
 #ifdef OPENSSL_NO_DES
-    if (usecrypt)
+	if (usecrypt) badopt = 1;
        badopt = 1;
 #endif
 #ifdef NO_MD5CRYPT_1
-    if (use1 || useapr1)
+	if (use1 || useapr1) badopt = 1;
        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,
+		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
                   "-crypt             standard Unix password algorithm (default)\n");
 #endif
 #ifndef NO_MD5CRYPT_1
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-1                 MD5-based password algorithm\n");
-                   "-1                 MD5-based password algorithm\n");
+		BIO_printf(bio_err, "-apr1              MD5-based password algorithm, Apache variant\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,
+		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
                   "-noverify          never verify when reading password from terminal\n");
 		BIO_printf(bio_err, "-quiet             no warnings\n");
 		BIO_printf(bio_err, "-table             format output as table\n");
 		BIO_printf(bio_err, "-reverse           switch table columns\n");
@@ -179,15 +188,19 @@ int MAIN(int argc, char **argv)
 		goto err;
 		}
-    if ((infile != NULL) || in_stdin) {
+	if ((infile != NULL) || in_stdin)
 		{
 		in = BIO_new(BIO_s_file());
 		if (in == NULL)
 			goto err;
-        if (infile != NULL) {
+		if (infile != NULL)
 			{
 			assert(in_stdin == 0);
 			if (BIO_read_filename(in, infile) <= 0)
 				goto err;
-        } else {
+			}
 		else
 			{
 			assert(in_stdin);
 			BIO_set_fp(in, stdin, BIO_NOCLOSE);
 			}
@@ -196,59 +209,61 @@ int MAIN(int argc, char **argv)
 	if (usecrypt)
 		pw_maxlen = 8;
 	else if (use1 || useapr1)
-        pw_maxlen = 256;        /* arbitrary limit, should be enough for most
+		pw_maxlen = 256; /* arbitrary limit, should be enough for most passwords */
                                 * passwords */
-    if (passwds == NULL) {
+	if (passwds == NULL)
 		{
 		/* no passwords on the command line */
 		passwd_malloc_size = pw_maxlen + 2;
-        /*
+		/* longer than necessary so that we can warn about truncation */
         * longer than necessary so that we can warn about truncation
         */
 		passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size);
 		if (passwd_malloc == NULL)
 			goto err;
 		}
-    if ((in == NULL) && (passwds == NULL)) {
+	if ((in == NULL) && (passwds == NULL))
 		{
 		/* build a null-terminated list */
 		static char *passwds_static[2] = {NULL, NULL};
 		passwds = passwds_static;
 		if (in == NULL)
-            if (EVP_read_pw_string
+			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
                (passwd_malloc, passwd_malloc_size, "Password: ",
                 !(passed_salt || in_noverify)) != 0)
 				goto err;
 		passwds[0] = passwd_malloc;
 		}
-    if (in == NULL) {
+	if (in == NULL)
 		{
 		assert(passwds != NULL);
 		assert(*passwds != NULL);
-        do {                    /* loop over list of passwords */
+		do /* loop over list of passwords */
 			{
 			passwd = *passwds++;
 			if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-                           quiet, table, reverse, pw_maxlen, usecrypt, use1,
+				quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
                           useapr1))
 				goto err;
 			}
 		while (*passwds != NULL);
-    } else
+		}
 	else
 		/* in != NULL */
 		{
 		int done;
 		assert (passwd != NULL);
-        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
@@ -257,8 +272,7 @@ int MAIN(int argc, char **argv)
 					}
 				if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, out,
-                               quiet, table, reverse, pw_maxlen, usecrypt,
+					quiet, table, reverse, pw_maxlen, usecrypt, use1, useapr1))
                               use1, useapr1))
 					goto err;
 				}
 			done = (r <= 0);
@@ -281,24 +295,24 @@ int MAIN(int argc, char **argv)
 	OPENSSL_EXIT(ret);
 	}
 #ifndef NO_MD5CRYPT_1
-/*
+/* MD5-based password algorithm (should probably be available as a library
- * MD5-based password algorithm (should probably be available as a library
+ * function; then the static buffer would not be acceptable).
- * function; then the static buffer would not be acceptable). For magic
+ * For magic string "1", this should be compatible to the MD5-based BSD
- * string "1", this should be compatible to the MD5-based BSD password
+ * password algorithm.
- * algorithm. For 'magic' string "apr1", this is compatible to the MD5-based
+ * For 'magic' string "apr1", this is compatible to the MD5-based Apache
- * Apache password algorithm. (Apparently, the Apache password algorithm is
+ * password algorithm.
- * identical except that the 'magic' string was changed -- the laziest
+ * (Apparently, the Apache password algorithm is identical except that the
- * application of the NIH principle I've ever encountered.)
+ * 'magic' string was changed -- the laziest application of the NIH principle
 * I've ever encountered.)
 */
 static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	{
-    /* "$apr1$..salt..$.......md5hash..........\0" */
+	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
    static char out_buf[6 + 9 + 24 + 2];
 	unsigned char buf[MD5_DIGEST_LENGTH];
 	char *salt_out;
-    int n;
+	int n, i;
    unsigned int i;
 	EVP_MD_CTX md,md2;
 	size_t passwd_len, salt_len;
@@ -334,21 +348,23 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	EVP_DigestUpdate(&md, buf, i);
 	n = passwd_len;
-    while (n) {
+	while (n)
 		{
 		EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
 		n >>= 1;
 		}
 	EVP_DigestFinal_ex(&md, buf, NULL);
-    for (i = 0; i < 1000; i++) {
+	for (i = 0; i < 1000; i++)
 		{
 		EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
-        EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *)passwd : buf,
+		EVP_DigestUpdate(&md2, (i & 1) ? (unsigned char *) passwd : buf,
 		                       (i & 1) ? passwd_len : sizeof buf);
 		if (i % 3)
 			EVP_DigestUpdate(&md2, salt_out, salt_len);
 		if (i % 7)
 			EVP_DigestUpdate(&md2, passwd, passwd_len);
-        EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *)passwd,
+		EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned char *) passwd,
 		                       (i & 1) ? sizeof buf : passwd_len);
 		EVP_DigestFinal_ex(&md2, buf, NULL);
 		}
@@ -362,13 +378,11 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 		char *output;
 		/* silly output permutation */
-        for (dest = 0, source = 0; dest < 14;
+		for (dest = 0, source = 0; dest < 14; dest++, source = (source + 6) % 17)
             dest++, source = (source + 6) % 17)
 			buf_perm[dest] = buf[source];
 		buf_perm[14] = buf[5];
 		buf_perm[15] = buf[11];
-#  ifndef PEDANTIC              /* Unfortunately, this generates a "no
+#ifndef PEDANTIC /* Unfortunately, this generates a "no effect" warning */
                                 * effect" warning */
 		assert(16 == sizeof buf_perm);
 #endif
@@ -377,7 +391,8 @@ 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)];
@@ -397,10 +412,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,
+	char *passwd, BIO *out,	int quiet, int table, int reverse,
-                     int reverse, size_t pw_maxlen, int usecrypt, int use1,
+	size_t pw_maxlen, int usecrypt, int use1, int useapr1)
                     int useapr1)
 	{
 	char *hash = NULL;
@@ -408,10 +423,13 @@ 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;
@@ -422,17 +440,19 @@ 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 back
+			ascii2ebcdic(*salt_p, *salt_p, 2); /* des_crypt will convert
-                                                * to ASCII */
+			                                    * back 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;
@@ -450,14 +470,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	assert(*salt_p != NULL);
 	/* truncate password if necessary */
-    if ((strlen(passwd) > pw_maxlen)) {
+	if ((strlen(passwd) > pw_maxlen))
 		{
 		if (!quiet)
-            /*
+			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);
             * XXX: really we should know how to print a size_t, not cast it
             */
            BIO_printf(bio_err,
                       "Warning: truncating password to %u characters\n",
                       (unsigned)pw_maxlen);
 		passwd[pw_maxlen] = 0;
 		}
 	assert(strlen(passwd) <= pw_maxlen);
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -71,8 +71,7 @@
 #undef PROG
 #define PROG	pkcs7_main
-/*-
+/* -inform arg	- input format - default PEM (DER or PEM)
 * -inform arg  - input format - default PEM (DER or PEM)
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
@@ -83,12 +82,15 @@ 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;
 	int informat,outformat;
 	char *infile,*outfile,*prog;
-    int print_certs = 0, text = 0, noout = 0, p7_print = 0;
+	int print_certs=0,text=0,noout=0;
 	int ret=1;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
@@ -111,39 +113,43 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } else if (strcmp(*argv, "-noout") == 0)
+			}
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		else if (strcmp(*argv,"-text") == 0)
 			text=1;
        else if (strcmp(*argv, "-print") == 0)
            p7_print = 1;
 		else if (strcmp(*argv,"-print_certs") == 0)
 			print_certs=1;
 #ifndef OPENSSL_NO_ENGINE
-        else if (strcmp(*argv, "-engine") == 0) {
+		else if (strcmp(*argv,"-engine") == 0)
-            if (--argc < 1)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
-        else {
+		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
@@ -152,7 +158,8 @@ 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");
@@ -160,14 +167,11 @@ int MAIN(int argc, char **argv)
 		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,
+		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
-                   " -print_certs  print any certs or crl in the input\n");
+		BIO_printf(bio_err," -text         print full details of certificates\n");
        BIO_printf(bio_err,
                   " -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,
+		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
                   " -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		ret = 1;
 		goto end;
@@ -176,22 +180,25 @@ int MAIN(int argc, char **argv)
 	ERR_load_crypto_strings();
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 	in=BIO_new(BIO_s_file());
 	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) {
+		{
-            BIO_printf(bio_err, "unable to load input file\n");
+		if (BIO_read_filename(in,infile) <= 0)
-            ERR_print_errors(bio_err);
+		if (in == NULL)
 			{
 			perror(infile);
 			goto end;
 			}
 		}
@@ -200,17 +207,20 @@ int MAIN(int argc, char **argv)
 		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
 		{
@@ -218,22 +228,24 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-    if (p7_print)
+	if (print_certs)
-        PKCS7_print_ctx(out, p7, 0, NULL);
+		{
    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;
@@ -246,31 +258,31 @@ int MAIN(int argc, char **argv)
 			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)
+				if(text) X509_print(out, x);
-                    X509_print(out, x);
+				else dump_cert_text(out, x);
                else
                    dump_cert_text(out, x);
-                if (!noout)
+				if(!noout) PEM_write_bio_X509(out,x);
                    PEM_write_bio_X509(out, x);
 				BIO_puts(out,"\n");
 				}
 			}
-        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)
+				if(!noout)PEM_write_bio_X509_CRL(out,crl);
                    PEM_write_bio_X509_CRL(out, crl);
 				BIO_puts(out,"\n");
 				}
 			}
@@ -289,7 +301,8 @@ int MAIN(int argc, char **argv)
 			goto end;
 			}
-        if (!i) {
+		if (!i)
 			{
 			BIO_printf(bio_err,"unable to write pkcs7 object\n");
 			ERR_print_errors(bio_err);
 			goto end;
@@ -297,12 +310,9 @@ int MAIN(int argc, char **argv)
 	}
 	ret=0;
 end:
-    if (p7 != NULL)
+	if (p7 != NULL) PKCS7_free(p7);
-        PKCS7_free(p7);
+	if (in != NULL) BIO_free(in);
-    if (in != NULL)
+	if (out != NULL) BIO_free_all(out);
        BIO_free(in);
    if (out != NULL)
        BIO_free_all(out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -1,7 +1,6 @@
 /* pkcs8.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 1999-2004.
 * 1999-2004.
 */
 /* ====================================================================
 * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
@@ -81,18 +80,16 @@ int MAIN(int argc, char **argv)
 	int informat, outformat;
 	int p8_broken = PKCS8_OK;
 	int nocrypt = 0;
-    X509_SIG *p8 = NULL;
+	X509_SIG *p8;
-    PKCS8_PRIV_KEY_INFO *p8inf = NULL;
+	PKCS8_PRIV_KEY_INFO *p8inf;
 	EVP_PKEY *pkey=NULL;
 	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
 	int badarg = 0;
    int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
-    if (bio_err == NULL)
+	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 	if (!load_config(bio_err, NULL))
 		goto end;
@@ -103,50 +100,59 @@ 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 (args[1]) {
+		if (!strcmp(*args,"-v2"))
 			{
 			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")) {
+			}
-            if (args[1]) {
+		else if (!strcmp(*args,"-v1"))
 			{
 			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
+				}
-                badarg = 1;
+			else
        } 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
+		else if (!strcmp(*args,"-inform"))
-                badarg = 1;
+			{
-        } else if (!strcmp(*args, "-inform")) {
+			if (args[1])
-            if (args[1]) {
+				{
 				args++;
 				informat=str2fmt(*args);
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-outform")) {
+			}
-            if (args[1]) {
+		else if (!strcmp(*args,"-outform"))
 			{
 			if (args[1])
 				{
 				args++;
 				outformat=str2fmt(*args);
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-topk8"))
+			}
 		else if (!strcmp (*args, "-topk8"))
 			topk8 = 1;
 		else if (!strcmp (*args, "-noiter"))
 			iter = 1;
@@ -158,97 +164,106 @@ 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])
+			{
-                goto bad;
+			if (!args[1]) goto bad;
 			passargin= *(++args);
-        } else if (!strcmp(*args, "-passout")) {
+			}
-            if (!args[1])
+		else if (!strcmp(*args,"-passout"))
-                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])
+			{
-                goto bad;
+			if (!args[1]) 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
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else if (!strcmp(*args, "-out")) {
+			}
-            if (args[1]) {
+		else if (!strcmp (*args, "-out"))
 			{
 			if (args[1])
 				{
 				args++;
 				outfile = *args;
-            } else
+				}
-                badarg = 1;
+			else badarg = 1;
-        } else
+			}
-            badarg = 1;
+		else badarg = 1;
 		args++;
 		}
-    if (badarg) {
+	if (badarg)
 		{
 		bad:
 		BIO_printf(bio_err, "Usage pkcs8 [options]\n");
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, "-in file        input file\n");
 		BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
                   "-passin arg     input file pass phrase source\n");
 		BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
 		BIO_printf(bio_err, "-out file       output file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
                   "-passout arg    output file pass phrase source\n");
 		BIO_printf(bio_err, "-topk8          output PKCS8 file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
-                   "-nooct          use (nonstandard) no octet format\n");
+		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
                   "-embed          use (nonstandard) embedded DSA parameters format\n");
        BIO_printf(bio_err,
                   "-nsdb           use (nonstandard) DSA Netscape DB format\n");
 		BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
-                   "-nocrypt        use or expect unencrypted private key\n");
+		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
                   "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
        BIO_printf(bio_err,
                   "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
-        goto end;
+		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;
+		return 1;
 		}
 	if ((pbe_nid == -1) && !cipher)
 		pbe_nid = NID_pbeWithMD5AndDES_CBC;
-    if (infile) {
+	if (infile)
-        if (!(in = BIO_new_file(infile, "rb"))) {
+		{
-            BIO_printf(bio_err, "Can't open input file %s\n", infile);
+		if (!(in = BIO_new_file(infile, "rb")))
-            goto end;
+			{
 			BIO_printf(bio_err,
 				 "Can't open input file %s\n", infile);
 			return (1);
 			}
-    } else
+		}
 	else
 		in = BIO_new_fp (stdin, BIO_NOCLOSE);
-    if (outfile) {
+	if (outfile)
-        if (!(out = BIO_new_file(outfile, "wb"))) {
+		{
-            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
+		if (!(out = BIO_new_file (outfile, "wb")))
-            goto end;
+			{
 			BIO_printf(bio_err,
 				 "Can't open output file %s\n", outfile);
 			return (1);
 			}
-    } else {
+		}
 	else
 		{
 		out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 			{
@@ -257,104 +272,152 @@ 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))) {
+			BIO_free_all(out);
 			return 1;
 			}
 		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
 			{
 			BIO_printf(bio_err, "Error converting key\n");
 			ERR_print_errors(bio_err);
-            goto end;
+			EVP_PKEY_free(pkey);
 			BIO_free_all(out);
 			return 1;
 			}
-        if (nocrypt) {
+		if (nocrypt)
 			{
 			if (outformat == FORMAT_PEM) 
 				PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
 			else if (outformat == FORMAT_ASN1)
 				i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
-            else {
+			else
 				{
 				BIO_printf(bio_err, "Bad format specified for key\n");
-                goto end;
+				PKCS8_PRIV_KEY_INFO_free(p8inf);
 				EVP_PKEY_free(pkey);
 				BIO_free_all(out);
 				return (1);
 				}
-        } else {
+			}
 		else
 			{
 			if (passout)
 				p8pass = passout;
-            else {
+			else
 				{
 				p8pass = pass;
-                if (EVP_read_pw_string
+				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
-                    (pass, sizeof pass, "Enter Encryption Password:", 1))
+					{
-                    goto end;
+					PKCS8_PRIV_KEY_INFO_free(p8inf);
 					EVP_PKEY_free(pkey);
 					BIO_free_all(out);
 					return (1);
 					}
 				}
 			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;
+				PKCS8_PRIV_KEY_INFO_free(p8inf);
 				EVP_PKEY_free(pkey);
 				BIO_free_all(out);
 				return (1);
 				}
 			app_RAND_write_file(NULL, bio_err);
 			if (outformat == FORMAT_PEM) 
 				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;
+				PKCS8_PRIV_KEY_INFO_free(p8inf);
 				EVP_PKEY_free(pkey);
 				BIO_free_all(out);
 				return (1);
 				}
 			X509_SIG_free(p8);
 			}
-        ret = 0;
+		PKCS8_PRIV_KEY_INFO_free (p8inf);
-        goto end;
+		EVP_PKEY_free(pkey);
 		BIO_free_all(out);
 		if (passin)
 			OPENSSL_free(passin);
 		if (passout)
 			OPENSSL_free(passout);
 		return (0);
 		}
-    if (nocrypt) {
+	if (nocrypt)
 		{
 		if (informat == FORMAT_PEM) 
 			p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
 		else if (informat == FORMAT_ASN1)
 			p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
-        else {
+		else
 			{
 			BIO_printf(bio_err, "Bad format specified for key\n");
-            goto end;
+			return (1);
 			}
-    } else {
+		}
 	else
 		{
 		if (informat == FORMAT_PEM) 
 			p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
 		else if (informat == FORMAT_ASN1)
 			p8 = d2i_PKCS8_bio(in, NULL);
-        else {
+		else
 			{
 			BIO_printf(bio_err, "Bad format specified for key\n");
-            goto end;
+			return (1);
 			}
-        if (!p8) {
+		if (!p8)
 			{
 			BIO_printf (bio_err, "Error reading key\n");
 			ERR_print_errors(bio_err);
-            goto end;
+			return (1);
 			}
 		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));
 		X509_SIG_free(p8);
 		}
-    if (!p8inf) {
+	if (!p8inf)
 		{
 		BIO_printf(bio_err, "Error decrypting key\n");
 		ERR_print_errors(bio_err);
-        goto end;
+		return (1);
 		}
-    if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
+	if (!(pkey = EVP_PKCS82PKEY(p8inf)))
 		{
 		BIO_printf(bio_err, "Error converting key\n");
 		ERR_print_errors(bio_err);
-        goto end;
+		return (1);
 		}
-    if (p8inf->broken) {
+	if (p8inf->broken)
 		{
 		BIO_printf(bio_err, "Warning: broken key encoding: ");
-        switch (p8inf->broken) {
+		switch (p8inf->broken)
 			{
 			case PKCS8_NO_OCTET:
 			BIO_printf(bio_err, "No Octet String in PrivateKey\n");
 			break;
@@ -367,29 +430,24 @@ 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;
 		}
 	}
 	PKCS8_PRIV_KEY_INFO_free(p8inf);
 	if (outformat == FORMAT_PEM) 
 		PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
 	else if (outformat == FORMAT_ASN1)
 		i2d_PrivateKey_bio(out, pkey);
-    else {
+	else
 		{
 		BIO_printf(bio_err, "Bad format specified for key\n");
-        goto end;
+			return (1);
 		}
    ret = 0;
 	end:
    X509_SIG_free(p8);
    PKCS8_PRIV_KEY_INFO_free(p8inf);
 	EVP_PKEY_free(pkey);
 	BIO_free_all(out);
 	BIO_free(in);
@@ -398,5 +456,5 @@ int MAIN(int argc, char **argv)
 	if (passout)
 		OPENSSL_free(passout);
-    return ret;
+	return (0);
 	}
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -1,251 +0,0 @@
 /* apps/pkey.c */
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
 * 2006
 */
 /* ====================================================================
 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <stdio.h>
 #include <string.h>
 #include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #define PROG pkey_main
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
    ENGINE *e = NULL;
    char **args, *infile = NULL, *outfile = NULL;
    char *passargin = NULL, *passargout = NULL;
    BIO *in = NULL, *out = NULL;
    const EVP_CIPHER *cipher = NULL;
    int informat, outformat;
    int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0;
    EVP_PKEY *pkey = NULL;
    char *passin = NULL, *passout = NULL;
    int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
    char *engine = NULL;
 #endif
    int ret = 1;
    if (bio_err == NULL)
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
    if (!load_config(bio_err, NULL))
        goto end;
    informat = FORMAT_PEM;
    outformat = FORMAT_PEM;
    ERR_load_crypto_strings();
    OpenSSL_add_all_algorithms();
    args = argv + 1;
    while (!badarg && *args && *args[0] == '-') {
        if (!strcmp(*args, "-inform")) {
            if (args[1]) {
                args++;
                informat = str2fmt(*args);
            } else
                badarg = 1;
        } else if (!strcmp(*args, "-outform")) {
            if (args[1]) {
                args++;
                outformat = str2fmt(*args);
            } else
                badarg = 1;
        } else if (!strcmp(*args, "-passin")) {
            if (!args[1])
                goto bad;
            passargin = *(++args);
        } else if (!strcmp(*args, "-passout")) {
            if (!args[1])
                goto bad;
            passargout = *(++args);
        }
 #ifndef OPENSSL_NO_ENGINE
        else if (strcmp(*args, "-engine") == 0) {
            if (!args[1])
                goto bad;
            engine = *(++args);
        }
 #endif
        else if (!strcmp(*args, "-in")) {
            if (args[1]) {
                args++;
                infile = *args;
            } else
                badarg = 1;
        } else if (!strcmp(*args, "-out")) {
            if (args[1]) {
                args++;
                outfile = *args;
            } else
                badarg = 1;
        } else if (strcmp(*args, "-pubin") == 0) {
            pubin = 1;
            pubout = 1;
            pubtext = 1;
        } else if (strcmp(*args, "-pubout") == 0)
            pubout = 1;
        else if (strcmp(*args, "-text_pub") == 0) {
            pubtext = 1;
            text = 1;
        } else if (strcmp(*args, "-text") == 0)
            text = 1;
        else if (strcmp(*args, "-noout") == 0)
            noout = 1;
        else {
            cipher = EVP_get_cipherbyname(*args + 1);
            if (!cipher) {
                BIO_printf(bio_err, "Unknown cipher %s\n", *args + 1);
                badarg = 1;
            }
        }
        args++;
    }
    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, "-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");
 #ifndef OPENSSL_NO_ENGINE
        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)) {
        BIO_printf(bio_err, "Error getting passwords\n");
        goto end;
    }
    if (outfile) {
        if (!(out = BIO_new_file(outfile, "wb"))) {
            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
            goto end;
        }
    } else {
        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 #endif
    }
    if (pubin)
        pkey = load_pubkey(bio_err, infile, informat, 1,
                           passin, e, "Public Key");
    else
        pkey = load_key(bio_err, infile, informat, 1, passin, e, "key");
    if (!pkey)
        goto end;
    if (!noout) {
        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) {
            if (pubout)
                i2d_PUBKEY_bio(out, pkey);
            else
                i2d_PrivateKey_bio(out, pkey);
        } else {
            BIO_printf(bio_err, "Bad format specified for key\n");
            goto end;
        }
    }
    if (text) {
        if (pubtext)
            EVP_PKEY_print_public(out, pkey, 0, NULL);
        else
            EVP_PKEY_print_private(out, pkey, 0, NULL);
    }
    ret = 0;
 end:
    EVP_PKEY_free(pkey);
    BIO_free_all(out);
    BIO_free(in);
    if (passin)
        OPENSSL_free(passin);
    if (passout)
        OPENSSL_free(passout);
    return ret;
 }
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -1,185 +0,0 @@
 /* apps/pkeyparam.c */
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
 * 2006
 */
 /* ====================================================================
 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <stdio.h>
 #include <string.h>
 #include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #define PROG pkeyparam_main
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 {
    char **args, *infile = NULL, *outfile = NULL;
    BIO *in = NULL, *out = NULL;
    int text = 0, noout = 0;
    EVP_PKEY *pkey = NULL;
    int badarg = 0;
 #ifndef OPENSSL_NO_ENGINE
    char *engine = NULL;
 #endif
    int ret = 1;
    if (bio_err == NULL)
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
    if (!load_config(bio_err, NULL))
        goto end;
    ERR_load_crypto_strings();
    OpenSSL_add_all_algorithms();
    args = argv + 1;
    while (!badarg && *args && *args[0] == '-') {
        if (!strcmp(*args, "-in")) {
            if (args[1]) {
                args++;
                infile = *args;
            } else
                badarg = 1;
        } else if (!strcmp(*args, "-out")) {
            if (args[1]) {
                args++;
                outfile = *args;
            } else
                badarg = 1;
        }
 #ifndef OPENSSL_NO_ENGINE
        else if (strcmp(*args, "-engine") == 0) {
            if (!args[1])
                goto bad;
            engine = *(++args);
        }
 #endif
        else if (strcmp(*args, "-text") == 0)
            text = 1;
        else if (strcmp(*args, "-noout") == 0)
            noout = 1;
        args++;
    }
    if (badarg) {
 #ifndef OPENSSL_NO_ENGINE
 bad:
 #endif
        BIO_printf(bio_err, "Usage pkeyparam [options]\n");
        BIO_printf(bio_err, "where options are\n");
        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");
 #ifndef OPENSSL_NO_ENGINE
        BIO_printf(bio_err,
                   "-engine e       use engine e, possibly a hardware device.\n");
 #endif
        return 1;
    }
 #ifndef OPENSSL_NO_ENGINE
    setup_engine(bio_err, engine, 0);
 #endif
    if (infile) {
        if (!(in = BIO_new_file(infile, "r"))) {
            BIO_printf(bio_err, "Can't open input file %s\n", infile);
            goto end;
        }
    } else
        in = BIO_new_fp(stdin, BIO_NOCLOSE);
    if (outfile) {
        if (!(out = BIO_new_file(outfile, "w"))) {
            BIO_printf(bio_err, "Can't open output file %s\n", outfile);
            goto end;
        }
    } else {
        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 #endif
    }
    pkey = PEM_read_bio_Parameters(in, NULL);
    if (!pkey) {
        BIO_printf(bio_err, "Error reading parameters\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (!noout)
        PEM_write_bio_Parameters(out, pkey);
    if (text)
        EVP_PKEY_print_params(out, pkey, 0, NULL);
    ret = 0;
 end:
    EVP_PKEY_free(pkey);
    BIO_free_all(out);
    BIO_free(in);
    return ret;
 }
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -1,555 +0,0 @@
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
 * 2006.
 */
 /* ====================================================================
 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include "apps.h"
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #define KEY_PRIVKEY     1
 #define KEY_PUBKEY      2
 #define KEY_CERT        3
 static void usage(void);
 #undef PROG
 #define PROG pkeyutl_main
 static EVP_PKEY_CTX *init_ctx(int *pkeysize,
                              const char *keyfile, int keyform, int key_type,
                              char *passargin, int pkey_op, ENGINE *e,
                              int   impl);
 static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
                      const char *file, ENGINE* e);
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
                    unsigned char *out, size_t *poutlen,
                    unsigned char *in, size_t inlen);
 int MAIN(int argc, char **);
 int MAIN(int argc, char **argv)
 {
    BIO *in = NULL, *out = NULL;
    char *infile = NULL, *outfile = NULL, *sigfile = NULL;
    ENGINE *e = NULL;
    int pkey_op = EVP_PKEY_OP_SIGN, key_type = KEY_PRIVKEY;
    int keyform = FORMAT_PEM, peerform = FORMAT_PEM;
    char badarg = 0, rev = 0;
    char hexdump = 0, asn1parse = 0;
    EVP_PKEY_CTX *ctx = NULL;
    char *passargin = NULL;
    int keysize = -1;
    int engine_impl = 0;
    unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL;
    size_t buf_outlen = 0;
    int buf_inlen = 0, siglen = -1;
    const char *inkey = NULL;
    const char *peerkey = NULL;
    STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
    int ret = 1, rv = -1;
    argc--;
    argv++;
    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) {
        if (!strcmp(*argv, "-in")) {
            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
                inkey = *++argv;
        } else if (!strcmp(*argv, "-peerkey")) {
            if (--argc < 1)
                badarg = 1;
            else
                peerkey = *++argv;
        } else if (!strcmp(*argv, "-passin")) {
            if (--argc < 1)
                badarg = 1;
            else
                passargin = *(++argv);
        } else if (strcmp(*argv, "-peerform") == 0) {
            if (--argc < 1)
                badarg = 1;
            else
                peerform = str2fmt(*(++argv));
        } else if (strcmp(*argv, "-keyform") == 0) {
            if (--argc < 1)
                badarg = 1;
            else
                keyform = str2fmt(*(++argv));
        }
 #ifndef OPENSSL_NO_ENGINE
        else if (!strcmp(*argv, "-engine")) {
            if (--argc < 1)
                badarg = 1;
            else
                e = setup_engine(bio_err, *(++argv), 0);
        } else if (!strcmp(*argv, "-engine_impl")) {
                engine_impl = 1;
        }
 #endif
        else if (!strcmp(*argv, "-pubin"))
            key_type = KEY_PUBKEY;
        else if (!strcmp(*argv, "-certin"))
            key_type = KEY_CERT;
        else if (!strcmp(*argv, "-asn1parse"))
            asn1parse = 1;
        else if (!strcmp(*argv, "-hexdump"))
            hexdump = 1;
        else if (!strcmp(*argv, "-sign"))
            pkey_op = EVP_PKEY_OP_SIGN;
        else if (!strcmp(*argv, "-verify"))
            pkey_op = EVP_PKEY_OP_VERIFY;
        else if (!strcmp(*argv, "-verifyrecover"))
            pkey_op = EVP_PKEY_OP_VERIFYRECOVER;
        else if (!strcmp(*argv, "-encrypt"))
            pkey_op = EVP_PKEY_OP_ENCRYPT;
        else if (!strcmp(*argv, "-decrypt"))
            pkey_op = EVP_PKEY_OP_DECRYPT;
        else if (!strcmp(*argv, "-derive"))
            pkey_op = EVP_PKEY_OP_DERIVE;
        else if (!strcmp(*argv, "-rev"))
            rev = 1;
        else if (strcmp(*argv, "-pkeyopt") == 0) {
            if (--argc < 1)
                badarg = 1;
            else if ((pkeyopts == NULL &&
                     (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
                    sk_OPENSSL_STRING_push(pkeyopts, *++argv) == 0) {
                BIO_puts(bio_err, "out of memory\n");
                goto end;
            }
        } else
            badarg = 1;
        if (badarg) {
            usage();
            goto end;
        }
        argc--;
        argv++;
    }
    if (inkey == NULL ||
        (peerkey != NULL && pkey_op != EVP_PKEY_OP_DERIVE)) {
        usage();
        goto end;
    }
    ctx = init_ctx(&keysize, inkey, keyform, key_type,
                   passargin, pkey_op, e, engine_impl);
    if (!ctx) {
        BIO_puts(bio_err, "Error initializing context\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (peerkey != NULL && !setup_peer(bio_err, ctx, peerform, peerkey, e)) {
        BIO_puts(bio_err, "Error setting up peer key\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (pkeyopts != NULL) {
        int num = sk_OPENSSL_STRING_num(pkeyopts);
        int i;
        for (i = 0; i < num; ++i) {
            const char *opt = sk_OPENSSL_STRING_value(pkeyopts, i);
            if (pkey_ctrl_string(ctx, opt) <= 0) {
                BIO_puts(bio_err, "parameter setting error\n");
                ERR_print_errors(bio_err);
                goto end;
            }
        }
    }
    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)) {
        BIO_puts(bio_err, "No signature file specified for verify\n");
        goto end;
    }
 /* FIXME: seed PRNG only if needed */
    app_RAND_load_file(NULL, bio_err, 0);
    if (pkey_op != EVP_PKEY_OP_DERIVE) {
        if (infile) {
            if (!(in = BIO_new_file(infile, "rb"))) {
                BIO_puts(bio_err, "Error Opening Input File\n");
                ERR_print_errors(bio_err);
                goto end;
            }
        } else
            in = BIO_new_fp(stdin, BIO_NOCLOSE);
    }
    if (outfile) {
        if (!(out = BIO_new_file(outfile, "wb"))) {
            BIO_printf(bio_err, "Error Creating Output File\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    } else {
        out = BIO_new_fp(stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
        {
            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
            out = BIO_push(tmpbio, out);
        }
 #endif
    }
    if (sigfile) {
        BIO *sigbio = BIO_new_file(sigfile, "rb");
        if (!sigbio) {
            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) {
            BIO_printf(bio_err, "Error reading signature data\n");
            goto end;
        }
    }
    if (in) {
        /* Read the input data */
        buf_inlen = bio_to_mem(&buf_in, keysize * 10, in);
        if (buf_inlen < 0) {
            BIO_printf(bio_err, "Error reading input Data\n");
            exit(1);
        }
        if (rev) {
            size_t i;
            unsigned char ctmp;
            size_t l = (size_t)buf_inlen;
            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;
            }
        }
    }
    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)
            BIO_puts(out, "Signature Verification Failure\n");
        else if (rv == 1)
            BIO_puts(out, "Signature Verified Successfully\n");
        if (rv >= 0)
            goto end;
    } else {
        rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
                      buf_in, (size_t)buf_inlen);
        if (rv > 0 && buf_outlen != 0) {
            buf_out = OPENSSL_malloc(buf_outlen);
            if (!buf_out)
                rv = -1;
            else
                rv = do_keyop(ctx, pkey_op,
                              buf_out, (size_t *)&buf_outlen,
                              buf_in, (size_t)buf_inlen);
        }
    }
    if (rv <= 0) {
        BIO_printf(bio_err, "Public Key operation error\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    ret = 0;
    if (asn1parse) {
        if (!ASN1_parse_dump(out, buf_out, buf_outlen, 1, -1))
            ERR_print_errors(bio_err);
    } else if (hexdump)
        BIO_dump(out, (char *)buf_out, buf_outlen);
    else
        BIO_write(out, buf_out, buf_outlen);
 end:
    if (ctx)
        EVP_PKEY_CTX_free(ctx);
    BIO_free(in);
    BIO_free_all(out);
    if (buf_in != NULL)
        OPENSSL_free(buf_in);
    if (buf_out != NULL)
        OPENSSL_free(buf_out);
    if (sig != NULL)
        OPENSSL_free(sig);
    if (pkeyopts != NULL)
        sk_OPENSSL_STRING_free(pkeyopts);
    return ret;
 }
 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,
               "-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, "-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, "-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, maybe a hardware device, for loading keys.\n");
    BIO_printf(bio_err, "-engine_impl    also use engine given by -engine for crypto operations\n");
 #endif
    BIO_printf(bio_err, "-passin arg     pass phrase source\n");
 }
 static EVP_PKEY_CTX *init_ctx(int *pkeysize,
                              const char *keyfile, int keyform, int key_type,
                              char *passargin, int pkey_op, ENGINE *e,
                              int   engine_impl)
 {
    EVP_PKEY *pkey = NULL;
    EVP_PKEY_CTX *ctx = NULL;
    ENGINE *impl = NULL;
    char *passin = NULL;
    int rv = -1;
    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)) {
        BIO_printf(bio_err, "A private key is needed for this operation\n");
        goto end;
    }
    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
        BIO_printf(bio_err, "Error getting password\n");
        goto end;
    }
    switch (key_type) {
    case KEY_PRIVKEY:
        pkey = load_key(bio_err, keyfile, keyform, 0,
                        passin, e, "Private Key");
        break;
    case KEY_PUBKEY:
        pkey = load_pubkey(bio_err, keyfile, keyform, 0,
                           NULL, e, "Public Key");
        break;
    case KEY_CERT:
        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
        if (x) {
            pkey = X509_get_pubkey(x);
            X509_free(x);
        }
        break;
    }
    *pkeysize = EVP_PKEY_size(pkey);
    if (!pkey)
        goto end;
 #ifndef OPENSSL_NO_ENGINE
    if (engine_impl)
 	impl = e;
 #endif
    ctx = EVP_PKEY_CTX_new(pkey, impl);
    EVP_PKEY_free(pkey);
    if (!ctx)
        goto end;
    switch (pkey_op) {
    case EVP_PKEY_OP_SIGN:
        rv = EVP_PKEY_sign_init(ctx);
        break;
    case EVP_PKEY_OP_VERIFY:
        rv = EVP_PKEY_verify_init(ctx);
        break;
    case EVP_PKEY_OP_VERIFYRECOVER:
        rv = EVP_PKEY_verify_recover_init(ctx);
        break;
    case EVP_PKEY_OP_ENCRYPT:
        rv = EVP_PKEY_encrypt_init(ctx);
        break;
    case EVP_PKEY_OP_DECRYPT:
        rv = EVP_PKEY_decrypt_init(ctx);
        break;
    case EVP_PKEY_OP_DERIVE:
        rv = EVP_PKEY_derive_init(ctx);
        break;
    }
    if (rv <= 0) {
        EVP_PKEY_CTX_free(ctx);
        ctx = NULL;
    }
 end:
    if (passin)
        OPENSSL_free(passin);
    return ctx;
 }
 static int setup_peer(BIO *err, EVP_PKEY_CTX *ctx, int peerform,
                      const char *file, ENGINE* e)
 {
    EVP_PKEY *peer = NULL;
    ENGINE* engine = NULL;
    int ret;
    if (peerform == FORMAT_ENGINE)
        engine = e;
    peer = load_pubkey(bio_err, file, peerform, 0, NULL, engine, "Peer Key");
    if (!peer) {
        BIO_printf(bio_err, "Error reading peer key %s\n", file);
        ERR_print_errors(err);
        return 0;
    }
    ret = EVP_PKEY_derive_set_peer(ctx, peer);
    EVP_PKEY_free(peer);
    if (ret <= 0)
        ERR_print_errors(err);
    return ret;
 }
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
                    unsigned char *out, size_t *poutlen,
                    unsigned char *in, size_t inlen)
 {
    int rv = 0;
    switch (pkey_op) {
    case EVP_PKEY_OP_VERIFYRECOVER:
        rv = EVP_PKEY_verify_recover(ctx, out, poutlen, in, inlen);
        break;
    case EVP_PKEY_OP_SIGN:
        rv = EVP_PKEY_sign(ctx, out, poutlen, in, inlen);
        break;
    case EVP_PKEY_OP_ENCRYPT:
        rv = EVP_PKEY_encrypt(ctx, out, poutlen, in, inlen);
        break;
    case EVP_PKEY_OP_DECRYPT:
        rv = EVP_PKEY_decrypt(ctx, out, poutlen, in, inlen);
        break;
    case EVP_PKEY_OP_DERIVE:
        rv = EVP_PKEY_derive(ctx, out, poutlen);
        break;
    }
    return rv;
 }
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -52,18 +52,14 @@
 #include "apps.h"
 #include <openssl/bn.h>
 #undef PROG
 #define PROG prime_main
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
    {
    int hex=0;
    int checks=20;
    int generate = 0;
    int bits = 0;
    int safe = 0;
    BIGNUM *bn=NULL;
    BIO *bio_out;
@@ -75,24 +71,17 @@ 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"))
            generate = 1;
        else if (!strcmp(*argv, "-bits"))
            if (--argc < 1)
                goto bad;
            else
                bits = atoi(*++argv);
        else if (!strcmp(*argv, "-safe"))
            safe = 1;
 	else if(!strcmp(*argv,"-checks"))
 	    if(--argc < 1)
 		goto bad;
 	    else
 		checks=atoi(*++argv);
-        else {
+	else
 	    {
 	    BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
 	    goto bad;
 	    }
@@ -100,12 +89,14 @@ int MAIN(int argc, char **argv)
 	++argv;
 	}
-    if (argv[0] == NULL && !generate) {
+    if (argv[0] == NULL)
 	{
 	BIO_printf(bio_err,"No prime specified\n");
 	goto bad;
 	}
-    if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
+   if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 	{
 	BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 	    {
@@ -115,19 +106,6 @@ int MAIN(int argc, char **argv)
 #endif
 	}
    if (generate) {
        char *s;
        if (!bits) {
            BIO_printf(bio_err, "Specifiy the number of bits.\n");
            return 1;
        }
        bn = BN_new();
        BN_generate_prime_ex(bn, bits, safe, NULL, NULL, NULL);
        s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
        BIO_printf(bio_out, "%s\n", s);
        OPENSSL_free(s);
    } else {
    if(hex)
 	BN_hex2bn(&bn,argv[0]);
    else
@@ -135,8 +113,7 @@ int MAIN(int argc, char **argv)
    BN_print(bio_out,bn);
    BIO_printf(bio_out," is %sprime\n",
-                   BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
+	       BN_is_prime(bn,checks,NULL,NULL,NULL) ? "" : "not ");
    }
    BN_free(bn);
    BIO_free_all(bio_out);
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -17,50 +17,39 @@ extern int rsa_main(int argc, char *argv[]);
 extern int rsautl_main(int argc,char *argv[]);
 extern int dsa_main(int argc,char *argv[]);
 extern int dsaparam_main(int argc,char *argv[]);
 extern int ec_main(int argc, char *argv[]);
 extern int ecparam_main(int argc, char *argv[]);
 extern int x509_main(int argc,char *argv[]);
 extern int genrsa_main(int argc,char *argv[]);
 extern int gendsa_main(int argc,char *argv[]);
 extern int genpkey_main(int argc, char *argv[]);
 extern int s_server_main(int argc,char *argv[]);
 extern int s_client_main(int argc,char *argv[]);
 extern int speed_main(int argc,char *argv[]);
 extern int s_time_main(int argc,char *argv[]);
 extern int version_main(int argc,char *argv[]);
 extern int pkcs7_main(int argc,char *argv[]);
 extern int cms_main(int argc, char *argv[]);
 extern int crl2pkcs7_main(int argc,char *argv[]);
 extern int sess_id_main(int argc,char *argv[]);
 extern int ciphers_main(int argc,char *argv[]);
 extern int nseq_main(int argc,char *argv[]);
 extern int pkcs12_main(int argc,char *argv[]);
 extern int pkcs8_main(int argc,char *argv[]);
 extern int pkey_main(int argc, char *argv[]);
 extern int pkeyparam_main(int argc, char *argv[]);
 extern int pkeyutl_main(int argc, char *argv[]);
 extern int spkac_main(int argc,char *argv[]);
 extern int smime_main(int argc,char *argv[]);
 extern int rand_main(int argc,char *argv[]);
 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[]);
+#ifndef OPENSSL_NO_ENGINE
-extern int srp_main(int argc, char *argv[]);
+extern int engine_main(int argc,char *argv[]);
 #endif
 extern int ocsp_main(int argc,char *argv[]);
 #define FUNC_TYPE_GENERAL	1
 #define FUNC_TYPE_MD		2
 #define FUNC_TYPE_CIPHER	3
 #define FUNC_TYPE_PKEY          4
 #define FUNC_TYPE_MD_ALG        5
 #define FUNC_TYPE_CIPHER_ALG    6
 typedef struct {
 	int type;
-    const char *name;
+	char *name;
-    int (*func) (int argc, char *argv[]);
+	int (*func)();
 	} FUNCTION;
 DECLARE_LHASH_OF(FUNCTION);
 FUNCTION functions[] = {
 	{FUNC_TYPE_GENERAL,"verify",verify_main},
@@ -92,12 +81,6 @@ FUNCTION functions[] = {
 #endif
 #ifndef OPENSSL_NO_DSA
 	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
 #endif
 #ifndef OPENSSL_NO_EC
    {FUNC_TYPE_GENERAL, "ec", ec_main},
 #endif
 #ifndef OPENSSL_NO_EC
    {FUNC_TYPE_GENERAL, "ecparam", ecparam_main},
 #endif
 	{FUNC_TYPE_GENERAL,"x509",x509_main},
 #ifndef OPENSSL_NO_RSA
@@ -106,27 +89,23 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_DSA
 	{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)
+#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 	{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)
+#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
 #endif
 	{FUNC_TYPE_GENERAL,"version",version_main},
 	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},
 #ifndef OPENSSL_NO_CMS
    {FUNC_TYPE_GENERAL, "cms", cms_main},
 #endif
 	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
 	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
-#if !defined(OPENSSL_NO_SOCK)
+#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
 	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
 	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
@@ -134,23 +113,14 @@ FUNCTION functions[] = {
 	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
 #endif
 	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
    {FUNC_TYPE_GENERAL, "pkey", pkey_main},
    {FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main},
    {FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main},
 	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
 	{FUNC_TYPE_GENERAL,"smime",smime_main},
 	{FUNC_TYPE_GENERAL,"rand",rand_main},
 	{FUNC_TYPE_GENERAL,"prime",prime_main},
 #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
@@ -189,29 +159,8 @@ FUNCTION functions[] = {
 #endif
 #ifndef OPENSSL_NO_AES
 	{FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
    {FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main},
 #endif
 	{FUNC_TYPE_CIPHER,"base64",enc_main},
 #ifdef ZLIB
    {FUNC_TYPE_CIPHER, "zlib", enc_main},
 #endif
 #ifndef OPENSSL_NO_DES
 	{FUNC_TYPE_CIPHER,"des",enc_main},
 #endif
@@ -224,9 +173,6 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
    {FUNC_TYPE_CIPHER, "seed", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC4
 	{FUNC_TYPE_CIPHER,"rc4",enc_main},
 #endif
@@ -293,18 +239,6 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea-ofb",enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
    {FUNC_TYPE_CIPHER, "seed-cbc", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
    {FUNC_TYPE_CIPHER, "seed-ecb", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
    {FUNC_TYPE_CIPHER, "seed-cfb", enc_main},
 #endif
 #ifndef OPENSSL_NO_SEED
    {FUNC_TYPE_CIPHER, "seed-ofb", enc_main},
 #endif
 #ifndef OPENSSL_NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-cbc",enc_main},
 #endif
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -13,16 +13,12 @@ print <<'EOF';
 #define FUNC_TYPE_GENERAL	1
 #define FUNC_TYPE_MD		2
 #define FUNC_TYPE_CIPHER	3
 #define FUNC_TYPE_PKEY		4
 #define FUNC_TYPE_MD_ALG	5
 #define FUNC_TYPE_CIPHER_ALG	6
 typedef struct {
 	int type;
-	const char *name;
+	char *name;
-	int (*func)(int argc,char *argv[]);
+	int (*func)();
 	} FUNCTION;
 DECLARE_LHASH_OF(FUNCTION);
 FUNCTION functions[] = {
 EOF
@@ -32,27 +28,15 @@ foreach (@ARGV)
 	push(@files,$_);
 	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 
+		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
 	elsif ( ($_ =~ /^speed$/))
 		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^engine$/))
 		{ print "#ifndef OPENSSL_NO_ENGINE\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
 		{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
 	elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
 		{ print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^ec$/) || ($_ =~ /^ecparam$/))
 		{ print "#ifndef OPENSSL_NO_EC\n${str}#endif\n";}
 	elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
 		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^pkcs12$/))
 		{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^cms$/))
 		{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
 	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; }
 	}
@@ -67,18 +51,14 @@ foreach (
 	"aes-128-cbc", "aes-128-ecb",
 	"aes-192-cbc", "aes-192-ecb",
 	"aes-256-cbc", "aes-256-ecb",
-	"camellia-128-cbc", "camellia-128-ecb",
+	"base64",
-	"camellia-192-cbc", "camellia-192-ecb",
+	"des", "des3", "desx", "idea", "rc4", "rc4-40",
 	"camellia-256-cbc", "camellia-256-ecb",
 	"base64", "zlib",
 	"des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
 	"rc2", "bf", "cast", "rc5",
 	"des-ecb", "des-ede",    "des-ede3",
 	"des-cbc", "des-ede-cbc","des-ede3-cbc",
 	"des-cfb", "des-ede-cfb","des-ede3-cfb",
 	"des-ofb", "des-ede-ofb","des-ede3-ofb",
 	"idea-cbc","idea-ecb",   "idea-cfb", "idea-ofb",
 	"seed-cbc","seed-ecb",    "seed-cfb", "seed-ofb",
 	"rc2-cbc", "rc2-ecb", "rc2-cfb","rc2-ofb", "rc2-64-cbc", "rc2-40-cbc",
 	"bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",
 	"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",
@@ -89,15 +69,12 @@ foreach (
 	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
 	if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }
 	elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }
 	elsif ($_ =~ /camellia/)  { $t="#ifndef OPENSSL_NO_CAMELLIA\n${t}#endif\n"; }
 	elsif ($_ =~ /idea/) { $t="#ifndef OPENSSL_NO_IDEA\n${t}#endif\n"; }
 	elsif ($_ =~ /seed/) { $t="#ifndef OPENSSL_NO_SEED\n${t}#endif\n"; }
 	elsif ($_ =~ /rc4/)  { $t="#ifndef OPENSSL_NO_RC4\n${t}#endif\n"; }
 	elsif ($_ =~ /rc2/)  { $t="#ifndef OPENSSL_NO_RC2\n${t}#endif\n"; }
 	elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }
 	elsif ($_ =~ /cast/) { $t="#ifndef OPENSSL_NO_CAST\n${t}#endif\n"; }
 	elsif ($_ =~ /rc5/)  { $t="#ifndef OPENSSL_NO_RC5\n${t}#endif\n"; }
 	elsif ($_ =~ /zlib/)  { $t="#ifdef ZLIB\n${t}#endif\n"; }
 	print $t;
 	}
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -66,11 +66,9 @@
 #undef PROG
 #define PROG rand_main
-/*-
+/* -out file         - write to file
 * -out file         - write to file
 * -rand file:file   - PRNG seed files
- * -base64           - base64 encode output
+ * -base64           - encode output
 * -hex              - hex encode output
 * num               - write 'num' bytes
 */
@@ -78,12 +76,14 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	int i, r, ret = 1;
 	int badopt;
 	char *outfile = NULL;
 	char *inrand = NULL;
 	int base64 = 0;
    int hex = 0;
 	BIO *out = NULL;
 	int num = -1;
 #ifndef OPENSSL_NO_ENGINE
@@ -101,69 +101,71 @@ 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) {
+			}
-            if (!hex)
+		else if (isdigit((unsigned char)argv[i][0]))
-                hex = 1;
+			{
-            else
+			if (num < 0)
-                badopt = 1;
+				{
        } else if (isdigit((unsigned char)argv[i][0])) {
            if (num < 0) {
 				r = sscanf(argv[i], "%d", &num);
 				if (r == 0 || num < 0)
 					badopt = 1;
-            } else
+				}
-                badopt = 1;
+			else
        } else
 				badopt = 1;
 			}
-
+		else
    if (hex && base64)
 			badopt = 1;
 		}
 	if (num < 0)
 		badopt = 1;
-    if (badopt) {
+	if (badopt) 
 		{
 		BIO_printf(bio_err, "Usage: rand [options] num\n");
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, "-out file             - write to file\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
                   "-engine e             - use engine e, possibly a hardware device.\n");
 #endif
-        BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n",
+		BIO_printf(bio_err, "-rand file%cfile%c... - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
-                   LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+		BIO_printf(bio_err, "-base64               - encode output\n");
        BIO_printf(bio_err, "-base64               - base64 encode output\n");
        BIO_printf(bio_err, "-hex                  - hex encode output\n");
 		goto err;
 		}
 #ifndef OPENSSL_NO_ENGINE
-    setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);
 #endif
 	app_RAND_load_file(NULL, bio_err, (inrand != NULL));
@@ -176,7 +178,8 @@ int MAIN(int argc, char **argv)
 		goto err;
 	if (outfile != NULL)
 		r = BIO_write_filename(out, outfile);
-    else {
+	else
 		{
 		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -188,34 +191,29 @@ 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;
 		chunk = num;
-        if (chunk > (int)sizeof(buf))
+		if (chunk > sizeof buf)
 			chunk = sizeof buf;
 		r = RAND_bytes(buf, chunk);
 		if (r <= 0)
 			goto err;
        if (!hex)
 		BIO_write(out, buf, chunk);
        else {
            for (i = 0; i < chunk; i++)
                BIO_printf(out, "%02x", buf[i]);
        }
 		num -= chunk;
 		}
-    if (hex)
+	BIO_flush(out);
        BIO_puts(out, "\n");
    (void)BIO_flush(out);
 	app_RAND_write_file(NULL, bio_err);
 	ret = 0;
--- a/apps/req.c
+++ b/apps/req.c
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -56,7 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,26 +68,20 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 # include <openssl/bn.h>
 #undef PROG
 #define PROG	rsa_main
-/*-
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
 * -inform arg  - input format - default PEM (one of DER, NET or PEM)
 * -outform arg - output format - default PEM
 * -in arg	- input file - default stdin
 * -out arg	- output file - default stdout
 * -des		- encrypt output if PEM format with DES in cbc mode
 * -des3	- encrypt output if PEM format
 * -idea	- encrypt output if PEM format
 * -seed        - encrypt output if PEM format
 * -aes128	- encrypt output if PEM format
 * -aes192	- encrypt output if PEM format
 * -aes256	- encrypt output if PEM format
 * -camellia128 - encrypt output if PEM format
 * -camellia192 - encrypt output if PEM format
 * -camellia256 - encrypt output if PEM format
 * -text	- print a text version
 * -modulus	- print the RSA key modulus
 * -check	- verify key consistency
@@ -116,8 +109,6 @@ int MAIN(int argc, char **argv)
 #endif
 	int modulus=0;
    int pvk_encr = 2;
 	apps_startup();
 	if (bio_err == NULL)
@@ -135,36 +126,42 @@ int MAIN(int argc, char **argv)
 	prog=argv[0];
 	argc--;
 	argv++;
-    while (argc >= 1) {
+	while (argc >= 1)
-        if (strcmp(*argv, "-inform") == 0) {
+		{
-            if (--argc < 1)
+		if 	(strcmp(*argv,"-inform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-outform") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-outform") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
-        } else if (strcmp(*argv, "-in") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-in") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
-        } else if (strcmp(*argv, "-out") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-out") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
-        } else if (strcmp(*argv, "-passin") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passin") == 0)
-                goto bad;
+			{
 			if (--argc < 1) goto bad;
 			passargin= *(++argv);
-        } else if (strcmp(*argv, "-passout") == 0) {
+			}
-            if (--argc < 1)
+		else if (strcmp(*argv,"-passout") == 0)
-                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)
+			{
-                goto bad;
+			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
@@ -174,16 +171,6 @@ int MAIN(int argc, char **argv)
 			pubin=1;
 		else if (strcmp(*argv,"-pubout") == 0)
 			pubout=1;
        else if (strcmp(*argv, "-RSAPublicKey_in") == 0)
            pubin = 2;
        else if (strcmp(*argv, "-RSAPublicKey_out") == 0)
            pubout = 2;
        else if (strcmp(*argv, "-pvk-strong") == 0)
            pvk_encr = 2;
        else if (strcmp(*argv, "-pvk-weak") == 0)
            pvk_encr = 1;
        else if (strcmp(*argv, "-pvk-none") == 0)
            pvk_encr = 0;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -192,7 +179,8 @@ int MAIN(int argc, char **argv)
 			modulus=1;
 		else if (strcmp(*argv,"-check") == 0)
 			check=1;
-        else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
@@ -201,53 +189,35 @@ 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,
+		BIO_printf(bio_err," -inform arg     input format - one of DER NET PEM\n");
-                   " -inform arg     input format - one of DER NET PEM\n");
+		BIO_printf(bio_err," -outform arg    output format - one of DER NET PEM\n");
        BIO_printf(bio_err,
                   " -outform arg    output format - one of DER NET PEM\n");
 		BIO_printf(bio_err," -in arg         input file\n");
 		BIO_printf(bio_err," -sgckey         Use IIS SGC key format\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
                   " -passin arg     input file pass phrase source\n");
 		BIO_printf(bio_err," -out arg        output file\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-                   " -passout arg    output file pass phrase source\n");
+		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,
+		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
                   " -idea           encrypt PEM output with cbc idea\n");
 # endif
 # ifndef OPENSSL_NO_SEED
        BIO_printf(bio_err,
                   " -seed           encrypt PEM output with cbc seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
                   "                 encrypt PEM output with cbc aes\n");
 # endif
 # ifndef OPENSSL_NO_CAMELLIA
        BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
        BIO_printf(bio_err,
                   "                 encrypt PEM output with cbc camellia\n");
 #endif
 		BIO_printf(bio_err," -text           print the key in text\n");
 		BIO_printf(bio_err," -noout          don't print key out\n");
 		BIO_printf(bio_err," -modulus        print the RSA key modulus\n");
 		BIO_printf(bio_err," -check          verify key consistency\n");
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
                   " -pubin          expect a public key in input file\n");
 		BIO_printf(bio_err," -pubout         output a public key\n");
 #ifndef OPENSSL_NO_ENGINE
-        BIO_printf(bio_err,
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
                   " -engine e       use engine e, possibly a hardware device.\n");
 #endif
 		goto end;
 		}
@@ -273,37 +243,30 @@ int MAIN(int argc, char **argv)
 	{
 		EVP_PKEY	*pkey;
-        if (pubin) {
+		if (pubin)
-            int tmpformat = -1;
+			pkey = load_pubkey(bio_err, infile,
-            if (pubin == 2) {
+				(informat == FORMAT_NETSCAPE && sgckey ?
-                if (informat == FORMAT_PEM)
+					FORMAT_IISSGC : informat), 1,
                    tmpformat = FORMAT_PEMRSA;
                else if (informat == FORMAT_ASN1)
                    tmpformat = FORMAT_ASN1RSA;
            } else if (informat == FORMAT_NETSCAPE && sgckey)
                tmpformat = FORMAT_IISSGC;
            else
                tmpformat = informat;
            pkey = load_pubkey(bio_err, infile, tmpformat, 1,
 				passin, e, "Public Key");
-        } else
+		else
 			pkey = load_key(bio_err, infile,
 				(informat == FORMAT_NETSCAPE && sgckey ?
 					FORMAT_IISSGC : informat), 1,
 				passin, e, "Private Key");
 		if (pkey != NULL)
-            rsa = EVP_PKEY_get1_RSA(pkey);
+		rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
 		EVP_PKEY_free(pkey);
 	}
-    if (rsa == NULL) {
+	if (rsa == NULL)
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-    if (outfile == NULL) {
+	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
@@ -311,73 +274,78 @@ int MAIN(int argc, char **argv)
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-    } else {
+		}
-        if (BIO_write_filename(out, outfile) <= 0) {
+	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 	if (text) 
-        if (!RSA_print(out, rsa, 0)) {
+		if (!RSA_print(out,rsa,0))
 			{
 			perror(outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
-    if (modulus) {
+	if (modulus)
 		{
 		BIO_printf(out,"Modulus=");
 		BN_print(out,rsa->n);
 		BIO_printf(out,"\n");
 		}
-    if (check) {
+	if (check)
 		{
 		int r = RSA_check_key(rsa);
 		if (r == 1)
 			BIO_printf(out,"RSA key ok\n");
-        else if (r == 0) {
+		else if (r == 0)
-            unsigned long err;
+			{
 			long err;
 			while ((err = ERR_peek_error()) != 0 &&
 				ERR_GET_LIB(err) == ERR_LIB_RSA &&
 				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
-                   ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE) {
+				ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE)
-                BIO_printf(out, "RSA key error: %s\n",
+				{
-                           ERR_reason_error_string(err));
+				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
 				ERR_get_error(); /* remove e from error stack */
 				}
 			}
-        if (r == -1 || ERR_peek_error() != 0) { /* should happen only if r ==
+		if (r == -1 || ERR_peek_error() != 0) /* should happen only if r == -1 */
-                                                 * -1 */
+			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    if (noout) {
+	if (noout)
 		{
 		ret = 0;
 		goto end;
 		}
 	BIO_printf(bio_err,"writing RSA key\n");
 	if 	(outformat == FORMAT_ASN1) {
-        if (pubout || pubin) {
+		if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
-            if (pubout == 2)
+		else i=i2d_RSAPrivateKey_bio(out,rsa);
                i = i2d_RSAPublicKey_bio(out, rsa);
            else
                i = i2d_RSA_PUBKEY_bio(out, rsa);
        } else
            i = i2d_RSAPrivateKey_bio(out, rsa);
 	}
 #ifndef OPENSSL_NO_RC4
-    else if (outformat == FORMAT_NETSCAPE) {
+	else if (outformat == FORMAT_NETSCAPE)
 		{
 		unsigned char *p,*pp;
 		int size;
 		i=1;
 		size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
-        if ((p = (unsigned char *)OPENSSL_malloc(size)) == NULL) {
+		if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
 			{
 			BIO_printf(bio_err,"Memory allocation failure\n");
 			goto end;
 			}
@@ -388,45 +356,26 @@ int MAIN(int argc, char **argv)
 		}
 #endif
 	else if (outformat == FORMAT_PEM) {
-        if (pubout || pubin) {
+		if(pubout || pubin)
            if (pubout == 2)
                i = PEM_write_bio_RSAPublicKey(out, rsa);
            else
 		    i=PEM_write_bio_RSA_PUBKEY(out,rsa);
-        } else
+		else i=PEM_write_bio_RSAPrivateKey(out,rsa,
            i = PEM_write_bio_RSAPrivateKey(out, rsa,
 						enc,NULL,0,NULL,passout);
 # if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)
    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
        EVP_PKEY *pk;
        pk = EVP_PKEY_new();
        EVP_PKEY_set1_RSA(pk, rsa);
        if (outformat == FORMAT_PVK)
            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
        else if (pubin || pubout)
            i = i2b_PublicKey_bio(out, pk);
        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 <= 0) {
+	if (!i)
 		{
 		BIO_printf(bio_err,"unable to write key\n");
 		ERR_print_errors(bio_err);
-    } else
+		}
 	else
 		ret=0;
 end:
-    if (out != NULL)
+	if(out != NULL) BIO_free_all(out);
-        BIO_free_all(out);
+	if(rsa != NULL) RSA_free(rsa);
-    if (rsa != NULL)
+	if(passin) OPENSSL_free(passin);
-        RSA_free(rsa);
+	if(passout) OPENSSL_free(passout);
    if (passin)
        OPENSSL_free(passin);
    if (passout)
        OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -1,10 +1,9 @@
 /* rsautl.c */
-/*
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * project 2000.
 * 2000.
 */
 /* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2000-2005 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
@@ -57,14 +56,12 @@
 *
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 #include "apps.h"
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 # include <openssl/rsa.h>
 #define RSA_SIGN 	1
 #define RSA_VERIFY 	2
@@ -109,8 +106,7 @@ int MAIN(int argc, char **argv)
 	argc--;
 	argv++;
-    if (!bio_err)
+	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
        bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 	if (!load_config(bio_err, NULL))
 		goto end;
@@ -118,71 +114,50 @@ int MAIN(int argc, char **argv)
 	OpenSSL_add_all_algorithms();
 	pad = RSA_PKCS1_PADDING;
-    while (argc >= 1) {
+	while(argc >= 1)
 	{
 		if (!strcmp(*argv,"-in")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
                        infile= *(++argv);
 		} else if (!strcmp(*argv,"-out")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
 			outfile= *(++argv);
 		} else if(!strcmp(*argv, "-inkey")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
 			keyfile = *(++argv);
 		} else if (!strcmp(*argv,"-passin")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
 			passargin= *(++argv);
 		} else if (strcmp(*argv,"-keyform") == 0) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
 			keyform=str2fmt(*(++argv));
 #ifndef OPENSSL_NO_ENGINE
 		} else if(!strcmp(*argv, "-engine")) {
-            if (--argc < 1)
+			if (--argc < 1) badarg = 1;
                badarg = 1;
            else
 			engine = *(++argv);
 #endif
 		} else if(!strcmp(*argv, "-pubin")) {
 			key_type = KEY_PUBKEY;
 		} else if(!strcmp(*argv, "-certin")) {
 			key_type = KEY_CERT;
-        } else if (!strcmp(*argv, "-asn1parse"))
+		} 
-            asn1parse = 1;
+		else if(!strcmp(*argv, "-asn1parse")) asn1parse = 1;
-        else if (!strcmp(*argv, "-hexdump"))
+		else if(!strcmp(*argv, "-hexdump")) hexdump = 1;
-            hexdump = 1;
+		else if(!strcmp(*argv, "-raw")) pad = RSA_NO_PADDING;
-        else if (!strcmp(*argv, "-raw"))
+		else if(!strcmp(*argv, "-oaep")) pad = RSA_PKCS1_OAEP_PADDING;
-            pad = RSA_NO_PADDING;
+		else if(!strcmp(*argv, "-ssl")) pad = RSA_SSLV23_PADDING;
-        else if (!strcmp(*argv, "-oaep"))
+		else if(!strcmp(*argv, "-pkcs")) pad = RSA_PKCS1_PADDING;
-            pad = RSA_PKCS1_OAEP_PADDING;
+		else if(!strcmp(*argv, "-x931")) pad = RSA_X931_PADDING;
        else if (!strcmp(*argv, "-ssl"))
            pad = RSA_SSLV23_PADDING;
        else if (!strcmp(*argv, "-pkcs"))
            pad = RSA_PKCS1_PADDING;
        else if (!strcmp(*argv, "-x931"))
            pad = RSA_X931_PADDING;
 		else if(!strcmp(*argv, "-sign")) {
 			rsa_mode = RSA_SIGN;
 			need_priv = 1;
-        } else if (!strcmp(*argv, "-verify"))
+		} else if(!strcmp(*argv, "-verify")) rsa_mode = RSA_VERIFY;
-            rsa_mode = RSA_VERIFY;
+		else if(!strcmp(*argv, "-rev")) rev = 1;
-        else if (!strcmp(*argv, "-rev"))
+		else if(!strcmp(*argv, "-encrypt")) rsa_mode = RSA_ENCRYPT;
            rev = 1;
        else if (!strcmp(*argv, "-encrypt"))
            rsa_mode = RSA_ENCRYPT;
 		else if(!strcmp(*argv, "-decrypt")) {
 			rsa_mode = RSA_DECRYPT;
 			need_priv = 1;
-        } else
+		} else badarg = 1;
            badarg = 1;
 		if(badarg) {
 			usage();
 			goto end;
@@ -195,6 +170,7 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err, "A private key is needed for this operation\n");
 		goto end;
 	}
 #ifndef OPENSSL_NO_ENGINE
        e = setup_engine(bio_err, engine, 0);
 #endif
@@ -218,7 +194,8 @@ int MAIN(int argc, char **argv)
 		break;
 		case KEY_CERT:
-        x = load_cert(bio_err, keyfile, keyform, NULL, e, "Certificate");
+		x = load_cert(bio_err, keyfile, keyform,
 			NULL, e, "Certificate");
 		if(x) {
 			pkey = X509_get_pubkey(x);
 			X509_free(x);
@@ -239,18 +216,18 @@ int MAIN(int argc, char **argv)
 		goto end;
 	}
 	if(infile) {
 		if(!(in = BIO_new_file(infile, "rb"))) {
 			BIO_printf(bio_err, "Error Reading Input File\n");
 			ERR_print_errors(bio_err);	
 			goto end;
 		}
-    } else
+	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);
        in = BIO_new_fp(stdin, BIO_NOCLOSE);
 	if(outfile) {
 		if(!(out = BIO_new_file(outfile, "wb"))) {
-            BIO_printf(bio_err, "Error Writing Output File\n");
+			BIO_printf(bio_err, "Error Reading Output File\n");
 			ERR_print_errors(bio_err);	
 			goto end;
 		}
@@ -268,15 +245,10 @@ int MAIN(int argc, char **argv)
 	rsa_in = OPENSSL_malloc(keysize * 2);
 	rsa_out = OPENSSL_malloc(keysize);
    if (!rsa_in || !rsa_out) {
        BIO_printf(bio_err, "Out of memory\n");
        ERR_print_errors(bio_err);
        goto end;
    }
 	/* Read the input data */
 	rsa_inlen = BIO_read(in, rsa_in, keysize * 2);
-    if (rsa_inlen < 0) {
+	if(rsa_inlen <= 0) {
 		BIO_printf(bio_err, "Error reading input Data\n");
 		exit(1);
 	}
@@ -296,8 +268,7 @@ int MAIN(int argc, char **argv)
 		break;
 		case RSA_SIGN:
-        rsa_outlen =
+			rsa_outlen  = RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
            RSA_private_encrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 		break;
 		case RSA_ENCRYPT:
@@ -305,13 +276,12 @@ int MAIN(int argc, char **argv)
 		break;
 		case RSA_DECRYPT:
-        rsa_outlen =
+			rsa_outlen  = RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
            RSA_private_decrypt(rsa_inlen, rsa_in, rsa_out, rsa, pad);
 		break;
 	}
-    if (rsa_outlen < 0) {
+	if(rsa_outlen <= 0) {
 		BIO_printf(bio_err, "RSA operation error\n");
 		ERR_print_errors(bio_err);
 		goto end;
@@ -321,20 +291,15 @@ int MAIN(int argc, char **argv)
 		if(!ASN1_parse_dump(out, rsa_out, rsa_outlen, 1, -1)) {
 			ERR_print_errors(bio_err);
 		}
-    } else if (hexdump)
+	} else if(hexdump) BIO_dump(out, (char *)rsa_out, rsa_outlen);
-        BIO_dump(out, (char *)rsa_out, rsa_outlen);
+	else BIO_write(out, rsa_out, rsa_outlen);
    else
        BIO_write(out, rsa_out, rsa_outlen);
 	end:
 	RSA_free(rsa);
 	BIO_free(in);
 	BIO_free_all(out);
-    if (rsa_in)
+	if(rsa_in) OPENSSL_free(rsa_in);
-        OPENSSL_free(rsa_in);
+	if(rsa_out) OPENSSL_free(rsa_out);
-    if (rsa_out)
+	if(passin) OPENSSL_free(passin);
        OPENSSL_free(rsa_out);
    if (passin)
        OPENSSL_free(passin);
 	return ret;
 }
@@ -346,12 +311,10 @@ static void usage()
 	BIO_printf(bio_err, "-inkey file     input key\n");
 	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
 	BIO_printf(bio_err, "-pubin          input is an RSA public\n");
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
               "-certin         input is a certificate carrying an RSA public key\n");
 	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
 	BIO_printf(bio_err, "-raw            use no padding\n");
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-pkcs           use PKCS#1 v1.5 padding (default)\n");
               "-pkcs           use PKCS#1 v1.5 padding (default)\n");
 	BIO_printf(bio_err, "-oaep           use PKCS#1 OAEP\n");
 	BIO_printf(bio_err, "-sign           sign with private key\n");
 	BIO_printf(bio_err, "-verify         verify with public key\n");
@@ -359,17 +322,10 @@ static void usage()
 	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
 	BIO_printf(bio_err, "-hexdump        hex dump output\n");
 #ifndef OPENSSL_NO_ENGINE
-    BIO_printf(bio_err,
+	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
               "-engine e       use engine e, possibly a hardware device.\n");
 	BIO_printf (bio_err, "-passin arg    pass phrase source\n");
 #endif
 }
 #else                           /* !OPENSSL_NO_RSA */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -108,24 +108,20 @@
 * Hudson (tjh@cryptsoft.com).
 *
 */
-/* conflicts with winsock2 stuff on netware */
+
 #if !defined(OPENSSL_SYS_NETWARE)
 #include <sys/types.h>
 #endif
 #include <openssl/opensslconf.h>
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
 #include <conio.h>
 #endif
-#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#ifdef OPENSSL_SYS_MSDOS
 #define _kbhit kbhit
 #endif
 #if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
-/*
+/* VAX C does not defined fd_set and friends, but it's actually quite simple */
 * VAX C does not defined fd_set and friends, but it's actually quite simple
 */
 /* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
 #define MAX_NOFILE	32
 #define	NBBY		 8		/* number of bits in a byte	*/
@@ -151,61 +147,22 @@ typedef fd_mask fd_set;
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
-int do_server(int port, int type, int *ret,
+int do_server(int port, int *ret, int (*cb) (), char *context);
              int (*cb) (char *hostname, int s, int stype,
                         unsigned char *context), unsigned char *context,
              int naccept);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
 #ifdef HEADER_SSL_H
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
                       STACK_OF(X509) *chain, int build_chain);
 int ssl_print_sigalgs(BIO *out, SSL *s);
 int ssl_print_point_formats(BIO *out, SSL *s);
 int ssl_print_curves(BIO *out, SSL *s, int noshared);
 #endif
-int ssl_print_tmp_key(BIO *out, SSL *s);
+int init_client(int *sock, char *server, int port);
 int init_client(int *sock, char *server, int port, int type);
 int should_retry(int i);
 int extract_port(char *str, short *port_ptr);
-int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
+int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
                      short *p);
-long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
+long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp,
 	int argi, long argl, long ret);
 #ifdef HEADER_SSL_H
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
+void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
                        const void *buf, size_t len, SSL *ssl, void *arg);
 void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                           unsigned char *data, int len, void *arg);
 #endif
 int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie,
                                         unsigned int *cookie_len);
 int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie,
                                       unsigned int cookie_len);
 typedef struct ssl_excert_st SSL_EXCERT;
 void ssl_ctx_set_excert(SSL_CTX *ctx, SSL_EXCERT *exc);
 void ssl_excert_free(SSL_EXCERT *exc);
 int args_excert(char ***pargs, int *pargc,
                int *badarg, BIO *err, SSL_EXCERT **pexc);
 int load_excert(SSL_EXCERT **pexc, BIO *err);
 void print_ssl_summary(BIO *bio, SSL *s);
 #ifdef HEADER_SSL_H
 int args_ssl(char ***pargs, int *pargc, SSL_CONF_CTX *cctx,
             int *badarg, BIO *err, STACK_OF(OPENSSL_STRING) **pstr);
 int args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx,
                  STACK_OF(OPENSSL_STRING) *str, int no_ecdhe, int no_jpake);
 int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls,
                     int crl_download);
 int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath,
                    const char *vfyCAfile, const char *chCApath,
                    const char *chCAfile, STACK_OF(X509_CRL) *crls,
                    int crl_download);
 #endif
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
--- a/apps/s_client.c
+++ b/apps/s_client.c
--- a/apps/s_server.c
+++ b/apps/s_server.c
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -1,6 +1,4 @@
-/*
+/* apps/s_socket.c -  socket-related functions used by s_client and s_server */
 * apps/s_socket.c - socket-related functions used by s_client and s_server
 */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -64,18 +62,12 @@
 #include <errno.h>
 #include <signal.h>
-#ifdef FLAT_INC
+#include <openssl/e_os2.h>
 # include "e_os2.h"
 #else
 # include "../e_os2.h"
 #endif
-/*
+/* With IPv6, it looks like Digital has mixed up the proper order of
- * With IPv6, it looks like Digital has mixed up the proper order of
+   recursive header file inclusion, resulting in the compiler complaining
- * recursive header file inclusion, resulting in the compiler complaining
+   that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
- * that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which is
+   is needed to have fileno() declared correctly...  So let's define u_int */
 * needed to have fileno() declared correctly...  So let's define u_int
 */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
@@ -89,26 +81,14 @@ typedef unsigned int u_int;
 #include "s_apps.h"
 #include <openssl/ssl.h>
 #ifdef FLAT_INC
 # include "e_os.h"
 #else
 # include "../e_os.h"
 #endif
 #ifndef OPENSSL_NO_SOCK
 # if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
 #  include "netdb.h"
 # endif
 static struct hostent *GetHostByName(char *name);
-# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+#ifdef OPENSSL_SYS_WINDOWS
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type);
+static int init_client_ip(int *sock,unsigned char ip[4], int port);
-static int init_server(int *sock, int port, int type);
+static int init_server(int *sock, int port);
-static int init_server_long(int *sock, int port, char *ip, int type);
+static int init_server_long(int *sock, int port,char *ip);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
@@ -118,10 +98,6 @@ static int host_ip(char *str, unsigned char ip[4]);
 #define SOCKET_PROTOCOL	IPPROTO_TCP
 #endif
 # if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
 static int wsa_init_done = 0;
 # endif
 #ifdef OPENSSL_SYS_WINDOWS
 static struct WSAData wsa_state;
 static int wsa_init_done=0;
@@ -135,8 +111,10 @@ extern HINSTANCE _hInstance;    /* nice global CRT provides */
 static LONG FAR PASCAL topHookProc(HWND hwnd, UINT message, WPARAM wParam,
 	     LPARAM lParam)
 	{
-    if (hwnd == topWnd) {
+	if (hwnd == topWnd)
-        switch (message) {
+		{
 		switch(message)
 			{
 		case WM_DESTROY:
 		case WM_CLOSE:
 			SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopWndProc);
@@ -159,7 +137,8 @@ static BOOL CALLBACK enumproc(HWND hwnd, LPARAM lParam)
 #ifdef OPENSSL_SYS_WINDOWS
 static void ssl_sock_cleanup(void)
 	{
-    if (wsa_init_done) {
+	if (wsa_init_done)
 		{
 		wsa_init_done=0;
 #ifndef OPENSSL_SYS_WINCE
 		WSACancelBlockingCall();
@@ -167,14 +146,6 @@ static void ssl_sock_cleanup(void)
 		WSACleanup();
 		}
 	}
 # elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
 static void sock_cleanup(void)
 {
    if (wsa_init_done) {
        wsa_init_done = 0;
        WSACleanup();
    }
 }
 #endif
 static int ssl_sock_init(void)
@@ -185,7 +156,8 @@ static int ssl_sock_init(void)
 	if (sock_init())
 		return (0);
 #elif defined(OPENSSL_SYS_WINDOWS)
-    if (!wsa_init_done) {
+	if (!wsa_init_done)
 		{
 		int err;
 #ifdef SIGINT
@@ -193,12 +165,13 @@ static int ssl_sock_init(void)
 #endif
 		wsa_init_done=1;
 		memset(&wsa_state,0,sizeof(wsa_state));
-        if (WSAStartup(0x0101, &wsa_state) != 0) {
+		if (WSAStartup(0x0101,&wsa_state)!=0)
 			{
 			err=WSAGetLastError();
-            BIO_printf(bio_err, "unable to start WINSOCK, error code=%d\n",
+			BIO_printf(bio_err,"unable to start WINSOCK, error code=%d\n",err);
                       err);
 			return(0);
 			}
 #ifdef OPENSSL_SYS_WIN16
 		EnumTaskWindows(GetCurrentTask(),enumproc,0L);
 		lpTopWndProc=(FARPROC)GetWindowLong(topWnd,GWL_WNDPROC);
@@ -207,48 +180,30 @@ static int ssl_sock_init(void)
 		SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopHookProc);
 #endif /* OPENSSL_SYS_WIN16 */
 		}
 # elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
    WORD wVerReq;
    WSADATA wsaData;
    int err;
    if (!wsa_init_done) {
 #  ifdef SIGINT
        signal(SIGINT, (void (*)(int))sock_cleanup);
 #  endif
        wsa_init_done = 1;
        wVerReq = MAKEWORD(2, 0);
        err = WSAStartup(wVerReq, &wsaData);
        if (err != 0) {
            BIO_printf(bio_err, "unable to start WINSOCK2, error code=%d\n",
                       err);
            return (0);
        }
    }
 #endif /* OPENSSL_SYS_WINDOWS */
 	return(1);
 	}
-int init_client(int *sock, char *host, int port, int type)
+int init_client(int *sock, char *host, int port)
 	{
 	unsigned char ip[4];
 	short p=0;
    memset(ip, '\0', sizeof ip);
 	if (!host_ip(host,&(ip[0])))
-        return 0;
+		{
-    return init_client_ip(sock, ip, port, type);
+		return(0);
 		}
 	if (p != 0) port=p;
 	return(init_client_ip(sock,ip,port));
 	}
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+static int init_client_ip(int *sock, unsigned char ip[4], int port)
 	{
 	unsigned long addr;
 	struct sockaddr_in them;
 	int s,i;
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
        return (0);
 	memset((char *)&them,0,sizeof(them));
 	them.sin_family=AF_INET;
@@ -256,86 +211,64 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 	addr=(unsigned long)
 		((unsigned long)ip[0]<<24L)|
 		((unsigned long)ip[1]<<16L)|
-        ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
+		((unsigned long)ip[2]<< 8L)|
 		((unsigned long)ip[3]);
 	them.sin_addr.s_addr=htonl(addr);
    if (type == SOCK_STREAM)
 	s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-    else                        /* ( type == SOCK_DGRAM) */
+	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (s == INVALID_SOCKET) {
+#ifndef OPENSSL_SYS_MPE
        perror("socket");
        return (0);
    }
 # if defined(SO_KEEPALIVE) && !defined(OPENSSL_SYS_MPE)
    if (type == SOCK_STREAM) {
 	i=0;
 	i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
-        if (i < 0) {
+	if (i < 0) { perror("keepalive"); return(0); }
            closesocket(s);
            perror("keepalive");
            return (0);
        }
    }
 #endif
-    if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
+	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-        closesocket(s);
+		{ close(s); perror("connect"); return(0); }
        perror("connect");
        return (0);
    }
 	*sock=s;
 	return(1);
 	}
-int do_server(int port, int type, int *ret,
+int do_server(int port, int *ret, int (*cb)(), char *context)
              int (*cb) (char *hostname, int s, int stype,
                         unsigned char *context), unsigned char *context,
              int naccept)
 	{
 	int sock;
-    char *name = NULL;
+	char *name;
-    int accept_socket = 0;
+	int accept_socket;
 	int i;
-    if (!init_server(&accept_socket, port, type))
+	if (!init_server(&accept_socket,port)) return(0);
        return (0);
-    if (ret != NULL) {
+	if (ret != NULL)
 		{
 		*ret=accept_socket;
 		/* return(1);*/
 		}
-    for (;;) {
+	for (;;)
-        if (type == SOCK_STREAM) {
+		{
-            if (do_accept(accept_socket, &sock, &name) == 0) {
+		if (do_accept(accept_socket,&sock,&name) == 0)
 			{
 			SHUTDOWN(accept_socket);
 			return(0);
 			}
-        } else
+		i=(*cb)(name,sock, context);
-            sock = accept_socket;
+		if (name != NULL) OPENSSL_free(name);
        i = (*cb) (name, sock, type, context);
        if (name != NULL)
            OPENSSL_free(name);
        if (type == SOCK_STREAM)
 		SHUTDOWN2(sock);
-        if (naccept != -1)
+		if (i < 0)
-            naccept--;
+			{
        if (i < 0 || naccept == 0) {
 			SHUTDOWN2(accept_socket);
 			return(i);
 			}
 		}
 	}
-static int init_server_long(int *sock, int port, char *ip, int type)
+static int init_server_long(int *sock, int port, char *ip)
 	{
 	int ret=0;
 	struct sockaddr_in server;
-    int s = -1;
+	int s= -1,i;
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
        return (0);
 	memset((char *)&server,0,sizeof(server));
 	server.sin_family=AF_INET;
@@ -349,53 +282,50 @@ static int init_server_long(int *sock, int port, char *ip, int type)
 #else
 		memcpy(&server.sin_addr,ip,4);
 #endif
    if (type == SOCK_STREAM)
 	s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
    else                        /* type == SOCK_DGRAM */
        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (s == INVALID_SOCKET)
+	if (s == INVALID_SOCKET) goto err;
        goto err;
 #if defined SOL_SOCKET && defined SO_REUSEADDR
 		{
 		int j = 1;
-        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
+		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
 			   (void *) &j, sizeof j);
 		}
 #endif
-    if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
+	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
 		{
 #ifndef OPENSSL_SYS_WINDOWS
 		perror("bind");
 #endif
 		goto err;
 		}
 	/* Make it 128 for linux */
-    if (type == SOCK_STREAM && listen(s, 128) == -1)
+	if (listen(s,128) == -1) goto err;
-        goto err;
+	i=0;
 	*sock=s;
 	ret=1;
 err:
-    if ((ret == 0) && (s != -1)) {
+	if ((ret == 0) && (s != -1))
 		{
 		SHUTDOWN(s);
 		}
 	return(ret);
 	}
-static int init_server(int *sock, int port, int type)
+static int init_server(int *sock, int port)
 	{
-    return (init_server_long(sock, port, NULL, type));
+	return(init_server_long(sock, port, NULL));
 	}
 static int do_accept(int acc_sock, int *sock, char **host)
 	{
-    int ret;
+	int ret,i;
 	struct hostent *h1,*h2;
 	static struct sockaddr_in from;
 	int len;
 /*	struct linger ling; */
-    if (!ssl_sock_init())
+	if (!ssl_sock_init()) return(0);
        return (0);
 #ifndef OPENSSL_SYS_WINDOWS
 redoit:
@@ -403,23 +333,21 @@ static int do_accept(int acc_sock, int *sock, char **host)
 	memset((char *)&from,0,sizeof(from));
 	len=sizeof(from);
-    /*
+	/* Note: under VMS with SOCKETSHR the fourth parameter is currently
-     * Note: under VMS with SOCKETSHR the fourth parameter is currently of
+	 * of type (int *) whereas under other systems it is (void *) if
-     * type (int *) whereas under other systems it is (void *) if you don't
+	 * you don't have a cast it will choke the compiler: if you do
-     * have a cast it will choke the compiler: if you do have a cast then you
+	 * have a cast then you can either go for (int *) or (void *).
     * can either go for (int *) or (void *).
 	 */
 	ret=accept(acc_sock,(struct sockaddr *)&from,(void *)&len);
-    if (ret == INVALID_SOCKET) {
+	if (ret == INVALID_SOCKET)
-# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+		{
-        int i;
+#ifdef OPENSSL_SYS_WINDOWS
 		i=WSAGetLastError();
 		BIO_printf(bio_err,"accept error %d\n",i);
 #else
-        if (errno == EINTR) {
+		if (errno == EINTR)
-            /*
+			{
-             * check_timeout();
+			/*check_timeout(); */
             */
 			goto redoit;
 			}
 		fprintf(stderr,"errno=%d ",errno);
@@ -428,7 +356,7 @@ static int do_accept(int acc_sock, int *sock, char **host)
 		return(0);
 		}
-/*-
+/*
 	ling.l_onoff=1;
 	ling.l_linger=0;
 	i=setsockopt(ret,SOL_SOCKET,SO_LINGER,(char *)&ling,sizeof(ling));
@@ -438,8 +366,7 @@ static int do_accept(int acc_sock, int *sock, char **host)
 	if (i < 0) { perror("keepalive"); return(0); }
 */
-    if (host == NULL)
+	if (host == NULL) goto end;
        goto end;
 #ifndef BIT_FIELD_LIMITS
 	/* I should use WSAAsyncGetHostByName() under windows */
 	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
@@ -448,27 +375,31 @@ static int do_accept(int acc_sock, int *sock, char **host)
 	h1=gethostbyaddr((char *)&from.sin_addr,
 		sizeof(struct in_addr),AF_INET);
 #endif
-    if (h1 == NULL) {
+	if (h1 == NULL)
 		{
 		BIO_printf(bio_err,"bad gethostbyaddr\n");
 		*host=NULL;
 		/* return(0); */
-    } else {
+		}
-        if ((*host = (char *)OPENSSL_malloc(strlen(h1->h_name) + 1)) == NULL) {
+	else
 		{
 		if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL)
 			{
 			perror("OPENSSL_malloc");
            closesocket(ret);
 			return(0);
 			}
 		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
 		h2=GetHostByName(*host);
-        if (h2 == NULL) {
+		if (h2 == NULL)
 			{
 			BIO_printf(bio_err,"gethostbyname failure\n");
            closesocket(ret);
 			return(0);
 			}
-        if (h2->h_addrtype != AF_INET) {
+		i=0;
 		if (h2->h_addrtype != AF_INET)
 			{
 			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
            closesocket(ret);
 			return(0);
 			}
 		}
@@ -484,7 +415,8 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
 	h=str;
 	p=strchr(str,':');
-    if (p == NULL) {
+	if (p == NULL)
 		{
 		BIO_printf(bio_err,"no port defined\n");
 		return(0);
 		}
@@ -492,8 +424,7 @@ int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
 	if ((ip != NULL) && !host_ip(str,ip))
 		goto err;
-    if (host_ptr != NULL)
+	if (host_ptr != NULL) *host_ptr=h;
        *host_ptr = h;
 	if (!extract_port(p,port_ptr))
 		goto err;
@@ -507,10 +438,11 @@ static int host_ip(char *str, unsigned char ip[4])
 	unsigned int in[4]; 
 	int i;
-    if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
+	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-        4) {
+		{
 		for (i=0; i<4; i++)
-            if (in[i] > 255) {
+			if (in[i] > 255)
 				{
 				BIO_printf(bio_err,"invalid IP address\n");
 				goto err;
 				}
@@ -518,19 +450,22 @@ static int host_ip(char *str, unsigned char ip[4])
 		ip[1]=in[1];
 		ip[2]=in[2];
 		ip[3]=in[3];
-    } else {                    /* do a gethostbyname */
+		}
 	else
 		{ /* do a gethostbyname */
 		struct hostent *he;
-        if (!ssl_sock_init())
+		if (!ssl_sock_init()) return(0);
            return (0);
 		he=GetHostByName(str);
-        if (he == NULL) {
+		if (he == NULL)
 			{
 			BIO_printf(bio_err,"gethostbyname failure\n");
 			goto err;
 			}
 		/* cast to short because of win16 winsock definition */
-        if ((short)he->h_addrtype != AF_INET) {
+		if ((short)he->h_addrtype != AF_INET)
 			{
 			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
 			return(0);
 			}
@@ -552,9 +487,11 @@ int extract_port(char *str, short *port_ptr)
 	i=atoi(str);
 	if (i != 0)
 		*port_ptr=(unsigned short)i;
-    else {
+	else
 		{
 		s=getservbyname(str,"tcp");
-        if (s == NULL) {
+		if (s == NULL)
 			{
 			BIO_printf(bio_err,"getservbyname failure for %s\n",str);
 			return(0);
 			}
@@ -564,7 +501,8 @@ int extract_port(char *str, short *port_ptr)
 	}
 #define GHBN_NUM	4
-static struct ghbn_cache_st {
+static struct ghbn_cache_st
 	{
 	char name[128];
 	struct hostent ent;
 	unsigned long order;
@@ -579,35 +517,38 @@ static struct hostent *GetHostByName(char *name)
 	int i,lowi=0;
 	unsigned long low= (unsigned long)-1;
-    for (i = 0; i < GHBN_NUM; i++) {
+	for (i=0; i<GHBN_NUM; i++)
-        if (low > ghbn_cache[i].order) {
+		{
 		if (low > ghbn_cache[i].order)
 			{
 			low=ghbn_cache[i].order;
 			lowi=i;
 			}
-        if (ghbn_cache[i].order > 0) {
+		if (ghbn_cache[i].order > 0)
 			{
 			if (strncmp(name,ghbn_cache[i].name,128) == 0)
 				break;
 			}
 		}
-    if (i == GHBN_NUM) {        /* no hit */
+	if (i == GHBN_NUM) /* no hit*/
 		{
 		ghbn_miss++;
 		ret=gethostbyname(name);
-        if (ret == NULL)
+		if (ret == NULL) return(NULL);
            return (NULL);
 		/* else add to cache */
-        if (strlen(name) < sizeof ghbn_cache[0].name) {
+		if(strlen(name) < sizeof ghbn_cache[0].name)
 			{
 			strcpy(ghbn_cache[lowi].name,name);
-            memcpy((char *)&(ghbn_cache[lowi].ent), ret,
+			memcpy((char *)&(ghbn_cache[lowi].ent),ret,sizeof(struct hostent));
                   sizeof(struct hostent));
 			ghbn_cache[lowi].order=ghbn_miss+ghbn_hits;
 			}
 		return(ret);
-    } else {
+		}
 	else
 		{
 		ghbn_hits++;
 		ret= &(ghbn_cache[i].ent);
 		ghbn_cache[i].order=ghbn_miss+ghbn_hits;
 		return(ret);
 		}
 	}
 #endif
--- a/Show More
+++ b/Show More
		`@@ -1,2 +0,0 @@`
			`Please https://www.openssl.org/community/thanks.html for the current`
			`acknowledgements.`