Update STATUS

Time to release 0.9.7-beta4.
The tag will be OpenSSL_0_9_7-beta4
2002-11-19 09:34:38 +00:00 · 2002-11-19 09:34:29 +00:00 · 2002-11-19 08:55:06 +00:00 · 2002-11-18 23:58:33 +00:00 · 2002-11-18 23:06:46 +00:00 · 2002-11-18 23:05:50 +00:00
2152 changed files with 102035 additions and 419812 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,16 @@
 openssl.pc
 Makefile.ssl
 MINFO
 makefile.one
 tmp
 out
 outinc
 rehash.time
 testlog
 make.log
 maketest.log
 cctest
 cctest.c
 cctest.a
 libcrypto.so.*
 libssl.so.*
--- a/.gitignore
+++ b/.gitignore
@@ -1,118 +0,0 @@
 # Object files
 *.o
 *.obj
 # editor artefacts
 *.swp
 .#*
 #*#
 *~
 # Top level excludes
 /Makefile.bak
 /Makefile
 /MINFO
 /*.a
 /include
 /*.pc
 /rehash.time
 /inc.*
 /makefile.*
 /out.*
 /tmp.*
 # Most *.c files under test/ are symlinks
 /test/*.c
 # Apart from these
 !/test/asn1test.c
 !/test/methtest.c
 !/test/dummytest.c
 !/test/igetest.c
 !/test/r160test.c
 !/test/fips_algvs.c
 !/test/testutil.c
 /test/*.ss
 /test/*.srl
 /test/.rnd
 /test/test*.pem
 /test/newkey.pem
 # Certificate symbolic links
 *.0
 # Links under apps
 /apps/CA.pl
 /apps/md4.c
 # Auto generated headers
 /crypto/buildinf.h
 /crypto/opensslconf.h
 # Auto generated assembly language source files
 *.s
 !/crypto/bn/asm/pa-risc2.s
 !/crypto/bn/asm/pa-risc2W.s
 crypto/aes/asm/a_win32.asm
 crypto/bf/asm/b_win32.asm
 crypto/bn/asm/bn_win32.asm
 crypto/bn/asm/co_win32.asm
 crypto/bn/asm/mt_win32.asm
 crypto/cast/asm/c_win32.asm
 crypto/cpu_win32.asm
 crypto/des/asm/d_win32.asm
 crypto/des/asm/y_win32.asm
 crypto/md5/asm/m5_win32.asm
 crypto/rc4/asm/r4_win32.asm
 crypto/rc5/asm/r5_win32.asm
 crypto/ripemd/asm/rm_win32.asm
 crypto/sha/asm/s1_win32.asm
 crypto/sha/asm/sha512-sse2.asm
 # Executables
 /apps/openssl
 /test/sha256t
 /test/sha512t
 /test/gost2814789t
 /test/*test
 /test/fips_aesavs
 /test/fips_desmovs
 /test/fips_dhvs
 /test/fips_drbgvs
 /test/fips_dssvs
 /test/fips_ecdhvs
 /test/fips_ecdsavs
 /test/fips_rngvs
 /test/fips_test_suite
 *.so*
 *.dylib*
 *.dll*
 # Exceptions
 !/test/bctest
 !/crypto/des/times/486-50.sol
 # Misc auto generated files
 /tools/c_rehash
 /test/evptests.txt
 lib
 Makefile.save
 *.bak
 tags
 TAGS
 cscope.out
 *.d
 # Windows
 /tmp32dll
 /tmp32dll.dbg
 /out32dll
 /out32dll.dbg
 /inc32
 /MINFO
 ms/bcb.mak
 ms/libeay32.def
 ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
--- a/30
+++ b/30
@@ -1,30 +0,0 @@
 The OpenSSL project depends on volunteer efforts and financial support from
 the end user community. That support comes in the form of donations and paid
 sponsorships, software support contracts, paid consulting services
 and commissioned software development.
 Since all these activities support the continued development and improvement
 of OpenSSL we consider all these clients and customers as sponsors of the
 OpenSSL project.
 We would like to identify and thank the following such sponsors for their past
 or current significant support of the OpenSSL project:
 Major support:
 	Qualys		http://www.qualys.com/
 Very significant support:
 	OpenGear:	http://www.opengear.com/
 Significant support:
 	PSW Group:	http://www.psw.net/
 	Acano Ltd.	http://acano.com/
 Please note that we ask permission to identify sponsors and that some sponsors
 we consider eligible for inclusion here have requested to remain anonymous.
 Additional sponsorship or financial support is always welcome: for more
 information please contact the OpenSSL Software Foundation.
--- a/5020
+++ b/5020
--- a/CHANGES.SSLeay
+++ b/CHANGES.SSLeay
@@ -29,7 +29,7 @@ eric (about to go bushwalking for the 4 day easter break :-)
 7-Jan-98
    - Finally reworked the cipher string to ciphers again, so it
      works correctly
-    - All the app_data stuff is now ex_data with function calls to access.
+    - All the app_data stuff is now ex_data with funcion calls to access.
      The index is supplied by a function and 'methods' can be setup
      for the types that are called on XXX_new/XXX_free.  This lets
      applications get notified on creation and destruction.  Some of
@@ -148,7 +148,7 @@ eric (about to go bushwalking for the 4 day easter break :-)
      This would tend to cause memory overwrites since SSLv3 has
      a maximum packet size of 16k.  If your program uses
      buffers <= 16k, you would probably never see this problem.
-    - Fixed a 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
@@ -937,7 +937,7 @@ Reasons to start playing with version 0.5.0
  certificate, it is my aim to use perl5/Tk but I don't have time to do
  this right now.  It will generate the certificates but the management
  scripts still need to be written.  This is not a hard task.
- Things have been cleaned up a lot.
+- Things have been cleaned up alot.
 - Have a look at the enc and dgst programs in the apps directory.
 - It supports v3 of x509 certiticates.
--- a/1638
+++ b/1638
--- a/523
+++ b/523
@@ -10,7 +10,6 @@ OpenSSL  -  Frequently Asked Questions
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
 * How does the versioning scheme work?
 [LEGAL] Legal questions
@@ -32,10 +31,6 @@ OpenSSL  -  Frequently Asked Questions
 * Why does my browser give a warning about a mismatched hostname?
 * How do I install a CA certificate into a browser?
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 * What is a "128 bit certificate"? Can I create one with OpenSSL?
 * Why does OpenSSL set the authority key identifier extension incorrectly?
 * How can I set up a bundle of commercial root CA certificates?
 * Some secure servers 'hang' with OpenSSL 1.0.1, is this a bug?
 [BUILD] Questions about building and testing OpenSSL
@@ -49,21 +44,12 @@ OpenSSL  -  Frequently Asked Questions
 * What is special about OpenSSL on Redhat?
 * Why does the OpenSSL compilation fail on MacOS X?
 * Why does the OpenSSL test suite fail on MacOS X?
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 * Why does compiler fail to compile sha512.c?
 * Test suite still fails, what to do?
 * I think I've found a bug, what should I do?
 * I'm SURE I've found a bug, how do I report it?
 * I've found a security issue, how do I report it?
 [PROG] Questions about programming with OpenSSL
 * 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?
@@ -72,11 +58,6 @@ OpenSSL  -  Frequently Asked Questions
 * 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?
 * Why does Valgrind complain about the use of uninitialized data?
 * Why doesn't a memory BIO work when a file does?
 * Where are the declarations and implementations of d2i_X509() etc?
 * When debugging I observe SIGILL during OpenSSL initialization: why?
 ===============================================================================
@@ -85,10 +66,11 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 The current version is available from <URL: http://www.openssl.org>.
 OpenSSL 0.9.6g was released on August 9, 2002.
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
-ftp://ftp.openssl.org/snapshot/>, or get it by anonymous Git access.
+ftp://ftp.openssl.org/snapshot/>, or get it by anonymous CVS access.
 * Where is the documentation?
@@ -100,19 +82,19 @@ explains how to install this library.
 OpenSSL includes a command line utility that can be used to perform a
 variety of cryptographic functions.  It is described in the openssl(1)
-manpage.  Documentation for developers is currently being written. Many
+manpage.  Documentation for developers is currently being written.  A
-manual pages are available; overviews over libcrypto and
+few manual pages already are available; overviews over libcrypto and
 libssl are given in the crypto(3) and ssl(3) manpages.
 The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
 different directory if you specified one as described in INSTALL).
 In addition, you can read the most current versions at
-<URL: http://www.openssl.org/docs/>. Note that the online documents refer
+<URL: http://www.openssl.org/docs/>.
-to the very latest development versions of OpenSSL and may include features
+
-not present in released versions. If in doubt refer to the documentation
+For information on parts of libcrypto that are not yet documented, you
-that came with the version of OpenSSL you are using. The pod format
+might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
-documentation is included in each OpenSSL distribution under the docs
+predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
-directory.
+of this still applies to OpenSSL.
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
@@ -132,14 +114,11 @@ OpenSSL.  Information on the OpenSSL mailing lists is available from
 * Where can I get a compiled version of OpenSSL?
 You can finder pointers to binary distributions in
 <URL: http://www.openssl.org/about/binaries.html> .
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
 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
+If you want to install 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.
@@ -155,8 +134,8 @@ less Unix-centric, it might have been used much earlier.
 With version 0.9.6 OpenSSL was extended to interface to external crypto
 hardware. This was realized in a special release '0.9.6-engine'. With
-version 0.9.7 the changes were merged into the main development line,
+version 0.9.7 (not yet released) the changes were merged into the main
-so that the special release is no longer necessary.
+development line, so that the special release is no longer necessary.
 * How do I check the authenticity of the OpenSSL distribution?
@@ -166,40 +145,22 @@ Use MD5 to check that a tarball from a mirror site is identical:
   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
 You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server, see a
+member public key used to sign it (download it from a key server). Then
 list of keys at <URL: http://www.openssl.org/about/>). Then
 just do:
   pgp TARBALL.asc
 * How does the versioning scheme work?
 After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter 
 releases (e.g. 1.0.1a) can only contain bug and security fixes and no
 new features. Minor releases change the last number (e.g. 1.0.2) and 
 can contain new features that retain binary compatibility. Changes to
 the middle number are considered major releases and neither source nor
 binary compatibility is guaranteed.
 Therefore the answer to the common question "when will feature X be
 backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear
 in the next minor release.
 * What happens when the letter release reaches z?
 It was decided after the release of OpenSSL 0.9.8y the next version should
 be 0.9.8za then 0.9.8zb and so on.
 [LEGAL] =======================================================================
 * Do I need patent licenses to use OpenSSL?
-For information on intellectual property rights, please consult a lawyer.
+The patents section of the README file lists patents that may apply to
-The OpenSSL team does not offer legal advice.
+you if you want to use OpenSSL.  For information on intellectual
 property rights, please consult a lawyer.  The OpenSSL team does not
 offer legal advice.
-You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
+You can configure OpenSSL so as not to use RC5 and IDEA by using
- ./config no-idea no-mdc2 no-rc5
+ ./config no-rc5 no-idea
 * Can I use OpenSSL with GPL software?
@@ -226,30 +187,18 @@ for permission to use their software with OpenSSL.
 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.
+device" that serves this purpose.  On other systems, applications have
-All OpenSSL versions try to use /dev/urandom by default; starting with
+to call the RAND_add() or RAND_seed() function with appropriate data
-version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
+before generating keys or performing public key encryption.
-available.
+(These functions initialize the pseudo-random number generator, PRNG.)
-On other systems, applications have to call the RAND_add() or
+Some broken applications do not do this.  As of version 0.9.5, the
-RAND_seed() function with appropriate data before generating keys or
+OpenSSL functions that need randomness report an error if the random
-performing public key encryption. (These functions initialize the
+number generator has not been seeded with at least 128 bits of
-pseudo-random number generator, PRNG.)  Some broken applications do
+randomness.  If this error occurs, please contact the author of the
-not do this.  As of version 0.9.5, the OpenSSL functions that need
+application you are using.  It is likely that it never worked
-randomness report an error if the random number generator has not been
+correctly.  OpenSSL 0.9.5 and later make the error visible by refusing
-seeded with at least 128 bits of randomness.  If this error occurs and
+to perform potentially insecure encryption.
 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
@@ -282,6 +231,18 @@ 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.
 For Solaris 2.6, Tim Nibbe <tnibbe@sprint.net> and others have suggested
 installing the SUNski package from Sun patch 105710-01 (Sparc) which
 adds a /dev/random device and make sure it gets used, usually through
 $RANDFILE.  There are probably similar patches for the other Solaris
 versions.  An official statement from Sun with respect to /dev/random
 support can be found at
  http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski
 However, be warned that /dev/random is usually a blocking device, which
 may have some effects on OpenSSL.
 A third party /dev/random solution for Solaris is available at
  http://www.cosy.sbg.ac.at/~andi/
 * Why do I get an "unable to write 'random state'" error message?
@@ -300,7 +261,7 @@ current directory in this case, but this has changed with 0.9.6a.)
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
-extensions documentation (in ca(1), req(1), x509v3_config(5) )
+extensions documentation (currently in doc/openssl.txt).
 * Why can't I create certificate requests?
@@ -412,89 +373,9 @@ whatever name they choose.
 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" command line tool for details. The old behaviour
+page of the "openssl x509" commandline tool for details. The old behaviour
 has however been left as default for the sake of compatibility.
 * What is a "128 bit certificate"? Can I create one with OpenSSL?
 The term "128 bit certificate" is a highly misleading marketing term. It does
 *not* refer to the size of the public key in the certificate! A certificate
 containing a 128 bit RSA key would have negligible security.
 There were various other names such as "magic certificates", "SGC
 certificates", "step up certificates" etc.
 You can't generally create such a certificate using OpenSSL but there is no
 need to any more. Nowadays web browsers using unrestricted strong encryption
 are generally available.
 When there were tight restrictions on the export of strong encryption
 software from the US only weak encryption algorithms could be freely exported
 (initially 40 bit and then 56 bit). It was widely recognised that this was
 inadequate. A relaxation of the rules allowed the use of strong encryption but
 only to an authorised server.
 Two slightly different techniques were developed to support this, one used by
 Netscape was called "step up", the other used by MSIE was called "Server Gated
 Cryptography" (SGC). When a browser initially connected to a server it would
 check to see if the certificate contained certain extensions and was issued by
 an authorised authority. If these test succeeded it would reconnect using
 strong encryption.
 Only certain (initially one) certificate authorities could issue the
 certificates and they generally cost more than ordinary certificates.
 Although OpenSSL can create certificates containing the appropriate extensions
 the certificate would not come from a permitted authority and so would not
 be recognized.
 The export laws were later changed to allow almost unrestricted use of strong
 encryption so these certificates are now obsolete.
 * Why does OpenSSL set the authority key identifier (AKID) extension incorrectly?
 It doesn't: this extension is often the cause of confusion.
 Consider a certificate chain A->B->C so that A signs B and B signs C. Suppose
 certificate C contains AKID.
 The purpose of this extension is to identify the authority certificate B. This
 can be done either by including the subject key identifier of B or its issuer
 name and serial number.
 In this latter case because it is identifying certifcate B it must contain the
 issuer name and serial number of B.
 It is often wrongly assumed that it should contain the subject name of B. If it
 did this would be redundant information because it would duplicate the issuer
 name of C.
 * How can I set up a bundle of commercial root CA certificates?
 The OpenSSL software is shipped without any root CA certificate as the
 OpenSSL project does not have any policy on including or excluding
 any specific CA and does not intend to set up such a policy. Deciding
 about which CAs to support is up to application developers or
 administrators.
 Other projects do have other policies so you can for example extract the CA
 bundle used by Mozilla and/or modssl as described in this article:
  <URL: http://www.mail-archive.com/modssl-users@modssl.org/msg16980.html>
 * Some secure servers 'hang' with OpenSSL 1.0.1, is this a bug?
 OpenSSL 1.0.1 is the first release to support TLS 1.2, among other things,
 this increases the size of the default ClientHello message to more than
 255 bytes in length. Some software cannot handle this and hangs. For more
 details and workarounds see:
  <URL: http://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=2771>
 [BUILD] =======================================================================
 * Why does the linker complain about undefined symbols?
@@ -534,7 +415,7 @@ when you run the test suite (using "make test").  The message returned is
 "bc: 1 not implemented".
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
+and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
@@ -545,7 +426,7 @@ that the OpenSSL bntest throws at it.  This gets triggered when you run the
 test suite (using "make test").  The message returned is "bc: stack empty".
 The best way to deal with this is to find another implementation of bc
-and compile/install it.  GNU bc (see <URL: http://www.gnu.org/software/software.html>
+and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
@@ -584,10 +465,6 @@ 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"?
@@ -611,20 +488,17 @@ and then redo the compilation.  What you should really do is make sure
 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
+To solve that problem, one should run VCVARS32.BAT which is found in
-VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
+the 'bin' subdirectory of the VC++ installation directory (somewhere
-installation directory (somewhere under 'Program Files').  For VC++
+under 'Program Files').  This needs to be done prior to running NMAKE,
-version 7 (and up?), which is also called VS.NET, the file is called
+and the changes are only valid for the current DOS session.
 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. Red Hat has chosen to disable support for IDEA, RC5 and
+version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
-MDC2 in this version. The same may apply to other Linux distributions.
+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
@@ -647,6 +521,11 @@ 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?
@@ -673,118 +552,6 @@ libraries you just built.
 Look in the file PROBLEMS for a more detailed explanation and for possible
 solutions.
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 Failure in BN_sqr test is most likely caused by a failure to configure the
 toolkit for current platform or lack of support for the platform in question.
 Run './config -t' and './apps/openssl version -p'. Do these platform
 identifiers match? If they don't, then you most likely failed to run
 ./config and you're hereby advised to do so before filing a bug report.
 If ./config itself fails to run, then it's most likely problem with your
 local environment and you should turn to your system administrator (or
 similar). If identifiers match (and/or no alternative identifier is
 suggested by ./config script), then the platform is unsupported. There might
 or might not be a workaround. Most notably on SPARC64 platforms with GNU
 C compiler you should be able to produce a working build by running
 './config -m32'. I understand that -m32 might not be what you want/need,
 but the build should be operational. For further details turn to
 <openssl-dev@openssl.org>.
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 As of 0.9.7 assembler routines were overhauled for position independence
 of the machine code, which is essential for shared library support. For
 some reason OpenBSD is equipped with an out-of-date GNU assembler which
 finds the new code offensive. To work around the problem, configure with
 no-asm (and sacrifice a great deal of performance) or patch your assembler
 according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
 For your convenience a pre-compiled replacement binary is provided at
 <URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
 Reportedly elder *BSD a.out platforms also suffer from this problem and
 remedy should be same. Provided binary is statically linked and should be
 working across wider range of *BSD branches, not just OpenBSD.
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 If the test program in question fails withs SIGILL, Illegal Instruction
 exception, then you more than likely to run SSE2-capable CPU, such as
 Intel P4, under control of kernel which does not support SSE2
 instruction extensions. See accompanying INSTALL file and
 OPENSSL_ia32cap(3) documentation page for further information.
 * Why does compiler fail to compile sha512.c?
 OpenSSL SHA-512 implementation depends on compiler support for 64-bit
 integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
 couple] lack support for this and therefore are incapable of compiling
 the module in question. The recommendation is to disable SHA-512 by
 adding no-sha512 to ./config [or ./Configure] command line. Another
 possible alternative might be to switch to GCC.
 * Test suite still fails, what to do?
 Another common reason for test failures is bugs in the toolchain
 or run-time environment.  Known cases of this are documented in the
 PROBLEMS file, please review it before you beat the drum. Even if you
 don't find anything in that file, please do consider the possibility
 of a compiler bug. Compiler bugs often appear in rather bizarre ways,
 they never make sense, and tend to emerge when you least expect
 them. One thing to try is to reduce the level of optimization (such
 as by editing the CFLAG variable line in the top-level Makefile),
 and then recompile and re-run the test.
 * I think I've found a bug, what should I do?
 If you are a new user then it is quite likely you haven't found a bug and
 something is happening you aren't familiar with. Check this FAQ, the associated
 documentation and the mailing lists for similar queries. If you are still
 unsure whether it is a bug or not submit a query to the openssl-users mailing
 list.
 If you think you have found a bug based on the output of static analysis tools
 then please manually check the issue is genuine. Such tools can produce a
 LOT of false positives.
 * I'm SURE I've found a bug, how do I report it?
 To avoid duplicated reports check the mailing lists and release notes for the
 relevant version of OpenSSL to see if the problem has been reported already.
 Bug reports with no security implications should be sent to the request
 tracker. This can be done by mailing the report to <rt@openssl.org> (or its
 alias <openssl-bugs@openssl.org>), please note that messages sent to the
 request tracker also appear in the public openssl-dev mailing list.
 The report should be in plain text. Any patches should be sent as
 plain text attachments because some mailers corrupt patches sent inline.
 If your issue affects multiple versions of OpenSSL check any patches apply
 cleanly and, if possible include patches to each affected version.
 The report should be given a meaningful subject line briefly summarising the
 issue. Just "bug in OpenSSL" or "bug in OpenSSL 0.9.8n" is not very helpful.
 By sending reports to the request tracker the bug can then be given a priority
 and assigned to the appropriate maintainer. The history of discussions can be
 accessed and if the issue has been addressed or a reason why not. If patches
 are only sent to openssl-dev they can be mislaid if a team member has to
 wade through months of old messages to review the discussion.
 See also <URL: http://www.openssl.org/support/rt.html>
 * I've found a security issue, how do I report it?
 If you think your bug has security implications then please send it to
 openssl-security@openssl.org if you don't get a prompt reply at least 
 acknowledging receipt then resend or mail it directly to one of the
 more active team members (e.g. Steve). If you wish to use PGP to send
 in a report please use one or more of the keys of the team members listed
 at <URL: http://www.openssl.org/about/>
 Note that bugs only present in the openssl utility are not in general
 considered to be security issues. 
 [PROG] ========================================================================
 * Is OpenSSL thread-safe?
@@ -796,11 +563,8 @@ 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
+OpenSSL.  This is described in the threads(3) manpage.
-CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
+
 including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback()
 and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
 and friends. This is described in the threads(3) manpage.
 * I've compiled a program under Windows and it crashes: why?
@@ -820,10 +584,10 @@ your application must link  against the same by which OpenSSL was
 built.  If you are using MS Visual C++ (Studio) this can be changed
 by:
- 1. Select Settings... from the Project Menu.
+1.  Select Settings... from the Project Menu.
- 2. Select the C/C++ Tab.
+2.  Select the C/C++ Tab.
- 3. Select "Code Generation from the "Category" drop down list box
+3.  Select "Code Generation from the "Category" drop down list box
- 4. Select the Appropriate library (see table below) from the "Use
+4.  Select the Appropriate library (see table below) from the "Use
    run-time library" drop down list box.  Perform this step for both
    your debug and release versions of your application (look at the
    top left of the settings panel to change between the two)
@@ -842,46 +606,32 @@ by:
 Note that debug and release libraries are NOT interchangeable.  If you
 built OpenSSL with /MD your application must use /MD and cannot use /MDd.
 As per 0.9.8 the above limitation is eliminated for .DLLs. OpenSSL
 .DLLs compiled with some specific run-time option [we insist on the
 default /MD] can be deployed with application compiled with different
 option or even different compiler. But there is a catch! Instead of
 re-compiling OpenSSL toolkit, as you would have to with prior versions,
 you have to compile small C snippet with compiler and/or options of
 your choice. The snippet gets installed as
 <install-root>/include/openssl/applink.c and should be either added to
 your application project or simply #include-d in one [and only one]
 of your application source files. Failure to link this shim module
 into your application manifests itself as fatal "no OPENSSL_Applink"
 run-time error. An explicit reminder is due that in this situation
 [mixing compiler options] it is as important to add CRYPTO_malloc_init
 prior first call to OpenSSL.
 * How do I read or write a DER encoded buffer using the ASN1 functions?
 You have two options. You can either use a memory BIO in conjunction
-with the i2d_*_bio() or d2i_*_bio() functions or you can use the
+with the i2d_XXX_bio() or d2i_XXX_bio() functions or you can use the
-i2d_*(), d2i_*() functions directly. Since these are often 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;
+unsigned char *buf, *p;
- int len;
+int len;
- len = i2d_PKCS7(p7, NULL);
+len = i2d_PKCS7(p7, NULL);
- buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
+buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
- p = buf;
+p = buf;
- i2d_PKCS7(p7, &p);
+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;
+unsigned char *p;
- p = buf;
+p = buf;
- p7 = d2i_PKCS7(NULL, &p, len);
+p7 = d2i_PKCS7(NULL, &p, len);
-At this point p7 contains a valid PKCS7 structure or NULL if an error
+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.
@@ -893,35 +643,6 @@ that has been read or written. This may well be uninitialized data
 and attempts to free the buffer will have unpredictable results
 because it no longer points to the same address.
 Memory allocation and encoding can also be combined in a single
 operation by the ASN1 routines:
 unsigned char *buf = NULL;	/* mandatory */
 int len;
 len = i2d_PKCS7(p7, &buf);
 if (len < 0)
 	/* Error */
 /* Do some things with 'buf' */
 /* Finished with buf: free it */
 OPENSSL_free(buf);
 In this special case the "buf" parameter is *not* incremented, it points
 to the start of the encoding.
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 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?
@@ -956,11 +677,11 @@ code itself (the hex digits after the second colon).
 * Why do I get errors about unknown algorithms?
-The cause is forgetting to load OpenSSL's table of algorithms with
+This can happen under several circumstances such as reading in an
-OpenSSL_add_all_algorithms(). See the manual page for more information. This
+encrypted private key or attempting to decrypt a PKCS#12 file. The cause
-can cause several problems such as being unable to read in an encrypted
+is forgetting to load OpenSSL's table of algorithms with
-PEM file, unable to decrypt a PKCS#12 file or signature failure when
+OpenSSL_add_all_algorithms(). See the manual page for more information.
-verifying certificates.
+
 * Why can't the OpenSSH configure script detect OpenSSL?
@@ -975,7 +696,6 @@ 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!
@@ -1005,84 +725,5 @@ 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().
 * Why does Valgrind complain about the use of uninitialized data?
 When OpenSSL's PRNG routines are called to generate random numbers the supplied
 buffer contents are mixed into the entropy pool: so it technically does not
 matter whether the buffer is initialized at this point or not.  Valgrind (and
 other test tools) will complain about this. When using Valgrind, make sure the
 OpenSSL library has been compiled with the PURIFY macro defined (-DPURIFY)
 to get rid of these warnings.
 * Why doesn't a memory BIO work when a file does?
 This can occur in several cases for example reading an S/MIME email message.
 The reason is that a memory BIO can do one of two things when all the data
 has been read from it.
 The default behaviour is to indicate that no more data is available and that
 the call should be retried, this is to allow the application to fill up the BIO
 again if necessary.
 Alternatively it can indicate that no more data is available and that EOF has
 been reached.
 If a memory BIO is to behave in the same way as a file this second behaviour
 is needed. This must be done by calling:
   BIO_set_mem_eof_return(bio, 0);
 See the manual pages for more details.
 * Where are the declarations and implementations of d2i_X509() etc?
 These are defined and implemented by macros of the form:
 DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509)
 The implementation passes an ASN1 "template" defining the structure into an
 ASN1 interpreter using generalised functions such as ASN1_item_d2i().
 * When debugging I observe SIGILL during OpenSSL initialization: why?
 OpenSSL adapts to processor it executes on and for this reason has to
 query its capabilities. Unfortunately on some processors the only way
 to achieve this for non-privileged code is to attempt instructions
 that can cause Illegal Instruction exceptions. The initialization
 procedure is coded to handle these exceptions to manipulate corresponding
 bits in capabilities vector. This normally appears transparent, except
 when you execute it under debugger, which stops prior delivering signal
 to handler. Simply resuming execution does the trick, but when debugging
 a lot it might feel counterproductive. Two options. Either set explicit
 capability environment variable in order to bypass the capability query
 (see corresponding crypto/*cap.c for details). Or configure debugger not
 to stop upon SIGILL exception, e.g. in gdb case add 'handle SIGILL nostop'
 to your .gdbinit.
 ===============================================================================
--- a/10
+++ b/10
@@ -1,10 +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=make
 which bsdmake > /dev/null && MAKE=bsdmake
 $MAKE -f makefile.$BRANCH init
--- a/7
+++ b/7
@@ -1,7 +0,0 @@
 #!/bin/sh
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 MAKE=make
 which bsdmake > /dev/null && MAKE=bsdmake
 $MAKE -f makefile.$BRANCH $@
--- a/68
+++ b/68
@@ -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,30 +73,14 @@
  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 extension is
 		detected at run-time, but the decision whether or not the
 		machine code will be executed is taken solely on CPU
 		capability vector. This means that if you happen to run OS
 		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.
@@ -158,8 +140,8 @@
     standard headers).  If it is a problem with OpenSSL itself, please
     report the problem to <openssl-bugs@openssl.org> (note that your
     message will be recorded in the request tracker publicly readable
-     via http://www.openssl.org/support/rt.html and will be forwarded to a
+     via http://www.openssl.org/rt2.html and will be forwarded to a public
-     public mailing list). Include the output of "make report" in your message.
+     mailing list). Include the output of "make report" in your message.
     Please check out the request tracker. Maybe the bug was already
     reported or has already been fixed.
@@ -176,11 +158,11 @@
     If a test fails, look at the output.  There may be reasons for
     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
+     try removing any compiler optimization flags from the CFLAGS line
     in Makefile.ssl and run "make clean; make". Please send a bug
     report to <openssl-bugs@openssl.org>, including the output of
     "make report" in order to be added to the request tracker at
-     http://www.openssl.org/support/rt.html.
+     http://www.openssl.org/rt2.html.
  4. If everything tests ok, install OpenSSL with
@@ -206,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
@@ -306,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,
@@ -330,25 +308,3 @@
 to install additional support software to obtain random seed.
 Please check out the manual pages for RAND_add(), RAND_bytes(), RAND_egd(),
 and the FAQ for more information.
 Note on support for multiple builds
 -----------------------------------
 OpenSSL is usually built in its source tree.  Unfortunately, this doesn't
 support building for multiple platforms from the same source tree very well.
 It is however possible to build in a separate tree through the use of lots
 of symbolic links, which should be prepared like this:
 	mkdir -p objtree/"`uname -s`-`uname -r`-`uname -m`"
 	cd objtree/"`uname -s`-`uname -r`-`uname -m`"
 	(cd $OPENSSL_SOURCE; find . -type f) | while read F; do
 		mkdir -p `dirname $F`
 		rm -f $F; ln -s $OPENSSL_SOURCE/$F $F
 		echo $F '->' $OPENSSL_SOURCE/$F
 	done
 	make -f Makefile.org clean
 OPENSSL_SOURCE is an environment variable that contains the absolute (this
 is important!) path to the OpenSSL source tree.
 Also, operations like 'make update' should still be made in the source tree.
--- a/INSTALL.DJGPP
+++ b/INSTALL.DJGPP
@@ -3,45 +3,30 @@
 INSTALLATION ON THE DOS PLATFORM WITH DJGPP
 -------------------------------------------
- OpenSSL has been ported to DJGPP, a Unix look-alike 32-bit run-time
+ Openssl has been ported to DOS, but only with long filename support. If
- environment for 16-bit DOS, but only with long filename support.
+ you wish to compile on native DOS with 8+3 filenames, you will have to
- If you wish to compile on native DOS with 8+3 filenames, you will
+ tweak the installation yourself, including renaming files with illegal
- have to tweak the installation yourself, including renaming files
+ or duplicate names.
 with illegal or duplicate names.
 You should have a full DJGPP environment installed, including the
 latest versions of DJGPP, GCC, BINUTILS, BASH, etc. This package
 requires that PERL and BC also be installed.
- All of these can be obtained from the usual DJGPP mirror sites or
+ All of these can be obtained from the usual DJGPP mirror sites, such as
- directly at "http://www.delorie.com/pub/djgpp". For help on which
+ "ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp". You also need to have
 files to download, see the DJGPP "ZIP PICKER" page at
 "http://www.delorie.com/djgpp/zip-picker.html". You also need to have
 the WATT-32 networking package installed before you try to compile
- OpenSSL. This can be obtained from "http://www.bgnett.no/~giva/".
+ openssl. This can be obtained from "http://www.bgnett.no/~giva/". The
- The Makefile assumes that the WATT-32 code is in the directory
+ Makefile assumes that the WATT-32 code is in directory "watt32" under
- specified by the environment variable WATT_ROOT. If you have watt-32
+ /dev/env/DJDIR.
 in directory "watt32" under your main DJGPP directory, specify
 WATT_ROOT="/dev/env/DJDIR/watt32".
- To compile OpenSSL, start your BASH shell, then configure for DJGPP by
+ To compile openssl, start your BASH shell. Then configure for DOS by
- running "./Configure" with appropriate arguments:
+ running "./Configure" with appropriate arguments. The basic syntax for
 DOS is:
 ./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
-	./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
+ You may run out of DPMI selectors when running in a DOS box under
 Windows. If so, just close the BASH shell, go back to Windows, and
 restart BASH. Then run "make" again.
- And finally fire up "make". You may run out of DPMI selectors when
+ Building openssl under DJGPP has been tested with DJGPP 2.03,
- running in a DOS box under Windows. If so, just close the BASH
+ GCC 2.952, GCC 2.953, perl 5.005_02 and perl 5.006_01.
 shell, go back to Windows, and restart BASH. Then run "make" again.
 RUN-TIME CAVEAT LECTOR
 --------------
 Quoting FAQ:
  "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."
 As of version 0.9.7f DJGPP port checks upon /dev/urandom$ for a 3rd
 party "randomness" DOS driver. One such driver, NOISE.SYS, can be
 obtained from "http://www.rahul.net/dkaufman/index.html".
--- a/INSTALL.MacOS
+++ b/INSTALL.MacOS
@@ -0,0 +1,72 @@
 OpenSSL - Port To The Macintosh OS 9 or Earlier
 ===============================================
 Thanks to Roy Wood <roy@centricsystems.ca> initial support for Mac OS (pre
 X) is now provided. "Initial" means that unlike other platforms where you
 get an SDK and a "swiss army" openssl application, on Macintosh you only
 get one sample application which fetches a page over HTTPS(*) and dumps it
 in a window. We don't even build the test applications so that we can't
 guarantee that all algorithms are operational.
 Required software:
 - StuffIt Expander 5.5 or later, alternatively MacGzip and SUNtar;
 - Scriptable Finder;
 - CodeWarrior Pro 5;
 Installation procedure:
 - fetch the source at ftp://ftp.openssl.org/ (well, you probably already
  did, huh?)
 - unpack the .tar.gz file:
 	- if you have StuffIt Expander then just drag it over it;
 	- otherwise uncompress it with MacGzip and then unpack with SUNtar;
 - locate MacOS folder in OpenSSL source tree and open it;
 - unbinhex mklinks.as.hqx and OpenSSL.mcp.hqx if present (**), do it
  "in-place", i.e. unpacked files should end-up in the very same folder;
 - execute mklinks.as;
 - open OpenSSL.mcp(***) and build 'GetHTTPS PPC' target(****);
 - that's it for now;
 (*)	URL is hardcoded into ./MacOS/GetHTTPS.src/GetHTTPS.cpp, lines 40
        to 42, change appropriately.
 (**)	If you use SUNtar, then it might have already unbinhexed the files
 	in question.
 (***)	The project file was saved with CW Pro 5.3. If you have an earlier
 	version and it refuses to open it, then download
 	http://www.openssl.org/~appro/OpenSSL.mcp.xml and import it
 	overwriting the original OpenSSL.mcp.
 (****)	Other targets are works in progress. If you feel like giving 'em a
 	shot, then you should know that OpenSSL* and Lib* targets are
 	supposed to be built with the GUSI, MacOS library which mimics
 	BSD sockets and some other POSIX APIs. The GUSI distribution is
 	expected to be found in the same directory as the openssl source tree,
 	i.e., in the parent directory to the one where this very file,
 	namely INSTALL.MacOS, resides. For more information about GUSI, see
 	http://www.iis.ee.ethz.ch/~neeri/macintosh/gusi-qa.html
 Finally some essential comments from our generous contributor:-)
 "I've gotten OpenSSL working on the Macintosh. It's probably a bit of a
 hack, but it works for what I'm doing. If you don't like the way I've done
 it, then feel free to change what I've done. I freely admit that I've done
 some less-than-ideal things in my port, and if you don't like the way I've
 done something, then feel free to change it-- I won't be offended!
 ... I've tweaked "bss_sock.c" a little to call routines in a "MacSocket"
 library I wrote. My MacSocket library is a wrapper around OpenTransport,
 handling stuff like endpoint creation, reading, writing, etc. It is not
 designed as a high-performance package such as you'd use in a webserver,
 but is fine for lots of other applications. MacSocket also uses some other
 code libraries I've written to deal with string manipulations and error
 handling. Feel free to use these things in your own code, but give me
 credit and/or send me free stuff in appreciation! :-)
 ...
 If you have any questions, feel free to email me as the following:
 roy@centricsystems.ca
 -Roy Wood"
--- 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 separate screen.  Therefore, the build also creates openssl2.nlm.
 Openssl2.nlm is functionally identical but uses the console screen.
 Openssl2 can be used when a non-interactive mode is desired.
 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.
@@ -134,7 +146,7 @@ Currently, the logical names supported are:
                        will not be implemented.  Supported algorithms to
                        do this with are: RSA, DSA, DH, MD2, MD4, MD5, RIPEMD,
                        SHA, DES, MDC2, CR2, RC4, RC5, IDEA, BF, CAST, HMAC,
-                        SSL3.  So, for example, having the logical name
+                        SSL2.  So, for example, having the logical name
                        OPENSSL_NO_RSA with the value YES means that the
                        LIBCRYPTO.OLB library will not contain an RSA
                        implementation.
@@ -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,42 @@
 ----------------------------------
 [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
+ ActiveState Perl, available from http://www.activestate.com/ActivePerl.
- and Windows 98 [there is Winsock 2 update for Windows 95 though].
+ For Cygwin users, there's more info in the Cygwin section.
- - you need Perl for Win32.  Unless you will build on Cygwin, you will need
+ and one of the following C compilers:
   ActiveState Perl, available from http://www.activestate.com/ActivePerl.
 - one of the following C compilers:
  * Visual C++
  * Borland C
-  * GNU C (Cygwin or MinGW)
+  * GNU C (Mingw32 or Cygwin)
- Netwide Assembler, a.k.a. NASM, available from http://nasm.sourceforge.net/
+ If you want to compile in the assembly language routines with Visual C++ then
-  is required if you intend to utilize assembler modules. Note that NASM
+ you will need an assembler. This is worth doing because it will result in
-  is now the only supported assembler.
+ faster code: for example it will typically result in a 2 times speedup in the
 RSA routines. Currently the following assemblers are supported:
- If you are compiling from a tarball or a Git snapshot then the Win32 files
+  * Microsoft MASM (aka "ml")
  * Free Netwide Assembler NASM.
 MASM was at one point distributed with VC++. It is now 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.
 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.
 If you are compiling from a tarball or a CVS snapshot then the Win32 files
 may well be not up to date. This may mean that some "tweaking" is required to
 get it all to work. See the trouble shooting section later on for if (when?)
 it goes wrong.
@@ -37,18 +46,16 @@
 Visual C++
 ----------
- If you want to compile in the assembly language routines with Visual
+ Firstly you should run Configure:
 C++, then you will need already mentioned Netwide Assembler binary,
 nasmw.exe or nasm.exe, to be available on your %PATH%.
- Firstly you should run Configure with platform VC-WIN32:
+ > perl Configure VC-WIN32
- > perl Configure VC-WIN32 --prefix=c:\some\openssl\dir
+ Next you need to build the Makefiles and optionally the assembly language
 files:
- Where the prefix argument specifies where OpenSSL will be installed to.
+ - If you are using MASM then run:
- Next you need to build the Makefiles and optionally the assembly
+   > ms\do_masm
 language files:
 - If you are using NASM then run:
@@ -56,7 +63,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,39 +73,30 @@
 > 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
 ---------------------
@@ -122,31 +119,62 @@
 * Run make:
   > make -f bcb.mak
 GNU C (Mingw32)
 ---------------
 To build OpenSSL, you need the Mingw32 package and GNU make.
 * Compiler installation:
   Mingw32 is available from <ftp://ftp.xraylith.wisc.edu/pub/khan/
   gnu-win32/mingw32/gcc-2.95.2/gcc-2.95.2-msvcrt.exe>. Extract it
   to a directory such as C:\gcc-2.95.2 and add c:\gcc-2.95.2\bin to
   the PATH environment variable in "System Properties"; or edit and
   run C:\gcc-2.95.2\mingw32.bat to set the PATH.
 * Compile OpenSSL:
   > ms\mingw32
   This will create the library and binaries in out. In case any problems
   occur, try
   > ms\mingw32 no-asm
   instead.
   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 having
   a number assigned.
 * You can now try the tests:
   > cd out
   > ..\ms\test
 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 W32 makes which are
- use the Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
+ based on a single makefile approach. Cygwin implements Posix/Unix
- MinGW. MinGW can be used in the Cygwin development environment or in a
+ calls through cygwin1.dll, and is contrasted to Mingw32 which links
- standalone setup as described in the following section.
+ dynamically to msvcrt.dll or crtdll.dll.
 To build OpenSSL using Cygwin:
 * Install Cygwin (see http://cygwin.com/)
- * Install Perl and ensure it is in the path. Both Cygwin perl
+ * Install Perl and ensure it is in the path (recent Cygwin perl 
-   (5.6.1-2 or newer) and ActivePerl work.
+   (version 5.6.1-2 of the latter has been reported to work) or
   ActivePerl)
 * Run the Cygwin bash shell
 * $ tar zxvf openssl-x.x.x.tar.gz
   $ cd openssl-x.x.x
   To build the Cygwin version of OpenSSL:
   $ ./config
   [...]
   $ make
@@ -154,16 +182,7 @@
   $ make test
   $ make install
-   This will create a default install in /usr/local/ssl.
+ This will create a default install in /usr/local/ssl.
   To build the MinGW version (native Windows) in Cygwin:
   $ ./Configure mingw
   [...]
   $ make
   [...]
   $ make test
   $ make install
 Cygwin Notes:
@@ -176,44 +195,6 @@
 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)
 -------------
 * Compiler and shell environment installation:
   MinGW and MSYS are available from http://www.mingw.org/, both are
   required. Run the installers and do whatever magic they say it takes
   to start MSYS bash shell with GNU tools on its PATH.
   N.B. Since source tar-ball can contain symbolic links, it's essential
   that you use accompanying MSYS tar to unpack the source. It will
   either handle them in one way or another or fail to extract them,
   which does the trick too. Latter means that you may safely ignore all
   "cannot create symlink" messages, as they will be "re-created" at
   configure stage by copying corresponding files. Alternative programs
   were observed to create empty files instead, which results in build
   failure.
 * Compile OpenSSL:
   $ ./config
   [...]
   $ make
   [...]
   $ make test
   This will create the library and binaries in root source directory
   and openssl.exe application in apps directory.
   It is also possible to cross-compile it on Linux by configuring
   with './Configure --cross-compile-prefix=i386-mingw32- mingw ...'.
   'make test' is naturally not applicable then.
   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
   having a number assigned.
 Installation
 ------------
@@ -233,7 +214,7 @@
 	$ md c:\openssl\lib
 	$ md c:\openssl\include
 	$ md c:\openssl\include\openssl
-	$ copy /b inc32\openssl\*       c:\openssl\include\openssl
+	$ copy /b inc32\*               c:\openssl\include\openssl
 	$ copy /b out32dll\ssleay32.lib c:\openssl\lib
 	$ copy /b out32dll\libeay32.lib c:\openssl\lib
 	$ copy /b out32dll\ssleay32.dll c:\openssl\bin
@@ -257,7 +238,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 +275,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,21 @@
 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_
+ The C Runtime Library implementation for Windows CE that is included with
-
+ Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
-  * PocketConsole driver and PortSDK available at
+ incorrect.  wcecompat plugs the holes and tries to bring the Windows CE
-    http://www.symbolictools.de/public/pocketconsole/
+ CRT to a level that is more compatible with ANSI C.  wcecompat goes further
-  * CMD command interpreter (same location)
+ and provides low-level IO and stream IO support for stdin/stdout/stderr
-
+ (which Windows CE does not provide).  This IO functionality is not needed
- As Windows CE support in OpenSSL relies on 3rd party compatibility
+ by the OpenSSL library itself but is used for the tests and openssl.exe.
- library, it's appropriate to check corresponding URL for updates. For
+ More information is available at www.essemer.com.au.
 example if you choose wcecompat, note that as for the moment of this
 writing version 1.2 is available and actually required for WCE 4.2
 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 +28,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
+ > set WCECOMPAT=C:\wcecompat
    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 +46,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-2011 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 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/GUSI_Init.cpp
+++ b/MacOS/GUSI_Init.cpp
@@ -0,0 +1,62 @@
 /**************** BEGIN GUSI CONFIGURATION ****************************
 *
 * GUSI Configuration section generated by GUSI Configurator
 * last modified: Wed Jan  5 20:33:51 2000
 *
 * This section will be overwritten by the next run of Configurator.
 */
 #define GUSI_SOURCE
 #include <GUSIConfig.h>
 #include <sys/cdefs.h>
 /* Declarations of Socket Factories */
 __BEGIN_DECLS
 void GUSIwithInetSockets();
 void GUSIwithLocalSockets();
 void GUSIwithMTInetSockets();
 void GUSIwithMTTcpSockets();
 void GUSIwithMTUdpSockets();
 void GUSIwithOTInetSockets();
 void GUSIwithOTTcpSockets();
 void GUSIwithOTUdpSockets();
 void GUSIwithPPCSockets();
 void GUSISetupFactories();
 __END_DECLS
 /* Configure Socket Factories */
 void GUSISetupFactories()
 {
 #ifdef GUSISetupFactories_BeginHook
 	GUSISetupFactories_BeginHook
 #endif
 	GUSIwithInetSockets();
 #ifdef GUSISetupFactories_EndHook
 	GUSISetupFactories_EndHook
 #endif
 }
 /* Declarations of File Devices */
 __BEGIN_DECLS
 void GUSIwithDConSockets();
 void GUSIwithNullSockets();
 void GUSISetupDevices();
 __END_DECLS
 /* Configure File Devices */
 void GUSISetupDevices()
 {
 #ifdef GUSISetupDevices_BeginHook
 	GUSISetupDevices_BeginHook
 #endif
 	GUSIwithNullSockets();
 #ifdef GUSISetupDevices_EndHook
 	GUSISetupDevices_EndHook
 #endif
 }
 /**************** END GUSI CONFIGURATION *************************/
--- a/MacOS/GetHTTPS.src/CPStringUtils.cpp
+++ b/MacOS/GetHTTPS.src/CPStringUtils.cpp
--- a/MacOS/GetHTTPS.src/CPStringUtils.hpp
+++ b/MacOS/GetHTTPS.src/CPStringUtils.hpp
@@ -0,0 +1,104 @@
 #pragma once
 #ifdef __cplusplus
 extern "C" {
 #endif
 void CopyPStrToCStr(const unsigned char *thePStr,char *theCStr,const int maxCStrLength);
 void CopyPStrToPStr(const unsigned char *theSrcPStr,unsigned char *theDstPStr,const int maxDstStrLength);
 void CopyCStrToCStr(const char *theSrcCStr,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrToPStr(const char *theSrcCStr,unsigned char *theDstPStr,const int maxDstStrLength);
 void ConcatPStrToCStr(const unsigned char *thePStr,char *theCStr,const int maxCStrLength);
 void ConcatPStrToPStr(const unsigned char *theSrcPStr,unsigned char *theDstPStr,const int maxDstStrLength);
 void ConcatCStrToPStr(const char *theSrcCStr,unsigned char *theDstPStr,const int maxDstStrLength);
 void ConcatCStrToCStr(const char *theSrcCStr,char *theDstCStr,const int maxCStrLength);
 void ConcatCharToCStr(const char theChar,char *theDstCStr,const int maxCStrLength);
 void ConcatCharToPStr(const char theChar,unsigned char *theDstPStr,const int maxPStrLength);
 int ComparePStrs(const unsigned char *theFirstPStr,const unsigned char *theSecondPStr,const Boolean ignoreCase = true);
 int CompareCStrs(const char *theFirstCStr,const char *theSecondCStr,const Boolean ignoreCase = true);
 int CompareCStrToPStr(const char *theCStr,const unsigned char *thePStr,const Boolean ignoreCase = true);
 Boolean CStrsAreEqual(const char *theFirstCStr,const char *theSecondCStr,const Boolean ignoreCase = true);
 Boolean PStrsAreEqual(const unsigned char *theFirstCStr,const unsigned char *theSecondCStr,const Boolean ignoreCase = true);
 void CopyLongIntToCStr(const long theNum,char *theCStr,const int maxCStrLength,const int numDigits = -1);
 void CopyUnsignedLongIntToCStr(const unsigned long theNum,char *theCStr,const int maxCStrLength);
 void ConcatLongIntToCStr(const long theNum,char *theCStr,const int maxCStrLength,const int numDigits = -1);
 void CopyCStrAndConcatLongIntToCStr(const char *theSrcCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
 void CopyLongIntToPStr(const long theNum,unsigned char *thePStr,const int maxPStrLength,const int numDigits = -1);
 void ConcatLongIntToPStr(const long theNum,unsigned char *thePStr,const int maxPStrLength,const int numDigits = -1);
 long CStrLength(const char *theCString);
 long PStrLength(const unsigned char *thePString);
 OSErr CopyCStrToExistingHandle(const char *theCString,Handle theHandle);
 OSErr CopyLongIntToExistingHandle(const long inTheLongInt,Handle theHandle);
 OSErr CopyCStrToNewHandle(const char *theCString,Handle *theHandle);
 OSErr CopyPStrToNewHandle(const unsigned char *thePString,Handle *theHandle);
 OSErr CopyLongIntToNewHandle(const long inTheLongInt,Handle *theHandle);
 OSErr AppendCStrToHandle(const char *theCString,Handle theHandle,long *currentLength = nil,long *maxLength = nil);
 OSErr AppendCharsToHandle(const char *theChars,const int numChars,Handle theHandle,long *currentLength = nil,long *maxLength = nil);
 OSErr AppendPStrToHandle(const unsigned char *thePString,Handle theHandle,long *currentLength = nil);
 OSErr AppendLongIntToHandle(const long inTheLongInt,Handle theHandle,long *currentLength = nil);
 void ZeroMem(void *theMemPtr,const unsigned long numBytes);
 char *FindCharInCStr(const char theChar,const char *theCString);
 long FindCharOffsetInCStr(const char theChar,const char *theCString,const Boolean inIgnoreCase = false);
 long FindCStrOffsetInCStr(const char *theCSubstring,const char *theCString,const Boolean inIgnoreCase = false);
 void CopyCSubstrToCStr(const char *theSrcCStr,const int maxCharsToCopy,char *theDstCStr,const int maxDstStrLength);
 void CopyCSubstrToPStr(const char *theSrcCStr,const int maxCharsToCopy,unsigned char *theDstPStr,const int maxDstStrLength);
 void InsertCStrIntoCStr(const char *theSrcCStr,const int theInsertionOffset,char *theDstCStr,const int maxDstStrLength);
 void InsertPStrIntoCStr(const unsigned char *theSrcPStr,const int theInsertionOffset,char *theDstCStr,const int maxDstStrLength);
 OSErr InsertCStrIntoHandle(const char *theCString,Handle theHandle,const long inInsertOffset);
 void CopyCStrAndInsertCStrIntoCStr(const char *theSrcCStr,const char *theInsertCStr,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrAndInsertCStrsLongIntsIntoCStr(const char *theSrcCStr,const char **theInsertCStrs,const long *theLongInts,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrAndInsert1LongIntIntoCStr(const char *theSrcCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrAndInsert2LongIntsIntoCStr(const char *theSrcCStr,const long long1,const long long2,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrAndInsert3LongIntsIntoCStr(const char *theSrcCStr,const long long1,const long long2,const long long3,char *theDstCStr,const int maxDstStrLength);
 void CopyCStrAndInsertCStrLongIntIntoCStr(const char *theSrcCStr,const char *theInsertCStr,const long theNum,char *theDstCStr,const int maxDstStrLength);
 OSErr CopyCStrAndInsertCStrLongIntIntoHandle(const char *theSrcCStr,const char *theInsertCStr,const long theNum,Handle *theHandle);
 OSErr CopyIndexedWordToCStr(char *theSrcCStr,int whichWord,char *theDstCStr,int maxDstCStrLength);
 OSErr CopyIndexedWordToNewHandle(char *theSrcCStr,int whichWord,Handle *outTheHandle);
 OSErr CopyIndexedLineToCStr(const char *theSrcCStr,int inWhichLine,int *lineEndIndex,Boolean *gotLastLine,char *theDstCStr,const int maxDstCStrLength);
 OSErr CopyIndexedLineToNewHandle(const char *theSrcCStr,int inWhichLine,Handle *outNewHandle);
 OSErr ExtractIntFromCStr(const char *theSrcCStr,int *outInt,Boolean skipLeadingSpaces = true);
 OSErr ExtractIntFromPStr(const unsigned char *theSrcPStr,int *outInt,Boolean skipLeadingSpaces = true);
 void ConvertCStrToUpperCase(char *theSrcCStr);
 int CountOccurencesOfCharInCStr(const char inChar,const char *inSrcCStr);
 int CountWordsInCStr(const char *inSrcCStr);
 OSErr CountDigits(const char *inCStr,int *outNumIntegerDigits,int *outNumFractDigits);
 void ExtractCStrItemFromCStr(const char *inSrcCStr,const char inItemDelimiter,const int inItemNumber,Boolean *foundItem,char *outDstCharPtr,const int inDstCharPtrMaxLength,const Boolean inTreatMultipleDelimsAsSingleDelim = false);
 OSErr ExtractCStrItemFromCStrIntoNewHandle(const char *inSrcCStr,const char inItemDelimiter,const int inItemNumber,Boolean *foundItem,Handle *outNewHandle,const Boolean inTreatMultipleDelimsAsSingleDelim = false);
 OSErr ExtractFloatFromCStr(const char *inCString,extended80 *outFloat);
 OSErr CopyFloatToCStr(const extended80 *theFloat,char *theCStr,const int maxCStrLength,const int inMaxNumIntDigits = -1,const int inMaxNumFractDigits = -1);
 void SkipWhiteSpace(char **ioSrcCharPtr,const Boolean inStopAtEOL = false);
 #ifdef __cplusplus
 }
 #endif
--- a/MacOS/GetHTTPS.src/ErrorHandling.cpp
+++ b/MacOS/GetHTTPS.src/ErrorHandling.cpp
@@ -1,6 +1,5 @@
 /* crypto/bn/bn_depr.c */
 /* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-1999 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
@@ -53,60 +52,119 @@
 *
 */
 /* Support for deprecated functions goes here - static linkage will only slurp
 * this code if applications are using them directly. */
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
 #include "bn_lcl.h"
 #include <openssl/rand.h>
-static void *dummy=&dummy;
+ #include "ErrorHandling.hpp"
 #include "CPStringUtils.hpp"
 #ifdef __EXCEPTIONS_ENABLED__
 	#include "CMyException.hpp"
 #endif
 static char					gErrorMessageBuffer[512];
 char 						*gErrorMessage = gErrorMessageBuffer;
 int							gErrorMessageMaxLength = sizeof(gErrorMessageBuffer);
 void SetErrorMessage(const char *theErrorMessage)
 {
 	if (theErrorMessage != nil)
 	{
 		CopyCStrToCStr(theErrorMessage,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
 void SetErrorMessageAndAppendLongInt(const char *theErrorMessage,const long theLongInt)
 {
 	if (theErrorMessage != nil)
 	{
 		CopyCStrAndConcatLongIntToCStr(theErrorMessage,theLongInt,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
 void SetErrorMessageAndCStrAndLongInt(const char *theErrorMessage,const char * theCStr,const long theLongInt)
 {
 	if (theErrorMessage != nil)
 	{
 		CopyCStrAndInsertCStrLongIntIntoCStr(theErrorMessage,theCStr,theLongInt,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
 void SetErrorMessageAndCStr(const char *theErrorMessage,const char * theCStr)
 {
 	if (theErrorMessage != nil)
 	{
 		CopyCStrAndInsertCStrLongIntIntoCStr(theErrorMessage,theCStr,-1,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
 void AppendCStrToErrorMessage(const char *theErrorMessage)
 {
 	if (theErrorMessage != nil)
 	{
 		ConcatCStrToCStr(theErrorMessage,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
 void AppendLongIntToErrorMessage(const long theLongInt)
 {
 	ConcatLongIntToCStr(theLongInt,gErrorMessage,gErrorMessageMaxLength);
 }
 char *GetErrorMessage(void)
 {
 	return gErrorMessage;
 }
 OSErr GetErrorMessageInNewHandle(Handle *inoutHandle)
 {
 OSErr		errCode;
 	errCode = CopyCStrToNewHandle(gErrorMessage,inoutHandle);
 	return(errCode);
 }
 OSErr GetErrorMessageInExistingHandle(Handle inoutHandle)
 {
 OSErr		errCode;
 	errCode = CopyCStrToExistingHandle(gErrorMessage,inoutHandle);
 	return(errCode);
 }
 OSErr AppendErrorMessageToHandle(Handle inoutHandle)
 {
 OSErr		errCode;
 	errCode = AppendCStrToHandle(gErrorMessage,inoutHandle,nil);
 	return(errCode);
 }
 #ifdef __EXCEPTIONS_ENABLED__
 void ThrowErrorMessageException(void)
 {
 	ThrowDescriptiveException(gErrorMessage);
 }
 #ifndef OPENSSL_NO_DEPRECATED
 BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
 	const BIGNUM *add, const BIGNUM *rem,
 	void (*callback)(int,int,void *), void *cb_arg)
 	{
 	BN_GENCB cb;
 	BIGNUM *rnd=NULL;
 	int found = 0;
 	BN_GENCB_set_old(&cb, callback, cb_arg);
 	if (ret == NULL)
 		{
 		if ((rnd=BN_new()) == NULL) goto err;
 		}
 	else
 		rnd=ret;
 	if(!BN_generate_prime_ex(rnd, bits, safe, add, rem, &cb))
 		goto err;
 	/* we have a prime :-) */
 	found = 1;
 err:
 	if (!found && (ret == NULL) && (rnd != NULL)) BN_free(rnd);
 	return(found ? rnd : NULL);
 	}
 int BN_is_prime(const BIGNUM *a, int checks, void (*callback)(int,int,void *),
 	BN_CTX *ctx_passed, void *cb_arg)
 	{
 	BN_GENCB cb;
 	BN_GENCB_set_old(&cb, callback, cb_arg);
 	return BN_is_prime_ex(a, checks, ctx_passed, &cb);
 	}
 int BN_is_prime_fasttest(const BIGNUM *a, int checks,
 		void (*callback)(int,int,void *),
 		BN_CTX *ctx_passed, void *cb_arg,
 		int do_trial_division)
 	{
 	BN_GENCB cb;
 	BN_GENCB_set_old(&cb, callback, cb_arg);
 	return BN_is_prime_fasttest_ex(a, checks, ctx_passed,
 				do_trial_division, &cb);
 	}
 #endif
--- a/MacOS/GetHTTPS.src/ErrorHandling.hpp
+++ b/MacOS/GetHTTPS.src/ErrorHandling.hpp
@@ -0,0 +1,147 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifndef kGenericError
 	#define kGenericError		-1
 #endif
 extern char	*gErrorMessage;
 void SetErrorMessage(const char *theErrorMessage);
 void SetErrorMessageAndAppendLongInt(const char *theErrorMessage,const long theLongInt);
 void SetErrorMessageAndCStrAndLongInt(const char *theErrorMessage,const char * theCStr,const long theLongInt);
 void SetErrorMessageAndCStr(const char *theErrorMessage,const char * theCStr);
 void AppendCStrToErrorMessage(const char *theErrorMessage);
 void AppendLongIntToErrorMessage(const long theLongInt);
 char *GetErrorMessage(void);
 OSErr GetErrorMessageInNewHandle(Handle *inoutHandle);
 OSErr GetErrorMessageInExistingHandle(Handle inoutHandle);
 OSErr AppendErrorMessageToHandle(Handle inoutHandle);
 #ifdef __EXCEPTIONS_ENABLED__
 	void ThrowErrorMessageException(void);
 #endif
 //	A bunch of evil macros that would be uneccessary if I were always using C++ !
 #define SetErrorMessageAndBailIfNil(theArg,theMessage)								\
 {																					\
 	if (theArg == nil)																\
 	{																				\
 		SetErrorMessage(theMessage);												\
 		errCode = kGenericError;													\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define SetErrorMessageAndBail(theMessage)											\
 {																					\
 		SetErrorMessage(theMessage);												\
 		errCode = kGenericError;													\
 		goto EXITPOINT;																\
 }
 #define SetErrorMessageAndLongIntAndBail(theMessage,theLongInt)						\
 {																					\
 		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
 		errCode = kGenericError;													\
 		goto EXITPOINT;																\
 }
 #define SetErrorMessageAndLongIntAndBailIfError(theErrCode,theMessage,theLongInt)	\
 {																					\
 	if (theErrCode != noErr)														\
 	{																				\
 		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
 		errCode = theErrCode;														\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define SetErrorMessageCStrLongIntAndBailIfError(theErrCode,theMessage,theCStr,theLongInt)	\
 {																					\
 	if (theErrCode != noErr)														\
 	{																				\
 		SetErrorMessageAndCStrAndLongInt(theMessage,theCStr,theLongInt);			\
 		errCode = theErrCode;														\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define SetErrorMessageAndCStrAndBail(theMessage,theCStr)							\
 {																					\
 	SetErrorMessageAndCStr(theMessage,theCStr);										\
 	errCode = kGenericError;														\
 	goto EXITPOINT;																	\
 }
 #define SetErrorMessageAndBailIfError(theErrCode,theMessage)						\
 {																					\
 	if (theErrCode != noErr)														\
 	{																				\
 		SetErrorMessage(theMessage);												\
 		errCode = theErrCode;														\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define SetErrorMessageAndLongIntAndBailIfNil(theArg,theMessage,theLongInt)			\
 {																					\
 	if (theArg == nil)																\
 	{																				\
 		SetErrorMessageAndAppendLongInt(theMessage,theLongInt);						\
 		errCode = kGenericError;													\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define BailIfError(theErrCode)														\
 {																					\
 	if ((theErrCode) != noErr)														\
 	{																				\
 		goto EXITPOINT;																\
 	}																				\
 }
 #define SetErrCodeAndBail(theErrCode)												\
 {																					\
 	errCode = theErrCode;															\
 																					\
 	goto EXITPOINT;																	\
 }
 #define SetErrorCodeAndMessageAndBail(theErrCode,theMessage)						\
 {																					\
 	SetErrorMessage(theMessage);													\
 	errCode = theErrCode;															\
 	goto EXITPOINT;																	\
 }
 #define BailNow()																	\
 {																					\
 	errCode = kGenericError;														\
 	goto EXITPOINT;																	\
 }
 #ifdef __cplusplus
 }
 #endif
--- a/MacOS/GetHTTPS.src/GetHTTPS.cpp
+++ b/MacOS/GetHTTPS.src/GetHTTPS.cpp
@@ -0,0 +1,209 @@
 /*
 *	An demo illustrating how to retrieve a URI from a secure HTTP server.
 *
 *	Author: 	Roy Wood
 *	Date:		September 7, 1999
 *	Comments:	This relies heavily on my MacSockets library.
 *				This project is also set up so that it expects the OpenSSL source folder (0.9.4 as I write this)
 *				to live in a folder called "OpenSSL-0.9.4" in this project's parent folder.  For example:
 *
 *					Macintosh HD:
 *						Development:
 *							OpenSSL-0.9.4:
 *								(OpenSSL sources here)
 *							OpenSSL Example:
 *								(OpenSSL example junk here)
 *
 *
 *				Also-- before attempting to compile this, make sure the aliases in "OpenSSL-0.9.4:include:openssl" 
 *				are installed!  Use the AppleScript applet in the "openssl-0.9.4" folder to do this!
 */
 /* modified to seed the PRNG */
 /* modified to use CRandomizer for seeding */
 //	Include some funky libs I've developed over time
 #include "CPStringUtils.hpp"
 #include "ErrorHandling.hpp"
 #include "MacSocket.h"
 #include "Randomizer.h"
 //	We use the OpenSSL implementation of SSL....
 //	This was a lot of work to finally get going, though you wouldn't know it by the results!
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <timer.h>
 //	Let's try grabbing some data from here:
 #define kHTTPS_DNS		"www.apache-ssl.org"
 #define kHTTPS_Port		443
 #define kHTTPS_URI		"/"
 //	Forward-declare this
 OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr);
 //	My idle-wait callback.  Doesn't do much, does it?  Silly cooperative multitasking.
 OSErr MyMacSocket_IdleWaitCallback(void *inUserRefPtr)
 {
 #pragma unused(inUserRefPtr)
 EventRecord		theEvent;
 	::EventAvail(everyEvent,&theEvent);
 	CRandomizer *randomizer = (CRandomizer*)inUserRefPtr;
 	if (randomizer)
 		randomizer->PeriodicAction();
 	return(noErr);
 }
 //	Finally!
 void main(void)
 {
 	OSErr				errCode;
 	int					theSocket = -1;
 	int					theTimeout = 30;
 	SSL_CTX				*ssl_ctx = nil;
 	SSL					*ssl = nil;
 	char				tempString[256];
 	UnsignedWide		microTickCount;
 	CRandomizer randomizer;
 	printf("OpenSSL Demo by Roy Wood, roy@centricsystems.ca\n\n");
 	BailIfError(errCode = MacSocket_Startup());
 	//	Create a socket-like object
 	BailIfError(errCode = MacSocket_socket(&theSocket,false,theTimeout * 60,MyMacSocket_IdleWaitCallback,&randomizer));
 	//	Set up the connect string and try to connect
 	CopyCStrAndInsertCStrLongIntIntoCStr("%s:%ld",kHTTPS_DNS,kHTTPS_Port,tempString,sizeof(tempString));
 	printf("Connecting to %s....\n",tempString);
 	BailIfError(errCode = MacSocket_connect(theSocket,tempString));
 	//	Init SSL stuff
 	SSL_load_error_strings();
 	SSLeay_add_ssl_algorithms();
 	//	Pick the SSL method
 //	ssl_ctx = SSL_CTX_new(SSLv2_client_method());
 	ssl_ctx = SSL_CTX_new(SSLv23_client_method());
 //	ssl_ctx = SSL_CTX_new(SSLv3_client_method());
 	//	Create an SSL thingey and try to negotiate the connection
 	ssl = SSL_new(ssl_ctx);
 	SSL_set_fd(ssl,theSocket);
 	errCode = SSL_connect(ssl);
 	if (errCode < 0)
 	{
 		SetErrorMessageAndLongIntAndBail("OpenSSL: Can't initiate SSL connection, SSL_connect() = ",errCode);
 	}
 	//	Request the URI from the host
 	CopyCStrToCStr("GET ",tempString,sizeof(tempString));
 	ConcatCStrToCStr(kHTTPS_URI,tempString,sizeof(tempString));
 	ConcatCStrToCStr(" HTTP/1.0\r\n\r\n",tempString,sizeof(tempString));
 	errCode = SSL_write(ssl,tempString,CStrLength(tempString));
 	if (errCode < 0)
 	{
 		SetErrorMessageAndLongIntAndBail("OpenSSL: Error writing data via ssl, SSL_write() = ",errCode);
 	}
 	for (;;)
 	{
 	char	tempString[256];
 	int		bytesRead;
 		//	Read some bytes and dump them to the console
 		bytesRead = SSL_read(ssl,tempString,sizeof(tempString) - 1);
 		if (bytesRead == 0 && MacSocket_RemoteEndIsClosing(theSocket))
 		{
 			break;
 		}
 		else if (bytesRead < 0)
 		{
 			SetErrorMessageAndLongIntAndBail("OpenSSL: Error reading data via ssl, SSL_read() = ",bytesRead);
 		}
 		tempString[bytesRead] = '\0';
 		printf("%s", tempString);
 	}
 	printf("\n\n\n");
 	//	All done!
 	errCode = noErr;
 EXITPOINT:
 	//	Clean up and go home
 	if (theSocket >= 0)
 	{
 		MacSocket_close(theSocket);
 	}
 	if (ssl != nil)
 	{
 		SSL_free(ssl);
 	}
 	if (ssl_ctx != nil)
 	{
 		SSL_CTX_free(ssl_ctx);
 	}
 	if (errCode != noErr)
 	{
 		printf("An error occurred:\n");
 		printf("%s",GetErrorMessage());
 	}
 	MacSocket_Shutdown();
 }
--- a/MacOS/GetHTTPS.src/MacSocket.cpp
+++ b/MacOS/GetHTTPS.src/MacSocket.cpp
--- a/MacOS/GetHTTPS.src/MacSocket.h
+++ b/MacOS/GetHTTPS.src/MacSocket.h
@@ -0,0 +1,103 @@
 #pragma once
 #ifdef __cplusplus
 extern "C" {
 #endif
 enum
 {
 	kMacSocket_TimeoutErr = -2
 };
 //	Since MacSocket does busy waiting, I do a callback while waiting
 typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
 //	Call this before anything else!
 OSErr MacSocket_Startup(void);
 //	Call this to cleanup before quitting
 OSErr MacSocket_Shutdown(void);
 //	Call this to allocate a "socket" (reference number is returned in outSocketNum)
 //	Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
 //	The inTimeoutTicks parameter is applied during reads/writes of data
 //	The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
 //	The inUserRefPtr parameter is passed back to the idle-wait callback
 OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
 //	Call this to connect to an IP/DNS address
 //	Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
 OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
 //	Call this to listen on a port
 //	Since this a low-performance implementation, I allow a maximum of 1 (one!) incoming request when I listen
 OSErr MacSocket_listen(const int inSocketNum,const int inPortNum);
 //	Call this to close a socket
 OSErr MacSocket_close(const int inSocketNum);
 //	Call this to receive data on a socket
 //	Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
 int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const Boolean inBlock);
 //	Call this to send data on a socket
 int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
 //	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
 //	This function will let you check whether that's true or not
 Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
 //	Call this to see if the listen has completed after a call to MacSocket_listen()
 Boolean MacSocket_ListenCompleted(const int inSocketNum);
 //	These really aren't very useful anymore
 Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
 Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
 //	You may wish to change the userRefPtr for a socket callback-- use this to do it
 void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
 //	Call these to get the socket's IP:port descriptor
 void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
 void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
 //	Call this to get error info from a socket
 void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
 #ifdef __cplusplus
 }
 #endif
--- a/MacOS/OpenSSL.mcp.hqx
+++ b/MacOS/OpenSSL.mcp.hqx
--- a/MacOS/Randomizer.cpp
+++ b/MacOS/Randomizer.cpp
@@ -0,0 +1,476 @@
 /* 
 ------- Strong random data generation on a Macintosh (pre - OS X) ------
 --	GENERAL: We aim to generate unpredictable bits without explicit
 	user interaction. A general review of the problem may be found
 	in RFC 1750, "Randomness Recommendations for Security", and some
 	more discussion, of general and Mac-specific issues has appeared
 	in "Using and Creating Cryptographic- Quality Random Numbers" by
 	Jon Callas (www.merrymeet.com/jon/usingrandom.html).
 	The data and entropy estimates provided below are based on my
 	limited experimentation and estimates, rather than by any
 	rigorous study, and the entropy estimates tend to be optimistic.
 	They should not be considered absolute.
 	Some of the information being collected may be correlated in
 	subtle ways. That includes mouse positions, timings, and disk
 	size measurements. Some obvious correlations will be eliminated
 	by the programmer, but other, weaker ones may remain. The
 	reliability of the code depends on such correlations being
 	poorly understood, both by us and by potential interceptors.
 	This package has been planned to be used with OpenSSL, v. 0.9.5.
 	It requires the OpenSSL function RAND_add. 
 --	OTHER WORK: Some source code and other details have been
 	published elsewhere, but I haven't found any to be satisfactory
 	for the Mac per se:
 	* The Linux random number generator (by Theodore Ts'o, in
 	  drivers/char/random.c), is a carefully designed open-source
 	  crypto random number package. It collects data from a variety
 	  of sources, including mouse, keyboard and other interrupts.
 	  One nice feature is that it explicitly estimates the entropy
 	  of the data it collects. Some of its features (e.g. interrupt
 	  timing) cannot be reliably exported to the Mac without using
 	  undocumented APIs.
 	* Truerand by Don P. Mitchell and Matt Blaze uses variations
 	  between different timing mechanisms on the same system. This
 	  has not been tested on the Mac, but requires preemptive
 	  multitasking, and is hardware-dependent, and can't be relied
 	  on to work well if only one oscillator is present.
 	* Cryptlib's RNG for the Mac (RNDMAC.C by Peter Gutmann),
 	  gathers a lot of information about the machine and system
 	  environment. Unfortunately, much of it is constant from one
 	  startup to the next. In other words, the random seed could be
 	  the same from one day to the next. Some of the APIs are
 	  hardware-dependent, and not all are compatible with Carbon (OS
 	  X). Incidentally, the EGD library is based on the UNIX entropy
 	  gathering methods in cryptlib, and isn't suitable for MacOS
 	  either.
 	* Mozilla (and perhaps earlier versions of Netscape) uses the
 	  time of day (in seconds) and an uninitialized local variable
 	  to seed the random number generator. The time of day is known
 	  to an outside interceptor (to within the accuracy of the
 	  system clock). The uninitialized variable could easily be
 	  identical between subsequent launches of an application, if it
 	  is reached through the same path.
 	* OpenSSL provides the function RAND_screen(), by G. van
 	  Oosten, which hashes the contents of the screen to generate a
 	  seed. This is not useful for an extension or for an
 	  application which launches at startup time, since the screen
 	  is likely to look identical from one launch to the next. This
 	  method is also rather slow.
 	* Using variations in disk drive seek times has been proposed
 	  (Davis, Ihaka and Fenstermacher, world.std.com/~dtd/;
 	  Jakobsson, Shriver, Hillyer and Juels,
 	  www.bell-labs.com/user/shriver/random.html). These variations
 	  appear to be due to air turbulence inside the disk drive
 	  mechanism, and are very strongly unpredictable. Unfortunately
 	  this technique is slow, and some implementations of it may be
 	  patented (see Shriver's page above.) It of course cannot be
 	  used with a RAM disk.
 --	TIMING: On the 601 PowerPC the time base register is guaranteed
 	to change at least once every 10 addi instructions, i.e. 10
 	cycles. On a 60 MHz machine (slowest PowerPC) this translates to
 	a resolution of 1/6 usec. Newer machines seem to be using a 10
 	cycle resolution as well.
 	For 68K Macs, the Microseconds() call may be used. See Develop
 	issue 29 on the Apple developer site
 	(developer.apple.com/dev/techsupport/develop/issue29/minow.html)
 	for information on its accuracy and resolution. The code below
 	has been tested only on PowerPC based machines.
 	The time from machine startup to the launch of an application in
 	the startup folder has a variance of about 1.6 msec on a new G4
 	machine with a defragmented and optimized disk, most extensions
 	off and no icons on the desktop. This can be reasonably taken as
 	a lower bound on the variance. Most of this variation is likely
 	due to disk seek time variability. The distribution of startup
 	times is probably not entirely even or uncorrelated. This needs
 	to be investigated, but I am guessing that it not a majpor
 	problem. Entropy = log2 (1600/0.166) ~= 13 bits on a 60 MHz
 	machine, ~16 bits for a 450 MHz machine.
 	User-launched application startup times will have a variance of
 	a second or more relative to machine startup time. Entropy >~22
 	bits.
 	Machine startup time is available with a 1-second resolution. It
 	is predictable to no better a minute or two, in the case of
 	people who show up punctually to work at the same time and
 	immediately start their computer. Using the scheduled startup
 	feature (when available) will cause the machine to start up at
 	the same time every day, making the value predictable. Entropy
 	>~7 bits, or 0 bits with scheduled startup.
 	The time of day is of course known to an outsider and thus has 0
 	entropy if the system clock is regularly calibrated.
 --	KEY TIMING: A  very fast typist (120 wpm) will have a typical
 	inter-key timing interval of 100 msec. We can assume a variance
 	of no less than 2 msec -- maybe. Do good typists have a constant
 	rhythm, like drummers? Since what we measure is not the
 	key-generated interrupt but the time at which the key event was
 	taken off the event queue, our resolution is roughly the time
 	between process switches, at best 1 tick (17 msec). I  therefore
 	consider this technique questionable and not very useful for
 	obtaining high entropy data on the Mac.
 --	MOUSE POSITION AND TIMING: The high bits of the mouse position
 	are far from arbitrary, since the mouse tends to stay in a few
 	limited areas of the screen. I am guessing that the position of
 	the mouse is arbitrary within a 6 pixel square. Since the mouse
 	stays still for long periods of time, it should be sampled only
 	after it was moved, to avoid correlated data. This gives an
 	entropy of log2(6*6) ~= 5 bits per measurement.
 	The time during which the mouse stays still can vary from zero
 	to, say, 5 seconds (occasionally longer). If the still time is
 	measured by sampling the mouse during null events, and null
 	events are received once per tick, its resolution is 1/60th of a
 	second, giving an entropy of log2 (60*5) ~= 8 bits per
 	measurement. Since the distribution of still times is uneven,
 	this estimate is on the high side.
 	For simplicity and compatibility across system versions, the
 	mouse is to be sampled explicitly (e.g. in the event loop),
 	rather than in a time manager task.
 --	STARTUP DISK TOTAL FILE SIZE: Varies typically by at least 20k
 	from one startup to the next, with 'minimal' computer use. Won't
 	vary at all if machine is started again immediately after
 	startup (unless virtual memory is on), but any application which
 	uses the web and caches information to disk is likely to cause
 	this much variation or more. The variation is probably not
 	random, but I don't know in what way. File sizes tend to be
 	divisible by 4 bytes since file format fields are often
 	long-aligned. Entropy > log2 (20000/4) ~= 12 bits.
 --	STARTUP DISK FIRST AVAILABLE ALLOCATION BLOCK: As the volume
 	gets fragmented this could be anywhere in principle. In a
 	perfectly unfragmented volume this will be strongly correlated
 	with the total file size on the disk. With more fragmentation
 	comes less certainty. I took the variation in this value to be
 	1/8 of the total file size on the volume.
 --	SYSTEM REQUIREMENTS: The code here requires System 7.0 and above
 	(for Gestalt and Microseconds calls). All the calls used are
 	Carbon-compatible.
 */
 /*------------------------------ Includes ----------------------------*/
 #include "Randomizer.h"
 // Mac OS API
 #include <Files.h>
 #include <Folders.h>
 #include <Events.h>
 #include <Processes.h>
 #include <Gestalt.h>
 #include <Resources.h>
 #include <LowMem.h>
 // Standard C library
 #include <stdlib.h>
 #include <math.h>
 /*---------------------- Function declarations -----------------------*/
 // declared in OpenSSL/crypto/rand/rand.h
 extern "C" void RAND_add (const void *buf, int num, double entropy);
 unsigned long GetPPCTimer (bool is601);	// Make it global if needed
 					// elsewhere
 /*---------------------------- Constants -----------------------------*/
 #define kMouseResolution 6		// Mouse position has to differ
 					// from the last one by this
 					// much to be entered
 #define kMousePositionEntropy 5.16	// log2 (kMouseResolution**2)
 #define kTypicalMouseIdleTicks 300.0	// I am guessing that a typical
 					// amount of time between mouse
 					// moves is 5 seconds
 #define kVolumeBytesEntropy 12.0	// about log2 (20000/4),
 					// assuming a variation of 20K
 					// in total file size and
 					// long-aligned file formats.
 #define kApplicationUpTimeEntropy 6.0	// Variance > 1 second, uptime
 					// in ticks  
 #define kSysStartupEntropy 7.0		// Entropy for machine startup
 					// time
 /*------------------------ Function definitions ----------------------*/
 CRandomizer::CRandomizer (void)
 {
 	long	result;
 	mSupportsLargeVolumes =
 		(Gestalt(gestaltFSAttr, &result) == noErr) &&
 		((result & (1L << gestaltFSSupports2TBVols)) != 0);
 	if (Gestalt (gestaltNativeCPUtype, &result) != noErr)
 	{
 		mIsPowerPC = false;
 		mIs601 = false;
 	}
 	else
 	{
 		mIs601 = (result == gestaltCPU601);
 		mIsPowerPC = (result >= gestaltCPU601);
 	}
 	mLastMouse.h = mLastMouse.v = -10;	// First mouse will
 						// always be recorded
 	mLastPeriodicTicks = TickCount();
 	GetTimeBaseResolution ();
 	// Add initial entropy
 	AddTimeSinceMachineStartup ();
 	AddAbsoluteSystemStartupTime ();
 	AddStartupVolumeInfo ();
 	AddFiller ();
 }
 void CRandomizer::PeriodicAction (void)
 {
 	AddCurrentMouse ();
 	AddNow (0.0);	// Should have a better entropy estimate here
 	mLastPeriodicTicks = TickCount();
 }
 /*------------------------- Private Methods --------------------------*/
 void CRandomizer::AddCurrentMouse (void)
 {
 	Point mouseLoc;
 	unsigned long lastCheck;	// Ticks since mouse was last
 					// sampled
 #if TARGET_API_MAC_CARBON
 	GetGlobalMouse (&mouseLoc);
 #else
 	mouseLoc = LMGetMouseLocation();
 #endif
 	if (labs (mLastMouse.h - mouseLoc.h) > kMouseResolution/2 &&
 	    labs (mLastMouse.v - mouseLoc.v) > kMouseResolution/2)
 		AddBytes (&mouseLoc, sizeof (mouseLoc),
 				kMousePositionEntropy);
 	if (mLastMouse.h == mouseLoc.h && mLastMouse.v == mouseLoc.v)
 		mMouseStill ++;
 	else
 	{
 		double entropy;
 		// Mouse has moved. Add the number of measurements for
 		// which it's been still. If the resolution is too
 		// coarse, assume the entropy is 0.
 		lastCheck = TickCount() - mLastPeriodicTicks;
 		if (lastCheck <= 0)
 			lastCheck = 1;
 		entropy = log2l
 			(kTypicalMouseIdleTicks/(double)lastCheck);
 		if (entropy < 0.0)
 			entropy = 0.0;
 		AddBytes (&mMouseStill, sizeof (mMouseStill), entropy);
 		mMouseStill = 0;
 	}
 	mLastMouse = mouseLoc;
 }
 void CRandomizer::AddAbsoluteSystemStartupTime (void)
 {
 	unsigned long	now;		// Time in seconds since
 					// 1/1/1904
 	GetDateTime (&now);
 	now -= TickCount() / 60;	// Time in ticks since machine
 					// startup
 	AddBytes (&now, sizeof (now), kSysStartupEntropy);
 }
 void CRandomizer::AddTimeSinceMachineStartup (void)
 {
 	AddNow (1.5);			// Uncertainty in app startup
 					// time is > 1.5 msec (for
 					// automated app startup).
 }
 void CRandomizer::AddAppRunningTime (void)
 {
 	ProcessSerialNumber PSN;
 	ProcessInfoRec		ProcessInfo;
 	ProcessInfo.processInfoLength = sizeof (ProcessInfoRec);
 	ProcessInfo.processName = nil;
 	ProcessInfo.processAppSpec = nil;
 	GetCurrentProcess (&PSN);
 	GetProcessInformation (&PSN, &ProcessInfo);
 	// Now add the amount of time in ticks that the current process
 	// has been active
 	AddBytes (&ProcessInfo, sizeof (ProcessInfoRec),
 			kApplicationUpTimeEntropy);
 }
 void CRandomizer::AddStartupVolumeInfo (void)
 {
 	short			vRefNum;
 	long			dirID;
 	XVolumeParam	pb;
 	OSErr			err;
 	if (!mSupportsLargeVolumes)
 		return;
 	FindFolder (kOnSystemDisk, kSystemFolderType, kDontCreateFolder,
 			&vRefNum, &dirID);
 	pb.ioVRefNum = vRefNum;
 	pb.ioCompletion = 0;
 	pb.ioNamePtr = 0;
 	pb.ioVolIndex = 0;
 	err = PBXGetVolInfoSync (&pb);
 	if (err != noErr)
 		return;
 	// Base the entropy on the amount of space used on the disk and
 	// on the next available allocation block. A lot else might be
 	// unpredictable, so might as well toss the whole block in. See
 	// comments for entropy estimate justifications.
 	AddBytes (&pb, sizeof (pb),
 		kVolumeBytesEntropy +
 		log2l (((pb.ioVTotalBytes.hi - pb.ioVFreeBytes.hi)
 				* 4294967296.0D +
 			(pb.ioVTotalBytes.lo - pb.ioVFreeBytes.lo))
 				/ pb.ioVAlBlkSiz - 3.0));
 }
 /*
 	On a typical startup CRandomizer will come up with about 60
 	bits of good, unpredictable data. Assuming no more input will
 	be available, we'll need some more lower-quality data to give
 	OpenSSL the 128 bits of entropy it desires. AddFiller adds some
 	relatively predictable data into the soup.
 */
 void CRandomizer::AddFiller (void)
 {
 	struct
 	{
 		ProcessSerialNumber psn;	// Front process serial
 						// number
 		RGBColor	hiliteRGBValue;	// User-selected
 						// highlight color
 		long		processCount;	// Number of active
 						// processes
 		long		cpuSpeed;	// Processor speed
 		long		totalMemory;	// Total logical memory
 						// (incl. virtual one)
 		long		systemVersion;	// OS version
 		short		resFile;	// Current resource file
 	} data;
 	GetNextProcess ((ProcessSerialNumber*) kNoProcess);
 	while (GetNextProcess (&data.psn) == noErr)
 		data.processCount++;
 	GetFrontProcess (&data.psn);
 	LMGetHiliteRGB (&data.hiliteRGBValue);
 	Gestalt (gestaltProcClkSpeed, &data.cpuSpeed);
 	Gestalt (gestaltLogicalRAMSize, &data.totalMemory);
 	Gestalt (gestaltSystemVersion, &data.systemVersion);
 	data.resFile = CurResFile ();
 	// Here we pretend to feed the PRNG completely random data. This
 	// is of course false, as much of the above data is predictable
 	// by an outsider. At this point we don't have any more
 	// randomness to add, but with OpenSSL we must have a 128 bit
 	// seed before we can start. We just add what we can, without a
 	// real entropy estimate, and hope for the best.
 	AddBytes (&data, sizeof(data), 8.0 * sizeof(data));
 	AddCurrentMouse ();
 	AddNow (1.0);
 }
 //-------------------  LOW LEVEL ---------------------
 void CRandomizer::AddBytes (void *data, long size, double entropy)
 {
 	RAND_add (data, size, entropy * 0.125);	// Convert entropy bits
 						// to bytes
 }
 void CRandomizer::AddNow (double millisecondUncertainty)
 {
 	long time = SysTimer();
 	AddBytes (&time, sizeof (time), log2l (millisecondUncertainty *
 			mTimebaseTicksPerMillisec));
 }
 //----------------- TIMING SUPPORT ------------------
 void CRandomizer::GetTimeBaseResolution (void)
 {	
 #ifdef __powerc
 	long speed;
 	// gestaltProcClkSpeed available on System 7.5.2 and above
 	if (Gestalt (gestaltProcClkSpeed, &speed) != noErr)
 		// Only PowerPCs running pre-7.5.2 are 60-80 MHz
 		// machines.
 		mTimebaseTicksPerMillisec =  6000.0D;
 	// Assume 10 cycles per clock update, as in 601 spec. Seems true
 	// for later chips as well.
 	mTimebaseTicksPerMillisec = speed / 1.0e4D;
 #else
 	// 68K VIA-based machines (see Develop Magazine no. 29)
 	mTimebaseTicksPerMillisec = 783.360D;
 #endif
 }
 unsigned long CRandomizer::SysTimer (void)	// returns the lower 32
 						// bit of the chip timer
 {
 #ifdef __powerc
 	return GetPPCTimer (mIs601);
 #else
 	UnsignedWide usec;
 	Microseconds (&usec);
 	return usec.lo;
 #endif
 }
 #ifdef __powerc
 // The timebase is available through mfspr on 601, mftb on later chips.
 // Motorola recommends that an 601 implementation map mftb to mfspr
 // through an exception, but I haven't tested to see if MacOS actually
 // does this. We only sample the lower 32 bits of the timer (i.e. a
 // few minutes of resolution)
 asm unsigned long GetPPCTimer (register bool is601)
 {
 	cmplwi	is601, 0	// Check if 601
 	bne	_601		// if non-zero goto _601
 	mftb  	r3		// Available on 603 and later.
 	blr			// return with result in r3
 _601:
 	mfspr r3, spr5  	// Available on 601 only.
 				// blr inserted automatically
 }
 #endif
--- a/MacOS/Randomizer.h
+++ b/MacOS/Randomizer.h
@@ -0,0 +1,43 @@
 //	Gathers unpredictable system data to be used for generating
 //	random bits
 #include <MacTypes.h>
 class CRandomizer
 {
 public:
 	CRandomizer (void);
 	void PeriodicAction (void);
 private:
 	// Private calls
 	void		AddTimeSinceMachineStartup (void);
 	void		AddAbsoluteSystemStartupTime (void);
 	void		AddAppRunningTime (void);
 	void		AddStartupVolumeInfo (void);
 	void		AddFiller (void);
 	void		AddCurrentMouse (void);
 	void		AddNow (double millisecondUncertainty);
 	void		AddBytes (void *data, long size, double entropy);
 	void		GetTimeBaseResolution (void);
 	unsigned long	SysTimer (void);
 	// System Info	
 	bool		mSupportsLargeVolumes;
 	bool		mIsPowerPC;
 	bool		mIs601;
 	// Time info
 	double		mTimebaseTicksPerMillisec;
 	unsigned long	mLastPeriodicTicks;
 	// Mouse info
 	long		mSamplePeriod;
 	Point		mLastMouse;
 	long		mMouseStill;
 };
--- a/MacOS/TODO
+++ b/MacOS/TODO
@@ -0,0 +1,18 @@
 -------------------------------------------------------------------
 Verify server certificate
 -------------------------------------------------------------------
 Currently omitted from the project:
 	crypto/tmdiff.c
 	crypto/bio/bss_conn.c
 	crypto/bio/b_sock.c
 	crypto/bio/bss_acpt.c
 	crypto/bio/bss_log.h
 -------------------------------------------------------------------
 Build libraries to link with...
 -------------------------------------------------------------------
 Port openssl application.
 -------------------------------------------------------------------
 BN optimizations (currently PPC version is compiled with BN_LLONG)
 -------------------------------------------------------------------
--- a/MacOS/_MWERKS_GUSI_prefix.h
+++ b/MacOS/_MWERKS_GUSI_prefix.h
@@ -0,0 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
 #pragma longlong on
 #endif
 #if 1
 #define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH
--- a/MacOS/_MWERKS_prefix.h
+++ b/MacOS/_MWERKS_prefix.h
@@ -0,0 +1,9 @@
 #include <MacHeaders.h>
 #define B_ENDIAN
 #ifdef __POWERPC__
 #pragma longlong on
 #endif
 #if 0
 #define MAC_OS_GUSI_SOURCE
 #endif
 #define MONOLITH
--- a/MacOS/buildinf.h
+++ b/MacOS/buildinf.h
@@ -0,0 +1,5 @@
 #ifndef MK1MF_BUILD
 #  define CFLAGS	"-DB_ENDIAN"
 #  define PLATFORM	"macos"
 #  define DATE		"Sun Feb 27 19:44:16 MET 2000"
 #endif
--- a/MacOS/mklinks.as.hqx
+++ b/MacOS/mklinks.as.hqx
@@ -0,0 +1,820 @@
 (This file must be converted with BinHex 4.0)
 :#QeVE'PZDh-ZBA-!39"36'&`E(3J!!!!!!!!!*LiI6m!!!!!!3!!!*G#!!#@3J!
 !!AChFQPd!!!!K3)"!3m(Fh9`F'pbG!!!!)B#!3%$"(0eFQ8!!!#(!J-%"!3("3C
 cGfPdBfJ!!!#)!J%"#39cH@jMD!!!!)N#"J%$!`-&"3-'FhPcG'9Y!!!!LJ)&"3)
 %!J8("!-#!`4dB@*X!!!!L`))!3-$!`-$!`-$"(4PE'`!!!#-!J)"#38$G'KP!!!
 !M3))(J)@!Ki#!J))!K)#!`)B!Kd%G'KPE3!!!)i#!J%&#`4dD'9j!!!!M`)#!J)
 #$3TdD(*[G@GSEh9d!!!!N!!#!3%&"(4TCQB!!!#4!J%"!`4dD@eP!!!!NJ)"!JS
 #!h4T!!!!'N!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!H!!!!!!!#!!!!!!
 !!!!!!!!!!!!!rrrrr`!!!$3!!!!N!!!!!#"[!!5JAb"[!!5K++!M6R9$9'mJFR9
 Z)(4SDA-JFf0bDA"d)'&`F'aTBf&dD@pZ,#"jEh8JEA9cG#"QDA*cG#"TER0dB@a
 X)%&`F'aP8f0bDA"d,J!!!)C8D'Pc)(0MFQP`G#"MFQ9KG'9c)#iZ,fPZBfaeC'8
 [Eh"PER0cE#"KEQ3JCQPXE(-JDA3JGfPdD#"ZC@0PFh0KFRNJB@aTBA0PFbi0$8P
 d)'eTCfKd)(4KDf8JB5"hD'PXC5"dEb"MEfe`E'9dC5"cEb"`E'9KFf8JBQ8JF'&
 dD@9ZG$SY+3!!!#S!!J!!!!!!$3!+!"!!!!!-!!!!!!!!!!!!63!0!!S!%!%!!!`
 !!!!!!!!!!!!B!!!!+!!!!!!!!!!)!!!!)!#N2c`!!DR`!!!!l!!!!!&19[ri,`0
 f!#m$-$bKVDG'*KmY52ri,`-`2+LITdBQ(b!ZrrLa`'FJ,`-J2'0`ER4"l[rm)NL
 KV5+)*Kp+3'B)5Ulrr'F#GJ%3!bBZrr41ANje6PB!!#m-@Bm[2%j29%Nr2!#!U"m
 SAb!-CJK`!cm!UFKJ+#m-UC)J9#!)d+J!'#&!!"JJ9#!)d+J!(#&!!"a9Mbm8)&q
 JAMk!9%mSE[rm6Pj1G8j@!!![$%kkre4+!'FU@Bm[2'&`E(3[2(0MF(4`)DJU+&m
 J$'F5@Bm[$#mm!!!!!A!!U#UTp&K26VVrG#KZrra1ANje!!!!('&`E(3!!!!"4P*
 &4J!!!!!!J%P$6L-!!!!!!*B!!!!"!!!!!!G"8&"-!!!!!!!"!!!"!!!!!S!!!!4
 !!!"i)!!!K"!!!3))!!)#"!!%"!)!#!J"!"!8!)!J)J"!3%%!)2#!J"#*!%!)KJ!
 J")3!)!*!!"!")!!3!K!!%!3)!"!)"!!J%!)!3#!"!)"!!S%!J!5#!3!)4!)!#%J
 %!!KB#!!%C"!!!m)J!!!"3!!!!)!!!!%!!!!$J!!!"m!!!(rJ!!$rm!!"rrJ!!rr
 m!!IrrJ!2rrm!(rrrJ$rrrm"rrrrJrrrrm2rrrrMrrrrmrrrrrRrrrrmrrrrq(rr
 rr!rrrrJ(rrr`!rrri!(rrm!$rrq!"rrr!!rrrJ!2rr`!$rri!!IRm!!$`q!!!!(
 !!!!!J!!!!!)!!!!!!!!!!!m!!!!!!!!!!!!!!!!!!!$`m!!!!!!!!!!!!!!!!!!
 2!!m!!!!!!!!!!!!!!!rrm!!!m!!!!!!!!!!!!!$`c0m!!!m!!!!!!!!!!!!2!!c
 -m!!!m!!!!!!!!!!!m!$-cI!!!!m!!!!!!!!!$`!-c0m!!!!!m!!!!!!!!2!!c-h
 `!!!!!!m!!!!!!!m!$-cIh`!!!!!!m!!!!!$`!-c0rGh`!!!!!!m!!!!2!!c-hph
 -h`!!!!!!m!!!rrr-cIhF`-h`!!!!!!m!!2lFr0rGc!`-h`!!!!!!m!$pc-rph-$
 !`-h`!!!!!!m!r-`2cF`-$!!-r3!!!!!!m!m!`-c!`-!!$0m!!!!!$-m!m!`-$!`
 !!-cI!!!!!-c`!!m!`-$!!!`-h`!!!!c2!!!!m!`-!!$!c0m!!!$-m!!!!!m!`!!
 -$-hm!!!-c`!!!!!!m!!!`-cIc!!!c2!!!!!!!!m!$!c0r-`!$-m!!!!!!!$pm-$
 -hmc!!-c`!!!!!!!2hI`-cIc-!!c2!!!!!!!!rGc2c0r-`!$-m!!!!!!!!2h-cmh
 mc!!-c`!!!!!!!!$mc!rIr-!!c2!!!!!!!!!!$m$2m!r-$-m!!!!!!!!!!!$rr`!
 !r-c`!!!!!!!!!!!!!!!!!!r2!!!!!!!!!!!!!!!!!!!!m!!!!!!!!!!!!!"!!B!
 13"%J)4"##18%Q)+3!%&!)5!L%%3BL#83*L!G3!#!!B!2`"rJ2r"rq2rmrrlrrhr
 r2riIr"ri2r!ri"h!!)!!!!#!!!!!$r!!!!!!!2r`$`!!!!!2$!m!m!!!!2$!c`!
 2!!!2$!c`!!$`!2r`cpm!!!m!rGrpc2!!!2$p$p`-c`!!$`m!`-$0m!$2!2!-$-h
 `$2!!$`$-hm$2!!!2m-hm$2!!!2h2hm$2!!!!r-rm$2!!!!!2r`r2!!!!!!!!!2!
 !!!!!!!#D8f0bDA"d)%&`F'aTBf&dD@pZ$3e8D'Pc)(0MFQP`G#"MFQ9KG'9c)#i
 Z,fPZBfaeC'8[Eh"PER0cE#"KEQ3JCQPXE(-JDA3JGfPdD#"ZC@0PFh0KFRNJB@a
 TBA0PFbi0$8Pd)'eTCfKd)(4KDf8JB5"hD'PXC5"dEb"MEfe`E'9dC5"cEb"`E'9
 KFf8JBQ8JF'&dD@9ZG$SY+3!!!")!!J!!!!!!!!!!!!%!"J!'%iN!!!!+@1!!!b!
 !!!-J!!!!!"3!+`!(!Cm#@!!V!!F"f!*B!!!!!3!!M`C'BA0N98&6)$%Z-6!a,M%
 `$J!!!!32rrm!!3!#!!-"rrm!!!d!!3!"D`!!!!!!!!!%!J!%!!)!"3!'$3!&!!*
 X!!)!!!U`!!IrrJd!"`!#6`!!!!!+X!!)!!N0!!J!!@X!!!!%#Um!#J)!#J!#!!X
 !$!d!#`!#E!!#!!3!"2rprr`"rrd!!!(rr!!!!J!-!!)!$3!1$3!0!!*X!!%!"!!
 %rrX!$`(rq`!!$!!2!&N!8b"(CA3JF'&dD#"dEb"dD'Pc)%&`F'aP8f0bDA"d)'&
 `F'aPG$XJGA0P)'Pd)(4[)'C[FQdJG'KP)("KG'JJG'mJG'KP)'PZBfaeC'8JCQp
 XC'9b!!)!!!)!$J!#!"!!%3d!%!!#E!!"!!3!"2rk!")"rrS!!!`!%J!Q!#!JB@j
 N)(4SC5"[G'KPFL"bC@aPGQ&ZG#"QEfaNCA*c,J!#!!!#!"%!!J!6!"30!"-!!R-
 !!!!%!"%!&3!@$3!9!!*M!!!!"!!1!"F!'!d!&`!#E!!&!!3!$!!CrrN0!"N!!Qi
 !!!!%!!`!'J!E$3!D!!)d!!!!"3!-rrJ!(!Vrq!!%#Q0[BQS0!"`!!Q`!"3!'!!X
 !(Irh$3!G!!0*!!)!"J!,rrB!([re#[rf!"JZC@&bFfCQC(*KE'Pc!!!!!!!!)!"
 KCQ4b$3!H!!"Q!!!!"J!(![re!!!"rrF!!!d!'`!"E3!!!!3!"3!I$`!I!6J)ER9
 XE!!!!!!!!Gq!rrm!!!!A"NCTEQ4PFJ!!(`*[Me!!ASfm!Qq,i!"HA[!!I&M!!!!
 !!!!!'mi!!JN#!Qq-1!!!Kb%#Ei`J!!!!!%C14&*038e"3e-!!"%!B@aTF`!!!!!
 !fJ!#!!!-6@&MD@jdEh0S)%K%!!!!!!!!!!!!!!!!!!!!XSA5h%*%!!!!!!!A"NC
 TEQ4PFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!3rLc#@a!4Nj%8Ne"3e2rrrrr!!!!!!!!!!!!!!!!!!!
 !!!!!!!e6HA0dC@dJ4QpXC'9b!!!"!!3!!!!A!!)!)8eKBfPZG'pcD#")4$T6HA0
 dC@dJ4QpXC'9b1NCTEQ4PFJ$rr`!!!Irj!!!0!"J!!@d!!!!-!!hrp!Vrp!!%#Q0
 dH(30!"B!!@m!!!!!!!$rm`[rm`!5-!!(G'KPF'&dD!!(G'KP8'&dD!)!&!!#!#!
 !)3d!)!!#E!!#!")!%[rbrr%"rr)!!!(rm3!!!J!K!!)!)J!M$3!L!!*b!!!!%J!
 A!#3!*3d!*!!#EJ!$!")!&3!Q!#F0!#B!!6%!!!!6!"Arm!Vrm!!%#R4iC'`0!#F
 !!6%!!!!5!"2rl`Vrl`!%#Q&cBh)0!#8!!@m!!!!!!!$rlJ[rlJ!F-!!-G'KPEfa
 NC'9XD@ec!!adD'92E'4%C@aTEA-#!#-!!J!S!#N0!#J!!R)!!!!B!"d!+J!V$3!
 U!!&Y!!!!'!!C!#`-!#`!"`!"1J!#!!!0!#X!!Qi!!`!!!!!!,3!Z$3!Y!!%a!!!
 !'J!Frqd+rqd!"!TdH'4X$3!Z!!%a!!!!'3!Drq`+rq`!"!TKFf0b!J!T!!)!,`!
 `$3![!!*X!!)!(J!Hrq[rkJ(rk`!!!IrU!!!#!$!!!J!a!$)0!$%!!R)!!!!H!#X
 !-`!d$3!c!!*X!!8!(J!T!$Ark3d!03!#EJ!!!"i!+3!f!$F0!$B!!cF"!!!I!#R
 rk!!i!$N+rqJ!"!TMDA4Y$3!i!!&Y!!!!)`!PrqF$rqF!!3d!13!"E3!!!#B!+2r
 Q!rrQrrd0!$F!!@m!!!!H!"rrj3[rj3!5-!!(G'KPF'&dD!!(G'KP8'&dD!(rk3!
 !$3!d!!&[!!!!!!!!rq3,rq3!)$!!$R4SCA"bEfTPBh4`BA4S!!jdD'93FQpUC@0
 d8'&dD!)!-J!#!$S!1`d!1J!#FJ!!!#`!1`!m!$d0!$`!!Q-!!!!X!$N!2J!r$3!
 q!!*X!!8!,!!h!%$ri`d!3!!#EJ!!!#`!0`""!%)0!%%!!cF"!!!Y!$IriJ"$!%3
 +rq)!"!TMDA4Y$3"$!!&Y!!!!-3!crq%$rq%!!3d!4!!"E3!!!$3!0[rJ!rrJrri
 0!%)!!@m!!!!X!#hrh`[rh`!5-!!(G'KPF'&dD!!(G'KP8'&dD!(ri`!!$3!r!!&
 Y!!!!0`!irpi+rpi!"!T849K8$3!p!!&[!!!!!!!!rpd,rpd!&M!!#A4SC@ePF'&
 dD!!*G'KP6@93BA4S!J!l!!)!43"'$3"&!!*X!!)!2!!mrpcrf`(rh!!!!IrE!!!
 #!%B!!J"(!%J0!%F!!R)!!!!m!%8!53"+$3"*!!*M!!!!2!""!%X!6!d!5`!#BJ!
 !!$`!2`"0!%i0!%d!!@m!!!!m!$hrfJ[rfJ!J-!!1G'KPF(*[DQ9MG("KG'J!$R4
 SC9"bEfTPBh43BA4S$3"1!!&Y!!!!23!q!%m-!%m!$3!(D@jME(9NC3!#!!!0!%`
 !!@d!!!!r!%$rf3Vrf3!%#P4&@&30!%S!!@m!!!!!!!$rf![rf!!Q-!!4D@jME(9
 NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S!J")!!)!8!"4$3"3!!*b!!!
 !4J"9!&)!8`d!8J!#B`!!!%B!83"8!&80!&3!!Q)!!!"'!%m!9J"A$3"@!!*L!!!
 !4J",!&J!@3d!@!!"E`!!!%B!4rrA#rrA!#!`!!jdD'9`FQpUC@0dF'&dD!!1G'K
 P8(*[DQ9MG&"KG'J0!&N!!@d!!!"(!%S!@J`!@J!0!!GTEQ0XG@4P!!)!!!d!9`!
 "E3!!!%X!6J"E$!"E!!d!"fp`C@jcFf`!!J!!$3"9!!&Y!!!!6`"3rpB+rpB!"!T
 849K8$3"6!!&[!!!!!!!!rp8,rp8!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
 dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S!J"4!!)!A!"G$3"F!!*b!!!!9J"
 K!&i!A`d!AJ!#B`!!!&B!A3"J!'%0!'!!!Q)!!!"@!&X!BJ"M$3"L!!&[!!!!9J"
 Arp3,rp3!)$!!$R4SCA"bEfTPBh4`BA4S!!jdD'93FQpUC@0d8'&dD!d!B`!"E3!
 !!&F!@J"N$!"N!!`!"Q0bHA"dE`!#!!!0!'%!!@d!!!"E!&crd`Vrd`!%#P4&@&3
 0!&m!!@m!!!!!!!$rdJ[rdJ!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4Qp
 XC'9b8'&dD!)!A3!#!'8!CJd!C3!#FJ!!!')!E3"R!'J0!'F!!Q-!!!"L!'N!D3"
 U$3"T!!*L!!!!BJ"R!'X!E!d!D`!"E`!!!')!Brr4#rr4!#!`!!jdD'9`FQpUC@0
 dF'&dD!!1G'KP8(*[DQ9MG&"KG'J0!'`!!@d!!!"M!'B!E3`!E3!*!!0cFf`!!J!
 !$3"U!!&Y!!!!C`"Srp!+rp!!"!T849K8$3"S!!&[!!!!!!!!rmm,rmm!(M!!$A0
 cE'C[E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J#!'B!!J"Z!'m0!'i!!R)!!!"Z!(8
 !F!"a$3"`!!*M!!!!EJ"a!()!F`d!FJ!"E`!!!'i!Err1#rr1!#!`!!jdD'9`FQp
 UC@0dF'&dD!!1G'KP8(*[DQ9MG&"KG'J0!(-!!@d!!!"[!($rc3Vrc3!%#P4&@&3
 0!(%!!@m!!!!!!!$rc![rc!!Q-!!4Eh"PER0cE'C[E'4PFR"KG'J!%@p`C@jcFfa
 'EfaNCA*3BA4S!J"[!!)!G!"e$3"d!!*X!!)!GJ"frm[rbJ(rb`!!!Ir+!!!#!(8
 !!J"f!(F0!(B!!R)!!!"f!(X!H!"j$3"i!!&[!!!!GJ"hrmN,rmN!($!!$(4SC@p
 XC'4PE'PYF`!-G'KP6faN4'9XD@ec$3"j!!*Z!!-!!!!!!(S!H`d!HJ!"-3!!!(J
 !H[r)#[r)!!3+G(KNE!d!H`!"-3!!!(F!H2r(#[r(!!3+BA0MFJ)!G`!#!(`!I3d
 !I!!#E!!#!(`!I2r'rm8"rmB!!!(ra3!!!J"p!!)!IJ"r$3"q!!*X!!%!I!"mrm3
 !J!(ra!!!$!#!!%!!1L"NC@aPG'8JEfaN)'PZBfaeC'8kEh"PER0cE#"QEfaNCA)
 JB@jN)(*PBh*PBA4P)'Pd)'0XC@&ZE(N!!J!!!J"r!!)!J3##$3#"!!*X!!)!I!"
 mrm2r`J(r``!!!Ir#!!!#!))!!J#$!)30!)-!!e%!!!"m!+8!K3#'!)F0!)8!!@X
 !!!"r!*`!L!)!L!!#!)N!LJd!L3!$53!#!(m!N[r"!)[r`!Vr`3!B,QeTFf0cE'0
 d+LSU+J!!!!!!!*!!!#SU+LS0!)X!!Qi!!!"r!)i!M!#0$3#-!!)d!!!!K`#1rlm
 !MJVr[`!%#Q0QEf`0!)i!!@d!!!#+!)d!M``!M`!0!!G[F'9ZFh0X!!)!!!d!M3!
 #0!!!!(m!Krqq!*!!#[qq!!3+BfC[E!d!N!!!!@m!!!#$!)Er[3[r[3!Q-!!4D@j
 ME(9NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S![r!!!!#!)S!!J#4rl`
 0!*%!!dN!!J#6!*crZ`#5rlS+rlX!'#jMEh*PC'9XEbSU+LS!!!!!!!#3!!!U+LS
 U$3#5!!%a!!!!N`#BrlN+rlN!"!TcC@aP![qk!!!#rl`!!!d!KJ!$8J!!!!!!!2q
 irlIrYJVrZ!!B,Q&cBh*PFR)J+LSU+J!!!!!!!*!!!#SU+LS"rlF!!!,rYJ!!$3#
 (!!*X!!%!T!#Nrl8!N`(rY3!!$!#6!"-!$5"TCfj[FQ8JCA*bEh)!!J!!!J#%!!)
 !P!#9$3#8!!*X!!)!TJ#Qrl6rX`(rY!!!!Iqc!!!#!*8!!J#@!*F0!*B!!dN!!J#
 Q!,lrX[qa!*J+rl)!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Iqa!!!'!*J
 !!rq`!*N!QJVrX!!%#QY[Bf`0!*N!!@d!!!#U!+hrV`VrV`!%#Q0QEf`'!*S!!rq
 Z!*[rV3VrVJ!%#QPZFfJ0!*X!!M3!!!#`!,MrV!#F#[qX!!3+BfC[E!d!R!!"E`!
 !!,3!YrqV#rqV!#B`!"&TEQ0XG@4PCQpXC'9bF'&dD!!4D@jME(9NC8C[E'4PFP"
 KG'J'rkd!!!)!P`!#!*d!RJd!R3!#FJ!!!,m!aJ#I!+!0!*m!!Q`"!!#r!-)!SIq
 U$3#K!!%a!!!![`$#rkN+rkN!"!TbFfad!IqU!!!0!+!!!@m!!!!!!!$rU![rU!!
 Z-!!9G'KPEQ9hCQpXC'9bFQ9QCA*PEQ0P!"9dD'91CAG'EfaNCA*5C@CPFQ9ZBf8
 #!*i!!J#L!+-0!+)!!dN!!J$(!-lrT`#NrkB+rkF!'#jYDA0MFfaMG#SU+LS!!!!
 !!!#3!!!U+LSU$3#N!!&[!!!!a`$+rk8,rk8!,M!!&A4SC@jPGfC[E'4PFR*PCQ9
 bC@jMC3!9G'KP6Q9h4QpXC'9b8Q9QCA*PEQ0P![qQ!!!#!+-!!J#P!+B0!+8!!R)
 !!!$2!0`!T`#S$3#R!!&Y!!!!c`$5!+N-!+N!$3!(Eh"PER0cE!!#!!!0!+J!!Qi
 !!!!!!!!!UJ#V$3#U!!%a!!!!e`$Erk3+rk3!"!T`EQ&Y$3#V!!%a!!!!dJ$Ark-
 +rk-!"!TcC@aP!J#Q!!)!V!#Y$3#X!!*X!!)!h3$Grk,rS3(rSJ!!!IqK!!!#!+d
 !!J#Z!+m0!+i!!Q`!!3$G!0hrS!#`!IqJ!!!-!,!!(`!C)&0dBA*d)'eKDfPZCb"
 dD'8JB@aTBA0PF`!#!!!#!+m!!J#a!,)0!,%!!dN!!J$G!3ArRrqH!,-+rjm!'#j
 MEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!IqH!!!'!,-!!rqG!,3!Y3VrR3!%#QY
 [Bf`0!,3!!@d!!!$K!16rR!VrR!!%#Q&XD@%'!,8!!rqE!,B!Y`VrQ`!%#QPZFfJ
 0!,B!!M3!!!$R!1rrQJ#i#[qD!!3+BfC[E!d!Z!!"E`!!!1X!l[qC#rqC!$3`!"K
 [F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&
 dD!B!Y`!$rjJ!ZIqA#[qB!!3+G'mJ)!d!Z3!#EJ!!!2)!r`#k!,X0!,S!!M3!!!$
 i!2rrPJ#m#[q@!!3+CQPXC3d![!!"E3!!!2X!rJ#p$!#p!"-!$@p`C@jcFfaMEfj
 Q,QJ!!J!!$3#l!!)d!!!!mJ$irj8![JVrP3!%#Q0QEf`0!,i!!@m!!!$f!2IrP![
 rP!!@-!!*G'KPE@9`BA4S!!PdD'90C9"KG'J'rjF!!!)!XJ!#!,m!`!d![`!#E!!
 #!3B""[q6rj)"rj-!!!(rNJ!!!J$!!!)!`3$#$3$"!!*b!!!""J%4!--!a!d!``!
 #BJ!!!3B"$3$&!-B0!-8!!@m!!!%'!3RrN3[rN3!N-!!3Bh*jF(4[CQpXC'9bF'&
 dD!!3Bh*jF(4[4QpXC'9b8'&dD!d!aJ!"E3!!!3N"$!$($!$(!!X!"6TKFfia!!)
 !!!d!a!!"E`!!!!!!!2q3!![rN!!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)!`J!
 #!-J!b3d!b!!$53!#!4)"22q2rii!bJVrM`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!
 !!'jeE'`"rii!!!B!bJ!$rid!b`$-#[q0!!3+DfpME!d!b`!"E3!!!4B"'Iq-#[q
 -!!3+B@aTB3B!c!!$riX!c3$1#[q,!!3+D@jcD!d!c3!#0!!!!4`"*2q+!-m+riS
 !"!TMCQpX$3$2!!&[!!!")!%MriN,riN!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9
 bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J$1!!2rL!$3riF+riJ!"!T
 dEb!J$3$3!!*Z!!!"*`%f!0%!dJd!d3!#0!!!!5m"0[q'!0-+riB!"!TQD@aP$3$
 6!!&Y!!!"-J%e!03-!03!$!!'BA0Z-5jS!!)!!!d!dJ!#0!!!!5F",rq&!08+ri8
 !"!TMCQpX$3$9!!&[!!!"+`%Zri3,ri3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!E
 rK`!!!J$*!!)!eJ$A$3$@!!0*!!)"23&Rri2rJJ$B#[q$!"JZBfpbC@0bC@`U+LS
 U!!!!!!!!N!!!ER9XE!(rJJ!!"J$B!!2rJ3$C!0S+ri%!"!TVEf0X$3$C!!&Y!!!
 "33&%ri!+ri!!"!TKE'PK"J$D!!2rI`$E!0`+rhm!"!TTER0S$3$E!!)d!!!"4`&
 2rhi!h3VrIJ!%#Q0QEf`0!0d!!@m!!!&,!8lrI3[rI3!d-!!BEh"PER0cE'PZBfa
 eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!0`!!rpm!0l
 rH`VrI!!%#R4[)#!0!0i!!Qi!!!&5!@%!h`$J$3$I!!)d!!!"@J&KrhS!i3VrHJ!
 %#QCTE'80!1%!!@d!!!&G!@!!iJ`!iJ!3!!TKFfiaAfeKBbjS!!)!!!d!i!!#0!!
 !!9)"@[pj!1-+rhN!"!TMCQpX$3$M!!&[!!!"9J&CrhJ,rhJ!&$!!#(4PEA"`BA4
 S!!KdC@e`8'&dD!ErH`!!!J$A!!)!j!$P$3$N!!*X!!)"D!&SrhIrGJ(rG`!!!Ip
 f!!!#!18!!J$Q!1F0!1B!!R)!!!&S!A-!k!$T$3$S!!*L!!!"D!&[!1S!k`d!kJ!
 "E`!!!@J"Drpe#rpe!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*
 3BA4S$3$V!!&Y!!!"D`&Z!1`-!1`!#J!%1Q*TE`!#!!!0!1N!!@m!!!!!!!$rG![
 rG!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J$R!!)!l3$Z$3$Y!!0*!!)"G!'Hrh2
 rFJ$[#[pc!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(rFJ!!"J$[!!2rF3$
 `!2%+rh%!"!TVEf0X$3$`!!&Y!!!"H!&lrh!+rh!!"!TKE'PK"J$a!!2rE`$b!2-
 +rfm!"!TTER0S$3$b!!)d!!!"IJ''rfi!p!VrEJ!%#Q0QEf`0!23!!@m!!!'#!BA
 rE3[rE3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
 NC8C[E'4PFP"KG'J'!2-!!rpX!2ArD`VrE!!%#R4[)#!0!28!!Qi!!!'*!CJ!pJ$
 h$3$f!!)d!!!"N3'BrfS!q!VrDJ!%#QCTE'80!2J!!@d!!!'8!CF!q3`!q3!,!!9
 LD@mZD!!#!!!0!2F!!M3!!!'*!C(rD3$k#[pT!!3+BfC[E!d!qJ!"E`!!!Bd"N!$
 rD![rD!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[pV!!!#!1i!!J$l!2`0!2X!!Q`
 !!J'I!CrrCrpQ!IpR!!!"rfB!!!)!r!!#!2d!rJd!r3!#FJ!!!Cm"UJ$r!3!0!2m
 !!Q)!!!'I!DB"!3%#$3%"!!&[!!!"R`'Lrf8,rf8!*$!!%'0bHA"dEfC[E'4PFR"
 KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!3)!!@d!!!'L!D8"!``"!`!*!!-kBQB!!J!
 !$3%!!!&[!!!!!!!!rf3,rf3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)!rJ!#!33
 ""3d""!!$53!#!DX"eIpMrf)""JVrB`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'j
 eE'`"rf)!!!B""J!$rf%""`%)#[pK!!3+DfpME!d""`!"E3!!!Dm"X[pJ#[pJ!!3
 +B@aTB3B"#!!$rem"#3%+#[pI!!3+D@jcD!d"#3!#0!!!!E8"[IpH!3X+rei!"!T
 MCQpX$3%,!!&[!!!"Z3'mred,red!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
 dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J%+!!2rA!%-reX+re`!"!TdEb!
 J$3%-!!*Z!!!"`!(2!3d"$Jd"$3!#0!!!!FJ"crpD!3m+reS!"!TQD@aP$3%2!!&
 Y!!!"b`(1!4!-!4!!%!!+BQa[GfCTFfJZD!!#!!!0!3i!!M3!!!(!!FMr@3%4#[p
 C!!3+BfC[E!d"%3!"E`!!!F3"arpB#rpB!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J
 'reX!!!)""3!#!4)"%`d"%J!#E!!#!GB"e[pAreB"reF!!!(r9J!!!J%6!!)"&!%
 9$3%8!!*b!!!"eJ(K!4B"&`d"&J!#BJ!!!GB"h3%B!4N0!4J!!@m!!!(@!GRr93[
 r93!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"'3!"E3!
 !!GN"h!%D$!%D!!N!!cTLEJ!#!!!0!4F!!@m!!!!!!!$r9![r9!!8-!!)G'9YF("
 KG'J!#(4PEA"3BA4S!J%9!!)"'`%F$3%E!!0*!!)"iJ)-re2r8J%G#[p6!"JZBfp
 bC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(r8J!!"J%G!!2r83%H!4m+re%!"!TVEf0
 X$3%H!!&Y!!!"jJ(Tre!+re!!"!TKE'PK"J%I!!2r6`%J!5%+rdm!"!TTER0S$3%
 J!!)d!!!"l!(drdi")JVr6J!%#Q0QEf`0!5)!!@m!!!(`!I2r63[r63!d-!!BEh"
 PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J
 '!5%!!rp-!52r5`Vr6!!%#R4[)#!0!5-!!Qi!!!(h!JB"*!%P$3%N!!)d!!!"r`)
 'rdS"*JVr5J!%#QCTE'80!5B!!@d!!!)#!J8"*``"*`!+!!4LELjS!!)!!!d"*3!
 #0!!!!IF"rrp*!5J+rdN!"!TMCQpX$3%S!!&[!!!"q`(qrdJ,rdJ!&$!!#(4PEA"
 `BA4S!!KdC@e`8'&dD!Er5`!!!J%F!!)"+3%U$3%T!!*X!!)#$3)0rdIr4J(r4`!
 !!Ip'!!!#!5S!!J%V!5`0!5X!!R)!!!)0!KJ",3%Z$3%Y!!*L!!!#$3)8!5m"-!d
 ",`!"E`!!!Jd#%2p&#rp&!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'Efa
 NCA*3BA4S$3%`!!&Y!!!#%!)6!6%-!6%!$3!(1Q*eCQCPFJ!#!!!0!5i!!@m!!!!
 !!!$r4![r4!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J%X!!)"-J%c$3%b!!0*!!)
 #'3*$rd2r3J%d#[p$!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(r3J!!"J%
 d!!2r33%e!6B+rd%!"!TVEf0X$3%e!!&Y!!!#(3)Jrd!+rd!!"!TKE'PK"J%f!!2
 r2`%h!6J+rcm!"!TTER0S$3%h!!)d!!!#)`)Vrci"13Vr2J!%#Q0QEf`0!6N!!@m
 !!!)R!LVr23[r23!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
 -5@jME(9NC8C[E'4PFP"KG'J'!6J!!rmm!6Vr1`Vr2!!%#R4[)#!0!6S!!Qi!!!)
 Z!Md"1`%m$3%l!!)d!!!#0J)prcS"23Vr1J!%#QCTE'80!6d!!@d!!!)j!M`"2J`
 "2J!1!!KLG@CQCA)ZD!!#!!!0!6`!!M3!!!)Z!MEr13%r#[mj!!3+BfC[E!d"2`!
 "E`!!!M)#0Imi#rmi!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rcX!!!)"-`!#!8!
 "33d"3!!#E!!#!N3#42mhrcB"rcF!!!(r0J!!!J&"!!)"3J&$$3&#!!*b!!!#4!*
 2!83"43d"4!!#BJ!!!N3#5`&'!8F0!8B!!@m!!!*%!NIr03[r03!N-!!3Bh*jF(4
 [CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"4`!"E3!!!NF#5J&)$!&)!!X
 !"6TMBA0d!!)!!!d"43!"E`!!!!!!!2md#rmd!"3`!!KdC@e`F'&dD!!)G'9YF&"
 KG'J#!8-!!J&*!8S0!8N!!dN!!J*3!RVr-rmb!8X+rc-!'#jMEh*PBh*PE#SU+LS
 !!!!!!!#3!!"ZG@aX!Imb!!!'!8X!!rma!8`"63Vr-3!%#QY[Bf`0!8`!!@d!!!*
 8!PIr-!Vr-!!%#Q&XD@%'!8d!!rm[!8i"6`Vr,`!%#QPZFfJ0!8i!!M3!!!*D!Q,
 r,J&3#[mZ!!3+BfC[E!d"8!!"E`!!!Pi#BImY#rmY!$3`!"K[F'9ZFh0XD@jME(9
 NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B"6`!$rb`"8Im
 V#[mX!!3+G'mJ)!d"83!#EJ!!!Q8#G!&5!9-0!9)!!M3!!!*Y!R6r+J&8#[mU!!3
 +CQPXC3d"9!!"E3!!!R!#F`&9$!&9!!`!"Q0KFh3ZD!!#!!!0!9-!!M3!!!*P!Qh
 r+3&@#[mT!!3+BfC[E!d"9J!"E`!!!QN#E2mS#rmS!"3`!!KdC@e`F'&dD!!)G'9
 YF&"KG'J'rbX!!!)"5J!#!9F"@!d"9`!#E!!#!RX#HrmRrbB"rbF!!!(r*J!!!J&
 B!!)"@3&D$3&C!!*b!!!#H`+'!9X"A!d"@`!#BJ!!!RX#JJ&G!9i0!9d!!@m!!!*
 l!Rlr*3[r*3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d
 "AJ!"E3!!!Ri#J3&I$!&I!!X!"6TMEfe`!!)!!!d"A!!"E`!!!!!!!2mN#rmN!"3
 `!!KdC@e`F'&dD!!)G'9YF&"KG'J#!9S!!J&J!@%0!@!!!dN!!J+(!V(r)rmL!@)
 +rb-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!ImL!!!'!@)!!rmK!@-"C!V
 r)3!%#QY[Bf`0!@-!!@d!!!+,!Slr)!Vr)!!%#Q&XD@%'!@3!!rmI!@8"CJVr(`!
 %#QPZFfJ0!@8!!M3!!!+4!TRr(J&R#[mH!!3+BfC[E!d"C`!"E`!!!T8#Q2mG#rm
 G!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4Qp
 XC'9b8'&dD!B"CJ!$ra`"D2mE#[mF!!3+G'mJ)!d"D!!#EJ!!!T`#U`&T!@S0!@N
 !!M3!!!+N!U[r'J&V#[mD!!3+CQPXC3d"D`!"E3!!!UF#UJ&X$!&X!!`!"Q0[EA!
 ZD!!#!!!0!@S!!M3!!!+F!U6r'3&Y#[mC!!3+BfC[E!d"E3!"E`!!!U!#SrmB#rm
 B!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'raX!!!)"B3!#!@i"E`d"EJ!#E!!#!V)
 #X[mAraB"raF!!!(r&J!!!J&[!!)"F!&a$3&`!!*b!!!#XJ+p!A)"F`d"FJ!#BJ!
 !!V)#Z3&d!A80!A3!!@m!!!+b!VAr&3[r&3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!
 3Bh*jF(4[4QpXC'9b8'&dD!d"G3!"E3!!!V8#Z!&f$!&f!!X!"6TMEfjQ!!)!!!d
 "F`!"E`!!!!!!!2m8#rm8!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!A%!!J&h!AJ
 0!AF!!dN!!J+q!ZMr%rm5!AN+ra-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@a
 X!Im5!!!'!AN!!rm4!AS"H`Vr%3!%#QY[Bf`0!AS!!@d!!!,#!XAr%!Vr%!!%#Q&
 XD@%'!AX!!rm2!A`"I3Vr$`!%#QPZFfJ0!A`!!M3!!!,)!Y$r$J&q#[m1!!3+BfC
 [E!d"IJ!"E`!!!X`#crm0#rm0!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J
 !''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B"I3!$r``"Irm,#[m-!!3+G'mJ)!d
 "I`!#EJ!!!Y-#iJ'!!B%0!B!!!M3!!!,E!Z,r#J'##[m+!!3+CQPXC3d"JJ!"E3!
 !!Yi#i3'$$!'$!!`!"Q0[EQBZD!!#!!!0!B%!!M3!!!,6!Y[r#3'%#[m*!!3+BfC
 [E!d"K!!"E`!!!YF#f[m)#rm)!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'r`X!!!)
 "H!!#!B8"KJd"K3!#E!!#!ZN#kIm(r`B"r`F!!!(r"J!!!J''!!)"K`')$3'(!!*
 b!!!#k3,d!BN"LJd"L3!#BJ!!!ZN#m!',!B`0!BX!!@m!!!,T!Zcr"3[r"3!N-!!
 3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"M!!"E3!!!Z`#l`'
 0$!'0!!S!"$TNCA-!!J!!$3'+!!&[!!!!!!!!r`3,r`3!&$!!#(4PEA"`BA4S!!K
 dC@e`8'&dD!)"L!!#!Bi"M`d"MJ!$53!#![8$(rm$r`)"N!!+r`-!'#jMEh*PBh*
 PE#SU+LS!!!!!!!#3!!"ZG@aX!Im#!!!'!C!!!!2r!3'4!C)+r`%!"!TVEf0X$3'
 4!!&Y!!!#q3,mr`!+r`!!"!TKE'PK"J'5!!2qr`'6!C3+r[m!"!TTER0S$3'6!!)
 d!!!#r`-(r[i"P3VqrJ!%#Q0QEf`0!C8!!@m!!!-$!`Eqr3[qr3!d-!!BEh"PER0
 cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!C3
 !!rlm!CEqq`Vqr!!%#R4[)#!0!CB!!Qi!!!-+!aN"P`'B$3'A!!)d!!!$%J-Cr[S
 "Q3VqqJ!%#QCTE'80!CN!!@d!!!-9!aJ"QJ`"QJ!,!!9NCA-ZD!!#!!!0!CJ!!M3
 !!!-+!a,qq3'E#[lj!!3+BfC[E!d"Q`!"E`!!!`i$%Ili#rli!"3`!!KdC@e`F'&
 dD!!)G'9YF&"KG'J'r[X!!!)"M`!#!C`"R3d"R!!#E!!#!b!$)2lhr[B"r[F!!!(
 qpJ!!!J'G!!)"RJ'I$3'H!!*b!!!$)!-V!D!"S3d"S!!#BJ!!!b!$*`'L!D-0!D)
 !!@m!!!-J!b2qp3[qp3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9
 b8'&dD!d"S`!"E3!!!b-$*J'N$!'N!!N!!cTND!!#!!!0!D%!!@m!!!!!!!$qp![
 qp!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J'I!!)"T3'Q$3'P!!0*!!)$,!0@r[2
 qmJ'R#[lc!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(qmJ!!"J'R!!2qm3'
 S!DN+r[%!"!TVEf0X$3'S!!&Y!!!$-!-cr[!+r[!!"!TKE'PK"J'T!!2ql`'U!DX
 +rZm!"!TTER0S$3'U!!)d!!!$0J-qrZi"V!VqlJ!%#Q0QEf`0!D`!!@m!!!-k!ch
 ql3[ql3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
 NC8C[E'4PFP"KG'J'!DX!!rlX!Dhqk`Vql!!%#R4[)#!0!Dd!!Qi!!!0"!e!"VJ'
 [$3'Z!!)d!!!$5303rZS"X!VqkJ!%#QCTE'80!E!!!@d!!!0-!dm"X3`"X3!+!!4
 ND#jS!!)!!!d"V`!#0!!!!d%$5IlT!E)+rZN!"!TMCQpX$3'b!!&[!!!$430)rZJ
 ,rZJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eqk`!!!J'Q!!)"X`'d$3'c!!*X!!)
 $9`0ArZIqjJ(qj`!!!IlQ!!!#!E3!!J'e!EB0!E8!!R)!!!0A!f)"Y`'i$3'h!!*
 L!!!$9`0H!EN"ZJd"Z3!"E`!!!eF$@[lP#rlP!#3`!""MFRP`G'pQEfaNCA*`BA4
 S!""MFRP`G'p'EfaNCA*3BA4S$3'k!!&Y!!!$@J0G!EX-!EX!#J!%1Q4cB3!#!!!
 0!EJ!!@m!!!!!!!$qj![qj!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J'f!!)"[!'
 p$3'm!!0*!!)$B`10rZ2qiJ'q#[lM!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
 XE!(qiJ!!"J'q!!2qi3'r!F!+rZ%!"!TVEf0X$3'r!!&Y!!!$C`0UrZ!+rZ!!"!T
 KE'PK"J(!!!2qh`("!F)+rYm!"!TTER0S$3("!!)d!!!$E30erYi"``VqhJ!%#Q0
 QEf`0!F-!!@m!!!0a!h6qh3[qh3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
 S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!F)!!rlF!F6qf`Vqh!!%#R4[)#!
 0!F3!!Qi!!!0i!iF"a3('$3(&!!)d!!!$J!1(rYS"a`VqfJ!%#QCTE'80!FF!!@d
 !!!1$!iB"b!`"b!!,!!9NFf%ZD!!#!!!0!FB!!M3!!!0i!i$qf3(*#[lC!!3+BfC
 [E!d"b3!"E`!!!h`$IrlB#rlB!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rYX!!!)
 "[3!#!FS"b`d"bJ!#E!!#!ii$M[lArYB"rYF!!!(qeJ!!!J(,!!)"c!(0$3(-!!*
 b!!!$MJ1C!Fi"c`d"cJ!#BJ!!!ii$P3(3!G%0!G!!!@m!!!11!j(qe3[qe3!N-!!
 3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d"d3!"E3!!!j%$P!(
 5$!(5!!S!"$TPFR)!!J!!$3(2!!&[!!!!!!!!rY3,rY3!&$!!#(4PEA"`BA4S!!K
 dC@e`8'&dD!)"c3!#!G-"e!d"d`!$53!#!jS$a2l6rY)"e3Vqd`!B,Q0[FQ9MFQ9
 X+LSU+J!!!!!!!*!!!'jeE'`"rY)!!!B"e3!$rY%"eJ(A#[l4!!3+DfpME!d"eJ!
 "E3!!!ji$SIl3#[l3!!3+B@aTB3B"e`!$rXm"f!(C#[l2!!3+D@jcD!d"f!!#0!!
 !!k3$V2l1!GS+rXi!"!TMCQpX$3(D!!&[!!!$U!1VrXd,rXd!0$!!''p`C@jcFfa
 TEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J(C!!2
 qc!(ErXX+rX`!"!TdEb!J$3(E!!*Z!!!$V`1q!G`"h3d"h!!#0!!!!lF$[[l+!Gi
 +rXS!"!TQD@aP$3(H!!&Y!!!$ZJ1p!Gm-!Gm!#`!&CA*b,QJ!!J!!$3(G!!)d!!!
 $V`1hrXN"i!Vqb3!%#Q0QEf`0!H!!!@m!!!1c!lEqb![qb!!8-!!)G'9YF("KG'J
 !#(4PEA"3BA4S"[l,!!!#!G3!!J(K!H)0!H%!!Q`!!J2&!mAqarl'!Il(!!!"rXB
 !!!)"iJ!#!H-"j!d"i`!#FJ!!!m8$d!(P!HB0!H8!!Q)!!!2&!m`"j`(S$3(R!!&
 [!!!$a32)rX8,rX8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"
 KG'J0!HJ!!@d!!!2)!mX"k3`"k3!+!!3kCAC`!!)!!!d"jJ!"E`!!!!!!!2l%#rl
 %!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!H3!!J(U!HX0!HS!!dN!!J24!r[q`rl
 #!H`+rX-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Il#!!!'!H`!!rl"!Hd
 "lJVq`3!%#QY[Bf`0!Hd!!@d!!!29!pMq`!Vq`!!%#Q&XD@%'!Hi!!rkr!Hm"m!V
 q[`!%#QPZFfJ0!Hm!!M3!!!2E!q2q[J(a#[kq!!3+BfC[E!d"m3!"E`!!!pm$i[k
 p#rkp!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4
 P4QpXC'9b8'&dD!B"m!!$rV`"m[kl#[km!!3+G'mJ)!d"mJ!#EJ!!!qB$p3(c!I3
 0!I-!!M3!!!2Z!rAqZJ(e#[kk!!3+CQPXC3d"p3!"E3!!!r%$p!(f$!(f!!X!"@9
 fF#jS!!)!!!d"p!!#0!!!!qB$l[kj!IF+rVN!"!TMCQpX$3(h!!&[!!!$kJ2YrVJ
 ,rVJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EqZ`!!!J(V!!)"q!(j$3(i!!*X!!)
 $r!2mrVIqYJ(qY`!!!Ikf!!!#!IN!!J(k!IX0!IS!!R)!!!2m"!F"r!(p$3(m!!*
 L!!!$r!3$!Ii"r`d"rJ!"E`!!!r`$rrke#rke!#3`!""MFRP`G'pQEfaNCA*`BA4
 S!""MFRP`G'p'EfaNCA*3BA4S$3(r!!&Y!!!$r`3#!J!-!J!!#`!&1QKYB@-!!J!
 !$3(p!!&[!!!!!!!!rV3,rV3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)"q`!#!J%
 #!Jd#!3!$53!#"!J%-[kcrV)#!`VqX`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'j
 eE'`"rV)!!!B#!`!$rV%#"!)&#[ka!!3+DfpME!d#"!!"E3!!"!`%$rk`#[k`!!3
 +B@aTB3B#"3!$rUm#"J)(#[k[!!3+D@jcD!d#"J!#0!!!"")%'[kZ!JJ+rUi!"!T
 MCQpX$3))!!&[!!!%&J3CrUd,rUd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&
 dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J)(!!2qV!)*rUX+rU`!"!TdEb!
 J$3)*!!*Z!!!%(33X!JS##`d##J!#0!!!"#8%,2kU!J`+rUS!"!TQD@aP$3)-!!&
 Y!!!%+!3V!Jd-!Jd!$!!'D'eKBbjS!!)!!!d##`!#0!!!""d%*IkT!Ji+rUN!"!T
 MCQpX$3)1!!&[!!!%)33NrUJ,rUJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EqU`!
 !!J)#!!)#$`)3$3)2!!*X!!)%-`3crUIqTJ(qT`!!!IkQ!!!#!K!!!J)4!K)0!K%
 !!R)!!!3c"$i#%`)8$3)6!!*L!!!%-`3k!K8#&Jd#&3!"E`!!"$-%0[kP#rkP!#3
 `!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3)@!!&Y!!!%0J3
 j!KF-!KF!#`!&1QPNC@%!!J!!$3)8!!&[!!!!!!!!rU3,rU3!&$!!#(4PEA"`BA4
 S!!KdC@e`8'&dD!)#%J!#!KJ#'3d#'!!$53!#"$m%DIkMrU)#'JVqS`!B,Q0[FQ9
 MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rU)!!!B#'J!$rU%#'`)F#[kK!!3+DfpME!d
 #'`!"E3!!"%-%4[kJ#[kJ!!3+B@aTB3B#(!!$rTm#(3)H#[kI!!3+D@jcD!d#(3!
 #0!!!"%N%8IkH!Km+rTi!"!TMCQpX$3)I!!&[!!!%6343rTd,rTd!0$!!''p`C@j
 cFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J)
 H!!2qR!)JrTX+rT`!"!TdEb!J$3)J!!*Z!!!%9!4M!L%#)Jd#)3!#0!!!"&`%Brk
 D!L-+rTS!"!TQD@aP$3)M!!&Y!!!%A`4L!L3-!L3!$!!'D@4PB5jS!!)!!!d#)J!
 #0!!!"&3%A2kC!L8+rTN!"!TMCQpX$3)P!!&[!!!%@!4ErTJ,rTJ!&$!!#(4PEA"
 `BA4S!!KdC@e`8'&dD!EqQ`!!!J)C!!)#*J)R$3)Q!!*X!!)%DJ4UrTIqPJ(qP`!
 !!Ik@!!!#!LF!!J)S!LN0!LJ!!R)!!!4U"(8#+J)V$3)U!!*L!!!%DJ4a!L`#,3d
 #,!!"E`!!"'S%EIk9#rk9!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'Efa
 NCA*3BA4S$3)Y!!&Y!!!%E34`!Li-!Li!$!!'1QaSBA0S!!)!!!d#+`!"E`!!!!!
 !!2k8#rk8!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!LN!!J)[!M!0!Lm!!dN!!J4
 f"+$qNrk5!M%+rT-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ik5!!!'!M%
 !!rk4!M)#-`VqN3!%#QY[Bf`0!M)!!@d!!!4k"(hqN!!+rT!!!!3+B@aTB3B#-`!
 $rSm#0!)e#[k2!!3+D@jcD!d#0!!#0!!!")!%L2k1!MB+rSi!"!TMCQpX$3)f!!&
 [!!!%K!5(rSd,rSd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP0
 66%PZBfaeC'9'EfaNCA*3BA4S"J)e!!2qM!)hrSX+rS`!"!TdEb!J$3)h!!*Z!!!
 %L`5D!MJ#13d#1!!#0!!!"*-%Q[k+!MS+rSS!"!TQD@aP$3)k!!&Y!!!%PJ5C!MX
 -!MX!$3!(E'KKFfJZD!!#!!!0!MN!!M3!!!5,"*2qL3)m#[k*!!3+BfC[E!d#2!!
 "E`!!")m%N[k)#rk)!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rSX!!!)#-!!#!Md
 #2Jd#23!#E!!#"+%%SIk(rSB"rSF!!!(qKJ!!!J)q!!)#2`*!$3)r!!*b!!!%S35
 X!N%#3Jd#33!#BJ!!"+%%U!*$!N30!N-!!@m!!!5K"+6qK3[qK3!N-!!3Bh*jF(4
 [CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d#4!!"E3!!"+3%T`*&$!*&!!S
 !"$TYC$)!!J!!$3*#!!&[!!!!!!!!rS3,rS3!&$!!#(4PEA"`BA4S!!KdC@e`8'&
 dD!)#3!!#!NB#4`d#4J!$53!#"+d%erk$rS)#5!VqJ`!B,Q0[FQ9MFQ9X+LSU+J!
 !!!!!!*!!!'jeE'`"rS)!!!B#5!!$rS%#53*+#[k"!!3+DfpME!d#53!"E3!!",%
 %Y2k!#[k!!!3+B@aTB3B#5J!$rRm#5`*-#[jr!!3+D@jcD!d#5`!#0!!!",F%[rj
 q!Nd+rRi!"!TMCQpX$3*0!!&[!!!%Z`5qrRd,rRd!0$!!''p`C@jcFfaTEQ0XG@4
 PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J*-!!2qI!*1rRX
 +rR`!"!TdEb!J$3*1!!*Z!!!%`J64!Nm#8!d#6`!#0!!!"-S%dIjk!P%+rRS!"!T
 QD@aP$3*4!!&Y!!!%c363!P)-!P)!#`!&E@3b,QJ!!J!!$3*3!!)d!!!%`J6+rRN
 #8`VqH3!%#Q0QEf`0!P-!!@m!!!6'"-RqH![qH!!8-!!)G'9YF("KG'J!#(4PEA"
 3BA4S"[jl!!!#!NF!!J*8!P80!P3!!Q`!!J6B"0MqGrjf!Ijh!!!"rRB!!!)#93!
 #!PB#9`d#9J!#FJ!!"0J%i`*B!PN0!PJ!!Q)!!!6B"0m#@J*E$3*D!!&[!!!%f!6
 ErR8,rR8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!PX
 !!@d!!!6E"0i#A!`#A!!+!!3kE@3e!!)!!!d#@3!"E`!!!!!!!2jd#rjd!"3`!!K
 dC@e`F'&dD!!)G'9YF&"KG'J#!PF!!J*G!Pi0!Pd!!dN!!J6N"3lqFrjb!Pm+rR-
 !'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ijb!!!'!Pm!!rja!Q!#B3VqF3!
 %#QY[Bf`0!Q!!!@d!!!6S"1[qF!VqF!!%#Q&XD@%'!Q%!!rj[!Q)#B`VqE`!%#QP
 ZFfJ0!Q)!!M3!!!6Z"2EqEJ*N#[jZ!!3+BfC[E!d#C!!"E`!!"2)%pIjY#rjY!$3
 `!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9
 b8'&dD!B#B`!$rQ`#CIjV#[jX!!3+G'mJ)!d#C3!#EJ!!"2N&#!*Q!QF0!QB!!M3
 !!!8""3MqDJ*S#[jU!!3+CQPXC3d#D!!"E3!!"33&"`*T$!*T!!X!"@eN05jS!!)
 !!!d#C`!#0!!!"2N&!IjT!QS+rQN!"!TMCQpX$3*U!!&[!!!%r38!rQJ,rQJ!&$!
 !#(4PEA"`BA4S!!KdC@e`8'&dD!EqD`!!!J*H!!)#D`*X$3*V!!*X!!)&$`82rQI
 qCJ(qC`!!!IjQ!!!#!Q`!!J*Y!Qi0!Qd!!R)!!!82"4S#E`*`$3*[!!*L!!!&$`8
@!R%#FJd#F3!"E`!!"3m&%[jP#rjP!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP
 `G'p'EfaNCA*3BA4S$3*b!!&Y!!!&%J89!R--!R-!#`!&1QeNBc)!!J!!$3*`!!&
 [!!!!!!!!rQ3,rQ3!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)#EJ!#!R3#G3d#G!!
 $53!#"4X&4IjMrQ)#GJVqB`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rQ)
 !!!B#GJ!$rQ%#G`*i#[jK!!3+DfpME!d#G`!"E3!!"4m&)[jJ#[jJ!!3+B@aTB3B
 #H!!$rPm#H3*k#[jI!!3+D@jcD!d#H3!#0!!!"58&,IjH!RX+rPi!"!TMCQpX$3*
 l!!&[!!!&+38XrPd,rPd!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"
 PEP066%PZBfaeC'9'EfaNCA*3BA4S"J*k!!2qA!*mrPX+rP`!"!TdEb!J$3*m!!*
 Z!!!&-!8r!Rd#IJd#I3!#0!!!"6J&2rjD!Rm+rPS!"!TQD@aP$3*r!!&Y!!!&1`8
 q!S!-!S!!$!!'E@4M-LjS!!)!!!d#IJ!#0!!!"6!&12jC!S%+rPN!"!TMCQpX$3+
 "!!&[!!!&0!8hrPJ,rPJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq@`!!!J*e!!)
 #JJ+$$3+#!!*X!!)&4J9'rPIq9J(q9`!!!Ij@!!!#!S-!!J+%!S80!S3!!R)!!!9
 '"9%#KJ+($3+'!!*L!!!&4J90!SJ#L3d#L!!"E`!!"8B&5Ij9#rj9!#3`!""MFRP
 `G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3+*!!&Y!!!&539-!SS-!SS
 !$J!)1QpLDQ9MG(-!!J!!$3+(!!&[!!!!!!!!rP3,rP3!&$!!#(4PEA"`BA4S!!K
 dC@e`8'&dD!)#K3!#!SX#M!d#L`!$53!#"9)&I2j6rP)#M3Vq8`!B,Q0[FQ9MFQ9
 X+LSU+J!!!!!!!*!!!'jeE'`"rP)!!!B#M3!$rP%#MJ+2#[j4!!3+DfpME!d#MJ!
 "E3!!"9B&@Ij3#[j3!!3+B@aTB3B#M`!$rNm#N!!#N3Vq6`!%#QPZFfJ0!T!!!!)
 d!!!&A!9NrNi#NJVq6J!%#Q0QEf`0!T)!!@m!!!9J"@2q63[q63!d-!!BEh"PER0
 cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!T%
 !!rj-!T2q5`Vq6!!%#R4[)#!0!T-!!Qi!!!9R"AB#P!+9$3+8!!)d!!!&E`9frNS
 #PJVq5J!%#QCTE'80!TB!!@d!!!9b"A8#P``#P`!2!!P[BQTPBh4c,QJ!!J!!$3+
 9!!)d!!!&C`9[rNN#Q!Vq53!%#Q0QEf`0!TJ!!@m!!!9V"@lq5![q5!!8-!!)G'9
 YF("KG'J!#(4PEA"3BA4S"[j,!!!#!S`!!J+C!TS0!TN!!Q`!!J9p"Ahq4rj'!Ij
 (!!!"rNB!!!)#QJ!#!TX#R!d#Q`!#FJ!!"Ad&L!+G!Ti0!Td!!Q)!!!9p"B3#R`+
 J$3+I!!&[!!!&I3@!rN8,rN8!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC
 [E'4PFP"KG'J0!U!!!@d!!!@!"B-#S3`#S3!+!!3kF'9Y!!)!!!d#RJ!"E`!!!!!
 !!2j%#rj%!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!T`!!J+L!U-0!U)!!dN!!J@
 *"E2q3rj#!U3+rN-!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ij#!!!'!U3
 !!rj"!U8#TJVq33!%#QY[Bf`0!U8!!@d!!!@0"C!!rN!+rN!!"!TKE'PK"J+Q!!2
 q2`+R!UJ+rMm!"!TTER0S$3+R!!)d!!!&N`@ErMi#U3Vq2J!%#Q0QEf`0!UN!!@m
 !!!@A"CVq23[q23!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
 -5@jME(9NC8C[E'4PFP"KG'J'!UJ!!rim!UVq1`Vq2!!%#R4[)#!0!US!!Qi!!!@
 H"Dd#U`+X$3+V!!)d!!!&TJ@YrMS#V3Vq1J!%#QCTE'80!Ud!!@d!!!@T"D`#VJ`
 #VJ!,!!9`C@dZD!!#!!!0!U`!!M3!!!@H"DEq13+[#[ij!!3+BfC[E!d#V`!"E`!
 !"D)&TIii#rii!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'rMX!!!)#S`!#!V!#X3d
 #X!!$53!#"E3&h[ihrMB#XJVq0`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`
 "rMB!!!B#XJ!$rM8#X`+d#[ie!!3+DfpME!d#X`!"E3!!"EJ&Zrid#[id!!3+B@a
 TB3B#Y!!$rM-#Y3+f#[ic!!3+D@jcD!d#Y3!#0!!!"Ei&a[ib!VF+rM)!"!TMCQp
 X$3+h!!&[!!!&`JA&rM%,rM%!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!
 BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J+f!!2q-!+irLm+rM!!"!TdEb!J$3+
 i!!*Z!!!&b3AB!VN#ZJd#Z3!#0!!!"G%&f2iZ!VX+rLi!"!TQD@aP$3+l!!&Y!!!
 &e!AA!V`-!V`!$!!'F'9Y-LjS!!)!!!d#ZJ!#0!!!"FN&dIiY!Vd+rLd!"!TMCQp
 X$3+p!!&[!!!&c3A3rL`,rL`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq,`!!!J+
 a!!)#[J+r$3+q!!*X!!)&h`AIrL[q+J(q+`!!!IiU!!!#!Vm!!J,!!X%0!X!!!R)
 !!!AI"HS#`J,$$3,#!!*L!!!&h`AQ!X3#a3d#a!!"E`!!"Gm&i[iT#riT!#3`!""
 MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3,&!!&Y!!!&iJAP!XB
 -!XB!$3!(1R"VBh-a-J!#!!!0!X-!!@m!!!!!!!$q+![q+!!8-!!)G'9YF("KG'J
 !#(4PEA"3BA4S!J,"!!)#a`,)$3,(!!0*!!)&k`B9rLIq*J,*#[iR!"JZBfpbC@0
 bC@`U+LSU!!!!!!!!N!!!ER9XE!(q*J!!"J,*!!2q*3,+!XX+rL8!"!TVEf0X$3,
 +!!&Y!!!&l`AbrL3+rL3!"!TKE'PK"J,,!!2q)`,-!Xd+rL-!"!TTER0S$3,-!!)
 d!!!&p3AprL)#cJVq)J!%#Q0QEf`0!Xi!!@m!!!Aj"Icq)3[q)3!d-!!BEh"PER0
 cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!Xd
 !!riJ!Xrq(`Vq)!!%#R4[)#!0!Xm!!Qi!!!B!"Jm#d!,4$3,3!!)d!!!'#!B2rKi
 #dJVq(J!%#QCTE'80!Y)!!@d!!!B,"Ji#d``#d`!1!!K`Df0c-6)ZD!!#!!!0!Y%
 !!M3!!!B!"JMq(3,8#[iG!!3+BfC[E!d#e!!"E`!!"J3'"riF#riF!"3`!!KdC@e
 `F'&dD!!)G'9YF&"KG'J'rKm!!!)#b!!#!Y8#eJd#e3!#E!!#"KB'&[iErKS"rKX
 !!!(q'J!!!J,@!!)#e`,B$3,A!!*b!!!'&JBK!YN#fJd#f3!#BJ!!"KB'(3,E!Y`
 0!YX!!@m!!!B@"KRq'3[q'3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4Qp
 XC'9b8'&dD!d#h!!"E3!!"KN'(!,G$!,G!!`!"MT`Df0c0`!#!!!0!YS!!@m!!!!
 !!!$q'![q'!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J,B!!)#hJ,I$3,H!!0*!!)
 ')JC-rKIq&J,J#[iA!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!(q&J!!"J,
 J!!2q&3,K!Z)+rK8!"!TVEf0X$3,K!!&Y!!!'*JBTrK3+rK3!"!TKE'PK"J,L!!2
 q%`,M!Z3+rK-!"!TTER0S$3,M!!)d!!!',!BdrK)#j3Vq%J!%#Q0QEf`0!Z8!!@m
 !!!B`"M2q%3[q%3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0
 -5@jME(9NC8C[E'4PFP"KG'J'!Z3!!ri3!ZEq$`Vq%!!%#R4[)#!0!ZB!!Qi!!!B
 h"NB#j`,S$3,R!!)d!!!'2`C'rJi#k3Vq$J!%#QCTE'80!ZN!!@d!!!C#"N8#kJ`
 #kJ!0!!G`Df0c0bjS!!)!!!d#k!!#0!!!"MF'2ri0!ZX+rJd!"!TMCQpX$3,V!!&
 [!!!'1`BqrJ`,rJ`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eq$`!!!J,I!!)#l!,
 Y$3,X!!*X!!)'63C0rJ[q#J(q#`!!!Ii+!!!#!Zd!!J,Z!Zm0!Zi!!R)!!!C0"PJ
 #m!,a$3,`!!*L!!!'63C8![)#m`d#mJ!"E`!!"Nd'82i*#ri*!#3`!""MFRP`G'p
 QEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3,c!!&Y!!!'8!C6![3-![3!#`!
 &1R*KEQ3!!J!!$3,a!!&[!!!!!!!!rJJ,rJJ!&$!!#(4PEA"`BA4S!!KdC@e`8'&
 dD!)#l`!#![8#pJd#p3!$53!#"PN'Jri(rJB#p`Vq"`!B,Q0[FQ9MFQ9X+LSU+J!
 !!!!!!*!!!'jeE'`"rJB!!!B#p`!$rJ8#q!,j#[i&!!3+DfpME!d#q!!"E3!!"Pd
 'B2i%#[i%!!3+B@aTB3B#q3!$rJ-#qJ,l#[i$!!3+D@jcD!d#qJ!#0!!!"Q-'Dri
 #![`+rJ)!"!TMCQpX$3,m!!&[!!!'C`CUrJ%,rJ%!0$!!''p`C@jcFfaTEQ0XG@4
 PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J,l!!2q!!,prIm
 +rJ!!"!TdEb!J$3,p!!*Z!!!'EJCp![i#r`d#rJ!#0!!!"RB'IIhq!`!+rIi!"!T
 QD@aP$3-!!!&Y!!!'H3Cm!`%-!`%!$!!'FQ&ZC#jS!!)!!!d#r`!#0!!!"Qi'G[h
 p!`)+rId!"!TMCQpX$3-#!!&[!!!'FJCerI`,rI`!&$!!#(4PEA"`BA4S!!KdC@e
 `8'&dD!Epr`!!!J,f!!)$!`-%$3-$!!*X!!)'K!D%rI[pqJ(pq`!!!Ihk!!!#!`3
 !!J-&!`B0!`8!!R)!!!D%"Sm$"`-)$3-(!!*L!!!'K!D,!`N$#Jd$#3!"E`!!"S3
 'Krhj#rhj!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3-
 +!!&Y!!!'K`D+!`X-!`X!#J!%1R*M-J!#!!!0!`J!!@m!!!!!!!$pq![pq!!8-!!
 )G'9YF("KG'J!#(4PEA"3BA4S!J-'!!)$$!-0$3--!!0*!!)'N!!'Z[hhrIB$$JV
 pp`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rIB!!!B$$J!$rI8$$`-3#[h
 e!!3+DfpME!d$$`!"E3!!"T3'Prhd#[hd!!3+B@aTB3B$%!!$rI-$%3-5#[hc!!3
 +D@jcD!d$%3!#0!!!"TS'S[hb!a-+rI)!"!TMCQpX$3-6!!&[!!!'RJDKrI%,rI%
 !0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'Efa
 NCA*3BA4S"J-5!!2pm!-8rHm+rI!!"!TdEb!J$3-8!!*Z!!!'T3Dd!a8$&Jd$&3!
 #0!!!"Ud'Y2hZ!aF+rHi!"!TQD@aP$3-A!!&Y!!!'X!Dc!aJ-!aJ!#`!&FQ-b,QJ
 !!J!!$3-@!!)d!!!'T3DYrHd$'3Vpl3!%#Q0QEf`0!aN!!@m!!!DT"Ucpl![pl!!
 8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[h[!!!#!`d!!J-D!aX0!aS!!Q`!!JDl"V[
 pkrhU!IhV!!!"rHS!!!)$'`!#!a`$(3d$(!!#FJ!!"VX'aJ-H!am0!ai!!Q)!!!D
 l"X)$)!-K$3-J!!&[!!!'Z`DqrHN,rHN!*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0
 bHA"dEdC[E'4PFP"KG'J0!b%!!@d!!!Dq"X%$)J`$)J!+!!3kFQ-d!!)!!!d$(`!
 "E`!!!!!!!2hS#rhS!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!ad!!J-M!b30!b-
 !!dN!!JE("[(pjrhQ!b8+rHF!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"ZG@aX!Ih
 Q!!!'!b8!!rhP!bB$*`Vpj3!%#QY[Bf`0!bB!!@d!!!E,"Xlpj!Vpj!!%#Q&XD@%
 '!bF!!rhM!bJ$+3Vpi`!%#QPZFfJ0!bJ!!M3!!!E4"YRpiJ-U#[hL!!3+BfC[E!d
 $+J!"E`!!"Y8'f2hK#rhK!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p
 `C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B$+3!$rH!$+rhI#[hJ!!3+G'mJ)!d$+`!
 #EJ!!"Y`'k`-X!bd0!b`!!M3!!!EN"Z[phJ-Z#[hH!!3+CQPXC3d$,J!"E3!!"ZF
 'kJ-[$!-[!!X!"A*M0#jS!!)!!!d$,3!#0!!!"Y`'j2hG!c!+rGd!"!TMCQpX$3-
 `!!&[!!!'i!EMrG`,rG`!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!Eph`!!!J-N!!)
 $-3-b$3-a!!*X!!)'mJEbrG[pfJ(pf`!!!IhD!!!#!c)!!J-c!c30!c-!!R)!!!E
 b"[d$03-f$3-e!!*L!!!'mJEj!cF$1!d$0`!"E`!!"[)'pIhC#rhC!#3`!""MFRP
 `G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$3-i!!&Y!!!'p3Ei!cN-!cN
 !#J!%1R*M03!#!!!0!cB!!@m!!!!!!!$pf![pf!!8-!!)G'9YF("KG'J!#(4PEA"
 3BA4S!J-d!!)$1J-l$3-k!!0*!!)'rJFSrGIpeJ-m#[hA!"JZBfpbC@0bC@`U+LS
 U!!!!!!!!N!!!ER9XE!(peJ!!"J-m!!2pe3-p!ci+rG8!"!TVEf0X$3-p!!&Y!!!
 (!JF&rG3+rG3!"!TKE'PK"J-q!!2pd`-r!d!+rG-!"!TTER0S$3-r!!)d!!!(#!F
 3rG)$33VpdJ!%#Q0QEf`0!d%!!@m!!!F-"`rpd3[pd3!d-!!BEh"PER0cE'PZBfa
 eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!d!!!rh3!d,
 pc`Vpd!!%#R4[)#!0!d)!!Qi!!!F6"b)$3`0%$30$!!)d!!!('`FLrFi$43VpcJ!
 %#QCTE'80!d8!!@d!!!FH"b%$4J`$4J!,!!9bBc8ZD!!#!!!0!d3!!M3!!!F6"a[
 pc30(#[h0!!3+BfC[E!d$4`!"E`!!"aF('[h-#rh-!"3`!!KdC@e`F'&dD!!)G'9
 YF&"KG'J'rFm!!!)$1`!#!dJ$53d$5!!#E!!#"bN(+Ih,rFS"rFX!!!(pbJ!!!J0
 *!!)$5J0,$30+!!*b!!!(+3Fd!d`$63d$6!!#BJ!!"bN(-!01!dm0!di!!@m!!!F
 T"bcpb3[pb3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d
 $6`!"E3!!"b`(,`03$!03!!d!"cTbDA"PE@3!!J!!$300!!&[!!!!!!!!rFJ,rFJ
 !&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)$5`!#!e%$8Jd$83!$53!#"c8(Arh(rFB
 $8`Vpa`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rFB!!!B$8`!$rF8$9!0
 9#[h&!!3+DfpME!d$9!!"E3!!"cN(22h%#[h%!!3+B@aTB3B$93!$rF-$9J0A#[h
 $!!3+D@jcD!d$9J!#0!!!"cm(4rh#!eJ+rF)!"!TMCQpX$30B!!&[!!!(3`G'rF%
 ,rF%!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9
 'EfaNCA*3BA4S"J0A!!2p`!0CrEm+rF!!"!TdEb!J$30C!!*Z!!!(5JGC!eS$@`d
 $@J!#0!!!"e)(@Ifq!e`+rEi!"!TQD@aP$30F!!&Y!!!(93GB!ed-!ed!$J!)FQP
 `C@eN,QJ!!J!!$30E!!)d!!!(5JG5rEd$AJVp[3!%#Q0QEf`0!ei!!@m!!!G1"e(
 p[![p[!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[fr!!!#!e)!!J0I!f!0!em!!Q`
 !!JGJ"f$pZrfk!Ifl!!!"rES!!!)$B!!#!f%$BJd$B3!#FJ!!"f!(D`0M!f30!f-
 !!Q)!!!GJ"fF$C30Q$30P!!&[!!!(B!GMrEN,rEN!*$!!%'0bHA"dEfC[E'4PFR"
 KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!fB!!@d!!!GM"fB$C``$C`!+!!3kFR0K!!)
 !!!d$C!!"E`!!!!!!!2fi#rfi!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J#!f)!!J0
 S!fN0!fJ!!dN!!JGX"jEpYrff!fS+rEF!'#jMEh*PBh*PE#SU+LS!!!!!!!#3!!"
 ZG@aX!Iff!!!'!fS!!rfe!fX$E!VpY3!%#QY[Bf`0!fX!!@d!!!G`"h2pY!VpY!!
 %#Q&XD@%'!f`!!rfc!fd$EJVpX`!%#QPZFfJ0!fd!!M3!!!Gf"hlpXJ0[#[fb!!3
 +BfC[E!d$E`!"E`!!"hS(IIfa#rfa!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4PFR"
 KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B$EJ!$rE!$F2f[#[f`!!3+G'm
 J)!d$F!!#EJ!!"i%(N!!$F30b$30a!!)d!!!(L3H3!2fZ!h-+rDi!"!TQD@aP$30
 c!!&Y!!!(M!H2!h3-!h3!#`!&FR0K,QJ!!J!!$30b!!)d!!!(J3H*rDd$G3VpV3!
 %#Q0QEf`0!h8!!@m!!!H&"iMpV![pV!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[f
 [!!!#!fN!!J0f!hF0!hB!!Q`!!JHA"jIpUrfU!IfV!!!"rDS!!!)$G`!#!hJ$H3d
 $H!!#FJ!!"jF(SJ0k!hX0!hS!!Q)!!!HA"ji$I!0p$30m!!&[!!!(P`HDrDN,rDN
 !*$!!%'0bHA"dEfC[E'4PFR"KG'J!%'0bHA"dEdC[E'4PFP"KG'J0!hd!!@d!!!H
 D"jd$IJ`$IJ!-!!BkFh4KBfX!!J!!$30l!!&[!!!!!!!!rDJ,rDJ!&$!!#(4PEA"
 `BA4S!!KdC@e`8'&dD!)$H3!#!hm$J!d$I`!$53!#"k-(cIfRrDB$J3VpT`!B,Q0
 [FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rDB!!!B$J3!$rD8$JJ1$#[fP!!3+Dfp
 ME!d$JJ!"E3!!"kF(U[fN#[fN!!3+B@aTB3B$J`!$rD-$K!1&#[fM!!3+D@jcD!d
 $K!!#0!!!"kd(YIfL!iB+rD)!"!TMCQpX$31'!!&[!!!(X3HdrD%,rD%!0$!!''p
 `C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4
 S"J1&!!2pS!1(rCm+rD!!"!TdEb!J$31(!!*Z!!!(Z!I(!iJ$L3d$L!!#0!!!"m!
 (arfH!iS+rCi!"!TQD@aP$31+!!&Y!!!(``I'!iX-!iX!$3!(Fh4KBfXZD!!#!!!
 0!iN!!M3!!!Hi"m$pR31-#[fG!!3+BfC[E!d$M!!"E`!!"l`([rfF#rfF!"3`!!K
 dC@e`F'&dD!!)G'9YF&"KG'J'rCm!!!)$J!!#!id$MJd$M3!$53!#"mi(q2fErCS
 $M`VpQ`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rCS!!!B$M`!$rCN$N!!
 $N3VpQ3!%#QY[Bf`0!j!!!!&Y!!!(dJI9rCJ+rCJ!"!TKE'PK"J14!!2pP`15!j-
 +rCF!"!TTER0S$315!!)d!!!(f!IJrCB$P!VpPJ!%#Q0QEf`0!j3!!@m!!!IF"pr
 pP3[pP3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
 NC8C[E'4PFP"KG'J'!j-!!rf8!jApN`VpP!!%#R4[)#!0!j8!!Qi!!!IM"r)$PJ1
 A$31@!!)d!!!(k`IbrC)$Q!VpNJ!%#QCTE'80!jJ!!@d!!!IZ"r%$Q3`$Q3!4!!Y
 cB@CPFh4KBfXZD!!#!!!0!jF!!M3!!!IM"q[pN31D#[f4!!3+BfC[E!d$QJ!"E`!
 !"qF(k[f3!![pN!!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!EpN`!!!J11!!)$Q`1
 F$31E!!*X!!)(q3IjrBrpMJ(pM`!!!If1!!!#!j`!!J1G!ji0!jd!!R)!!!Ij#!3
 $R`1J$31I!!*L!!!(q3J!!k%$SJd$S3!"E`!!"rN(r2f0#rf0!#3`!""MFRP`G'p
 QEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S$31L!!&Y!!!(r!Ir!k--!k-!#J!
 %1R0SB3!#!!!0!k!!!@m!!!!!!!$pM![pM!!8-!!)G'9YF("KG'J!#(4PEA"3BA4
 S!J1H!!)$T!1P$31N!!0*!!))"3J[rB[pLJ1Q#[f,!"JZBfpbC@0bC@`U+LSU!!!
 !!!!!N!!!ER9XE!(pLJ!!"J1Q!!2pL31R!kJ+rBN!"!TVEf0X$31R!!&Y!!!)#3J
 -rBJ+rBJ!"!TKE'PK"J1S!!2pK`1T!kS+rBF!"!TTER0S$31T!!)d!!!)$`JArBB
 $U`VpKJ!%#Q0QEf`0!kX!!@m!!!J6#"EpK3[pK3!d-!!BEh"PER0cE'PZBfaeC'9
 QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!kS!!rf%!kcpJ`V
 pK!!%#R4[)#!0!k`!!Qi!!!JD##N$V31Z$31Y!!)d!!!))JJTrB)$V`VpJJ!%#QC
 TE'80!km!!@d!!!JP##J$X!`$X!!,!!9cD'%ZD!!#!!!0!ki!!M3!!!JD##,pJ31
 a#[f"!!3+BfC[E!d$X3!"E`!!#"i))If!#rf!!"3`!!KdC@e`F'&dD!!)G'9YF&"
 KG'J'rB-!!!)$T3!#!l)$X`d$XJ!#E!!##$!)-2errAi"rAm!!!(pIJ!!!J1c!!)
 $Y!1e$31d!!*b!!!)-!Jl!lB$Y`d$YJ!#BJ!!#$!)0`1i!lN0!lJ!!@m!!!J`#$2
 pI3[pI3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD!d$Z3!
 "E3!!#$-)0J1k$!1k!!d!"cTdH(4IC')!!J!!$31h!!&[!!!!!!!!rA`,rA`!&$!
 !#(4PEA"`BA4S!!KdC@e`8'&dD!)$Y3!#!lX$[!d$Z`!$53!##$`)C[elrAS$[3V
 pH`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"rAS!!!B$[3!$rAN$[J1r#[e
 j!!3+DfpME!d$[J!"E3!!#%!)3rei#[ei!!3+B@aTB3B$[`!$rAF$`!2"#[eh!!3
 +D@jcD!d$`!!#0!!!#%B)6[ef!m)+rAB!"!TMCQpX$32#!!&[!!!)5JK0rA8,rA8
 !0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'Efa
 NCA*3BA4S"J2"!!2pG!2$rA-+rA3!"!TdEb!J$32$!!*Z!!!)83KJ!m3$a3d$a!!
 #0!!!#&N)B2eb!mB+rA)!"!TQD@aP$32'!!&Y!!!)A!KI!mF-!mF!$J!)G(KdAf4
 L,QJ!!J!!$32&!!)d!!!)83KCrA%$b!VpF3!%#Q0QEf`0!mJ!!@m!!!K9#&MpF![
 pF!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[ec!!!#!l`!!J2*!mS0!mN!!Q`!!JK
 R#'IpEreZ!Ie[!!!"r@i!!!)$bJ!#!mX$c!d$b`!#FJ!!#'F)FJ20!mi0!md!!Q)
 !!!KR#'i$c`23$322!!&[!!!)C`KUr@d,r@d!*$!!%'0bHA"dEfC[E'4PFR"KG'J
 !%'0bHA"dEdC[E'4PFP"KG'J0!p!!!@d!!!KU#'d$d3`$d3!,!!8kH$8`13!#!!!
 0!mi!!@m!!!!!!!$pE![pE!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!J2-!!)$dJ2
 6$325!!0*!!))F`LGr@[pDJ28#[eV!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
 XE!(pDJ!!"J28!!2pD329!pB+r@N!"!TVEf0X$329!!&Y!!!)G`Kkr@J+r@J!"!T
 KE'PK"J2@!!2pC`2A!pJ+r@F!"!TTER0S$32A!!)d!!!)I3L&r@B$f3VpCJ!%#Q0
 QEf`0!pN!!@m!!!L"#)6pC3[pC3!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
 S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'!pJ!!reN!pVpB`VpC!!%#R4[)#!
 0!pS!!Qi!!!L)#*F$f`2F$32E!!)d!!!)N!!)PreL!pd+r@)!"!TQD@aP$32G!!&
 Y!!!)N`L@!pi-!pi!$!!'H$8`15jS!!)!!!d$h!!#0!!!#)J)N!$pB32I#[eK!!3
 +BfC[E!d$h`!"E`!!#)`)MreJ#reJ!"3`!!KdC@e`F'&dD!!)G'9YF&"KG'J'r@-
 !!!)$d`!#!q!$i3d$i!!$53!##*i)b2eIr9i$iJVpA`!B,Q0[FQ9MFQ9X+LSU+J!
 !!!!!!*!!!'jeE'`"r9i!!!B$iJ!$r9d$i`2N#[eG!!3+DfpME!d$i`!"E3!!#+)
 )TIeF#[eF!!3+B@aTB3B$j!!$r9X$j32Q#[eE!!3+D@jcD!d$j3!#0!!!#+J)X2e
 D!qF+r9S!"!TMCQpX$32R!!&[!!!)V!L[r9N,r9N!0$!!''p`C@jcFfaTEQ0XG@4
 PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J2Q!!2p@!2Sr9F
 +r9J!"!TdEb!J$32S!!*Z!!!)X`M#!qN$kJd$k3!#0!!!#,X)`[e@!qX+r9B!"!T
 QD@aP$32V!!&Y!!!)[JM"!q`-!q`!%!!+H$8`19pfCRNZD!!#!!!0!qS!!M3!!!L
 c#,[p932Y#[e9!!3+BfC[E!d$l3!"E`!!#,F)Z[e8#re8!"3`!!KdC@e`F'&dD!!
 )G'9YF&"KG'J'r9F!!!)$i3!#!qi$l`d$lJ!#E!!##-N)bIe6r9)"r9-!!!(p8J!
 !!J2[!!)$m!2a$32`!!*b!!!)b3M8!r)$m`d$mJ!#BJ!!#-N)d!2d!r80!r3!!@m
 !!!M*#-cp83[p83!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&
 dD!d$p3!"E3!!#-`)c`2f$!2f!!d!"cTi06!jGM-!!J!!$32c!!&[!!!!!!!!r9!
 ,r9!!&$!!#(4PEA"`BA4S!!KdC@e`8'&dD!)$m3!#!rF$q!d$p`!$53!##08)rre
 2r8i$q3Vp6`!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r8i!!!B$q3!$r8d
 $qJ2l#[e0!!3+DfpME!d$qJ!"E3!!#0N)h2e-#[e-!!3+B@aTB3B$q`!$r8X$r!2
 p#[e,!!3+D@jcD!d$r!!#0!!!#0m)jre+!ri+r8S!"!TMCQpX$32q!!&[!!!)i`M
 Qr8N,r8N!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfa
 eC'9'EfaNCA*3BA4S"J2p!!2p5!2rr8F+r8J!"!TdEb!J$32r!!*Z!!!)kJMj"!!
 %!3d%!!!#0!!!#2))qIe'"!)+r8B!"!TQD@aP$33#!!&Y!!!)p3Mi"!--"!-!$J!
 )H$8`1ABc,QJ!!J!!$33"!!)d!!!)kJMbr88%"!Vp43!%#Q0QEf`0"!3!!@m!!!M
 Z#2(p4![p4!!8-!!)G'9YF("KG'J!#(4PEA"3BA4S"[e(!!!#!rJ!!J3&"!B0"!8
 !!Q`!!JN!#3$p3re#!Ie$!!!"r8)!!!)%"J!#"!F%#!d%"`!$53!##3!*+[e"r8!
 %#3Vp33!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r8!!!!B%#3!$r6m%#J3
 ,#[dr!!3+DfpME!d%#J!"E3!!#33*"rdq#[dq!!3+B@aTB3B%#`!$r6d%$!30#[d
 p!!3+D@jcD!d%$!!#0!!!#3S*%[dm"!i+r6`!"!TMCQpX$331!!&[!!!*$JN4r6X
 ,r6X!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9
 'EfaNCA*3BA4S"J30!!2p1J32r6N+r6S!"!TdEb!J$332!!*Z!!!*&3NN""!%%3d
 %%!!#0!!!#4d**2di"")+r6J!"!TQD@aP$335!!&Y!!!*)!NM""--""-!#`!&Fh0
 X,QJ!!J!!$334!!)d!!!*&3NGr6F%&!Vp0`!%#Q0QEf`0""3!!@m!!!NC#4cp0J[
 p0J!H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9b8'&dD!Ep13!!!J3)!!)%&33
@$339!!0*!!)*+`P9r6Ap0!3A#[de!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9
 XE!(p0!!!"J3A!!2p-`3B""N+r6-!"!TVEf0X$33B!!&Y!!!*,`Nbr6)+r6)!"!T
 KE'PK"J3C!!2p-33D""X+r6%!"!TTER0S$33D!!)d!!!*03Npr6!%(!Vp-!!%#Q0
 QEf`0""`!!@m!!!Nj#6cp,`[p,`!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4
 S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'""X!!rdZ""hp,3Vp,J!%#R4[)#!
 0""d!!Qi!!!P!#8m%(J3I$33H!!)d!!!*5!P2r5`%)!Vp,!!%#QCTE'80"#!!!@d
 !!!P,#8i%)3`%)3!-!!CcFf`b,QJ!!J!!$33I!!)d!!!*3!P)r5X%)JVp+`!%#Q0
 QEf`0"#)!!@m!!!P%#8Ip+J[p+J!H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9
 b8'&dD!Ep,3!!!J3@!!)%)`3N$33M!!0*!!)*9JQ!r5Rp+!3P#[dT!"JZBfpbC@0
 bC@`U+LSU!!!!!!!!N!!!ER9XE!(p+!!!"J3P!!2p*`3Q"#F+r5F!"!TVEf0X$33
 Q!!&Y!!!*@JPGr5B+r5B!"!TKE'PK"J3R!!2p*33S"#N+r58!"!TTER0S$33S!!)
 d!!!*B!PSr53%+JVp*!!%#Q0QEf`0"#S!!@m!!!PN#@Ip)`[p)`!d-!!BEh"PER0
 cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'"#N
 !!rdL"#[p)3Vp)J!%#R4[)#!0"#X!!Qi!!!PV#AS%,!3Y$33X!!)d!!!*F`Pkr5!
 %,JVp)!!%#QCTE'80"#i!!@d!!!Pf#AN%,``%,`!0!!GcFf`b-bjS!!)!!!d%,3!
 #0!!!#@X*FrdI"$!+r4m!"!TMCQpX$33`!!&[!!!*E`Pbr4i,r4i!(M!!$A0cE'C
 [E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J'r5%!!!)%*!!#"$%%-Jd%-3!$53!##B%
 *UrdGr4`%-`Vp(3!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r4`!!!B%-`!
 $r4X%0!3e#[dE!!3+DfpME!d%0!!"E3!!#B8*L2dD#[dD!!3+B@aTB3B%03!$r4N
 %0J3h#[dC!!3+D@jcD!d%0J!#0!!!#BX*NrdB"$J+r4J!"!TMCQpX$33i!!&[!!!
 *M`Q5r4F,r4F!0$!!''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%P
 ZBfaeC'9'EfaNCA*3BA4S"J3h!!2p&J3jr48+r4B!"!TdEb!J$33j!!*Z!!!*PJQ
 P"$S%1`d%1J!#0!!!#Ci*TId8"$`+r43!"!TQD@aP$33m!!&Y!!!*S3QN"$d-"$d
 !$!!'Fh0X-bjS!!)!!!d%1`!#0!!!#CB*R[d6"$i+r4-!"!TMCQpX$33q!!&[!!!
 *QJQGr4),r4)!(M!!$A0cE'C[E'4PFR"KG'J!$A0cE%C[E'4PFP"KG'J'r48!!!)
 %-J!#"$m%3!d%2`!$53!##D`*e[d4r4!%33Vp%3!B,Q0[FQ9MFQ9X+LSU+J!!!!!
 !!*!!!'jeE'`"r4!!!!B%33!$r3m%3J4$#[d2!!3+DfpME!d%3J!"E3!!#E!*Xrd
 1#[d1!!3+B@aTB3B%3`!$r3d%4!4&#[d0!!3+D@jcD!d%4!!#0!!!#EB*[[d-"%B
 +r3`!"!TMCQpX$34'!!&[!!!*ZJQpr3X,r3X!0$!!''p`C@jcFfaTEQ0XG@4PCQp
 XC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*3BA4S"J4&!!2p#J4(r3N+r3S
 !"!TdEb!J$34(!!*Z!!!*`3R3"%J%53d%5!!#0!!!#FN*d2d)"%S+r3J!"!TQD@a
 P$34+!!&Y!!!*c!R2"%X-"%X!$!!'G'ac-5jS!!)!!!d%53!#0!!!#F%*bId("%`
 +r3F!"!TMCQpX$34-!!&[!!!*a3R)r3B,r3B!(M!!$A0cE'C[E'4PFR"KG'J!$A0
 cE%C[E'4PFP"KG'J'r3N!!!)%3!!#"%d%6Jd%63!#E!!##GF*erd&r33"r38!!!(
 p"!!!!J41!!)%6`43$342!!0*!!)*e`S"r32p!J44#[d$!"JZBfpbC@0bC@`U+LS
 U!!!!!!!!N!!!ER9XE!(p!J!!"J44!!2p!345"&-+r3%!"!TVEf0X$345!!&Y!!!
 *f`RHr3!+r3!!"!TKE'PK"J46!!2mr`48"&8+r2m!"!TTER0S$348!!)d!!!*i3R
 Tr2i%9JVmrJ!%#Q0QEf`0"&B!!@m!!!RP#HMmr3[mr3!d-!!BEh"PER0cE'PZBfa
 eC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9NC8C[E'4PFP"KG'J'"&8!!rcm"&I
 mq`Vmr!!%#R4[)#!0"&F!!Qi!!!RX#IX%@!4C$34B!!)d!!!*p!Rlr2S%@JVmqJ!
 %#QCTE'80"&S!!@d!!!Rh#IS%@``%@`!1!!KMFRP`G'mZD!!#!!!0"&N!!M3!!!R
 X#I6mq34F#[cj!!3+BfC[E!d%A!!"E`!!#I!*mrci#rci!#3`!""MFRP`G'pQEfa
 NCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S"[cl!!!#"&!!!J4G"&i0"&d!!Q`!!JS
 ##J,mprcf!Ich!!!"r2B!!!)%AJ!#"&m%B!d%A`!$53!##J)+,2cer23%B3Vmp3!
 B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r23!!!B%B3!$r2-%BJ4M#[cc!!3
 +DfpME!d%BJ!"E3!!#JB+#Icb#[cb!!3+B@aTB3B%B`!$r2%%C!4P#[ca!!3+D@j
 cD!d%C!!#0!!!#J`+&2c`"'B+r2!!"!TMCQpX$34Q!!&[!!!+%!S6r1m,r1m!0$!
 !''p`C@jcFfaTEQ0XG@4PCQpXC'9bF'&dD!!BEh"PEP066%PZBfaeC'9'EfaNCA*
 3BA4S"J4P!!2mlJ4Rr1d+r1i!"!TdEb!J$34R!!*Z!!!+&`SQ"'J%D3d%D!!#0!!
 !#Km+*[cX"'S+r1`!"!TQD@aP$34U!!&Y!!!+)JSP"'X-"'X!%!!+Eh"PER0cE(B
 ZD!!#!!!0"'N!!M3!!!SA#Krmk`4X#[cV!!3+BfC[E!d%E!!"E`!!#KX+([cU#rc
 U!#3`!""MFRP`G'pQEfaNCA*`BA4S!""MFRP`G'p'EfaNCA*3BA4S"[cY!!!#"'!
 !!J4Y"'i0"'d!!dN!!JSY#PImkIcS"'m+r1N!'#jMEh*PBh*PE#SU+LS!!!!!!!#
 3!!"ZG@aX!IcS!!!'"'m!!rcR"(!%F3Vmj`!%#QY[Bf`0"(!!!@d!!!Sa#M6mjJV
 mjJ!%#Q&XD@%'"(%!!rcP"()%F`Vmj3!%#QPZFfJ0"()!!M3!!!Sh#Mrmj!4d#[c
 N!!3+BfC[E!d%G!!"E`!!#MX+2[cM#rcM!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4
 PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B%F`!$r1)%GIcK#[cL!!3
 +G'mJ)!d%G3!#EJ!!#N)+834f"(F0"(B!!M3!!!T+#P(mi!4i#[cJ!!3+CQPXC3d
 %H!!"E3!!#Nd+8!4j$!4j!!i!#(4YC'PQCLjS!!)!!!d%G`!#0!!!#N)+5[cI"(S
 +r0m!"!TMCQpX$34k!!&[!!!+4JT*r0i,r0i!*$!!%'0bHA"dEfC[E'4PFR"KG'J
 !%'0bHA"dEdC[E'4PFP"KG'J'r1%!!!)%EJ!#"(X%I!d%H`!#E!!##PJ+@2cGr0`
 "r0d!!!(mh!!!!J4m!!)%I34q$34p!!*X!!)+@!TBr0[mfJ(mf`!!!IcD!!!#"(i
 !!J4r")!0"(m!!dN!!JTB#S,mfIcB")%+r0N!'#jMEh*PBh*PE#SU+LS!!!!!!!#
 3!!"ZG@aX!IcB!!!'")%!!rcA"))%J`Vme`!%#QY[Bf`0"))!!@d!!!TF#PrmeJV
 meJ!%#Q&XD@%'")-!!rc9")3%K3Vme3!%#QPZFfJ0")3!!M3!!!TL#QVme!5'#[c
 8!!3+BfC[E!d%KJ!"E`!!#QB+DIc6#rc6!$3`!"K[F'9ZFh0XD@jME(9NC@C[E'4
 PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD!B%K3!$r0)%Krc4#[c5!!3
 +G'mJ)!d%K`!#EJ!!#Qd+I!5)")N0")J!!M3!!!Te#Rcmd!5+#[c3!!3+CQPXC3d
 %LJ!"E3!!#RJ+H`5,$!5,!!`!"Q9IEh-ZD!!#!!!0")N!!M3!!!TY#RAmc`5-#[c
 2!!3+BfC[E!d%M!!"E`!!#R%+G2c1#rc1!#B`!"&[F'9ZFh0XCQpXC'9bF'&dD!!
 4Eh"PER0cE%C[E'4PFP"KG'J'r0%!!!)%J!!#")d%MJd%M3!$53!##S-+VIc0r-`
 %M`Vmc3!B,Q0[FQ9MFQ9X+LSU+J!!!!!!!*!!!'jeE'`"r-`!!!B%M`!$r-X%N!!
 %N3Vmb`!%#QY[Bf`0"*!!!!&Y!!!+K`U+r-S+r-S!"!TKE'PK"J54!!2mb355"*-
 +r-N!"!TTER0S$355!!)d!!!+M3U9r-J%P!Vmb!!%#Q0QEf`0"*3!!@m!!!U4#T6
 ma`[ma`!d-!!BEh"PER0cE'PZBfaeC'9QEfaNCA*`BA4S!"K[F'9Z8e0-5@jME(9
 NC8C[E'4PFP"KG'J'"*-!!rc'"*Ama3VmaJ!%#R4[)#!0"*8!!Qi!!!UB#UF%PJ5
 A$35@!!)d!!!+S!URr-3%Q!Vma!!%#QCTE'80"*J!!@d!!!UM#UB%Q3`%Q3!0!!G
 PAfpc-LjS!!)!!!d%P`!#0!!!#TJ+S2c$"*S+r--!"!TMCQpX$35D!!&[!!!+R!U
 Ir-),r-)!*M!!%@p`C@jcFfaQEfaNCA*`BA4S!"&[F'9ZFh0X4QpXC'9b8'&dD!E
 ma3!!!J51!!)%Qrc"$35E!!*X!!)+VJUZr-$m[`(m`!!!!Ibr!!!#r-%!!!d!#3!
 "E3!!!!!!!3!I!Irq!!!#!!B!!J5F"*d0"*`!!Q`!!J!!!!$m[[bp!Ibq!!!"r,d
 !!!)%R3!#"*i%R`d%RJ!#E!!##V%+b!5Jr,`0"+!!!dN!!JUa#XMmZ`5K"+)+r,X
 !'#jcHA0[C'a[Cf&cDh)!!!!!!!!!!&4&@&30"+%!!@d!!!Ua#V3%S``%S`!'!!!
 !!J!!"J5L!!2mZJ5N"+8+r,S!"!TLG'jc$35N!!&+!!!+Y`Um"+B#"+B!!J5Rr,N
 0"+F!!@d!!!Uh#VS%U!`%U!!+!!4%EfjP!!)!!!,mZ3!!"J5P!!2mZ!5Tr,F+r,J
 !"!TRDACe$35T!!&Y!!!+[`V#r,B$r,B!"3EmY`!!!Ibm!!!#"*m!!J5Ur,80"+S
 !!Q`!!J!!!!$mY2bc!Ibd!!!"r,-!!!,mY3!!$J!#!!!2%!!$!",mXJ5V"+`%V35
 Z"+m%X!5a",)%X`5d",8%YJ5hr,(mX2b[r+i"r,)!!"!%U`!3r+hmV2bVr+VmUIb
 Sr+ImT[bPr+6mSrbLr+(mS2bIr*i+r+d!'#jKCACdEf&`F'jeE'`!!)!!!!#3!!!
 U+LSU#rbX!")`!!GdD'9`BA4S!!GdD'93BA4S#rbV!"``!!adD'9[E'4NC@aTEA-
 !$(4SC8pXC%4PE'PYF`[mUJ!J-!!1G'KPF(*[DQ9MG("KG'J!$R4SC9"bEfTPBh4
 3BA4S#rbT!"B`!!PdD'9YCA"KG'J!#A4SC8eP8'&dD![mU!!Q-!!4D@jME(9NC@C
 [E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S#rbR!$3`!"K[F'9ZFh0XD@jME(9
 NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&dD![mTJ!N-!!3Bh*
 jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD![mT3!H-!!0Fh0XCQpXC'9
 bF'&dD!!0Fh0X4QpXC'9b8'&dD![mT!!Q-!!4Eh"PER0cE'C[E'4PFR"KG'J!%@p
 `C@jcFfa'EfaNCA*3BA4S#rbM!#i`!"9dD'9ZCAGQEfaNCA*bC@CPFQ9ZBf8!&A4
 SC8jPGdC[E'4PFP*PCQ9bC@jMC3[mSJ!8-!!)G'9YF("KG'J!#(4PEA"3BA4S!Ib
 K!!!"r+!!!!(mR`!!!IbH!!!1"+`!"a$mR35ir*cmQ`5j",VmQJVmR3!B,Q&PGR4
 [BA"`ER9XE!!!J!!!!*!!!#SU+LS0",J!!@X!!!!!#XJ%Z`)%Z`!#!!8%[!)%[!!
 #"*lmQ3,mQ3!!!IbF!!!#r*X!!"!%Z3!!%!5k!)B!(rbBr*ImP[b9r*6mNrb5!#c
 mNIb3!2b2r)lmMIb-!%rmL`"D!&[mLJ"Nr)N!EIb)r)ImKJ#2r)AmK2b$r),mJIb
 !r(rmI[apr(cmH`#Tr(VmHIair(F![Iaf!-ImG3$8!1)!l!$j!3-"%!%D!5F"-3%
 q!8J"93&I!@`"GJ'$!Bd"QJ'N!E%"Z`()!G)"h`(T!IB#!!)0!KF#*!)Z!MX#43*
 5!P`#D3*c!S!#LJ+A!U%#VJ+m!XB#d`,G!ZS#p!-"!`X$'!-L!bm$130'!e!$A30
 R!h3$IJ1,!jN$S`1`!lS$a`24!pi$l!2f"!-%%`3K"#m%234,"&X%D`4j")X%Q35
 Mr(3%U2acr(,mF3VmQ!!%#Q0[BQS+r*F!'#jPBA*cCQCNFQ&XDA-!!!!!!!!J!'&
 QC()+r*B!"!TMG(Kd#rb9!")`!!GdD'9`BA4S!!GdD'93BA4S#[b8!!3+BA0MFJV
 mN`!%#R4iC'`,r*)!($!!$(4SC@pXC'4PE'PYF`!-G'KP6faN4'9XD@ec#[b4!!3
 +BfPdE32mN!$rr3[mM`!J-!!1G'KPF(*[DQ9MG("KG'J!$R4SC9"bEfTPBh43BA4
 S!rb1rri+r)d!"!T849K8#rb-!"B`!!PdD'9YCA"KG'J!#A4SC8eP8'&dD![mL`!
 Q-!!4D@jME(9NC@C[E'4PFR"KG'J!%@PZBfaeC'9'EfaNCA*3BA4S#rb+!$3`!"K
 [F'9ZFh0XD@jME(9NC@C[E'4PFR"KG'J!''p`C@j68da*EQ0XG@4P4QpXC'9b8'&
 dD![mL3!N-!!3Bh*jF(4[CQpXC'9bF'&dD!!3Bh*jF(4[4QpXC'9b8'&dD![mL!!
 H-!!0Fh0XCQpXC'9bF'&dD!!0Fh0X4QpXC'9b8'&dD![mK`!Q-!!4Eh"PER0cE'C
 [E'4PFR"KG'J!%@p`C@jcFfa'EfaNCA*3BA4S#[b'!!3+BfC[E!VmK3!B,QeTFf0
 cE'0d+LSU+J!!!!!!!*!!!#SU+LS+r)3!"!TcC@aP#[b$!"JZBfpbC@4PE'mU+LS
 U!!!!!!!!N!!!+LSU+J(mJJ!!![b"!!!+r)!!"!TVEf0X#[ar!!3+D@jcD!2mIJ!
 %#[ap!"JZBfpbC@0bC@`U+LSU!!!!!!!!N!!!ER9XE!VmI!!%#R*cE(3,r(X!,M!
 !&A4SC@jPGfC[E'4PFR*PCQ9bC@jMC3!9G'KP6Q9h4QpXC'9b8Q9QCA*PEQ0P#[a
 k!!3+F'jKE3VmH3!%#Q&XD@%+r(J!"!TdEb!J#[ah!!3+CQPXC32mGJ!'#rae!"3
 `!!KdC@e`F'&dD!!)G'9YF&"KG'J+r(3!"!TLG'jc#[ac!!3+CfPfG32mFJ!&#[a
 a!"JZFhPcEf4XEfGKFfYb!!!!!!!!!!"849K8%IbD#XRJ%JUYi1%TDJ`!!LrM*N9
 4e%r&jLa&edrSaHBX4Nr%@qPF@eTVA&VU-NAE6m4Ek9aE@QYF@Z`bl5C&hNr,lbA
 Y*N9J!""2bf%!%59K!")Pl5C&B!!66mYK!"3Pl5C&B!!96mYK!"BPl5C&B!!A6m[
 Y*N9J!"K2amAQ,%C2&!!L+Q%!'9m!%#pK!"PK!"S[DJ`!'dmUB3!F,'S-!"eA!!K
 B!"i!(fK2+Q%!)'%!'@%!)5TK!"PI!"![B3!L$!!M6em!*%9J!#92A`!PDJ`!'dp
 K!#BUB3!F,'%!*ba'6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"R1,f%!+Q%!+bp
 K!#`-!#02A`!9B3!Y*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,Lp
 K!#TK!#m[B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3!
 `,f%!,!`!)dpI!"9K!$%P4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!
 Z,f%!+Q%!-LpK!#`-!#02A`!9B3!c*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!
 T+Q%!'9m!,LpK!#TK!$3[B3!X$!!M6em!&@%!059&B!!Z6bTK!#"K!#KK!#%UB3!
 CA`!6,f%!+5TK!"PI!#i[B3!UB3!f,f%!,!`!)dpI!"9K!$FP4@!!,NmUB3!JB3!
 SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!1#pK!#`-!#02A`!9B3!j*89J!#j
 2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!$S[B3!X$!!M6em!&@%
 !1b9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3!m,f%!,!`
 !)dpI!"9K!$dP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%
 !2LpK!#`-!#02A`!9B3!r*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m
 !,LpK!#TK!%![B3!X$!!M6em!&@%!359&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%
 !+5TK!"PI!#i[B3!UB3"#,f%!,!`!)dpI!"9K!%-P4@!!,NmUB3!JB3!SB3!K+Q%
 !'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!4#pK!#`-!#02A`!9B3"&*89J!#j2+Q%!)'%
 !+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!%B[B3!X$!!M6em!&@%!4b9&B!!
 Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"),f%!,!`!)dpI!"9
 K!%NP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!5LpK!#`
 -!#02A`!9B3",*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#T
 K!%`[B3!X$!!M6em!&@%!659&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"P
 I!#i[B3!UB3"1,f%!,!`!)dpI!"9K!%mP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bp
 K!#NUB3!CA`!Z,f%!+Q%!8#pK!#`-!#02A`!9B3"4*89J!#j2+Q%!)'%!+'%!)5T
 K!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!&)[B3!X$!!M6em!&@%!8b9&B!!Z6bTK!#"
 K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"8,f%!,!`!)dpI!"9K!&8P4@!
 !,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!9LpK!#`-!#02A`!
 9B3"A*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!&J[B3!
 X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"C,f%!,!`!)dp
 I!"9K!&SP4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!@bp
 K!#`-!#02A`!9B3"F*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,Lp
 K!#TK!&d[B3!X$!!M6em!&@%!AL9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5T
 K!"PI!#i[B3!UB3"I,f%!,!`!)dpI!"9K!'!P4@!!,NmUB3!JB3!SB3!K+Q%!'9m
 !%bpK!#NUB3!CA`!Z,f%!+Q%!B5pK!#`-!#02A`!9B3"L*89J!#j2+Q%!)'%!+'%
 !)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!'-[B3!X$!!M6em!&@%!C#9&B!!Z6bT
 K!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"P,f%!,!`!)dpI!"9K!'B
 P4@!!,NmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!CbpK!#`-!#0
 2A`!9B3"S*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!,LpK!#TK!'N
 [B3!X$!!M6em!&@%!DL9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!#i
 [B3!UB3"V,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!Z,f%!+Q%
 !E#pK!#`-!#02A`!9B3"Y*89J!#j2+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m
 !,LpK!#TK!'i[B3!X$!!M6em!&@%!Eb9&B!!Z6bTK!#"K!#KK!#%UB3!CA`!6,f%
 !+5TK!"PI!#i[B3!UB3"`,f%!,!`!)dpI!"9K!(%P4@!!,NmUB3!JB3!SB3!K+Q%
 !'9m!%bpK!#NUB3!CA`!Z,f%!+Q%!FLpK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-
 [B3!T+Q%!'9m!,LpK!#TK!(-[B3!X$!!M6em!&@%!G#9&B!!Z6bTK!#"K!#KK!#%
 UB3!CA`!6,f%!+5TK!"PI!#i[B3!UB3"e,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m
 !%bpK!#NUB3!CA`!A,f%!+Q%!GLpK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-[B3!
 T+Q%!'9m!&bpK!#TK!(F[B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"P
 I!"F[B3!UB3"i,f%!,!`!)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!A,f%
 !+Q%!H5pK!#`-!#02+Q%!)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!&bpK!#TK!(S
 [B3!X$!!M6bTK!#"K!#KK!#%UB3!CA`!6,f%!+5TK!"PI!"8[B3!UB3"l,f%!,!`
 !)dmUB3!JB3!SB3!K+Q%!'9m!%bpK!#NUB3!CA`!9,f%!+Q%!I#pK!#`-!#02+Q%
 !)'%!+'%!)5TK!"PI!"-[B3!T+Q%!'9m!&5pK!#TK!(d[B3!X$!!M6bTK!#"K!#K
 K!#%UB3!CA`!6,f%!+5TK!"PI!"J[B3!UB3"q,f%!,!`!)dmUB3!JB3!SB3!K+Q%
 !'9m!%bpK!#NUB3!CA`!B,f%!+Q%!IbpK!#`-!#028&92B3#!B3#"B3##DhCK!)0
 K!)4K!#)-!)82$!5Y!&%!5deKBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0
 [E@PZCcT[F'9ZFh0X,90139!Y-6Nj16%b-6%k6@&M6e-kE@YXD@jVFbjKF`!#!!!
 1"+i!!J6mF!5p!ra`!!%1",d!!3!%[J`%[J!'!!!!!J!!$J5[!!)%r'm%[`2mE`!
 %$J5r!!3!"-!%`36#"---"-!!%J!-6@&MD@jdEh0S)%K%!!)!!!`%`3!8!!j%CA0
 VG'p`)%C[E'4PFJ!#!!!-"-)!$J!)5@jMEfeTEQF!!J!!$!6$!"X!&@p`C@jcFf`
 Y8dj"8#da16Nj-6)a-3!#!!!-",!!4J"!6@&MD@jdEh0S)%K%1N4PFfYdEh!J4Qp
 XC'9b1NPZBfpYD@jR1Qp`C@jcFf`Y8dj"8#da16Nj-6)a-6T0B@028`!#!!!-",%
 !5!"#6@&MD@jdEh0S)%K%1N4PFfYdEh!J4QpXC'9b1NPZBfpYD@jR1Qp`C@jcFf`
 Y8dj"8#da16Nj-6)a-6TTEQ0XG@4P!!)!!!`%XJ"3!%T0B@0TER4[FfJJ5%3k4'9
 cDh4[F#"'EfaNCA)k5@jMEfeTEQFkEh"PER0cE#e66N&3,6%j16Na-M%a1QPZBfa
 eC'8kEh"PER0cE!!#!!!-",-!4`""6@&MD@jdEh0S)%K%1N4PFfYdEh!J4QpXC'9
 b1NPZBfpYD@jR1Qp`C@jcFf`Y8dj"8#da16Nj-6)a-6TMFRP`G'm!!J!!$!5d!%3
 !2NeKBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0[E@PZCcT[F'9ZFh0X,90
 139!Y-6Nj16%b-6%kFh0X!!)!!!`%Y3"!!$T0B@0TER4[FfJJ5%3k4'9cDh4[F#"
 'EfaNCA)k5@jMEfeTEQFkEh"PER0cE#e66N&3,6%j16Na-M%a!!)!!!i%YJ!"&!6
 %$J6%!!-B"-AmEJ6'$J6&!!-B"-ImE36)$J6(!!-B"-RmE!6+$J6*!!-B!"rmD`6
 ,#[aV!!3+BfC[E!`%b`!1!!K*EQ0[E@PZC`!#!!!+r'`!"!TMCQpX$!6+!"X!&@p
 `C@jcFf`Y8dj"8#da16Nj-6)a-3!#!!!+r'd!"!TMCQpX$!6)!!d!"fPZBfaeC'8
 !!J!!#[aZ!!3+BfC[E!`%aJ!9!!peER4TG'aPC#"QEfaNCA)!!J!!$!5h!%i!5%e
 KBfPZG'pcD#")4$T%CA0VG'p`)%C[E'4PFMT*EQ0[E@PZCcT[F'9ZFh0X,90139!
 Y-6Nj16%b-6%kBh*jF(4[1RJe-$Pf-`!#!!!"r,%!!!(mX!!!!Ib[!!!"r+i!!'&
 cBh)!!3!-qYlHV3!!!3!!!*G#!!#@3J!!!AB!!$-8-0J!!!!F!AB!$h0MFhS!!!#
 #6Np853!!!)jcBh"d!!!!QP4&@&3!!3#QFh4jE!!!!,j$6d4&!!%!bN*14%`!!!$
 LBA"XG!!!!1j'8N9'!!!!qNP$6L-!!!%'D@0X0!!!!4*TBh-M!!!"(QPMFc3!!!%
 UD'CNFJ!!!6C659T&!!!"3PG3Eh-!!!&1!!$rr`!!!!!!!!!!!)$rre!!!"i!!!!
 !!)$rr`!!"cJ#DH#m"'Mrr`!!!*S!!!!!%iRrr`!!"Pi!!!!!"'Mrr`!!!53!!!!
 !!!$rrb!!!9)!!!!!!!(rra3!!@i#DG`%!)$rr`!!!Pi#DH"X!!$rr`!!!Ri!!!!
 !!)$rr`!!!S-#DH"d!*Err`!!!Si!!!!!!*Err`!!!j)!!!!!!*Err`!!"CB#DH%
 i!*Err`!!"GS#DH%dkF$rr`!!"[`!!!!!rrrrr`!!"a)!!!!!!)$rr`!!"b!!!!!
 !*4S:
--- a/MacOS/opensslconf.h
+++ b/MacOS/opensslconf.h
@@ -0,0 +1,116 @@
 /* MacOS/opensslconf.h */
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
 #define OPENSSLDIR "/usr/local/ssl"
 #endif
 #endif
 #if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
 #define IDEA_INT unsigned int
 #endif
 #if defined(HEADER_MD2_H) && !defined(MD2_INT)
 #define MD2_INT unsigned int
 #endif
 #if defined(HEADER_RC2_H) && !defined(RC2_INT)
 /* I need to put in a mod for the alpha - eay */
 #define RC2_INT unsigned int
 #endif
 #if defined(HEADER_RC4_H)
 #if !defined(RC4_INT)
 /* using int types make the structure larger but make the code faster
 * on most boxes I have tested - up to %20 faster. */
 /*
 * I don't know what does "most" mean, but declaring "int" is a must on:
 * - Intel P6 because partial register stalls are very expensive;
 * - elder Alpha because it lacks byte load/store instructions;
 */
 #define RC4_INT unsigned char
 #endif
 #if !defined(RC4_CHUNK)
 /*
 * This enables code handling data aligned at natural CPU word
 * boundary. See crypto/rc4/rc4_enc.c for further details.
 */
 #define RC4_CHUNK unsigned long
 #endif
 #endif
 #if defined(HEADER_DES_H) && !defined(DES_LONG)
 /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
 * %20 speed up (longs are 8 bytes, int's are 4). */
 #ifndef DES_LONG
 #define DES_LONG unsigned long
 #endif
 #endif
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
 #define CONFIG_HEADER_BN_H
 #if __option(longlong)
 #  define BN_LLONG
 #else
 #  undef BN_LLONG
 #endif
 /* Should we define BN_DIV2W here? */
 /* Only one for the following should be defined */
 /* The prime number generation stuff may not work when
 * EIGHT_BIT but I don't care since I've only used this mode
 * for debuging the bignum libraries */
 #undef SIXTY_FOUR_BIT_LONG
 #undef SIXTY_FOUR_BIT
 #define THIRTY_TWO_BIT
 #undef SIXTEEN_BIT
 #undef EIGHT_BIT
 #endif
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
 #define CONFIG_HEADER_RC4_LOCL_H
 /* if this is defined data[i] is used instead of *data, this is a %20
 * speedup on x86 */
 #undef RC4_INDEX
 #endif
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
 #define CONFIG_HEADER_BF_LOCL_H
 #define BF_PTR
 #endif /* HEADER_BF_LOCL_H */
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
 #define CONFIG_HEADER_DES_LOCL_H
 /* the following is tweaked from a config script, that is why it is a
 * protected undef/define */
 #ifndef DES_PTR
 #define DES_PTR
 #endif
 /* This helps C compiler generate the correct code for multiple functional
 * units.  It reduces register dependancies at the expense of 2 more
 * registers */
 #ifndef DES_RISC1
 #define DES_RISC1
 #endif
 #ifndef DES_RISC2
 #undef DES_RISC2
 #endif
 #if defined(DES_RISC1) && defined(DES_RISC2)
 YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
 #endif
 /* Unroll the inner loop, this sometimes helps, sometimes hinders.
 * Very mucy CPU dependant */
 #ifndef DES_UNROLL
 #define DES_UNROLL
 #endif
 #endif /* HEADER_DES_LOCL_H */
 #ifndef __POWERPC__
 #define MD32_XARRAY
 #endif
--- a/Makefile.org
+++ b/Makefile.org
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,618 +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)
 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,-s,-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" ] && 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,-s,-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)
 # Targets to build symbolic links when needed
 symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
 symlink.aix:
 	@ $(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:
 # 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
--- a/550
+++ b/550
@@ -5,502 +5,7 @@
  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.1j and OpenSSL 1.0.2 [in beta]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
      o Suite B support for TLS 1.2 and DTLS 1.2
      o Support for DTLS 1.2
      o TLS automatic EC curve selection.
      o API to set TLS supported signature algorithms and curves
      o SSL_CONF configuration API.
      o TLS Brainpool support.
      o ALPN support.
      o CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.
  Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014]
      o Fix for CVE-2014-3513
      o Fix for CVE-2014-3567
      o Mitigation for CVE-2014-3566 (SSL protocol vulnerability)
      o Fix for CVE-2014-3568
  Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014]
      o Fix for CVE-2014-3512
      o Fix for CVE-2014-3511
      o Fix for CVE-2014-3510
      o Fix for CVE-2014-3507
      o Fix for CVE-2014-3506
      o Fix for CVE-2014-3505
      o Fix for CVE-2014-3509
      o Fix for CVE-2014-5139
      o Fix for CVE-2014-3508
  Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]
      o Fix for CVE-2014-0224
      o Fix for CVE-2014-0221
      o Fix for CVE-2014-0195
      o Fix for CVE-2014-3470
      o Fix for CVE-2010-5298
  Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
      o Fix for CVE-2014-0160
      o Add TLS padding extension workaround for broken servers.
      o Fix for CVE-2014-0076
  Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]
      o Don't include gmt_unix_time in TLS server and client random values
      o Fix for TLS record tampering bug CVE-2013-4353
      o Fix for TLS version checking bug CVE-2013-6449
      o Fix for DTLS retransmission bug CVE-2013-6450
  Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e [11 Feb 2013]:
      o Corrected fix for CVE-2013-0169
  Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d [4 Feb 2013]:
      o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version.
      o Include the fips configuration module.
      o Fix OCSP bad key DoS attack CVE-2013-0166
      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
      o Fix for TLS AESNI record handling flaw CVE-2012-2686
  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c [10 May 2012]:
      o Fix TLS/DTLS record length checking bug CVE-2012-2333
      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b [26 Apr 2012]:
      o Fix compilation error on non-x86 platforms.
      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a [19 Apr 2012]:
      o Fix for ASN1 overflow bug CVE-2012-2110
      o Workarounds for some servers that hang on long client hellos.
      o Fix SEGV in AES code.
  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1 [14 Mar 2012]:
      o TLS/DTLS heartbeat support.
      o SCTP support.
      o RFC 5705 TLS key material exporter.
      o RFC 5764 DTLS-SRTP negotiation.
      o Next Protocol Negotiation.
      o PSS signatures in certificates, requests and CRLs.
      o Support for password based recipient info for CMS.
      o Support TLS v1.2 and TLS v1.1.
      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
      o SRP support.
  Major changes between OpenSSL 1.0.0k and OpenSSL 1.0.0l [6 Jan 2014]
      o Fix for DTLS retransmission bug CVE-2013-6450
  Major changes between OpenSSL 1.0.0j and OpenSSL 1.0.0k [5 Feb 2013]:
      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
      o Fix OCSP bad key DoS attack CVE-2013-0166
  Major changes between OpenSSL 1.0.0i and OpenSSL 1.0.0j [10 May 2012]:
      o Fix DTLS record length checking bug CVE-2012-2333
  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.0i [19 Apr 2012]:
      o Fix for ASN1 overflow bug CVE-2012-2110
  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
      o Corrected fix for CVE-2011-4619
      o Various DTLS fixes.
  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]:
      o Fix for DTLS DoS issue CVE-2012-0050
  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]:
      o Fix for DTLS plaintext recovery attack CVE-2011-4108
      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
      o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
      o Check for malformed RFC3779 data CVE-2011-4577
  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]:
      o Fix for CRL vulnerability issue CVE-2011-3207
      o Fix for ECDH crashes CVE-2011-3210
      o Protection against EC timing attacks.
      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
      o Various DTLS fixes.
  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]:
      o Fix for security issue CVE-2011-0014
  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]:
      o Fix for security issue CVE-2010-4180
      o Fix for CVE-2010-4252
      o Fix mishandling of absent EC point format extension.
      o Fix various platform compilation issues.
      o Corrected fix for security issue CVE-2010-3864.
  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]:
      o Fix for security issue CVE-2010-3864.
      o Fix for CVE-2010-2939
      o Fix WIN32 build system for GOST ENGINE.
  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]:
      o Fix for security issue CVE-2010-1633.
      o GOST MAC and CFB fixes.
  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]:
      o RFC3280 path validation: sufficient to process PKITS tests.
      o Integrated support for PVK files and keyblobs.
      o Change default private key format to PKCS#8.
      o CMS support: able to process all examples in 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.8y and OpenSSL 0.9.8za [5 Jun 2014]:
      o Fix for CVE-2014-0224
      o Fix for CVE-2014-0221
      o Fix for CVE-2014-0195
      o Fix for CVE-2014-3470
      o Fix for CVE-2014-0076
      o Fix for CVE-2010-5298
      o Fix to TLS alert handling.
  Major changes between OpenSSL 0.9.8x and OpenSSL 0.9.8y [5 Feb 2013]:
      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
      o Fix OCSP bad key DoS attack CVE-2013-0166
  Major changes between OpenSSL 0.9.8w and OpenSSL 0.9.8x [10 May 2012]:
      o Fix DTLS record length checking bug CVE-2012-2333
  Major changes between OpenSSL 0.9.8v and OpenSSL 0.9.8w [23 Apr 2012]:
      o Fix for CVE-2012-2131 (corrected fix for 0.9.8 and CVE-2012-2110)
  Major changes between OpenSSL 0.9.8u and OpenSSL 0.9.8v [19 Apr 2012]:
      o Fix for ASN1 overflow bug CVE-2012-2110
  Major changes between OpenSSL 0.9.8t and OpenSSL 0.9.8u [12 Mar 2012]:
      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
      o Corrected fix for CVE-2011-4619
      o Various DTLS fixes.
  Major changes between OpenSSL 0.9.8s and OpenSSL 0.9.8t [18 Jan 2012]:
      o Fix for DTLS DoS issue CVE-2012-0050
  Major changes between OpenSSL 0.9.8r and OpenSSL 0.9.8s [4 Jan 2012]:
      o Fix for DTLS plaintext recovery attack CVE-2011-4108
      o Fix policy check double free error CVE-2011-4109
      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
      o Check for malformed RFC3779 data CVE-2011-4577
  Major changes between OpenSSL 0.9.8q and OpenSSL 0.9.8r [8 Feb 2011]:
      o Fix for security issue CVE-2011-0014
  Major changes between OpenSSL 0.9.8p and OpenSSL 0.9.8q [2 Dec 2010]:
      o Fix for security issue CVE-2010-4180
      o Fix for CVE-2010-4252
  Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p [16 Nov 2010]:
      o Fix for security issue CVE-2010-3864.
  Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o [1 Jun 2010]:
      o Fix for security issue CVE-2010-0742.
      o Various DTLS fixes.
      o Recognise SHA2 certificates if only SSL algorithms added.
      o Fix for no-rc4 compilation.
      o Chil ENGINE unload workaround.
  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
      o CFB cipher definition fixes.
      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
      o Cipher definition fixes.
      o Workaround for slow RAND_poll() on some WIN32 versions.
      o Remove MD2 from algorithm tables.
      o SPKAC handling fixes.
      o Support for RFC5746 TLS renegotiation extension.
      o Compression memory leak fixed.
      o Compression session resumption fixed.
      o Ticket and SNI coexistence fixes.
      o Many fixes to DTLS handling. 
  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
      o Temporary work around for CVE-2009-3555: disable renegotiation.
  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
      o Fix various build issues.
      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
      o Fix security issue (CVE-2008-5077)
      o Merge FIPS 140-2 branch code.
  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
      o CryptoAPI ENGINE support.
      o Various precautionary measures.
      o Fix for bugs affecting certificate request creation.
      o Support for local machine keyset attribute in PKCS#12 files.
  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
      o Backport of CMS functionality to 0.9.8.
      o Fixes for bugs introduced with 0.9.8f.
  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
      o Add gcc 4.2 support.
      o Add support for AES and SSE2 assembly lanugauge optimization
        for VC++ build.
      o Support for RFC4507bis and server name extensions if explicitly 
        selected at compile time.
      o DTLS improvements.
      o RFC4507bis support.
      o TLS Extensions support.
  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
      o Various ciphersuite selection fixes.
      o RFC3779 support.
  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
      o Changes to ciphersuite selection algorithm
  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c [5 Sep 2006]:
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
      o New cipher Camellia
  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b [4 May 2006]:
      o Cipher string fixes.
      o Fixes for VC++ 2005.
      o Updated ECC cipher suite support.
      o New functions EVP_CIPHER_CTX_new() and EVP_CIPHER_CTX_free().
      o Zlib compression usage fixes.
      o Built in dynamic engine compilation support on Win32.
      o Fixes auto dynamic engine loading in Win32.
  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
      o Fix potential SSL 2.0 rollback, CVE-2005-2969
      o Extended Windows CE support
  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8 [5 Jul 2005]:
      o Major work on the BIGNUM library for higher efficiency and to
        make operations more streamlined and less contradictory.  This
        is the result of a major audit of the BIGNUM library.
      o Addition of BIGNUM functions for fields GF(2^m) and NIST
        curves, to support the Elliptic Crypto functions.
      o Major work on Elliptic Crypto; ECDH and ECDSA added, including
        the use through EVP, X509 and ENGINE.
      o New ASN.1 mini-compiler that's usable through the OpenSSL
        configuration file.
      o Added support for ASN.1 indefinite length constructed encoding.
      o New PKCS#12 'medium level' API to manipulate PKCS#12 files.
      o Complete rework of shared library construction and linking
        programs with shared or static libraries, through a separate
        Makefile.shared.
      o Rework of the passing of parameters from one Makefile to another.
      o Changed ENGINE framework to load dynamic engine modules
        automatically from specifically given directories.
      o New structure and ASN.1 functions for CertificatePair.
      o Changed the ZLIB compression method to be stateful.
      o Changed the key-generation and primality testing "progress"
        mechanism to take a structure that contains the ticker
        function and an argument.
      o New engine module: GMP (performs private key exponentiation).
      o New engine module: VIA PadLOck ACE extension in VIA C3
        Nehemiah processors.
      o Added support for IPv6 addresses in certificate extensions.
        See RFC 1884, section 2.2.
      o Added support for certificate policy mappings, policy
        constraints and name constraints.
      o Added support for multi-valued AVAs in the OpenSSL
        configuration file.
      o Added support for multiple certificates with the same subject
        in the 'openssl ca' index file.
      o Make it possible to create self-signed certificates using
        'openssl ca -selfsign'.
      o Make it possible to generate a serial number file with
        'openssl ca -create_serial'.
      o New binary search functions with extended functionality.
      o New BUF functions.
      o New STORE structure and library to provide an interface to all
        sorts of data repositories.  Supports storage of public and
        private keys, certificates, CRLs, numbers and arbitrary blobs.
 	This library is unfortunately unfinished and unused withing
 	OpenSSL.
      o New control functions for the error stack.
      o Changed the PKCS#7 library to support one-pass S/MIME
        processing.
      o Added the possibility to compile without old deprecated
        functionality with the OPENSSL_NO_DEPRECATED macro or the
        'no-deprecated' argument to the config and Configure scripts.
      o Constification of all ASN.1 conversion functions, and other
        affected functions.
      o Improved platform support for PowerPC.
      o New FIPS 180-2 algorithms (SHA-224, -256, -384 and -512).
      o New X509_VERIFY_PARAM structure to support parametrisation
        of X.509 path validation.
      o Major overhaul of RC4 performance on Intel P4, IA-64 and
        AMD64.
      o Changed the Configure script to have some algorithms disabled
        by default.  Those can be explicitely enabled with the new
        argument form 'enable-xxx'.
      o Change the default digest in 'openssl' commands from MD5 to
        SHA-1.
      o Added support for DTLS.
      o New BIGNUM blinding.
      o Added support for the RSA-PSS encryption scheme
      o Added support for the RSA X.931 padding.
      o Added support for BSD sockets on NetWare.
      o Added support for files larger than 2GB.
      o Added initial support for Win64.
      o Added alternate pkg-config files.
  Major changes between OpenSSL 0.9.7l and OpenSSL 0.9.7m [23 Feb 2007]:
      o FIPS 1.1.1 module linking.
      o Various ciphersuite selection fixes.
  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
      o Visual C++ 2005 fixes.
      o Update Windows build system for FIPS.
  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
      o Fix SSL 2.0 Rollback, CVE-2005-2969
      o Allow use of fixed-length exponent on DSA signing
      o Default fixed-window RSA, DSA, DH private-key operations
  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
      o More compilation issues fixed.
      o Adaptation to more modern Kerberos API.
      o Enhanced or corrected configuration for Solaris64, Mingw and Cygwin.
      o Enhanced x86_64 assembler BIGNUM module.
      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]:
      o Several compilation issues fixed.
      o Many memory allocation failure checks added.
      o Improved comparison of X509 Name type.
      o Mandatory basic checks on certificates.
      o Performance improvements.
  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
      o Fix race condition in CRL checking code.
      o Fixes to PKCS#7 (S/MIME) code.
  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
      o Security: Fix null-pointer assignment in do_change_cipher_spec()
      o Allow multiple active certificates with same subject in CA index
      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]:
      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]:
      o Security: counter the Klima-Pokorny-Rosa extension of
        Bleichbacher's attack 
      o Security: make RSA blinding default.
      o Configuration: Irix fixes, AIX fixes, better mingw support.
      o Support for new platforms: linux-ia64-ecc.
      o Build: shared library support fixes.
      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]:
      o Security: Important security related bugfixes.
      o Enhanced compatibility with MIT Kerberos.
      o Can be built without the ENGINE framework.
      o IA32 assembler enhancements.
      o Support for new platforms: FreeBSD/IA64 and FreeBSD/Sparc64.
      o Configuration: the no-err option now works properly.
      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]:
      o New library section OCSP.
      o Complete rewrite of ASN1 code.
@@ -512,15 +17,11 @@
        a separate distribution.
      o New elliptic curve library section.
      o New AES (Rijndael) library section.
-      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit,
+      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit
        Linux x86_64, Linux 64-bit on Sparc v9
      o Extended support for some platforms: VxWorks
      o Enhanced support for shared libraries.
      o Now only builds PIC code when shared library support is requested.
      o Support for pkg-config.
      o Lots of new manuals.
      o Makes symbolic links to or copies of manuals to cover all described
        functions.
      o Change DES API to clean up the namespace (some applications link also
        against libdes providing similar functions having the same name).
        Provide macros for backward compatibility (will be removed in the
@@ -541,28 +42,11 @@
      o SSL/TLS: allow optional cipher choice according to server's preference.
      o SSL/TLS: allow server to explicitly set new session ids.
      o SSL/TLS: support Kerberos cipher suites (RFC2712).
 	Only supports MIT Kerberos for now.
      o SSL/TLS: allow more precise control of renegotiations and sessions.
      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.6g and OpenSSL 0.9.6h:
      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]:
      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]:
      o Important security related bugfixes.
  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
      o New configuration targets for Tandem OSS and A/UX.
      o New OIDs for Microsoft attributes.
@@ -576,25 +60,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.
@@ -607,7 +91,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.
@@ -624,7 +108,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.
@@ -649,7 +133,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.
@@ -664,7 +148,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
@@ -673,7 +157,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
@@ -709,7 +193,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
@@ -720,7 +204,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
@@ -734,7 +218,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"
@@ -756,7 +240,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,592 +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 -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 -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 -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 separate error strings for each process )
   The "init" variable can't be left "global" because the error has is a ptr
   that is malloc'ed.  The malloc'ed error has is dependant on the "init"
   vars.
   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/171
+++ b/171
@@ -12,8 +12,8 @@ along the whole library path before it bothers looking for .a libraries.  This
 means that -L switches won't matter unless OpenSSL is built with shared
 library support.
-The workaround may be to change the following lines in apps/Makefile and
+The workaround may be to change the following lines in apps/Makefile.ssl and
-test/Makefile:
+test/Makefile.ssl:
  LIBCRYPTO=-L.. -lcrypto
  LIBSSL=-L.. -lssl
@@ -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
@@ -48,166 +46,3 @@ scripts use the same name for output and input files, which means different
 will interfere with each other and lead to test failure.
 The solution is simple for now: don't run parallell make when testing.
 * Bugs in gcc triggered
 - According to a problem report, there are bugs in gcc 3.0 that are
  triggered by some of the code in OpenSSL, more specifically in
  PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
 	header+=11;
 	if (*header != '4') return(0); header++;
 	if (*header != ',') return(0); header++;
  What happens is that gcc might optimize a little too agressively, and
  you end up with an extra incrementation when *header != '4'.
  We recommend that you upgrade gcc to as high a 3.x version as you can.
 - According to multiple problem reports, some of our message digest
  implementations trigger bug[s] in code optimizer in gcc 3.3 for sparc64
  and gcc 2.96 for ppc. Former fails to complete RIPEMD160 test, while
  latter - SHA one.
  The recomendation is to upgrade your compiler. This naturally applies to
  other similar cases.
 - There is a subtle Solaris x86-specific gcc run-time environment bug, which
  "falls between" OpenSSL [0.9.8 and later], Solaris ld and GCC. The bug
  manifests itself as Segmentation Fault upon early application start-up.
  The problem can be worked around by patching the environment according to
  http://www.openssl.org/~appro/values.c.
 * solaris64-sparcv9-cc SHA-1 performance with WorkShop 6 compiler.
 As subject suggests SHA-1 might perform poorly (4 times slower)
 if compiled with WorkShop 6 compiler and -xarch=v9. The cause for
 this seems to be the fact that compiler emits multiplication to
 perform shift operations:-( To work the problem around configure
 with './Configure solaris64-sparcv9-cc -DMD32_REG_T=int'.
 * Problems with hp-parisc2-cc target when used with "no-asm" flag
 When using the hp-parisc2-cc target, wrong bignum code is generated.
 This is due to the SIXTY_FOUR_BIT build being compiled with the +O3
 aggressive optimization.
 The problem manifests itself by the BN_kronecker test hanging in an
 endless loop. Reason: the BN_kronecker test calls BN_generate_prime()
 which itself hangs. The reason could be tracked down to the bn_mul_comba8()
 function in bn_asm.c. At some occasions the higher 32bit value of r[7]
 is off by 1 (meaning: calculated=shouldbe+1). Further analysis failed,
 as no debugger support possible at +O3 and additional fprintf()'s
 introduced fixed the bug, therefore it is most likely a bug in the
 optimizer.
 The bug was found in the BN_kronecker test but may also lead to
 failures in other parts of the code.
 (See Ticket #426.)
 Workaround: modify the target to +O2 when building with no-asm.
 * Problems building shared libraries on SCO OpenServer Release 5.0.6
  with gcc 2.95.3
 The symptoms appear when running the test suite, more specifically
 test/ectest, with the following result:
 OSSL_LIBPATH="`cd ..; pwd`"; LD_LIBRARY_PATH="$OSSL_LIBPATH:$LD_LIBRARY_PATH"; DYLD_LIBRARY_PATH="$OSSL_LIBPATH:$DYLD_LIBRARY_PATH"; SHLIB_PATH="$OSSL_LIBPATH:$SHLIB_PATH"; LIBPATH="$OSSL_LIBPATH:$LIBPATH"; if [ "debug-sco5-gcc" = "Cygwin" ]; then PATH="${LIBPATH}:$PATH"; fi; export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; ./ectest
 ectest.c:186: ABORT
 The cause of the problem seems to be that isxdigit(), called from
 BN_hex2bn(), returns 0 on a perfectly legitimate hex digit.  Further
 investigation shows that any of the isxxx() macros return 0 on any
 input.  A direct look in the information array that the isxxx() use,
 called __ctype, shows that it contains all zeroes...
 Taking a look at the newly created libcrypto.so with nm, one can see
 that the variable __ctype is defined in libcrypto's .bss (which
 explains why it is filled with zeroes):
 $ nm -Pg libcrypto.so | grep __ctype
 __ctype B 0011659c
 __ctype2 U         
 Curiously, __ctype2 is undefined, in spite of being declared in
 /usr/include/ctype.h in exactly the same way as __ctype.
 Any information helping to solve this issue would be deeply
 appreciated.
 NOTE: building non-shared doesn't come with this problem.
 * ULTRIX build fails with shell errors, such as "bad substitution"
  and "test: argument expected"
 The problem is caused by ULTRIX /bin/sh supporting only original
 Bourne shell syntax/semantics, and the trouble is that the vast
 majority is so accustomed to more modern syntax, that very few
 people [if any] would recognize the ancient syntax even as valid.
 This inevitably results in non-trivial scripts breaking on ULTRIX,
 and OpenSSL isn't an exclusion. Fortunately there is workaround,
 hire /bin/ksh to do the job /bin/sh fails to do.
 1. Trick make(1) to use /bin/ksh by setting up following environ-
   ment variables *prior* you execute ./Configure and make:
 	PROG_ENV=POSIX
 	MAKESHELL=/bin/ksh
 	export PROG_ENV MAKESHELL
   or if your shell is csh-compatible:
 	setenv PROG_ENV POSIX
 	setenv MAKESHELL /bin/ksh
 2. Trick /bin/sh to use alternative expression evaluator. Create
   following 'test' script for example in /tmp:
 	#!/bin/ksh
 	${0##*/} "$@"
   Then 'chmod a+x /tmp/test; ln /tmp/test /tmp/[' and *prepend*
   your $PATH with chosen location, e.g. PATH=/tmp:$PATH. Alter-
   natively just replace system /bin/test and /bin/[ with the
   above script.
 * hpux64-ia64-cc fails blowfish test.
 Compiler bug, presumably at particular patch level. It should be noted
 that same compiler generates correct 32-bit code, a.k.a. hpux-ia64-cc
 target. Drop optimization level to +O2 when compiling 64-bit bf_skey.o.
 * no-engines generates errors.
 Unfortunately, the 'no-engines' configuration option currently doesn't
 work properly.  Use 'no-hw' and you'll will at least get no hardware
 support.  We'll see how we fix that on OpenSSL versions past 0.9.8.
 * 'make test' fails in BN_sqr [commonly with "error 139" denoting SIGSEGV]
  if elder GNU binutils were deployed to link shared libcrypto.so.
 As subject suggests the failure is caused by a bug in elder binutils,
 either as or ld, and was observed on FreeBSD and Linux. There are two
 options. First is naturally to upgrade binutils, the second one - to
 reconfigure with additional no-sse2 [or 386] option passed to ./config.
 * If configured with ./config no-dso, toolkit still gets linked with -ldl,
  which most notably poses a problem when linking with dietlibc.
 We don't have framework to associate -ldl with no-dso, therefore the only
 way is to edit Makefile right after ./config no-dso and remove -ldl from
 EX_LIBS line.
 * 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/87
+++ b/87
@@ -1,7 +1,7 @@
- OpenSSL 1.1.0-dev
+ OpenSSL 0.9.7-beta4 19 Nov 2002
- Copyright (c) 1998-2011 The OpenSSL Project
+ Copyright (c) 1998-2002 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 All rights reserved.
@@ -36,13 +36,12 @@
     actually logically part of it. It includes routines for the following:
     Ciphers
-        libdes - EAY's libdes DES encryption package which was floating
+        libdes - EAY's libdes DES encryption package which has been floating
-                 around the net for a few years, and was then relicensed by
+                 around the net for a few years.  It includes 15
-                 him as part of SSLeay.  It includes 15 'modes/variations'
+                 'modes/variations' of DES (1, 2 and 3 key versions of ecb,
-                 of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb;
+                 cbc, cfb and ofb; pcbc and a more general form of cfb and
-                 pcbc and a more general form of cfb and ofb) including desx
+                 ofb) including desx in cbc mode, a fast crypt(3), and
-                 in cbc mode, a fast crypt(3), and routines to read
+                 routines to read passwords from the keyboard.
                 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.
@@ -90,6 +89,28 @@
        SSL/TLS Client and Server Tests
        Handling of S/MIME signed or encrypted mail
 PATENTS
 -------
 Various companies hold various patents for various algorithms in various
 locations around the world. _YOU_ are responsible for ensuring that your use
 of any algorithms is legal by checking if there are any patents in your
 country.  The file contains some of the patents that we know about or are
 rumored to exist. This is not a definitive list.
 RSA Security holds software patents on the RC5 algorithm.  If you
 intend to use this cipher, you must contact RSA Security for
 licensing conditions. Their web page is http://www.rsasecurity.com/.
 RC4 is a trademark of RSA Security, so use of this label should perhaps
 only be used with RSA Security's permission. 
 The IDEA algorithm is patented by Ascom in Austria, France, Germany, Italy,
 Japan, the Netherlands, Spain, Sweden, Switzerland, UK and the USA.  They
 should be contacted if that algorithm is to be used; their web page is
 http://www.ascom.ch/.
 INSTALLATION
 ------------
@@ -111,9 +132,6 @@
 SUPPORT 
 -------
 See the OpenSSL website www.openssl.org for details of how to obtain
 commercial technical support.
 If you have any problems with OpenSSL then please take the following steps
 first:
@@ -135,53 +153,31 @@
    - 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:
    openssl-bugs@openssl.org
- Note that the request tracker should NOT be used for general assistance
+ Note that mail to openssl-bugs@openssl.org is recorded in the publicly
- or support queries. Just because something doesn't work the way you expect
+ readable request tracker database and is forwarded to a public
- does not mean it is necessarily a bug in OpenSSL.
+ mailing list. Confidential mail may be sent to openssl-security@openssl.org
-
+ (PGP key available from the key servers).
 Note that mail to openssl-bugs@openssl.org is recorded in the public
 request tracker database (see https://www.openssl.org/support/rt.html
 for details) and also forwarded to a public mailing list. Confidential
 mail may be sent to openssl-security@openssl.org (PGP key available from
 the key servers).
 HOW TO CONTRIBUTE TO OpenSSL
 ----------------------------
 Development is coordinated on the openssl-dev mailing list (see
 http://www.openssl.org for information on subscribing). If you
- would like to submit a patch, send it to openssl-bugs@openssl.org with
+ would like to submit a patch, send it to openssl-dev@openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
 If you are unsure as to whether a feature will be useful for the general
 OpenSSL community please discuss it on the openssl-dev mailing list first.
 Someone may be already working on the same thing or there may be a good
 reason as to why that feature isn't implemented.
 Patches should be as up to date as possible, preferably relative to the
 current Git or the last snapshot. They should follow the coding style of
 OpenSSL and compile without warnings. Some of the core team developer targets
 can be used for testing purposes, (debug-steve64, debug-geoff etc). OpenSSL
 compiles on many varied platforms: try to ensure you only use portable
 features.
 Note: For legal reasons, contributions from the US can be accepted only
- if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
+ if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov;
- (formerly BXA) with a copy to the ENC Encryption Request Coordinator;
+ see http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
- please take some time to look at
+ and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)).
    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
+ The preferred format for changes is "diff -u" output. You might
 generate it like this:
 # cd openssl-work
@@ -189,4 +185,3 @@
 # ./Configure dist; make clean
 # cd ..
 # diff -ur openssl-orig openssl-work > mydiffs.patch
--- a/README.ECC
+++ b/README.ECC
@@ -1,61 +0,0 @@
 NOTE: The OpenSSL Software Foundation has executed a sublicense agreement
 entitled "Elliptic Curve Cryptography Patent License Agreement" with the
 National Security Agency/ Central Security Service Commercial Solutions
 Center (NCSC) dated 2010-11-04. That agreement permits implementation and
 distribution of software containing features covered by any or all of the
 following patents:
 1.) U.S. Pat. No. 5,761,305 entitled "Key Agreement and Transport Protocol 
    with Implicit Signatures" issued on June 2, 1998;
 2.) Can. Pat. Appl. Ser. No. 2176972 entitled "Key Agreement and Transport 
    Protocol with Implicit Signature and Reduced Bandwidth" filed on May 
    16, 1996;
 3.) U.S. Pat. No. 5,889,865 entitled "Key Agreement and Transport Protocol 
    with Implicit Signatures" issued on March 30, 1999;
 4.) U.S. Pat. No. 5,896,455 entitled "Key Agreement and Transport Protocol 
    with Implicit Signatures" issued on April 20, 1999;
 5.) U.S. Pat. No. 5,933,504 entitled "Strengthened Public Key Protocol" 
    issued on August 3, 1999;
 6.) Can. Pat. Appl. Ser. No. 2176866 entitled "Strengthened Public Key 
    Protocol" filed on May 17, 1996;
 7.) E.P. Pat. Appl. Ser. No. 96201322.3 entitled "Strengthened Public Key 
    Protocol" filed on May 17, 1996;
 8.) U.S. Pat. No. 5,999,626 entitled "Digital Signatures on a Smartcard" 
    issued on December 7, 1999;
 9.) Can. Pat. Appl. Ser. No. 2202566 entitled "Digital Signatures on a 
    Smartcard" filed on April 14, 1997;
 10.) E.P. Pat. Appl. No. 97106114.8 entitled "Digital Signatures on a 
     Smartcard" filed on April 15, 1997;
 11.) U.S Pat. No. 6,122,736 entitled "Key Agreement and Transport Protocol 
     with Implicit Signatures" issued on September 19, 2000;
 12.) Can. Pat. Appl. Ser. No. 2174261 entitled "Key Agreement and Transport 
     Protocol with Implicit Signatures" filed on April 16, 1996;
 13.) E.P. Pat. Appl. Ser. No. 96105920.1 entitled "Key Agreement and 
     Transport Protocol with Implicit Signatures" filed on April 16, 1996;
 14.) U.S. Pat. No. 6,141,420 entitled "Elliptic Curve Encryption Systems" 
     issued on October 31, 2000;
 15.) Can. Pat. Appl. Ser. No. 2155038 entitled "Elliptic Curve Encryption 
     Systems" filed on July 31, 1995;
 16.) E.P. Pat. Appl. Ser. No. 95926348.4 entitled "Elliptic Curve Encryption 
     Systems" filed on July 31, 1995;
 17.) U.S. Pat. No. 6,336,188 entitled "Authenticated Key Agreement" issued 
     on January 1, 2002;
 18.) U.S. Pat. No. 6,487,661 entitled "Key Agreement and Transport Protocol" 
     issued on November 26, 2002;
 19.) Can. Pat. Appl. Ser. No. 2174260 entitled "Key Agreement and Transport 
     Protocol" filed on April 16, 1996;
 20.) E.P. Pat. Appl. Ser. No. 96105921.9 entitled "Key Agreement and 
     Transport Protocol" filed on April 21, 1996;
 21.) U.S. Pat. No. 6,563,928 entitled "Strengthened Public Key Protocol" 
     issued on May 13, 2003;
 22.) U.S. Pat. No. 6,618,483 entitled "Elliptic Curve Encryption Systems" 
     issued September 9, 2003;
 23.) U.S. Pat. Appl. Ser. No. 09/434,247 entitled "Digital Signatures on a 
     Smartcard" filed on November 5, 1999;
 24.) U.S. Pat. Appl. Ser. No. 09/558,256 entitled "Key Agreement and 
     Transport Protocol with Implicit Signatures" filed on April 25, 2000;
 25.) U.S. Pat. Appl. Ser. No. 09/942,492 entitled "Digital Signatures on a 
     Smartcard" filed on August 29, 2001 and published on July 18, 2002; and,
 26.) U.S. Pat. Appl. Ser. No. 10/185,735 entitled "Strengthened Public Key 
     Protocol" filed on July 1, 2000.
--- a/README.FIPS
+++ b/README.FIPS
@@ -1,130 +0,0 @@
 Preliminary status and build information for FIPS module v2.0
 NB: if you are cross compiling you now need to use the latest "incore" script
 this can be found at util/incore in the tarballs.
 If you have any object files from a previous build do:
 make clean
 To build the module do:
 ./config fipscanisteronly
 make
 Build should complete without errors.
 Build test utilities:
 make build_tests
 Run test suite:
 test/fips_test_suite
 again should complete without errors.
 Run test vectors: 
 1. Download an appropriate set of testvectors from www.openssl.org/docs/fips
   only the fips-2.0 testvector files are usable for complete tests.
 2. Extract the files to a suitable directory.
 3. Run the test vector perl script, for example:
   cd fips
   perl fipsalgtest.pl --dir=/wherever/stuff/was/extracted
 4. It should say "passed all tests" at the end. Report full details of any
   failures.
 If you wish to use the older 1.2.x testvectors (for example those from 2007)
 you need the command line switch --disable-v2 to fipsalgtest.pl
 Examine the external symbols in fips/fipscanister.o they should all begin
 with FIPS or fips. One way to check with GNU nm is:
 	nm -g --defined-only fips/fipscanister.o | grep -v -i fips
 If you get *any* output at all from this test (i.e. symbols not starting with
 fips or FIPS) please report it.
 Restricted tarball tests.
 The validated module will have its own tarball containing sufficient code to
 build fipscanister.o and the associated algorithm tests. You can create a
 similar tarball yourself for testing purposes using the commands below.
 Standard restricted tarball:
 make -f Makefile.fips dist
 Prime field field only ECC tarball:
 make NOEC2M=1 -f Makefile.fips dist
 Once you've created the tarball extract into a fresh directory and do:
 ./config
 make
 You can then run the algorithm tests as above. This build automatically uses
 fipscanisterbuild and no-ec2m as appropriate.
 FIPS capable OpenSSL test: WARNING PRELIMINARY INSTRUCTIONS, SUBJECT TO CHANGE.
 At least initially the test module and FIPS capable OpenSSL may change and
 by out of sync. You are advised to check for any changes and pull the latest
 source from CVS if you have problems. See anon CVS and rsync instructions at:
 http://www.openssl.org/source/repos.html
 Make or download a restricted tarball from ftp://ftp.openssl.org/snapshot/
 If required set the environment variable FIPSDIR to an appropriate location
 to install the test module. If cross compiling set other environment
 variables too.
 In this restricted tarball on a Linux or U*ix like system run:
 ./config
 make
 make install
 On Windows from a VC++ environment do:
 ms\do_fips
 This will build and install the test module and some associated files.
 Now download the latest version of the OpenSSL 1.0.1 branch from either a
 snapshot or preferably CVS. For Linux do:
 ./config fips [other args]
 make
 For Windows:
 perl Configure VC-WIN32 fips [other args]
 ms\do_nasm
 nmake -f ms\ntdll.mak
 (or ms\nt.mak for a static build).
 Where [other args] can be any other arguments you use for an OpenSSL build
 such as "shared" or "zlib".
 This will build the fips capable OpenSSL and link it to the test module. You
 can now try linking and testing applications against the FIPS capable OpenSSL.
 Please report any problems to either the openssl-dev mailing list or directly
 to me steve@openssl.org . Check the mailing lists regularly to avoid duplicate
 reports.
 Known issues:
 Code needs extensively reviewing to ensure it builds correctly on 
 supported platforms and is compliant with FIPS 140-2.
 The "FIPS capable OpenSSL" is still largely untested, it builds and runs
 some simple tests OK on some systems but needs far more "real world" testing.
--- a/108
+++ b/108
@@ -0,0 +1,108 @@
  OpenSSL STATUS                           Last modified at
  ______________                           $Date: 2002/11/19 09:34:38 $
  DEVELOPMENT STATE
    o  OpenSSL 0.9.8:  Under development...
    o  OpenSSL 0.9.7-beta4: Released on November 19th, 2002
    o  OpenSSL 0.9.7-beta3: Released on July 30th, 2002
    o  OpenSSL 0.9.7-beta2: Released on June 16th, 2002
    o  OpenSSL 0.9.7-beta1: Released on June  1st, 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 BN_mod_mul verification fails for mips3-sgi-irix
      unless configured with no-asm
  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
 	Constification
 	OCSP
  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/6910
+++ b/6910
--- a/VMS/VMSify-conf.pl
+++ b/VMS/VMSify-conf.pl
@@ -1,34 +0,0 @@
 #! /usr/bin/perl
 use strict;
 use warnings;
 my @directory_vars = ( "dir", "certs", "crl_dir", "new_certs_dir" );
 my @file_vars = ( "database", "certificate", "serial", "crlnumber",
 		  "crl", "private_key", "RANDFILE" );
 while(<STDIN>) {
    chomp;
    foreach my $d (@directory_vars) {
 	if (/^(\s*\#?\s*${d}\s*=\s*)\.\/([^\s\#]*)([\s\#].*)$/) {
 	    $_ = "$1sys\\\$disk:\[.$2$3";
 	} elsif (/^(\s*\#?\s*${d}\s*=\s*)(\w[^\s\#]*)([\s\#].*)$/) {
 	    $_ = "$1sys\\\$disk:\[.$2$3";
 	}
 	s/^(\s*\#?\s*${d}\s*=\s*\$\w+)\/([^\s\#]*)([\s\#].*)$/$1.$2\]$3/;
 	while(/^(\s*\#?\s*${d}\s*=\s*(\$\w+\.|sys\\\$disk:\[\.)[\w\.]+)\/([^\]]*)\](.*)$/) {
 	    $_ = "$1.$3]$4";
 	}
    }
    foreach my $f (@file_vars) {
 	s/^(\s*\#?\s*${f}\s*=\s*)\.\/(.*)$/$1sys\\\$disk:\[\/$2/;
 	while(/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/(\w+\/[^\s\#]*)([\s\#].*)$/) {
 	    $_ = "$1.$3$4";
 	}
 	if (/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/(\w+)([\s\#].*)$/) {
 	    $_ = "$1]$3.$4";
 	} elsif  (/^(\s*\#?\s*${f}\s*=\s*(\$\w+|sys\\\$disk:\[)[^\/]*)\/([^\s\#]*)([\s\#].*)$/) {
 	    $_ = "$1]$3$4";
 	}
   }
    print $_,"\n";
 }
--- 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:
+$   exit
 $ endif
 $
-$ if (f$getsyi("cpu") .lt. 128)
+$ if f$getsyi("CPU") .ge. 128
 $ then
-$   arch_vax = 1
+$   libid  = "Crypto"
-$   arch = "VAX"
+$   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
 $   arch_vax = 0
 $   arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE")
 $   if (arch .eqs. "") then arch = "UNK"
 $ endif
 $!
 $ archd = arch
 $ lib32 = "32"
 $ shr = "SHR32"
 $!
 $ if (p1 .nes. "")
 $ then
 $   if (p1 .eqs. "64")
 $   then
 $     archd = arch+ "_64"
 $     lib32 = ""
 $     shr = "SHR"
 $   else
 $     if (p1 .nes. "32")
 $     then
 $       write sys$output "Second argument invalid."
 $       write sys$output "It should be "32", "64", or nothing."
 $       exit
 $     endif
 $   endif
 $ endif
 $!
 $! ----- Prepare info for processing: disabled algorithms info
 $ gosub read_disabled_algorithms_info
 $!
 $ ZLIB = p2
 $ zlib_lib = ""
 $ if (ZLIB .nes. "")
 $ then
 $   file2 = f$parse( ZLIB, "libz.olb", , , "syntax_only")
 $   if (f$search( file2) .eqs. "")
 $   then
 $     write sys$output ""
 $     write sys$output "The Option ", ZLIB, " Is Invalid."
 $     write sys$output "    Can't find library: ''file2'"
 $     write sys$output ""
 $     goto tidy
 $   endif
 $   zlib_lib = ", ''file2' /library"
 $ endif
 $!
 $ if (arch_vax)
 $ then
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.''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'
+$   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,11 +144,11 @@ $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for VAX
+$! ----- Subroutines for AXP
 $! -----
 $! The creator routine
 $ create_vax_shr:
-$   open /write mar 'libmar'
+$   open/write mar 'libmar'
 $   type sys$input:/out=mar:
 ;
 ; Transfer vector for VAX shareable image
@@ -275,10 +183,10 @@ $!   libwriter := write_vax_vtransfer_entry
 $!   gosub read_func_num
 $   write mar "	.END"
 $   close mar
-$   open /write opt 'libopt'
+$   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:
@@ -330,46 +237,35 @@ $   libentrynum=0
 $   liblastentry:=false
 $   entrycount=0
 $   loop:
-$     read /end=loop_end /err=loop_end libnum line
+$     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))
+$     info_exist=f$element(0,":",entryinfo)
-$     entryinfo = f$element( 2, " ", lin)
+$     info_platforms=","+f$element(1,":",entryinfo)+","
-$     curentry = f$element( 0, " ", lin)
+$     info_kind=f$element(2,":",entryinfo)
-$     info_exist = f$element( 0, ":", entryinfo)
+$     info_algorithms=","+f$element(3,":",entryinfo)+","
 $     info_platforms = ","+ f$element(1, ":", entryinfo)+ ","
 $     info_kind = f$element( 2, ":", entryinfo)
 $     info_algorithms = ","+ f$element( 3, ":", entryinfo)+ ","
 $     if info_exist .eqs. "NOEXIST" then goto loop
 $     truesum = 0
 $     falsesum = 0
 $     negatives = 1
 $     plat_i = 0
 $     loop1:
-$       plat_entry = f$element( plat_i, ",", info_platforms)
+$       plat_entry = f$element(plat_i,",",info_platforms)
 $       plat_i = plat_i + 1
 $       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. -
            (arch_vax .and. (plat_entry .eqs. "VMSVAX"))) then -
            truesum = truesum + 1
 $!
 $         if ((plat_entry .eqs. "!VMS") .or. -
            (arch_vax .and. (plat_entry .eqs. "!VMSVAX"))) then -
            falsesum = falsesum + 1
 $!
 $	  goto loop1
 $       endif
 $     endloop1:
@@ -388,7 +284,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
@@ -431,7 +327,7 @@ $
 $! The version number reader
 $ read_version_info:
 $   libver = ""
-$   open /read vf [.CRYPTO]OPENSSLV.H
+$   open/read vf [.CRYPTO]OPENSSLV.H
 $   loop_rvi:
 $     read/err=endloop_rvi/end=endloop_rvi vf rvi_line
 $     if rvi_line - "SHLIB_VERSION_NUMBER """ .eqs. rvi_line then -
@@ -455,22 +351,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,39 +8,31 @@ $!
 $!
 $! Slightly modified by Richard Levitte <richard@levitte.org>
 $!
 $!
 $! Always define OPENSSL.  Others are optional (non-null P1).
 $!
 $ OPENSSL  :== $SSLEXE:OPENSSL
-$
+$ VERIFY   :== $SSLEXE:OPENSSL VERIFY
-$ IF (P1 .NES. "")
+$ ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
-$ THEN
+$ REQ      :== $SSLEXE:OPENSSL REQ
-$     VERIFY   :== $SSLEXE:OPENSSL VERIFY
+$ DGST     :== $SSLEXE:OPENSSL DGST
-$     ASN1PARSE:== $SSLEXE:OPENSSL ASN1PARS
+$ DH       :== $SSLEXE:OPENSSL DH
-$! REQ could conflict with REQUEST.
+$ ENC      :== $SSLEXE:OPENSSL ENC
-$     OREQ     :== $SSLEXE:OPENSSL REQ
+$ GENDH    :== $SSLEXE:OPENSSL GENDH
-$     DGST     :== $SSLEXE:OPENSSL DGST
+$ ERRSTR   :== $SSLEXE:OPENSSL ERRSTR
-$     DH       :== $SSLEXE:OPENSSL DH
+$ CA       :== $SSLEXE:OPENSSL CA
-$     ENC      :== $SSLEXE:OPENSSL ENC
+$ CRL      :== $SSLEXE:OPENSSL CRL
-$     GENDH    :== $SSLEXE:OPENSSL GENDH
+$ RSA      :== $SSLEXE:OPENSSL RSA
-$     ERRSTR   :== $SSLEXE:OPENSSL ERRSTR
+$ DSA      :== $SSLEXE:OPENSSL DSA
-$     CA       :== $SSLEXE:OPENSSL CA
+$ DSAPARAM :== $SSLEXE:OPENSSL DSAPARAM
-$     CRL      :== $SSLEXE:OPENSSL CRL
+$ X509     :== $SSLEXE:OPENSSL X509
-$     RSA      :== $SSLEXE:OPENSSL RSA
+$ GENRSA   :== $SSLEXE:OPENSSL GENRSA
-$     DSA      :== $SSLEXE:OPENSSL DSA
+$ GENDSA   :== $SSLEXE:OPENSSL GENDSA
-$     DSAPARAM :== $SSLEXE:OPENSSL DSAPARAM
+$ S_SERVER :== $SSLEXE:OPENSSL S_SERVER
-$     X509     :== $SSLEXE:OPENSSL X509
+$ S_CLIENT :== $SSLEXE:OPENSSL S_CLIENT
-$     GENRSA   :== $SSLEXE:OPENSSL GENRSA
+$ SPEED    :== $SSLEXE:OPENSSL SPEED
-$     GENDSA   :== $SSLEXE:OPENSSL GENDSA
+$ S_TIME   :== $SSLEXE:OPENSSL S_TIME
-$     S_SERVER :== $SSLEXE:OPENSSL S_SERVER
+$ VERSION  :== $SSLEXE:OPENSSL VERSION
-$     S_CLIENT :== $SSLEXE:OPENSSL S_CLIENT
+$ PKCS7    :== $SSLEXE:OPENSSL PKCS7
-$     SPEED    :== $SSLEXE:OPENSSL SPEED
+$ CRL2PKCS7:== $SSLEXE:OPENSSL CRL2P7
-$     S_TIME   :== $SSLEXE:OPENSSL S_TIME
+$ SESS_ID  :== $SSLEXE:OPENSSL SESS_ID
-$     VERSION  :== $SSLEXE:OPENSSL VERSION
+$ CIPHERS  :== $SSLEXE:OPENSSL CIPHERS
-$     PKCS7    :== $SSLEXE:OPENSSL PKCS7
+$ NSEQ     :== $SSLEXE:OPENSSL NSEQ
-$     CRL2PKCS7:== $SSLEXE:OPENSSL CRL2P7
+$ PKCS12   :== $SSLEXE:OPENSSL PKCS12
 $     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,5 @@
 openssl
 Makefile.save
 der_chop
 der_chop.bak
 CA.pl
--- 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,40 +90,41 @@ $ 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
+$	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' -
-$       RET=$STATUS
+		       -out 'CATOP''CACERT' 'DAYS'
 $	RET=$STATUS
 $     ENDIF
 $   ENDIF
 $   GOTO opt_loop_continue
@@ -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'"
+	   -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
@@ -1,36 +1,52 @@
 #!/usr/local/bin/perl
 #
-# CA - wrapper around ca to make it easier to use
+# CA - wrapper around ca to make it easier to use ... basically ca requires
 #      some setup stuff to be done before you can use it and this makes
 #      things easier between now and when Eric is convinced to fix it :-)
 #
 # CA -newca ... will setup the right stuff
 # CA -newreq[-nodes] ... will generate a certificate request 
 # CA -sign ... will sign the generated request and output 
 #
 # At the end of that grab newreq.pem and newcert.pem (one has the key 
 # and the other the certificate) and cat them together and that is what
 # you want/need ... I'll make even this a little cleaner later.
 #
 #
 # 12-Jan-96 tjh    Added more things ... including CA -signcert which
 #                  converts a certificate to a request and then signs it.
 # 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
 #		   environment variable so this can be driven from
 #		   a script.
 # 25-Jul-96 eay    Cleaned up filenames some more.
 # 11-Jun-96 eay    Fixed a few filename missmatches.
 # 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
 # 18-Apr-96 tjh    Original hacking
 #
 # Tim Hudson
 # tjh@cryptsoft.com
 #
 # 27-Apr-98 snh    Translation into perl, fix existing CA bug.
 #
 #
 # Steve Henson
 # shenson@bigfoot.com
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
 my $openssl;
 if(defined $ENV{OPENSSL}) {
 	$openssl = $ENV{OPENSSL};
 } else {
 	$openssl = "openssl";
 	$ENV{OPENSSL} = $openssl;
 }
 $SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
-$DAYS="-days 365";	# 1 year
+$DAYS="-days 365";
-$CADAYS="-days 1095";	# 3 years
+$REQ="openssl req $SSLEAY_CONFIG";
-$REQ="$openssl req $SSLEAY_CONFIG";
+$CA="openssl ca $SSLEAY_CONFIG";
-$CA="$openssl ca $SSLEAY_CONFIG";
+$VERIFY="openssl verify";
-$VERIFY="$openssl verify";
+$X509="openssl x509";
-$X509="$openssl x509";
+$PKCS12="openssl pkcs12";
 $PKCS12="$openssl pkcs12";
 $CATOP="./demoCA";
 $CAKEY="cakey.pem";
 $CAREQ="careq.pem";
 $CACERT="cacert.pem";
 $CACRL="crl.pem";
 $DIRMODE = 0777;
@@ -39,23 +55,22 @@ $RET = 0;
 foreach (@ARGV) {
 	if ( /^(-\?|-h|-help)$/ ) {
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 	    print STDERR "       CA -crl|-revoke cert-filename [reason]\n";
 	    exit 0;
 	} elsif (/^-newcert$/) {
 	    # create a certificate
-	    system ("$REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS");
+	    system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
 	    $RET=$?;
-	    print "Certificate is in newcert.pem, private key is in newkey.pem\n"
+	    print "Certificate (and private key) is in newreq.pem\n"
 	} elsif (/^-newreq$/) {
 	    # create a certificate request
-	    system ("$REQ -new -keyout newkey.pem -out newreq.pem $DAYS");
+	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
 	    $RET=$?;
-	    print "Request is in newreq.pem, private key is in newkey.pem\n";
+	    print "Request (and private key) is in newreq.pem\n";
 	} elsif (/^-newreq-nodes$/) {
 	    # create a certificate request
-	    system ("$REQ -new -nodes -keyout newkey.pem -out newreq.pem $DAYS");
+	    system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");
 	    $RET=$?;
-	    print "Request is in newreq.pem, private key is in newkey.pem\n";
+	    print "Request (and private key) is in newreq.pem\n";
 	} elsif (/^-newca$/) {
 		# if explicitly asked for or it doesn't exist then setup the
 		# directory structure that Eric likes to manage things 
@@ -67,11 +82,11 @@ foreach (@ARGV) {
 		mkdir "${CATOP}/crl", $DIRMODE ;
 		mkdir "${CATOP}/newcerts", $DIRMODE;
 		mkdir "${CATOP}/private", $DIRMODE;
-		open OUT, ">${CATOP}/index.txt";
+		open OUT, ">${CATOP}/serial";
 		close OUT;
 		open OUT, ">${CATOP}/crlnumber";
 		print OUT "01\n";
 		close OUT;
 		open OUT, ">${CATOP}/index.txt";
 		close OUT;
 	    }
 	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
 		print "CA certificate filename (or enter to create)\n";
@@ -86,24 +101,18 @@ 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=$?;
 		}
 	    }
 	} elsif (/^-pkcs12$/) {
 	    my $cname = $ARGV[1];
 	    $cname = "My Certificate" unless defined $cname;
-	    system ("$PKCS12 -in newcert.pem -inkey newkey.pem " .
+	    system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .
 			"-certfile ${CATOP}/$CACERT -out newcert.p12 " .
 			"-export -name \"$cname\"");
 	    $RET=$?;
 	    print "PKCS #12 file is in newcert.p12\n";
 	    exit $RET;
 	} elsif (/^-xsign$/) {
 	    system ("$CA -policy policy_anything -infiles newreq.pem");
@@ -135,50 +144,17 @@ foreach (@ARGV) {
 	    } else {
 		    system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
 		    $RET=$?;
-		    exit $RET;
+	    	    exit 0;
 	    }
 	} elsif (/^-crl$/) {
 		system ("$CA -gencrl -out $CATOP/crl/$CACRL");
 		$RET=$?;
 		print "Generated CRL is in $CATOP/crl/$CACRL\n" if (!$RET);
 	} elsif (/^-revoke$/) {
 		my $cname = $ARGV[1];
 		if (!defined $cname) {
 			print "Certificate filename is required; reason optional.\n";
 			exit 1;
 		}
 		my $reason = $ARGV[2];
 		$reason = " -crl_reason $reason"
 			if defined $reason && crl_reason_ok($reason);
 		my $cmd = "$CA -revoke \"$cname\"".$reason;
 		system ($cmd);
 		$RET=$?;
 		exit $RET;
 	} else {
 	    print STDERR "Unknown arg $_\n";
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 	    print STDERR "       CA -crl|-revoke cert-filename [reason]\n";
 	    exit 1;
 	}
 }
 exit $RET;
 sub crl_reason_ok {
 	my ($r) = shift;
 	if ($r eq 'unspecified' || $r eq 'keyCompromise' ||
 	$r eq 'CACompromise' || $r eq 'affiliationChanged' ||
 	$r eq 'superseded' || $r eq 'cessationOfOperation' ||
 	$r eq 'certificateHold' || $r eq 'removeFromCRL') {
 		return 1;
 	}
 	print STDERR "Invalid CRL reason; must be one of:\n";
 	print STDERR "    unspecified, keyCompromise, CACompromise,\n";
 	print STDERR "    affiliationChanged, superseded, cessationOfOperation\n";
 	print STDERR "    certificateHold, removeFromCRL";
 	exit 1;
 }
 sub cp_pem {
 my ($infile, $outfile, $bound) = @_;
 open IN, $infile;
--- a/apps/CA.sh
+++ b/apps/CA.sh
@@ -16,8 +16,8 @@
 # 12-Jan-96 tjh    Added more things ... including CA -signcert which
 #                  converts a certificate to a request and then signs it.
 # 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
-#                  environment variable so this can be driven from
+#		   environment variable so this can be driven from
-#                  a script.
+#		   a script.
 # 25-Jul-96 eay    Cleaned up filenames some more.
 # 11-Jun-96 eay    Fixed a few filename missmatches.
 # 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
@@ -29,73 +29,33 @@
 # 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
+DAYS="-days 365"
-	if [ $? -eq 0 ]; then
+REQ="openssl req $SSLEAY_CONFIG"
-		echo $line >$outfile
+CA="openssl ca $SSLEAY_CONFIG"
-		flag=1
+VERIFY="openssl verify"
-	fi
+X509="openssl x509"
    done
 }
-usage() {
+CATOP=./demoCA
 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
 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
 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) 
    # create a certificate
-    $REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS
+    $REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS
    RET=$?
-    echo "Certificate is in newcert.pem, private key is in newkey.pem"
+    echo "Certificate (and private key) is in newreq.pem"
    ;;
 -newreq) 
    # create a certificate request
-    $REQ -new -keyout newkey.pem -out newreq.pem $DAYS
+    $REQ -new -keyout newreq.pem -out newreq.pem $DAYS
    RET=$?
    echo "Request is in newreq.pem, private key is in newkey.pem"
    ;;
 -newreq-nodes) 
    # create a certificate request
    $REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS
    RET=$?
    echo "Request (and private key) is in newreq.pem"
    ;;
@@ -105,11 +65,12 @@ case $1 in
    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 +79,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 +93,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 +120,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/Makefile.ssl
+++ b/apps/Makefile.ssl
--- a/apps/apps.c
+++ b/apps/apps.c
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -114,17 +114,14 @@
 #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>
 #include <openssl/txt_db.h>
 #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);
@@ -137,6 +134,17 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                       * (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
 /* VMS below version 7.0 doesn't have strcasecmp() */
 #ifdef OPENSSL_SYS_VMS
 #define strcasecmp(str1,str2) VMS_strcasecmp((str1),(str2))
 int VMS_strcasecmp(const char *str1, const char *str2);
 #endif
 #ifndef MONOLITH
 #define MAIN(a,v)	main(a,v)
@@ -158,9 +166,7 @@ extern BIO *bio_err;
 #endif
 #ifndef OPENSSL_SYS_NETWARE
 #include <signal.h>
 #endif
 #ifdef SIGPIPE
 #define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
@@ -168,49 +174,37 @@ 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) || \
-#    define apps_startup() \
+   defined(OPENSSL_SYS_WIN32)
-			do { do_pipe_sig(); CRYPTO_malloc_init(); \
+#    ifdef _O_BINARY
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+#      define apps_startup() \
-			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+		do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-#    define apps_shutdown() \
+		ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-			do { CONF_modules_unload(1); destroy_ui_method(); \
+		ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
-			OBJ_cleanup(); EVP_cleanup(); ENGINE_cleanup(); \
+#    else
-			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
+#      define apps_startup() \
-			RAND_cleanup(); \
+		do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-			ERR_free_strings(); zlib_cleanup();} while(0)
+		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(); CRYPTO_malloc_init(); \
+		do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
+		ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
-			setup_ui_method(); } while(0)
+		setup_ui_method(); } while(0)
 #    define apps_shutdown() \
 			do { CONF_modules_unload(1); destroy_ui_method(); \
 			OBJ_cleanup(); EVP_cleanup(); \
 			CRYPTO_cleanup_all_ex_data(); ERR_remove_thread_state(NULL); \
 			RAND_cleanup(); \
 			ERR_free_strings(); zlib_cleanup(); } while(0)
 #  endif
 #  define apps_shutdown() \
 		do { CONF_modules_unload(1); destroy_ui_method(); \
 		EVP_cleanup(); ENGINE_cleanup(); \
 		CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 		ERR_free_strings(); } while(0)
 #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)
 #endif
 typedef struct args_st
 	{
 	char **data;
@@ -237,7 +231,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, unsigned long lflags);
+void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags);
 #endif
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
@@ -247,106 +241,24 @@ int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *cert_descrip);
 X509_CRL *load_crl(const char *infile, int format);
 int load_cert_crl_http(const char *url, BIO *err,
 					X509 **pcert, X509_CRL **pcrl);
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 	const char *pass, ENGINE *e, const char *key_descrip);
 EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 	const char *pass, ENGINE *e, const char *key_descrip);
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *cert_descrip);
 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);
 int make_serial_index(TXT_DB *db);
-#define DB_type         0
+X509_NAME *do_subject(char *str, long chtype);
 #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 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
 	{
 	int unique_subject;
 	} DB_ATTR;
 typedef struct ca_db_st
 	{
 	DB_ATTR attributes;
 	TXT_DB *db;
 	} CA_DB;
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
 int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 void free_index(CA_DB *db);
 #define index_name_cmp_noconst(a, 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);
 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, 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,12 +270,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 FORMAT_NSS	14	/* NSS keylog format */
 #define EXT_COPY_NONE	0
 #define EXT_COPY_ADD	1
@@ -373,16 +279,4 @@ void store_setup_crl_download(X509_STORE *st);
 #define APP_PASS_LEN	1024
 #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,7 +56,7 @@
 * [including the GNU Public Licence.]
 */
-/* A nice addition from Dr Stephen Henson <steve@openssl.org> to 
+/* A nice addition from Dr Stephen Henson <shenson@bigfoot.com> to 
 * add the -strparse option which parses nested binary structures
 */
@@ -69,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
@@ -81,24 +80,19 @@
 #undef PROG
 #define PROG	asn1parse_main
 int MAIN(int, char **);
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 int MAIN(int argc, char **argv)
 	{
 	int i,badops=0,offset=0,ret=1,j;
 	unsigned int length=0;
 	long num,tmplen;
 	BIO *in=NULL,*out=NULL,*b64=NULL, *derout = NULL;
-	int informat,indent=0, noout = 0, dump = 0, strictpem = 0;
+	int informat,indent=0, noout = 0, dump = 0;
-	char *infile=NULL,*str=NULL,*prog,*oidfile=NULL, *derfile=NULL, *name=NULL, *header=NULL;
+	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,7 +109,7 @@ 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;
@@ -171,22 +165,7 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-strparse") == 0)
 			{
 			if (--argc < 1) goto bad;
-			sk_OPENSSL_STRING_push(osk,*(++argv));
+			sk_push(osk,*(++argv));
 			}
 		else if (strcmp(*argv,"-genstr") == 0)
 			{
 			if (--argc < 1) goto bad;
 			genstr= *(++argv);
 			}
 		else if (strcmp(*argv,"-genconf") == 0)
 			{
 			if (--argc < 1) goto bad;
 			genconf= *(++argv);
 			}
 		else if (strcmp(*argv,"-strictpem") == 0)
 			{
 			strictpem = 1;
 			informat = FORMAT_PEM;
 			}
 		else
 			{
@@ -203,7 +182,7 @@ int MAIN(int argc, char **argv)
 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," -inform arg   input format - one of DER TXT PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
 		BIO_printf(bio_err," -noout arg    don't produce any output\n");
@@ -216,10 +195,6 @@ bad:
 		BIO_printf(bio_err," -strparse offset\n");
 		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
 		BIO_printf(bio_err,"               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");
 		BIO_printf(bio_err," -strictpem    do not attempt base64 decode outside PEM markers (-inform \n");
 		BIO_printf(bio_err,"               will be ignored)\n");
 		goto end;
 		}
@@ -270,80 +245,50 @@ bad:
 		}
 	}
-	if(strictpem)
+	if ((buf=BUF_MEM_new()) == NULL) goto end;
 	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
 	if (informat == FORMAT_PEM)
 		{
-		if(PEM_read_bio(in, &name, &header, (unsigned char **)&str, &num) != 1)
+		BIO *tmp;
-			{
+
-			BIO_printf(bio_err,"Error reading PEM file\n");
+		if ((b64=BIO_new(BIO_f_base64())) == NULL)
 			ERR_print_errors(bio_err);
 			goto end;
-			}
+		BIO_push(b64,in);
 		tmp=in;
 		in=b64;
 		b64=tmp;
 		}
-	else
+
 	num=0;
 	for (;;)
 		{
-
+		if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
-		if ((buf=BUF_MEM_new()) == NULL) goto end;
+		i=BIO_read(in,&(buf->data[num]),BUFSIZ);
-		if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
+		if (i <= 0) break;
-
+		num+=i;
 		if (genstr || genconf)
 			{
 			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)
 					goto end;
 				BIO_push(b64,in);
 				tmp=in;
 				in=b64;
 				b64=tmp;
 				}
 			num=0;
 			for (;;)
 				{
 				if (!BUF_MEM_grow(buf,(int)num+BUFSIZ)) goto end;
 				i=BIO_read(in,&(buf->data[num]),BUFSIZ);
 				if (i <= 0) break;
 				num+=i;
 				}
 			}
 		str=buf->data;
 		}
 	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_value(osk,i));
 			j=atoi(sk_OPENSSL_STRING_value(osk,i));
 			if (j == 0)
 				{
-				BIO_printf(bio_err,"'%s' is an invalid number\n",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)
 				{
@@ -351,15 +296,6 @@ bad:
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			typ = ASN1_TYPE_get(at);
 			if ((typ == V_ASN1_OBJECT)
 				|| (typ == V_ASN1_NULL))
 				{
 				BIO_printf(bio_err, "Can't parse %s type\n",
 					typ == V_ASN1_NULL ? "NULL" : "OBJECT");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			/* hmm... this is a little evil but it works */
 			tmpbuf=at->value.asn1_string->data;
 			tmplen=at->value.asn1_string->length;
@@ -368,15 +304,7 @@ bad:
 		num=tmplen;
 		}
-	if (offset >= num)
+	if (length == 0) length=(unsigned int)num;
 		{
 		BIO_printf(bio_err, "Error: offset too large\n");
 		goto end;
 		}
 	num -= offset;
 	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
 	if(derout) {
 		if(BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
@@ -400,72 +328,10 @@ end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	if (buf != NULL) BUF_MEM_free(buf);
 	if (name != NULL) OPENSSL_free(name);
 	if (header != NULL) OPENSSL_free(header);
 	if (strictpem && str != NULL) OPENSSL_free(str);
 	if (at != NULL) ASN1_TYPE_free(at);
-	if (osk != NULL) sk_OPENSSL_STRING_free(osk);
+	if (osk != NULL) sk_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf)
 	{
 	CONF *cnf = NULL;
 	int len;
 	long errline;
 	unsigned char *p;
 	ASN1_TYPE *atyp = NULL;
 	if (genconf)
 		{
 		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
@@ -59,6 +59,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
@@ -66,10 +69,10 @@
 #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",
 NULL
@@ -80,23 +83,25 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	int ret=1,i;
-	int verbose=0,Verbose=0;
+	int verbose=0;
-	int use_supported = 0;
+	char **pp;
 #ifndef OPENSSL_NO_SSL_TRACE
 	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=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();
@@ -109,8 +114,6 @@ int MAIN(int argc, char **argv)
 	STDout = BIO_push(tmpbio, STDout);
 	}
 #endif
 	if (!load_config(bio_err, NULL))
 		goto end;
 	argc--;
 	argv++;
@@ -118,13 +121,9 @@ int MAIN(int argc, char **argv)
 		{
 		if (strcmp(*argv,"-v") == 0)
 			verbose=1;
-		else if (strcmp(*argv,"-V") == 0)
+#ifndef OPENSSL_NO_SSL2
-			verbose=Verbose=1;
+		else if (strcmp(*argv,"-ssl2") == 0)
-		else if (strcmp(*argv,"-s") == 0)
+			meth=SSLv2_client_method();
 			use_supported = 1;
 #ifndef OPENSSL_NO_SSL_TRACE
 		else if (strcmp(*argv,"-stdname") == 0)
 			stdname=verbose=1;
 #endif
 #ifndef OPENSSL_NO_SSL3
 		else if (strcmp(*argv,"-ssl3") == 0)
@@ -168,55 +167,27 @@ int MAIN(int argc, char **argv)
 	ssl=SSL_new(ctx);
 	if (ssl == NULL) goto err;
 	if (use_supported)
 		sk=SSL_get1_supported_ciphers(ssl);
 	else
 		sk=SSL_get_ciphers(ssl);
 	if (!verbose)
 		{
-		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
+		for (i=0; ; i++)
 			{
-			SSL_CIPHER *c = sk_SSL_CIPHER_value(sk,i);
+			p=SSL_get_cipher_list(ssl,i);
 			p = SSL_CIPHER_get_name(c);
 			if (p == NULL) break;
 			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++)
 			{
-			SSL_CIPHER *c;
+			BIO_puts(STDout,SSL_CIPHER_description(
-
+				sk_SSL_CIPHER_value(sk,i),
-			c = 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) == 0x03000000L)
 					BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */
 				else
 					BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
 				}
 #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));
 			}
 		}
@@ -228,12 +199,10 @@ err:
 		ERR_print_errors(bio_err);
 		}
 end:
 	if (use_supported && sk)
 		sk_SSL_CIPHER_free(sk);
 	if (ctx != NULL) SSL_CTX_free(ctx);
 	if (ssl != NULL) SSL_free(ssl);
 	if (STDout != NULL) BIO_free_all(STDout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	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,9 @@ static const char *crl_usage[]={
 " -in arg         - input file - default stdin\n",
 " -out arg        - output file - default stdout\n",
 " -hash           - print hash value\n",
 #ifndef OPENSSL_NO_MD5
 " -hash_old       - print old-style (MD5) hash value\n",
 #endif
 " -fingerprint    - print the crl fingerprint\n",
 " -issuer         - print issuer DN\n",
 " -lastupdate     - lastUpdate field\n",
 " -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 +91,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,23 +101,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=0,text=0;
-#ifndef OPENSSL_NO_MD5
+	int fingerprint = 0;
-       int hash_old=0;
+	char **pp;
 #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();
@@ -146,7 +139,6 @@ int MAIN(int argc, char **argv)
 	informat=FORMAT_PEM;
 	outformat=FORMAT_PEM;
 	keyformat=FORMAT_PEM;
 	argc--;
 	argv++;
@@ -175,21 +167,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
 			}
 		else if (strcmp(*argv,"-gendelta") == 0)
 			{
 			if (--argc < 1) goto bad;
 			crldiff= *(++argv);
 			}
 		else if (strcmp(*argv,"-key") == 0)
 			{
 			if (--argc < 1) goto bad;
 			keyfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-keyform") == 0)
 			{
 			if (--argc < 1) goto bad;
 			keyformat=str2fmt(*(++argv));
 			}
 		else if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -213,10 +190,6 @@ int MAIN(int argc, char **argv)
 			text = 1;
 		else if (strcmp(*argv,"-hash") == 0)
 			hash= ++num;
 #ifndef OPENSSL_NO_MD5
 		else if (strcmp(*argv,"-hash_old") == 0)
 			hash_old= ++num;
 #endif
 		else if (strcmp(*argv,"-nameopt") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -232,10 +205,6 @@ int MAIN(int argc, char **argv)
 			noout= ++num;
 		else if (strcmp(*argv,"-fingerprint") == 0)
 			fingerprint= ++num;
 		else if (strcmp(*argv,"-crlnumber") == 0)
 			crlnumber= ++num;
 		else if (strcmp(*argv,"-badsig") == 0)
 			badsig = 1;
 		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
 			{
 			/* ok */
@@ -303,39 +272,6 @@ bad:
 		else BIO_printf(bio_err, "verify OK\n");
 	}
 	if (crldiff)
 		{
 		X509_CRL *newcrl, *delta;
 		if (!keyfile)
 			{
 			BIO_puts(bio_err, "Missing CRL signing key\n");
 			goto end;
 			}
 		newcrl = load_crl(crldiff,informat);
 		if (!newcrl)
 			goto end;
 		pkey = load_key(bio_err, keyfile, keyformat, 0, NULL, NULL,
 					"CRL signing key");
 		if (!pkey)
 			{
 			X509_CRL_free(newcrl);
 			goto end;
 			}	
 		delta = X509_CRL_diff(x, newcrl, pkey, digest, 0);
 		X509_CRL_free(newcrl);
 		EVP_PKEY_free(pkey);
 		if (delta)
 			{
 			X509_CRL_free(x);
 			x = delta;
 			}
 		else
 			{
 			BIO_puts(bio_err, "Error creating delta CRL\n");
 			goto end;
 			}
 		}
 	if (num)
 		{
 		for (i=1; i<=num; i++)
@@ -344,34 +280,12 @@ bad:
 				{
 				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 (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=");
@@ -440,14 +354,7 @@ bad:
 	if (text) X509_CRL_print(out, x);
-	if (noout) 
+	if (noout) goto end;
 		{
 		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);
@@ -461,8 +368,6 @@ bad:
 	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
 	ret=0;
 end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	BIO_free_all(out);
 	BIO_free_all(bio_out);
 	bio_out=NULL;
@@ -472,5 +377,48 @@ end:
 		X509_STORE_free(store);
 	}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	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
@@ -63,6 +63,7 @@
 #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>
@@ -75,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
@@ -93,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;
@@ -141,14 +141,8 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-certfile") == 0)
 			{
 			if (--argc < 1) goto bad;
-			if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
+			if(!certflst) certflst = sk_new_null();
-			if (!certflst)
+			sk_push(certflst,*(++argv));
 				goto end;
 			if (!sk_OPENSSL_STRING_push(certflst,*(++argv)))
 				{
 				sk_OPENSSL_STRING_free(certflst);
 				goto end;
 				}
 			}
 		else
 			{
@@ -233,8 +227,8 @@ bad:
 	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
 	p7s->cert=cert_stack;
-	if(certflst) for(i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
-		certfile = sk_OPENSSL_STRING_value(certflst, i);
+		certfile = sk_value(certflst, i);
 		if (add_certs_from_file(cert_stack,certfile) < 0)
 			{
 			BIO_printf(bio_err, "error loading certificates\n");
@@ -243,7 +237,7 @@ bad:
 			}
 	}
-	sk_OPENSSL_STRING_free(certflst);
+	sk_free(certflst);
 	if (outfile == NULL)
 		{
@@ -286,7 +280,7 @@ end:
 	if (crl != NULL) X509_CRL_free(crl);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 /*
@@ -301,12 +295,19 @@ end:
 */
 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))
 		{
--- 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/der_chop.in
+++ b/apps/der_chop.in
@@ -0,0 +1,305 @@
 #!/usr/local/bin/perl
 #
 # der_chop ... this is one total hack that Eric is really not proud of
 #              so don't look at it and don't ask for support
 #
 # The "documentation" for this (i.e. all the comments) are my fault --tjh
 #
 # This program takes the "raw" output of derparse/asn1parse and 
 # converts it into tokens and then runs regular expression matches
 # to try to figure out what to grab to get the things that are needed
 # and it is possible that this will do the wrong thing as it is a *hack*
 #
 # SSLeay 0.5.2+ should have direct read support for x509 (via -inform NET)
 # [I know ... promises promises :-)]
 #
 # To convert a Netscape Certificate:
 #    der_chop < ServerCert.der > cert.pem
 # To convert a Netscape Key (and encrypt it again to protect it)
 #    rsa -inform NET -in ServerKey.der -des > key.pem
 #
 # 23-Apr-96 eay    Added the extra ASN.1 string types, I still think this
 #		   is an evil hack.  If nothing else the parsing should
 #		   be relative, not absolute.
 # 19-Apr-96 tjh    hacked (with eay) into 0.5.x format
 #
 # Tim Hudson
 # tjh@cryptsoft.com
 #
 require 'getopts.pl';
 $debug=0;
 # this was the 0.4.x way of doing things ...
 $cmd="derparse";
 $x509_cmd="x509";
 $crl_cmd="crl";
 $rc4_cmd="rc4";
 $md2_cmd="md2";
 $md4_cmd="md4";
 $rsa_cmd="rsa -des -inform der ";
 # this was the 0.5.x way of doing things ...
 $cmd="openssl asn1parse";
 $x509_cmd="openssl x509";
 $crl_cmd="openssl crl";
 $rc4_cmd="openssl rc4";
 $md2_cmd="openssl md2";
 $md4_cmd="openssl md4";
 $rsa_cmd="openssl rsa -des -inform der ";
 &Getopts('vd:') || die "usage:$0 [-v] [-d num] file";
 $depth=($opt_d =~ /^\d+$/)?$opt_d:0;
 &init_der();
 if ($#ARGV != -1)
 	{
 	foreach $file (@ARGV)
 		{
 		print STDERR "doing $file\n";
 		&dofile($file);
 		}
 	}
 else
 	{
 	$file="/tmp/a$$.DER";
 	open(OUT,">$file") || die "unable to open $file:$!\n";
 	for (;;)
 		{
 		$i=sysread(STDIN,$b,1024*10);
 		last if ($i <= 0);
 		$i=syswrite(OUT,$b,$i);
 		}
 	&dofile($file);
 	unlink($file);
 	}
 sub dofile
 	{
 	local($file)=@_;
 	local(@p);
 	$b=&load_file($file);
 	@p=&load_file_parse($file);
 	foreach $_ (@p)
 		{
 		($off,$d,$hl,$len)=&parse_line($_);
 		$d-=$depth;
 		next if ($d != 0);
 		next if ($len == 0);
 		$o=substr($b,$off,$len+$hl);
 		($str,@data)=&der_str($o);
 		print "$str\n" if ($opt_v);
 		if ($str =~ /^$crl/)
 			{
 			open(OUT,"|$crl_cmd -inform d -hash -issuer") ||
 				die "unable to run $crl_cmd:$!\n";
 			print OUT $o;
 			close(OUT);
 			}
 		elsif ($str =~ /^$x509/)
 			{
 			open(OUT,"|$x509_cmd -inform d -hash -subject -issuer")
 				|| die "unable to run $x509_cmd:$!\n";
 			print OUT $o;
 			close(OUT);
 			}
 		elsif ($str =~ /^$rsa/)
 			{
 			($type)=($data[3] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
 			next unless ($type eq "rsaEncryption");
 			($off,$d,$hl,$len)=&parse_line($data[5]);
 			$os=substr($o,$off+$hl,$len);
 			open(OUT,"|$rsa_cmd")
 				|| die "unable to run $rsa_cmd:$!\n";
 			print OUT $os;
 			close(OUT);
 			}
 		elsif ($str =~ /^0G-1D-1G/)
 			{
 			($off,$d,$hl,$len)=&parse_line($data[1]);
 			$os=substr($o,$off+$hl,$len);
 			print STDERR "<$os>\n" if $opt_v;
 			&do_certificate($o,@data)
 				if (($os eq "certificate") &&
 				    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
 			&do_private_key($o,@data)
 				if (($os eq "private-key") &&
 				    ($str =! /^0G-1D-1G-2G-3F-3E-2D/));
 			}
 		}
 	}
 sub der_str
 	{
 	local($str)=@_;
 	local(*OUT,*IN,@a,$t,$d,$ret);
 	local($file)="/tmp/b$$.DER";
 	local(@ret);
 	open(OUT,">$file");
 	print OUT $str;
 	close(OUT);
 	open(IN,"$cmd -inform 'd' -in $file |") ||
 		die "unable to run $cmd:$!\n";
 	$ret="";
 	while (<IN>)
 		{
 		chop;
 		push(@ret,$_);
 		print STDERR "$_\n" if ($debug);
 		@a=split(/\s*:\s*/);
 		($d)=($a[1] =~ /d=\s*(\d+)/);
 		$a[2] =~ s/\s+$//;
 		$t=$DER_s2i{$a[2]};
 		$ret.="$d$t-";
 		}
 	close(IN);
 	unlink($file);
 	chop $ret;
 	$ret =~ s/(-3H(-4G-5F-5[IJKMQRS])+)+/-NAME/g;
 	$ret =~ s/(-3G-4B-4L)+/-RCERT/g;
 	return($ret,@ret);
 	}
 sub init_der
 	{
 	$crl= "0G-1G-2G-3F-3E-2G-NAME-2L-2L-2G-RCERT-1G-2F-2E-1C";
 	$x509="0G-1G-2B-2G-3F-3E-2G-NAME-2G-3L-3L-2G-NAME-2G-3G-4F-4E-3C-1G-2F-2E-1C";
 	$rsa= "0G-1B-1G-2F-2E-1D";
 	%DER_i2s=(
 		# SSLeay 0.4.x has this list
 		"A","EOC",
 		"B","INTEGER",
 		"C","BIT STRING",
 		"D","OCTET STRING",
 		"E","NULL",
 		"F","OBJECT",
 		"G","SEQUENCE",
 		"H","SET",
 		"I","PRINTABLESTRING",
 		"J","T61STRING",
 		"K","IA5STRING",
 		"L","UTCTIME",
 		"M","NUMERICSTRING",
 		"N","VIDEOTEXSTRING",
 		"O","GENERALIZEDTIME",
 		"P","GRAPHICSTRING",
 		"Q","ISO64STRING",
 		"R","GENERALSTRING",
 		"S","UNIVERSALSTRING",
 		# SSLeay 0.5.x changed some things ... and I'm
 		# leaving in the old stuff but adding in these
 		# to handle the new as well --tjh
 		# - Well I've just taken them out and added the extra new
 		# ones :-) - eay
 		);
 	foreach (keys %DER_i2s)
 		{ $DER_s2i{$DER_i2s{$_}}=$_; }
 	}
 sub parse_line
 	{
 	local($_)=@_;
 	return(/\s*(\d+):d=\s*(\d+)\s+hl=\s*(\d+)\s+l=\s*(\d+|inf)\s/);
 	}
 #  0:d=0 hl=4 l=377 cons: univ: SEQUENCE          
 #  4:d=1 hl=2 l= 11 prim: univ: OCTET_STRING      
 # 17:d=1 hl=4 l=360 cons: univ: SEQUENCE          
 # 21:d=2 hl=2 l= 12 cons: univ: SEQUENCE          
 # 23:d=3 hl=2 l=  8 prim: univ: OBJECT_IDENTIFIER :rc4
 # 33:d=3 hl=2 l=  0 prim: univ: NULL              
 # 35:d=2 hl=4 l=342 prim: univ: OCTET_STRING
 sub do_private_key
 	{
 	local($data,@struct)=@_;
 	local($file)="/tmp/b$$.DER";
 	local($off,$d,$hl,$len,$_,$b,@p,$s);
 	($type)=($struct[4] =~ /OBJECT_IDENTIFIER :(.*)\s*$/);
 	if ($type eq "rc4")
 		{
 		($off,$d,$hl,$len)=&parse_line($struct[6]);
 		open(OUT,"|$rc4_cmd >$file") ||
 			die "unable to run $rc4_cmd:$!\n";
 		print OUT substr($data,$off+$hl,$len);
 		close(OUT);
 		$b=&load_file($file);
 		unlink($file);
 		($s,@p)=&der_str($b);
 		die "unknown rsa key type\n$s\n"
 			if ($s ne '0G-1B-1G-2F-2E-1D');
 		local($off,$d,$hl,$len)=&parse_line($p[5]);
 		$b=substr($b,$off+$hl,$len);
 		($s,@p)=&der_str($b);
 		open(OUT,"|$rsa_cmd") || die "unable to run $rsa_cmd:$!\n";
 		print OUT $b;
 		close(OUT);
 		}
 	else
 		{
 		print "'$type' is unknown\n";
 		exit(1);
 		}
 	}
 sub do_certificate
 	{
 	local($data,@struct)=@_;
 	local($file)="/tmp/b$$.DER";
 	local($off,$d,$hl,$len,$_,$b,@p,$s);
 	($off,$d,$hl,$len)=&parse_line($struct[2]);
 	$b=substr($data,$off,$len+$hl);
 	open(OUT,"|$x509_cmd -inform d") || die "unable to run $x509_cmd:$!\n";
 	print OUT $b;
 	close(OUT);
 	}
 sub load_file
 	{
 	local($file)=@_;
 	local(*IN,$r,$b,$i);
 	$r="";
 	open(IN,"<$file") || die "unable to open $file:$!\n";
 	for (;;)
 		{
 		$i=sysread(IN,$b,10240);
 		last if ($i <= 0);
 		$r.=$b;
 		}
 	close(IN);
 	return($r);
 	}
 sub load_file_parse
 	{
 	local($file)=@_;
 	local(*IN,$r,@ret,$_,$i,$n,$b);
 	open(IN,"$cmd -inform d -in $file|")
 		|| die "unable to run der_parse\n";
 	while (<IN>)
 		{
 		chop;
 		push(@ret,$_);
 		}
 	return($r,@ret);
 	}
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -66,7 +66,6 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
 #undef BUFSIZE
 #define BUFSIZE	1024*8
@@ -75,41 +74,21 @@
 #define PROG	dgst_main
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-	  EVP_PKEY *key, unsigned char *sigin, int siglen,
+	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-	  const char *sig_name, const char *md_name,
+	  const char *file);
 	  const char *file,BIO *bmd);
 static void list_md_fn(const EVP_MD *m,
 			const char *from, const char *to, void *arg)
 	{
 	const char *mname;
 	/* Skip aliases */
 	if (!m)
 		return;
 	mname = OBJ_nid2ln(EVP_MD_type(m));
 	/* Skip shortnames */
 	if (strcmp(from, mname))
 		return;
 	/* Skip clones */
 	if (EVP_MD_flags(m) & EVP_MD_FLAG_PKEY_DIGEST)
 		return;
 	if (strchr(mname, ' '))
 		mname= EVP_MD_name(m);
 	BIO_printf(arg, "-%-14s to use the %s message digest algorithm\n",
 			mname, mname);
 	}
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL, *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;
@@ -121,15 +100,7 @@ int MAIN(int argc, char **argv)
 	EVP_PKEY *sigkey = NULL;
 	unsigned char *sigbuf = NULL;
 	int siglen = 0;
 	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();
@@ -157,8 +128,6 @@ int MAIN(int argc, char **argv)
 		if ((*argv)[0] != '-') break;
 		if (strcmp(*argv,"-c") == 0)
 			separator=1;
 		else if (strcmp(*argv,"-r") == 0)
 			separator=2;
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) break;
@@ -174,12 +143,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			}
 		else if (!strcmp(*argv,"-passin"))
 			{
 			if (--argc < 1)
 				break;
 			passargin=*++argv;
 			}
 		else if (strcmp(*argv,"-verify") == 0)
 			{
 			if (--argc < 1) break;
@@ -203,56 +166,17 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) break;
 			keyform=str2fmt(*(++argv));
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			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;
 		else if (strcmp(*argv,"-binary") == 0)
 			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"))
 			{
 			if (--argc < 1)
 				break;
 			hmac_key=*++argv;
 			}
 		else if (!strcmp(*argv,"-mac"))
 			{
 			if (--argc < 1)
 				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
@@ -261,9 +185,12 @@ int MAIN(int argc, char **argv)
 		argv++;
 		}
 	if (md == NULL)
 		md=EVP_md5();
 	if(do_verify && !sigfile) {
 		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
 		err = 1; 
 		goto end;
 	}
@@ -272,34 +199,36 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err,"unknown option '%s'\n",*argv);
 		BIO_printf(bio_err,"options are\n");
 		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
 		BIO_printf(bio_err,"-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,"-non-fips-allow allow use of non FIPS digest\n");
 		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
 		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
 		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
 		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
 		BIO_printf(bio_err,"-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,"-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
+        e = setup_engine(bio_err, engine, 0);
 	if (engine_impl)
 		impl = e;
 #endif
 	in=BIO_new(BIO_s_file());
 	bmd=BIO_new(BIO_f_md());
@@ -307,13 +236,7 @@ int MAIN(int argc, char **argv)
 		{
 		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))
 		{
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 		}
 	if ((in == NULL) || (bmd == NULL))
@@ -323,10 +246,8 @@ int MAIN(int argc, char **argv)
 		}
 	if(out_bin == -1) {
-		if(keyfile)
+		if(keyfile) out_bin = 1;
-			out_bin = 1;
+		else out_bin = 0;
 		else
 			out_bin = 0;
 	}
 	if(randfile)
@@ -352,11 +273,6 @@ 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)
 		{
@@ -364,7 +280,7 @@ int MAIN(int argc, char **argv)
 			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
 				e, "key file");
 		else
-			sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
+			sigkey = load_key(bio_err, keyfile, keyform, 0, NULL,
 				e, "key file");
 		if (!sigkey)
 			{
@@ -374,115 +290,6 @@ int MAIN(int argc, char **argv)
 			}
 		}
 	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;
 		}
 	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;
 			}
 		}
 	if(sigfile && sigkey) {
 		BIO *sigbio;
 		sigbio = BIO_new_file(sigfile, "rb");
@@ -503,82 +310,69 @@ int MAIN(int argc, char **argv)
 			goto end;
 		}
 	}
 	inp=BIO_push(bmd,in);
-	if (md == NULL)
+
-		{
+
-		EVP_MD_CTX *tctx;
+	/* we use md as a filter, reading from 'in' */
-		BIO_get_md_ctx(bmd, &tctx);
+	BIO_set_md(bmd,md);
-		md = EVP_MD_CTX_md(tctx);
+	inp=BIO_push(bmd,in);
 		}
 	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)");
 		}
 	else
 		{
-		const char *md_name = NULL, *sig_name = NULL;
+		name=OBJ_nid2sn(md->type);
 		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)
 				md_name = EVP_MD_name(md);
 			}
 		err = 0;
 		for (i=0; i<argc; i++)
 			{
 			char *tmp,*tofree=NULL;
 			int r;
 			if (BIO_read_filename(in,argv[i]) <= 0)
 				{
 				perror(argv[i]);
 				err++;
 				continue;
 				}
 			if(!out_bin)
 				{
 				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);
 				sprintf(tmp,"%s(%s)= ",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]);
 			if(r)
 			    err=r;
 			if(tofree)
 				OPENSSL_free(tofree);
 			(void)BIO_reset(bmd);
 			}
 		}
 end:
 	if (buf != NULL)
 		{
-		OPENSSL_cleanse(buf,BUFSIZE);
+		memset(buf,0,BUFSIZE);
 		OPENSSL_free(buf);
 		}
 	if (in != NULL) BIO_free(in);
 	if (passin)
 		OPENSSL_free(passin);
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
 	if (sigopts)
 		sk_OPENSSL_STRING_free(sigopts);
 	if (macopts)
 		sk_OPENSSL_STRING_free(macopts);
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
 	apps_shutdown();
-	OPENSSL_EXIT(err);
+	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)
 	  const char *file,BIO *bmd)
 	{
-	size_t len;
+	int len;
 	int i;
 	for (;;)
@@ -596,7 +390,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 		{
 		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)
@@ -616,8 +410,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 		{
 		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);
@@ -625,36 +418,13 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 			}
 		}
 	else
 		{
 		len=BIO_gets(bp,(char *)buf,BUFSIZE);
 		if ((int)len <0)
 			{
 			ERR_print_errors(bio_err);
 			return 1;
 			}
 		}
 	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_write(out,title,strlen(title));
-			{
+		for (i=0; i<len; i++)
 			BIO_puts(out, sig_name);
 			if (md_name)
 				BIO_printf(out, "-%s", md_name);
 			BIO_printf(out, "(%s)= ", file);
 			}
 		else if (md_name)
 			BIO_printf(out, "%s(%s)= ", md_name, file);
 		else
 			BIO_printf(out, "(%s)= ", file);
 		for (i=0; i<(int)len; i++)
 			{
 			if (sep && (i != 0))
 				BIO_printf(out, ":");
--- 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,14 +87,12 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,check=0,noout=0,C=0,ret=1;
-	char *infile,*outfile,*prog;
+	char *infile,*outfile,*prog,*engine;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine;
 #endif
 	apps_startup();
@@ -107,9 +103,7 @@ int MAIN(int argc, char **argv)
 	if (!load_config(bio_err, NULL))
 		goto end;
 #ifndef OPENSSL_NO_ENGINE
 	engine=NULL;
 #endif
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -140,13 +134,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-check") == 0)
 			check=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -178,17 +170,13 @@ bad:
 		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -noout        no output\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		goto end;
 		}
 	ERR_load_crypto_strings();
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	in=BIO_new(BIO_s_file());
 	out=BIO_new(BIO_s_file());
@@ -345,12 +333,6 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	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,13 @@
 * -C
 */
-static int 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)
 	{
 	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int i,badops=0,text=0;
 #ifndef OPENSSL_NO_DSA
@@ -158,10 +157,7 @@ int MAIN(int argc, char **argv)
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,check=0,noout=0,C=0,ret=1;
 	char *infile,*outfile,*prog;
-	char *inrand=NULL;
+	char *inrand=NULL,*engine=NULL;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 	int num = 0, g = 0;
 	apps_startup();
@@ -203,13 +199,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-check") == 0)
 			check=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -254,10 +248,8 @@ bad:
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
 		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
-		BIO_printf(bio_err," numbits       number of bits in to generate (default 2048)\n");
+		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"               the random number generator\n");
@@ -267,9 +259,7 @@ bad:
 	ERR_load_crypto_strings();
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	if (g && !num)
 		num = DEFBITS;
@@ -293,15 +283,6 @@ bad:
 	if(num) {
 		BN_GENCB *cb;
 		cb = BN_GENCB_new();
 		if(!cb)
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		BN_GENCB_set(cb, dh_cb, bio_err);
 		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 			{
 			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
@@ -313,14 +294,12 @@ bad:
 #ifndef OPENSSL_NO_DSA
 		if (dsaparam)
 			{
-			DSA *dsa = DSA_new();
+			DSA *dsa;
 			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
+			dsa = DSA_generate_parameters(num, NULL, 0, NULL, NULL, dh_cb, bio_err);
-						NULL, 0, NULL, NULL, cb))
+			if (dsa == NULL)
 				{
 				if(dsa) DSA_free(dsa);
 				BN_GENCB_free(cb);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -329,7 +308,6 @@ bad:
 			DSA_free(dsa);
 			if (dh == NULL)
 				{
 				BN_GENCB_free(cb);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
@@ -337,18 +315,17 @@ bad:
 		else
 #endif
 			{
 			dh = DH_new();
 			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
 			BIO_printf(bio_err,"This is going to take a long time\n");
-			if(!dh || !DH_generate_parameters_ex(dh, num, g, cb))
+			dh=DH_generate_parameters(num,g,dh_cb,bio_err);
 			if (dh == NULL)
 				{
 				BN_GENCB_free(cb);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			}
 		BN_GENCB_free(cb);
 		app_RAND_write_file(NULL, bio_err);
 	} else {
@@ -524,12 +501,7 @@ bad:
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
-			{
+			i=PEM_write_bio_DHparams(out,dh);
 			if (dh->q)
 				i=PEM_write_bio_DHxparams(out,dh);
 			else
 				i=PEM_write_bio_DHparams(out,dh);
 			}
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
@@ -547,11 +519,11 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
-static int dh_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 	{
 	char c='*';
@@ -559,15 +531,11 @@ static int dh_cb(int p, int n, BN_GENCB *cb)
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
-	BIO_write(BN_GENCB_get_arg(cb),&c,1);
+	BIO_write((BIO *)arg,&c,1);
-	(void)BIO_flush(BN_GENCB_get_arg(cb));
+	(void)BIO_flush((BIO *)arg);
-	return 1;
+#ifdef LINT
 	p=n;
 #endif
 	}
 #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
 */
@@ -105,16 +98,11 @@ int MAIN(int argc, char **argv)
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,text=0,noout=0;
 	int pubin = 0, pubout = 0;
-	char *infile,*outfile,*prog;
+	char *infile,*outfile,*prog,*engine;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine;
 #endif
 	char *passargin = NULL, *passargout = NULL;
 	char *passin = NULL, *passout = NULL;
 	int modulus=0;
 	int pvk_encr = 2;
 	apps_startup();
 	if (bio_err == NULL)
@@ -124,9 +112,7 @@ int MAIN(int argc, char **argv)
 	if (!load_config(bio_err, NULL))
 		goto end;
 #ifndef OPENSSL_NO_ENGINE
 	engine=NULL;
 #endif
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -167,19 +153,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passargout= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-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)
@@ -211,9 +189,7 @@ bad:
 		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");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
 		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
 #ifndef OPENSSL_NO_IDEA
@@ -222,13 +198,6 @@ bad:
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 #endif
 #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");
@@ -238,9 +207,7 @@ bad:
 	ERR_load_crypto_strings();
 #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");
@@ -267,22 +234,16 @@ bad:
 		}
 	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)
 		{
@@ -335,24 +296,11 @@ bad:
 			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
 		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
 							NULL,0,NULL, passout);
 #if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
 	} else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
 		EVP_PKEY *pk;
 		pk = EVP_PKEY_new();
 		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);
@@ -366,12 +314,6 @@ end:
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #else /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 #endif
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -56,8 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 #include <assert.h>
 #include <stdio.h>
@@ -75,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
@@ -85,28 +82,15 @@
 * -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 dsa_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	DSA *dsa=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
@@ -114,14 +98,7 @@ int MAIN(int argc, char **argv)
 	char *infile,*outfile,*prog,*inrand=NULL;
 	int numbits= -1,num,genkey=0;
 	int need_rand=0;
 	int non_fips_allow = 0;
 	BN_GENCB *cb = NULL;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 #ifdef GENCB_TEST
 	int timebomb=0;
 #endif
 	apps_startup();
@@ -162,20 +139,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if(strcmp(*argv, "-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine = *(++argv);
 			}
 #endif
 #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)
@@ -193,8 +161,6 @@ int MAIN(int argc, char **argv)
 			}
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		else if (strcmp(*argv,"-non-fips-allow") == 0)
 			non_fips_allow = 1;
 		else if (sscanf(*argv,"%d",&num) == 1)
 			{
 			/* generate a key */
@@ -225,12 +191,7 @@ bad:
 		BIO_printf(bio_err," -noout        no output\n");
 		BIO_printf(bio_err," -genkey       generate a DSA key\n");
 		BIO_printf(bio_err," -rand         files to use for random number input\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
 #ifdef GENCB_TEST
 		BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
 #endif
 		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
 		goto end;
 		}
@@ -274,9 +235,7 @@ bad:
 			}
 		}
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	if (need_rand)
 		{
@@ -288,55 +247,10 @@ bad:
 	if (numbits > 0)
 		{
 		cb = BN_GENCB_new();
 		if(!cb)
 			{
 			BIO_printf(bio_err,"Error allocating BN_GENCB object\n");
 			goto end;
 			}
 		BN_GENCB_set(cb, dsa_cb, bio_err);
 		assert(need_rand);
 		dsa = DSA_new();
 		if(!dsa)
 			{
 			BIO_printf(bio_err,"Error allocating DSA object\n");
 			goto end;
 			}
 		if (non_fips_allow)
 			dsa->flags |= DSA_FLAG_NON_FIPS_ALLOW;
 		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
 	        BIO_printf(bio_err,"This could take some time\n");
-#ifdef GENCB_TEST
+	        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);
 	}
 #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);
@@ -362,10 +276,12 @@ bad:
 	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)
 			{
@@ -437,21 +353,13 @@ bad:
 		assert(need_rand);
 		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
-		if (non_fips_allow)
+		if (!DSA_generate_key(dsakey)) goto end;
 			dsakey->flags |= DSA_FLAG_NON_FIPS_ALLOW;
 		if (!DSA_generate_key(dsakey))
 			{
 			ERR_print_errors(bio_err);
 			DSA_free(dsakey);
 			goto end;
 			}
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DSAPrivateKey_bio(out,dsakey);
 		else if (outformat == FORMAT_PEM)
 			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			DSA_free(dsakey);
 			goto end;
 			}
 		DSA_free(dsakey);
@@ -460,15 +368,14 @@ bad:
 		app_RAND_write_file(NULL, bio_err);
 	ret=0;
 end:
 	if (cb != NULL) BN_GENCB_free(cb);
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
-static int dsa_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
 	{
 	char c='*';
@@ -476,18 +383,10 @@ static int dsa_cb(int p, int n, BN_GENCB *cb)
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
-	BIO_write(BN_GENCB_get_arg(cb),&c,1);
+	BIO_write(arg,&c,1);
-	(void)BIO_flush(BN_GENCB_get_arg(cb));
+	(void)BIO_flush(arg);
-#ifdef GENCB_TEST
+#ifdef LINT
-	if(stop_keygen_flag)
+	p=n;
 		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,407 +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,735 +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)
 		{
 		if (group == NULL)
 			BIO_printf(bio_err, "no elliptic curve parameters\n");
 		BIO_printf(bio_err, "checking elliptic curve parameters: ");
 		if (!EC_GROUP_check(group, NULL))
 			{
 			BIO_printf(bio_err, "failed\n");
 			ERR_print_errors(bio_err);
 			}
 		else
 			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);
@@ -103,6 +100,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	static const char magic[]="Salted__";
 	char mbuf[sizeof magic-1];
 	char *strbuf=NULL;
@@ -114,24 +112,14 @@ int MAIN(int argc, char **argv)
 	unsigned char salt[PKCS5_SALT_LEN];
 	char *str=NULL, *passarg = NULL, *pass = NULL;
 	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=NULL,*wbio=NULL;
 #define PROG_NAME_SIZE  39
 	char pname[PROG_NAME_SIZE+1];
 #ifndef OPENSSL_NO_ENGINE
 	char *engine = NULL;
 #endif
 	const EVP_MD *dgst=NULL;
 	int non_fips_allow = 0;
 	apps_startup();
@@ -146,18 +134,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;
@@ -184,13 +163,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passarg= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if	(strcmp(*argv,"-d") == 0)
 			enc=0;
 		else if	(strcmp(*argv,"-p") == 0)
@@ -213,10 +190,6 @@ int MAIN(int argc, char **argv)
 			base64=1;
 		else if	(strcmp(*argv,"-base64") == 0)
 			base64=1;
 #ifdef ZLIB
 		else if	(strcmp(*argv,"-z") == 0)
 			do_zlib=1;
 #endif
 		else if (strcmp(*argv,"-bufsize") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -243,12 +216,7 @@ int MAIN(int argc, char **argv)
 				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) &&
@@ -279,13 +247,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			hiv= *(++argv);
 			}
 		else if (strcmp(*argv,"-md") == 0)
 			{
 			if (--argc < 1) goto bad;
 			md= *(++argv);
 			}
 		else if (strcmp(*argv,"-non-fips-allow") == 0)
 			non_fips_allow = 1;
 		else if	((argv[0][0] == '-') &&
 			((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
 			{
@@ -304,18 +265,12 @@ bad:
 			BIO_printf(bio_err,"%-14s encrypt\n","-e");
 			BIO_printf(bio_err,"%-14s decrypt\n","-d");
 			BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
-			BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
+			BIO_printf(bio_err,"%-14s key is the next argument\n","-k");
-			BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
+			BIO_printf(bio_err,"%-14s key is the first line of the file argument\n","-kfile");
 			BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
 			BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
 			BIO_printf(bio_err,"%-14s 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,"%-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,
@@ -329,32 +284,7 @@ bad:
 		argv++;
 		}
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
 		{
 		BIO_printf(bio_err, "AEAD ciphers not supported by the enc utility\n");
 		goto end;
 		}
 	if (cipher && (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE))
 		{
 		BIO_printf(bio_err, "Ciphers in XTS mode are not supported by the enc utility\n");
 		goto end;
 		}
 	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
 		{
 		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
 		goto end;
 		}
 	if (dgst == NULL)
 		{
 		dgst = EVP_md5();
 		}
 	if (bufsize != NULL)
 		{
@@ -379,7 +309,7 @@ bad:
 			}
 		/* It must be large enough for a base64 encoded line */
-		if (base64 && n < 80) n=80;
+		if (n < 80) n=80;
 		bsize=(int)n;
 		if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize);
@@ -404,18 +334,12 @@ bad:
 		{
 		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)
 	        {
 #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)
@@ -439,9 +363,9 @@ bad:
 			{
 			char buf[200];
-			BIO_snprintf(buf,sizeof buf,"enter %s %s password:",
+			sprintf(buf,"enter %s %s password:",
-				     OBJ_nid2ln(EVP_CIPHER_nid(cipher)),
+				OBJ_nid2ln(EVP_CIPHER_nid(cipher)),
-				     (enc)?"encryption":"decryption");
+				(enc)?"encryption":"decryption");
 			strbuf[0]='\0';
 			i=EVP_read_pw_string((char *)strbuf,SIZE,buf,enc);
 			if (i == 0)
@@ -466,10 +390,6 @@ bad:
 	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());
@@ -489,19 +409,6 @@ bad:
 	rbio=in;
 	wbio=out;
 #ifdef ZLIB
 	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)
@@ -509,7 +416,7 @@ bad:
 		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);
@@ -566,29 +473,24 @@ bad:
 				sptr = salt;
 			}
-			if (!EVP_BytesToKey(cipher,dgst,sptr,
+			EVP_BytesToKey(cipher,EVP_md5(),sptr,
-					    (unsigned char *)str,
+				(unsigned char *)str,
-					    strlen(str),1,key,iv))
+				strlen(str),1,key,iv);
 				{
 				BIO_printf(bio_err, "EVP_BytesToKey failed\n");
 				goto end;
 				}
 			/* zero the complete buffer or the string
 			 * passed from the command line
 			 * bug picked up by
 			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 			if (str == strbuf)
-				OPENSSL_cleanse(str,SIZE);
+				memset(str,0,SIZE);
 			else
-				OPENSSL_cleanse(str,strlen(str));
+				memset(str,0,strlen(str));
 			}
 		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
 			{
 			BIO_printf(bio_err,"invalid hex iv value\n");
 			goto end;
 			}
-		if ((hiv == NULL) && (str == NULL)
+		if ((hiv == NULL) && (str == NULL))
 		    && EVP_CIPHER_iv_length(cipher) != 0)
 			{
 			/* No IV was explicitly set and no IV was generated
 			 * during EVP_BytesToKey. Hence the IV is undefined,
@@ -604,40 +506,17 @@ bad:
 		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
 			goto end;
-
+		BIO_set_cipher(benc,cipher,key,iv,enc);
 		/* Since we may be changing parameters work on the encryption
 		 * context rather than calling BIO_set_cipher().
 		 */
 		BIO_get_cipher_ctx(benc, &ctx);
 		if (non_fips_allow)
 			EVP_CIPHER_CTX_set_flags(ctx,
 				EVP_CIPH_FLAG_NON_FIPS_ALLOW);
 		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 (nopad)
 			EVP_CIPHER_CTX_set_padding(ctx, 0);
 		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
 			{
-			BIO_printf(bio_err, "Error setting cipher %s\n",
+			EVP_CIPHER_CTX *ctx;
-				EVP_CIPHER_name(cipher));
+			BIO_get_cipher_ctx(benc, &ctx);
-			ERR_print_errors(bio_err);
+			EVP_CIPHER_CTX_set_padding(ctx, 0);
 			goto end;
 			}
 		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)
@@ -645,7 +524,7 @@ bad:
 			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");
 				}
@@ -705,12 +584,9 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (benc != NULL) BIO_free(benc);
 	if (b64 != NULL) BIO_free(b64);
 #ifdef ZLIB
 	if (bzl != NULL) BIO_free(bzl);
 #endif
 	if(pass) OPENSSL_free(pass);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 int set_hex(char *in, unsigned char *out, int size)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -56,28 +56,28 @@
 *
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
 #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",
@@ -89,7 +89,7 @@ static const char *engine_usage[]={
 NULL
 };
-static void identity(char *ptr)
+static void identity(void *ptr)
 	{
 	return;
 	}
@@ -120,8 +120,8 @@ static int append_buf(char **buf, const char *s, int *size, int step)
 		return 0;
 	if (**buf != '\0')
-		BUF_strlcat(*buf, ", ", *size);
+		strcat(*buf, ", ");
-	BUF_strlcat(*buf, s, *size);
+	strcat(*buf, s);
 	return 1;
 	}
@@ -145,6 +145,11 @@ static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
 	if(flags & ENGINE_CMD_FLAG_NUMERIC)
 		{
 		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "NUMERIC");
 		started = 1;
 		}
@@ -197,7 +202,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
 	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))
@@ -208,7 +213,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
 		return 1;
 		}
-	cmds = sk_OPENSSL_STRING_new_null();
+	cmds = sk_new_null();
 	if(!cmds)
 		goto err;
@@ -244,7 +249,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
                        /* Now decide on the output */
                        if(xpos == 0)
                                /* Do an indent */
-                                xpos = BIO_puts(bio_out, indent);
+                                xpos = BIO_printf(bio_out, indent);
                        else
                                /* Otherwise prepend a ", " */
                                xpos += BIO_printf(bio_out, ", ");
@@ -255,7 +260,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
 					(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);
                                }
@@ -281,17 +286,15 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
 		BIO_printf(bio_out, "\n");
 	ret = 1;
 err:
-	if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity);
+	if(cmds) sk_pop_free(cmds, identity);
 	if(name) OPENSSL_free(name);
 	if(desc) OPENSSL_free(desc);
 	return ret;
 	}
-static void util_do_cmds(ENGINE *e, STACK_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_OPENSSL_STRING_num(cmds);
+	int loop, res, num = sk_num(cmds);
 	if(num < 0)
 		{
 		BIO_printf(bio_out, "[Error]: internal stack error\n");
@@ -301,7 +304,7 @@ static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
 		{
 		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)
@@ -338,12 +341,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 = "     ";
@@ -377,33 +380,23 @@ int MAIN(int argc, char **argv)
 			}
 		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))
 				goto skip_arg_loop;
 			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
 				goto skip_arg_loop;
 			}
 		else if (strcmp(*argv,"-pre") == 0)
 			{
 			argc--; argv++;
-			if (argc == 0)
+			sk_push(pre_cmds,*argv);
 				goto skip_arg_loop;
 			sk_OPENSSL_STRING_push(pre_cmds,*argv);
 			}
 		else if (strcmp(*argv,"-post") == 0)
 			{
 			argc--; argv++;
-			if (argc == 0)
+			sk_push(post_cmds,*argv);
 				goto skip_arg_loop;
 			sk_OPENSSL_STRING_push(post_cmds,*argv);
 			}
 		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++;
 		}
@@ -418,17 +411,17 @@ skip_arg_loop:
 		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));
+			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);
+		const char *id = sk_value(engines,i);
 		if ((e = ENGINE_by_id(id)) != NULL)
 			{
 			const char *name = ENGINE_get_name(e);
@@ -448,7 +441,6 @@ skip_arg_loop:
 				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",
@@ -487,15 +479,6 @@ skip_ciphers:
 						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);
@@ -513,8 +496,7 @@ skip_pmeths:
 				else
 					{
 					BIO_printf(bio_out, "[ unavailable ]\n");
-					if(test_avail_noise)
+					ERR_print_errors_fp(stdout);
 						ERR_print_errors_fp(stdout);
 					ERR_clear_error();
 					}
 				}
@@ -528,19 +510,11 @@ skip_pmeths:
 	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) BIO_free_all(bio_out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #else
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 #endif
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -97,12 +97,10 @@ int MAIN(int argc, char **argv)
 			out = BIO_push(tmpbio, out);
 			}
 #endif
-			lh_ERR_STRING_DATA_node_stats_bio(
+			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
-						  ERR_get_string_table(), out);
+			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
-			lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(),
+			lh_node_usage_stats_bio((LHASH *)
-						     out);
+				ERR_get_string_table(),out);
 			lh_ERR_STRING_DATA_node_usage_stats_bio(
 						    ERR_get_string_table(),out);
 			}
 		if (out != NULL) BIO_free_all(out);
 		argc--;
@@ -124,5 +122,5 @@ int MAIN(int argc, char **argv)
 			}
 		}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -57,8 +57,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <string.h>
@@ -73,25 +71,23 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#define DEFBITS	2048
+#define DEFBITS	512
 #undef PROG
 #define PROG gendh_main
-static int 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=NULL;
+	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int ret=1,num=DEFBITS;
 	int g=2;
 	char *outfile=NULL;
 	char *inrand=NULL;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 	BIO *out=NULL;
 	apps_startup();
@@ -100,12 +96,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 	cb = BN_GENCB_new();
 	if(!cb)
 		goto end;
 	BN_GENCB_set(cb, dh_cb, bio_err);
 	if (!load_config(bio_err, NULL))
 		goto end;
@@ -125,13 +115,11 @@ int MAIN(int argc, char **argv)
 			g=3; */
 		else if (strcmp(*argv,"-5") == 0)
 			g=5;
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -150,18 +138,14 @@ bad:
 		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
 	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
 		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
 		goto end;
 		}
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	out=BIO_new(BIO_s_file());
 	if (out == NULL)
@@ -199,9 +183,9 @@ bad:
 	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");
 	dh=DH_generate_parameters(num,g,dh_cb,bio_err);
-	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, cb))
+	if (dh == NULL) goto end;
 		goto end;
 	app_RAND_write_file(NULL, bio_err);
@@ -213,12 +197,11 @@ end:
 		ERR_print_errors(bio_err);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	if (cb != NULL) BN_GENCB_free(cb);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
-static int dh_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
 	{
 	char c='*';
@@ -226,14 +209,10 @@ static int dh_cb(int p, int n, BN_GENCB *cb)
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
-	BIO_write(BN_GENCB_get_arg(cb),&c,1);
+	BIO_write((BIO *)arg,&c,1);
-	(void)BIO_flush(BN_GENCB_get_arg(cb));
+	(void)BIO_flush((BIO *)arg);
-	return 1;
+#ifdef LINT
-	}
+	p=n;
-#else /* !OPENSSL_NO_DH */
+#endif
-
+	}
 # 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,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	DSA *dsa=NULL;
 	int ret=1;
 	char *outfile=NULL;
@@ -85,9 +85,7 @@ int MAIN(int argc, char **argv)
 	char *passargout = NULL, *passout = NULL;
 	BIO *out=NULL,*in=NULL;
 	const EVP_CIPHER *enc=NULL;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 	apps_startup();
@@ -113,13 +111,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passargout= *(++argv);
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -137,10 +133,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();
@@ -148,14 +140,6 @@ int MAIN(int argc, char **argv)
 			enc=EVP_aes_192_cbc();
 		else if (strcmp(*argv,"-aes256") == 0)
 			enc=EVP_aes_256_cbc();
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		else if (strcmp(*argv,"-camellia128") == 0)
 			enc=EVP_camellia_128_cbc();
 		else if (strcmp(*argv,"-camellia192") == 0)
 			enc=EVP_camellia_192_cbc();
 		else if (strcmp(*argv,"-camellia256") == 0)
 			enc=EVP_camellia_256_cbc();
 #endif
 		else if (**argv != '-' && dsaparams == NULL)
 			{
@@ -179,21 +163,11 @@ bad:
 #ifndef OPENSSL_NO_IDEA
 		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #endif
 #ifndef OPENSSL_NO_SEED
 		BIO_printf(bio_err," -seed\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 #endif
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
@@ -202,9 +176,7 @@ bad:
 		goto end;
 		}
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
@@ -274,12 +246,6 @@ end:
 	if (dsa != NULL) DSA_free(dsa);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #else /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 #endif
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,437 +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);
 	return 1;
 	}
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -56,8 +56,6 @@
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include <string.h>
@@ -73,44 +71,31 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
-#define DEFBITS	2048
+#define DEFBITS	512
 #undef PROG
 #define PROG genrsa_main
-static int 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 = NULL;
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	int ret=1;
-	int non_fips_allow = 0;
+	RSA *rsa=NULL;
-	int num=DEFBITS;
+	int i,num=DEFBITS;
 	long l;
 	const EVP_CIPHER *enc=NULL;
 	unsigned long f4=RSA_F4;
 	char *outfile=NULL;
 	char *passargout = NULL, *passout = NULL;
 	char *hexe, *dece;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 	char *inrand=NULL;
 	BIO *out=NULL;
 	BIGNUM *bn = BN_new();
 	RSA *rsa = NULL;
 	if(!bn) goto err;
 	cb = BN_GENCB_new();
 	if(!cb) 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)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
@@ -137,13 +122,11 @@ int MAIN(int argc, char **argv)
 			f4=3;
 		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
 			f4=RSA_F4;
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -159,10 +142,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();
@@ -170,22 +149,12 @@ int MAIN(int argc, char **argv)
 			enc=EVP_aes_192_cbc();
 		else if (strcmp(*argv,"-aes256") == 0)
 			enc=EVP_aes_256_cbc();
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		else if (strcmp(*argv,"-camellia128") == 0)
 			enc=EVP_camellia_128_cbc();
 		else if (strcmp(*argv,"-camellia192") == 0)
 			enc=EVP_camellia_192_cbc();
 		else if (strcmp(*argv,"-camellia256") == 0)
 			enc=EVP_camellia_256_cbc();
 #endif
 		else if (strcmp(*argv,"-passout") == 0)
 			{
 			if (--argc < 1) goto bad;
 			passargout= *(++argv);
 			}
 		else if (strcmp(*argv,"-non-fips-allow") == 0)
 			non_fips_allow = 1;
 		else
 			break;
 		argv++;
@@ -200,25 +169,15 @@ bad:
 #ifndef OPENSSL_NO_IDEA
 		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
 #endif
 #ifndef OPENSSL_NO_SEED
 		BIO_printf(bio_err," -seed\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
 		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
 #endif
 		BIO_printf(bio_err," -out file       output the key to 'file\n");
 		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
 		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
 		BIO_printf(bio_err," -3              use 3 for the E value\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 #endif
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"                 the random number generator\n");
@@ -232,9 +191,7 @@ bad:
 		goto err;
 	}
 #ifndef OPENSSL_NO_ENGINE
        e = setup_engine(bio_err, engine, 0);
 #endif
 	if (outfile == NULL)
 		{
@@ -266,30 +223,24 @@ bad:
 	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
 		num);
-#ifdef OPENSSL_NO_ENGINE
+	rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);
 	rsa = RSA_new();
 #else
 	rsa = RSA_new_method(e);
 #endif
 	if (!rsa)
 		goto err;
 	if (non_fips_allow)
 		rsa->flags |= RSA_FLAG_NON_FIPS_ALLOW;
 	if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, cb))
 		goto err;
 	app_RAND_write_file(NULL, bio_err);
-	hexe = BN_bn2hex(rsa->e);
+	if (rsa == NULL) goto err;
-	dece = BN_bn2dec(rsa->e);
+	
-	if(hexe && dece)
+	/* 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++)
 		{
-		BIO_printf(bio_err,"e is %s (0x%s)\n",dece, hexe);
+#ifndef SIXTY_FOUR_BIT
 		l<<=BN_BITS4;
 		l<<=BN_BITS4;
 #endif
 		l+=rsa->e->d[i];
 		}
-	if(hexe) OPENSSL_free(hexe);
+	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
 	if(dece) OPENSSL_free(dece);
 	{
 	PW_CB_DATA cb_data;
 	cb_data.password = passout;
@@ -301,18 +252,16 @@ bad:
 	ret=0;
 err:
-	if (bn) BN_free(bn);
+	if (rsa != NULL) RSA_free(rsa);
-	if (cb) BN_GENCB_free(cb);
+	if (out != NULL) BIO_free_all(out);
 	if (rsa) RSA_free(rsa);
 	if (out) BIO_free_all(out);
 	if(passout) OPENSSL_free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
-static int genrsa_cb(int p, int n, BN_GENCB *cb)
+static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
 	{
 	char c='*';
@@ -320,9 +269,11 @@ static int genrsa_cb(int p, int n, BN_GENCB *cb)
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
-	BIO_write(BN_GENCB_get_arg(cb),&c,1);
+	BIO_write((BIO *)arg,&c,1);
-	(void)BIO_flush(BN_GENCB_get_arg(cb));
+	(void)BIO_flush((BIO *)arg);
-	return 1;
+#ifdef LINT
 	p=n;
 #endif
 	}
 #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,23 +136,33 @@ $!
 $ 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"
 $ 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
 $ 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
 $!
@@ -200,158 +172,146 @@ $ 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")
 $ EXTRA_OBJ = FILE_NAME0 - FILE_NAME
 $!
-$!  Create The Executable File Name.
+$! Check To See If We Are At The End Of The File List.
 $!
-$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
+$ IF (FILE_NAME0.EQS.";")
 $!
 $!  Check To See If We Are At The End Of The File List.
 $!
 $ IF (CURRENT_APP.EQS.",")
 $ THEN
 $   IF (PHASE.EQS."LIB")
 $   THEN
 $     PHASE := APP
 $     GOTO RESTART
 $   ELSE
-$     GOTO APP_DONE
+$     GOTO FILE_DONE
 $   ENDIF
 $ ENDIF
 $!
-$!  Increment The Counter.
+$! 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. "APP" .AND. -
     ","+PROGRAMS+"," - (","+F$EDIT(FILE_NAME,"UPCASE")+",") .EQS. ","+PROGRAMS+","
 $ THEN
 $   GOTO NEXT_FILE
 $ ENDIF
 $!
 $! Create The Source File Name.
 $!
 $ SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C"
 $!
 $! Create The Object File Name.
 $!
 $ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
 $!
 $! Create The Executable File Name.
 $!
 $ EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"
 $ ON WARNING THEN GOTO NEXT_FILE
 $!
 $! Check To See If The File We Want To Compile Actually Exists.
 $!
 $ IF (F$SEARCH(SOURCE_FILE).EQS."")
 $ THEN
 $!
 $!  Tell The User That The File Dosen't Exist.
 $!
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Exit The Build.
 $!
 $   GOTO EXIT
 $!
 $! End The File Exist Check.
 $!
 $ ENDIF
 $!
 $! Tell The User What We Are Building.
 $!
 $ IF (PHASE.EQS."LIB")
 $ THEN
 $   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME,".C File."
 $ ELSE
 $   WRITE SYS$OUTPUT "Building The ",FILE_NAME," Application Program."
 $ ENDIF
 $!
-$!  Define A Library File Counter And Set It To "-1".
+$! Compile The File.
 $!  -1 Means The Application File Name Is To Be Used.
 $!
-$   LIB_COUNTER = -1
+$ 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
 $!
-$!  Create a .OPT file for the object files
+$ ON WARNING THEN GOTO NEXT_FILE
 $!
-$   OPEN /WRITE OBJECTS 'EXE_DIR''CURRENT_APP'.OPT
+$ IF (PHASE.EQS."LIB") 
-$!
+$ THEN 
-$!  Top Of The File Loop.
+$   GOTO NEXT_FILE
 $!
 $  NEXT_LIB:
 $!
 $!  O.K, Extract The File Name From The File List.
 $!
 $   IF LIB_COUNTER .GE. 0
 $   THEN
 $     FILE_NAME = F$EDIT(F$ELEMENT(LIB_COUNTER,",",LIB_'CURRENT_APP'),"TRIM")
 $   ELSE
 $     FILE_NAME = CURRENT_APP
 $   ENDIF
 $!
 $!  Check To See If We Are At The End Of The File List.
 $!
 $   IF (FILE_NAME.EQS.",")
 $   THEN
 $     CLOSE OBJECTS
 $     GOTO NEXT_APP
 $   ENDIF
 $!
 $!  Increment The Counter.
 $!
 $   LIB_COUNTER = LIB_COUNTER + 1
 $!
 $!  Create The Source File Name.
 $!
 $   SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C"
 $!
 $!  Create The Object File Name.
 $!
 $   OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
 $   ON WARNING THEN GOTO NEXT_LIB
 $!
 $!  Check To See If The File We Want To Compile Actually Exists.
 $!
 $   IF (F$SEARCH(SOURCE_FILE).EQS."")
 $   THEN
 $!
 $!    Tell The User That The File Dosen't Exist.
 $!
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
 $     WRITE SYS$OUTPUT ""
 $!
 $!    Exit The Build.
 $!
 $     GOTO EXIT
 $!
 $!  End The File Exist Check.
 $!
 $   ENDIF
 $!
 $!  Tell The User What We Are Building.
 $!
 $   IF (PHASE.EQS."LIB")
 $   THEN
 $     WRITE SYS$OUTPUT "Compiling The ",FILE_NAME,".C File."
 $   ELSE
 $     WRITE SYS$OUTPUT "Building The ",FILE_NAME," Application Program."
 $   ENDIF
 $!
 $!  Compile The File.
 $!
 $   ON ERROR THEN GOTO NEXT_LIB
 $   IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
 $   THEN
 $     CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $   ELSE
 $     CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $   ENDIF
 $   WRITE OBJECTS OBJECT_FILE
 $!
 $   GOTO NEXT_LIB
 $ ENDIF
 $!
 $!  Check if this program works well without a TCPIP library
 $!
-$ IF TCPIP_LIB .EQS. "" .AND. TCPIP_PROGRAMS - 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
 $!
@@ -541,15 +501,14 @@ $!
 $ IF (P1.EQS."NODEBUG")
 $ THEN
 $!
-$!  P1 Is NODEBUG, So Compile Without Debugger Information.
+$!   P1 Is NODEBUG, So Compile Without Debugger Information.
 $!
-$   DEBUGGER  = "NODEBUG"
+$    DEBUGGER  = "NODEBUG"
-$   LINKMAP = "NOMAP"
+$    TRACEBACK = "NOTRACEBACK" 
-$   TRACEBACK = "NOTRACEBACK" 
+$    GCC_OPTIMIZE = "OPTIMIZE"
-$   GCC_OPTIMIZE = "OPTIMIZE"
+$    CC_OPTIMIZE = "OPTIMIZE"
-$   CC_OPTIMIZE = "OPTIMIZE"
+$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
-$   WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
+$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
 $   WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
 $!
 $! Else...
 $!
@@ -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,64 +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 = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
+$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX"
 $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
 	CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
 $!
-$! 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
@@ -853,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:[-])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -880,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:[-])" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -896,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
 $!
@@ -919,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:[-])" + 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.
 $!
@@ -933,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
 $!
@@ -965,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
 $!
@@ -991,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
@@ -1011,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
 $!
@@ -1036,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
 $!
@@ -1066,13 +890,13 @@ $ IF COMPILER .EQS. "DECC"
 $ THEN
 $   IF CCDISABLEWARNINGS .NES. ""
 $   THEN
-$     CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
+$     CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
 $   ENDIF
 $ ELSE
 $   CCDISABLEWARNINGS = ""
 $ ENDIF
-$ CC2 = CC + " /DEFINE=(" + CCDEFS + ",_POSIX_C_SOURCE)" + CCDISABLEWARNINGS
+$ CC2 = CC + "/DEFINE=(" + CCDEFS + ",_POSIX_C_SOURCE)" + CCDISABLEWARNINGS
-$ CC = CC + " /DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
+$ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $! Show user the result
 $!
@@ -1138,7 +962,7 @@ $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $! Set up the logical name OPENSSL to point at the include directory
 $!
-$ DEFINE OPENSSL /NOLOG '__INCLUDE'
+$ DEFINE OPENSSL/NOLOG '__INCLUDE'
 $!
 $! Done
 $!
@@ -1146,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. "")
+$ IF __SAVE_OPENSSL .EQS. ""
-$ then
+$ THEN
-$   IF __SAVE_OPENSSL .EQS. ""
+$   DEASSIGN OPENSSL
-$   THEN
+$ ELSE
-$     DEASSIGN OPENSSL
+$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'
-$   ELSE
+$ ENDIF
 $     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,5 +1,5 @@
 /* nseq.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 * project 1999.
 */
 /* ====================================================================
@@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-in file  input file\n");
 		BIO_printf (bio_err, "-out file output file\n");
 		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
-		OPENSSL_EXIT(1);
+		EXIT(1);
 	}
 	if (infile) {
@@ -162,6 +162,6 @@ end:
 	BIO_free_all(out);
 	NETSCAPE_CERT_SEQUENCE_free(seq);
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 }
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1,5 +1,5 @@
 /* ocsp.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 * project 2000.
 */
 /* ====================================================================
@@ -55,67 +55,48 @@
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #ifndef OPENSSL_NO_OCSP
 #ifdef OPENSSL_SYS_VMS
 #define _XOPEN_SOURCE_EXTENDED	/* So fd_set and friends get properly defined
 				   on OpenVMS */
 #endif
 #define USE_SOCKETS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include "apps.h"
-#include "apps.h" /* needs to be included before the openssl headers! */
+#include <openssl/pem.h>
-#include <openssl/e_os2.h>
+#include <openssl/ocsp.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #if defined(NETWARE_CLIB)
 #  ifdef NETWARE_BSDSOCK
 #    include <sys/socket.h>
 #    include <sys/bsdskt.h>
 #  else
 #    include <novsock2.h>
 #  endif
 #elif defined(NETWARE_LIBC)
 #  ifdef NETWARE_BSDSOCK
 #    include <sys/select.h>
 #  else
 #    include <novsock2.h>
 #  endif
 #endif
 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD	(5 * 60)
-static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md, X509 *issuer,
+/* CA index.txt definitions */
 #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 for active */
 #define DB_NUMBER       6
 #define DB_TYPE_REV	'R'
 #define DB_TYPE_EXP	'E'
 #define DB_TYPE_VAL	'V'
 static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids);
-static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD * cert_id_md, X509 *issuer,
+static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids);
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(OPENSSL_STRING) *names,
+				STACK *names, STACK_OF(OCSP_CERTID) *ids,
-			      STACK_OF(OCSP_CERTID) *ids, long nsec,
+				long nsec, long maxage);
 			      long maxage);
-static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
+static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, TXT_DB *db,
-			X509 *ca, X509 *rcert, EVP_PKEY *rkey, const EVP_MD *md,
+			X509 *ca, X509 *rcert, EVP_PKEY *rkey,
 			STACK_OF(X509) *rother, unsigned long flags,
-			int nmin, int ndays, int badsig);
+			int nmin, int ndays);
-static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
+static char **lookup_serial(TXT_DB *db, ASN1_INTEGER *ser);
-static BIO *init_responder(const char *port);
+static BIO *init_responder(char *port);
-static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, const char *port);
+static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port);
 static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);
 static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
 				      const STACK_OF(CONF_VALUE) *headers,
 				      OCSP_REQUEST *req, int req_timeout);
 #undef PROG
 #define PROG ocsp_main
@@ -127,14 +108,12 @@ int MAIN(int argc, char **argv)
 	ENGINE *e = NULL;
 	char **args;
 	char *host = NULL, *port = NULL, *path = "/";
 	char *thost = NULL, *tport = NULL, *tpath = NULL;
 	char *reqin = NULL, *respin = NULL;
 	char *reqout = NULL, *respout = NULL;
 	char *signfile = NULL, *keyfile = NULL;
 	char *rsignfile = NULL, *rkeyfile = NULL;
 	char *outfile = NULL;
 	int add_nonce = 1, noverify = 0, use_ssl = -1;
 	STACK_OF(CONF_VALUE) *headers = NULL;
 	OCSP_REQUEST *req = NULL;
 	OCSP_RESPONSE *resp = NULL;
 	OCSP_BASICRESP *bs = NULL;
@@ -144,39 +123,34 @@ int MAIN(int argc, char **argv)
 	BIO *acbio = NULL, *cbio = NULL;
 	BIO *derbio = NULL;
 	BIO *out = NULL;
 	int req_timeout = -1;
 	int req_text = 0, resp_text = 0;
 	long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
 	char *CAfile = NULL, *CApath = NULL;
 	X509_STORE *store = NULL;
-	X509_VERIFY_PARAM *vpm = NULL;
+	SSL_CTX *ctx = NULL;
 	STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL;
 	char *sign_certfile = NULL, *verify_certfile = NULL, *rcertfile = NULL;
 	unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
 	int ret = 1;
 	int accept_count = -1;
 	int badarg = 0;
 	int badsig = 0;
 	int i;
-	int ignore_err = 0;
+	STACK *reqnames = NULL;
 	STACK_OF(OPENSSL_STRING) *reqnames = NULL;
 	STACK_OF(OCSP_CERTID) *ids = NULL;
 	X509 *rca_cert = NULL;
 	char *ridx_filename = NULL;
 	char *rca_filename = NULL;
-	CA_DB *rdb = NULL;
+	TXT_DB *rdb = NULL;
 	int nmin = 0, ndays = -1;
 	const EVP_MD *cert_id_md = NULL, *rsign_md = NULL;
 	if (bio_err == NULL) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 	if (!load_config(bio_err, NULL))
 		goto end;
 	SSL_load_error_strings();
 	OpenSSL_add_ssl_algorithms();
 	args = argv + 1;
-	reqnames = sk_OPENSSL_STRING_new_null();
+	reqnames = sk_new_null();
 	ids = sk_OCSP_CERTID_new_null();
 	while (!badarg && *args && *args[0] == '-')
 		{
@@ -189,30 +163,8 @@ int MAIN(int argc, char **argv)
 				}
 			else badarg = 1;
 			}
 		else if (!strcmp(*args, "-timeout"))
 			{
 			if (args[1])
 				{
 				args++;
 				req_timeout = atol(*args);
 				if (req_timeout < 0)
 					{
 					BIO_printf(bio_err,
 						"Illegal timeout value %s\n",
 						*args);
 					badarg = 1;
 					}
 				}
 			else badarg = 1;
 			}
 		else if (!strcmp(*args, "-url"))
 			{
 			if (thost)
 				OPENSSL_free(thost);
 			if (tport)
 				OPENSSL_free(tport);
 			if (tpath)
 				OPENSSL_free(tpath);
 			if (args[1])
 				{
 				args++;
@@ -221,9 +173,6 @@ int MAIN(int argc, char **argv)
 					BIO_printf(bio_err, "Error parsing URL\n");
 					badarg = 1;
 					}
 				thost = host;
 				tport = port;
 				tpath = path;
 				}
 			else badarg = 1;
 			}
@@ -245,18 +194,6 @@ int MAIN(int argc, char **argv)
 				}
 			else badarg = 1;
 			}
 		else if (!strcmp(*args, "-header"))
 			{
 			if (args[1] && args[2])
 				{
 				if (!X509V3_add_value(args[1], args[2], &headers))
 					goto end;
 				args += 2;
 				}
 			else badarg = 1;
 			}
 		else if (!strcmp(*args, "-ignore_err"))
 			ignore_err = 1;
 		else if (!strcmp(*args, "-noverify"))
 			noverify = 1;
 		else if (!strcmp(*args, "-nonce"))
@@ -283,8 +220,6 @@ int MAIN(int argc, char **argv)
 			verify_flags |= OCSP_TRUSTOTHER;
 		else if (!strcmp(*args, "-no_intern"))
 			verify_flags |= OCSP_NOINTERN;
 		else if (!strcmp(*args, "-badsig"))
 			badsig = 1;
 		else if (!strcmp(*args, "-text"))
 			{
 			req_text = 1;
@@ -367,12 +302,6 @@ int MAIN(int argc, char **argv)
 				}
 			else badarg = 1;
 			}
 		else if (args_verify(&args, NULL, &badarg, bio_err, &vpm))
 			{
 			if (badarg)
 				goto end;
 			continue;
 			}
 		else if (!strcmp (*args, "-validity_period"))
 			{
 			if (args[1])
@@ -462,10 +391,9 @@ int MAIN(int argc, char **argv)
 				cert = load_cert(bio_err, *args, FORMAT_PEM,
 					NULL, e, "certificate");
 				if(!cert) goto end;
-				if (!cert_id_md) cert_id_md = EVP_sha1();
+				if(!add_ocsp_cert(&req, cert, issuer, ids))
 				if(!add_ocsp_cert(&req, cert, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_OPENSSL_STRING_push(reqnames, *args))
+				if(!sk_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -475,10 +403,9 @@ int MAIN(int argc, char **argv)
 			if (args[1])
 				{
 				args++;
-				if (!cert_id_md) cert_id_md = EVP_sha1();
+				if(!add_ocsp_serial(&req, *args, issuer, ids))
 				if(!add_ocsp_serial(&req, *args, cert_id_md, issuer, ids))
 					goto end;
-				if(!sk_OPENSSL_STRING_push(reqnames, *args))
+				if(!sk_push(reqnames, *args))
 					goto end;
 				}
 			else badarg = 1;
@@ -578,21 +505,7 @@ int MAIN(int argc, char **argv)
 				}
 			else badarg = 1;
 			}
-		else if (!strcmp(*args, "-rmd"))
+		else badarg = 1;
 			{
 			if (args[1])
 				{
 				args++;
 				rsign_md = EVP_get_digestbyname(*args);
 				if (!rsign_md)
 					badarg = 1;
 				}
 			else badarg = 1;
 			}
 		else if ((cert_id_md = EVP_get_digestbyname((*args)+1))==NULL)
 			{
 			badarg = 1;
 			}
 		args++;
 		}
@@ -604,53 +517,50 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "OCSP utility\n");
 		BIO_printf (bio_err, "Usage ocsp [options]\n");
 		BIO_printf (bio_err, "where options are\n");
-		BIO_printf (bio_err, "-out file            output filename\n");
+		BIO_printf (bio_err, "-out file          output filename\n");
-		BIO_printf (bio_err, "-issuer file         issuer certificate\n");
+		BIO_printf (bio_err, "-issuer file       issuer certificate\n");
-		BIO_printf (bio_err, "-cert file           certificate to check\n");
+		BIO_printf (bio_err, "-cert file         certificate to check\n");
-		BIO_printf (bio_err, "-serial n            serial number to check\n");
+		BIO_printf (bio_err, "-serial n          serial number to check\n");
-		BIO_printf (bio_err, "-signer file         certificate to sign OCSP request with\n");
+		BIO_printf (bio_err, "-signer file       certificate to sign OCSP request with\n");
-		BIO_printf (bio_err, "-signkey file        private key to sign OCSP request with\n");
+		BIO_printf (bio_err, "-signkey file      private key to sign OCSP request with\n");
-		BIO_printf (bio_err, "-sign_other file     additional certificates to include in signed request\n");
+		BIO_printf (bio_err, "-sign_certs file   additional certificates to include in signed request\n");
-		BIO_printf (bio_err, "-no_certs            don't include any certificates in signed request\n");
+		BIO_printf (bio_err, "-no_certs          don't include any certificates in signed request\n");
-		BIO_printf (bio_err, "-req_text            print text form of request\n");
+		BIO_printf (bio_err, "-req_text          print text form of request\n");
-		BIO_printf (bio_err, "-resp_text           print text form of response\n");
+		BIO_printf (bio_err, "-resp_text         print text form of response\n");
-		BIO_printf (bio_err, "-text                print text form of request and response\n");
+		BIO_printf (bio_err, "-text              print text form of request and response\n");
-		BIO_printf (bio_err, "-reqout file         write DER encoded OCSP request to \"file\"\n");
+		BIO_printf (bio_err, "-reqout file       write DER encoded OCSP request to \"file\"\n");
-		BIO_printf (bio_err, "-respout file        write DER encoded OCSP reponse to \"file\"\n");
+		BIO_printf (bio_err, "-respout file      write DER encoded OCSP reponse to \"file\"\n");
-		BIO_printf (bio_err, "-reqin file          read DER encoded OCSP request from \"file\"\n");
+		BIO_printf (bio_err, "-reqin file        read DER encoded OCSP request from \"file\"\n");
-		BIO_printf (bio_err, "-respin file         read DER encoded OCSP reponse from \"file\"\n");
+		BIO_printf (bio_err, "-respin file       read DER encoded OCSP reponse from \"file\"\n");
-		BIO_printf (bio_err, "-nonce               add OCSP nonce to request\n");
+		BIO_printf (bio_err, "-nonce             add OCSP nonce to request\n");
-		BIO_printf (bio_err, "-no_nonce            don't add OCSP nonce to request\n");
+		BIO_printf (bio_err, "-no_nonce          don't add OCSP nonce to request\n");
-		BIO_printf (bio_err, "-url URL             OCSP responder URL\n");
+		BIO_printf (bio_err, "-url URL           OCSP responder URL\n");
-		BIO_printf (bio_err, "-host host:n         send OCSP request to host on port n\n");
+		BIO_printf (bio_err, "-host host:n       send OCSP request to host on port n\n");
-		BIO_printf (bio_err, "-path                path to use in OCSP request\n");
+		BIO_printf (bio_err, "-path              path to use in OCSP request\n");
-		BIO_printf (bio_err, "-CApath dir          trusted certificates directory\n");
+		BIO_printf (bio_err, "-CApath dir        trusted certificates directory\n");
-		BIO_printf (bio_err, "-CAfile file         trusted certificates file\n");
+		BIO_printf (bio_err, "-CAfile file       trusted certificates file\n");
-		BIO_printf (bio_err, "-trusted_first       use locally trusted CA's first when building trust chain\n");
+		BIO_printf (bio_err, "-VAfile file       validator certificates file\n");
-		BIO_printf (bio_err, "-VAfile file         validator certificates file\n");
+		BIO_printf (bio_err, "-validity_period n maximum validity discrepancy in seconds\n");
-		BIO_printf (bio_err, "-validity_period n   maximum validity discrepancy in seconds\n");
+		BIO_printf (bio_err, "-status_age n      maximum status age in seconds\n");
-		BIO_printf (bio_err, "-status_age n        maximum status age in seconds\n");
+		BIO_printf (bio_err, "-noverify          don't verify response at all\n");
-		BIO_printf (bio_err, "-noverify            don't verify response at all\n");
+		BIO_printf (bio_err, "-verify_certs file additional certificates to search for signer\n");
-		BIO_printf (bio_err, "-verify_other file   additional certificates to search for signer\n");
+		BIO_printf (bio_err, "-trust_other       don't verify additional certificates\n");
-		BIO_printf (bio_err, "-trust_other         don't verify additional certificates\n");
+		BIO_printf (bio_err, "-no_intern         don't search certificates contained in response for signer\n");
-		BIO_printf (bio_err, "-no_intern           don't search certificates contained in response for signer\n");
+		BIO_printf (bio_err, "-no_sig_verify     don't check signature on response\n");
-		BIO_printf (bio_err, "-no_signature_verify don't check signature on response\n");
+		BIO_printf (bio_err, "-no_cert_verify    don't check signing certificate\n");
-		BIO_printf (bio_err, "-no_cert_verify      don't check signing certificate\n");
+		BIO_printf (bio_err, "-no_chain          don't chain verify response\n");
-		BIO_printf (bio_err, "-no_chain            don't chain verify response\n");
+		BIO_printf (bio_err, "-no_cert_checks    don't do additional checks on signing certificate\n");
-		BIO_printf (bio_err, "-no_cert_checks      don't do additional checks on signing certificate\n");
+		BIO_printf (bio_err, "-port num		 port to run responder on\n");
-		BIO_printf (bio_err, "-port num            port to run responder on\n");
+		BIO_printf (bio_err, "-index file	 certificate status index file\n");
-		BIO_printf (bio_err, "-index file          certificate status index file\n");
+		BIO_printf (bio_err, "-CA file		 CA certificate\n");
-		BIO_printf (bio_err, "-CA file             CA certificate\n");
+		BIO_printf (bio_err, "-rsigner file	 responder certificate to sign responses with\n");
-		BIO_printf (bio_err, "-rsigner file        responder certificate to sign responses with\n");
+		BIO_printf (bio_err, "-rkey file	 responder key to sign responses with\n");
-		BIO_printf (bio_err, "-rkey file           responder key to sign responses with\n");
+		BIO_printf (bio_err, "-rother file	 other certificates to include in response\n");
-		BIO_printf (bio_err, "-rother file         other certificates to include in response\n");
+		BIO_printf (bio_err, "-resp_no_certs     don't include any certificates in response\n");
-		BIO_printf (bio_err, "-resp_no_certs       don't include any certificates in response\n");
+		BIO_printf (bio_err, "-nmin n	 	 number of minutes before next update\n");
-		BIO_printf (bio_err, "-nmin n              number of minutes before next update\n");
+		BIO_printf (bio_err, "-ndays n	 	 number of days before next update\n");
-		BIO_printf (bio_err, "-ndays n             number of days before next update\n");
+		BIO_printf (bio_err, "-resp_key_id       identify reponse by signing certificate key ID\n");
-		BIO_printf (bio_err, "-resp_key_id         identify reponse by signing certificate key ID\n");
+		BIO_printf (bio_err, "-nrequest n        number of requests to accept (default unlimited)\n");
 		BIO_printf (bio_err, "-nrequest n          number of requests to accept (default unlimited)\n");
 		BIO_printf (bio_err, "-<dgst alg>          use specified digest in the request\n");
 		BIO_printf (bio_err, "-timeout n           timeout connection to OCSP responder after n seconds\n");
 		goto end;
 		}
@@ -667,10 +577,7 @@ int MAIN(int argc, char **argv)
 	if (!req && reqin)
 		{
-		if (!strcmp(reqin, "-"))
+		derbio = BIO_new_file(reqin, "rb");
 			derbio = BIO_new_fp(stdin, BIO_NOCLOSE);
 		else
 			derbio = BIO_new_file(reqin, "rb");
 		if (!derbio)
 			{
 			BIO_printf(bio_err, "Error Opening OCSP request file\n");
@@ -760,8 +667,7 @@ int MAIN(int argc, char **argv)
 			"signer private key");
 		if (!key)
 			goto end;
-
+		if (!OCSP_request_sign(req, signer, key, EVP_sha1(), sign_other, sign_flags))
 		if (!OCSP_request_sign(req, signer, key, NULL, sign_other, sign_flags))
 			{
 			BIO_printf(bio_err, "Error signing OCSP request\n");
 			goto end;
@@ -772,10 +678,7 @@ int MAIN(int argc, char **argv)
 	if (reqout)
 		{
-		if (!strcmp(reqout, "-"))
+		derbio = BIO_new_file(reqout, "wb");
 			derbio = BIO_new_fp(stdout, BIO_NOCLOSE);
 		else
 			derbio = BIO_new_file(reqout, "wb");
 		if(!derbio)
 			{
 			BIO_printf(bio_err, "Error opening file %s\n", reqout);
@@ -793,35 +696,64 @@ int MAIN(int argc, char **argv)
 	if (ridx_filename && !rdb)
 		{
-		rdb = load_index(ridx_filename, NULL);
+		BIO *db_bio = NULL;
-		if (!rdb) goto end;
+		db_bio = BIO_new_file(ridx_filename, "r");
-		if (!index_index(rdb)) goto end;
+		if (!db_bio)
 			{
 			BIO_printf(bio_err, "Error opening index file %s\n", ridx_filename);
 			goto end;
 			}
 		rdb = TXT_DB_read(db_bio, DB_NUMBER);
 		BIO_free(db_bio);
 		if (!rdb)
 			{
 			BIO_printf(bio_err, "Error reading index file %s\n", ridx_filename);
 			goto end;
 			}
 		if (!make_serial_index(rdb))
 			goto end;
 		}
 	if (rdb)
 		{
-		i = make_ocsp_response(&resp, req, rdb, rca_cert, rsigner, rkey,rsign_md, rother, rflags, nmin, ndays, badsig);
+		i = make_ocsp_response(&resp, req, rdb, rca_cert, rsigner, rkey, rother, rflags, nmin, ndays);
 		if (cbio)
 			send_ocsp_response(cbio, resp);
 		}
 	else if (host)
 		{
-#ifndef OPENSSL_NO_SOCK
+		cbio = BIO_new_connect(host);
-		resp = process_responder(bio_err, req, host, path,
+		if (!cbio)
-					port, use_ssl, headers, req_timeout);
+			{
-		if (!resp)
+			BIO_printf(bio_err, "Error creating connect BIO\n");
 			goto end;
-#else
+			}
-		BIO_printf(bio_err, "Error creating connect BIO - sockets not supported.\n");
+		if (port) BIO_set_conn_port(cbio, port);
-		goto end;
+		if (use_ssl == 1)
-#endif
+			{
 			BIO *sbio;
 			ctx = SSL_CTX_new(SSLv23_client_method());
 			SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
 			sbio = BIO_new_ssl(ctx, 1);
 			cbio = BIO_push(sbio, cbio);
 			}
 		if (BIO_do_connect(cbio) <= 0)
 			{
 			BIO_printf(bio_err, "Error connecting BIO\n");
 			goto end;
 			}
 		resp = OCSP_sendreq_bio(cbio, path, req);
 		BIO_free_all(cbio);
 		cbio = NULL;
 		if (!resp)
 			{
 			BIO_printf(bio_err, "Error querying OCSP responsder\n");
 			goto end;
 			}
 		}
 	else if (respin)
 		{
-		if (!strcmp(respin, "-"))
+		derbio = BIO_new_file(respin, "rb");
 			derbio = BIO_new_fp(stdin, BIO_NOCLOSE);
 		else
 			derbio = BIO_new_file(respin, "rb");
 		if (!derbio)
 			{
 			BIO_printf(bio_err, "Error Opening OCSP response file\n");
@@ -846,10 +778,7 @@ int MAIN(int argc, char **argv)
 	if (respout)
 		{
-		if (!strcmp(respout, "-"))
+		derbio = BIO_new_file(respout, "wb");
 			derbio = BIO_new_fp(stdout, BIO_NOCLOSE);
 		else
 			derbio = BIO_new_file(respout, "wb");
 		if(!derbio)
 			{
 			BIO_printf(bio_err, "Error opening file %s\n", respout);
@@ -863,10 +792,8 @@ int MAIN(int argc, char **argv)
 	if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL)
 		{
-		BIO_printf(out, "Responder Error: %s (%d)\n",
+		BIO_printf(out, "Responder Error: %s (%ld)\n",
 				OCSP_response_status_str(i), i);
 		if (ignore_err)
 			goto redo_accept;
 		ret = 0;
 		goto end;
 		}
@@ -889,12 +816,6 @@ int MAIN(int argc, char **argv)
 			resp = NULL;
 			goto redo_accept;
 			}
 		ret = 0;
 		goto end;
 		}
 	else if (ridx_filename)
 		{
 		ret = 0;
 		goto end;
 		}
@@ -902,8 +823,6 @@ int MAIN(int argc, char **argv)
 		store = setup_verify(bio_err, CAfile, CApath);
 	if (!store)
 		goto end;
 	if (vpm)
 		X509_STORE_set1_param(store, vpm);
 	if (verify_certfile)
 		{
 		verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
@@ -919,8 +838,6 @@ int MAIN(int argc, char **argv)
 		goto end;
 		}
 	ret = 0;
 	if (!noverify)
 		{
 		if (req && ((i = OCSP_check_nonce(req, bs)) <= 0))
@@ -930,17 +847,17 @@ int MAIN(int argc, char **argv)
 			else
 				{
 				BIO_printf(bio_err, "Nonce Verify error\n");
 				ret = 1;
 				goto end;
 				}
 			}
 		i = OCSP_basic_verify(bs, verify_other, store, verify_flags);
                if (i < 0) i = OCSP_basic_verify(bs, NULL, store, 0);
 		if(i <= 0)
 			{
-			BIO_printf(bio_err, "Response Verify Failure\n");
+			BIO_printf(bio_err, "Response Verify Failure\n", i);
 			ERR_print_errors(bio_err);
 			ret = 1;
 			}
 		else
 			BIO_printf(bio_err, "Response verify OK\n");
@@ -948,44 +865,44 @@ int MAIN(int argc, char **argv)
 		}
 	if (!print_ocsp_summary(out, bs, req, reqnames, ids, nsec, maxage))
-		ret = 1;
+		goto end;
 	ret = 0;
 end:
 	ERR_print_errors(bio_err);
 	X509_free(signer);
 	X509_STORE_free(store);
 	if (vpm)
 		X509_VERIFY_PARAM_free(vpm);
 	EVP_PKEY_free(key);
 	EVP_PKEY_free(rkey);
 	X509_free(issuer);
 	X509_free(cert);
 	X509_free(rsigner);
 	X509_free(rca_cert);
-	free_index(rdb);
+	TXT_DB_free(rdb);
 	BIO_free_all(cbio);
 	BIO_free_all(acbio);
 	BIO_free(out);
 	OCSP_REQUEST_free(req);
 	OCSP_RESPONSE_free(resp);
 	OCSP_BASICRESP_free(bs);
-	sk_OPENSSL_STRING_free(reqnames);
+	sk_free(reqnames);
 	sk_OCSP_CERTID_free(ids);
 	sk_X509_pop_free(sign_other, X509_free);
 	sk_X509_pop_free(verify_other, X509_free);
 	sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
-	if (thost)
+	if (use_ssl != -1)
-		OPENSSL_free(thost);
+		{
-	if (tport)
+		OPENSSL_free(host);
-		OPENSSL_free(tport);
+		OPENSSL_free(port);
-	if (tpath)
+		OPENSSL_free(path);
-		OPENSSL_free(tpath);
+		SSL_CTX_free(ctx);
 		}
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 }
-static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md,X509 *issuer,
+static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids)
 	{
 	OCSP_CERTID *id;
@@ -996,7 +913,7 @@ static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_m
 		}
 	if(!*req) *req = OCSP_REQUEST_new();
 	if(!*req) goto err;
-	id = OCSP_cert_to_id(cert_id_md, cert, issuer);
+	id = OCSP_cert_to_id(NULL, cert, issuer);
 	if(!id || !sk_OCSP_CERTID_push(ids, id)) goto err;
 	if(!OCSP_request_add0_id(*req, id)) goto err;
 	return 1;
@@ -1006,7 +923,7 @@ static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_m
 	return 0;
 	}
-static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,const EVP_MD *cert_id_md, X509 *issuer,
+static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, X509 *issuer,
 				STACK_OF(OCSP_CERTID) *ids)
 	{
 	OCSP_CERTID *id;
@@ -1028,7 +945,7 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,const EVP_MD *cert_i
 		BIO_printf(bio_err, "Error converting serial number %s\n", serial);
 		return 0;
 		}
-	id = OCSP_cert_id_new(cert_id_md, iname, ikey, sno);
+	id = OCSP_cert_id_new(EVP_sha1(), iname, ikey, sno);
 	ASN1_INTEGER_free(sno);
 	if(!id || !sk_OCSP_CERTID_push(ids, id)) goto err;
 	if(!OCSP_request_add0_id(*req, id)) goto err;
@@ -1040,9 +957,8 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,const EVP_MD *cert_i
 	}
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-			      STACK_OF(OPENSSL_STRING) *names,
+					STACK *names, STACK_OF(OCSP_CERTID) *ids,
-			      STACK_OF(OCSP_CERTID) *ids, long nsec,
+					long nsec, long maxage)
 			      long maxage)
 	{
 	OCSP_CERTID *id;
 	char *name;
@@ -1052,13 +968,13 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
 	ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
-	if (!bs || !req || !sk_OPENSSL_STRING_num(names) || !sk_OCSP_CERTID_num(ids))
+	if (!bs || !req || !sk_num(names) || !sk_OCSP_CERTID_num(ids))
 		return 1;
 	for (i = 0; i < sk_OCSP_CERTID_num(ids); i++)
 		{
 		id = sk_OCSP_CERTID_value(ids, i);
-		name = sk_OPENSSL_STRING_value(names, i);
+		name = sk_value(names, i);
 		BIO_printf(out, "%s: ", name);
 		if(!OCSP_resp_find_status(bs, id, &status, &reason,
@@ -1105,17 +1021,17 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
 	}
-static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
+static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, TXT_DB *db,
-			X509 *ca, X509 *rcert,
+			X509 *ca, X509 *rcert, EVP_PKEY *rkey,
 			EVP_PKEY *rkey, const EVP_MD *rmd,
 			STACK_OF(X509) *rother, unsigned long flags,
-			int nmin, int ndays, int badsig)
+			int nmin, int ndays)
 	{
 	ASN1_TIME *thisupd = NULL, *nextupd = NULL;
 	OCSP_CERTID *cid, *ca_id = NULL;
 	OCSP_BASICRESP *bs = NULL;
 	int i, id_count, ret = 1;
 	id_count = OCSP_request_onereq_count(req);
 	if (id_count <= 0)
@@ -1124,6 +1040,7 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db
 		goto end;
 		}
 	ca_id = OCSP_cert_to_id(EVP_sha1(), NULL, ca);
 	bs = OCSP_BASICRESP_new();
 	thisupd = X509_gmtime_adj(NULL, 0);
@@ -1136,23 +1053,8 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db
 		OCSP_ONEREQ *one;
 		ASN1_INTEGER *serial;
 		char **inf;
 		ASN1_OBJECT *cert_id_md_oid;
 		const EVP_MD *cert_id_md;
 		one = OCSP_request_onereq_get0(req, i);
 		cid = OCSP_onereq_get0_id(one);
 		OCSP_id_get0_info(NULL,&cert_id_md_oid, NULL,NULL, cid);
 		cert_id_md = EVP_get_digestbyobj(cert_id_md_oid);	
 		if (! cert_id_md) 
 			{
 			*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
 				NULL);
 				goto end;
 			}	
 		if (ca_id) OCSP_CERTID_free(ca_id);
 		ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca);
 		/* Is this request about our CA? */
 		if (OCSP_id_issuer_cmp(ca_id, cid))
 			{
@@ -1198,10 +1100,7 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db
 	OCSP_copy_nonce(bs, req);
-	OCSP_basic_sign(bs, rcert, rkey, rmd, rother, flags);
+	OCSP_basic_sign(bs, rcert, rkey, EVP_sha1(), rother, flags);
 	if (badsig)
 		bs->signature->data[bs->signature->length -1] ^= 0x1;
 	*resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
@@ -1214,38 +1113,33 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db
 	}
-static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
+static char **lookup_serial(TXT_DB *db, ASN1_INTEGER *ser)
 	{
 	int i;
 	BIGNUM *bn = NULL;
 	char *itmp, *row[DB_NUMBER],**rrow;
 	for (i = 0; i < DB_NUMBER; i++) row[i] = NULL;
 	bn = ASN1_INTEGER_to_BN(ser,NULL);
 	OPENSSL_assert(bn); /* FIXME: should report an error at this point and abort */
 	if (BN_is_zero(bn))
 		itmp = BUF_strdup("00");
 	else
 		itmp = BN_bn2hex(bn);
 	row[DB_serial] = itmp;
 	BN_free(bn);
-	rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
+	rrow=TXT_DB_get_by_index(db,DB_serial,row);
 	OPENSSL_free(itmp);
 	return rrow;
 	}
 /* Quick and dirty OCSP server: read in and parse input request */
-static BIO *init_responder(const char *port)
+static BIO *init_responder(char *port)
 	{
 	BIO *acbio = NULL, *bufbio = NULL;
 	bufbio = BIO_new(BIO_f_buffer());
 	if (!bufbio) 
 		goto err;
 #ifndef OPENSSL_NO_SOCK
 	acbio = BIO_new_accept(port);
 #else
 	BIO_printf(bio_err, "Error setting up accept BIO - sockets not supported.\n");
 #endif
 	if (!acbio)
 		goto err;
 	BIO_set_accept_bios(acbio, bufbio);
@@ -1266,8 +1160,7 @@ static BIO *init_responder(const char *port)
 	return NULL;
 	}
-static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
+static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port)
 			const char *port)
 	{
 	int have_post = 0, len;
 	OCSP_REQUEST *req = NULL;
@@ -1329,145 +1222,7 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
 		return 0;
 	BIO_printf(cbio, http_resp, i2d_OCSP_RESPONSE(resp, NULL));
 	i2d_OCSP_RESPONSE_bio(cbio, resp);
-	(void)BIO_flush(cbio);
+	BIO_flush(cbio);
 	return 1;
 	}
 static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
 				      const STACK_OF(CONF_VALUE) *headers,
 				      OCSP_REQUEST *req, int req_timeout)
 	{
 	int fd;
 	int rv;
 	int i;
 	OCSP_REQ_CTX *ctx = NULL;
 	OCSP_RESPONSE *rsp = NULL;
 	fd_set confds;
 	struct timeval tv;
 	if (req_timeout != -1)
 		BIO_set_nbio(cbio, 1);
 	rv = BIO_do_connect(cbio);
 	if ((rv <= 0) && ((req_timeout == -1) || !BIO_should_retry(cbio)))
 		{
 		BIO_puts(err, "Error connecting BIO\n");
 		return NULL;
 		}
 	if (BIO_get_fd(cbio, &fd) <= 0)
 		{
 		BIO_puts(err, "Can't get connection fd\n");
 		goto err;
 		}
 	if (req_timeout != -1 && rv <= 0)
 		{
 		FD_ZERO(&confds);
 		openssl_fdset(fd, &confds);
 		tv.tv_usec = 0;
 		tv.tv_sec = req_timeout;
 		rv = select(fd + 1, NULL, (void *)&confds, NULL, &tv);
 		if (rv == 0)
 			{
 			BIO_puts(err, "Timeout on connect\n");
 			return NULL;
 			}
 		}
 	ctx = OCSP_sendreq_new(cbio, path, NULL, -1);
 	if (!ctx)
 		return NULL;
 	for (i = 0; i < sk_CONF_VALUE_num(headers); i++)
 		{
 		CONF_VALUE *hdr = sk_CONF_VALUE_value(headers, i);
 		if (!OCSP_REQ_CTX_add1_header(ctx, hdr->name, hdr->value))
 			goto err;
 		}
 	if (!OCSP_REQ_CTX_set1_req(ctx, req))
 		goto err;
 	for (;;)
 		{
 		rv = OCSP_sendreq_nbio(&rsp, ctx);
 		if (rv != -1)
 			break;
 		if (req_timeout == -1)
 			continue;
 		FD_ZERO(&confds);
 		openssl_fdset(fd, &confds);
 		tv.tv_usec = 0;
 		tv.tv_sec = req_timeout;
 		if (BIO_should_read(cbio))
 			rv = select(fd + 1, (void *)&confds, NULL, NULL, &tv);
 		else if (BIO_should_write(cbio))
 			rv = select(fd + 1, NULL, (void *)&confds, NULL, &tv);
 		else
 			{
 			BIO_puts(err, "Unexpected retry condition\n");
 			goto err;
 			}
 		if (rv == 0)
 			{
 			BIO_puts(err, "Timeout on request\n");
 			break;
 			}
 		if (rv == -1)
 			{
 			BIO_puts(err, "Select error\n");
 			break;
 			}
 		}
 	err:
 	if (ctx)
 		OCSP_REQ_CTX_free(ctx);
 	return rsp;
 	}
 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)
 	{
 	BIO *cbio = NULL;
 	SSL_CTX *ctx = NULL;
 	OCSP_RESPONSE *resp = NULL;
 	cbio = BIO_new_connect(host);
 	if (!cbio)
 		{
 		BIO_printf(err, "Error creating connect BIO\n");
 		goto end;
 		}
 	if (port) BIO_set_conn_port(cbio, port);
 	if (use_ssl == 1)
 		{
 		BIO *sbio;
 		ctx = SSL_CTX_new(SSLv23_client_method());
 		if (ctx == NULL)
 			{
 			BIO_printf(err, "Error creating SSL context.\n");
 			goto end;
 			}
 		SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
 		sbio = BIO_new_ssl(ctx, 1);
 		cbio = BIO_push(sbio, cbio);
 		}
 	resp = query_responder(err, cbio, path, headers, req, req_timeout);
 	if (!resp)
 		BIO_printf(bio_err, "Error querying OCSP responder\n");
 	end:
 	if (cbio)
 		BIO_free_all(cbio);
 	if (ctx)
 		SSL_CTX_free(ctx);
 	return resp;
 	}
 #endif
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -3,13 +3,8 @@
 # This is mostly being used for generation of certificate requests.
 #
 # This definition stops the following lines choking if HOME isn't
 # defined.
 HOME			= .
 RANDFILE		= $ENV::HOME/.rnd
-
+oid_file		= $ENV::HOME/.oid
 # Extra OBJECT IDENTIFIER info:
 #oid_file		= $ENV::HOME/.oid
 oid_section		= new_oids
 # To use this configuration file with the "-extfile" option of the
@@ -21,17 +16,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
@@ -39,40 +29,27 @@ default_ca	= CA_default		# The default ca section
 ####################################################################
 [ CA_default ]
-dir		= sys\$disk:[.demoCA		# Where everything is kept
+dir		= sys\$disk:[.demoCA	# Where everything is kept
 certs		= $dir.certs]		# Where the issued certs are kept
 crl_dir		= $dir.crl]		# Where the issued crl are kept
 database	= $dir]index.txt	# database index file.
-#unique_subject	= no			# Set to 'no' to allow creation of
+new_certs_dir	= $dir.newcerts]	# default place for new certs.
 					# several certs with same subject.
 new_certs_dir	= $dir.newcerts]		# default place for new certs.
 certificate	= $dir]cacert.pem 	# The CA certificate
-serial		= $dir]serial. 		# The current serial number
+serial		= $dir]serial.		# The current serial number
 crlnumber	= $dir]crlnumber.	# the current crl number
 					# must be 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
-x509_extensions	= usr_cert		# The extensions to add to the cert
+x509_extensions	= usr_cert		# The extentions to add to the cert
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
 name_opt 	= ca_default		# Subject Name options
 cert_opt 	= ca_default		# Certificate field options
 # Extension copying option: use with caution.
 # copy_extensions = copy
 # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 # so this is commented out by default to leave a V1 CRL.
 # crlnumber must also be commented out to leave a V1 CRL.
 # crl_extensions	= crl_ext
 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,24 +80,22 @@ emailAddress		= optional
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extensions to add to the self signed cert
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
-# Passwords for private keys if not present they will be prompted for
+# This sets the permitted types in a DirectoryString. There are several
-# input_password = secret
+# options. 
 # output_password = secret
 # 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).
+# nobmp : PrintableString, T61String (no BMPStrings).
 # 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!
 dirstring_type = nobmp
 # req_extensions = v3_req # The extensions to add to a certificate request
@@ -145,11 +120,11 @@ 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
-emailAddress_max		= 64
+emailAddress_max		= 40
 # SET-ex3			= SET extension number 3
@@ -192,14 +167,11 @@ 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.
 # subjectAltName=email:copy
 # An alternative to produce certificates that aren't
 # deprecated according to PKIX.
 # subjectAltName=email:move
 # Copy subject details
 # issuerAltName=issuer:copy
@@ -211,9 +183,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 +200,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,87 +233,4 @@ 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
 # This goes against PKIX guidelines but some CAs do it and some software
 # requires this to avoid interpreting an end user certificate as a CA.
 basicConstraints=CA:FALSE
 # Here are some examples of the usage of nsCertType. If it is omitted
 # the certificate can be used for anything *except* object signing.
 # This is OK for an SSL server.
 # nsCertType			= server
 # For an object signing certificate this would be used.
 # nsCertType = objsign
 # For normal client use this is typical
 # nsCertType = client, email
 # and for everything including object signing:
 # nsCertType = client, email, objsign
 # This is typical in keyUsage for a client certificate.
 # keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 # This will be displayed in Netscape's comment listbox.
 nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
 authorityKeyIdentifier=keyid,issuer
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
 # subjectAltName=email:copy
 # An alternative to produce certificates that aren't
 # deprecated according to PKIX.
 # subjectAltName=email:move
 # Copy subject details
 # issuerAltName=issuer:copy
 #nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
 #nsBaseUrl
 #nsRevocationUrl
 #nsRenewalUrl
 #nsCaPolicyUrl
 #nsSslServerName
 # 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
@@ -117,33 +117,28 @@
 #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>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
 #endif
 /* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
 * base prototypes (we cast each variable inside the function to the required
 * type of "FUNCTION*"). This removes the necessity for 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 */
@@ -166,7 +161,7 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
 		goto err;
 		}
-	if (type < 0 || type >= CRYPTO_NUM_LOCKS)
+	if (type < 0 || type > CRYPTO_NUM_LOCKS)
 		{
 		errstr = "type out of bounds";
 		goto err;
@@ -216,76 +211,21 @@ static void lock_dbg_cb(int mode, int type, const char *file, int 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;
@@ -315,19 +255,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 */
@@ -343,21 +270,9 @@ int main(int Argc, char *ARGV[])
 	i=NCONF_load(config,p,&errline);
 	if (i == 0)
 		{
-		if (ERR_GET_REASON(ERR_peek_last_error())
+		NCONF_free(config);
-		    == CONF_R_NO_SUCH_FILE)
+		config = NULL;
-			{
+		ERR_clear_error();
 			BIO_printf(bio_err,
 				   "WARNING: can't open config file: %s\n",p);
 			ERR_clear_error();
 			NCONF_free(config);
 			config = NULL;
 			}
 		else
 			{
 			ERR_print_errors(bio_err);
 			NCONF_free(config);
 			exit(1);
 			}
 		}
 	prog=prog_init();
@@ -366,7 +281,7 @@ 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)
 		{
 		Argv[0]=pname;
@@ -401,8 +316,7 @@ int main(int Argc, char *ARGV[])
 			else	prompt="OpenSSL> ";
 			fputs(prompt,stdout);
 			fflush(stdout);
-			if (!fgets(p,n,stdin))
+			fgets(p,n,stdin);
 				goto end;
 			if (p[0] == '\0') goto end;
 			i=strlen(p);
 			if (i <= 1) break;
@@ -433,37 +347,25 @@ end:
 		NCONF_free(config);
 		config=NULL;
 		}
-	if (prog != NULL) lh_FUNCTION_free(prog);
+	if (prog != NULL) lh_free(prog);
 	if (arg.data != NULL) OPENSSL_free(arg.data);
 	apps_shutdown();
 	CRYPTO_mem_leaks(bio_err);
 	if (bio_err != NULL)
 		{
 		BIO_free(bio_err);
 		bio_err=NULL;
 		}
-#if defined( OPENSSL_SYS_VMS) && (__INITIAL_POINTER_SIZE == 64)
+	EXIT(ret);
 	/* Free any duplicate Argv[] storage. */
 	if (free_Argv)
 		{
 		OPENSSL_free(Argv);
 		}
 #endif
 	apps_shutdown();
 	CRYPTO_mem_leaks(bio_err);
 	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 *prog, int argc, char *argv[])
 static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 	{
 	FUNCTION f,*fp;
 	int i,ret=1,tp,nl;
@@ -471,22 +373,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 	if ((argc <= 0) || (argv[0] == NULL))
 		{ ret=0; goto end; }
 	f.name=argv[0];
-	fp=lh_FUNCTION_retrieve(prog,&f);
+	fp=(FUNCTION *)lh_retrieve(prog,&f);
 	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);
@@ -501,7 +388,7 @@ 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
@@ -519,10 +406,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 		}
 	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;
@@ -531,12 +415,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);
@@ -547,22 +425,9 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 		}
 #endif
-		if (!load_config(bio_err, NULL))
+		for (fp=functions; fp->name != NULL; fp++)
-			goto end;
+			if (fp->type == list_type)
-
+				BIO_printf(bio_stdout, "%s\n", fp->name);
 		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;
@@ -577,11 +442,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 		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;
@@ -602,11 +463,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
 					BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n");
 					}
 				}
 #ifdef OPENSSL_NO_CAMELLIA
 			BIO_printf(bio_err,"%-15s",fp->name);
 #else
 			BIO_printf(bio_err,"%-18s",fp->name);
 #endif
 			}
 		BIO_printf(bio_err,"\n\n");
 		ret=0;
@@ -625,107 +482,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 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 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)
 	    ;
 	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
@@ -43,19 +38,15 @@ dir		= ./demoCA		# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
 #unique_subject	= no			# Set to 'no' to allow creation of
 					# several certs with same subject.
 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
 					# must be 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
-x509_extensions	= usr_cert		# The extensions to add to the cert
+x509_extensions	= usr_cert		# The extentions to add to the cert
 # Comment out the following two lines for the "traditional"
 # (and highly broken) format.
@@ -67,12 +58,11 @@ cert_opt 	= ca_default		# Certificate field options
 # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 # so this is commented out by default to leave a V1 CRL.
 # crlnumber must also be commented out to leave a V1 CRL.
 # crl_extensions	= crl_ext
 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,11 +93,11 @@ emailAddress		= optional
 ####################################################################
 [ req ]
-default_bits		= 2048
+default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extensions to add to the self signed cert
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # Passwords for private keys if not present they will be prompted for
 # input_password = secret
@@ -115,12 +105,13 @@ x509_extensions	= v3_ca	# The extensions 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 +136,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 +183,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 +202,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 +219,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,87 +252,4 @@ 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
 # This goes against PKIX guidelines but some CAs do it and some software
 # requires this to avoid interpreting an end user certificate as a CA.
 basicConstraints=CA:FALSE
 # Here are some examples of the usage of nsCertType. If it is omitted
 # the certificate can be used for anything *except* object signing.
 # This is OK for an SSL server.
 # nsCertType			= server
 # For an object signing certificate this would be used.
 # nsCertType = objsign
 # For normal client use this is typical
 # nsCertType = client, email
 # and for everything including object signing:
 # nsCertType = client, email, objsign
 # This is typical in keyUsage for a client certificate.
 # keyUsage = nonRepudiation, digitalSignature, keyEncipherment
 # This will be displayed in Netscape's comment listbox.
 nsComment			= "OpenSSL Generated Certificate"
 # PKIX recommendations harmless if included in all certificates.
 subjectKeyIdentifier=hash
 authorityKeyIdentifier=keyid,issuer
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
 # subjectAltName=email:copy
 # An alternative to produce certificates that aren't
 # deprecated according to PKIX.
 # subjectAltName=email:move
 # Copy subject details
 # issuerAltName=issuer:copy
 #nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
 #nsBaseUrl
 #nsRevocationUrl
 #nsRenewalUrl
 #nsCaPolicyUrl
 #nsSslServerName
 # 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
@@ -43,8 +43,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	char *passwd, BIO *out, int quiet, int table, int reverse,
 	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
-/*-
+/* -crypt        - standard Unix password algorithm (default)
 * -crypt        - standard Unix password algorithm (default)
 * -1            - MD5-based password algorithm
 * -apr1         - MD5-based password algorithm, Apache variant
 * -salt string  - salt
@@ -293,7 +292,7 @@ err:
 	if (out)
 		BIO_free_all(out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
@@ -313,8 +312,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
 	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;
@@ -360,13 +358,13 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	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);
 		}
@@ -475,8 +473,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	if ((strlen(passwd) > pw_maxlen))
 		{
 		if (!quiet)
-			/* XXX: really we should know how to print a size_t, not cast it */
+			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", pw_maxlen);
 			BIO_printf(bio_err, "Warning: truncating password to %u characters\n", (unsigned)pw_maxlen);
 		passwd[pw_maxlen] = 0;
 		}
 	assert(strlen(passwd) <= pw_maxlen);
@@ -508,6 +505,6 @@ err:
 int MAIN(int argc, char **argv)
 	{
 	fputs("Program not available.\n", stderr)
-	OPENSSL_EXIT(1);
+	EXIT(1);
 	}
 #endif
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -1,9 +1,11 @@
 /* pkcs12.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
- * project.
+
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 * project 1999.
 */
 /* ====================================================================
- * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999 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
@@ -56,9 +58,6 @@
 *
 */
 #include <openssl/opensslconf.h>
 #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -84,11 +83,10 @@ int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int opti
 int dump_certs_pkeys_bags(BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags, char *pass,
 			  int passlen, int options, char *pempass);
 int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options, char *pempass);
-int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name);
+int print_attribs(BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 int alg_print(BIO *x, X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
 static int set_pbe(BIO *err, int *ppbe, const char *str);
 int MAIN(int, char **);
@@ -101,7 +99,6 @@ int MAIN(int argc, char **argv)
    char **args;
    char *name = NULL;
    char *csp_name = NULL;
    int add_lmk = 0;
    PKCS12 *p12 = NULL;
    char pass[50], macpass[50];
    int export_cert = 0;
@@ -117,16 +114,13 @@ int MAIN(int argc, char **argv)
    int ret = 1;
    int macver = 1;
    int noprompt = 0;
-    STACK_OF(OPENSSL_STRING) *canames = NULL;
+    STACK *canames = NULL;
    char *cpass = NULL, *mpass = NULL;
    char *passargin = NULL, *passargout = NULL, *passarg = NULL;
    char *passin = NULL, *passout = NULL;
    char *inrand = NULL;
    char *macalg = NULL;
    char *CApath = NULL, *CAfile = NULL;
 #ifndef OPENSSL_NO_ENGINE
    char *engine=NULL;
 #endif
    apps_startup();
@@ -156,42 +150,41 @@ int MAIN(int argc, char **argv)
    			cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 		else if (!strcmp (*args, "-export")) export_cert = 1;
 		else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
 		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 #ifndef OPENSSL_NO_IDEA
 		else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
 #endif
-#ifndef OPENSSL_NO_SEED
+		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 		else if (!strcmp(*args, "-seed")) enc=EVP_seed_cbc();
 #endif
 #ifndef OPENSSL_NO_AES
 		else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
 		else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
 		else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 		else if (!strcmp(*args,"-camellia128")) enc=EVP_camellia_128_cbc();
 		else if (!strcmp(*args,"-camellia192")) enc=EVP_camellia_192_cbc();
 		else if (!strcmp(*args,"-camellia256")) enc=EVP_camellia_256_cbc();
 #endif
 		else if (!strcmp (*args, "-noiter")) iter = 1;
 		else if (!strcmp (*args, "-maciter"))
 					 maciter = PKCS12_DEFAULT_ITER;
 		else if (!strcmp (*args, "-nomaciter"))
 					 maciter = 1;
 		else if (!strcmp (*args, "-nomac"))
 					 maciter = -1;
 		else if (!strcmp (*args, "-macalg"))
 		    if (args[1]) {
 			args++;	
 			macalg = *args;
 		    } else badarg = 1;
 		else if (!strcmp (*args, "-nodes")) enc=NULL;
 		else if (!strcmp (*args, "-certpbe")) {
-			if (!set_pbe(bio_err, &cert_pbe, *++args))
+			if (args[1]) {
-				badarg = 1;
+				args++;
 				cert_pbe=OBJ_txt2nid(*args);
 				if(cert_pbe == NID_undef) {
 					BIO_printf(bio_err,
 						 "Unknown PBE algorithm %s\n", *args);
 					badarg = 1;
 				}
 			} else badarg = 1;
 		} else if (!strcmp (*args, "-keypbe")) {
-			if (!set_pbe(bio_err, &key_pbe, *++args))
+			if (args[1]) {
-				badarg = 1;
+				args++;
 				key_pbe=OBJ_txt2nid(*args);
 				if(key_pbe == NID_undef) {
 					BIO_printf(bio_err,
 						 "Unknown PBE algorithm %s\n", *args);
 					badarg = 1;
 				}
 			} else badarg = 1;
 		} else if (!strcmp (*args, "-rand")) {
 		    if (args[1]) {
 			args++;	
@@ -212,9 +205,7 @@ int MAIN(int argc, char **argv)
 			args++;	
 			name = *args;
 		    } else badarg = 1;
-		} else if (!strcmp (*args, "-LMK"))
+		} else if (!strcmp (*args, "-CSP")) {
 			add_lmk = 1;
 		else if (!strcmp (*args, "-CSP")) {
 		    if (args[1]) {
 			args++;	
 			csp_name = *args;
@@ -222,8 +213,8 @@ int MAIN(int argc, char **argv)
 		} else if (!strcmp (*args, "-caname")) {
 		    if (args[1]) {
 			args++;	
-			if (!canames) canames = sk_OPENSSL_STRING_new_null();
+			if (!canames) canames = sk_new_null();
-			sk_OPENSSL_STRING_push(canames, *args);
+			sk_push(canames, *args);
 		    } else badarg = 1;
 		} else if (!strcmp (*args, "-in")) {
 		    if (args[1]) {
@@ -261,13 +252,11 @@ int MAIN(int argc, char **argv)
 			args++;	
 			CAfile = *args;
 		    } else badarg = 1;
 #ifndef OPENSSL_NO_ENGINE
 		} else if (!strcmp(*args,"-engine")) {
 		    if (args[1]) {
 			args++;	
 			engine = *args;
 		    } else badarg = 1;
 #endif
 		} else badarg = 1;
 	} else badarg = 1;
@@ -299,46 +288,30 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_IDEA
 	BIO_printf (bio_err, "-idea         encrypt private keys with idea\n");
 #endif
 #ifndef OPENSSL_NO_SEED
 	BIO_printf (bio_err, "-seed         encrypt private keys with seed\n");
 #endif
 #ifndef OPENSSL_NO_AES
 	BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
 	BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
 	BIO_printf (bio_err, "-camellia128, -camellia192, -camellia256\n");
 	BIO_printf (bio_err, "              encrypt PEM output with cbc camellia\n");
 #endif
 	BIO_printf (bio_err, "-nodes        don't encrypt private keys\n");
 	BIO_printf (bio_err, "-noiter       don't use encryption iteration\n");
 	BIO_printf (bio_err, "-nomaciter    don't use MAC iteration\n");
 	BIO_printf (bio_err, "-maciter      use MAC iteration\n");
 	BIO_printf (bio_err, "-nomac        don't generate MAC\n");
 	BIO_printf (bio_err, "-twopass      separate MAC, encryption passwords\n");
 	BIO_printf (bio_err, "-descert      encrypt PKCS#12 certificates with triple DES (default RC2-40)\n");
 	BIO_printf (bio_err, "-certpbe alg  specify certificate PBE algorithm (default RC2-40)\n");
 	BIO_printf (bio_err, "-keypbe alg   specify private key PBE algorithm (default 3DES)\n");
 	BIO_printf (bio_err, "-macalg alg   digest algorithm used in MAC (default SHA1)\n");
 	BIO_printf (bio_err, "-keyex        set MS key exchange type\n");
 	BIO_printf (bio_err, "-keysig       set MS key signature type\n");
 	BIO_printf (bio_err, "-password p   set import/export password source\n");
 	BIO_printf (bio_err, "-passin p     input file pass phrase source\n");
 	BIO_printf (bio_err, "-passout p    output file pass phrase source\n");
 #ifndef OPENSSL_NO_ENGINE
 	BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
 #endif
 	BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 	BIO_printf(bio_err,  "              load the file (or the files in the directory) into\n");
 	BIO_printf(bio_err,  "              the random number generator\n");
 	BIO_printf(bio_err,  "-CSP name     Microsoft CSP name\n");
 	BIO_printf(bio_err,  "-LMK          Add local machine keyset attribute to private key\n");
    	goto end;
    }
 #ifndef OPENSSL_NO_ENGINE
    e = setup_engine(bio_err, engine, 0);
 #endif
    if(passarg) {
 	if(export_cert) passargout = passarg;
@@ -384,6 +357,24 @@ int MAIN(int argc, char **argv)
 	    goto end;
   }
 #if 0
   if (certfile) {
    	if(!(certsin = BIO_new_file(certfile, "r"))) {
 	    BIO_printf(bio_err, "Can't open certificate file %s\n", certfile);
 	    perror (certfile);
 	    goto end;
 	}
    }
    if (keyname) {
    	if(!(inkey = BIO_new_file(keyname, "r"))) {
 	    BIO_printf(bio_err, "Can't key certificate file %s\n", keyname);
 	    perror (keyname);
 	    goto end;
 	}
     }
 #endif
 #ifdef CRYPTO_MDEBUG
    CRYPTO_pop_info();
    CRYPTO_push_info("write files");
@@ -420,32 +411,27 @@ int MAIN(int argc, char **argv)
    if (export_cert) {
 	EVP_PKEY *key = NULL;
-	X509 *ucert = NULL, *x = NULL;
+	STACK_OF(PKCS12_SAFEBAG) *bags = NULL;
 	STACK_OF(PKCS7) *safes = NULL;
 	PKCS12_SAFEBAG *bag = NULL;
 	PKCS8_PRIV_KEY_INFO *p8 = NULL;
 	PKCS7 *authsafe = NULL;
 	X509 *ucert = NULL;
 	STACK_OF(X509) *certs=NULL;
-	const EVP_MD *macmd = NULL;
+	char *catmp = NULL;
 	unsigned char *catmp = NULL;
 	int i;
-
+	unsigned char keyid[EVP_MAX_MD_SIZE];
-	if ((options & (NOCERTS|NOKEYS)) == (NOCERTS|NOKEYS))
+	unsigned int keyidlen = 0;
 		{	
 		BIO_printf(bio_err, "Nothing to do!\n");
 		goto export_end;
 		}
 	if (options & NOCERTS)
 		chain = 0;
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_push_info("process -export_cert");
 	CRYPTO_push_info("reading private key");
 #endif
-	if (!(options & NOKEYS))
+	key = load_key(bio_err, keyname ? keyname : infile, FORMAT_PEM, 1,
-		{
+		passin, e, "private key");
-		key = load_key(bio_err, keyname ? keyname : infile,
+	if (!key) {
-				FORMAT_PEM, 1, passin, e, "private key");
+		goto export_end;
-		if (!key)
+	}
 			goto export_end;
 		}
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
@@ -453,62 +439,50 @@ int MAIN(int argc, char **argv)
 #endif
 	/* Load in all certs in input file */
-	if(!(options & NOCERTS))
+	if(!(certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
-		{
+		"certificates"))) {
-		certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
+		goto export_end;
-							"certificates");
+	}
 		if (!certs)
 			goto export_end;
 		if (key)
 			{
 			/* Look for matching private key */
 			for(i = 0; i < sk_X509_num(certs); i++)
 				{
 				x = sk_X509_value(certs, i);
 				if(X509_check_private_key(x, key))
 					{
 					ucert = x;
 					/* Zero keyid and alias */
 					X509_keyid_set1(ucert, NULL, 0);
 					X509_alias_set1(ucert, NULL, 0);
 					/* Remove from list */
 					(void)sk_X509_delete(certs, i);
 					break;
 					}
 				}
 			if (!ucert)
 				{
 				BIO_printf(bio_err, "No certificate matches private key\n");
 				goto export_end;
 				}
 			}
 		}
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
 	CRYPTO_push_info("reading certs from input 2");
 #endif
-	/* Add any more certificates asked for */
+	for(i = 0; i < sk_X509_num(certs); i++) {
-	if(certfile)
+		ucert = sk_X509_value(certs, i);
-		{
+		if(X509_check_private_key(ucert, key)) {
-		STACK_OF(X509) *morecerts=NULL;
+			X509_digest(ucert, EVP_sha1(), keyid, &keyidlen);
-		if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
+			break;
-					    NULL, e,
+		}
-					    "certificates from certfile")))
+	}
-			goto export_end;
+	if(!keyidlen) {
-		while(sk_X509_num(morecerts) > 0)
+		ucert = NULL;
-			sk_X509_push(certs, sk_X509_shift(morecerts));
+		BIO_printf(bio_err, "No certificate matches private key\n");
-		sk_X509_free(morecerts);
+		goto export_end;
- 		}
+	}
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
 	CRYPTO_push_info("reading certs from certfile");
 #endif
 	bags = sk_PKCS12_SAFEBAG_new_null ();
 	/* Add any more certificates asked for */
 	if (certfile) {
 		STACK_OF(X509) *morecerts=NULL;
 		if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
 					    NULL, e,
 					    "certificates from certfile"))) {
 			goto export_end;
 		}
 		while(sk_X509_num(morecerts) > 0) {
 			sk_X509_push(certs, sk_X509_shift(morecerts));
 		}
 		sk_X509_free(morecerts);
 	}
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
 	CRYPTO_push_info("building chain");
@@ -538,76 +512,106 @@ int MAIN(int argc, char **argv)
 		    X509_free(sk_X509_value(chain2, 0));
 		    sk_X509_free(chain2);
 		} else {
-			if (vret >= 0)
+			BIO_printf (bio_err, "Error %s getting chain.\n",
 				BIO_printf (bio_err, "Error %s getting chain.\n",
 					X509_verify_cert_error_string(vret));
 			else
 				ERR_print_errors(bio_err);
 			goto export_end;
 		}			
    	}
-	/* Add any CA names */
+#ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
 	CRYPTO_push_info("building bags");
 #endif
-	for (i = 0; i < sk_OPENSSL_STRING_num(canames); i++)
+	/* We now have loads of certificates: include them all */
-		{
+	for(i = 0; i < sk_X509_num(certs); i++) {
-		catmp = (unsigned char *)sk_OPENSSL_STRING_value(canames, i);
+		X509 *cert = NULL;
-		X509_alias_set1(sk_X509_value(certs, i), catmp, -1);
+		cert = sk_X509_value(certs, i);
-		}
+		bag = PKCS12_x5092certbag(cert);
-
+		/* If it matches private key set id */
-	if (csp_name && key)
+		if(cert == ucert) {
-		EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
+			if(name) PKCS12_add_friendlyname(bag, name, -1);
-				MBSTRING_ASC, (unsigned char *)csp_name, -1);
+			PKCS12_add_localkeyid(bag, keyid, keyidlen);
-
+		} else if((catmp = sk_shift(canames))) 
-	if (add_lmk && key)
+				PKCS12_add_friendlyname(bag, catmp, -1);
-		EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
+		sk_PKCS12_SAFEBAG_push(bags, bag);
 	}
 	sk_X509_pop_free(certs, X509_free);
 	certs = NULL;
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
-	CRYPTO_push_info("reading password");
+	CRYPTO_push_info("encrypting bags");
 #endif
 	if(!noprompt &&
-		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1))
+		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1)) {
-		{
+	    BIO_printf (bio_err, "Can't read Password\n");
-	    	BIO_printf (bio_err, "Can't read Password\n");
+	    goto export_end;
-	    	goto export_end;
+        }
-        	}
+	if (!twopass) strcpy(macpass, pass);
-	if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+	/* Turn certbags into encrypted authsafe */
 	authsafe = PKCS12_pack_p7encdata(cert_pbe, cpass, -1, NULL, 0,
 								 iter, bags);
 	sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
 	bags = NULL;
 	if (!authsafe) {
 		ERR_print_errors (bio_err);
 		goto export_end;
 	}
 	safes = sk_PKCS7_new_null ();
 	sk_PKCS7_push (safes, authsafe);
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
-	CRYPTO_push_info("creating PKCS#12 structure");
+	CRYPTO_push_info("building shrouded key bag");
 #endif
-	p12 = PKCS12_create(cpass, name, key, ucert, certs,
+	/* Make a shrouded key bag */
-				key_pbe, cert_pbe, iter, -1, keytype);
+	p8 = EVP_PKEY2PKCS8 (key);
 	if(keytype) PKCS8_add_keyusage(p8, keytype);
 	bag = PKCS12_MAKE_SHKEYBAG(key_pbe, cpass, -1, NULL, 0, iter, p8);
 	PKCS8_PRIV_KEY_INFO_free(p8);
 	p8 = NULL;
        if (name) PKCS12_add_friendlyname (bag, name, -1);
 	if(csp_name) PKCS12_add_CSPName_asc(bag, csp_name, -1);
 	PKCS12_add_localkeyid (bag, keyid, keyidlen);
 	bags = sk_PKCS12_SAFEBAG_new_null();
 	sk_PKCS12_SAFEBAG_push (bags, bag);
-	if (!p12)
+#ifdef CRYPTO_MDEBUG
-		{
+	CRYPTO_pop_info();
-	    	ERR_print_errors (bio_err);
+	CRYPTO_push_info("encrypting shrouded key bag");
-		goto export_end;
+#endif
 		}
-	if (macalg)
+	/* Turn it into unencrypted safe bag */
-		{
+	authsafe = PKCS12_pack_p7data (bags);
-		macmd = EVP_get_digestbyname(macalg);
+	sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
-		if (!macmd)
+	bags = NULL;
-			{
+	sk_PKCS7_push (safes, authsafe);
 			BIO_printf(bio_err, "Unknown digest algorithm %s\n", 
 						macalg);
 			}
 		}
-	if (maciter != -1)
+#ifdef CRYPTO_MDEBUG
-		PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, macmd);
+	CRYPTO_pop_info();
 	CRYPTO_push_info("building pkcs12");
 #endif
 	p12 = PKCS12_init(NID_pkcs7_data);
 	PKCS12_pack_authsafes(p12, safes);
 	sk_PKCS7_pop_free(safes, PKCS7_free);
 	safes = NULL;
 	PKCS12_set_mac (p12, mpass, -1, NULL, 0, maciter, NULL);
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
 	CRYPTO_push_info("writing pkcs12");
 #endif
-	i2d_PKCS12_bio(out, p12);
+	i2d_PKCS12_bio (out, p12);
 	ret = 0;
@@ -620,7 +624,8 @@ int MAIN(int argc, char **argv)
 	if (key) EVP_PKEY_free(key);
 	if (certs) sk_X509_pop_free(certs, X509_free);
-	if (ucert) X509_free(ucert);
+	if (safes) sk_PKCS7_pop_free(safes, PKCS7_free);
 	if (bags) sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
@@ -645,15 +650,15 @@ int MAIN(int argc, char **argv)
    CRYPTO_pop_info();
 #endif
-    if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);
+    if (!twopass) strcpy(macpass, pass);
-    if ((options & INFO) && p12->mac) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1);
+    if (options & INFO) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1);
    if(macver) {
 #ifdef CRYPTO_MDEBUG
    CRYPTO_push_info("verify MAC");
 #endif
 	/* If we enter empty password try no password first */
-	if(!mpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
+	if(!macpass[0] && PKCS12_verify_mac(p12, NULL, 0)) {
 		/* If mac and crypto pass the same set it to NULL too */
 		if(!twopass) cpass = NULL;
 	} else if (!PKCS12_verify_mac(p12, mpass, -1)) {
@@ -687,20 +692,19 @@ int MAIN(int argc, char **argv)
 #endif
    BIO_free(in);
    BIO_free_all(out);
-    if (canames) sk_OPENSSL_STRING_free(canames);
+    if (canames) sk_free(canames);
    if(passin) OPENSSL_free(passin);
    if(passout) OPENSSL_free(passout);
    apps_shutdown();
-    OPENSSL_EXIT(ret);
+    EXIT(ret);
 }
 int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
 	     int passlen, int options, char *pempass)
 {
-	STACK_OF(PKCS7) *asafes = NULL;
+	STACK_OF(PKCS7) *asafes;
 	STACK_OF(PKCS12_SAFEBAG) *bags;
 	int i, bagnid;
 	int ret = 0;
 	PKCS7 *p7;
 	if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
@@ -718,22 +722,16 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
 			}
 			bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
 		} else continue;
-		if (!bags) goto err;
+		if (!bags) return 0;
 	    	if (!dump_certs_pkeys_bags (out, bags, pass, passlen, 
 						 options, pempass)) {
 			sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
-			goto err;
+			return 0;
 		}
 		sk_PKCS12_SAFEBAG_pop_free (bags, PKCS12_SAFEBAG_free);
 		bags = NULL;
 	}
-	ret = 1;
+	sk_PKCS7_pop_free (asafes, PKCS7_free);
-
+	return 1;
 	err:
 	if (asafes)
 		sk_PKCS7_pop_free (asafes, PKCS7_free);
 	return ret;
 }
 int dump_certs_pkeys_bags (BIO *out, STACK_OF(PKCS12_SAFEBAG) *bags,
@@ -828,7 +826,7 @@ int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 {
 	X509_STORE_CTX store_ctx;
 	STACK_OF(X509) *chn;
-	int i = 0;
+	int i;
 	/* FIXME: Should really check the return status of X509_STORE_CTX_init
 	 * for an error, but how that fits into the return value of this
@@ -836,17 +834,13 @@ int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 	X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
 	if (X509_verify_cert(&store_ctx) <= 0) {
 		i = X509_STORE_CTX_get_error (&store_ctx);
 		if (i == 0)
 			/* avoid returning 0 if X509_verify_cert() did not
 			 * set an appropriate error value in the context */
 			i = -1;
 		chn = NULL;
 		goto err;
-	} else
+	}
-		chn = X509_STORE_CTX_get1_chain(&store_ctx);
+	chn =  X509_STORE_CTX_get1_chain(&store_ctx);
 	i = 0;
 	*chain = chn;
 err:
 	X509_STORE_CTX_cleanup(&store_ctx);
 	*chain = chn;
 	return i;
 }	
@@ -854,16 +848,13 @@ err:
 int alg_print (BIO *x, X509_ALGOR *alg)
 {
 	PBEPARAM *pbe;
-	const unsigned char *p;
+	unsigned char *p;
 	p = alg->parameter->value.sequence->data;
-	pbe = d2i_PBEPARAM(NULL, &p, alg->parameter->value.sequence->length);
+	pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);
-	if (!pbe)
+	BIO_printf (bio_err, "%s, Iteration %d\n", 
-		return 1;
+	OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));
 	BIO_printf (bio_err, "%s, Iteration %ld\n", 
 		OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),
 		ASN1_INTEGER_get(pbe->iter));
 	PBEPARAM_free (pbe);
-	return 1;
+	return 0;
 }
 /* Load all certificates from a given file */
@@ -895,7 +886,7 @@ int cert_load(BIO *in, STACK_OF(X509) *sk)
 /* Generalised attribute print: handle PKCS#8 and bag attributes */
-int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
+int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name)
 {
 	X509_ATTRIBUTE *attr;
 	ASN1_TYPE *av;
@@ -923,7 +914,7 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name)
 			av = sk_ASN1_TYPE_value(attr->value.set, 0);
 			switch(av->type) {
 				case V_ASN1_BMPSTRING:
-        			value = OPENSSL_uni2asc(av->value.bmpstring->data,
+        			value = uni2asc(av->value.bmpstring->data,
                                	       av->value.bmpstring->length);
 				BIO_printf(out, "%s\n", value);
 				OPENSSL_free(value);
@@ -956,22 +947,4 @@ void hex_prin(BIO *out, unsigned char *buf, int len)
 	for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]);
 }
 static int set_pbe(BIO *err, int *ppbe, const char *str)
 	{
 	if (!str)
 		return 0;
 	if (!strcmp(str, "NONE"))
 		{
 		*ppbe = -1;
 		return 1;
 		}
 	*ppbe=OBJ_txt2nid(str);
 	if (*ppbe == NID_undef)
 		{
 		BIO_printf(bio_err, "Unknown PBE algorithm %s\n", str);
 		return 0;
 		}
 	return 1;
 	}
 #endif
--- 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,16 +82,15 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	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;
 #endif
 	apps_startup();
@@ -100,9 +98,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 	if (!load_config(bio_err, NULL))
 		goto end;
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -137,17 +132,13 @@ int MAIN(int argc, char **argv)
 			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)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -170,18 +161,14 @@ bad:
 		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
 		BIO_printf(bio_err," -text         print full details of certificates\n");
 		BIO_printf(bio_err," -noout        don't output encoded data\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 #endif
 		ret = 1;
 		goto end;
 		}
 	ERR_load_crypto_strings();
-#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
        setup_engine(bio_err, engine, 0);
 #endif
 	in=BIO_new(BIO_s_file());
 	out=BIO_new(BIO_s_file());
@@ -238,9 +225,6 @@ bad:
 			}
 		}
 	if (p7_print)
 		PKCS7_print_ctx(out, p7, 0, NULL);
 	if (print_certs)
 		{
 		STACK_OF(X509) *certs=NULL;
@@ -317,5 +301,5 @@ end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/Show More
+++ b/Show More