VxWorks support.

Update rand and dsa algorithm test programs so they can support command
line filenames and no longer require redirection, which some platforms don't support.
2011-09-25 18:11:42 +00:00 · 2011-09-25 17:11:53 +00:00 · 2011-09-25 17:10:16 +00:00 · 2011-09-25 16:49:41 +00:00 · 2011-09-25 16:43:26 +00:00 · 2011-09-25 15:51:57 +00:00
2717 changed files with 326752 additions and 523622 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,18 @@
 openssl.pc
 MINFO
 makefile.one
 tmp
 out
 outinc
 rehash.time
 testlog
 make.log
 maketest.log
 cctest
 cctest.c
 cctest.a
 libcrypto.so.*
 libssl.so.*
 *.flc
 semantic.cache
 Makefile
--- a/.gitignore
+++ b/.gitignore
@@ -1,128 +0,0 @@
 # Object files
 *.o
 *.obj
 # editor artefacts
 *.swp
 .#*
 \#*#
 *~
 /.dir-locals.el
 # Top level excludes
 /Makefile.bak
 /Makefile
 /MINFO
 /TABLE
 /*.a
 /*.pc
 /rehash.time
 /inc.*
 /makefile.*
 /out.*
 /tmp.*
 /test/*.ss
 /test/*.srl
 /test/.rnd
 /test/test*.pem
 /test/newkey.pem
 /test/*.log
 # 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/*/asm/*.s
 /crypto/arm*.S
 /crypto/*/*.S
 *.asm
 !/crypto/*/asm/*.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*
 *.exe
 # Exceptions
 !/test/bctest
 !/crypto/des/times/486-50.sol
 # Misc auto generated files
 include/openssl/opensslconf.h
 /tools/c_rehash
 lib
 Makefile.save
 *.bak
 tags
 TAGS
 cscope.out
 *.d
 # Windows
 /tmp32
 /tmp32.dbg
 /tmp32dll
 /tmp32dll.dbg
 /out32
 /out32.dbg
 /out32dll
 /out32dll.dbg
 /inc32
 /MINFO
 ms/bcb.mak
 ms/libeay32.def
 ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
 # Files created on other branches that are not held in git, and are not
 # needed on this branch
 include/openssl/asn1_mac.h
 include/openssl/des_old.h
 include/openssl/fips.h
 include/openssl/fips_rand.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/pq_compat.h
 include/openssl/ssl23.h
 include/openssl/tmdiff.h
 include/openssl/ui_compat.h
 test/fips_aesavs.c
 test/fips_desmovs.c
 test/fips_dsatest.c
 test/fips_dssvs.c
 test/fips_hmactest.c
 test/fips_randtest.c
 test/fips_rngvs.c
 test/fips_rsagtest.c
 test/fips_rsastest.c
 test/fips_rsavtest.c
 test/fips_shatest.c
 test/fips_test_suite.c
 test/shatest.c
--- a/.travis-create-release.sh
+++ b/.travis-create-release.sh
@@ -1,10 +0,0 @@
 #! /bin/sh
 # $1 is expected to be $TRAVIS_OS_NAME
 if [ "$1" == osx ]; then
    make -f Makefile.org \
 	 DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist
 else
    make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist
 fi
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,96 +0,0 @@
 language: c
 addons:
    apt:
        packages:
            - clang-3.6
            - gcc-5
            - binutils-mingw-w64
            - gcc-mingw-w64
            - wine
        sources:
            - llvm-toolchain-precise-3.6
            - ubuntu-toolchain-r-test
 os:
    - linux
    - osx
 compiler:
    - clang
    - clang-3.6
    - gcc
    - gcc-5
    - i686-w64-mingw32-gcc
    - x86_64-w64-mingw32-gcc
 env:
    - CONFIG_OPTS=""
    - CONFIG_OPTS="shared"
    - CONFIG_OPTS="no-asm"
    - CONFIG_OPTS="--debug --strict-warnings"
 matrix:
    include:
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="-fsanitize=address"
        - os: linux
          compiler: clang-3.6
          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined"
        - os: linux
          compiler: gcc-5
          env: CONFIG_OPTS="-fsanitize=address"
        - os: linux
          compiler: gcc-5
          env: CONFIG_OPTS="no-asm --debug --strict-warnings -fno-sanitize-recover -fsanitize=address -fsanitize=undefined"
    exclude:
        - os: osx
          compiler: clang-3.6
        - os: osx
          compiler: gcc-5
        - os: osx
          compiler: i686-w64-mingw32-gcc
        - os: osx
          compiler: x86_64-w64-mingw32-gcc
        - compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="shared"
        - compiler: x86_64-w64-mingw32-gcc
          env: CONFIG_OPTS="shared"
        - compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="no-asm"
        - compiler: x86_64-w64-mingw32-gcc
          env: CONFIG_OPTS="no-asm"
    allow_failures:
        - compiler: i686-w64-mingw32-gcc
          env: CONFIG_OPTS="--debug --strict-warnings"
        - compiler: x86_64-w64-mingw32-gcc
          env: CONFIG_OPTS="--debug --strict-warnings"
 before_script:
    - sh .travis-create-release.sh $TRAVIS_OS_NAME
    - tar -xvzf _srcdist.tar.gz
    - cd _srcdist
    - if [ "$CC" == i686-w64-mingw32-gcc ]; then
          export CROSS_COMPILE=${CC%%gcc}; unset CC;
          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
      elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
          export CROSS_COMPILE=${CC%%gcc}; unset CC;
          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
      else
          ./config $CONFIG_OPTS;
      fi
    - cd ..
 script:
    - cd _srcdist
    - make
    - if [ -n "$CROSS_COMPILE" ]; then
          export EXE_SHELL="wine" WINEPREFIX=`pwd`;
      fi
    - make test
    - cd ..
 notifications:
    email:
        - openssl-commits@openssl.org
--- a/2
+++ b/2
@@ -1,2 +0,0 @@
 Please https://www.openssl.org/community/thanks.html for the current
 acknowledgements.
--- a/3951
+++ b/3951
--- a/CHANGES.SSLeay
+++ b/CHANGES.SSLeay
@@ -0,0 +1,968 @@
 This file contains the changes for the SSLeay library up to version
 0.9.0b. For later changes, see the file "CHANGES".
  SSLeay CHANGES
  ______________
 Changes between 0.8.x and 0.9.0b
 10-Apr-1998
 I said the next version would go out at easter, and so it shall.
 I expect a 0.9.1 will follow with portability fixes in the next few weeks.
 This is a quick, meet the deadline.  Look to ssl-users for comments on what
 is new etc.
 eric (about to go bushwalking for the 4 day easter break :-)
 16-Mar-98
    - Patch for Cray T90 from Wayne Schroeder <schroede@SDSC.EDU>
    - Lots and lots of changes
 29-Jan-98
    - ASN1_BIT_STRING_set_bit()/ASN1_BIT_STRING_get_bit() from
      Goetz Babin-Ebell <babinebell@trustcenter.de>.
    - SSL_version() now returns SSL2_VERSION, SSL3_VERSION or
      TLS1_VERSION.
 7-Jan-98
    - Finally reworked the cipher string to ciphers again, so it
      works correctly
    - All the app_data stuff is now ex_data with funcion calls to access.
      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
      the RSA methods could be implemented this way and I may do so.
    - Oh yes, SSL under perl5 is working at the basic level.
 15-Dec-97
    - Warning - the gethostbyname cache is not fully thread safe,
      but it should work well enough.
    - Major internal reworking of the app_data stuff.  More functions
      but if you were accessing ->app_data directly, things will
      stop working.
    - The perlv5 stuff is working.  Currently on message digests,
      ciphers and the bignum library.
 9-Dec-97
    - Modified re-negotiation so that server initated re-neg
      will cause a SSL_read() to return -1 should retry.
      The danger otherwise was that the server and the
      client could end up both trying to read when using non-blocking
      sockets.
 4-Dec-97
    - Lots of small changes
    - Fix for binaray mode in Windows for the FILE BIO, thanks to
      Bob Denny <rdenny@dc3.com>
 17-Nov-97
    - Quite a few internal cleanups, (removal of errno, and using macros
      defined in e_os.h).
    - A bug in ca.c, pointed out by yasuyuki-ito@d-cruise.co.jp, where
      the automactic naming out output files was being stuffed up.
 29-Oct-97
    - The Cast5 cipher has been added.  MD5 and SHA-1 are now in assember
      for x86.
 21-Oct-97
    - Fixed a bug in the BIO_gethostbyname() cache.
 15-Oct-97
    - cbc mode for blowfish/des/3des is now in assember.  Blowfish asm
      has also been improved.  At this point in time, on the pentium,
      md5 is %80 faster, the unoptimesed sha-1 is %79 faster,
      des-cbc is %28 faster, des-ede3-cbc is %9 faster and blowfish-cbc
      is %62 faster.
 12-Oct-97
    - MEM_BUF_grow() has been fixed so that it always sets the buf->length
      to the value we are 'growing' to.  Think of MEM_BUF_grow() as the
      way to set the length value correctly.
 10-Oct-97
    - I now hash for certificate lookup on the raw DER encoded RDN (md5).
      This breaks things again :-(.  This is efficent since I cache
      the DER encoding of the RDN.
    - The text DN now puts in the numeric OID instead of UNKNOWN.
    - req can now process arbitary OIDs in the config file.
    - I've been implementing md5 in x86 asm, much faster :-).
    - Started sha1 in x86 asm, needs more work.
    - Quite a few speedups in the BN stuff.  RSA public operation
      has been made faster by caching the BN_MONT_CTX structure.
      The calulating of the Ai where A*Ai === 1 mod m was rather
      expensive.  Basically a 40-50% speedup on public operations.
      The RSA speedup is now 15% on pentiums and %20 on pentium
      pro.
 30-Sep-97
    - After doing some profiling, I added x86 adm for bn_add_words(),
      which just adds 2 arrays of longs together.  A %10 speedup
      for 512 and 1024 bit RSA on the pentium pro.
 29-Sep-97
    - Converted the x86 bignum assembler to us the perl scripts
      for generation.
 23-Sep-97
    - If SSL_set_session() is passed a NULL session, it now clears the
      current session-id.
 22-Sep-97
    - Added a '-ss_cert file' to apps/ca.c.  This will sign selfsigned
      certificates.
    - Bug in crypto/evp/encode.c where by decoding of 65 base64
      encoded lines, one line at a time (via a memory BIO) would report
      EOF after the first line was decoded.
    - Fix in X509_find_by_issuer_and_serial() from
      Dr Stephen Henson <shenson@bigfoot.com>
 19-Sep-97
    - NO_FP_API and NO_STDIO added.
    - Put in sh config command.  It auto runs Configure with the correct
      parameters.
 18-Sep-97
    - Fix x509.c so if a DSA cert has different parameters to its parent,
      they are left in place.  Not tested yet.
 16-Sep-97
    - ssl_create_cipher_list() had some bugs, fixes from
      Patrick Eisenacher <eisenach@stud.uni-frankfurt.de>
    - Fixed a bug in the Base64 BIO, where it would return 1 instead
      of -1 when end of input was encountered but should retry.
      Basically a Base64/Memory BIO interaction problem.
    - Added a HMAC set of functions in preporarion for TLS work.
 15-Sep-97
    - Top level makefile tweak - Cameron Simpson <cs@zip.com.au>
    - Prime generation spead up %25 (512 bit prime, pentium pro linux)
      by using montgomery multiplication in the prime number test.
 11-Sep-97
    - Ugly bug in ssl3_write_bytes().  Basically if application land
      does a SSL_write(ssl,buf,len) where len > 16k, the SSLv3 write code
      did not check the size and tried to copy the entire buffer.
      This would tend to cause memory overwrites since SSLv3 has
      a maximum packet size of 16k.  If your program uses
      buffers <= 16k, you would probably never see this problem.
    - Fixed a new errors that were cause by malloc() not returning
      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
      since this flags stops SSLeay being able to handle client
      cert requests correctly.
 08-Sep-97
    - SSL_SESS_CACHE_NO_INTERNAL_LOOKUP option added.  When switched
      on, the SSL server routines will not use a SSL_SESSION that is
      held in it's cache.  This in intended to be used with the session-id
      callbacks so that while the session-ids are still stored in the
      cache, the decision to use them and how to look them up can be
      done by the callbacks.  The are the 'new', 'get' and 'remove'
      callbacks.  This can be used to determine the session-id
      to use depending on information like which port/host the connection
      is coming from.  Since the are also SSL_SESSION_set_app_data() and
      SSL_SESSION_get_app_data() functions, the application can hold
      information against the session-id as well.
 03-Sep-97
    - Added lookup of CRLs to the by_dir method,
      X509_load_crl_file() also added.  Basically it means you can
      lookup CRLs via the same system used to lookup certificates.
    - Changed things so that the X509_NAME structure can contain
      ASN.1 BIT_STRINGS which is required for the unique
      identifier OID.
    - Fixed some problems with the auto flushing of the session-id
      cache.  It was not occuring on the server side.
 02-Sep-97
    - Added SSL_CTX_sess_cache_size(SSL_CTX *ctx,unsigned long size)
      which is the maximum number of entries allowed in the
      session-id cache.  This is enforced with a simple FIFO list.
      The default size is 20*1024 entries which is rather large :-).
      The Timeout code is still always operating.
 01-Sep-97
    - Added an argument to all the 'generate private key/prime`
      callbacks.  It is the last parameter so this should not
      break existing code but it is needed for C++.
    - Added the BIO_FLAGS_BASE64_NO_NL flag for the BIO_f_base64()
      BIO.  This lets the BIO read and write base64 encoded data
      without inserting or looking for '\n' characters.  The '-A'
      flag turns this on when using apps/enc.c.
    - RSA_NO_PADDING added to help BSAFE functionality.  This is a
      very dangerous thing to use, since RSA private key
      operations without random padding bytes (as PKCS#1 adds) can
      be attacked such that the private key can be revealed.
    - ASN.1 bug and rc2-40-cbc and rc4-40 added by
      Dr Stephen Henson <shenson@bigfoot.com>
 31-Aug-97 (stuff added while I was away)    
    - Linux pthreads by Tim Hudson (tjh@cryptsoft.com).
    - RSA_flags() added allowing bypass of pub/priv match check
      in ssl/ssl_rsa.c - Tim Hudson.
    - A few minor bugs.
 SSLeay 0.8.1 released.
 19-Jul-97
    - Server side initated dynamic renegotiation is broken.  I will fix
      it when I get back from holidays.
 15-Jul-97
    - Quite a few small changes.
    - INVALID_SOCKET usage cleanups from Alex Kiernan <alex@hisoft.co.uk>
 09-Jul-97
    - Added 2 new values to the SSL info callback.
      SSL_CB_START which is passed when the SSL protocol is started
      and SSL_CB_DONE when it has finished sucsessfully.
 08-Jul-97
    - Fixed a few bugs problems in apps/req.c and crypto/asn1/x_pkey.c
      that related to DSA public/private keys.
    - Added all the relevent PEM and normal IO functions to support
      reading and writing RSAPublic keys.
    - Changed makefiles to use ${AR} instead of 'ar r'
 07-Jul-97
    - Error in ERR_remove_state() that would leave a dangling reference
      to a free()ed location - thanks to Alex Kiernan <alex@hisoft.co.uk>
    - s_client now prints the X509_NAMEs passed from the server
      when requesting a client cert.
    - Added a ssl->type, which is one of SSL_ST_CONNECT or
      SSL_ST_ACCEPT.  I had to add it so I could tell if I was
      a connect or an accept after the handshake had finished.
    - SSL_get_client_CA_list(SSL *s) now returns the CA names
      passed by the server if called by a client side SSL.
 05-Jul-97
    - Bug in X509_NAME_get_text_by_OBJ(), looking starting at index
      0, not -1 :-(  Fix from Tim Hudson (tjh@cryptsoft.com).
 04-Jul-97
    - Fixed some things in X509_NAME_add_entry(), thanks to
      Matthew Donald <matthew@world.net>.
    - I had a look at the cipher section and though that it was a
      bit confused, so I've changed it.
    - I was not setting up the RC4-64-MD5 cipher correctly.  It is
      a MS special that appears in exported MS Money.
    - Error in all my DH ciphers.  Section 7.6.7.3 of the SSLv3
      spec.  I was missing the two byte length header for the
      ClientDiffieHellmanPublic value.  This is a packet sent from
      the client to the server.  The SSL_OP_SSLEAY_080_CLIENT_DH_BUG
      option will enable SSLeay server side SSLv3 accept either
      the correct or my 080 packet format.
    - Fixed a few typos in crypto/pem.org.
 02-Jul-97
    - Alias mapping for EVP_get_(digest|cipher)byname is now
      performed before a lookup for actual cipher.  This means
      that an alias can be used to 're-direct' a cipher or a
      digest.
    - ASN1_read_bio() had a bug that only showed up when using a
      memory BIO.  When EOF is reached in the memory BIO, it is
      reported as a -1 with BIO_should_retry() set to true.
 01-Jul-97
    - Fixed an error in X509_verify_cert() caused by my
      miss-understanding how 'do { contine } while(0);' works.
      Thanks to Emil Sit <sit@mit.edu> for educating me :-)
 30-Jun-97
    - Base64 decoding error.  If the last data line did not end with
      a '=', sometimes extra data would be returned.
    - Another 'cut and paste' bug in x509.c related to setting up the
      STDout BIO.
 27-Jun-97
    - apps/ciphers.c was not printing due to an editing error.
    - Alex Kiernan <alex@hisoft.co.uk> send in a nice fix for
      a library build error in util/mk1mf.pl
 26-Jun-97
    - Still did not have the auto 'experimental' code removal
      script correct.
    - A few header tweaks for Watcom 11.0 under Win32 from
      Rolf Lindemann <Lindemann@maz-hh.de>
    - 0 length OCTET_STRING bug in asn1_parse
    - A minor fix with an non-existent function in the MS .def files.
    - A few changes to the PKCS7 stuff.
 25-Jun-97
    SSLeay 0.8.0 finally it gets released.
 24-Jun-97
    Added a SSL_OP_EPHEMERAL_RSA option which causes all SSLv3 RSA keys to
    use a temporary RSA key.  This is experimental and needs some more work.
    Fixed a few Win16 build problems.
 23-Jun-97
    SSLv3 bug. I was not doing the 'lookup' of the CERT structure
    correctly. I was taking the SSL->ctx->default_cert when I should
    have been using SSL->cert. The bug was in ssl/s3_srvr.c
 20-Jun-97
    X509_ATTRIBUTES were being encoded wrongly by apps/reg.c and the
    rest of the library. Even though I had the code required to do
    it correctly, apps/req.c was doing the wrong thing.  I have fixed
    and tested everything.
    Missing a few #ifdef FIONBIO sections in crypto/bio/bss_acpt.c.
 19-Jun-97
    Fixed a bug in the SSLv2 server side first packet handling. When
    using the non-blocking test BIO, the ssl->s2->first_packet flag
    was being reset when a would-block failure occurred when reading
    the first 5 bytes of the first packet. This caused the checking
    logic to run at the wrong time and cause an error.
    Fixed a problem with specifying cipher. If RC4-MD5 were used,
    only the SSLv3 version would be picked up.  Now this will pick
    up both SSLv2 and SSLv3 versions. This required changing the
    SSL_CIPHER->mask values so that they only mask the ciphers,
    digests, authentication, export type and key-exchange algorithms.
    I found that when a SSLv23 session is established, a reused
    session, of type SSLv3 was attempting to write the SSLv2 
    ciphers, which were invalid. The SSL_METHOD->put_cipher_by_char 
    method has been modified so it will only write out cipher which
    that method knows about.  
 Changes between 0.8.0 and 0.8.1
  *) Mostly bug fixes. 
     There is an Ephemeral DH cipher problem which is fixed.
 SSLeay 0.8.0
 This version of SSLeay has quite a lot of things different from the
 previous version.
 Basically check all callback parameters, I will be producing documentation
 about how to use things in th future.  Currently I'm just getting 080 out
 the door.  Please not that there are several ways to do everything, and
 most of the applications in the apps directory are hybrids, some using old
 methods and some using new methods.
 Have a look in demos/bio for some very simple programs and
 apps/s_client.c and apps/s_server.c for some more advanced versions.
 Notes are definitly needed but they are a week or so away.
 Anyway, some quick nots from Tim Hudson (tjh@cryptsoft.com)
 ---
 Quick porting notes for moving from SSLeay-0.6.x to SSLeay-0.8.x to
 get those people that want to move to using the new code base off to
 a quick start.
 Note that Eric has tidied up a lot of the areas of the API that were
 less than desirable and renamed quite a few things (as he had to break
 the API in lots of places anyrate). There are a whole pile of additional
 functions for making dealing with (and creating) certificates a lot
 cleaner.
 01-Jul-97
 Tim Hudson
 tjh@cryptsoft.com
 ---8<---
 To maintain code that uses both SSLeay-0.6.x and SSLeay-0.8.x you could
 use something like the following (assuming you #include "crypto.h" which
 is something that you really should be doing).
 #if SSLEAY_VERSION_NUMBER >= 0x0800
 #define SSLEAY8
 #endif
 buffer.h -> splits into buffer.h and bio.h so you need to include bio.h
            too if you are working with BIO internal stuff (as distinct
        from simply using the interface in an opaque manner)
 #include "bio.h"    - required along with "buffer.h" if you write
              your own BIO routines as the buffer and bio
              stuff that was intermixed has been separated
              out 
 envelope.h -> evp.h  (which should have been done ages ago)
 Initialisation ... don't forget these or you end up with code that
 is missing the bits required to do useful things (like ciphers):
 SSLeay_add_ssl_algorithms()
 (probably also want SSL_load_error_strings() too but you should have
 already had that call in place)
 SSL_CTX_new()   - requires an extra method parameter
              SSL_CTX_new(SSLv23_method()) 
              SSL_CTX_new(SSLv2_method()) 
              SSL_CTX_new(SSLv3_method()) 
          OR to only have the server or the client code
              SSL_CTX_new(SSLv23_server_method()) 
              SSL_CTX_new(SSLv2_server_method()) 
              SSL_CTX_new(SSLv3_server_method()) 
          or  
              SSL_CTX_new(SSLv23_client_method()) 
              SSL_CTX_new(SSLv2_client_method()) 
              SSL_CTX_new(SSLv3_client_method()) 
 SSL_set_default_verify_paths() ... renamed to the more appropriate
 SSL_CTX_set_default_verify_paths()
 If you want to use client certificates then you have to add in a bit
 of extra stuff in that a SSLv3 server sends a list of those CAs that
 it will accept certificates from ... so you have to provide a list to
 SSLeay otherwise certain browsers will not send client certs.
 SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(s_cert_file));
 X509_NAME_oneline(X)    -> X509_NAME_oneline(X,NULL,0)  
               or provide a buffer and size to copy the
               result into
 X509_add_cert ->  X509_STORE_add_cert (and you might want to read the
          notes on X509_NAME structure changes too)
 VERIFICATION CODE
 =================
 The codes have all be renamed from VERIFY_ERR_* to X509_V_ERR_* to
 more accurately reflect things.
 The verification callback args are now packaged differently so that
 extra fields for verification can be added easily in future without
 having to break things by adding extra parameters each release :-)
 X509_cert_verify_error_string -> X509_verify_cert_error_string
 BIO INTERNALS
 =============
 Eric has fixed things so that extra flags can be introduced in
 the BIO layer in future without having to play with all the BIO
 modules by adding in some macros.
 The ugly stuff using 
    b->flags ~= (BIO_FLAGS_RW|BIO_FLAGS_SHOULD_RETRY)
 becomes
    BIO_clear_retry_flags(b)
    b->flags |= (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY)
 becomes
    BIO_set_retry_read(b)
 Also ... BIO_get_retry_flags(b), BIO_set_flags(b)
 OTHER THINGS
 ============
 X509_NAME has been altered so that it isn't just a STACK ... the STACK
 is now in the "entries" field ... and there are a pile of nice functions
 for getting at the details in a much cleaner manner.
 SSL_CTX has been altered ... "cert" is no longer a direct member of this
 structure ... things are now down under "cert_store" (see x509_vfy.h) and
 things are no longer in a CERTIFICATE_CTX but instead in a X509_STORE.
 If your code "knows" about this level of detail then it will need some 
 surgery.
 If you depending on the incorrect spelling of a number of the error codes
 then you will have to change your code as these have been fixed.
 ENV_CIPHER "type" got renamed to "nid" and as that is what it actually
 has been all along so this makes things clearer.
 ify_cert_error_string(ctx->error));
 SSL_R_NO_CIPHER_WE_TRUST -> SSL_R_NO_CIPHER_LIST
            and SSL_R_REUSE_CIPHER_LIST_NOT_ZERO
 Changes between 0.7.x and 0.8.0
  *) There have been lots of changes, mostly the addition of SSLv3.
     There have been many additions from people and amongst
     others, C2Net has assisted greatly.
 Changes between 0.7.x and 0.7.x
  *) Internal development version only
 SSLeay 0.6.6 13-Jan-1997
 The main additions are
 - assember for x86 DES improvments.
  From 191,000 per second on a pentium 100, I now get 281,000.  The inner
  loop and the IP/FP modifications are from
  Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>.  Many thanks for his
  contribution.
 - The 'DES macros' introduced in 0.6.5 now have 3 types.
  DES_PTR1, DES_PTR2 and 'normal'.  As per before, des_opts reports which
  is best and there is a summery of mine in crypto/des/options.txt
 - A few bug fixes.
 - Added blowfish.  It is not used by SSL but all the other stuff that
  deals with ciphers can use it in either ecb, cbc, cfb64 or ofb64 modes.
  There are 3 options for optimising Blowfish.  BF_PTR, BF_PTR2 and 'normal'.
  BF_PTR2 is pentium/x86 specific.  The correct option is setup in
  the 'Configure' script.
 - There is now a 'get client certificate' callback which can be
  'non-blocking'.  If more details are required, let me know.  It will
  documented more in SSLv3 when I finish it.
 - Bug fixes from 0.6.5 including the infamous 'ca' bug.  The 'make test'
  now tests the ca program.
 - Lots of little things modified and tweaked.
 SSLeay 0.6.5
 After quite some time (3 months), the new release.  I have been very busy
 for the last few months and so this is mostly bug fixes and improvments.
 The main additions are
 - assember for x86 DES.  For all those gcc based systems, this is a big
  improvement.  From 117,000 DES operation a second on a pentium 100,
  I now get 191,000.  I have also reworked the C version so it
  now gives 148,000 DESs per second.  
 - As mentioned above, the inner DES macros now have some more variant that
  sometimes help, sometimes hinder performance.  There are now 3 options
  DES_PTR (ptr vs array lookup), DES_UNROLL (full vs partial loop unrolling)
  and DES_RISC (a more register intensive version of the inner macro).
  The crypto/des/des_opts.c program, when compiled and run, will give
  an indication of the correct options to use.
 - The BIO stuff has been improved.  Read doc/bio.doc.  There are now
  modules for encryption and base64 encoding and a BIO_printf() function.
 - The CA program will accept simple one line X509v3 extensions in the
  ssleay.cnf file.  Have a look at the example.  Currently this just
  puts the text into the certificate as an OCTET_STRING so currently
  the more advanced X509v3 data types are not handled but this is enough
  for the netscape extensions.
 - There is the start of a nicer higher level interface to the X509
  strucutre.
 - Quite a lot of bug fixes.
 - CRYPTO_malloc_init()  (or CRYPTO_set_mem_functions()) can be used
  to define the malloc(), free() and realloc() routines to use
  (look in crypto/crypto.h).  This is mostly needed for Windows NT/95 when
  using DLLs and mixing CRT libraries.
 In general, read the 'VERSION' file for changes and be aware that some of
 the new stuff may not have been tested quite enough yet, so don't just plonk
 in SSLeay 0.6.5 when 0.6.4 used to work and expect nothing to break.
 SSLeay 0.6.4 30/08/96 eay
 I've just finished some test builds on Windows NT, Windows 3.1, Solaris 2.3,
 Solaris 2.5, Linux, IRIX, HPUX 10 and everthing seems to work :-).
 The main changes in this release
 - Thread safe.  have a read of doc/threads.doc and play in the mt directory.
  For anyone using 0.6.3 with threads, I found 2 major errors so consider
  moving to 0.6.4.  I have a test program that builds under NT and
  solaris.
 - The get session-id callback has changed.  Have a read of doc/callback.doc.
 - The X509_cert_verify callback (the SSL_verify callback) now
  has another argument.  Have a read of doc/callback.doc
 - 'ca -preserve', sign without re-ordering the DN.  Not tested much.
 - VMS support.
 - Compile time memory leak detection can now be built into SSLeay.
  Read doc/memory.doc
 - CONF routines now understand '\', '\n', '\r' etc.  What this means is that
  the  SPKAC object mentioned in doc/ns-ca.doc can be on multiple lines.
 - 'ssleay ciphers' added, lists the default cipher list for SSLeay.
 - RC2 key setup is now compatable with Netscape.
 - Modifed server side of SSL implementation, big performance difference when
      using session-id reuse.
 0.6.3
 Bug fixes and the addition of some nice stuff to the 'ca' program.
 Have a read of doc/ns-ca.doc for how hit has been modified so
 it can be driven from a CGI script.  The CGI script is not provided,
 but that is just being left as an excersize for the reader :-).
 0.6.2
 This is most bug fixes and functionality improvements.
 Additions are
 - More thread debugging patches, the thread stuff is still being
  tested, but for those keep to play with stuff, have a look in
  crypto/cryptlib.c.  The application needs to define 1 (or optionaly
  a second) callback that is used to implement locking.  Compiling
  with LOCK_DEBUG spits out lots of locking crud :-).
  This is what I'm currently working on.
 - SSL_CTX_set_default_passwd_cb() can be used to define the callback
  function used in the SSL*_file() functions used to load keys.  I was
  always of the opinion that people should call
  PEM_read_RSAPrivateKey() and pass the callback they want to use, but
  it appears they just want to use the SSL_*_file() function() :-(.
 - 'enc' now has a -kfile so a key can be read from a file.  This is
  mostly used so that the passwd does not appear when using 'ps',
  which appears imposible to stop under solaris.
 - X509v3 certificates now work correctly.  I even have more examples
  in my tests :-).  There is now a X509_EXTENSION type that is used in
  X509v3 certificates and CRLv2.
 - Fixed that signature type error :-(
 - Fixed quite a few potential memory leaks and problems when reusing
  X509, CRL and REQ structures.
 - EVP_set_pw_prompt() now sets the library wide default password
  prompt.
 - The 'pkcs7' command will now, given the -print_certs flag, output in
  pem format, all certificates and CRL contained within.  This is more
  of a pre-emtive thing for the new verisign distribution method.  I
  should also note, that this also gives and example in code, of how
  to do this :-), or for that matter, what is involved in going the
  other way (list of certs and crl -> pkcs7).
 - Added RSA's DESX to the DES library.  It is also available via the
  EVP_desx_cbc() method and via 'enc desx'. 
 SSLeay 0.6.1
 The main functional changes since 0.6.0 are as follows
 - Bad news, the Microsoft 060 DLL's are not compatable, but the good news is
  that from now on, I'll keep the .def numbers the same so they will be.
 - RSA private key operations are about 2 times faster that 0.6.0
 - The SSL_CTX now has more fields so default values can be put against
  it.  When an SSL structure is created, these default values are used
  but can be overwritten.  There are defaults for cipher, certificate,
  private key, verify mode and callback.  This means SSL session
  creation can now be
  ssl=SSL_new()
  SSL_set_fd(ssl,sock);
  SSL_accept(ssl)
  ....
  All the other uglyness with having to keep a global copy of the
  private key and certificate/verify mode in the server is now gone.
 - ssl/ssltest.c - one process talking SSL to its self for testing.
 - Storage of Session-id's can be controled via a session_cache_mode
  flag.  There is also now an automatic default flushing of 
  old session-id's.
 - The X509_cert_verify() function now has another parameter, this
  should not effect most people but it now means that the reason for
  the failure to verify is now available via SSL_get_verify_result(ssl).
  You don't have to use a global variable.
 - SSL_get_app_data() and SSL_set_app_data() can be used to keep some
  application data against the SSL structure.  It is upto the application
  to free the data.  I don't use it, but it is available.
 - SSL_CTX_set_cert_verify_callback() can be used to specify a
  verify callback function that completly replaces my certificate
  verification code.  Xcert should be able to use this :-).
  The callback is of the form int app_verify_callback(arg,ssl,cert).
  This needs to be documented more.
 - I have started playing with shared library builds, have a look in
  the shlib directory.  It is very simple.  If you need a numbered
  list of functions, have a look at misc/crypto.num and misc/ssl.num.
 - There is some stuff to do locking to make the library thread safe.
  I have only started this stuff and have not finished.  If anyone is
  keen to do so, please send me the patches when finished.
 So I have finally made most of the additions to the SSL interface that
 I thought were needed.
 There will probably be a pause before I make any non-bug/documentation
 related changes to SSLeay since I'm feeling like a bit of a break.
 eric - 12 Jul 1996
 I saw recently a comment by some-one that we now seem to be entering
 the age of perpetual Beta software.
 Pioneered by packages like linux but refined to an art form by
 netscape.
 I too wish to join this trend with the anouncement of SSLeay 0.6.0 :-).
 There are quite a large number of sections that are 'works in
 progress' in this package.  I will also list the major changes and
 what files you should read.
 BIO - this is the new IO structure being used everywhere in SSLeay.  I
 started out developing this because of microsoft, I wanted a mechanism
 to callback to the application for all IO, so Windows 3.1 DLL
 perversion could be hidden from me and the 15 different ways to write
 to a file under NT would also not be dictated by me at library build
 time.  What the 'package' is is an API for a data structure containing
 functions.  IO interfaces can be written to conform to the
 specification.  This in not intended to hide the underlying data type
 from the application, but to hide it from SSLeay :-).
 I have only really finished testing the FILE * and socket/fd modules.
 There are also 'filter' BIO's.  Currently I have only implemented
 message digests, and it is in use in the dgst application.  This
 functionality will allow base64/encrypto/buffering modules to be
 'push' into a BIO without it affecting the semantics.  I'm also
 working on an SSL BIO which will hide the SSL_accept()/SLL_connet()
 from an event loop which uses the interface.
 It is also possible to 'attach' callbacks to a BIO so they get called
 before and after each operation, alowing extensive debug output
 to be generated (try running dgst with -d).
 Unfortunaly in the conversion from 0.5.x to 0.6.0, quite a few
 functions that used to take FILE *, now take BIO *.
 The wrappers are easy to write
 function_fp(fp,x)
 FILE *fp;
    {
    BIO *b;
    int ret;
    if ((b=BIO_new(BIO_s_file())) == NULL) error.....
    BIO_set_fp(b,fp,BIO_NOCLOSE);
    ret=function_bio(b,x);
    BIO_free(b);
    return(ret);
    }
 Remember, there are no functions that take FILE * in SSLeay when
 compiled for Windows 3.1 DLL's.
 --
 I have added a general EVP_PKEY type that can hold a public/private
 key.  This is now what is used by the EVP_ functions and is passed
 around internally.  I still have not done the PKCS#8 stuff, but
 X509_PKEY is defined and waiting :-)
 --
 For a full function name listings, have a look at ms/crypt32.def and
 ms/ssl32.def.  These are auto-generated but are complete.
 Things like ASN1_INTEGER_get() have been added and are in here if you
 look.  I have renamed a few things, again, have a look through the
 function list and you will probably find what you are after.  I intend
 to at least put a one line descrition for each one.....
 --
 Microsoft - thats what this release is about, read the MICROSOFT file.
 --
 Multi-threading support.  I have started hunting through the code and
 flaging where things need to be done.  In a state of work but high on
 the list.
 --
 For random numbers, edit e_os.h and set DEVRANDOM (it's near the top)
 be be you random data device, otherwise 'RFILE' in e_os.h
 will be used, in your home directory.  It will be updated
 periodically.  The environment variable RANDFILE will override this
 choice and read/write to that file instead.  DEVRANDOM is used in
 conjunction to the RFILE/RANDFILE.  If you wish to 'seed' the random
 number generator, pick on one of these files.
 --
 The list of things to read and do
 dgst -d
 s_client -state (this uses a callback placed in the SSL state loop and
        will be used else-where to help debug/monitor what
        is happening.)
 doc/why.doc
 doc/bio.doc <- hmmm, needs lots of work.
 doc/bss_file.doc <- one that is working :-)
 doc/session.doc <- it has changed
 doc/speed.doc
 also play with ssleay version -a.  I have now added a SSLeay()
 function that returns a version number, eg 0600 for this release
 which is primarily to be used to check DLL version against the
 application.
 util/*  Quite a few will not interest people, but some may, like
 mk1mf.pl, mkdef.pl,
 util/do_ms.sh
 try
 cc -Iinclude -Icrypto -c crypto/crypto.c
 cc -Iinclude -Issl -c ssl/ssl.c
 You have just built the SSLeay libraries as 2 object files :-)
 Have a general rummage around in the bin stall directory and look at
 what is in there, like CA.sh and c_rehash
 There are lots more things but it is 12:30am on a Friday night and I'm
 heading home :-).
 eric 22-Jun-1996
 This version has quite a few major bug fixes and improvements.  It DOES NOT
 do SSLv3 yet.
 The main things changed
 - A Few days ago I added the s_mult application to ssleay which is
  a demo of an SSL server running in an event loop type thing.
  It supports non-blocking IO, I have finally gotten it right, SSL_accept()
  can operate in non-blocking IO mode, look at the code to see how :-).
  Have a read of doc/s_mult as well.  This program leaks memory and
  file descriptors everywhere but I have not cleaned it up yet.
  This is a demo of how to do non-blocking IO.
 - The SSL session management has been 'worked over' and there is now
  quite an expansive set of functions to manipulate them.  Have a read of
  doc/session.doc for some-things I quickly whipped up about how it now works.
  This assume you know the SSLv2 protocol :-)
 - I can now read/write the netscape certificate format, use the
  -inform/-outform  'net' options to the x509 command.  I have not put support
  for this type in the other demo programs, but it would be easy to add.
 - asn1parse and 'enc' have been modified so that when reading base64
  encoded files (pem format), they do not require '-----BEGIN' header lines.
  The 'enc' program had a buffering bug fixed, it can be used as a general
  base64 -> binary -> base64 filter by doing 'enc -a -e' and 'enc -a -d'
  respecivly.  Leaving out the '-a' flag in this case makes the 'enc' command
  into a form of 'cat'.
 - The 'x509' and 'req' programs have been fixed and modified a little so
  that they generate self-signed certificates correctly.  The test
  script actually generates a 'CA' certificate and then 'signs' a
  'user' certificate.  Have a look at this shell script (test/sstest)
  to see how things work, it tests most possible combinations of what can
  be done.
 - The 'SSL_set_pref_cipher()' function has been 'fixed' and the prefered name
  of SSL_set_cipher_list() is now the correct API (stops confusion :-).
  If this function is used in the client, only the specified ciphers can
  be used, with preference given to the order the ciphers were listed.
  For the server, if this is used, only the specified ciphers will be used
  to accept connections.  If this 'option' is not used, a default set of
  ciphers will be used.  The SSL_CTX_set_cipher_list(SSL_CTX *ctx) sets this
  list for all ciphers started against the SSL_CTX.  So the order is
  SSL cipher_list, if not present, SSL_CTX cipher list, if not
  present, then the library default.
  What this means is that normally ciphers like
  NULL-MD5 will never be used.  The only way this cipher can be used
  for both ends to specify to use it.
  To enable or disable ciphers in the library at build time, modify the
  first field for the cipher in the ssl_ciphers array in ssl/ssl_lib.c.
  This file also contains the 'pref_cipher' list which is the default
  cipher preference order.
 - I'm not currently sure if the 'rsa -inform net' and the 'rsa -outform net'
  options work.  They should, and they enable loading and writing the
  netscape rsa private key format.  I will be re-working this section of
  SSLeay for the next version.  What is currently in place is a quick and
  dirty hack.
 - I've re-written parts of the bignum library.  This gives speedups
  for all platforms.  I now provide assembler for use under Windows NT.
  I have not tested the Windows 3.1 assembler but it is quite simple code.
  This gives RSAprivate_key operation encryption times of 0.047s (512bit key)
  and 0.230s (1024bit key) on a pentium 100 which I consider reasonable.
  Basically the times available under linux/solaris x86 can be achieve under
  Windows NT.  I still don't know how these times compare to RSA's BSAFE
  library but I have been emailing with people and with their help, I should
  be able to get my library's quite a bit faster still (more algorithm changes).
  The object file crypto/bn/asm/x86-32.obj should be used when linking
  under NT.
 - 'make makefile.one' in the top directory will generate a single makefile
  called 'makefile.one'  This makefile contains no perl references and
  will build the SSLeay library into the 'tmp' and 'out' directories.
  util/mk1mf.pl >makefile.one is how this makefile is
  generated.  The mk1mf.pl command take several option to generate the
  makefile for use with cc, gcc, Visual C++ and Borland C++.  This is
  still under development.  I have only build .lib's for NT and MSDOS
  I will be working on this more.  I still need to play with the
  correct compiler setups for these compilers and add some more stuff but
  basically if you just want to compile the library
  on a 'non-unix' platform, this is a very very good file to start with :-).
  Have a look in the 'microsoft' directory for my current makefiles.
  I have not yet modified things to link with sockets under Windows NT.
  You guys should be able to do this since this is actually outside of the
  SSLeay scope :-).  I will be doing it for myself soon.
  util/mk1mf.pl takes quite a few options including no-rc, rsaref  and no-sock
  to build without RC2/RC4, to require RSAref for linking, and to
  build with no socket code.
 - Oh yes, the cipher that was reported to be compatible with RSA's RC2 cipher
  that was posted to sci.crypt has been added to the library and SSL.
  I take the view that if RC2 is going to be included in a standard,
  I'll include the cipher to make my package complete.
  There are NO_RC2, NO_RC4 and NO_IDEA macros to remove these ciphers
  at compile time.  I have not tested this recently but it should all work
  and if you are in the USA and don't want RSA threatening to sue you,
  you could probably remove the RC4/RC2 code inside these sections.
  I may in the future include a perl script that does this code
  removal automatically for those in the USA :-).
 - I have removed all references to sed in the makefiles.  So basically,
  the development environment requires perl and sh.  The build environment
  does not (use the makefile.one makefile).
  The Configure script still requires perl, this will probably stay that way
  since I have perl for Windows NT :-).
 eric (03-May-1996)
 PS Have a look in the VERSION file for more details on the changes and
   bug fixes.
 I have fixed a few bugs, added alpha and x86 assembler and generally cleaned
 things up.  This version will be quite stable, mostly because I'm on
 holidays until 10-March-1996.  For any problems in the interum, send email
 to Tim Hudson <tjh@mincom.oz.au>.
 SSLeay 0.5.0
 12-12-95
 This is going out before it should really be released.
 I leave for 11 weeks holidays on the 22-12-95 and so I either sit on
 this for 11 weeks or get things out.  It is still going to change a
 lot in the next week so if you do grab this version, please test and
 give me feed back ASAP, inculuding questions on how to do things with
 the library.  This will prompt me to write documentation so I don't
 have to answer the same question again :-).
 This 'pre' release version is for people who are interested in the
 library.  The applications will have to be changed to use
 the new version of the SSL interface.  I intend to finish more
 documentation before I leave but until then, look at the programs in
 the apps directory.  As far as code goes, it is much much nicer than
 the old version.
 The current library works, has no memory leaks (as far as I can tell)
 and is far more bug free that 0.4.5d.  There are no global variable of
 consequence (I believe) and I will produce some documentation that
 tell where to look for those people that do want to do multi-threaded
 stuff.
 There should be more documentation.  Have a look in the
 doc directory.  I'll be adding more before I leave, it is a start
 by mostly documents the crypto library.  Tim Hudson will update
 the web page ASAP.  The spelling and grammar are crap but
 it is better than nothing :-)
 Reasons to start playing with version 0.5.0
 - All the programs in the apps directory build into one ssleay binary.
 - There is a new version of the 'req' program that generates certificate
  requests, there is even documentation for this one :-)
 - There is a demo certification authorithy program.  Currently it will
  look at the simple database and update it.  It will generate CRL from
  the data base.  You need to edit the database by hand to revoke a
  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 alot.
 - Have a look at the enc and dgst programs in the apps directory.
 - It supports v3 of x509 certiticates.
 Major things missing.
 - I have been working on (and thinging about) the distributed x509
  hierachy problem.  I have not had time to put my solution in place.
  It will have to wait until I come back.
 - I have not put in CRL checking in the certificate verification but
  it would not be hard to do.  I was waiting until I could generate my
  own CRL (which has only been in the last week) and I don't have time
  to put it in correctly.
 - Montgomery multiplication need to be implemented.  I know the
  algorithm, just ran out of time.
 - PKCS#7.  I can load and write the DER version.  I need to re-work
  things to support BER (if that means nothing, read the ASN1 spec :-).
 - Testing of the higher level digital envelope routines.  I have not
  played with the *_seal() and *_open() type functions.  They are
  written but need testing.  The *_sign() and *_verify() functions are
  rock solid. 
 - PEM.  Doing this and PKCS#7 have been dependant on the distributed
  x509 heirachy problem.  I started implementing my ideas, got
  distracted writing a CA program and then ran out of time.  I provide
  the functionality of RSAref at least.
 - Re work the asm. code for the x86.  I've changed by low level bignum
  interface again, so I really need to tweak the x86 stuff.  gcc is
  good enough for the other boxes.
--- a/38
+++ b/38
@@ -1,38 +0,0 @@
 HOW TO CONTRIBUTE TO OpenSSL
 ----------------------------
 Development is coordinated on the openssl-dev mailing list (see
 http://www.openssl.org for information on subscribing). If you
 would like to submit a patch, send it to rt@openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
 You can also make GitHub pull requests. If you do this, please also send
 mail to rt@openssl.org with a brief description and a link to the PR so
 that we can more easily keep track of it.
 If you are unsure as to whether a feature will be useful for the general
 OpenSSL community please discuss it on the openssl-dev mailing list first.
 Someone may be already working on the same thing or there may be a good
 reason as to why that feature isn't implemented.
 Patches should be as up to date as possible, preferably relative to the
 current Git or the last snapshot. They should follow our coding style
 (see https://www.openssl.org/policies/codingstyle.html) and compile without
 warnings using the --strict-warnings flag.  OpenSSL compiles on many varied
 platforms: try to ensure you only use portable features.
 Our preferred format for patch files is "git format-patch" output. For example
 to provide a patch file containing the last commit in your local git repository
 use the following command:
 # git format-patch --stdout HEAD^ >mydiffs.patch
 Another method of creating an acceptable patch file without using git is as
 follows:
 # cd openssl-work
 # [your changes]
 # ./Configure dist; make clean
 # cd ..
 # diff -ur openssl-orig openssl-work > mydiffs.patch
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -0,0 +1,163 @@
 This file, together with ChangeLog.0_9_7-stable_not-in-head_FIPS,
 provides a collection of those CVS change log entries for the
 0.9.7 branch (OpenSSL_0_9_7-stable) that do not appear similarly in
 0.9.8-dev (CVS head).
 ChangeLog.0_9_7-stable_not-in-head_FIPS  -  "FIPS" related changes
 ChangeLog.0_9_7-stable_not-in-head       -  everything else
 Some obvious false positives have been eliminated: e.g., we do not
 care about a simple "make update"; and we don't care about changes
 identified to the 0.9.7 branch that were explicitly identified as
 backports from head.
 Eliminating all other entries (and finally this file and its
 compantion), either as false positives or as things that should go
 into 0.9.8, remains to be done.  Any additional changes to 0.9.7 that
 are not immediately put into 0.9.8, but belong there as well, should
 be added to the end of this file.
 2002-11-04 17:33  levitte
 	Changed:
 		Configure (1.314.2.38), "Exp", lines: +4 -2
 	Return my normal debug targets to something not so extreme, and
 	make the extreme ones special (or 'extreme', if you will :-)).
 2002-12-16 19:17  appro
 	Changed:
 		crypto/bn/bn_lcl.h (1.23.2.3), "Exp", lines: +3 -0
 		crypto/bn/bn_mul.c (1.28.2.4), "Exp", lines: +84 -445
 	This is rollback to 0.9.6h bn_mul.c to address problem reported in
 	RT#272.
 2003-07-27 15:46  ben
 	Changed:
 		crypto/aes/aes.h (1.1.2.5), "Exp", lines: +3 -0
 		crypto/aes/aes_cfb.c (1.1.2.4), "Exp", lines: +57 -0
 	Add untested CFB-r mode. Will be tested soon.
 2003-07-28 17:07  ben
 	Changed:
 		Makefile.org (1.154.2.69), "Exp", lines: +5 -1
 		crypto/aes/aes.h (1.1.2.6), "Exp", lines: +3 -0
 		crypto/aes/aes_cfb.c (1.1.2.5), "Exp", lines: +19 -0
 		crypto/dsa/Makefile.ssl (1.49.2.6), "Exp", lines: +3 -2
 		crypto/err/Makefile.ssl (1.48.2.4), "Exp", lines: +17 -16
 		crypto/evp/e_aes.c (1.6.2.5), "Exp", lines: +8 -0
 		crypto/evp/e_des.c (1.5.2.2), "Exp", lines: +1 -1
 		crypto/evp/e_des3.c (1.8.2.3), "Exp", lines: +2 -2
 		crypto/evp/evp.h (1.86.2.11), "Exp", lines: +28 -11
 		crypto/evp/evp_locl.h (1.7.2.3), "Exp", lines: +2 -2
 		crypto/objects/obj_dat.h (1.49.2.13), "Exp", lines: +10 -5
 		crypto/objects/obj_mac.h (1.19.2.13), "Exp", lines: +5 -0
 		crypto/objects/obj_mac.num (1.15.2.9), "Exp", lines: +1 -0
 		crypto/objects/objects.txt (1.20.2.14), "Exp", lines: +4 -0
 		fips/Makefile.ssl (1.1.2.3), "Exp", lines: +7 -0
 		fips/aes/Makefile.ssl (1.1.2.2), "Exp", lines: +23 -1
 		fips/aes/fips_aesavs.c (1.1.2.3), "Exp", lines: +9 -1
 		test/Makefile.ssl (1.84.2.30), "Exp", lines: +101 -43
 	Add support for partial CFB modes, make tests work, update
 	dependencies.
 2003-07-29 12:56  ben
 	Changed:
 		crypto/aes/aes_cfb.c (1.1.2.6), "Exp", lines: +9 -6
 		crypto/evp/c_allc.c (1.8.2.3), "Exp", lines: +1 -0
 		crypto/evp/evp_test.c (1.14.2.11), "Exp", lines: +17 -8
 		crypto/evp/evptests.txt (1.9.2.2), "Exp", lines: +48 -1
 	Working CFB1 and test vectors.
 2003-07-29 15:24  ben
 	Changed:
 		crypto/evp/e_aes.c (1.6.2.6), "Exp", lines: +14 -0
 		crypto/objects/obj_dat.h (1.49.2.14), "Exp", lines: +15 -5
 		crypto/objects/obj_mac.h (1.19.2.14), "Exp", lines: +10 -0
 		crypto/objects/obj_mac.num (1.15.2.10), "Exp", lines: +2 -0
 		crypto/objects/objects.txt (1.20.2.15), "Exp", lines: +2 -0
 		fips/aes/Makefile.ssl (1.1.2.3), "Exp", lines: +1 -1
 		fips/aes/fips_aesavs.c (1.1.2.4), "Exp", lines: +34 -19
 	The rest of the keysizes for CFB1, working AES AVS test for CFB1.
 2003-07-29 19:05  ben
 	Changed:
 		crypto/aes/aes.h (1.1.2.7), "Exp", lines: +3 -0
 		crypto/aes/aes_cfb.c (1.1.2.7), "Exp", lines: +14 -0
 		crypto/evp/c_allc.c (1.8.2.4), "Exp", lines: +1 -0
 		crypto/evp/e_aes.c (1.6.2.7), "Exp", lines: +4 -9
 		crypto/evp/evptests.txt (1.9.2.3), "Exp", lines: +48 -0
 		crypto/objects/obj_dat.h (1.49.2.15), "Exp", lines: +20 -5
 		crypto/objects/obj_mac.h (1.19.2.15), "Exp", lines: +15 -0
 		crypto/objects/obj_mac.num (1.15.2.11), "Exp", lines: +3 -0
 		crypto/objects/objects.txt (1.20.2.16), "Exp", lines: +3 -0
 		fips/aes/fips_aesavs.c (1.1.2.7), "Exp", lines: +11 -0
 	AES CFB8.
 2003-07-30 20:30  ben
 	Changed:
 		Makefile.org (1.154.2.70), "Exp", lines: +16 -5
 		crypto/des/cfb_enc.c (1.7.2.1), "Exp", lines: +2 -1
 		crypto/des/des_enc.c (1.11.2.2), "Exp", lines: +4 -0
 		crypto/evp/e_aes.c (1.6.2.8), "Exp", lines: +7 -14
 		crypto/evp/e_des.c (1.5.2.3), "Exp", lines: +37 -1
 		crypto/evp/evp.h (1.86.2.12), "Exp", lines: +6 -0
 		crypto/evp/evp_locl.h (1.7.2.4), "Exp", lines: +9 -0
 		crypto/objects/obj_dat.h (1.49.2.16), "Exp", lines: +48 -23
 		crypto/objects/obj_mac.h (1.19.2.16), "Exp", lines: +31 -6
 		crypto/objects/obj_mac.num (1.15.2.12), "Exp", lines: +5 -0
 		crypto/objects/objects.txt (1.20.2.17), "Exp", lines: +12 -6
 		fips/Makefile.ssl (1.1.2.4), "Exp", lines: +8 -1
 		fips/fips_make_sha1 (1.1.2.3), "Exp", lines: +3 -0
 		fips/aes/Makefile.ssl (1.1.2.4), "Exp", lines: +1 -1
 		fips/des/.cvsignore (1.1.2.1), "Exp", lines: +3 -0
 		fips/des/Makefile.ssl (1.1.2.1), "Exp", lines: +96 -0
 		fips/des/fingerprint.sha1 (1.1.2.1), "Exp", lines: +2 -0
 		fips/des/fips_des_enc.c (1.1.2.1), "Exp", lines: +288 -0
 		fips/des/fips_des_locl.h (1.1.2.1), "Exp", lines: +428 -0
 		fips/des/fips_desmovs.c (1.1.2.1), "Exp", lines: +659 -0
 	Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8.
 2003-08-01 12:25  ben
 	Changed:
 		crypto/des/cfb_enc.c (1.7.2.2), "Exp", lines: +45 -36
 		crypto/evp/c_allc.c (1.8.2.5), "Exp", lines: +2 -0
 		crypto/evp/e_des.c (1.5.2.4), "Exp", lines: +8 -3
 		crypto/evp/evptests.txt (1.9.2.4), "Exp", lines: +6 -0
 	Fix DES CFB-r.
 2003-08-01 12:31  ben
 	Changed:
 		crypto/evp/evptests.txt (1.9.2.5), "Exp", lines: +4 -0
 	DES CFB8 test.
 2005-04-19 16:21  appro
 	Changed:
 		Configure (1.314.2.117), "Exp", lines: +24 -21
 		Makefile.org (1.154.2.100), "Exp", lines: +1 -11
 		TABLE (1.99.2.52), "Exp", lines: +20 -20
 		apps/Makefile (1.1.4.15), "Exp", lines: +1 -1
 		test/Makefile (1.1.4.12), "Exp", lines: +1 -1
 	Enable shared link on HP-UX.
--- a/ChangeLog.0_9_7-stable_not-in-head_FIPS
+++ b/ChangeLog.0_9_7-stable_not-in-head_FIPS
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -1,123 +0,0 @@
 ## -*- mode: perl; -*-
 ## Build configuration targets for openssl-team members
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "purify" => {
        cc               => "purify gcc",
        cflags           => "-g -DPURIFY -Wall",
        thread_cflag     => "(unknown)",
        lflags           => "-lsocket -lnsl",
    },
    "debug" => {
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",
        thread_cflag     => "(unknown)",
        lflags           => "-lefence",
    },
    "debug-erbridge" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_ldflag    => "-m64",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
        multilib         => "64",
    },
    "debug-linux-pentium" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
        dso_scheme       => "dlfcn",
    },
    "debug-linux-ppro" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
        dso_scheme       => "dlfcn",
    },
    "debug-linux-elf-noefence" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-linux-ia32-aes" => {
        cc               => "gcc",
        cflags           => "-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
        cpuid_obj        => "x86cpuid.o",
        bn_obj           => "bn-586.o co-586.o x86-mont.o",
        des_obj          => "des-586.o crypt586.o",
        aes_obj          => "aes_x86core.o aes_cbc.o aesni-x86.o",
        bf_obj           => "bf-586.o",
        md5_obj          => "md5-586.o",
        sha1_obj         => "sha1-586.o sha256-586.o sha512-586.o",
        cast_obj         => "cast-586.o",
        rc4_obj          => "rc4-586.o",
        rmd160_obj       => "rmd-586.o",
        rc5_obj          => "rc5-586.o",
        wp_obj           => "wp_block.o wp-mmx.o",
        modes_obj        => "ghash-x86.o",
        engines_obj      => "e_padlock-x86.o",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "dist" => {
        cc               => "cc",
        cflags           => "-O",
        thread_cflag     => "(unknown)",
    },
    "debug-test-64-clang" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "clang",
        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
        thread_cflag     => "${BSDthreads}",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "bsd-gcc-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "darwin64-debug-test-64-clang" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "clang",
        cflags           => "-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
        thread_cflag     => "${BSDthreads}",
        sys_id           => "MACOSX",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "macosx",
        dso_scheme       => "dlfcn",
        shared_target    => "darwin-shared",
        shared_cflag     => "-fPIC -fno-common",
        shared_ldflag    => "-arch x86_64 -dynamiclib",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
    },
 );
--- a/Configurations/99-personal-ben.conf
+++ b/Configurations/99-personal-ben.conf
@@ -1,95 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "debug-ben" => {
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-openbsd" => {
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-openbsd-debug" => {
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-debug" => {
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-debug-64" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
        thread_cflag     => "${BSDthreads}",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "bsd-gcc-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-ben-debug-64-clang" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "clang",
        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
        thread_cflag     => "${BSDthreads}",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "bsd-gcc-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-ben-debug-64-noopt" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe",
        thread_cflag     => "${BSDthreads}",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "bsd-gcc-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-ben-macos" => {
        cc               => "cc",
        cflags           => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-no-opt" => {
        cc               => "gcc",
        cflags           => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-strict" => {
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe",
        thread_cflag     => "(unknown)",
    },
    "debug-ben-darwin64" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "cc",
        cflags           => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall",
        thread_cflag     => "-D_REENTRANT",
        sys_id           => "MACOSX",
        lflags           => "-Wl,-search_paths_first%",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "macosx",
        dso_scheme       => "dlfcn",
        shared_target    => "darwin-shared",
        shared_cflag     => "-fPIC -fno-common",
        shared_ldflag    => "-arch x86_64 -dynamiclib",
        shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
    },
 );
--- a/Configurations/99-personal-bodo.conf
+++ b/Configurations/99-personal-bodo.conf
@@ -1,24 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "debug-bodo" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_ldflag    => "-m64",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
        multilib         => "64",
    },
 );
--- a/Configurations/99-personal-geoff.conf
+++ b/Configurations/99-personal-geoff.conf
@@ -1,33 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "debug-geoff32" => {
        inherit_from     => [ "no_asm_filler" ],
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-geoff64" => {
        inherit_from     => [ "no_asm_filler" ],
        cc               => "gcc",
        cflags           => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
 );
--- a/Configurations/99-personal-levitte.conf
+++ b/Configurations/99-personal-levitte.conf
@@ -1,60 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "levitte-linux-elf" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "-DL_ENDIAN -Wall",
        debug_cflags     => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG-ggdb -g3",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-levitte-linux-noasm" => {
        inherit_from     => [ "no_asm_filler" ],
        cc               => "gcc",
        cflags           => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-levitte-linux-elf-extreme" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-levitte-linux-noasm-extreme" => {
        inherit_from     => [ "no_asm_filler" ],
        cc               => "gcc",
        cflags           => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT",
        perlasm_scheme   => "void",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
 );
--- a/Configurations/99-personal-rse.conf
+++ b/Configurations/99-personal-rse.conf
@@ -1,16 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "debug-rse" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "cc",
        cflags           => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall",
        thread_cflag     => "(unknown)",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
    },
 );
--- a/Configurations/99-personal-steve.conf
+++ b/Configurations/99-personal-steve.conf
@@ -1,50 +0,0 @@
 ## -*- mode: perl; -*-
 ## Personal configuration targets
 ##
 ## If you edit this file, run this command before committing
 ##	make -f Makefile.org TABLE
 ## This file is interpolated by the Configure script.
 %targets = (
    "debug-steve64" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -pthread -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_ldflag    => "-m64",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-steve32" => {
        inherit_from     => [ "x86_elf_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -pthread -m32 -DL_ENDIAN -DCONF_DEBUG -g",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-rdynamic -ldl",
        bn_ops           => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_ldflag    => "-m32",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
    "debug-steve-opt" => {
        inherit_from     => [ "x86_64_asm" ],
        cc               => "gcc",
        cflags           => "$gcc_devteam_warn -pthread -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -g",
        thread_cflag     => "-D_REENTRANT",
        lflags           => "-ldl",
        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL",
        perlasm_scheme   => "elf",
        dso_scheme       => "dlfcn",
        shared_target    => "linux-shared",
        shared_cflag     => "-fPIC",
        shared_ldflag    => "-m64",
        shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
    },
 );
--- a/2068
+++ b/2068
--- a/900
+++ b/900
@@ -1,2 +1,898 @@
-The FAQ is now maintained on the web:
+OpenSSL  -  Frequently Asked Questions
-        https://www.openssl.org/docs/faq.html
+--------------------------------------
 [MISC] Miscellaneous questions
 * Which is the current version of OpenSSL?
 * Where is the documentation?
 * How can I contact the OpenSSL developers?
 * Where can I get a compiled version of OpenSSL?
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
 [LEGAL] Legal questions
 * Do I need patent licenses to use OpenSSL?
 * Can I use OpenSSL with GPL software? 
 [USER] Questions on using the OpenSSL applications
 * Why do I get a "PRNG not seeded" error message?
 * Why do I get an "unable to write 'random state'" error message?
 * How do I create certificates or certificate requests?
 * Why can't I create certificate requests?
 * Why does <SSL program> fail with a certificate verify error?
 * Why can I only use weak ciphers when I connect to a server using OpenSSL?
 * How can I create DSA certificates?
 * Why can't I make an SSL connection using a DSA certificate?
 * How can I remove the passphrase on a private key?
 * Why can't I use OpenSSL certificates with SSL client authentication?
 * Why does my browser give a warning about a mismatched hostname?
 * How do I install a CA certificate into a browser?
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 * What is a "128 bit certificate"? Can I create one with OpenSSL?
 [BUILD] Questions about building and testing OpenSSL
 * Why does the linker complain about undefined symbols?
 * Why does the OpenSSL test fail with "bc: command not found"?
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
 * Why does the OpenSSL test fail with "bc: stack empty"?
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 * Why does the OpenSSL compilation fail on Win32 with VC++?
 * What is special about OpenSSL on Redhat?
 * Why does the OpenSSL compilation fail on MacOS X?
 * Why does the OpenSSL test suite fail on MacOS X?
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 * Why does compiler fail to compile sha512.c?
 * Test suite still fails, what to do?
 [PROG] Questions about programming with OpenSSL
 * Is OpenSSL thread-safe?
 * I've compiled a program under Windows and it crashes: why?
 * How do I read or write a DER encoded buffer using the ASN1 functions?
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 * I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 * I've called <some function> and it fails, why?
 * I just get a load of numbers for the error output, what do they mean?
 * Why do I get errors about unknown algorithms?
 * Why can't the OpenSSH configure script detect OpenSSL?
 * Can I use OpenSSL's SSL library with non-blocking I/O?
 * Why doesn't my server application receive a client certificate?
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 * I think I've detected a memory leak, is this a bug?
 ===============================================================================
 [MISC] ========================================================================
 * Which is the current version of OpenSSL?
 The current version is available from <URL: http://www.openssl.org>.
 OpenSSL 0.9.8e was released on February 23rd, 2007.
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
 ftp://ftp.openssl.org/snapshot/>, or get it by anonymous CVS access.
 * Where is the documentation?
 OpenSSL is a library that provides cryptographic functionality to
 applications such as secure web servers.  Be sure to read the
 documentation of the application you want to use.  The INSTALL file
 explains how to install this library.
 OpenSSL includes a command line utility that can be used to perform a
 variety of cryptographic functions.  It is described in the openssl(1)
 manpage.  Documentation for developers is currently being written.  A
 few manual pages already are available; overviews over libcrypto and
 libssl are given in the crypto(3) and ssl(3) manpages.
 The OpenSSL manpages are installed in /usr/local/ssl/man/ (or a
 different directory if you specified one as described in INSTALL).
 In addition, you can read the most current versions at
 <URL: http://www.openssl.org/docs/>.
 For information on parts of libcrypto that are not yet documented, you
 might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
 predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
 of this still applies to OpenSSL.
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
 The original SSLeay documentation is included in OpenSSL as
 doc/ssleay.txt.  It may be useful when none of the other resources
 help, but please note that it reflects the obsolete version SSLeay
 0.6.6.
 * How can I contact the OpenSSL developers?
 The README file describes how to submit bug reports and patches to
 OpenSSL.  Information on the OpenSSL mailing lists is available from
 <URL: http://www.openssl.org>.
 * Where can I get a compiled version of OpenSSL?
 You can finder pointers to binary distributions in
 http://www.openssl.org/related/binaries.html .
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
 yourself; the application will include the required parts (e.g. DLLs).
 If you want to build OpenSSL on a Windows system and you don't have
 a C compiler, read the "Mingw32" section of INSTALL.W32 for information
 on how to obtain and install the free GNU C compiler.
 A number of Linux and *BSD distributions include OpenSSL.
 * Why aren't tools like 'autoconf' and 'libtool' used?
 autoconf will probably be used in future OpenSSL versions. If it was
 less Unix-centric, it might have been used much earlier.
 * What is an 'engine' version?
 With version 0.9.6 OpenSSL was extended to interface to external crypto
 hardware. This was realized in a special release '0.9.6-engine'. With
 version 0.9.7 the changes were merged into the main development line,
 so that the special release is no longer necessary.
 * How do I check the authenticity of the OpenSSL distribution?
 We provide MD5 digests and ASC signatures of each tarball.
 Use MD5 to check that a tarball from a mirror site is identical:
   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
 You can check authenticity using pgp or gpg. You need the OpenSSL team
 member public key used to sign it (download it from a key server, see a
 list of keys at <URL: http://www.openssl.org/about/>). Then
 just do:
   pgp TARBALL.asc
 [LEGAL] =======================================================================
 * Do I need patent licenses to use OpenSSL?
 The patents section of the README file lists patents that may apply to
 you if you want to use OpenSSL.  For information on intellectual
 property rights, please consult a lawyer.  The OpenSSL team does not
 offer legal advice.
 You can configure OpenSSL so as not to use IDEA, MDC2 and RC5 by using
 ./config no-idea no-mdc2 no-rc5
 * Can I use OpenSSL with GPL software?
 On many systems including the major Linux and BSD distributions, yes (the
 GPL does not place restrictions on using libraries that are part of the
 normal operating system distribution).
 On other systems, the situation is less clear. Some GPL software copyright
 holders claim that you infringe on their rights if you use OpenSSL with
 their software on operating systems that don't normally include OpenSSL.
 If you develop open source software that uses OpenSSL, you may find it
 useful to choose an other license than the GPL, or state explicitly that
 "This program is released under the GPL with the additional exemption that
 compiling, linking, and/or using OpenSSL is allowed."  If you are using
 GPL software developed by others, you may want to ask the copyright holder
 for permission to use their software with OpenSSL.
 [USER] ========================================================================
 * Why do I get a "PRNG not seeded" error message?
 Cryptographic software needs a source of unpredictable data to work
 correctly.  Many open source operating systems provide a "randomness
 device" (/dev/urandom or /dev/random) that serves this purpose.
 All OpenSSL versions try to use /dev/urandom by default; starting with
 version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
 available.
 On other systems, applications have to call the RAND_add() or
 RAND_seed() function with appropriate data before generating keys or
 performing public key encryption. (These functions initialize the
 pseudo-random number generator, PRNG.)  Some broken applications do
 not do this.  As of version 0.9.5, the OpenSSL functions that need
 randomness report an error if the random number generator has not been
 seeded with at least 128 bits of randomness.  If this error occurs and
 is not discussed in the documentation of the application you are
 using, please contact the author of that application; it is likely
 that it never worked correctly.  OpenSSL 0.9.5 and later make the
 error visible by refusing to perform potentially insecure encryption.
 If you are using Solaris 8, you can add /dev/urandom and /dev/random
 devices by installing patch 112438 (Sparc) or 112439 (x86), which are
 available via the Patchfinder at <URL: http://sunsolve.sun.com>
 (Solaris 9 includes these devices by default). For /dev/random support
 for earlier Solaris versions, see Sun's statement at
 <URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
 (the SUNWski package is available in patch 105710).
 On systems without /dev/urandom and /dev/random, it is a good idea to
 use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
 details.  Starting with version 0.9.7, OpenSSL will automatically look
 for an EGD socket at /var/run/egd-pool, /dev/egd-pool, /etc/egd-pool and
 /etc/entropy.
 Most components of the openssl command line utility automatically try
 to seed the random number generator from a file.  The name of the
 default seeding file is determined as follows: If environment variable
 RANDFILE is set, then it names the seeding file.  Otherwise if
 environment variable HOME is set, then the seeding file is $HOME/.rnd.
 If neither RANDFILE nor HOME is set, versions up to OpenSSL 0.9.6 will
 use file .rnd in the current directory while OpenSSL 0.9.6a uses no
 default seeding file at all.  OpenSSL 0.9.6b and later will behave
 similarly to 0.9.6a, but will use a default of "C:\" for HOME on
 Windows systems if the environment variable has not been set.
 If the default seeding file does not exist or is too short, the "PRNG
 not seeded" error message may occur.
 The openssl command line utility will write back a new state to the
 default seeding file (and create this file if necessary) unless
 there was no sufficient seeding.
 Pointing $RANDFILE to an Entropy Gathering Daemon socket does not work.
 Use the "-rand" option of the OpenSSL command line tools instead.
 The $RANDFILE environment variable and $HOME/.rnd are only used by the
 OpenSSL command line tools. Applications using the OpenSSL library
 provide their own configuration options to specify the entropy source,
 please check out the documentation coming the with application.
 * Why do I get an "unable to write 'random state'" error message?
 Sometimes the openssl command line utility does not abort with
 a "PRNG not seeded" error message, but complains that it is
 "unable to write 'random state'".  This message refers to the
 default seeding file (see previous answer).  A possible reason
 is that no default filename is known because neither RANDFILE
 nor HOME is set.  (Versions up to 0.9.6 used file ".rnd" in the
 current directory in this case, but this has changed with 0.9.6a.)
 * How do I create certificates or certificate requests?
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
 extensions documentation (currently in doc/openssl.txt).
 * Why can't I create certificate requests?
 You typically get the error:
 	unable to find 'distinguished_name' in config
 	problems making Certificate Request
 This is because it can't find the configuration file. Check out the
 DIAGNOSTICS section of req(1) for more information.
 * Why does <SSL program> fail with a certificate verify error?
 This problem is usually indicated by log messages saying something like
 "unable to get local issuer certificate" or "self signed certificate".
 When a certificate is verified its root CA must be "trusted" by OpenSSL
 this typically means that the CA certificate must be placed in a directory
 or file and the relevant program configured to read it. The OpenSSL program
 'verify' behaves in a similar way and issues similar error messages: check
 the verify(1) program manual page for more information.
 * Why can I only use weak ciphers when I connect to a server using OpenSSL?
 This is almost certainly because you are using an old "export grade" browser
 which only supports weak encryption. Upgrade your browser to support 128 bit
 ciphers.
 * How can I create DSA certificates?
 Check the CA.pl(1) manual page for a DSA certificate example.
 * Why can't I make an SSL connection to a server using a DSA certificate?
 Typically you'll see a message saying there are no shared ciphers when
 the same setup works fine with an RSA certificate. There are two possible
 causes. The client may not support connections to DSA servers most web
 browsers (including Netscape and MSIE) only support connections to servers
 supporting RSA cipher suites. The other cause is that a set of DH parameters
 has not been supplied to the server. DH parameters can be created with the
 dhparam(1) command and loaded using the SSL_CTX_set_tmp_dh() for example:
 check the source to s_server in apps/s_server.c for an example.
 * How can I remove the passphrase on a private key?
 Firstly you should be really *really* sure you want to do this. Leaving
 a private key unencrypted is a major security risk. If you decide that
 you do have to do this check the EXAMPLES sections of the rsa(1) and
 dsa(1) manual pages.
 * Why can't I use OpenSSL certificates with SSL client authentication?
 What will typically happen is that when a server requests authentication
 it will either not include your certificate or tell you that you have
 no client certificates (Netscape) or present you with an empty list box
 (MSIE). The reason for this is that when a server requests a client
 certificate it includes a list of CAs names which it will accept. Browsers
 will only let you select certificates from the list on the grounds that
 there is little point presenting a certificate which the server will
 reject.
 The solution is to add the relevant CA certificate to your servers "trusted
 CA list". How you do this depends on the server software in uses. You can
 print out the servers list of acceptable CAs using the OpenSSL s_client tool:
 openssl s_client -connect www.some.host:443 -prexit
 If your server only requests certificates on certain URLs then you may need
 to manually issue an HTTP GET command to get the list when s_client connects:
 GET /some/page/needing/a/certificate.html
 If your CA does not appear in the list then this confirms the problem.
 * Why does my browser give a warning about a mismatched hostname?
 Browsers expect the server's hostname to match the value in the commonName
 (CN) field of the certificate. If it does not then you get a warning.
 * How do I install a CA certificate into a browser?
 The usual way is to send the DER encoded certificate to the browser as
 MIME type application/x-x509-ca-cert, for example by clicking on an appropriate
 link. On MSIE certain extensions such as .der or .cacert may also work, or you
 can import the certificate using the certificate import wizard.
 You can convert a certificate to DER form using the command:
 openssl x509 -in ca.pem -outform DER -out ca.der
 Occasionally someone suggests using a command such as:
 openssl pkcs12 -export -out cacert.p12 -in cacert.pem -inkey cakey.pem
 DO NOT DO THIS! This command will give away your CAs private key and
 reduces its security to zero: allowing anyone to forge certificates in
 whatever name they choose.
 * Why is OpenSSL x509 DN output not conformant to RFC2253?
 The ways to print out the oneline format of the DN (Distinguished Name) have
 been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
 interface, the "-nameopt" option could be introduded. See the manual
 page of the "openssl x509" commandline tool for details. The old behaviour
 has however been left as default for the sake of compatibility.
 * 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 export 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 the rules allowed the use of strong encryption but
 only to an authorised server.
 Two slighly different techniques were developed to support this, one used by
 Netscape was called "step up", the other used by MSIE was called "Server Gated
 Cryptography" (SGC). When a browser initially connected to a server it would
 check to see if the certificate contained certain extensions and was issued by
 an authorised authority. If these test succeeded it would reconnect using
 strong encryption.
 Only certain (initially one) certificate authorities could issue the
 certificates and they generally cost more than ordinary certificates.
 Although OpenSSL can create certificates containing the appropriate extensions
 the certificate would not come from a permitted authority and so would not
 be recognized.
 The export laws were later changed to allow almost unrestricted use of strong
 encryption so these certificates are now obsolete.
 [BUILD] =======================================================================
 * Why does the linker complain about undefined symbols?
 Maybe the compilation was interrupted, and make doesn't notice that
 something is missing.  Run "make clean; make".
 If you used ./Configure instead of ./config, make sure that you
 selected the right target.  File formats may differ slightly between
 OS versions (for example sparcv8/sparcv9, or a.out/elf).
 In case you get errors about the following symbols, use the config
 option "no-asm", as described in INSTALL:
 BF_cbc_encrypt, BF_decrypt, BF_encrypt, CAST_cbc_encrypt,
 CAST_decrypt, CAST_encrypt, RC4, RC5_32_cbc_encrypt, RC5_32_decrypt,
 RC5_32_encrypt, bn_add_words, bn_div_words, bn_mul_add_words,
 bn_mul_comba4, bn_mul_comba8, bn_mul_words, bn_sqr_comba4,
 bn_sqr_comba8, bn_sqr_words, bn_sub_words, des_decrypt3,
 des_ede3_cbc_encrypt, des_encrypt, des_encrypt2, des_encrypt3,
 des_ncbc_encrypt, md5_block_asm_host_order, sha1_block_asm_data_order
 If none of these helps, you may want to try using the current snapshot.
 If the problem persists, please submit a bug report.
 * Why does the OpenSSL test fail with "bc: command not found"?
 You didn't install "bc", the Unix calculator.  If you want to run the
 tests, get GNU bc from ftp://ftp.gnu.org or from your OS distributor.
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
 On some SCO installations or versions, bc has a bug that gets triggered
 when you run the test suite (using "make test").  The message returned is
 "bc: 1 not implemented".
 The best way to deal with this is to find another implementation of bc
 and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 * Why does the OpenSSL test fail with "bc: stack empty"?
 On some DG/ux versions, bc seems to have a too small stack for calculations
 that the OpenSSL bntest throws at it.  This gets triggered when you run the
 test suite (using "make test").  The message returned is "bc: stack empty".
 The best way to deal with this is to find another implementation of bc
 and compile/install it.  GNU bc (see http://www.gnu.org/software/software.html
 for download instructions) can be safely used, for example.
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 On some Alpha installations running Tru64 Unix and Compaq C, the compilation
 of crypto/sha/sha_dgst.c fails with the message 'Fatal:  Insufficient virtual
 memory to continue compilation.'  As far as the tests have shown, this may be
 a compiler bug.  What happens is that it eats up a lot of resident memory
 to build something, probably a table.  The problem is clearly in the
 optimization code, because if one eliminates optimization completely (-O0),
 the compilation goes through (and the compiler consumes about 2MB of resident
 memory instead of 240MB or whatever one's limit is currently).
 There are three options to solve this problem:
 1. set your current data segment size soft limit higher.  Experience shows
 that about 241000 kbytes seems to be enough on an AlphaServer DS10.  You do
 this with the command 'ulimit -Sd nnnnnn', where 'nnnnnn' is the number of
 kbytes to set the limit to.
 2. If you have a hard limit that is lower than what you need and you can't
 get it changed, you can compile all of OpenSSL with -O0 as optimization
 level.  This is however not a very nice thing to do for those who expect to
 get the best result from OpenSSL.  A bit more complicated solution is the
 following:
 ----- snip:start -----
  make DIRS=crypto SDIRS=sha "`grep '^CFLAG=' Makefile.ssl | \
       sed -e 's/ -O[0-9] / -O0 /'`"
  rm `ls crypto/*.o crypto/sha/*.o | grep -v 'sha_dgst\.o'`
  make
 ----- snip:end -----
 This will only compile sha_dgst.c with -O0, the rest with the optimization
 level chosen by the configuration process.  When the above is done, do the
 test and installation and you're set.
 3. Reconfigure the toolkit with no-sha0 option to leave out SHA0. It 
 should not be used and is not used in SSL/TLS nor any other recognized
 protocol in either case.
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 Getting this message is quite usual on Solaris 2, because Sun has hidden
 away 'ar' and other development commands in directories that aren't in
 $PATH by default.  One of those directories is '/usr/ccs/bin'.  The
 quickest way to fix this is to do the following (it assumes you use sh
 or any sh-compatible shell):
 ----- snip:start -----
  PATH=${PATH}:/usr/ccs/bin; export PATH
 ----- snip:end -----
 and then redo the compilation.  What you should really do is make sure
 '/usr/ccs/bin' is permanently in your $PATH, for example through your
 '.profile' (again, assuming you use a sh-compatible shell).
 * Why does the OpenSSL compilation fail on Win32 with VC++?
 Sometimes, you may get reports from VC++ command line (cl) that it
 can't find standard include files like stdio.h and other weirdnesses.
 One possible cause is that the environment isn't correctly set up.
 To solve that problem for VC++ versions up to 6, one should run
 VCVARS32.BAT which is found in the 'bin' subdirectory of the VC++
 installation directory (somewhere under 'Program Files').  For VC++
 version 7 (and up?), which is also called VS.NET, the file is called
 VSVARS32.BAT instead.
 This needs to be done prior to running NMAKE, and the changes are only
 valid for the current DOS session.
 * What is special about OpenSSL on Redhat?
 Red Hat Linux (release 7.0 and later) include a preinstalled limited
 version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
 is disabled in this version. The same may apply to other Linux distributions.
 Users may therefore wish to install more or all of the features left out.
 To do this you MUST ensure that you do not overwrite the openssl that is in
 /usr/bin on your Red Hat machine. Several packages depend on this file,
 including sendmail and ssh. /usr/local/bin is a good alternative choice. The
 libraries that come with Red Hat 7.0 onwards have different names and so are
 not affected. (eg For Red Hat 7.2 they are /lib/libssl.so.0.9.6b and
 /lib/libcrypto.so.0.9.6b with symlinks /lib/libssl.so.2 and
 /lib/libcrypto.so.2 respectively).
 Please note that we have been advised by Red Hat attempting to recompile the
 openssl rpm with all the cryptography enabled will not work. All other
 packages depend on the original Red Hat supplied openssl package. It is also
 worth noting that due to the way Red Hat supplies its packages, updates to
 openssl on each distribution never change the package version, only the
 build number. For example, on Red Hat 7.1, the latest openssl package has
 version number 0.9.6 and build number 9 even though it contains all the
 relevant updates in packages up to and including 0.9.6b.
 A possible way around this is to persuade Red Hat to produce a non-US
 version of Red Hat Linux.
 FYI: Patent numbers and expiry dates of US patents:
 MDC-2: 4,908,861 13/03/2007
 IDEA:  5,214,703 25/05/2010
 RC5:   5,724,428 03/03/2015
 * Why does the OpenSSL compilation fail on MacOS X?
 If the failure happens when trying to build the "openssl" binary, with
 a large number of undefined symbols, it's very probable that you have
 OpenSSL 0.9.6b delivered with the operating system (you can find out by
 running '/usr/bin/openssl version') and that you were trying to build
 OpenSSL 0.9.7 or newer.  The problem is that the loader ('ld') in
 MacOS X has a misfeature that's quite difficult to go around.
 Look in the file PROBLEMS for a more detailed explanation and for possible
 solutions.
 * Why does the OpenSSL test suite fail on MacOS X?
 If the failure happens when running 'make test' and the RC4 test fails,
 it's very probable that you have OpenSSL 0.9.6b delivered with the
 operating system (you can find out by running '/usr/bin/openssl version')
 and that you were trying to build OpenSSL 0.9.6d.  The problem is that
 the loader ('ld') in MacOS X has a misfeature that's quite difficult to
 go around and has linked the programs "openssl" and the test programs
 with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
 libraries you just built.
 Look in the file PROBLEMS for a more detailed explanation and for possible
 solutions.
 * Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
 Failure in BN_sqr test is most likely caused by a failure to configure the
 toolkit for current platform or lack of support for the platform in question.
 Run './config -t' and './apps/openssl version -p'. Do these platform
 identifiers match? If they don't, then you most likely failed to run
 ./config and you're hereby advised to do so before filing a bug report.
 If ./config itself fails to run, then it's most likely problem with your
 local environment and you should turn to your system administrator (or
 similar). If identifiers match (and/or no alternative identifier is
 suggested by ./config script), then the platform is unsupported. There might
 or might not be a workaround. Most notably on SPARC64 platforms with GNU
 C compiler you should be able to produce a working build by running
 './config -m32'. I understand that -m32 might not be what you want/need,
 but the build should be operational. For further details turn to
 <openssl-dev@openssl.org>.
 * Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?
 As of 0.9.7 assembler routines were overhauled for position independence
 of the machine code, which is essential for shared library support. For
 some reason OpenBSD is equipped with an out-of-date GNU assembler which
 finds the new code offensive. To work around the problem, configure with
 no-asm (and sacrifice a great deal of performance) or patch your assembler
 according to <URL: http://www.openssl.org/~appro/gas-1.92.3.OpenBSD.patch>.
 For your convenience a pre-compiled replacement binary is provided at
 <URL: http://www.openssl.org/~appro/gas-1.92.3.static.aout.bin>.
 Reportedly elder *BSD a.out platforms also suffer from this problem and
 remedy should be same. Provided binary is statically linked and should be
 working across wider range of *BSD branches, not just OpenBSD.
 * Why does the OpenSSL test suite fail in sha512t on x86 CPU?
 If the test program in question fails withs SIGILL, Illegal Instruction
 exception, then you more than likely to run SSE2-capable CPU, such as
 Intel P4, under control of kernel which does not support SSE2
 instruction extentions. See accompanying INSTALL file and
 OPENSSL_ia32cap(3) documentation page for further information.
 * Why does compiler fail to compile sha512.c?
 OpenSSL SHA-512 implementation depends on compiler support for 64-bit
 integer type. Few elder compilers [ULTRIX cc, SCO compiler to mention a
 couple] lack support for this and therefore are incapable of compiling
 the module in question. The recommendation is to disable SHA-512 by
 adding no-sha512 to ./config [or ./Configure] command line. Another
 possible alternative might be to switch to GCC.
 * Test suite still fails, what to do?
 Another common reason for failure to complete some particular test is
 simply bad code generated by a buggy component in toolchain or deficiency
 in run-time environment. There are few cases documented in PROBLEMS file,
 consult it for possible workaround before you beat the drum. Even if you
 don't find solution or even mention there, do reserve for possibility of
 a compiler bug. Compiler bugs might appear in rather bizarre ways, they
 never make sense, and tend to emerge when you least expect them. In order
 to identify one, drop optimization level, e.g. by editing CFLAG line in
 top-level Makefile, recompile and re-run the test.
 [PROG] ========================================================================
 * Is OpenSSL thread-safe?
 Yes (with limitations: an SSL connection may not concurrently be used
 by multiple threads).  On Windows and many Unix systems, OpenSSL
 automatically uses the multi-threaded versions of the standard
 libraries.  If your platform is not one of these, consult the INSTALL
 file.
 Multi-threaded applications must provide two callback functions to
 OpenSSL by calling CRYPTO_set_locking_callback() and
 CRYPTO_set_id_callback().  This is described in the threads(3)
 manpage.
 * I've compiled a program under Windows and it crashes: why?
 This is usually because you've missed the comment in INSTALL.W32.
 Your application must link against the same version of the Win32
 C-Runtime against which your openssl libraries were linked.  The
 default version for OpenSSL is /MD - "Multithreaded DLL".
 If you are using Microsoft Visual C++'s IDE (Visual Studio), in
 many cases, your new project most likely defaulted to "Debug
 Singlethreaded" - /ML.  This is NOT interchangeable with /MD and your
 program will crash, typically on the first BIO related read or write
 operation.
 For each of the six possible link stage configurations within Win32,
 your application must link  against the same by which OpenSSL was
 built.  If you are using MS Visual C++ (Studio) this can be changed
 by:
 1. Select Settings... from the Project Menu.
 2. Select the C/C++ Tab.
 3. Select "Code Generation from the "Category" drop down list box
 4. Select the Appropriate library (see table below) from the "Use
    run-time library" drop down list box.  Perform this step for both
    your debug and release versions of your application (look at the
    top left of the settings panel to change between the two)
    Single Threaded           /ML        -  MS VC++ often defaults to
                                            this for the release
                                            version of a new project.
    Debug Single Threaded     /MLd       -  MS VC++ often defaults to
                                            this for the debug version
                                            of a new project.
    Multithreaded             /MT
    Debug Multithreaded       /MTd
    Multithreaded DLL         /MD        -  OpenSSL defaults to this.
    Debug Multithreaded DLL   /MDd
 Note that debug and release libraries are NOT interchangeable.  If you
 built OpenSSL with /MD your application must use /MD and cannot use /MDd.
 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
 i2d_*(), d2i_*() functions directly. Since these are often the
 cause of grief here are some code fragments using PKCS7 as an example:
 unsigned char *buf, *p;
 int len;
 len = i2d_PKCS7(p7, NULL);
 buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */
 p = buf;
 i2d_PKCS7(p7, &p);
 At this point buf contains the len bytes of the DER encoding of
 p7.
 The opposite assumes we already have len bytes in buf:
 unsigned char *p;
 p = buf;
 p7 = d2i_PKCS7(NULL, &p, len);
 At this point p7 contains a valid PKCS7 structure of NULL if an error
 occurred. If an error occurred ERR_print_errors(bio) should give more
 information.
 The reason for the temporary variable 'p' is that the ASN1 functions
 increment the passed pointer so it is ready to read or write the next
 structure. This is often a cause of problems: without the temporary
 variable the buffer pointer is changed to point just after the data
 that has been read or written. This may well be uninitialized data
 and attempts to free the buffer will have unpredictable results
 because it no longer points to the same address.
 * OpenSSL uses DER but I need BER format: does OpenSSL support BER?
 The short answer is yes, because DER is a special case of BER and OpenSSL
 ASN1 decoders can process BER.
 The longer answer is that ASN1 structures can be encoded in a number of
 different ways. One set of ways is the Basic Encoding Rules (BER) with various
 permissible encodings. A restriction of BER is the Distinguished Encoding
 Rules (DER): these uniquely specify how a given structure is encoded.
 Therefore, because DER is a special case of BER, DER is an acceptable encoding
 for BER.
 * I've tried using <M_some_evil_pkcs12_macro> and I get errors why?
 This usually happens when you try compiling something using the PKCS#12
 macros with a C++ compiler. There is hardly ever any need to use the
 PKCS#12 macros in a program, it is much easier to parse and create
 PKCS#12 files using the PKCS12_parse() and PKCS12_create() functions
 documented in doc/openssl.txt and with examples in demos/pkcs12. The
 'pkcs12' application has to use the macros because it prints out 
 debugging information.
 * I've called <some function> and it fails, why?
 Before submitting a report or asking in one of the mailing lists, you
 should try to determine the cause. In particular, you should call
 ERR_print_errors() or ERR_print_errors_fp() after the failed call
 and see if the message helps. Note that the problem may occur earlier
 than you think -- you should check for errors after every call where
 it is possible, otherwise the actual problem may be hidden because
 some OpenSSL functions clear the error state.
 * I just get a load of numbers for the error output, what do they mean?
 The actual format is described in the ERR_print_errors() manual page.
 You should call the function ERR_load_crypto_strings() before hand and
 the message will be output in text form. If you can't do this (for example
 it is a pre-compiled binary) you can use the errstr utility on the error
 code itself (the hex digits after the second colon).
 * Why do I get errors about unknown algorithms?
 This can happen under several circumstances such as reading in an
 encrypted private key or attempting to decrypt a PKCS#12 file. The cause
 is forgetting to load OpenSSL's table of algorithms with
 OpenSSL_add_all_algorithms(). See the manual page for more information.
 * Why can't the OpenSSH configure script detect OpenSSL?
 Several reasons for problems with the automatic detection exist.
 OpenSSH requires at least version 0.9.5a of the OpenSSL libraries.
 Sometimes the distribution has installed an older version in the system
 locations that is detected instead of a new one installed. The OpenSSL
 library might have been compiled for another CPU or another mode (32/64 bits).
 Permissions might be wrong.
 The general answer is to check the config.log file generated when running
 the OpenSSH configure script. It should contain the detailed information
 on why the OpenSSL library was not detected or considered incompatible.
 * Can I use OpenSSL's SSL library with non-blocking I/O?
 Yes; make sure to read the SSL_get_error(3) manual page!
 A pitfall to avoid: Don't assume that SSL_read() will just read from
 the underlying transport or that SSL_write() will just write to it --
 it is also possible that SSL_write() cannot do any useful work until
 there is data to read, or that SSL_read() cannot do anything until it
 is possible to send data.  One reason for this is that the peer may
 request a new TLS/SSL handshake at any time during the protocol,
 requiring a bi-directional message exchange; both SSL_read() and
 SSL_write() will try to continue any pending handshake.
 * Why doesn't my server application receive a client certificate?
 Due to the TLS protocol definition, a client will only send a certificate,
 if explicitly asked by the server. Use the SSL_VERIFY_PEER flag of the
 SSL_CTX_set_verify() function to enable the use of client certificates.
 * Why does compilation fail due to an undefined symbol NID_uniqueIdentifier?
 For OpenSSL 0.9.7 the OID table was extended and corrected. In earlier
 versions, uniqueIdentifier was incorrectly used for X.509 certificates.
 The correct name according to RFC2256 (LDAP) is x500UniqueIdentifier.
 Change your code to use the new name when compiling against OpenSSL 0.9.7.
 * I think I've detected a memory leak, is this a bug?
 In most cases the cause of an apparent memory leak is an OpenSSL internal table
 that is allocated when an application starts up. Since such tables do not grow
 in size over time they are harmless.
 These internal tables can be freed up when an application closes using various
 functions.  Currently these include following:
 Thread-local cleanup functions:
  ERR_remove_state()
 Application-global cleanup functions that are aware of usage (and therefore
 thread-safe):
  ENGINE_cleanup() and CONF_modules_unload()
 "Brutal" (thread-unsafe) Application-global cleanup functions:
  ERR_free_strings(), EVP_cleanup() and CRYPTO_cleanup_all_ex_data().
 ===============================================================================
--- a/10
+++ b/10
@@ -1,10 +0,0 @@
 #!/bin/sh
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 ./Configure $@
 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/72
+++ b/72
@@ -12,7 +12,7 @@
 To install OpenSSL, you will need:
  * make
-  * Perl 5 with core modules (see 'Note on Perl' further down)
+  * Perl 5
  * an ANSI C compiler
  * a development environment in form of development libraries and C
    header files
@@ -79,7 +79,7 @@
                compiler flags for any other CPU specific configuration,
                e.g. "-m32" to build x86 code on an x64 system.
-  no-sse2	Exclude SSE2 code pathes. Normally SSE2 extension is
+  no-sse2	Exclude SSE2 code pathes. Normally SSE2 extention is
 		detected at run-time, but the decision whether or not the
 		machine code will be executed is taken solely on CPU
 		capability vector. This means that if you happen to run OS
@@ -98,7 +98,7 @@
                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, -mxxx, -Kxxx These system specific options will
                be passed through to the compiler to allow you to
                define preprocessor symbols, specify additional libraries,
                library directories or other compiler options.
@@ -158,7 +158,7 @@
     standard headers).  If it is a problem with OpenSSL itself, please
     report the problem to <openssl-bugs@openssl.org> (note that your
     message will be recorded in the request tracker publicly readable
-     via http://www.openssl.org/support/rt.html and will be forwarded to a
+     via http://www.openssl.org/support/rt2.html and will be forwarded to a
     public mailing list). Include the output of "make report" in your message.
     Please check out the request tracker. Maybe the bug was already
     reported or has already been fixed.
@@ -173,38 +173,14 @@
       $ make test
-     If some tests fail, look at the output.  There may be reasons for
+     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
+     the failure that isn't a problem in OpenSSL itself (like a missing
-     malfunction with Perl).  You may want increased verbosity, that
+     or malfunctioning bc).  If it is a problem with OpenSSL itself,
-     can be accomplished like this:
+     try removing any compiler optimization flags from the CFLAG line
-
+     in Makefile.ssl and run "make clean; make". Please send a bug
-       $ HARNESS_VERBOSE=yes make test
+     report to <openssl-bugs@openssl.org>, including the output of
-
+     "make report" in order to be added to the request tracker at
-     Also, you will find logs for all commands the tests have executed
+     http://www.openssl.org/support/rt2.html.
     in logs, test/test_*.log, one for each individual test.
     If you want to run just one or a few specific tests, you can use
     the make variable TESTS to specify them, like this:
       $ make TESTS='test_rsa test_dsa' test
     And of course, you can combine:
       $ HARNESS_VERBOSE=yes make TESTS='test_rsa test_dsa' test
     You can find the list of available tests like this:
       $ make list-tests
     If you find a problem with OpenSSL itself, try removing any
     compiler optimization flags from the CFLAG line in Makefile and
     run "make clean; make".
     Please send a bug report to <openssl-bugs@openssl.org>, and when
     you do, please run the following and include the output in your
     report:
       $ make report
  4. If everything tests ok, install OpenSSL with
@@ -230,10 +206,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
@@ -310,26 +282,6 @@
     with names of the form <foo.h>.
 Note on Perl
 ------------
 For our scripts, we rely quite a bit on Perl, and increasingly on
 some core Perl modules.  These Perl modules are part of the Perl
 source, so if you build Perl on your own, you should be set.
 However, if you install Perl as binary packages, the outcome might
 differ, and you may have to check that you do get the core modules
 installed properly.  We do not claim to know them all, but experience
 has told us the following:
 - on Linux distributions based on Debian, the package 'perl' will
   install the core Perl modules as well, so you will be fine.
 - on Linux distributions based on RPMs, you will need to install
   'perl-core' rather than just 'perl'.
 It is highly recommended that you have at least Perl version 5.12
 installed.
 Note on multi-threading
 -----------------------
--- 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
@@ -8,62 +8,58 @@ 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
+tested on W2K.  The scripts should run fine on other Windows
-(NT, Win9x, WinXP) but they have not been tested.  They may require some
+platforms (NT, Win9x, WinXP) but they haven't been tested.  They may require 
-modifications.
+some modifications.
 Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
-------------------------------------------------------
+------------------------------------------
-OpenSSL can either use the WinSock interfaces introduced in NetWare 5,
+OpenSSL uses the WinSock interfaces introduced in NetWare 5.  Therefore,
-or the BSD socket interface.  Previous versions of NetWare, 4.x and 3.x,
+previous versions of NetWare, 4.x and 3.x, are not supported.
 are only supported if OpenSSL is build for CLIB and BSD sockets;
 WinSock builds only support NetWare 5 and up.
 On NetWare there are two c-runtime libraries.  There is the legacy CLIB 
-interfaces and the newer LIBC interfaces.  Being ANSI-C libraries, the 
+interfaces and the newer LibC interfaces.  Being ANSI-C libraries, the 
-functionality in CLIB and LIBC is similar but the LIBC interfaces are built 
+functionality in CLIB and LibC is similar but the LibC interfaces are built 
 using Novell Kernal Services (NKS) which is designed to leverage 
 multi-processor environments.
-The NetWare port of OpenSSL can be configured to build using CLIB or LIBC.
+The NetWare port of OpenSSL can configured to build using CLIB or LibC.  The 
-The CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LIBC 
+CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LibC 
 build was developed and tested using the NetWare 6.0 FCS.  
-The necessary LIBC functionality ships with NetWare 6.  However, earlier 
+The necessary LibC functionality ships with NetWare 6.  However, earlier 
-NetWare 5.x versions will require updates in order to run the OpenSSL LIBC
+NetWare 5.x versions will require updates in order to run the OpenSSL LibC
-build (NetWare 5.1 SP8 is known to work).
+build.
-As of June 2005, the LIBC build can be configured to use BSD sockets instead
+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):
+* Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare - required:
-         http://forge.novell.com/modules/xfmod/project/?aunixnw
+   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)
 * Assemblers - optional:
   If you intend to build using the assembly options you will need an
@@ -83,11 +79,11 @@ following tools may be required:
   In order to build you will need a make tool.  Two make tools are
   supported, GNU make (gmake.exe) or Microsoft nmake.exe.
-   make.exe - GNU make for Windows (version 3.75 used for development)
+   gmake.exe - GNU make for Windows (version 3.75 used for development)
-         http://gnuwin32.sourceforge.net/packages/make.htm
+         http://www.gnu.org/software/make/make.html
   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)
@@ -127,14 +123,14 @@ following tools may be required:
   LIBC - BUILDS:
-      Libraries for C (LIBC) - LIBC headers and import files
+      Libraries for C (LibC) - LibC headers and import files
-         If you are going to build a LIBC version of OpenSSL, you will
+         If you are going to build a LibC version of OpenSSL, you will
-         need the LIBC headers and imports.  The March 14, 2002 NDK release or
+         need the LibC headers and imports.  The March 14, 2002 NDK release or
         later is required.  
-         NOTE: The LIBC SDK includes the necessary WinSock2 support.
+         NOTE: The LibC SDK includes the necessary WinSock2 support.  It
-         It is not necessary to download the WinSock2 NDK when building for
+         It is not necessary to download the WinSock2 Developer when building
-         LIBC. The LIBC SDK also includes the appropriate BSD socket support
+         for LibC. The LibC SDK also includes the appropriate BSD socket support
         if configuring to use BSD sockets.
@@ -147,36 +143,33 @@ 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]
+   netware\set_env.bat [target]
-      target        - "netware-clib" - CLIB NetWare build
+      target        - "netware-clib" - CLib NetWare build
-                    - "netware-libc" - LIBC NetWare build
+                    - "netware-libc" - LibC NetWare build
      compiler      - "gnuc"         - GNU GCC Compiler
                    - "codewarrior"  - MetroWerks CodeWarrior (default)
 If you don't use set_env.bat, you will need to set up the following
 environment variables:
-   PATH - Set PATH to point to the tools you will use.
+   path - Set path to point to the tools you will use.
-   INCLUDE - The location of the NDK include files.
+   MWCIncludes - The location of the NDK include files.
-            CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm
+            CLIB ex: set MWCIncludes=c:\ndk\nwsdk\include\nlm
-            LIBC ex: set INCLUDE=c:\ndk\libc\include
+            LibC ex: set MWCIncludes=c:\ndk\libc\include
   PRELUDE - The absolute path of the prelude object to link with.  For
            a CLIB build it is recommended you use the "clibpre.o" files shipped
-            with the Metrowerks PDK for NetWare.  For a LIBC build you should 
+            with the Metrowerks PDK for NetWare.  For a LibC build you should 
-            use the "libcpre.o" file delivered with the LIBC NDK components.
+            use the "libcpre.o" file delivered with the LibC NDK components.
            CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
-            LIBC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
+            LibC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
   IMPORTS - The locaton of the NDK import files.
            CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
-            LIBC ex: set IMPORTS=c:\ndk\libc\imports
+            LibC ex: set IMPORTS=c:\ndk\libc\imports
 In order to build, you need to run the Perl scripts to configure the build
@@ -189,10 +182,9 @@ 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)
+      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" - LIBC NetWare build (WinSock Sockets)
+                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
                    - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets)
      debug opts    - "debug"  - build debug
@@ -201,27 +193,25 @@ the assembly code.  Always run build.bat from the "openssl" directory.
                      "no-asm"   - don't use assembly
      configure opts- all unrecognized arguments are passed to the
-                      perl 'configure' script. See that script for
+                      perl configure script
                      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:
+      LibC build, non-debug, using NASM assembly:
-         netware\build.bat netware-libc nw-nasm enable-mdc2
+         netware\build.bat netware-libc nw-nasm
-      LIBC build, BSD sockets, non-debug, without assembly:
+      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.mak 
-   LIBC ex: gmake -f netware\nlm_libc_bsdsock.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
@@ -230,7 +220,7 @@ 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).
+      (CLIB or LibC).
   perl util\mkfiles.pl >MINFO
      generates a listing of source files (used by mk1mf)
@@ -260,12 +250,12 @@ The output from the build is placed in the following directories:
      tmp_nw_clib         - temporary build files
      outinc_nw_clib      - necesary include files
-   LIBC Debug build:
+   LibC Debug build:
      out_nw_libc.dbg     - static libs & test nlm(s)
      tmp_nw_libc.dbg     - temporary build files
      outinc_nw_libc      - necessary include files
-   LIBC Non-debug build:
+   LibC Non-debug build:
      out_nw_libc         - static libs & test nlm(s)
      tmp_nw_libc         - temporary build files
      outinc_nw_libc      - necesary include files
@@ -291,7 +281,7 @@ To run cpy_tests.bat:
      NetWare drive    - drive letter of mapped drive
      CLIB ex: netware\cpy_tests out_nw_clib m:
-      LIBC ex: netware\cpy_tests out_nw_libc m:
+      LibC ex: netware\cpy_tests out_nw_libc m:
 The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server
@@ -366,9 +356,9 @@ clean up the resources!
 Multi-threaded Development
 ---------------------------
-The NetWare version of OpenSSL is thread-safe, however multi-threaded
+The NetWare version of OpenSSL is thread-safe however, multi-threaded
 applications must provide the necessary locking function callbacks.  This
-is described in doc\threads.doc.  The file "openssl-x.x.x\crypto\threads\mttest.c"
+is described in doc\threads.doc.  The file "openssl\crypto\threads\mttest.c"
 is a multi-threaded test program and demonstrates the locking functions.
@@ -378,7 +368,7 @@ The openssl program has numerous options and can be used for many different
 things.  Many of the options operate in an interactive mode requiring the
 user to enter data.  Because of this, a default screen is created for the
 program.  However, when running the test script it is not desirable to
-have a separate screen.  Therefore, the build also creates openssl2.nlm.
+have a seperate screen.  Therefore, the build also creates openssl2.nlm.
 Openssl2.nlm is functionally identical but uses the console screen.
 Openssl2 can be used when a non-interactive mode is desired.
@@ -438,7 +428,7 @@ Makefile "vclean"
 ------------------
 The generated makefile has a "vclean" target which cleans up the build
 directories.  If you have been building successfully and suddenly
-experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry.
+experience problems, use "vclean" (gmake -f netware\nlm.mak vclean) and retry.
 "Undefined Symbol" Linker errors
--- a/INSTALL.VMS
+++ b/INSTALL.VMS
@@ -25,8 +25,6 @@ Requirements:
 To build and install OpenSSL, you will need:
 * Perl 5 with core modules.  If you don't want to build it yourself,
   we suggest you look here: http://sourceforge.net/projects/vmsperlkit/files/
 * DEC C or some other ANSI C compiler.  VAX C is *not* supported.
   [Note: OpenSSL has only been tested with DEC C.  Compiling with 
    a different ANSI C compiler may require some work]
@@ -73,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:
@@ -85,14 +83,28 @@ directory.  The syntax is the following:
      RSAREF    Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
      CRYPTO    Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
      SSL       Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
      SSL_TASK  Just build the "[.xxx.EXE.SSL]SSL_TASK.EXE" program.
      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:
@@ -105,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.
@@ -131,23 +142,15 @@ Currently, the logical names supported are:
      OPENSSL_NO_ASM    with value YES, the assembler parts of OpenSSL will
                        not be used.  Instead, plain C implementations are
                        used.  This is good to try if something doesn't work.
-      OPENSSL_NO_'alg'  with value YES, the corresponding crypto algorithm,
+      OPENSSL_NO_'alg'  with value YES, the corresponding crypto algorithm
-                        protocol or other routine will not be implemented if
+                        will not be implemented.  Supported algorithms to
-                        disabling it is supported.  Supported algorithms to
+                        do this with are: RSA, DSA, DH, MD2, MD4, MD5, RIPEMD,
-                        do this with are: AES, BF, CAMELLIA, CAST, CMS, COMP,
+                        SHA, DES, MDC2, CR2, RC4, RC5, IDEA, BF, CAST, HMAC,
-                        DES, DGRAM, DH, DSA, EC, EC2M, ECDH, ECDSA, ENGINE,
+                        SSL2.  So, for example, having the logical name
-                        ERR, GOST, HEARTBEATS, HMAC, IDEA, MD2, MD4,
+                        OPENSSL_NO_RSA with the value YES means that the
-                        MD5, OCB, OCSP, PSK, RC2, RC4, RC5, RMD160, RSA, SCTP,
+                        LIBCRYPTO.OLB library will not contain an RSA
-                        SEED, SOCK, SRP, SRTP, WHIRLPOOL.  So, for
+                        implementation.
-                        example, having the logical name OPENSSL_NO_RSA with
+
                        the value YES means that the LIBCRYPTO.OLB library
                        will not contain an RSA implementation.
      OPENSSL_EXPERIMENTAL_'alg'
                        with value YES, the corresponding experimental
                        algorithm is enabled.  Note that is also requires
                        the application using this to define the C macro
                        OPENSSL_EXPERIMENTAL_'alg'.  Supported algorithms
                        to do this with are: JPAKE, STORE.
 Test:
 =====
@@ -167,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.
@@ -195,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
@@ -206,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.
@@ -213,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
@@ -299,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
@@ -5,31 +5,20 @@
 [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].
- - 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)
- Netwide Assembler, a.k.a. NASM, available from http://nasm.sourceforge.net/
+ If you are compiling from a tarball or a CVS snapshot then the Win32 files
  is required if you intend to utilize assembler modules. Note that NASM
  is now the only supported assembler.
 If you are compiling from a tarball or a Git snapshot then the Win32 files
 may well be not up to date. This may mean that some "tweaking" is required to
 get it all to work. See the trouble shooting section later on for if (when?)
 it goes wrong.
@@ -37,18 +26,39 @@
 Visual C++
 ----------
- If you want to compile in the assembly language routines with Visual
+ If you want to compile in the assembly language routines with Visual C++ then
- C++, then you will need already mentioned Netwide Assembler binary,
+ you will need an assembler. This is worth doing because it will result in
- nasmw.exe or nasm.exe, to be available on your %PATH%.
+ faster code: for example it will typically result in a 2 times speedup in the
 RSA routines. Currently the following assemblers are supported:
- Firstly you should run Configure with platform VC-WIN32:
+  * Microsoft MASM (aka "ml")
  * Free Netwide Assembler NASM.
- > perl Configure VC-WIN32 --prefix=c:\some\openssl\dir
+ MASM is distributed with most versions of VC++. For the versions where it is
 not included in VC++, it is also distributed with some Microsoft DDKs, for
 example the Windows NT 4.0 DDK and the Windows 98 DDK. If you do not have
 either of these DDKs then you can just download the binaries for the Windows
 98 DDK and extract and rename the two files XXXXXml.exe and XXXXXml.err, to
 ml.exe and ml.err and install somewhere on your PATH. Both DDKs can be
 downloaded from the Microsoft developers site www.msdn.com.
- Where the prefix argument specifies where OpenSSL will be installed to.
+ NASM is freely available. Version 0.98 was used during testing: other versions
 may also work. It is available from many places, see for example:
 http://www.kernel.org/pub/software/devel/nasm/binaries/win32/
 The NASM binary nasmw.exe needs to be installed anywhere on your PATH.
- Next you need to build the Makefiles and optionally the assembly
+ Firstly you should run Configure:
- language files:
+
 > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir
 Where the prefix argument specifies where OpenSSL will be installed to.
 Next you need to build the Makefiles and optionally the assembly language
 files:
 - If you are using MASM then run:
   > ms\do_masm
 - If you are using NASM then run:
@@ -56,7 +66,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 +76,42 @@
 > 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
- To install OpenSSL to the specified location do:
+To install OpenSSL to the specified location do:
- > nmake -f ms\ntdll.mak install
+> 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"
+ By default in 0.9.8 OpenSSL will compile builtin ENGINES into the libeay32.dll
- option on the command line to Configure the shared library build
+ shared library. If you specify the "no-static-engine" option on the command
- (ms\ntdll.mak) will compile the engines into libeay32.dll instead.
+ line to Configure the shared library build (ms\ntdll.mak) will compile the
 engines as separate DLLs.
 The default Win32 environment is to leave out any Windows NT specific
 features.
- 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
 ---------------------
@@ -125,13 +137,17 @@
 GNU C (Cygwin)
 --------------
- Cygwin implements a Posix/Unix runtime system (cygwin1.dll) on top of
+ Cygwin provides a bash shell and GNU tools environment running
- Win32 subsystem and provides a bash shell and GNU tools environment.
+ on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.
- Consequently, a make of OpenSSL with Cygwin is virtually identical to
+ Consequently, a make of OpenSSL with Cygwin is closer to a GNU
- Unix procedure. It is also possible to create Win32 binaries that only
+ bash environment such as Linux than to other the other Win32
- use the Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
+ makes.
- MinGW. MinGW can be used in the Cygwin development environment or in a
+
- standalone setup as described in the following section.
+ Cygwin implements a Posix/Unix runtime system (cygwin1.dll).
 It is also possible to create Win32 binaries that only use the
 Microsoft C runtime system (msvcrt.dll or crtdll.dll) using
 MinGW. MinGW can be used in the Cygwin development environment
 or in a standalone setup as described in the following section.
 To build OpenSSL using Cygwin:
@@ -176,44 +192,35 @@
 non-fatal error in "make test" but is otherwise harmless.  If
 desired and needed, GNU bc can be built with Cygwin without change.
- GNU C (MinGW/MSYS)
+ GNU C (MinGW)
 -------------
- * Compiler and shell environment installation:
+ * Compiler installation:
-   MinGW and MSYS are available from http://www.mingw.org/, both are
+   MinGW is available from http://www.mingw.org. Run the installer and
-   required. Run the installers and do whatever magic they say it takes
+   set the MinGW bin directory to the PATH in "System Properties" or
-   to start MSYS bash shell with GNU tools on its PATH.
+   autoexec.bat.
   N.B. Since source tar-ball can contain symbolic links, it's essential
   that you use accompanying MSYS tar to unpack the source. It will
   either handle them in one way or another or fail to extract them,
   which does the trick too. Latter means that you may safely ignore all
   "cannot create symlink" messages, as they will be "re-created" at
   configure stage by copying corresponding files. Alternative programs
   were observed to create empty files instead, which results in build
   failure.
 * Compile OpenSSL:
-   $ ./config
+   > ms\mingw32
   [...]
   $ make
   [...]
   $ make test
-   This will create the library and binaries in root source directory
+   This will create the library and binaries in out. In case any problems
-   and openssl.exe application in apps directory.
+   occur, try
-
+   > ms\mingw32 no-asm
-   It is also possible to cross-compile it on Linux by configuring
+   instead.
   with './Configure --cross-compile-prefix=i386-mingw32- mingw ...'.
   '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
+   See troubleshooting if you get error messages about functions not having
-   having a number assigned.
+   a number assigned.
 * You can now try the tests:
   > cd out
   > ..\ms\test
 Installation
 ------------
@@ -257,7 +264,7 @@
 then ms\do_XXX should not give a warning any more. However the numbers that
 get assigned by this technique may not match those that eventually get
- assigned in the 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
@@ -300,24 +307,13 @@
 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
+ WSOCK32.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
+ with latter two, as they are justly associated with interactive desktop,
- desktop, which is not available to service processes. The toolkit is
+ which is not available to service processes. The toolkit is designed
- designed to detect in which context it's currently executed, GUI,
+ to detect in which context it's currently executed, GUI, console app
- console app or service, and act accordingly, namely whether or not to
+ or service, and act accordingly, namely whether or not to actually make
- actually make GUI calls. Additionally those who wish to
+ GUI calls.
 /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
--- a/INSTALL.WCE
+++ b/INSTALL.WCE
@@ -4,36 +4,27 @@
 Building OpenSSL for Windows CE requires the following external tools:
-  * Microsoft eMbedded Visual C++ 3.0 or later
+  * Microsoft eMbedded Visual C++ 3.0
-  * Appropriate SDK might be required
+  * wcecompat compatibility library (www.essemer.com.au)
-  * Perl for Win32 [commonly recommended ActiveState Perl is available
+  * Optionally ceutils for running automated tests (www.essemer.com.au)
    from http://www.activestate.com/Products/ActivePerl/]
-  * wcecompat compatibility library available at
+ You also need Perl for Win32.  You will need ActiveState Perl, available
-    http://www.essemer.com.au/windowsce/
+ from http://www.activestate.com/ActivePerl.
  * Optionally ceutils for running automated tests (same location)
-  _or_
+ Windows CE support in OpenSSL relies on wcecompat and therefore it's
 appropriate to check http://www.essemer.com.au/windowsce/ for updates in
 case of compilation problems. As for the moment of this writing version
 1.1 is available and actually required for WCE 4.2 and newer platforms.
 All Windows CE specific issues should be directed to www.essemer.com.au.
-  * PocketConsole driver and PortSDK available at
+ The C Runtime Library implementation for Windows CE that is included with
-    http://www.symbolictools.de/public/pocketconsole/
+ Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
-  * CMD command interpreter (same location)
+ incorrect.  wcecompat plugs the holes and tries to bring the Windows CE
-
+ CRT to a level that is more compatible with ANSI C.  wcecompat goes further
- As Windows CE support in OpenSSL relies on 3rd party compatibility
+ and provides low-level IO and stream IO support for stdin/stdout/stderr
- library, it's appropriate to check corresponding URL for updates. For
+ (which Windows CE does not provide).  This IO functionality is not needed
- example if you choose wcecompat, note that as for the moment of this
+ by the OpenSSL library itself but is used for the tests and openssl.exe.
- writing version 1.2 is available and actually required for WCE 4.2
+ More information is available at www.essemer.com.au.
 and newer platforms. All wcecompat issues should be directed to
 www.essemer.com.au.
 Why compatibility library at all? The C Runtime Library implementation
 for Windows CE that is included with Microsoft eMbedded Visual C++ is
 incomplete and in some places incorrect.  Compatibility library plugs
 the holes and tries to bring the Windows CE CRT to [more] usable level.
 Most gaping hole in CRT is support for stdin/stdout/stderr IO, which
 proposed compatibility libraries solve in two different ways: wcecompat
 redirects IO to active sync link, while PortSDK - to NT-like console
 driver on the handheld itself.
 Building
 --------
@@ -43,21 +34,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 +52,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-2007 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/MacOS/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,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 2015 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
@@ -51,98 +51,120 @@
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <openssl/crypto.h>
 static long sargl;
 static void *sargp;
 static int sidx;
-static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
+ 
-          int idx, long argl, void *argp)
+ #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)
 {
-    assert(idx == sidx);
+	if (theErrorMessage != nil)
-    assert(argl == sargl);
+	{
-    assert(argp == sargp);
+		CopyCStrToCStr(theErrorMessage,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
-static int exdup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
+
-          void *from_d, int idx, long argl, void *argp)
+void SetErrorMessageAndAppendLongInt(const char *theErrorMessage,const long theLongInt)
 {
-    assert(idx == sidx);
+	if (theErrorMessage != nil)
-    assert(argl == sargl);
+	{
-    assert(argp == sargp);
+		CopyCStrAndConcatLongIntToCStr(theErrorMessage,theLongInt,gErrorMessage,gErrorMessageMaxLength);
-    return 0;
+	}
 }
-static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
+void SetErrorMessageAndCStrAndLongInt(const char *theErrorMessage,const char * theCStr,const long theLongInt)
            int idx, long argl, void *argp)
 {
-    assert(idx == sidx);
+	if (theErrorMessage != nil)
-    assert(argl == sargl);
+	{
-    assert(argp == sargp);
+		CopyCStrAndInsertCStrLongIntIntoCStr(theErrorMessage,theCStr,theLongInt,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
-typedef struct myobj_st {
+void SetErrorMessageAndCStr(const char *theErrorMessage,const char * theCStr)
    CRYPTO_EX_DATA ex_data;
    int id;
 } MYOBJ;
 static MYOBJ *MYOBJ_new()
 {
-    static int count = 0;
+	if (theErrorMessage != nil)
-    MYOBJ *obj = OPENSSL_malloc(sizeof(*obj));
+	{
-    int st;
+		CopyCStrAndInsertCStrLongIntIntoCStr(theErrorMessage,theCStr,-1,gErrorMessage,gErrorMessageMaxLength);
-
+	}
    obj->id = ++count;
    st = CRYPTO_new_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
    assert(st != 0);
    return obj;
 }
 static void MYOBJ_sethello(MYOBJ *obj, char *cp)
 {
    int st;
-    st = CRYPTO_set_ex_data(&obj->ex_data, sidx, cp);
+void AppendCStrToErrorMessage(const char *theErrorMessage)
-    assert(st != 0);
+{
 	if (theErrorMessage != nil)
 	{
 		ConcatCStrToCStr(theErrorMessage,gErrorMessage,gErrorMessageMaxLength);
 	}
 }
-static char *MYOBJ_gethello(MYOBJ *obj)
+
 void AppendLongIntToErrorMessage(const long theLongInt)
 {
-    return CRYPTO_get_ex_data(&obj->ex_data, sidx);
+	ConcatLongIntToCStr(theLongInt,gErrorMessage,gErrorMessageMaxLength);
 }
-static void MYOBJ_free(MYOBJ *obj)
+
 char *GetErrorMessage(void)
 {
-    CRYPTO_free_ex_data(CRYPTO_EX_INDEX_APP, obj, &obj->ex_data);
+	return gErrorMessage;
    OPENSSL_free(obj);
 }
 int main()
 {
    MYOBJ *t1, *t2;
    const char *cp;
    char *p;
-    p = strdup("hello world");
+OSErr GetErrorMessageInNewHandle(Handle *inoutHandle)
-    sargl = 21;
+{
-    sargp = malloc(1);
+OSErr		errCode;
-    sidx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP, sargl, sargp,
+
-                                   exnew, exdup, exfree);
+
-    t1 = MYOBJ_new();
+	errCode = CopyCStrToNewHandle(gErrorMessage,inoutHandle);
-    t2 = MYOBJ_new();
+	
-    MYOBJ_sethello(t1, p);
+	return(errCode);
    cp = MYOBJ_gethello(t1);
    assert(cp == p);
    cp = MYOBJ_gethello(t2);
    assert(cp == NULL);
    MYOBJ_free(t1);
    MYOBJ_free(t2);
    free(sargp);
    free(p);
    return 0;
 }
 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);
 }
 #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
@@ -26,14 +26,14 @@ HERE=.
 INSTALL_PREFIX=
 INSTALLTOP=/usr/local/ssl
-# Do not edit this manually. Use Configure --openssldir=DIR to change this!
+# Do not edit this manually. Use Configure --openssldir=DIR do change this!
 OPENSSLDIR=/usr/local/ssl
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm
 # NO_RC2  - Define to build without the RC2 algorithm
 # THREADS - Define when building with threads, you will probably also need any
-#           system defines as well, i.e. _REENTRANT for Solaris 2.[34]
+#           system defines as well, i.e. _REENTERANT for Solaris 2.[34]
 # TERMIO  - Define the termio terminal subsystem, needed if sgtty is missing.
 # TERMIOS - Define the termios terminal subsystem, Silicon Graphics.
 # LONGCRYPT - Define to use HPUX 10.x's long password modification to crypt(3).
@@ -65,15 +65,12 @@ EX_LIBS=
 EXE_EXT= 
 ARFLAGS=
 AR=ar $(ARFLAGS) r
 ARD=ar $(ARFLAGS) d
 RANLIB= ranlib
 NM= nm
 PERL= perl
 #RM= echo --
 RM= rm -f
 TAR= tar
 TARFLAGS= --no-recursion
 MAKEDEPPROG=makedepend
 LIBDIR=lib
 # We let the C compiler driver to take care of .s files. This is done in
 # order to be excused from maintaining a separate set of architecture
@@ -90,9 +87,8 @@ PROCESSOR=
 # CPUID module collects small commonly used assembler snippets
 CPUID_OBJ= 
 BN_ASM= bn_asm.o
 EC_ASM=
 DES_ENC= des_enc.o fcrypt_b.o
-AES_ENC= aes_core.o aes_cbc.o
+AES_ASM_OBJ=aes_core.o aes_cbc.o
 BF_ENC= bf_enc.o
 CAST_ENC= c_enc.o
 RC4_ENC= rc4_enc.o
@@ -100,11 +96,10 @@ RC5_ENC= rc5_enc.o
 MD5_ASM_OBJ= 
 SHA1_ASM_OBJ= 
 RMD160_ASM_OBJ= 
-WP_ASM_OBJ=
+
-CMLL_ENC=
+# KRB5 stuff
-MODES_ASM_OBJ=
+KRB5_INCLUDES=
-ENGINES_ASM_OBJ=
+LIBKRB5=
 PERLASM_SCHEME=
 # Zlib stuff
 ZLIB_INCLUDE=
@@ -114,14 +109,20 @@ LIBZLIB=
 # The FIPS module build will place it $(INSTALLTOP)/lib
 # but since $(INSTALLTOP) can only take the default value
 # when the module is built it will be in /usr/local/ssl/lib
-# $(INSTALLTOP) for this build may be different so hard
+# $(INSTALLTOP) for this build make be different so hard
 # code the path.
-FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
+FIPSLIBDIR=/usr/local/ssl/lib/
 # This is set to "y" if fipscanister.o is compiled internally as
 # opposed to coming from an external validated location.
 FIPSCANISTERINTERNAL=n
 # The location of the library which contains fipscanister.o
-# normally it will be libcrypto. If not compiling in FIPS mode
+# normally it will be libcrypto unless fipsdso is set in which
-# at all this is empty making it a useful test for a FIPS compile.
+# case it will be libfips. If not compiling in FIPS mode at all
 # this is empty making it a useful test for a FIPS compile.
 FIPSCANLIB=
@@ -130,20 +131,18 @@ FIPSCANLIB=
 BASEADDR=
-DIRS=   crypto ssl engines apps test tools
+DIRS=   crypto fips ssl engines apps test tools
-ENGDIRS= ccgost
+SHLIBDIRS= crypto ssl fips
 SHLIBDIRS= crypto ssl
 INSTALL_SUBS= engines apps tools
 # dirs in crypto to build
 SDIRS=  \
 	objects \
-	md2 md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 \
+	md2 md4 md5 sha mdc2 hmac ripemd \
-	des aes rc2 rc4 rc5 idea bf cast camellia seed chacha modes \
+	des aes rc2 rc4 rc5 idea bf cast camellia seed \
-	bn ec rsa dsa dh dso engine \
+	bn ec rsa dsa ecdsa dh ecdh dso engine \
 	buffer bio stack lhash rand err \
-	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-	cms pqueue ts jpake srp store cmac ct async
+	store pqueue
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
@@ -157,36 +156,29 @@ MANDIR=$(OPENSSLDIR)/man
 MAN1=1
 MAN3=3
 MANSUFFIX=
 HTMLSUFFIX=html
 HTMLDIR=$(OPENSSLDIR)/html
 SHELL=/bin/sh
 TOP=    .
 ONEDIRS=out tmp
 EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS
 WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
 SHARED_FIPS=
 SHARED_LIBS=
 SHARED_LIBS_LINK_EXTS=
 SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
-NAME=           $(BASENAME)-$(VERSION)
+NAME=           $(BASENAME)-fips-$(VERSION)
-TARFILE=        ../$(NAME).tar
+TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
-# Directories created on install if they don't exist.
+all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
 INSTALLDIRS=	\
 		$(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
 all: Makefile build_all
 # as we stick to -e, CLEARENV ensures that local variables in lower
 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -197,47 +189,39 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
 		$${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}	\
 		$${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}		\
 		$${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL}	\
-		$${HEADER+HEADER}				\
+		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
 		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
 		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
-		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS}	\
+		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
 		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
 		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
-# LC_ALL=C ensures that error [and other] messages are delivered in
+BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
-# same language for uniform treatment.
+		CC='${CC}' CFLAG='${CFLAG}' 			\
-BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
+		AS='${CC}' ASFLAG='${CFLAG} -c'			\
-		CC='$(CC)' CFLAG='$(CFLAG)' 			\
+		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
-		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
+		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
-		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
+		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
-		CROSS_COMPILE='$(CROSS_COMPILE)'	\
+		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
-		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
+		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
-		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\
+		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
-		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\
+		MAKEDEPPROG='${MAKEDEPPROG}'			\
-		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\
+		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
-		LIBDIR='$(LIBDIR)'				\
+		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
-		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
+		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
-		DEPFLAG='$(DEPFLAG)'                    	\
+		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\
-		MAKEDEPPROG='$(MAKEDEPPROG)'			\
+		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\
-		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
+		CPUID_OBJ='${CPUID_OBJ}'			\
-		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
+		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\
-		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\
+		AES_ASM_OBJ='${AES_ASM_OBJ}'			\
-		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\
+		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\
-		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\
+		RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'	\
-		CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)'	\
+		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\
-		EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)'		\
+		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\
-		AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)'	\
+		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\
-		BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)'	\
+		FIPSLIBDIR='${FIPSLIBDIR}' FIPSCANLIB='${FIPSCANLIB}' \
-		RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)'	\
+		FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'	\
-		SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)'			\
+		FIPS_EX_OBJ='${FIPS_EX_OBJ}'	\
 		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\
 		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\
 		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\
 		MODES_ASM_OBJ='$(MODES_ASM_OBJ)'		\
 		ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'		\
 		PERLASM_SCHEME='$(PERLASM_SCHEME)'		\
 		FIPSLIBDIR='${FIPSLIBDIR}'			\
 		FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"	\
 		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
 # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
 # which in turn eliminates ambiguities in variable treatment with -e.
@@ -248,13 +232,13 @@ BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
 # This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
 # BUILD_ONE_CMD instead.
 #
 # RECURSIVE_BUILD_CMD is a macro to build a given target in all
 # subdirectories defined in $(DIRS).  It requires that the target
 # is given through the shell variable `target'.
 #
 # BUILD_ONE_CMD is a macro to build a given target in a given
 # subdirectory if that subdirectory is part of $(DIRS).  It requires
 # exactly the same shell variables as BUILD_CMD.
 #
 # RECURSIVE_BUILD_CMD is a macro to build a given target in all
 # subdirectories defined in $(DIRS).  It requires that the target
 # is given through the shell variable `target'.
 BUILD_CMD=  if [ -d "$$dir" ]; then \
 	    (	cd $$dir && echo "making $$target in $$dir..." && \
 		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
@@ -262,47 +246,120 @@ BUILD_CMD=  if [ -d "$$dir" ]; then \
 	    fi
 RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
 BUILD_ONE_CMD=\
-	if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \
+	if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
 		$(BUILD_CMD); \
 	fi
 reflect:
 	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
-sub_all: build_all
+FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
 	../crypto/aes/aes_ecb.o \
 	../crypto/aes/aes_ofb.o \
 	../crypto/bn/bn_add.o \
 	../crypto/bn/bn_blind.o \
 	../crypto/bn/bn_ctx.o \
 	../crypto/bn/bn_div.o \
 	../crypto/bn/bn_exp2.o \
 	../crypto/bn/bn_exp.o \
 	../crypto/bn/bn_gcd.o \
 	../crypto/bn/bn_lib.o \
 	../crypto/bn/bn_mod.o \
 	../crypto/bn/bn_mont.o \
 	../crypto/bn/bn_mul.o \
 	../crypto/bn/bn_prime.o \
 	../crypto/bn/bn_rand.o \
 	../crypto/bn/bn_recp.o \
 	../crypto/bn/bn_shift.o \
 	../crypto/bn/bn_sqr.o \
 	../crypto/bn/bn_word.o \
 	../crypto/bn/bn_x931p.o \
 	../crypto/buffer/buf_str.o \
 	../crypto/cryptlib.o \
 	../crypto/des/cfb64ede.o \
 	../crypto/des/cfb64enc.o \
 	../crypto/des/cfb_enc.o \
 	../crypto/des/ecb3_enc.o \
 	../crypto/des/ecb_enc.o \
 	../crypto/des/ofb64ede.o \
 	../crypto/des/ofb64enc.o \
 	../crypto/des/fcrypt.o \
 	../crypto/des/set_key.o \
 	../crypto/dsa/dsa_utl.o \
 	../crypto/dsa/dsa_sign.o \
 	../crypto/dsa/dsa_vrf.o \
 	../crypto/err/err.o \
 	../crypto/evp/digest.o \
 	../crypto/evp/enc_min.o \
 	../crypto/evp/e_aes.o \
 	../crypto/evp/e_des3.o \
 	../crypto/evp/p_sign.o \
 	../crypto/evp/p_verify.o \
 	../crypto/mem_clr.o \
 	../crypto/mem.o \
 	../crypto/rand/md_rand.o \
 	../crypto/rand/rand_egd.o \
 	../crypto/rand/randfile.o \
 	../crypto/rand/rand_lib.o \
 	../crypto/rand/rand_os2.o \
 	../crypto/rand/rand_unix.o \
 	../crypto/rand/rand_win.o \
 	../crypto/rsa/rsa_lib.o \
 	../crypto/rsa/rsa_none.o \
 	../crypto/rsa/rsa_oaep.o \
 	../crypto/rsa/rsa_pk1.o \
 	../crypto/rsa/rsa_pss.o \
 	../crypto/rsa/rsa_ssl.o \
 	../crypto/rsa/rsa_x931.o \
 	../crypto/sha/sha1dgst.o \
 	../crypto/sha/sha256.o \
 	../crypto/sha/sha512.o \
 	../crypto/uid.o
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
-build_libs: build_libcrypto build_libssl openssl.pc
+build_libs: build_crypto build_fips build_ssl build_shared build_engines
 build_libcrypto: build_crypto build_engines libcrypto.pc
 build_libssl: build_ssl libssl.pc
 build_crypto:
-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
+	if [ -n "$(FIPSCANLIB)" ]; then \
-build_ssl: build_crypto
+		EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
 		ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
 	else \
 		ARX='${AR}' ; \
 	fi ; export ARX ; \
 		dir=crypto; target=all; $(BUILD_ONE_CMD)
 build_fips:
 	@dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
 build_ssl:
 	@dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines: build_crypto
+build_engines:
-	@dir=engines; target=all; AS='$(CC) -c'; export AS; $(BUILD_ONE_CMD)
+	@dir=engines; target=all; $(BUILD_ONE_CMD)
-
+build_apps:
 build_apps: build_libs
 	@dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests: build_libs
+build_tests:
 	@dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools: build_libs
+build_tools:
 	@dir=tools; target=all; $(BUILD_ONE_CMD)
 all_testapps: build_libs build_testapps
 build_testapps:
 	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
-libcrypto$(SHLIB_EXT): libcrypto.a
+build_shared:	$(SHARED_LIBS)
 libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+		if [ "$(FIPSCANLIB)" = "libfips" ]; then \
-			FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+			$(ARD) libcrypto.a fipscanister.o ; \
-			export CC FIPSLD_CC; \
+			$(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
-		fi; \
+			$(AR) libcrypto.a fips/fipscanister.o ; \
-		$(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared; \
+		else \
 			if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
 				FIPSLD_CC=$(CC); CC=fips/fipsld; \
 				export CC FIPSLD_CC; \
 			fi; \
 			$(MAKE) -e SHLIBDIRS='crypto' build-shared; \
 		fi \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \
@@ -310,12 +367,32 @@ libcrypto$(SHLIB_EXT): libcrypto.a
 libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
-		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
+		shlibdeps=-lcrypto; \
 		[ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
 		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2 ; \
 		exit 1; \
 	fi
 fips/fipscanister.o:	build_fips
 libfips$(SHLIB_EXT):		fips/fipscanister.o
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 		FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
 		$(MAKE) -f Makefile.shared -e $(BUILDENV) \
 			CC=$${CC} LIBNAME=fips THIS=$@ \
 			LIBEXTRAS=fips/fipscanister.o \
 			LIBDEPS="$(EX_LIBS)" \
 			LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 		exit 1; \
 	fi
 libfips.a:
 	dir=fips; target=all; $(BUILD_ONE_CMD)
 clean-shared:
 	@set -e; for i in $(SHLIBDIRS); do \
 		if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
@@ -325,16 +402,16 @@ clean-shared:
 			done; \
 		fi; \
 		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
-		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
+		if [ "$(PLATFORM)" = "Cygwin" ]; then \
 			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
 		fi; \
 	done
 link-shared:
-	@ set -e; for i in $(SHLIBDIRS); do \
+	@ set -e; for i in ${SHLIBDIRS}; do \
 		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
-			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
+			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			symlink.$(SHLIB_TARGET); \
 		libs="$$libs -l$$i"; \
 	done
@@ -342,10 +419,13 @@ link-shared:
 build-shared: do_$(SHLIB_TARGET) link-shared
 do_$(SHLIB_TARGET):
-	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \
+	@ set -e; libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
 			libs="$(LIBKRB5) $$libs"; \
 		fi; \
 		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
-			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
-			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
+			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
 			LIBDEPS="$$libs $(EX_LIBS)" \
 			link_a.$(SHLIB_TARGET); \
 		libs="-l$$i $$libs"; \
@@ -354,41 +434,41 @@ do_$(SHLIB_TARGET):
 libcrypto.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL-libcrypto'; \
 	    echo 'Description: OpenSSL cryptography library'; \
 	    echo 'Version: '$(VERSION); \
 	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lcrypto'; \
+	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-	    echo 'Libs.private: $(EX_LIBS)'; \
+	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 	    echo 'Cflags: -I$${includedir}' ) > libcrypto.pc
 libssl.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
-	    echo 'Name: OpenSSL-libssl'; \
+	    echo 'Name: OpenSSL'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
 	    echo 'Version: '$(VERSION); \
-	    echo 'Requires.private: libcrypto'; \
+	    echo 'Requires: '; \
-	    echo 'Libs: -L$${libdir} -lssl'; \
+	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-	    echo 'Libs.private: $(EX_LIBS)'; \
+	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
 	    echo 'Cflags: -I$${includedir}' ) > libssl.pc
 openssl.pc: Makefile
 	@ ( echo 'prefix=$(INSTALLTOP)'; \
 	    echo 'exec_prefix=$${prefix}'; \
-	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+	    echo 'libdir=$${exec_prefix}/lib'; \
 	    echo 'includedir=$${prefix}/include'; \
 	    echo ''; \
 	    echo 'Name: OpenSSL'; \
 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
 	    echo 'Version: '$(VERSION); \
-	    echo 'Requires: libssl libcrypto' ) > openssl.pc
+	    echo 'Requires: '; \
 	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 Makefile: Makefile.org Configure config
 	@echo "Makefile is older than Makefile.org, Configure or config."
@@ -396,16 +476,19 @@ Makefile: Makefile.org Configure config
 	@false
 libclean:
-	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
+	rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
 clean:	libclean
-	rm -f */*/*.o */*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
 	rm -rf *.bak certs/.0
 	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
-	rm -f $(LIBS) tags TAGS
+	rm -f $(LIBS)
 	rm -f openssl.pc libssl.pc libcrypto.pc
 	rm -f speed.* .pure
 	rm -f $(TARFILE)
 	@set -e; for i in $(ONEDIRS) ;\
 	do \
 	rm -fr $$i/*; \
 	done
 makefile.one: files
 	$(PERL) util/mk1mf.pl >makefile.one; \
@@ -415,64 +498,53 @@ files:
 	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
 	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
 links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
 	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \
-	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
 dclean:
 	rm -f *.bak
 	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 rehash: rehash.time
 rehash.time: certs apps
 	@if [ -z "$(CROSS_COMPILE)" ]; then \
 		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
-		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
+		OPENSSL_DEBUG_MEMORY=on; \
-		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
+		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
+		$(PERL) tools/c_rehash certs) && \
 		$$OPENSSL rehash certs/demo) && \
 		touch rehash.time; \
 	else :; fi
 test:   tests
 test_ordinals:
 	TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals
 tests: rehash
 	@(cd test && echo "testing..." && \
-	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
+	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
-	@if [ -z "$(CROSS_COMPILE)" ]; then \
+	util/opensslwrap.sh version -a
 		OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a; \
 	fi
 list-tests:
 	@(cd test && \
 	        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. list-tests)
 report:
 	@$(PERL) util/selftest.pl
 update: errors stacks util/libeay.num util/ssleay.num TABLE test_ordinals
 	@set -e; target=update; $(RECURSIVE_BUILD_CMD)
 depend:
 	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
 lint:
 	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
-tags TAGS: FORCE
+tags:
-	rm -f TAGS tags
+	rm -f TAGS
-	-ctags -R .
+	find . -name '[^.]*.[ch]' | xargs etags -a
 	-etags -R .
 FORCE:
 errors:
 	$(PERL) util/ck_errf.pl -strict */*.c */*/*.c
 	$(PERL) util/mkerr.pl -recurse -write
 	(cd engines; $(MAKE) PERL=$(PERL) errors)
-	(cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
+	$(PERL) util/ck_errf.pl */*.c */*/*.c
 stacks:
 	$(PERL) util/mkstack.pl -write
@@ -483,63 +555,84 @@ util/libeay.num::
 util/ssleay.num::
 	$(PERL) util/mkdef.pl ssl update
-TABLE: Configure Configurations/*.conf
+crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
 	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
 crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
 	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
 apps/openssl-vms.cnf: apps/openssl.cnf
 	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
 crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
 	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
 TABLE: Configure
 	(echo 'Output of `Configure TABLE'"':"; \
 	$(PERL) Configure TABLE) > TABLE
 update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
 # Build distribution tar-file. As the list of files returned by "find" is
 # pretty long, on several platforms a "too many arguments" error or similar
 # would occur. Therefore the list of files is temporarily stored into a file
 # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
 # tar does not support the --files-from option.
-TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \
+tar:
 	                       --owner 0 --group 0 \
 			       --transform 's|^|$(NAME)/|' \
 			       -cvf -
 $(TARFILE).list:
 	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \
 	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \
 	       \! -name '*test' \! -name '.#*' \! -name '*~' \!	-type l \
 	    | sort > $(TARFILE).list
 tar: $(TARFILE).list
 	find . -type d -print | xargs chmod 755
 	find . -type f -print | xargs chmod a+r
 	find . -type f -perm -0100 -print | xargs chmod a+x
-	$(TAR_COMMAND) | gzip --best > $(TARFILE).gz
+	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-	rm -f $(TARFILE).list
+	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
-	ls -l $(TARFILE).gz
+	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
 	      --prefix=openssl-fips-$(VERSION) - |\
 	gzip --best >../$(TARFILE).gz; \
 	rm -f ../$(TARFILE).list; \
 	ls -l ../$(TARFILE).gz
-tar-snap: $(TARFILE).list
+tar-snap:
-	$(TAR_COMMAND) > $(TARFILE)
+	@$(TAR) $(TARFLAGS) -cvf - \
-	rm -f $(TARFILE).list
+		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-	ls -l $(TARFILE)
+	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
 	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
 	ls -l ../$(TARFILE)
 dist:   
 	$(PERL) Configure dist
-	@$(MAKE) SDIRS='$(SDIRS)' clean
+	@$(MAKE) dist_pem_h
-	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
+	@$(MAKE) SDIRS='${SDIRS}' clean
 	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
-install: all install_docs install_sw
+dist_pem_h:
 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-uninstall: uninstall_sw uninstall_docs
+install: all install_sw
 install_sw:
-	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
+	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-	@set -e; for i in include/openssl/*.h; do \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
-	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
 	do \
 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 	done;
-	@set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done
+	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+	@set -e; for i in $(LIBS) ;\
 	do \
 		if [ -f "$$i" ]; then \
 		(       echo installing $$i; \
-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 		fi; \
 	done;
 	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -548,127 +641,37 @@ install_sw:
 		do \
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 			(       echo installing $$i; \
-				if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
+				if [ "$(PLATFORM)" != "Cygwin" ]; then \
 					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				else \
 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				else \
 					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
 					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 				fi ); \
 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 				(	case $$i in \
 						*crypto*) i=libeay32.dll;; \
 						*ssl*)    i=ssleay32.dll;; \
 					esac; \
 					echo installing $$i; \
 					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
 				fi; \
 			fi; \
 		done; \
 		(	here="`pwd`"; \
-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
 			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
 			echo 'OpenSSL shared libraries have been installed in:'; \
 			echo '  $(INSTALLTOP)'; \
 			echo ''; \
 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
 		fi; \
 	fi
-	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
-	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
+	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
 uninstall_sw:
 	cd include/openssl && files=* && cd $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl && $(RM) $$files
 	@for i in $(LIBS) ;\
 	do \
 		test -f "$$i" && \
 		echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i && \
 		$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 	done;
 	@if [ -n "$(SHARED_LIBS)" ]; then \
 		tmp="$(SHARED_LIBS)"; \
 		for i in $${tmp:-x}; \
 		do \
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 				if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
 					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
 					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
 					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 				else \
 					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
 				fi; \
 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 					case $$i in \
 						*crypto*) i=libeay32.dll;; \
 						*ssl*)    i=ssleay32.dll;; \
 					esac; \
 					echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
 					$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
 				fi; \
 			fi; \
 		done; \
 	fi
 	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
 	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
 	$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
 	@target=uninstall; $(RECURSIVE_BUILD_CMD)
 install_html_docs:
 	here="`pwd`"; \
 	filecase=; \
 	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
 		filecase=-i; \
 	esac; \
 	for subdir in apps crypto ssl; do \
 		$(PERL) $(TOP)/util/mkdir-p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
 		for i in doc/$$subdir/*.pod; do \
 			fn=`basename $$i .pod`; \
 			echo "installing html/$$fn.$(HTMLSUFFIX)"; \
 			cat $$i \
 			| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
 			| pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \
 			| sed -r 's/<!DOCTYPE.*//g' \
 			> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
 			$(PERL) util/extract-names.pl < $$i | \
 				grep -v $$filecase "^$$fn\$$" | \
 				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \
 				 while read n; do \
 					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \
 				 done); \
 		done; \
 	done
 uninstall_html_docs:
 	here="`pwd`"; \
 	filecase=; \
 	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
 		filecase=-i; \
 	esac; \
 	for subdir in apps crypto ssl; do \
 		for i in doc/$$subdir/*.pod; do \
 			fn=`basename $$i .pod`; \
 			$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
 			$(PERL) util/extract-names.pl < $$i | \
 				grep -v $$filecase "^$$fn\$$" | \
 				while read n; do \
 					$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \
 				done; \
 		done; \
 	done
 install_docs:
 	@$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -676,26 +679,27 @@ install_docs:
 		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 		$(INSTALL_PREFIX)$(MANDIR)/man7
 	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
 	here="`pwd`"; \
 	filecase=; \
-	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
+	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
 		filecase=-i; \
-	esac; \
+	fi; \
 	set -e; for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
-		pod2man \
+		sh -c "$$pod2man \
 			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`) \
+			--release=$(VERSION) `basename $$i`") \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done; \
 	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
@@ -703,50 +707,17 @@ install_docs:
 		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 		(cd `$(PERL) util/dirname.pl $$i`; \
-		pod2man \
+		sh -c "$$pod2man \
 			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`) \
+			--release=$(VERSION) `basename $$i`") \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
 			 while read n; do \
-				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
 			 done); \
 	done
 uninstall_docs:
 	@here="`pwd`"; \
 	filecase=; \
 	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
 		filecase=-i; \
 	esac; \
 	for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 		echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			while read n; do \
 				echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
 				$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
 			done; \
 	done; \
 	for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 		fn=`basename $$i .pod`; \
 		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
 		echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
 		$(PERL) util/extract-names.pl < $$i | \
 			(grep -v $$filecase "^$$fn\$$"; true) | \
 			(grep -v "[	]"; true) | \
 			while read n; do \
 				echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
 				$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
 			done; \
 	done
 # DO NOT DELETE THIS LINE -- make depend depends on it.
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -14,8 +14,6 @@ CFLAGS=$(CFLAG)
 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
@@ -93,7 +91,7 @@ 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=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
@@ -103,7 +101,7 @@ LINK_SO=	\
    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=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
    $${SHAREDCMD} $${SHAREDFLAGS} \
@@ -135,7 +133,7 @@ LINK_SO_A_VIA_O=	\
  ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
  ( $(SET_X); \
    ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
-  $(LINK_SO) && rm -f lib$(LIBNAME).o
+  $(LINK_SO) && rm -f $(LIBNAME).o
 LINK_SO_A_UNPACKED=	\
  UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
@@ -144,7 +142,7 @@ LINK_SO_A_UNPACKED=	\
  SHOBJECTS=$$UNPACKDIR/*.o; \
  $(LINK_SO) && rm -rf $$UNPACKDIR
-DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
 DO_GNU_SO=$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
@@ -171,7 +169,7 @@ link_app.gnu:
 	@ $(DO_GNU_APP); $(LINK_APP)
 link_o.bsd:
-	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
+	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
@@ -181,7 +179,7 @@ link_o.bsd:
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 	fi; $(LINK_SO_O)
 link_a.bsd:
-	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
+	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
@@ -191,34 +189,24 @@ link_a.bsd:
 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
 	fi; $(LINK_SO_A)
 link_app.bsd:
-	@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
+	@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
+# link_o.darwin produces .so, because we let it use dso_dlfcn module,
-# in dso_dlfcn module. At later point dso_dlfcn switched to .dylib
+# which has .so extension hard-coded. One can argue that one should
-# extension in order to allow for run-time linking with vendor-
+# develop special dso module for MacOS X. At least manual encourages
-# supplied shared libraries such as libz, so that link_o.darwin had
+# to use native NSModule(3) API and refers to dlfcn as termporary hack.
 # 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=`expr "$$THIS" : '.*/\([^/\.]*\)\.'`; \
-	SHLIB_SUFFIX=.dylib; \
+	SHLIB=$${SHLIB:-lib$(LIBNAME)}; \
 	SHLIB_SUFFIX=`expr "$$THIS" : '.*\(\.[^\.]*\)$$'`; \
 	SHLIB_SUFFIX=$${SHLIB_SUFFIX:-.so}; \
 	ALLSYMSFLAGS='-all_load'; \
 	NOALLSYMSFLAGS=''; \
-	SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
 	if [ -n "$(LIBVERSION)" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
 	fi; \
@@ -239,7 +227,7 @@ link_a.darwin:
 	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
 		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
 	fi; \
-	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/$(LIBDIR)/$$SHLIB$(SHLIB_EXT)"; \
+	SHAREDFLAGS="$$SHAREDFLAGS -install_name ${INSTALLTOP}/lib/$$SHLIB${SHLIB_EXT}"; \
 	$(LINK_SO_A)
 link_app.darwin:	# is there run-path on darwin?
 	$(LINK_APP)
@@ -249,59 +237,40 @@ link_o.cygwin:
 	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"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
 	$(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; \
+	SHLIB=cyg$(LIBNAME); \
 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
 	base=-Wl,--enable-auto-image-base; \
 	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
-		case $(LIBNAME) in \
+		SHLIB=$(LIBNAME)eay32; \
-			crypto) SHLIB=libeay;; \
+		base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
 			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; \
+	SHLIB_SUFFIX=.dll; \
-	$(PERL) util/mkrc.pl $$dll_name | \
+	SHLIB_SOVER=-$(LIBVERSION); \
 		$(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"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
-	[ -f apps/$$dll_name ] && rm apps/$$dll_name; \
+	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
-	[ -f test/$$dll_name ] && rm test/$$dll_name; \
+	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
 	$(LINK_SO_A) || exit 1; \
-	rm $$extras; \
+	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \
-	cp -p $$dll_name apps/; \
+	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/
 	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 \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		SHLIB=lib$(LIBNAME).so; \
@@ -322,7 +291,7 @@ link_o.alpha-osf1:
 	fi; \
 	$(LINK_SO_O)
 link_a.alpha-osf1:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		SHLIB=lib$(LIBNAME).so; \
@@ -343,7 +312,7 @@ link_a.alpha-osf1:
 	fi; \
 	$(LINK_SO_A)
 link_app.alpha-osf1:
-	@if $(DETECT_GNU_LD); then \
+	@if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_APP); \
 	else \
 		LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
@@ -351,7 +320,7 @@ link_app.alpha-osf1:
 	$(LINK_APP)
 link_o.solaris:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -365,12 +334,12 @@ link_o.solaris:
 	fi; \
 	$(LINK_SO_O)
 link_a.solaris:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
 		MINUSZ='-z '; \
-		($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+		(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=;\
 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
@@ -379,7 +348,7 @@ link_a.solaris:
 	fi; \
 	$(LINK_SO_A)
 link_app.solaris:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_APP); \
 	else \
 		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
@@ -388,7 +357,7 @@ link_app.solaris:
 # OpenServer 5 native compilers used
 link_o.svr3:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -400,7 +369,7 @@ link_o.svr3:
 	fi; \
 	$(LINK_SO_O)
 link_a.svr3:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -412,12 +381,12 @@ link_a.svr3:
 	fi; \
 	$(LINK_SO_A_UNPACKED)
 link_app.svr3:
-	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \
+	@${DETECT_GNU_LD} && $(DO_GNU_APP); \
 	$(LINK_APP)
 # UnixWare 7 and OpenUNIX 8 native compilers used
 link_o.svr5:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -431,12 +400,12 @@ link_o.svr5:
 	fi; \
 	$(LINK_SO_O)
 link_a.svr5:
-	@ if $(DETECT_GNU_LD); then \
+	@ 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'; \
+		(${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 		SHLIB=lib$(LIBNAME).so; \
 		SHLIB_SUFFIX=; \
 		ALLSYMSFLAGS=''; \
@@ -445,11 +414,11 @@ link_a.svr5:
 	fi; \
 	$(LINK_SO_A_UNPACKED)
 link_app.svr5:
-	@$(DETECT_GNU_LD) && $(DO_GNU_APP); \
+	@${DETECT_GNU_LD} && $(DO_GNU_APP); \
 	$(LINK_APP)
 link_o.irix:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -463,7 +432,7 @@ link_o.irix:
 	fi; \
 	$(LINK_SO_O)
 link_a.irix:
-	@ if $(DETECT_GNU_LD); then \
+	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_SO); \
 	else \
 		$(CALC_VERSIONS); \
@@ -489,7 +458,7 @@ link_app.irix:
 # ELFs by the way].
 #
 link_o.hpux:
-	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
+	@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; \
@@ -502,7 +471,7 @@ link_o.hpux:
 	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 \
+	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
 	$(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).sl; \
 	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
@@ -515,39 +484,57 @@ link_a.hpux:
 	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 \
+	@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=`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'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_O);
 link_a.aix:
 	@ $(CALC_VERSIONS); \
-	OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
+	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'; \
+	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
 	$(LINK_SO_A_VIA_O)
 link_app.aix:
 	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
 	$(LINK_APP)
 link_o.reliantunix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS=; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) -G'; \
 	$(LINK_SO_O)
 link_a.reliantunix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	SHLIB_SUFFIX=; \
 	ALLSYMSFLAGS=; \
 	NOALLSYMSFLAGS=''; \
 	SHAREDFLAGS='$(CFLAGS) -G'; \
 	$(LINK_SO_A_UNPACKED)
 link_app.reliantunix:
 	$(LINK_APP)
 # Targets to build symbolic links when needed
 symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
-symlink.aix:
+symlink.aix symlink.reliantunix:
 	@ $(CALC_VERSIONS); \
 	SHLIB=lib$(LIBNAME).so; \
 	$(SYMLINK_SO)
@@ -616,3 +603,7 @@ link_o.aix-shared: link_o.aix
 link_a.aix-shared: link_a.aix
 link_app.aix-shared: link_app.aix
 symlink.aix-shared: symlink.aix
 link_o.reliantunix-shared: link_o.reliantunix
 link_a.reliantunix-shared: link_a.reliantunix
 link_app.reliantunix-shared: link_app.reliantunix
 symlink.reliantunix-shared: symlink.reliantunix
--- a/375
+++ b/375
@@ -5,319 +5,23 @@
  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.2e and OpenSSL 1.1.0 [in pre-release]
+  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e:
      o Support for ChaCha20 and Poly1305 added to libcrypto and libssl
      o Support for extended master secret
      o CCM ciphersuites
      o Reworked test suite, now based on perl, Test::Harness and Test::More
      o Varous libcrypto structures made opaque including: BIGNUM, EVP_MD,
        EVP_MD_CTX and HMAC_CTX.
      o libssl internal structures made opaque
      o SSLv2 support removed
      o Kerberos ciphersuite support removed
      o RC4 removed from DEFAULT ciphersuites in libssl
      o 40 and 56 bit cipher support removed from libssl
      o All public header files moved to include/openssl, no more symlinking
      o SSL/TLS state machine, version negotiation and record layer rewritten
      o EC revision: now operations use new EC_KEY_METHOD.
      o Support for OCB mode added to libcrypto
      o Support for asynchronous crypto operations added to libcrypto and libssl
  Major changes between OpenSSL 1.0.2d and OpenSSL 1.0.2e [3 Dec 2015]
      o BN_mod_exp may produce incorrect results on x86_64 (CVE-2015-3193)
      o Certificate verify crash with missing PSS parameter (CVE-2015-3194)
      o X509_ATTRIBUTE memory leak (CVE-2015-3195)
      o Rewrite EVP_DecodeUpdate (base64 decoding) to fix several bugs
      o In DSA_generate_parameters_ex, if the provided seed is too short,
        return an error
  Major changes between OpenSSL 1.0.2c and OpenSSL 1.0.2d [9 Jul 2015]
      o Alternate chains certificate forgery (CVE-2015-1793)
      o Race condition handling PSK identify hint (CVE-2015-3196)
  Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
      o Fix HMAC ABI incompatibility
  Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015]
      o Malformed ECParameters causes infinite loop (CVE-2015-1788)
      o Exploitable out-of-bounds read in X509_cmp_time (CVE-2015-1789)
      o PKCS7 crash with missing EnvelopedContent (CVE-2015-1790)
      o CMS verify infinite loop with unknown hash function (CVE-2015-1792)
      o Race condition handling NewSessionTicket (CVE-2015-1791)
  Major changes between OpenSSL 1.0.2 and OpenSSL 1.0.2a [19 Mar 2015]
      o OpenSSL 1.0.2 ClientHello sigalgs DoS fix (CVE-2015-0291)
      o Multiblock corrupted pointer fix (CVE-2015-0290)
      o Segmentation fault in DTLSv1_listen fix (CVE-2015-0207)
      o Segmentation fault in ASN1_TYPE_cmp fix (CVE-2015-0286)
      o Segmentation fault for invalid PSS parameters fix (CVE-2015-0208)
      o ASN.1 structure reuse memory corruption fix (CVE-2015-0287)
      o PKCS7 NULL pointer dereferences fix (CVE-2015-0289)
      o DoS via reachable assert in SSLv2 servers fix (CVE-2015-0293)
      o Empty CKE with client auth and DHE fix (CVE-2015-1787)
      o Handshake with unseeded PRNG fix (CVE-2015-0285)
      o Use After Free following d2i_ECPrivatekey error fix (CVE-2015-0209)
      o X509_to_X509_REQ NULL pointer deref fix (CVE-2015-0288)
      o Removed the export ciphers from the DEFAULT ciphers
  Major changes between OpenSSL 1.0.1l and OpenSSL 1.0.2 [22 Jan 2015]:
      o Suite B support for TLS 1.2 and DTLS 1.2
      o Support for DTLS 1.2
      o TLS automatic EC curve selection.
      o API to set TLS supported signature algorithms and curves
      o SSL_CONF configuration API.
      o TLS Brainpool support.
      o ALPN support.
      o CMS support for RSA-PSS, RSA-OAEP, ECDH and X9.42 DH.
  Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
      o Build fixes for the Windows and OpenVMS platforms
  Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
      o Fix for CVE-2014-3571
      o Fix for CVE-2015-0206
      o Fix for CVE-2014-3569
      o Fix for CVE-2014-3572
      o Fix for CVE-2015-0204
      o Fix for CVE-2015-0205
      o Fix for CVE-2014-8275
      o Fix for CVE-2014-3570
  Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014]
      o Fix for CVE-2014-3513
      o Fix for CVE-2014-3567
      o Mitigation for CVE-2014-3566 (SSL protocol vulnerability)
      o Fix for CVE-2014-3568
  Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014]
      o Fix for CVE-2014-3512
      o Fix for CVE-2014-3511
      o Fix for CVE-2014-3510
      o Fix for CVE-2014-3507
      o Fix for CVE-2014-3506
      o Fix for CVE-2014-3505
      o Fix for CVE-2014-3509
      o Fix for CVE-2014-5139
      o Fix for CVE-2014-3508
  Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]
      o Fix for CVE-2014-0224
      o Fix for CVE-2014-0221
      o Fix for CVE-2014-0198
      o Fix for CVE-2014-0195
      o Fix for CVE-2014-3470
      o Fix for CVE-2010-5298
  Major changes between OpenSSL 1.0.1f and OpenSSL 1.0.1g [7 Apr 2014]
      o Fix for CVE-2014-0160
      o Add TLS padding extension workaround for broken servers.
      o Fix for CVE-2014-0076
  Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [6 Jan 2014]
      o Don't include gmt_unix_time in TLS server and client random values
      o Fix for TLS record tampering bug CVE-2013-4353
      o Fix for TLS version checking bug CVE-2013-6449
      o Fix for DTLS retransmission bug CVE-2013-6450
  Major changes between OpenSSL 1.0.1d and OpenSSL 1.0.1e [11 Feb 2013]:
      o Corrected fix for CVE-2013-0169
  Major changes between OpenSSL 1.0.1c and OpenSSL 1.0.1d [4 Feb 2013]:
      o Fix renegotiation in TLS 1.1, 1.2 by using the correct TLS version.
      o Include the fips configuration module.
      o Fix OCSP bad key DoS attack CVE-2013-0166
      o Fix for SSL/TLS/DTLS CBC plaintext recovery attack CVE-2013-0169
      o Fix for TLS AESNI record handling flaw CVE-2012-2686
  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c [10 May 2012]:
      o Fix TLS/DTLS record length checking bug CVE-2012-2333
      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b [26 Apr 2012]:
      o Fix compilation error on non-x86 platforms.
      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a [19 Apr 2012]:
      o Fix for ASN1 overflow bug CVE-2012-2110
      o Workarounds for some servers that hang on long client hellos.
      o Fix SEGV in AES code.
  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1 [14 Mar 2012]:
      o TLS/DTLS heartbeat support.
      o SCTP support.
      o RFC 5705 TLS key material exporter.
      o RFC 5764 DTLS-SRTP negotiation.
      o Next Protocol Negotiation.
      o PSS signatures in certificates, requests and CRLs.
      o Support for password based recipient info for CMS.
      o Support TLS v1.2 and TLS v1.1.
      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
      o SRP support.
  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h [12 Mar 2012]:
      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
      o Corrected fix for CVE-2011-4619
      o Various DTLS fixes.
  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g [18 Jan 2012]:
      o Fix for DTLS DoS issue CVE-2012-0050
  Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f [4 Jan 2012]:
      o Fix for DTLS plaintext recovery attack CVE-2011-4108
      o Clear block padding bytes of SSL 3.0 records CVE-2011-4576
      o Only allow one SGC handshake restart for SSL/TLS CVE-2011-4619
      o Check parameters are not NULL in GOST ENGINE CVE-2012-0027
      o Check for malformed RFC3779 data CVE-2011-4577
  Major changes between OpenSSL 1.0.0d and OpenSSL 1.0.0e [6 Sep 2011]:
      o Fix for CRL vulnerability issue CVE-2011-3207
      o Fix for ECDH crashes CVE-2011-3210
      o Protection against EC timing attacks.
      o Support ECDH ciphersuites for certificates using SHA2 algorithms.
      o Various DTLS fixes.
  Major changes between OpenSSL 1.0.0c and OpenSSL 1.0.0d [8 Feb 2011]:
      o Fix for security issue CVE-2011-0014
  Major changes between OpenSSL 1.0.0b and OpenSSL 1.0.0c [2 Dec 2010]:
      o Fix for security issue CVE-2010-4180
      o Fix for CVE-2010-4252
      o Fix mishandling of absent EC point format extension.
      o Fix various platform compilation issues.
      o Corrected fix for security issue CVE-2010-3864.
  Major changes between OpenSSL 1.0.0a and OpenSSL 1.0.0b [16 Nov 2010]:
      o Fix for security issue CVE-2010-3864.
      o Fix for CVE-2010-2939
      o Fix WIN32 build system for GOST ENGINE.
  Major changes between OpenSSL 1.0.0 and OpenSSL 1.0.0a [1 Jun 2010]:
      o Fix for security issue CVE-2010-1633.
      o GOST MAC and CFB fixes.
  Major changes between OpenSSL 0.9.8n and OpenSSL 1.0.0 [29 Mar 2010]:
      o RFC3280 path validation: sufficient to process PKITS tests.
      o Integrated support for PVK files and keyblobs.
      o Change default private key format to PKCS#8.
      o CMS support: able to process all examples in RFC4134
      o Streaming ASN1 encode support for PKCS#7 and CMS.
      o Multiple signer and signer add support for PKCS#7 and CMS.
      o ASN1 printing support.
      o Whirlpool hash algorithm added.
      o RFC3161 time stamp support.
      o New generalised public key API supporting ENGINE based algorithms.
      o New generalised public key API utilities.
      o New ENGINE supporting GOST algorithms.
      o SSL/TLS GOST ciphersuite support.
      o PKCS#7 and CMS GOST support.
      o RFC4279 PSK ciphersuite support.
      o Supported points format extension for ECC ciphersuites.
      o ecdsa-with-SHA224/256/384/512 signature types.
      o dsa-with-SHA224 and dsa-with-SHA256 signature types.
      o Opaque PRF Input TLS extension support.
      o Updated time routines to avoid OS limitations.
  Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n [24 Mar 2010]:
      o CFB cipher definition fixes.
      o Fix security issues CVE-2010-0740 and CVE-2010-0433.
  Major changes between OpenSSL 0.9.8l and OpenSSL 0.9.8m [25 Feb 2010]:
      o Cipher definition fixes.
      o Workaround for slow RAND_poll() on some WIN32 versions.
      o Remove MD2 from algorithm tables.
      o SPKAC handling fixes.
      o Support for RFC5746 TLS renegotiation extension.
      o Compression memory leak fixed.
      o Compression session resumption fixed.
      o Ticket and SNI coexistence fixes.
      o Many fixes to DTLS handling. 
  Major changes between OpenSSL 0.9.8k and OpenSSL 0.9.8l [5 Nov 2009]:
      o Temporary work around for CVE-2009-3555: disable renegotiation.
  Major changes between OpenSSL 0.9.8j and OpenSSL 0.9.8k [25 Mar 2009]:
      o Fix various build issues.
      o Fix security issues (CVE-2009-0590, CVE-2009-0591, CVE-2009-0789)
  Major changes between OpenSSL 0.9.8i and OpenSSL 0.9.8j [7 Jan 2009]:
      o Fix security issue (CVE-2008-5077)
      o Merge FIPS 140-2 branch code.
  Major changes between OpenSSL 0.9.8g and OpenSSL 0.9.8h [28 May 2008]:
      o CryptoAPI ENGINE support.
      o Various precautionary measures.
      o Fix for bugs affecting certificate request creation.
      o Support for local machine keyset attribute in PKCS#12 files.
  Major changes between OpenSSL 0.9.8f and OpenSSL 0.9.8g [19 Oct 2007]:
      o Backport of CMS functionality to 0.9.8.
      o Fixes for bugs introduced with 0.9.8f.
  Major changes between OpenSSL 0.9.8e and OpenSSL 0.9.8f [11 Oct 2007]:
      o Add gcc 4.2 support.
      o Add support for AES and SSE2 assembly lanugauge optimization
        for VC++ build.
      o Support for RFC4507bis and server name extensions if explicitly 
        selected at compile time.
      o DTLS improvements.
      o RFC4507bis support.
      o TLS Extensions support.
  Major changes between OpenSSL 0.9.8d and OpenSSL 0.9.8e [23 Feb 2007]:
      o Various ciphersuite selection fixes.
      o RFC3779 support.
-  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d [28 Sep 2006]:
+  Major changes between OpenSSL 0.9.8c and OpenSSL 0.9.8d:
      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]:
+  Major changes between OpenSSL 0.9.8b and OpenSSL 0.9.8c:
      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]:
+  Major changes between OpenSSL 0.9.8a and OpenSSL 0.9.8b:
      o Cipher string fixes.
      o Fixes for VC++ 2005.
@@ -327,12 +31,12 @@
      o Built in dynamic engine compilation support on Win32.
      o Fixes auto dynamic engine loading in Win32.
-  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a [11 Oct 2005]:
+  Major changes between OpenSSL 0.9.8 and OpenSSL 0.9.8a:
      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]:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.8:
      o Major work on the BIGNUM library for higher efficiency and to
        make operations more streamlined and less contradictory.  This
@@ -406,36 +110,31 @@
      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]:
+  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l:
      o FIPS 1.1.1 module linking.
      o Various ciphersuite selection fixes.
  Major changes between OpenSSL 0.9.7k and OpenSSL 0.9.7l [28 Sep 2006]:
      o Introduce limits to prevent malicious key DoS  (CVE-2006-2940)
      o Fix security issues (CVE-2006-2937, CVE-2006-3737, CVE-2006-4343)
-  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k [5 Sep 2006]:
+  Major changes between OpenSSL 0.9.7j and OpenSSL 0.9.7k:
      o Fix Daniel Bleichenbacher forged signature attack, CVE-2006-4339
-  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j [4 May 2006]:
+  Major changes between OpenSSL 0.9.7i and OpenSSL 0.9.7j:
      o Visual C++ 2005 fixes.
      o Update Windows build system for FIPS.
-  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i [14 Oct 2005]:
+  Major changes between OpenSSL 0.9.7h and OpenSSL 0.9.7i:
      o Give EVP_MAX_MD_SIZE it's old value, except for a FIPS build.
-  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h [11 Oct 2005]:
+  Major changes between OpenSSL 0.9.7g and OpenSSL 0.9.7h:
      o Fix SSL 2.0 Rollback, CVE-2005-2969
      o Allow use of fixed-length exponent on DSA signing
      o Default fixed-window RSA, DSA, DH private-key operations
-  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g [11 Apr 2005]:
+  Major changes between OpenSSL 0.9.7f and OpenSSL 0.9.7g:
      o More compilation issues fixed.
      o Adaptation to more modern Kerberos API.
@@ -444,7 +143,7 @@
      o More constification.
      o Added processing of proxy certificates (RFC 3820).
-  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f [22 Mar 2005]:
+  Major changes between OpenSSL 0.9.7e and OpenSSL 0.9.7f:
      o Several compilation issues fixed.
      o Many memory allocation failure checks added.
@@ -452,12 +151,12 @@
      o Mandatory basic checks on certificates.
      o Performance improvements.
-  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e [25 Oct 2004]:
+  Major changes between OpenSSL 0.9.7d and OpenSSL 0.9.7e:
      o Fix race condition in CRL checking code.
      o Fixes to PKCS#7 (S/MIME) code.
-  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d [17 Mar 2004]:
+  Major changes between OpenSSL 0.9.7c and OpenSSL 0.9.7d:
      o Security: Fix Kerberos ciphersuite SSL/TLS handshaking bug
      o Security: Fix null-pointer assignment in do_change_cipher_spec()
@@ -465,14 +164,14 @@
      o Multiple X509 verification fixes
      o Speed up HMAC and other operations
-  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.7b and OpenSSL 0.9.7c:
      o Security: fix various ASN1 parsing bugs.
      o New -ignore_err option to OCSP utility.
      o Various interop and bug fixes in S/MIME code.
      o SSL/TLS protocol fix for unrequested client certificates.
-  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.7a and OpenSSL 0.9.7b:
      o Security: counter the Klima-Pokorny-Rosa extension of
        Bleichbacher's attack 
@@ -483,7 +182,7 @@
      o ASN.1: treat domainComponent correctly.
      o Documentation: fixes and additions.
-  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.7 and OpenSSL 0.9.7a:
      o Security: Important security related bugfixes.
      o Enhanced compatibility with MIT Kerberos.
@@ -494,7 +193,7 @@
      o SSL/TLS: now handles manual certificate chain building.
      o SSL/TLS: certain session ID malfunctions corrected.
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7 [30 Dec 2002]:
+  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
      o New library section OCSP.
      o Complete rewrite of ASN1 code.
@@ -540,23 +239,23 @@
      o SSL/TLS: add callback to retrieve SSL/TLS messages.
      o SSL/TLS: support AES cipher suites (RFC3268).
-  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k [30 Sep 2003]:
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
      o Security: fix various ASN1 parsing bugs.
      o SSL/TLS protocol fix for unrequested client certificates.
-  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j [10 Apr 2003]:
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
      o Security: counter the Klima-Pokorny-Rosa extension of
        Bleichbacher's attack 
      o Security: make RSA blinding default.
      o Build: shared library support fixes.
-  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i [19 Feb 2003]:
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
      o Important security related bugfixes.
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h [5 Dec 2002]:
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
      o New configuration targets for Tandem OSS and A/UX.
      o New OIDs for Microsoft attributes.
@@ -570,25 +269,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.
@@ -601,7 +300,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.
@@ -618,7 +317,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.
@@ -643,7 +342,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.
@@ -658,7 +357,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
@@ -667,7 +366,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
@@ -703,7 +402,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
@@ -714,7 +413,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
@@ -728,7 +427,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"
@@ -750,7 +449,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
@@ -7,9 +7,8 @@ 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 NKS NetWare build (WinSock Sockets)
-rem                    - "netware-libc" - LibC NetWare build (WinSock Sockets)
+rem                    - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
 rem                    - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 rem 
 rem      debug opts    - "debug"  - build debug
 rem
@@ -72,12 +71,10 @@ if "%1" == "nw-nasm"  set NO_ASM=
 if "%1" == "nw-nasm"  set ARG_PROCESSED=YES
 if "%1" == "nw-mwasm" set ASM_MODE=nw-mwasm
 if "%1" == "nw-mwasm" set ASSEMBLER=Metrowerks
-if "%1" == "nw-mwasm" set NO_ASM=
+if "%1" == "nw-mwasm"  set NO_ASM=
 if "%1" == "nw-mwasm" set ARG_PROCESSED=YES
 if "%1" == "netware-clib" set BLD_TARGET=netware-clib
 if "%1" == "netware-clib" set ARG_PROCESSED=YES
 if "%1" == "netware-clib-bsdsock" set BLD_TARGET=netware-clib-bsdsock
 if "%1" == "netware-clib-bsdsock" set ARG_PROCESSED=YES
 if "%1" == "netware-libc" set BLD_TARGET=netware-libc
 if "%1" == "netware-libc" set ARG_PROCESSED=YES
 if "%1" == "netware-libc-bsdsock" set BLD_TARGET=netware-libc-bsdsock
@@ -97,7 +94,6 @@ 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
@@ -114,14 +110,7 @@ echo Generating x86 for %ASSEMBLER% assembler
 echo Bignum
 cd crypto\bn\asm
-rem perl x86.pl %ASM_MODE% > bn-nw.asm
+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
@@ -159,8 +148,6 @@ 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
@@ -173,16 +160,6 @@ 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
@@ -199,10 +176,8 @@ 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%)
+echo build (ex: gmake -f %NLM_MAKE%)
 goto end
 rem ===============================================================
@@ -214,9 +189,8 @@ 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 NKS NetWare build (WinSock Sockets)
-echo .                   - "netware-libc" - LibC NetWare build (WinSock Sockets)
+echo .                   - "netware-libc-bsdsock" - LibC NKS NetWare build (BSD Sockets)
 echo .                   - "netware-libc-bsdsock" - LibC NetWare build (BSD Sockets)
 echo .
 echo .     debug opts    - "debug"  - build debug
 echo .
--- a/Netware/cpy_tests.bat
+++ b/Netware/cpy_tests.bat
@@ -73,7 +73,6 @@ 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\
--- a/Netware/do_tests.pl
+++ b/Netware/do_tests.pl
@@ -37,14 +37,9 @@ sub main()
   # open the main log file 
   open(OUT, ">$log_file") || die "unable to open $log_file\n";
   print( OUT "========================================================\n");
   my $outFile = "$output_path\\version.out";
   system("openssl2 version (CLIB_OPT)/>$outFile");
   log_output("CHECKING FOR OPENSSL VERSION:", $outFile);
   algorithm_tests();
   encryption_tests();
   evp_tests();
   pem_tests();
   verify_tests();
   ca_tests();
@@ -61,10 +56,9 @@ sub algorithm_tests
 {
   my $i;
   my $outFile;
-   my @tests = ( rsa_test, destest, ideatest, bftest, bntest, shatest, sha1test,
+   my @tests = ( rsa_test, destest, ideatest, bftest, shatest, sha1test,
-                 sha256t, sha512t, dsatest, md2test, md4test, md5test, mdc2test,
+                 md5test, dsatest, md2test, mdc2test, rc2test, rc4test, randtest,
-                 rc2test, rc4test, rc5test, randtest, rmdtest, dhtest, ecdhtest,
+                 dhtest, exptest );
                 ecdsatest, ectest, exptest, casttest, hmactest );
   print( "\nRUNNING CRYPTO ALGORITHM TESTS:\n\n");
@@ -74,16 +68,16 @@ sub algorithm_tests
   foreach $i (@tests)
   {
      if (-e "$base_path\\$i.nlm")
-      {
+	  {
         $outFile = "$output_path\\$i.out";
-         system("$i (CLIB_OPT)/>$outFile");
+         system("$i > $outFile");
         log_desc("Test: $i\.nlm:");
         log_output("", $outFile );
-      }
+	  }
-      else
+	  else
-      {
+	  {
         log_desc("Test: $i\.nlm: file not found");
-      }
+	  }
   }
 }
@@ -115,24 +109,24 @@ sub encryption_tests
      # do encryption
      $outFile = "$output_path\\enc.out";
-      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile" );
+      system("openssl2 $i -e -bufsize 113 -k test -in $input -out $cipher > $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");
+      system("openssl2 $i -d -bufsize 157 -k test -in $cipher -out $clear > $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( "SUCCESS - files match: $input, $clear\n");
         print( OUT "SUCCESS - files match: $input, $clear\n");
      }
      else
      {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
@@ -142,24 +136,24 @@ sub encryption_tests
      # do encryption B64
      $outFile = "$output_path\\B64enc.out";
-      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher (CLIB_OPT)/>$outFile");
+      system("openssl2 $i -a -e -bufsize 113 -k test -in $input -out $cipher > $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");
+      system("openssl2 $i -a -d -bufsize 157 -k test -in $cipher -out $clear > $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( "SUCCESS - files match: $input, $clear\n");
         print( OUT "SUCCESS - files match: $input, $clear\n");
      }
      else
      {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
@@ -205,24 +199,24 @@ sub pem_tests
      if ($i ne "req" )
      {
-         system("openssl2 $i -in $input -out $tmp_out (CLIB_OPT)/>$outFile");
+         system("openssl2 $i -in $input -out $tmp_out > $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");
+         system("openssl2 $i -in $input -out $tmp_out -config $OpenSSL_config > $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( "SUCCESS - files match: $input, $tmp_out\n");
         print( OUT "SUCCESS - files match: $input, $tmp_out\n");
      }
      else
      {
-         print( "\rERROR: files don't match\n");
+         print( "ERROR: files don't match\n");
         print( OUT "ERROR: files don't match\n");
      }
      do_wait();
@@ -237,8 +231,7 @@ sub verify_tests
   my $i;
   my $outFile = "$output_path\\verify.out";
-   $cert_path =~ s/\\/\//g;
+   my @cert_files = <$cert_path\\*.pem>;
   my @cert_files = <$cert_path/*.pem>;
   print( "\nRUNNING VERIFY TESTS:\n\n");
@@ -249,7 +242,7 @@ sub verify_tests
   foreach $i (@cert_files)
   {
-      system("openssl2 verify -CAfile $tmp_cert $i (CLIB_OPT)/>$outFile");
+      system("openssl2 verify -CAfile $tmp_cert $i >$outFile");
      log_desc("Verifying cert: $i");
      log_output("openssl2 verify -CAfile $tmp_cert $i", $outFile);
   }
@@ -270,71 +263,103 @@ sub ssl_tests
   print( OUT "\n========================================================\n");
   print( OUT "SSL TESTS:\n\n");
-   system("ssltest -ssl3 (CLIB_OPT)/>$outFile");
+   system("ssltest -ssl2 >$outFile");
   log_desc("Testing sslv2:");
   log_output("ssltest -ssl2", $outFile);
   system("$ssltest -ssl2 -server_auth >$outFile");
   log_desc("Testing sslv2 with server authentication:");
   log_output("$ssltest -ssl2 -server_auth", $outFile);
   system("$ssltest -ssl2 -client_auth >$outFile");
   log_desc("Testing sslv2 with client authentication:");
   log_output("$ssltest -ssl2 -client_auth", $outFile);
   system("$ssltest -ssl2 -server_auth -client_auth >$outFile");
   log_desc("Testing sslv2 with both client and server authentication:");
   log_output("$ssltest -ssl2 -server_auth -client_auth", $outFile);
   system("ssltest -ssl3 >$outFile");
   log_desc("Testing sslv3:");
   log_output("ssltest -ssl3", $outFile);
-   system("$ssltest -ssl3 -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl3 -server_auth >$outFile");
   log_desc("Testing sslv3 with server authentication:");
   log_output("$ssltest -ssl3 -server_auth", $outFile);
-   system("$ssltest -ssl3 -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -ssl3 -client_auth >$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");
+   system("$ssltest -ssl3 -server_auth -client_auth >$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");
+   system("ssltest >$outFile");
   log_desc("Testing sslv2/sslv3:");
   log_output("ssltest", $outFile);
-   system("$ssltest -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -server_auth >$outFile");
   log_desc("Testing sslv2/sslv3 with server authentication:");
   log_output("$ssltest -server_auth", $outFile);
-   system("$ssltest -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -client_auth >$outFile");
   log_desc("Testing sslv2/sslv3 with client authentication:");
   log_output("$ssltest -client_auth ", $outFile);
-   system("$ssltest -server_auth -client_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -server_auth -client_auth >$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");
+   system("ssltest -bio_pair -ssl2 >$outFile");
   log_desc("Testing sslv2 via BIO pair:");
   log_output("ssltest -bio_pair -ssl2", $outFile);
   system("ssltest -bio_pair -dhe1024dsa -v >$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");
+   system("$ssltest -bio_pair -ssl2 -server_auth >$outFile");
   log_desc("Testing sslv2 with server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -ssl2 -server_auth", $outFile);
   system("$ssltest -bio_pair -ssl2 -client_auth >$outFile");
   log_desc("Testing sslv2 with client authentication via BIO pair:");
   log_output("$ssltest -bio_pair -ssl2 -client_auth", $outFile);
   system("$ssltest -bio_pair -ssl2 -server_auth -client_auth >$outFile");
   log_desc("Testing sslv2 with both client and server authentication via BIO pair:");
   log_output("$ssltest -bio_pair -ssl2 -server_auth -client_auth", $outFile);
   system("ssltest -bio_pair -ssl3 >$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");
+   system("$ssltest -bio_pair -ssl3 -server_auth >$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");
+   system("$ssltest -bio_pair -ssl3 -client_auth >$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");
+   system("$ssltest -bio_pair -ssl3 -server_auth -client_auth >$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");
+   system("ssltest -bio_pair >$outFile");
   log_desc("Testing sslv2/sslv3 via BIO pair:");
   log_output("ssltest -bio_pair", $outFile);
-   system("$ssltest -bio_pair -server_auth (CLIB_OPT)/>$outFile");
+   system("$ssltest -bio_pair -server_auth >$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");
+   system("$ssltest -bio_pair -client_auth >$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");
+   system("$ssltest -bio_pair -server_auth -client_auth >$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);
 }
@@ -364,43 +389,43 @@ sub ca_tests
   print( OUT "\n========================================================\n");
   print( OUT "CA TESTS:\n");
-   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $CAconf -out $CAreq -keyout $CAkey -new >$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");
+   system("openssl2 x509 -CAcreateserial -in $CAreq -days 30 -req -out $CAcert -signkey $CAkey >$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");
+   system("openssl2 x509 -in $CAcert -x509toreq -signkey $CAkey -out $CAreq2 >$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");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq -noout >$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");
+   system("openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout >$outFile");
   log_output( "openssl2 req -config $OpenSSL_config -verify -in $CAreq2 -noout", $outFile);
-   system("openssl2 verify -CAfile $CAcert $CAcert (CLIB_OPT)/>$outFile");
+   system("openssl2 verify -CAfile $CAcert $CAcert >$outFile");
   log_output("openssl2 verify -CAfile $CAcert $CAcert", $outFile);
-   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new (CLIB_OPT)/>$outFile");
+   system("openssl2 req -config $Uconf -out $Ureq -keyout $Ukey -new >$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");
+   system("openssl2 x509 -CAcreateserial -in $Ureq -days 30 -req -out $Ucert -CA $CAcert -CAkey $CAkey -CAserial $CAserial >$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");
+   system("openssl2 verify -CAfile $CAcert $Ucert >$outFile");
   log_output("openssl2 verify -CAfile $CAcert $Ucert", $outFile);
-   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert (CLIB_OPT)/>$outFile");
+   system("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert >$outFile");
   log_desc("Certificate details");
   log_output("openssl2 x509 -subject -issuer -startdate -enddate -noout -in $Ucert", $outFile);
-   print(OUT "--\n");
+   print(OUT "-- \n");
   print(OUT "The generated CA certificate is $CAcert\n");
   print(OUT "The generated CA private key is $CAkey\n");
   print(OUT "The current CA signing serial number is in $CAserial\n");
@@ -410,29 +435,6 @@ sub ca_tests
   print(OUT "--\n");
 }
 ############################################################################
 sub evp_tests
 {
   my $i = 'evp_test';
   print( "\nRUNNING EVP TESTS:\n\n");
   print( OUT "\n========================================================\n");
   print( OUT "EVP TESTS:\n\n");
   if (-e "$base_path\\$i.nlm")
   {
       my $outFile = "$output_path\\$i.out";
       system("$i $test_path\\evptests.txt (CLIB_OPT)/>$outFile");
       log_desc("Test: $i\.nlm:");
       log_output("", $outFile );
   }
   else
   {
       log_desc("Test: $i\.nlm: file not found");
   }
 }
 ############################################################################
 sub log_output( $ $ )
 {
@@ -443,7 +445,7 @@ sub log_output( $ $ )
   if ($desc)
   {
-      print("\r$desc\n");
+      print("$desc\n");
      print(OUT "$desc\n");
   }
@@ -560,7 +562,7 @@ sub do_wait()
 ############################################################################
 sub make_tmp_cert_file()
 {
-   my @cert_files = <$cert_path/*.pem>;
+   my @cert_files = <$cert_path\\*.pem>;
      # delete the file if it already exists
   unlink($tmp_cert);
--- a/Netware/globals.txt
+++ b/Netware/globals.txt
@@ -66,7 +66,7 @@ static LHASH *error_hash=NULL;
 static LHASH *thread_hash=NULL;
 several files have routines with static "init" to track if error strings
-   have been loaded ( may not want separate error strings for each process )
+   have been loaded ( may not want seperate error strings for each process )
   The "init" variable can't be left "global" because the error has is a ptr
   that is malloc'ed.  The malloc'ed error has is dependant on the "init"
   vars.
--- a/Netware/set_env.bat
+++ b/Netware/set_env.bat
@@ -16,97 +16,75 @@ if "a%1" == "a" goto usage
 set LIBC_BUILD=
 set CLIB_BUILD=
 set GNUC=
 if "%1" == "netware-clib" set CLIB_BUILD=Y
 if "%1" == "netware-clib" set LIBC_BUILD=
-if "%1" == "netware-libc" set LIBC_BUILD=Y
+if "%1" == "netware-libc"  set LIBC_BUILD=Y
-if "%1" == "netware-libc" set CLIB_BUILD=
+if "%1" == "netware-libc"  set CLIB_BUILD=
 if "%2" == "gnuc" set GNUC=Y
 if "%2" == "codewarrior" set GNUC=
 rem   Location of tools (compiler, linker, etc)
-if "%NDKBASE%" == "" set NDKBASE=c:\Novell
+set TOOLS=d:\i_drive\tools
 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
+set METROWERKS_PATH=%TOOLS%\codewar\pdk_21\tools\command line tools
-if "%GNUC%" == "" set COMPILER_PATH=c:\prg\cwcmdl40
+rem set METROWERKS_PATH=%TOOLS%\codewar\PDK_40\Other Metrowerks Tools\Command Line Tools
 rem   If using gnu make define path to utility
-rem set GNU_MAKE_PATH=%NDKBASE%\gnu
+set GNU_MAKE_PATH=%TOOLS%\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
+set MS_NMAKE_PATH=%TOOLS%\msvc\600\bin
 rem   If using NASM assembler define path
-rem set NASM_PATH=%NDKBASE%\nasm
+set NASM_PATH=%TOOLS%\nasm
 set NASM_PATH=c:\prg\tools
 rem   Update path to include tool paths
-set path=%path%;%COMPILER_PATH%
+set path=%path%;%METROWERKS_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
+rem   Set MWCIncludes to location of Novell NDK includes
-if "%LIBC_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\libc\include;%NDKBASE%\ndk\libc\include\winsock
+if "%LIBC_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\libc\include;%TOOLS%\ndk\libc\include\winsock;.\engines
-if "%CLIB_BUILD%" == "Y" set INCLUDE=%NDKBASE%\ndk\nwsdk\include\nlm;%NDKBASE%\ws295sdk\include
+if "%CLIB_BUILD%" == "Y" set MWCIncludes=%TOOLS%\ndk\nwsdk\include\nlm;.\engines
 set include=
 rem   Set Imports to location of Novell NDK import files
-if "%LIBC_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\libc\imports
+if "%LIBC_BUILD%" == "Y" set IMPORTS=%TOOLS%\ndk\libc\imports
-if "%CLIB_BUILD%" == "Y" set IMPORTS=%NDKBASE%\ndk\nwsdk\imports
+if "%CLIB_BUILD%" == "Y" set IMPORTS=%TOOLS%\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%\clibpre.o
 if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.o
 echo using MetroWerks CodeWarrior 
 goto info
 :gnuc
 if "%LIBC_BUILD%" == "Y" set PRELUDE=%IMPORTS%\libcpre.gcc.o
 rem if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\clibpre.gcc.o
 if "%CLIB_BUILD%" == "Y" set PRELUDE=%IMPORTS%\prelude.gcc.o
 echo using GNU GCC Compiler 
 :info
 echo.
 if "%LIBC_BUILD%" == "Y" echo Enviroment configured for LibC build
 if "%LIBC_BUILD%" == "Y" echo use "netware\build.bat netware-libc ..." 
 if "%CLIB_BUILD%" == "Y" echo Enviroment configured for CLib build
 if "%CLIB_BUILD%" == "Y" echo use "netware\build.bat netware-clib ..." 
 goto end
 :usage
 rem ===============================================================
-echo.
+echo .
-echo No target build specified!
+echo . No target build specified!
-echo.
+echo .
-echo usage: set_env [target] [compiler]
+echo . usage: set_env [target]
-echo.
+echo .
-echo target      - "netware-clib" - Clib build
+echo .   target      - "netware-clib" - Clib build
-echo             - "netware-libc" - LibC build
+echo .               - "netware-libc" - LibC build
-echo.
+echo .
-echo compiler    - "gnuc"         - GNU GCC Compiler
+
-echo             - "codewarrior"  - MetroWerks CodeWarrior (default)
+
 echo.
 :end
 echo.
--- a/20
+++ b/20
@@ -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
@@ -47,7 +45,7 @@ While running tests, running a parallell make is a bad idea.  Many test
 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 parallel make when testing.
+The solution is simple for now: don't run parallell make when testing.
 * Bugs in gcc triggered
@@ -197,17 +195,3 @@ reconfigure with additional no-sse2 [or 386] option passed to ./config.
 We don't have framework to associate -ldl with no-dso, therefore the only
 way is to edit Makefile right after ./config no-dso and remove -ldl from
 EX_LIBS line.
 * hpux-parisc2-cc no-asm build fails with SEGV in ECDSA/DH.
 Compiler bug, presumably at particular patch level. Remaining
 hpux*-parisc*-cc configurations can be affected too. Drop optimization
 level to +O2 when compiling bn_nist.o.
 * solaris64-sparcv9-cc link failure
 Solaris 8 ar can fail to maintain symbol table in .a, which results in
 link failures. Apply 109147-09 or later or modify Makefile generated
 by ./Configure solaris64-sparcv9-cc and replace RANLIB assignment with
 	RANLIB= /usr/ccs/bin/ar rs
--- a/199
+++ b/199
@@ -1,26 +1,32 @@
- OpenSSL 1.1.0-pre1 (alpha) 10 Dec 2015
+ OpenSSL 0.9.8f-fips-dev test version
- Copyright (c) 1998-2015 The OpenSSL Project
+ Copyright (c) 1998-2007 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 All rights reserved.
 WARNING
 -------
 This version of OpenSSL is an initial port of the FIPS 140-2 code to OpenSSL
 0.9.8. See the file README.FIPS for brief usage details.
 DESCRIPTION
 -----------
 The OpenSSL Project is a collaborative effort to develop a robust,
 commercial-grade, fully featured, and Open Source toolkit implementing the
- Secure Sockets Layer (SSLv3) and Transport Layer Security (TLS) protocols as
+ Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
- well as a full-strength general purpose cryptograpic library. The project is
+ protocols as well as a full-strength general purpose cryptography library.
- managed by a worldwide community of volunteers that use the Internet to
+ The project is managed by a worldwide community of volunteers that use the
- communicate, plan, and develop the OpenSSL toolkit and its related
+ Internet to communicate, plan, and develop the OpenSSL toolkit and its
- documentation.
+ related documentation.
- OpenSSL is descended from the SSLeay library developed by Eric A. Young
+ OpenSSL is based on the excellent SSLeay library developed from Eric A. Young
 and Tim J. Hudson.  The OpenSSL toolkit is licensed under a dual-license (the
- OpenSSL license plus the SSLeay license), which means that you are free to
+ OpenSSL license plus the SSLeay license) situation, which basically means
- get and use it for commercial and non-commercial purposes as long as you
+ that you are free to get and use it for commercial and non-commercial
- fulfill the conditions of both licenses.
+ purposes as long as you fulfill the conditions of both licenses.
 OVERVIEW
 --------
@@ -28,41 +34,117 @@
 The OpenSSL toolkit includes:
 libssl.a:
-     Provides the client and server-side implementations for SSLv3 and TLS.
+     Implementation of SSLv2, SSLv3, TLSv1 and the required code to support
     both SSLv2, SSLv3 and TLSv1 in the one server and client.
 libcrypto.a:
-     Provides general cryptographic and X.509 support needed by SSL/TLS but
+     General encryption and X.509 v1/v3 stuff needed by SSL/TLS but not
-     not logically part of it.
+     actually logically part of it. It includes routines for the following:
     Ciphers
        libdes - EAY's libdes DES encryption package which was floating
                 around the net for a few years, and was then relicensed by
                 him as part of SSLeay.  It includes 15 'modes/variations'
                 of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb;
                 pcbc and a more general form of cfb and ofb) including desx
                 in cbc mode, a fast crypt(3), and routines to read
                 passwords from the keyboard.
        RC4 encryption,
        RC2 encryption      - 4 different modes, ecb, cbc, cfb and ofb.
        Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb.
        IDEA encryption     - 4 different modes, ecb, cbc, cfb and ofb.
     Digests
        MD5 and MD2 message digest algorithms, fast implementations,
        SHA (SHA-0) and SHA-1 message digest algorithms,
        MDC2 message digest. A DES based hash that is popular on smart cards.
     Public Key
        RSA encryption/decryption/generation.
            There is no limit on the number of bits.
        DSA encryption/decryption/generation.
            There is no limit on the number of bits.
        Diffie-Hellman key-exchange/key generation.
            There is no limit on the number of bits.
     X.509v3 certificates
        X509 encoding/decoding into/from binary ASN1 and a PEM
             based ASCII-binary encoding which supports encryption with a
             private key.  Program to generate RSA and DSA certificate
             requests and to generate RSA and DSA certificates.
     Systems
        The normal digital envelope routines and base64 encoding.  Higher
        level access to ciphers and digests by name.  New ciphers can be
        loaded at run time.  The BIO io system which is a simple non-blocking
        IO abstraction.  Current methods supported are file descriptors,
        sockets, socket accept, socket connect, memory buffer, buffering, SSL
        client/server, file pointer, encryption, digest, non-blocking testing
        and null.
     Data structures
        A dynamically growing hashing system
        A simple stack.
        A Configuration loader that uses a format similar to MS .ini files.
 openssl:
     A command line tool that can be used for:
-        Creation of key parameters
+        Creation of RSA, DH and DSA key parameters
        Creation of X.509 certificates, CSRs and CRLs
-        Calculation of message digests
+        Calculation of Message Digests
-        Encryption and decryption
+        Encryption and Decryption with Ciphers
-        SSL/TLS client and server tests
+        SSL/TLS Client and Server Tests
        Handling of S/MIME signed or encrypted mail
-        And more...
+
 PATENTS
 -------
 Various companies hold various patents for various algorithms in various
 locations around the world. _YOU_ are responsible for ensuring that your use
 of any algorithms is legal by checking if there are any patents in your
 country.  The file contains some of the patents that we know about or are
 rumored to exist. This is not a definitive list.
 RSA Security holds software patents on the RC5 algorithm.  If you
 intend to use this cipher, you must contact RSA Security for
 licensing conditions. Their web page is http://www.rsasecurity.com/.
 RC4 is a trademark of RSA Security, so use of this label should perhaps
 only be used with RSA Security's permission.
 The IDEA algorithm is patented by Ascom in Austria, France, Germany, Italy,
 Japan, the Netherlands, Spain, Sweden, Switzerland, UK and the USA.  They
 should be contacted if that algorithm is to be used; their web page is
 http://www.ascom.ch/.
 The MDC2 algorithm is patented by IBM.
 NTT and Mitsubishi have patents and pending patents on the Camellia
 algorithm, but allow use at no charge without requiring an explicit
 licensing agreement: http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html
 INSTALLATION
 ------------
- See the appropriate file:
+ To install this package under a Unix derivative, read the INSTALL file.  For
-        INSTALL         Linux, Unix, etc.
+ a Win32 platform, read the INSTALL.W32 file.  For OpenVMS systems, read
-        INSTALL.DJGPP   DOS platform with DJGPP
+ INSTALL.VMS.
-        INSTALL.NW      Netware
+
-        INSTALL.OS2     OS/2
+ Read the documentation in the doc/ directory.  It is quite rough, but it
-        INSTALL.VMS     VMS
+ lists the functions; you will probably have to look at the code to work out
-        INSTALL.W32     Windows (32bit)
+ how to use them. Look at the example programs.
-        INSTALL.W64     Windows (64bit)
+
-        INSTALL.WCE     Windows CE
+ PROBLEMS
 --------
 For some platforms, there are some known problems that may affect the user
 or application author.  We try to collect those in doc/PROBLEMS, with current
 thoughts on how they should be solved in a future of OpenSSL.
 SUPPORT
 -------
 See the OpenSSL website www.openssl.org for details on how to obtain
 commercial technical support.
 If you have any problems with OpenSSL then please take the following steps
 first:
@@ -84,35 +166,42 @@
    - Problem Description (steps that will reproduce the problem, if known)
    - Stack Traceback (if the application dumps core)
- Email the report to:
+ Report the bug to the OpenSSL project via the Request Tracker
 (http://www.openssl.org/support/rt2.html) by mail to:
-    rt@openssl.org
+    openssl-bugs@openssl.org
- In order to avoid spam, this is a moderated mailing list, and it might
+ Note that mail to openssl-bugs@openssl.org is recorded in the publicly
- take a day for the ticket to show up.  (We also scan posts to make sure
+ readable request tracker database and is forwarded to a public
- that security disclosures aren't publically posted by mistake.) Mail to
+ mailing list. Confidential mail may be sent to openssl-security@openssl.org
- this address is recorded in the public RT (request tracker) database (see
+ (PGP key available from the key servers).
 https://www.openssl.org/support/rt.html for details) and also forwarded
 the public openssl-dev mailing list.  Confidential mail may be sent to
 openssl-security@openssl.org (PGP key available from the key servers).
 Please do NOT use this for general assistance or support queries.
 Just because something doesn't work the way you expect does not mean it
 is necessarily a bug in OpenSSL.
 You can also make GitHub pull requests. If you do this, please also send
 mail to rt@openssl.org with a link to the PR so that we can more easily
 keep track of it.
 HOW TO CONTRIBUTE TO OpenSSL
 ----------------------------
- See CONTRIBUTING
+ Development is coordinated on the openssl-dev mailing list (see
 http://www.openssl.org for information on subscribing). If you
 would like to submit a patch, send it to openssl-dev@openssl.org with
 the string "[PATCH]" in the subject. Please be sure to include a
 textual explanation of what your patch does.
- LEGALITIES
+ Note: For legal reasons, contributions from the US can be accepted only
- ----------
+ if a TSU notification and a copy of the patch are sent to crypt@bis.doc.gov
 (formerly BXA) with a copy to the ENC Encryption Request Coordinator;
 please take some time to look at
    http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
 and
    http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e))
 for the details. If "your encryption source code is too large to serve as
 an email attachment", they are glad to receive it by fax instead; hope you
 have a cheap long-distance plan.
 Our preferred format for changes is "diff -u" output. You might
 generate it like this:
 # cd openssl-work
 # [your changes]
 # ./Configure dist; make clean
 # cd ..
 # diff -ur openssl-orig openssl-work > mydiffs.patch
 A number of nations, in particular the U.S., restrict the use or export
 of cryptography. If you are potentially subject to such restrictions
 you should seek competent professional legal advice before attempting to
 develop or distribute cryptographic code.
--- a/README.ASN1
+++ b/README.ASN1
@@ -0,0 +1,187 @@
 OpenSSL ASN1 Revision
 =====================
 This document describes some of the issues relating to the new ASN1 code.
 Previous OpenSSL ASN1 problems
 =============================
 OK why did the OpenSSL ASN1 code need revising in the first place? Well
 there are lots of reasons some of which are included below...
 1. The code is difficult to read and write. For every single ASN1 structure
 (e.g. SEQUENCE) four functions need to be written for new, free, encode and
 decode operations. This is a very painful and error prone operation. Very few
 people have ever written any OpenSSL ASN1 and those that have usually wish
 they hadn't.
 2. Partly because of 1. the code is bloated and takes up a disproportionate
 amount of space. The SEQUENCE encoder is particularly bad: it essentially
 contains two copies of the same operation, one to compute the SEQUENCE length
 and the other to encode it.
 3. The code is memory based: that is it expects to be able to read the whole
 structure from memory. This is fine for small structures but if you have a
 (say) 1Gb PKCS#7 signedData structure it isn't such a good idea...
 4. The code for the ASN1 IMPLICIT tag is evil. It is handled by temporarily
 changing the tag to the expected one, attempting to read it, then changing it
 back again. This means that decode buffers have to be writable even though they
 are ultimately unchanged. This gets in the way of constification.
 5. The handling of EXPLICIT isn't much better. It adds a chunk of code into 
 the decoder and encoder for every EXPLICIT tag.
 6. APPLICATION and PRIVATE tags aren't even supported at all.
 7. Even IMPLICIT isn't complete: there is no support for implicitly tagged
 types that are not OPTIONAL.
 8. Much of the code assumes that a tag will fit in a single octet. This is
 only true if the tag is 30 or less (mercifully tags over 30 are rare).
 9. The ASN1 CHOICE type has to be largely handled manually, there aren't any
 macros that properly support it.
 10. Encoders have no concept of OPTIONAL and have no error checking. If the
 passed structure contains a NULL in a mandatory field it will not be encoded,
 resulting in an invalid structure.
 11. It is tricky to add ASN1 encoders and decoders to external applications.
 Template model
 ==============
 One of the major problems with revision is the sheer volume of the ASN1 code.
 Attempts to change (for example) the IMPLICIT behaviour would result in a
 modification of *every* single decode function. 
 I decided to adopt a template based approach. I'm using the term 'template'
 in a manner similar to SNACC templates: it has nothing to do with C++
 templates.
 A template is a description of an ASN1 module as several constant C structures.
 It describes in a machine readable way exactly how the ASN1 structure should
 behave. If this template contains enough detail then it is possible to write
 versions of new, free, encode, decode (and possibly others operations) that
 operate on templates.
 Instead of having to write code to handle each operation only a single
 template needs to be written. If new operations are needed (such as a 'print'
 operation) only a single new template based function needs to be written 
 which will then automatically handle all existing templates.
 Plans for revision
 ==================
 The revision will consist of the following steps. Other than the first two
 these can be handled in any order.
 o Design and write template new, free, encode and decode operations, initially
 memory based. *DONE*
 o Convert existing ASN1 code to template form. *IN PROGRESS*
 o Convert an existing ASN1 compiler (probably SNACC) to output templates
 in OpenSSL form.
 o Add support for BIO based ASN1 encoders and decoders to handle large
 structures, initially blocking I/O.
 o Add support for non blocking I/O: this is quite a bit harder than blocking
 I/O.
 o Add new ASN1 structures, such as OCSP, CRMF, S/MIME v3 (CMS), attribute
 certificates etc etc.
 Description of major changes
 ============================
 The BOOLEAN type now takes three values. 0xff is TRUE, 0 is FALSE and -1 is
 absent. The meaning of absent depends on the context. If for example the
 boolean type is DEFAULT FALSE (as in the case of the critical flag for
 certificate extensions) then -1 is FALSE, if DEFAULT TRUE then -1 is TRUE.
 Usually the value will only ever be read via an API which will hide this from
 an application.
 There is an evil bug in the old ASN1 code that mishandles OPTIONAL with
 SEQUENCE OF or SET OF. These are both implemented as a STACK structure. The
 old code would omit the structure if the STACK was NULL (which is fine) or if
 it had zero elements (which is NOT OK). This causes problems because an empty
 SEQUENCE OF or SET OF will result in an empty STACK when it is decoded but when
 it is encoded it will be omitted resulting in different encodings. The new code
 only omits the encoding if the STACK is NULL, if it contains zero elements it
 is encoded and empty. There is an additional problem though: because an empty
 STACK was omitted, sometimes the corresponding *_new() function would
 initialize the STACK to empty so an application could immediately use it, if
 this is done with the new code (i.e. a NULL) it wont work. Therefore a new
 STACK should be allocated first. One instance of this is the X509_CRL list of
 revoked certificates: a helper function X509_CRL_add0_revoked() has been added
 for this purpose.
 The X509_ATTRIBUTE structure used to have an element called 'set' which took
 the value 1 if the attribute value was a SET OF or 0 if it was a single. Due
 to the behaviour of CHOICE in the new code this has been changed to a field
 called 'single' which is 0 for a SET OF and 1 for single. The old field has
 been deleted to deliberately break source compatibility. Since this structure
 is normally accessed via higher level functions this shouldn't break too much.
 The X509_REQ_INFO certificate request info structure no longer has a field
 called 'req_kludge'. This used to be set to 1 if the attributes field was
 (incorrectly) omitted. You can check to see if the field is omitted now by
 checking if the attributes field is NULL. Similarly if you need to omit
 the field then free attributes and set it to NULL.
 The top level 'detached' field in the PKCS7 structure is no longer set when
 a PKCS#7 structure is read in. PKCS7_is_detached() should be called instead.
 The behaviour of PKCS7_get_detached() is unaffected.
 The values of 'type' in the GENERAL_NAME structure have changed. This is
 because the old code use the ASN1 initial octet as the selector. The new
 code uses the index in the ASN1_CHOICE template.
 The DIST_POINT_NAME structure has changed to be a true CHOICE type.
 typedef struct DIST_POINT_NAME_st {
 int type;
 union {
 	STACK_OF(GENERAL_NAME) *fullname;
 	STACK_OF(X509_NAME_ENTRY) *relativename;
 } name;
 } DIST_POINT_NAME;
 This means that name.fullname or name.relativename should be set
 and type reflects the option. That is if name.fullname is set then
 type is 0 and if name.relativename is set type is 1.
 With the old code using the i2d functions would typically involve:
 unsigned char *buf, *p;
 int len;
 /* Find length of encoding */
 len = i2d_SOMETHING(x, NULL);
 /* Allocate buffer */
 buf = OPENSSL_malloc(len);
 if(buf == NULL) {
 	/* Malloc error */
 }
 /* Use temp variable because &p gets updated to point to end of
 * encoding.
 */
 p = buf;
 i2d_SOMETHING(x, &p);
 Using the new i2d you can also do:
 unsigned char *buf = NULL;
 int len;
 len = i2d_SOMETHING(x, &buf);
 if(len < 0) {
 	/* Malloc error */
 }
 and it will automatically allocate and populate a buffer with the
 encoding. After this call 'buf' will point to the start of the
 encoding which is len bytes long.
--- 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 +1,35 @@
 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
+Brief instructions on using OpenSSL 0.9.8 FIPS test branch.
 this can be found at util/incore in the tarballs.
-If you have any object files from a previous build do:
+To avoid any confusion that this might generate a validate library just
 supplying "fips" on the command line wont work. Additional options are
 needed...
-make clean
+To build fipscanister and produce a usable distribution the configuration
 option "fipscanisterbuild" is used to either the config or Configure scripts.
 For example:
-To build the module do:
+./config fipscanisterbuild
-./config fipscanisteronly
+This builds static libraries in a way similar to the FIPS 1.1.1 distro.
 make
-Build should complete without errors.
+To build the shared library fipscanister version use the configuration
 options "fipsdso".
-Build test utilities:
+Note that the fipscanister.o file is totally incompatible with the version
 produced by the FIPS 1.1.1 distribution and cannot be made to work with
 it.
-make build_tests
+Both options should also work under Windows and VC++. With this version the
 use of MinGW is unnecessary and the normal VC++ build procedure can be
 followed *except* the GNU linker "ld.exe" (for example from MinGW) must be
 accessible somewhere on the PATH. For example:
-Run test suite:
+perl Configure VC-WIN32 fipsdso
-
+ms\do_masm
 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).
+Note that any warnings from a Windows version of "tar" about being unable to
 create symbolic links can be ignored.
 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/129
+++ b/129
@@ -0,0 +1,129 @@
  OpenSSL STATUS                           Last modified at
  ______________                           $Date: 2007/02/23 12:12:27 $
  DEVELOPMENT STATE
    o  OpenSSL 0.9.9:  Under development...
    o  OpenSSL 0.9.8e: Released on February  23rd, 2007
    o  OpenSSL 0.9.8d: Released on September 28th, 2006
    o  OpenSSL 0.9.8c: Released on September  5th, 2006
    o  OpenSSL 0.9.8b: Released on May        4th, 2006
    o  OpenSSL 0.9.8a: Released on October   11th, 2005
    o  OpenSSL 0.9.8:  Released on July       5th, 2005
    o  OpenSSL 0.9.7m: Released on February  23rd, 2007
    o  OpenSSL 0.9.7l: Released on September 28th, 2006
    o  OpenSSL 0.9.7k: Released on September  5th, 2006
    o  OpenSSL 0.9.7j: Released on May        4th, 2006
    o  OpenSSL 0.9.7i: Released on October   14th, 2005
    o  OpenSSL 0.9.7h: Released on October   11th, 2005
    o  OpenSSL 0.9.7g: Released on April     11th, 2005
    o  OpenSSL 0.9.7f: Released on March     22nd, 2005
    o  OpenSSL 0.9.7e: Released on October   25th, 2004
    o  OpenSSL 0.9.7d: Released on March     17th, 2004
    o  OpenSSL 0.9.7c: Released on September 30th, 2003
    o  OpenSSL 0.9.7b: Released on April     10th, 2003
    o  OpenSSL 0.9.7a: Released on February  19th, 2003
    o  OpenSSL 0.9.7:  Released on December  31st, 2002
    o  OpenSSL 0.9.6m: Released on March     17th, 2004
    o  OpenSSL 0.9.6l: Released on November   4th, 2003
    o  OpenSSL 0.9.6k: Released on September 30th, 2003
    o  OpenSSL 0.9.6j: Released on April     10th, 2003
    o  OpenSSL 0.9.6i: Released on February  19th, 2003
    o  OpenSSL 0.9.6h: Released on December   5th, 2002
    o  OpenSSL 0.9.6g: Released on August     9th, 2002
    o  OpenSSL 0.9.6f: Released on August     8th, 2002
    o  OpenSSL 0.9.6e: Released on July      30th, 2002
    o  OpenSSL 0.9.6d: Released on May        9th, 2002
    o  OpenSSL 0.9.6c: Released on December  21st, 2001
    o  OpenSSL 0.9.6b: Released on July       9th, 2001
    o  OpenSSL 0.9.6a: Released on April      5th, 2001
    o  OpenSSL 0.9.6:  Released on September 24th, 2000
    o  OpenSSL 0.9.5a: Released on April      1st, 2000
    o  OpenSSL 0.9.5:  Released on February  28th, 2000
    o  OpenSSL 0.9.4:  Released on August    09th, 1999
    o  OpenSSL 0.9.3a: Released on May       29th, 1999
    o  OpenSSL 0.9.3:  Released on May       25th, 1999
    o  OpenSSL 0.9.2b: Released on March     22th, 1999
    o  OpenSSL 0.9.1c: Released on December  23th, 1998
  [See also http://www.openssl.org/support/rt2.html]
  RELEASE SHOWSTOPPERS
    o The Makefiles fail with some SysV makes.
    o 
  AVAILABLE PATCHES
    o 
  IN PROGRESS
    o Steve is currently working on (in no particular order):
        ASN1 code redesign, butchery, replacement.
        OCSP
        EVP cipher enhancement.
        Enhanced certificate chain verification.
 	Private key, certificate and CRL API and implementation.
 	Developing and bugfixing PKCS#7 (S/MIME code).
        Various X509 issues: character sets, certificate request extensions.
    o Richard is currently working on:
 	Constification
 	Attribute Certificate support
 	Certificate Pair support
 	Storage Engines (primarly an LDAP storage engine)
 	Certificate chain validation with full RFC 3280 compatibility
  NEEDS PATCH
    o  0.9.8-dev: COMPLEMENTOFALL and COMPLEMENTOFDEFAULT do not
       handle ECCdraft cipher suites correctly.
    o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file
    o  "OpenSSL STATUS" is never up-to-date.
  OPEN ISSUES
    o  The Makefile hierarchy and build mechanism is still not a round thing:
       1. The config vs. Configure scripts
          It's the same nasty situation as for Apache with APACI vs.
          src/Configure. It confuses.
          Suggestion: Merge Configure and config into a single configure
                      script with a Autoconf style interface ;-) and remove
                      Configure and config. Or even let us use GNU Autoconf
                      itself. Then we can avoid a lot of those platform checks
                      which are currently in Configure.
    o  Support for Shared Libraries has to be added at least
       for the major Unix platforms. The details we can rip from the stuff
       Ralf has done for the Apache src/Configure script. Ben wants the
       solution to be really simple.
       Status: Ralf will look how we can easily incorporate the
               compiler PIC and linker DSO flags from Apache
               into the OpenSSL Configure script.
               Ulf: +1 for using GNU autoconf and libtool (but not automake,
                    which apparently is not flexible enough to generate
                    libcrypto)
  WISHES
    o  Add variants of DH_generate_parameters() and BN_generate_prime() [etc?]
       where the callback function can request that the function be aborted.
       [Gregory Stark <ghstark@pobox.com>, <rayyang2000@yahoo.com>]
    o  SRP in TLS.
       [wished by:
        Dj <derek@yo.net>, Tom Wu <tom@arcot.com>,
        Tom Holroyd <tomh@po.crl.go.jp>]
       See http://search.ietf.org/internet-drafts/draft-ietf-tls-srp-00.txt
       as well as http://www-cs-students.stanford.edu/~tjw/srp/.
       Tom Holroyd tells us there is a SRP patch for OpenSSH at
       http://members.tripod.com/professor_tom/archives/, that could
       be useful.
--- a/4159
+++ b/4159
--- 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,8 @@ $	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 alg_entry .eqs. "STATIC_ENGINE" then goto loop ! Special for now
 $         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
 $	  goto loop2
 $       endif
@@ -431,7 +328,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 +352,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,7 @@
 openssl
 Makefile.save
 der_chop
 der_chop.bak
 CA.pl
 *.flc
 semantic.cache
--- a/apps/CA.com
+++ b/apps/CA.com
@@ -10,37 +10,41 @@ $! 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.
 $!
-$! default openssl.cnf file has setup as per the following
+$!
 $! 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 'openssl cmd' instead of 'cmd'.
 $! 18-Apr-96 tjh    Original hacking
 $!
 $! Tim Hudson
 $! tjh@cryptsoft.com
 $!
 $!
 $! default ssleay.cnf file has setup as per the following
 $! demoCA ... where everything is stored
 $
-$ IF F$TYPE(OPENSSL_CONFIG) .EQS. "" THEN OPENSSL_CONFIG := SSLLIB:OPENSSL.CNF
+$ IF F$TYPE(SSLEAY_CONFIG) .EQS. "" THEN SSLEAY_CONFIG := SSLLIB:SSLEAY.CNF
 $
 $ DAYS   = "-days 365"
-$ REQ    = openssl + " req " + OPENSSL_CONFIG
+$ REQ    = openssl + " req " + SSLEAY_CONFIG
-$ CA     = openssl + " ca " + OPENSSL_CONFIG
+$ CA     = openssl + " ca " + SSLEAY_CONFIG
 $ 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:
@@ -51,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")
@@ -65,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"
@@ -75,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"
@@ -86,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
@@ -130,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
@@ -148,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
@@ -160,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
@@ -177,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
@@ -203,8 +208,8 @@ $ IF (prog_opt .NES. "")
 $ THEN
 $!   
 $   echo "Unknown argument ''prog_opt'"
-$   RET = 3
+$   
-$   goto clean_up
+$   EXIT 3
 $ ENDIF
 $
 $opt_loop_continue:
@@ -212,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,189 +1,189 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 #
 # 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
 #
 # Wrapper around the ca to make it easier to use
 # Edit CA.pl.in not CA.pl!
-
+# 27-Apr-98 snh    Translation into perl, fix existing CA bug.
-use strict;
+#
-use warnings;
+#
-
+# Steve Henson
-my $openssl = "openssl";
+# shenson@bigfoot.com
 if(defined $ENV{'OPENSSL'}) {
    $openssl = $ENV{'OPENSSL'};
 } else {
    $ENV{'OPENSSL'} = $openssl;
 }
 my $verbose = 1;
 my $OPENSSL_CONFIG = $ENV{"OPENSSL_CONFIG"};
 my $DAYS = "-days 365";
 my $CADAYS = "-days 1095";	# 3 years
 my $REQ = "$openssl req $OPENSSL_CONFIG";
 my $CA = "$openssl ca $OPENSSL_CONFIG";
 my $VERIFY = "$openssl verify";
 my $X509 = "$openssl x509";
 my $PKCS12 = "$openssl pkcs12";
 # default openssl.cnf file has setup as per the following
-my $CATOP = "./demoCA";
+# demoCA ... where everything is stored
 my $CAKEY = "cakey.pem";
 my $CAREQ = "careq.pem";
 my $CACERT = "cacert.pem";
 my $CACRL = "crl.pem";
 my $DIRMODE = 0777;
-my $NEWKEY = "newkey.pem";
+my $openssl;
-my $NEWREQ = "newreq.pem";
+if(defined $ENV{OPENSSL}) {
-my $NEWCERT = "newcert.pem";
+	$openssl = $ENV{OPENSSL};
 my $NEWP12 = "newcert.p12";
 my $RET = 0;
 my $WHAT = shift @ARGV;
 my $FILE;
 # See if reason for a CRL entry is valid; exit if not.
 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;
 }
 # Copy a PEM-format file; return like exit status (zero means ok)
 sub copy_pemfile
 {
    my ($infile, $outfile, $bound) = @_;
    my $found = 0;
    open IN, $infile || die "Cannot open $infile, $!";
    open OUT, ">$outfile" || die "Cannot write to $outfile, $!";
    while (<IN>) {
        $found = 1 if /^-----BEGIN.*$bound/;
        print OUT $_ if $found;
        $found = 2, last if /^-----END.*$bound/;
    }
    close IN;
    close OUT;
    return $found == 2 ? 0 : 1;
 }
 # Wrapper around system; useful for debugging.  Returns just the exit status
 sub run
 {
    my $cmd = shift;
    print "====\n$cmd\n" if $verbose;
    my $status = system($cmd);
    print "==> $status\n====\n" if $verbose;
    return $status >> 8;
 }
 if ( $WHAT =~ /^(-\?|-h|-help)$/ ) {
    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
    print STDERR "       CA -pkcs12 [certname]\n";
    print STDERR "       CA -crl|-revoke cert-filename [reason]\n";
    exit 0;
 }
 if ($WHAT eq '-newcert' ) {
    # create a certificate
    $RET = run("$REQ -new -x509 -keyout $NEWKEY -out $NEWCERT $DAYS");
    print "Cert is in $NEWCERT, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT eq '-newreq' ) {
    # create a certificate request
    $RET = run("$REQ -new -keyout $NEWKEY -out $NEWREQ $DAYS");
    print "Request is in $NEWREQ, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT eq '-newreq-nodes' ) {
    # create a certificate request
    $RET = run("$REQ -new -nodes -keyout $NEWKEY -out $NEWREQ $DAYS");
    print "Request is in $NEWREQ, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT eq '-newca' ) {
    # create the directory hierarchy
    mkdir ${CATOP}, $DIRMODE;
    mkdir "${CATOP}/certs", $DIRMODE;
    mkdir "${CATOP}/crl", $DIRMODE ;
    mkdir "${CATOP}/newcerts", $DIRMODE;
    mkdir "${CATOP}/private", $DIRMODE;
    open OUT, ">${CATOP}/index.txt";
    close OUT;
    open OUT, ">${CATOP}/crlnumber";
    print OUT "01\n";
    close OUT;
    # ask user for existing CA certificate
    print "CA certificate filename (or enter to create)\n";
    $FILE = <STDIN>;
    chop $FILE if $FILE;
    if ($FILE) {
        copy_pemfile($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
        copy_pemfile($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
    } else {
        print "Making CA certificate ...\n";
        $RET = run("$REQ -new -keyout"
                . " ${CATOP}/private/$CAKEY"
                . " -out ${CATOP}/$CAREQ");
        $RET = run("$CA -create_serial"
                . " -out ${CATOP}/$CACERT $CADAYS -batch"
                . " -keyfile ${CATOP}/private/$CAKEY -selfsign"
                . " -extensions v3_ca"
                . " -infiles ${CATOP}/$CAREQ") if $RET == 0;
        print "CA certificate is in ${CATOP}/$CACERT\n" if $RET == 0;
    }
 } elsif ($WHAT eq '-pkcs12' ) {
    my $cname = $ARGV[1];
    $cname = "My Certificate" unless defined $cname;
    $RET = run("$PKCS12 -in $NEWCERT -inkey $NEWKEY"
            . " -certfile ${CATOP}/$CACERT"
            . " -out $NEWP12"
            . " -export -name \"$cname\"");
    print "PKCS #12 file is in $NEWP12\n" if $RET == 0;
 } elsif ($WHAT eq '-xsign' ) {
    $RET = run("$CA -policy policy_anything -infiles $NEWREQ");
 } elsif ($WHAT eq '-sign' ) {
    $RET = run("$CA -policy policy_anything -out $NEWCERT -infiles $NEWREQ");
    print "Signed certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-signCA' ) {
    $RET = run("$CA -policy policy_anything -out $NEWCERT"
            . " -extensions v3_ca -infiles $NEWREQ");
    print "Signed CA certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-signcert' ) {
    $RET = run("$X509 -x509toreq -in $NEWREQ -signkey $NEWREQ"
            . " -out tmp.pem");
    $RET = run("$CA -policy policy_anything -out $NEWCERT"
            . " -infiles tmp.pem") if $RET == 0;
    print "Signed certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-verify' ) {
    my @files = @ARGV ? @ARGV : ( $NEWCERT );
    my $file;
    foreach $file (@files) {
        my $status = run("$VERIFY -CAfile ${CATOP}/$CACERT $file");
        $RET = $status if $status != 0;
    }
 } elsif ($WHAT eq '-crl' ) {
    $RET = run("$CA -gencrl -out ${CATOP}/crl/$CACRL");
    print "Generated CRL is in ${CATOP}/crl/$CACRL\n" if $RET == 0;
 } elsif ($WHAT eq '-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);
    $RET = run("$CA -revoke \"$cname\"" . $reason);
 } else {
-    print STDERR "Unknown arg \"$WHAT\"\n";
+	$openssl = "openssl";
-    print STDERR "Use -help for help.\n";
+	$ENV{OPENSSL} = $openssl;
-    exit 1;
+}
 $SSLEAY_CONFIG=$ENV{"SSLEAY_CONFIG"};
 $DAYS="-days 365";	# 1 year
 $CADAYS="-days 1095";	# 3 years
 $REQ="$openssl req $SSLEAY_CONFIG";
 $CA="$openssl ca $SSLEAY_CONFIG";
 $VERIFY="$openssl verify";
 $X509="$openssl x509";
 $PKCS12="$openssl pkcs12";
 $CATOP="./demoCA";
 $CAKEY="cakey.pem";
 $CAREQ="careq.pem";
 $CACERT="cacert.pem";
 $DIRMODE = 0777;
 $RET = 0;
 foreach (@ARGV) {
 	if ( /^(-\?|-h|-help)$/ ) {
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 	    exit 0;
 	} elsif (/^-newcert$/) {
 	    # create a certificate
 	    system ("$REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS");
 	    $RET=$?;
 	    print "Certificate is in newcert.pem, private key is in newkey.pem\n"
 	} elsif (/^-newreq$/) {
 	    # create a certificate request
 	    system ("$REQ -new -keyout newkey.pem -out newreq.pem $DAYS");
 	    $RET=$?;
 	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 	} elsif (/^-newreq-nodes$/) {
 	    # create a certificate request
 	    system ("$REQ -new -nodes -keyout newkey.pem -out newreq.pem $DAYS");
 	    $RET=$?;
 	    print "Request is in newreq.pem, private key is in newkey.pem\n";
 	} elsif (/^-newca$/) {
 		# if explicitly asked for or it doesn't exist then setup the
 		# directory structure that Eric likes to manage things 
 	    $NEW="1";
 	    if ( "$NEW" || ! -f "${CATOP}/serial" ) {
 		# create the directory hierarchy
 		mkdir $CATOP, $DIRMODE;
 		mkdir "${CATOP}/certs", $DIRMODE;
 		mkdir "${CATOP}/crl", $DIRMODE ;
 		mkdir "${CATOP}/newcerts", $DIRMODE;
 		mkdir "${CATOP}/private", $DIRMODE;
 		open OUT, ">${CATOP}/index.txt";
 		close OUT;
 		open OUT, ">${CATOP}/crlnumber";
 		print OUT "01\n";
 		close OUT;
 	    }
 	    if ( ! -f "${CATOP}/private/$CAKEY" ) {
 		print "CA certificate filename (or enter to create)\n";
 		$FILE = <STDIN>;
 		chop $FILE;
 		# ask user for existing CA certificate
 		if ($FILE) {
 		    cp_pem($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
 		    cp_pem($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
 		    $RET=$?;
 		} else {
 		    print "Making CA certificate ...\n";
 		    system ("$REQ -new -keyout " .
 			"${CATOP}/private/$CAKEY -out ${CATOP}/$CAREQ");
 		    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 " .
 			"-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");
 	    $RET=$?;
 	} elsif (/^(-sign|-signreq)$/) {
 	    system ("$CA -policy policy_anything -out newcert.pem " .
 							"-infiles newreq.pem");
 	    $RET=$?;
 	    print "Signed certificate is in newcert.pem\n";
 	} elsif (/^(-signCA)$/) {
 	    system ("$CA -policy policy_anything -out newcert.pem " .
 					"-extensions v3_ca -infiles newreq.pem");
 	    $RET=$?;
 	    print "Signed CA certificate is in newcert.pem\n";
 	} elsif (/^-signcert$/) {
 	    system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
 								"-out tmp.pem");
 	    system ("$CA -policy policy_anything -out newcert.pem " .
 							"-infiles tmp.pem");
 	    $RET = $?;
 	    print "Signed certificate is in newcert.pem\n";
 	} elsif (/^-verify$/) {
 	    if (shift) {
 		foreach $j (@ARGV) {
 		    system ("$VERIFY -CAfile $CATOP/$CACERT $j");
 		    $RET=$? if ($? != 0);
 		}
 		exit $RET;
 	    } else {
 		    system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
 		    $RET=$?;
 	    	    exit 0;
 	    }
 	} else {
 	    print STDERR "Unknown arg $_\n";
 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
 	    exit 1;
 	}
 }
 exit $RET;
 sub cp_pem {
 my ($infile, $outfile, $bound) = @_;
 open IN, $infile;
 open OUT, ">$outfile";
 my $flag = 0;
 while (<IN>) {
 	$flag = 1 if (/^-----BEGIN.*$bound/) ;
 	print OUT $_ if ($flag);
 	if (/^-----END.*$bound/) {
 		close IN;
 		close OUT;
 		return;
 	}
 }
 }
--- a/apps/CA.sh
+++ b/apps/CA.sh
@@ -0,0 +1,139 @@
 #!/bin/sh
 #
 # 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 ... 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
 #
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
 if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
 DAYS="-days 365"	# 1 year
 CADAYS="-days 1095"	# 3 years
 REQ="$OPENSSL req $SSLEAY_CONFIG"
 CA="$OPENSSL ca $SSLEAY_CONFIG"
 VERIFY="$OPENSSL verify"
 X509="$OPENSSL x509"
 CATOP=./demoCA
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
 for i
 do
 case $i in
 -\?|-h|-help)
    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
    RET=$?
    echo "Certificate is in newcert.pem, private key is in newkey.pem"
    ;;
 -newreq) 
    # create a certificate request
    $REQ -new -keyout newkey.pem -out newreq.pem $DAYS
    RET=$?
    echo "Request is in newreq.pem, private key is in newkey.pem"
    ;;
 -newca)     
    # if explicitly asked for or it doesn't exist then setup the directory
    # structure that Eric likes to manage things 
    NEW="1"
    if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
 	# create the directory hierarchy
 	mkdir ${CATOP} 
 	mkdir ${CATOP}/certs 
 	mkdir ${CATOP}/crl 
 	mkdir ${CATOP}/newcerts
 	mkdir ${CATOP}/private
 	echo "00" > ${CATOP}/serial
 	touch ${CATOP}/index.txt
    fi
    if [ ! -f ${CATOP}/private/$CAKEY ]; then
 	echo "CA certificate filename (or enter to create)"
 	read FILE
 	# ask user for existing CA certificate
 	if [ "$FILE" ]; then
 	    cp $FILE ${CATOP}/private/$CAKEY
 	    RET=$?
 	else
 	    echo "Making CA certificate ..."
 	    $REQ -new -keyout ${CATOP}/private/$CAKEY \
 			   -out ${CATOP}/$CAREQ
 	    $CA -out ${CATOP}/$CACERT $CADAYS -batch \
 			   -keyfile ${CATOP}/private/$CAKEY -selfsign \
 			   -infiles ${CATOP}/$CAREQ 
 	    RET=$?
 	fi
    fi
    ;;
 -xsign)
    $CA -policy policy_anything -infiles newreq.pem 
    RET=$?
    ;;
 -sign|-signreq) 
    $CA -policy policy_anything -out newcert.pem -infiles newreq.pem
    RET=$?
    cat newcert.pem
    echo "Signed certificate is in newcert.pem"
    ;;
 -signcert) 
    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
    cat newcert.pem
    echo "Signed certificate is in newcert.pem"
    ;;
 -verify) 
    shift
    if [ -z "$1" ]; then
 	    $VERIFY -CAfile $CATOP/$CACERT newcert.pem
 	    RET=$?
    else
 	for j
 	do
 	    $VERIFY -CAfile $CATOP/$CACERT $j
 	    if [ $? != 0 ]; then
 		    RET=$?
 	    fi
 	done
    fi
    exit 0
    ;;
 *)
    echo "Unknown arg $i";
    exit 1
    ;;
 esac
 done
 exit $RET
--- a/apps/Makefile
+++ b/apps/Makefile
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -1,3 +1,4 @@
 /* apps/app_rand.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -108,107 +109,110 @@
 *
 */
 #define NON_MAIN
 #include "apps.h"
 #undef NON_MAIN
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 static int seeded = 0;
 static int egdsocket = 0;
-int app_RAND_load_file(const char *file, int dont_warn)
+int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
-{
+	{
-    int consider_randfile = (file == NULL);
+	int consider_randfile = (file == NULL);
-    char buffer[200];
+	char buffer[200];
 #ifdef OPENSSL_SYS_WINDOWS
-    RAND_screen();
+	BIO_printf(bio_e,"Loading 'screen' into random state -");
 	BIO_flush(bio_e);
 	RAND_screen();
 	BIO_printf(bio_e," done\n");
 #endif
-    if (file == NULL)
+	if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
+		file = RAND_file_name(buffer, sizeof buffer);
-    else if (RAND_egd(file) > 0) {
+	else if (RAND_egd(file) > 0)
-        /*
+		{
-         * we try if the given filename is an EGD socket. if it is, we don't
+		/* we try if the given filename is an EGD socket.
-         * write anything back to the file.
+		   if it is, we don't write anything back to the file. */
-         */
+		egdsocket = 1;
-        egdsocket = 1;
+		return 1;
-        return 1;
+		}
-    }
+	if (file == NULL || !RAND_load_file(file, -1))
-    if (file == NULL || !RAND_load_file(file, -1)) {
+		{
-        if (RAND_status() == 0) {
+		if (RAND_status() == 0)
-            if (!dont_warn) {
+			{
-                BIO_printf(bio_err, "unable to load 'random state'\n");
+			if (!dont_warn)
-                BIO_printf(bio_err,
+				{
-                           "This means that the random number generator has not been seeded\n");
+				BIO_printf(bio_e,"unable to load 'random state'\n");
-                BIO_printf(bio_err, "with much random data.\n");
+				BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
-                if (consider_randfile) { /* explanation does not apply when a
+				BIO_printf(bio_e,"with much random data.\n");
-                                          * file is explicitly named */
+				if (consider_randfile) /* explanation does not apply when a file is explicitly named */
-                    BIO_printf(bio_err,
+					{
-                               "Consider setting the RANDFILE environment variable to point at a file that\n");
+					BIO_printf(bio_e,"Consider setting the RANDFILE environment variable to point at a file that\n");
-                    BIO_printf(bio_err,
+					BIO_printf(bio_e,"'random' data can be kept in (the file will be overwritten).\n");
-                               "'random' data can be kept in (the file will be overwritten).\n");
+					}
-                }
+				}
-            }
+			return 0;
-            return 0;
+			}
-        }
+		}
-    }
+	seeded = 1;
-    seeded = 1;
+	return 1;
-    return 1;
+	}
 }
 long app_RAND_load_files(char *name)
-{
+	{
-    char *p, *n;
+	char *p,*n;
-    int last;
+	int last;
-    long tot = 0;
+	long tot=0;
-    int egd;
+	int egd;
-    for (;;) {
+	for (;;)
-        last = 0;
+		{
-        for (p = name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++) ;
+		last=0;
-        if (*p == '\0')
+		for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++);
-            last = 1;
+		if (*p == '\0') last=1;
-        *p = '\0';
+		*p='\0';
-        n = name;
+		n=name;
-        name = p + 1;
+		name=p+1;
-        if (*n == '\0')
+		if (*n == '\0') break;
            break;
-        egd = RAND_egd(n);
+		egd=RAND_egd(n);
-        if (egd > 0)
+		if (egd > 0)
-            tot += egd;
+			tot+=egd;
-        else
+		else
-            tot += RAND_load_file(n, -1);
+			tot+=RAND_load_file(n,-1);
-        if (last)
+		if (last) break;
-            break;
+		}
-    }
+	if (tot > 512)
-    if (tot > 512)
+		app_RAND_allow_write_file();
-        app_RAND_allow_write_file();
+	return(tot);
-    return (tot);
+	}
 }
-int app_RAND_write_file(const char *file)
+int app_RAND_write_file(const char *file, BIO *bio_e)
-{
+	{
-    char buffer[200];
+	char buffer[200];
-    if (egdsocket || !seeded)
+	if (egdsocket || !seeded)
-        /*
+		/* If we did not manage to read the seed file,
-         * If we did not manage to read the seed file, we should not write a
+		 * we should not write a low-entropy seed file back --
-         * low-entropy seed file back -- it would suppress a crucial warning
+		 * it would suppress a crucial warning the next time
-         * the next time we want to use it.
+		 * we want to use it. */
-         */
+		return 0;
        return 0;
-    if (file == NULL)
+	if (file == NULL)
-        file = RAND_file_name(buffer, sizeof buffer);
+		file = RAND_file_name(buffer, sizeof buffer);
-    if (file == NULL || !RAND_write_file(file)) {
+	if (file == NULL || !RAND_write_file(file))
-        BIO_printf(bio_err, "unable to write 'random state'\n");
+		{
-        return 0;
+		BIO_printf(bio_e,"unable to write 'random state'\n");
-    }
+		return 0;
-    return 1;
+		}
-}
+	return 1;
 	}
 void app_RAND_allow_write_file(void)
-{
+	{
-    seeded = 1;
+	seeded = 1;
-}
+	}
--- a/apps/apps.c
+++ b/apps/apps.c
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -110,478 +110,239 @@
 */
 #ifndef HEADER_APPS_H
-# define HEADER_APPS_H
+#define HEADER_APPS_H
-# include "e_os.h"
+#include "e_os.h"
 # include <assert.h>
-# include <openssl/e_os2.h>
+#include <openssl/bio.h>
-# include <openssl/bio.h>
+#include <openssl/x509.h>
-# include <openssl/x509.h>
+#include <openssl/lhash.h>
-# include <openssl/lhash.h>
+#include <openssl/conf.h>
-# include <openssl/conf.h>
+#include <openssl/txt_db.h>
-# include <openssl/txt_db.h>
+#ifndef OPENSSL_NO_ENGINE
-# ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
-#  include <openssl/engine.h>
+#endif
-# endif
+#include <openssl/ossl_typ.h>
 # ifndef OPENSSL_NO_OCSP
 #  include <openssl/ocsp.h>
 # endif
 # include <openssl/ossl_typ.h>
 # ifndef OPENSSL_SYS_NETWARE
 #  include <signal.h>
 # endif
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
-#  define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
+int app_RAND_write_file(const char *file, BIO *bio_e);
-# else
+/* When `file' is NULL, use defaults.
-#  define openssl_fdset(a,b) FD_SET(a, b)
+ * `bio_e' is for error messages. */
 # endif
 int app_RAND_load_file(const char *file, int dont_warn);
 int app_RAND_write_file(const char *file);
 /*
 * When `file' is NULL, use defaults. `bio_e' is for error messages.
 */
 void app_RAND_allow_write_file(void);
 long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                       * separated by LIST_SEPARATOR_CHAR
                                       * (see e_os.h).  The string is
                                       * destroyed! */
-extern char *default_config_file;
+#ifdef OPENSSL_SYS_WIN32
-extern BIO *bio_in;
+#define rename(from,to) WIN32_rename((from),(to))
-extern BIO *bio_out;
+int WIN32_rename(const char *oldname,const char *newname);
 #endif
 #ifndef MONOLITH
 #define MAIN(a,v)	main(a,v)
 #ifndef NON_MAIN
 CONF *config=NULL;
 BIO *bio_err=NULL;
 int in_FIPS_mode=0;
 #else
 extern CONF *config;
 extern BIO *bio_err;
-BIO *dup_bio_in(int format);
+extern int in_FIPS_mode;
-BIO *dup_bio_out(int format);
+#endif
 BIO *bio_open_owner(const char *filename, int format, int private);
 BIO *bio_open_default(const char *filename, char mode, int format);
 BIO *bio_open_default_quiet(const char *filename, char mode, int format);
 CONF *app_load_config(const char *filename);
 CONF *app_load_config_quiet(const char *filename);
 int app_load_modules(const CONF *config);
 void unbuffer(FILE *fp);
 void wait_for_async(SSL *s);
-/*
+#else
 * Common verification options.
 */
 # define OPT_V_ENUM \
        OPT_V__FIRST=2000, \
        OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
        OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL, \
        OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS, \
        OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK, \
        OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP, \
        OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS, \
        OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST, \
        OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192, \
        OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME, \
        OPT_V__LAST
-# define OPT_V_OPTIONS \
+#define MAIN(a,v)	PROG(a,v)
-        { "policy", OPT_V_POLICY, 's' }, \
+extern CONF *config;
-        { "purpose", OPT_V_PURPOSE, 's' }, \
+extern char *default_config_file;
-        { "verify_name", OPT_V_VERIFY_NAME, 's' }, \
+extern BIO *bio_err;
-        { "verify_depth", OPT_V_VERIFY_DEPTH, 'p' }, \
+extern int in_FIPS_mode;
        { "attime", OPT_V_ATTIME, 'p' }, \
        { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's' }, \
        { "verify_email", OPT_V_VERIFY_EMAIL, 's' }, \
        { "verify_ip", OPT_V_VERIFY_IP, 's' }, \
        { "ignore_critical", OPT_V_IGNORE_CRITICAL, '-' }, \
        { "issuer_checks", OPT_V_ISSUER_CHECKS, '-' }, \
        { "crl_check", OPT_V_CRL_CHECK, '-', "Check that peer cert has not been revoked" }, \
        { "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "Also check all certs in the chain" }, \
        { "policy_check", OPT_V_POLICY_CHECK, '-' }, \
        { "explicit_policy", OPT_V_EXPLICIT_POLICY, '-' }, \
        { "inhibit_any", OPT_V_INHIBIT_ANY, '-' }, \
        { "inhibit_map", OPT_V_INHIBIT_MAP, '-' }, \
        { "x509_strict", OPT_V_X509_STRICT, '-' }, \
        { "extended_crl", OPT_V_EXTENDED_CRL, '-' }, \
        { "use_deltas", OPT_V_USE_DELTAS, '-' }, \
        { "policy_print", OPT_V_POLICY_PRINT, '-' }, \
        { "check_ss_sig", OPT_V_CHECK_SS_SIG, '-' }, \
        { "trusted_first", OPT_V_TRUSTED_FIRST, '-', "Use locally-trusted CA's first in building chain" }, \
        { "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-' }, \
        { "suiteB_128", OPT_V_SUITEB_128, '-' }, \
        { "suiteB_192", OPT_V_SUITEB_192, '-' }, \
        { "partial_chain", OPT_V_PARTIAL_CHAIN, '-' }, \
        { "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "Only use the first cert chain found" }, \
        { "no_check_time", OPT_V_NO_CHECK_TIME, '-', "Do not check validity against current time" }
-# define OPT_V_CASES \
+#endif
        OPT_V__FIRST: case OPT_V__LAST: break; \
        case OPT_V_POLICY: \
        case OPT_V_PURPOSE: \
        case OPT_V_VERIFY_NAME: \
        case OPT_V_VERIFY_DEPTH: \
        case OPT_V_ATTIME: \
        case OPT_V_VERIFY_HOSTNAME: \
        case OPT_V_VERIFY_EMAIL: \
        case OPT_V_VERIFY_IP: \
        case OPT_V_IGNORE_CRITICAL: \
        case OPT_V_ISSUER_CHECKS: \
        case OPT_V_CRL_CHECK: \
        case OPT_V_CRL_CHECK_ALL: \
        case OPT_V_POLICY_CHECK: \
        case OPT_V_EXPLICIT_POLICY: \
        case OPT_V_INHIBIT_ANY: \
        case OPT_V_INHIBIT_MAP: \
        case OPT_V_X509_STRICT: \
        case OPT_V_EXTENDED_CRL: \
        case OPT_V_USE_DELTAS: \
        case OPT_V_POLICY_PRINT: \
        case OPT_V_CHECK_SS_SIG: \
        case OPT_V_TRUSTED_FIRST: \
        case OPT_V_SUITEB_128_ONLY: \
        case OPT_V_SUITEB_128: \
        case OPT_V_SUITEB_192: \
        case OPT_V_PARTIAL_CHAIN: \
        case OPT_V_NO_ALT_CHAINS: \
        case OPT_V_NO_CHECK_TIME
-/*
+#ifndef OPENSSL_SYS_NETWARE
- * Common "extended"? options.
+#include <signal.h>
- */
+#endif
 # define OPT_X_ENUM \
        OPT_X__FIRST=1000, \
        OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
        OPT_X_CERTFORM, OPT_X_KEYFORM, \
        OPT_X__LAST
-# define OPT_X_OPTIONS \
+#ifdef SIGPIPE
-        { "xkey", OPT_X_KEY, '<' }, \
+#define do_pipe_sig()	signal(SIGPIPE,SIG_IGN)
-        { "xcert", OPT_X_CERT, '<' }, \
+#else
-        { "xchain", OPT_X_CHAIN, '<' }, \
+#define do_pipe_sig()
-        { "xchain_build", OPT_X_CHAIN_BUILD, '-' }, \
+#endif
        { "xcertform", OPT_X_CERTFORM, 'F' }, \
        { "xkeyform", OPT_X_KEYFORM, 'F' }
-# define OPT_X_CASES \
+#if defined(MONOLITH) && !defined(OPENSSL_C)
-        OPT_X__FIRST: case OPT_X__LAST: break; \
+#  define apps_startup() \
-        case OPT_X_KEY: \
+		do_pipe_sig()
-        case OPT_X_CERT: \
+#  define apps_shutdown()
-        case OPT_X_CHAIN: \
+#else
-        case OPT_X_CHAIN_BUILD: \
+#  ifndef OPENSSL_NO_ENGINE
-        case OPT_X_CERTFORM: \
+#    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
-        case OPT_X_KEYFORM
+     defined(OPENSSL_SYS_WIN32)
 #      ifdef _O_BINARY
 #        define apps_startup() \
 			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 #      else
 #        define apps_startup() \
 			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
 #      endif
 #    else
 #      define apps_startup() \
 			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 			ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
 			setup_ui_method(); } while(0)
 #    endif
 #    define apps_shutdown() \
 			do { CONF_modules_unload(1); destroy_ui_method(); \
 			EVP_cleanup(); ENGINE_cleanup(); \
 			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 			ERR_free_strings(); } while(0)
 #  else
 #    if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
     defined(OPENSSL_SYS_WIN32)
 #      ifdef _O_BINARY
 #        define apps_startup() \
 			do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			setup_ui_method(); } while(0)
 #      else
 #        define apps_startup() \
 			do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
 			ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
 			setup_ui_method(); } while(0)
 #      endif
 #    else
 #      define apps_startup() \
 			do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
 			ERR_load_crypto_strings(); \
 			setup_ui_method(); } while(0)
 #    endif
 #    define apps_shutdown() \
 			do { CONF_modules_unload(1); destroy_ui_method(); \
 			EVP_cleanup(); \
 			CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
 			ERR_free_strings(); } while(0)
 #  endif
 #endif
-/*
+typedef struct args_st
- * Common SSL options.
+	{
- * Any changes here must be coordinated with ../ssl/ssl_conf.c
+	char **data;
- */
+	int count;
-# define OPT_S_ENUM \
+	} ARGS;
        OPT_S__FIRST=3000, \
        OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2, \
        OPT_S_BUGS, OPT_S_NOCOMP, OPT_S_ECDHSINGLE, OPT_S_NOTICKET, \
        OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_LEGACYCONN, \
        OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, OPT_S_STRICT, OPT_S_SIGALGS, \
        OPT_S_CLIENTSIGALGS, OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, \
        OPT_S_DHPARAM, OPT_S_DEBUGBROKE, \
        OPT_S__LAST
-# define OPT_S_OPTIONS \
+#define PW_MIN_LENGTH 4
-        {"no_ssl3", OPT_S_NOSSL3, '-' }, \
+typedef struct pw_cb_data
-        {"no_tls1", OPT_S_NOTLS1, '-' }, \
+	{
-        {"no_tls1_1", OPT_S_NOTLS1_1, '-' }, \
+	const void *password;
-        {"no_tls1_2", OPT_S_NOTLS1_2, '-' }, \
+	const char *prompt_info;
-        {"bugs", OPT_S_BUGS, '-' }, \
+	} PW_CB_DATA;
        {"no_comp", OPT_S_NOCOMP, '-', "Don't use SSL/TLS-level compression" }, \
        {"ecdh_single", OPT_S_ECDHSINGLE, '-' }, \
        {"no_ticket", OPT_S_NOTICKET, '-' }, \
        {"serverpref", OPT_S_SERVERPREF, '-' }, \
        {"legacy_renegotiation", OPT_S_LEGACYRENEG, '-' }, \
        {"legacy_server_connect", OPT_S_LEGACYCONN, '-' }, \
        {"no_resumption_on_reneg", OPT_S_ONRESUMP, '-' }, \
        {"no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-' }, \
        {"strict", OPT_S_STRICT, '-' }, \
        {"sigalgs", OPT_S_SIGALGS, 's', \
            "Signature algorithms to support (colon-separated list)" }, \
        {"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
            "Signature algorithms to support for client certificate" \
            " authentication (colon-separated list)" }, \
        {"curves", OPT_S_CURVES, 's', \
            "Elliptic curves to advertise (colon-separated list)" }, \
        {"named_curve", OPT_S_NAMEDCURVE, 's', \
            "Elliptic curve used for ECDHE (server-side only)" }, \
        {"cipher", OPT_S_CIPHER, 's', }, \
        {"dhparam", OPT_S_DHPARAM, '<' }, \
        {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-' }
-# define OPT_S_CASES \
+int password_callback(char *buf, int bufsiz, int verify,
-        OPT_S__FIRST: case OPT_S__LAST: break; \
+	PW_CB_DATA *cb_data);
        case OPT_S_NOSSL3: \
        case OPT_S_NOTLS1: \
        case OPT_S_NOTLS1_1: \
        case OPT_S_NOTLS1_2: \
        case OPT_S_BUGS: \
        case OPT_S_NOCOMP: \
        case OPT_S_ECDHSINGLE: \
        case OPT_S_NOTICKET: \
        case OPT_S_SERVERPREF: \
        case OPT_S_LEGACYRENEG: \
        case OPT_S_LEGACYCONN: \
        case OPT_S_ONRESUMP: \
        case OPT_S_NOLEGACYCONN: \
        case OPT_S_STRICT: \
        case OPT_S_SIGALGS: \
        case OPT_S_CLIENTSIGALGS: \
        case OPT_S_CURVES: \
        case OPT_S_NAMEDCURVE: \
        case OPT_S_CIPHER: \
        case OPT_S_DHPARAM: \
        case OPT_S_DEBUGBROKE
 /*
 * Option parsing.
 */
 extern const char OPT_HELP_STR[];
 extern const char OPT_MORE_STR[];
 typedef struct options_st {
    const char *name;
    int retval;
    /*
     * value type: - no value (also the value zero), n number, p positive
     * number, u unsigned, s string, < input file, > output file, f der/pem
     * format, F any format identifier.  n and u include zero; p does not.
     */
    int valtype;
    const char *helpstr;
 } OPTIONS;
 /*
 * A string/int pairing; widely use for option value lookup, hence the
 * name OPT_PAIR. But that name is misleading in s_cb.c, so we also use
 * the "generic" name STRINT_PAIR.
 */
 typedef struct string_int_pair_st {
    const char *name;
    int retval;
 } OPT_PAIR, STRINT_PAIR;
 /* Flags to pass into opt_format; see FORMAT_xxx, below. */
 # define OPT_FMT_PEMDER          (1L <<  1)
 # define OPT_FMT_PKCS12          (1L <<  2)
 # define OPT_FMT_SMIME           (1L <<  3)
 # define OPT_FMT_ENGINE          (1L <<  4)
 # define OPT_FMT_MSBLOB          (1L <<  5)
 # define OPT_FMT_NETSCAPE        (1L <<  6)
 # define OPT_FMT_NSS             (1L <<  7)
 # define OPT_FMT_TEXT            (1L <<  8)
 # define OPT_FMT_HTTP            (1L <<  9)
 # define OPT_FMT_PVK             (1L << 10)
 # define OPT_FMT_ANY     ( \
        OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_SMIME | \
        OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NETSCAPE | \
        OPT_FMT_NSS | OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
 char *opt_progname(const char *argv0);
 char *opt_getprog(void);
 char *opt_init(int ac, char **av, const OPTIONS * o);
 int opt_next();
 int opt_format(const char *s, unsigned long flags, int *result);
 int opt_int(const char *arg, int *result);
 int opt_ulong(const char *arg, unsigned long *result);
 int opt_long(const char *arg, long *result);
 int opt_pair(const char *arg, const OPT_PAIR * pairs, int *result);
 int opt_cipher(const char *name, const EVP_CIPHER **cipherp);
 int opt_md(const char *name, const EVP_MD **mdp);
 char *opt_arg(void);
 char *opt_flag(void);
 char *opt_unknown(void);
 char *opt_reset(void);
 char **opt_rest(void);
 int opt_num_rest(void);
 int opt_verify(int i, X509_VERIFY_PARAM *vpm);
 void opt_help(const OPTIONS * list);
 int opt_format_error(const char *s, unsigned long flags);
 int opt_next(void);
 typedef struct args_st {
    int size;
    int argc;
    char **argv;
 } ARGS;
 # define PW_MIN_LENGTH 4
 typedef struct pw_cb_data {
    const void *password;
    const char *prompt_info;
 } PW_CB_DATA;
 int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data);
 int setup_ui_method(void);
 void destroy_ui_method(void);
-int chopup_args(ARGS *arg, char *buf);
+int should_retry(int i);
-# ifdef HEADER_X509_H
+int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
 void program_name(char *in,char *out,int size);
 int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
 #ifdef HEADER_X509_H
 int dump_cert_text(BIO *out, X509 *x);
-void print_name(BIO *out, const char *title, X509_NAME *nm,
+void print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags);
-                unsigned long lflags);
+#endif
 # endif
 void print_bignum_var(BIO *, BIGNUM *, const char*, int, unsigned char *);
 void print_array(BIO *, const char *, int, const unsigned char *);
 int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
 int set_ext_copy(int *copy_type, const char *arg);
 int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
-int app_passwd(char *arg1, char *arg2, char **pass1, char **pass2);
+int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
-int add_oid_section(CONF *conf);
+int add_oid_section(BIO *err, CONF *conf);
-X509 *load_cert(const char *file, int format,
+X509 *load_cert(BIO *err, const char *file, int format,
-                const char *pass, ENGINE *e, const char *cert_descrip);
+	const char *pass, ENGINE *e, const char *cert_descrip);
-X509_CRL *load_crl(const char *infile, int format);
+EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
-int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl);
+	const char *pass, ENGINE *e, const char *key_descrip);
-EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
+EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
-                   const char *pass, ENGINE *e, const char *key_descrip);
+	const char *pass, ENGINE *e, const char *key_descrip);
-EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
+STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
-                      const char *pass, ENGINE *e, const char *key_descrip);
+	const char *pass, ENGINE *e, const char *cert_descrip);
-STACK_OF(X509) *load_certs(const char *file, int format,
+X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
-                           const char *pass, ENGINE *e,
+#ifndef OPENSSL_NO_ENGINE
-                           const char *cert_descrip);
+ENGINE *setup_engine(BIO *err, const char *engine, int debug);
-STACK_OF(X509_CRL) *load_crls(const char *file, int format,
+#endif
-                              const char *pass, ENGINE *e,
+
-                              const char *cert_descrip);
+int load_config(BIO *err, CONF *cnf);
-X509_STORE *setup_verify(char *CAfile, char *CApath,
+char *make_config_name(void);
                         int noCAfile, int noCApath);
 int ctx_set_verify_locations(SSL_CTX *ctx, const char *CAfile,
                             const char *CApath, int noCAfile, int noCApath);
 # ifdef OPENSSL_NO_ENGINE
 #  define setup_engine(engine, debug) NULL
 # else
 ENGINE *setup_engine(const char *engine, int debug);
 # endif
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
                                 const char *host, const char *path,
                                 const char *port, int use_ssl,
                                 STACK_OF(CONF_VALUE) *headers,
                                 int req_timeout);
 # endif
 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-                   ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+			ASN1_GENERALIZEDTIME **pinvtm, const char *str);
-# define DB_type         0
+#define DB_type         0
-# define DB_exp_date     1
+#define DB_exp_date     1
-# define DB_rev_date     2
+#define DB_rev_date     2
-# define DB_serial       3      /* index - unique */
+#define DB_serial       3       /* index - unique */
-# define DB_file         4
+#define DB_file         4       
-# define DB_name         5      /* index - unique when active and not
+#define DB_name         5       /* index - unique when active and not disabled */
-                                 * disabled */
+#define DB_NUMBER       6
 # define DB_NUMBER       6
-# define DB_TYPE_REV     'R'
+#define DB_TYPE_REV	'R'
-# define DB_TYPE_EXP     'E'
+#define DB_TYPE_EXP	'E'
-# define DB_TYPE_VAL     'V'
+#define DB_TYPE_VAL	'V'
-typedef struct db_attr_st {
+typedef struct db_attr_st
-    int unique_subject;
+	{
-} DB_ATTR;
+	int unique_subject;
-typedef struct ca_db_st {
+	} DB_ATTR;
-    DB_ATTR attributes;
+typedef struct ca_db_st
-    TXT_DB *db;
+	{
-} CA_DB;
+	DB_ATTR attributes;
 	TXT_DB *db;
 	} CA_DB;
 void* app_malloc(int sz, const char *what);
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(char *serialfile, char *suffix, BIGNUM *serial,
+int save_serial(char *serialfile, char *suffix, BIGNUM *serial, ASN1_INTEGER **retai);
                ASN1_INTEGER **retai);
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 CA_DB *load_index(char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
-int rotate_index(const char *dbfile, const char *new_suffix,
+int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
                 const char *old_suffix);
 void free_index(CA_DB *db);
-# define index_name_cmp_noconst(a, b) \
+int index_name_cmp(const char **a, const char **b);
        index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
        (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
 int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
-X509_NAME *parse_name(const char *str, long chtype, int multirdn);
+X509_NAME *parse_name(char *str, long chtype, int multirdn);
 int args_verify(char ***pargs, int *pargc,
-                int *badarg, X509_VERIFY_PARAM **pm);
+			int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
-void policies_print(X509_STORE_CTX *ctx);
+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(EVP_PKEY_CTX **pctx,
                 const char *algname, ENGINE *e, int do_param);
 int do_X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
                 STACK_OF(OPENSSL_STRING) *sigopts);
 int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
                     STACK_OF(OPENSSL_STRING) *sigopts);
 int do_X509_CRL_sign(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
-unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
+#define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
 #define FORMAT_TEXT     2
 #define FORMAT_PEM      3
 #define FORMAT_NETSCAPE 4
 #define FORMAT_PKCS12   5
 #define FORMAT_SMIME    6
 #define FORMAT_ENGINE   7
 #define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
 				 * adding yet another param to load_*key() */
-void print_cert_checks(BIO *bio, X509 *x,
+#define EXT_COPY_NONE	0
-                       const char *checkhost,
+#define EXT_COPY_ADD	1
-                       const char *checkemail, const char *checkip);
+#define EXT_COPY_ALL	2
-void store_setup_crl_download(X509_STORE *st);
+#define NETSCAPE_CERT_HDR	"certificate"
-/* See OPT_FMT_xxx, above. */
+#define APP_PASS_LEN	1024
 /* On some platforms, it's important to distinguish between text and binary
 * files.  On some, there might even be specific file formats for different
 * contents.  The FORMAT_xxx macros are meant to express an intent with the
 * file being read or created.
 */
 # define B_FORMAT_TEXT   0x8000
 # define FORMAT_UNDEF    0
 # define FORMAT_TEXT    (1 | B_FORMAT_TEXT)     /* Generic text */
 # define FORMAT_BINARY   2                      /* Generic binary */
 # define FORMAT_BASE64  (3 | B_FORMAT_TEXT)     /* Base64 */
 # define FORMAT_ASN1     4                      /* ASN.1/DER */
 # define FORMAT_PEM     (5 | B_FORMAT_TEXT)
 # define FORMAT_PKCS12   6
 # define FORMAT_SMIME   (7 | B_FORMAT_TEXT)
 # define FORMAT_ENGINE   8                      /* Not really a file format */
 # define FORMAT_PEMRSA  (9 | B_FORMAT_TEXT)     /* 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 SERIAL_RAND_BITS	64
 # define EXT_COPY_ADD    1
 # define EXT_COPY_ALL    2
 # define NETSCAPE_CERT_HDR       "certificate"
 # define APP_PASS_LEN    1024
 # define SERIAL_RAND_BITS        64
 int app_hex(char);
 int app_isdir(const char *);
 int app_access(const char *, int flag);
 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);
 /* this is an accident waiting to happen (-Wshadow is your friend) */
 extern int verify_depth;
 extern int verify_quiet;
 extern int verify_error;
 extern int verify_return_error;
 # include "progs.h"
 #endif
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -1,3 +1,4 @@
 /* apps/asn1pars.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,9 +56,8 @@
 * [including the GNU Public Licence.]
 */
-/*
+/* A nice addition from Dr Stephen Henson <shenson@bigfoot.com> to 
- * A nice addition from Dr Stephen Henson <steve@openssl.org> to add the
+ * add the -strparse option which parses nested binary structures
 * -strparse option which parses nested binary structures
 */
 #include <stdio.h>
@@ -69,309 +69,376 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-typedef enum OPTION_choice {
+/* -inform arg	- input format - default PEM (DER or PEM)
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+ * -in arg	- input file - default stdin
-    OPT_INFORM, OPT_IN, OPT_OUT, OPT_INDENT, OPT_NOOUT,
+ * -i		- indent the details by depth
-    OPT_OID, OPT_OFFSET, OPT_LENGTH, OPT_DUMP, OPT_DLIMIT,
+ * -offset	- where in the file to start
-    OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM
+ * -length	- how many bytes to use
-} OPTION_CHOICE;
+ * -oid file	- extra oid description file
 */
-OPTIONS asn1parse_options[] = {
+#undef PROG
-    {"help", OPT_HELP, '-', "Display this summary"},
+#define PROG	asn1parse_main
    {"inform", OPT_INFORM, 'F', "input format - one of DER PEM"},
    {"in", OPT_IN, '<', "input file"},
    {"out", OPT_OUT, '>', "output file (output format is always DER)"},
    {"i", OPT_INDENT, 0, "entries"},
    {"noout", OPT_NOOUT, 0, "don't produce any output"},
    {"offset", OPT_OFFSET, 'p', "offset into file"},
    {"length", OPT_LENGTH, 'p', "length of section in file"},
    {"oid", OPT_OID, '<', "file of extra oid definitions"},
    {"dump", OPT_DUMP, 0, "unknown data in hex form"},
    {"dlimit", OPT_DLIMIT, 'p',
     "dump the first arg bytes of unknown data in hex form"},
    {"strparse", OPT_STRPARSE, 's',
     "offset; a series of these can be used to 'dig'"},
    {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
    {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
    {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"},
    {OPT_MORE_STR, 0, 0, "(-inform  will be ignored)"},
    {"strictpem", OPT_STRICTPEM, 0,
     "do not attempt base64 decode outside PEM markers"},
    {NULL}
 };
-static int do_generate(char *genstr, char *genconf, BUF_MEM *buf);
+int MAIN(int, char **);
-int asn1parse_main(int argc, char **argv)
+static int do_generate(BIO *bio, char *genstr, char *genconf, BUF_MEM *buf);
 {
    ASN1_TYPE *at = NULL;
    BIO *in = NULL, *b64 = NULL, *derout = NULL;
    BUF_MEM *buf = NULL;
    STACK_OF(OPENSSL_STRING) *osk = NULL;
    char *genstr = NULL, *genconf = NULL;
    char *infile = NULL, *str = NULL, *oidfile = NULL, *derfile = NULL;
    char *name = NULL, *header = NULL, *prog;
    const unsigned char *ctmpbuf;
    int indent = 0, noout = 0, dump = 0, strictpem = 0, informat = FORMAT_PEM;
    int offset = 0, ret = 1, i, j;
    long num, tmplen;
    unsigned char *tmpbuf;
    unsigned int length = 0;
    OPTION_CHOICE o;
-    prog = opt_init(argc, argv, asn1parse_options);
+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;
 	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 *osk=NULL;
 	ASN1_TYPE *at=NULL;
-    if ((osk = sk_OPENSSL_STRING_new_null()) == NULL) {
+	informat=FORMAT_PEM;
        BIO_printf(bio_err, "%s: Memory allocation failure\n", prog);
        goto end;
    }
-    while ((o = opt_next()) != OPT_EOF) {
+	apps_startup();
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(asn1parse_options);
            ret = 0;
            goto end;
        case OPT_INFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUT:
            derfile = opt_arg();
            break;
        case OPT_INDENT:
            indent = 1;
            break;
        case OPT_NOOUT:
            noout = 1;
            break;
        case OPT_OID:
            oidfile = opt_arg();
            break;
        case OPT_OFFSET:
            offset = strtol(opt_arg(), NULL, 0);
            break;
        case OPT_LENGTH:
            length = atoi(opt_arg());
            break;
        case OPT_DUMP:
            dump = -1;
            break;
        case OPT_DLIMIT:
            dump = atoi(opt_arg());
            break;
        case OPT_STRPARSE:
            sk_OPENSSL_STRING_push(osk, opt_arg());
            break;
        case OPT_GENSTR:
            genstr = opt_arg();
            break;
        case OPT_GENCONF:
            genconf = opt_arg();
            break;
        case OPT_STRICTPEM:
            strictpem = 1;
            informat = FORMAT_PEM;
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
-    if (oidfile != NULL) {
+	if (bio_err == NULL)
-        in = bio_open_default(oidfile, 'r', FORMAT_TEXT);
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-        if (in == NULL)
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
            goto end;
        OBJ_create_objects(in);
        BIO_free(in);
    }
-    if ((in = bio_open_default(infile, 'r', informat)) == NULL)
+	if (!load_config(bio_err, NULL))
-        goto end;
+		goto end;
-    if (derfile && (derout = bio_open_default(derfile, 'w', FORMAT_ASN1)) == NULL)
+	prog=argv[0];
-        goto end;
+	argc--;
 	argv++;
 	if ((osk=sk_new_null()) == NULL)
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto end;
 		}
 	while (argc >= 1)
 		{
 		if 	(strcmp(*argv,"-inform") == 0)
 			{
 			if (--argc < 1) goto bad;
 			informat=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;
 			derfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-i") == 0)
 			{
 			indent=1;
 			}
 		else if (strcmp(*argv,"-noout") == 0) noout = 1;
 		else if (strcmp(*argv,"-oid") == 0)
 			{
 			if (--argc < 1) goto bad;
 			oidfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-offset") == 0)
 			{
 			if (--argc < 1) goto bad;
 			offset= atoi(*(++argv));
 			}
 		else if (strcmp(*argv,"-length") == 0)
 			{
 			if (--argc < 1) goto bad;
 			length= atoi(*(++argv));
 			if (length == 0) goto bad;
 			}
 		else if (strcmp(*argv,"-dump") == 0)
 			{
 			dump= -1;
 			}
 		else if (strcmp(*argv,"-dlimit") == 0)
 			{
 			if (--argc < 1) goto bad;
 			dump= atoi(*(++argv));
 			if (dump <= 0) goto bad;
 			}
 		else if (strcmp(*argv,"-strparse") == 0)
 			{
 			if (--argc < 1) goto bad;
 			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
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
-    if (strictpem) {
+	if (badops)
-        if (PEM_read_bio(in, &name, &header, (unsigned char **)&str, &num) !=
+		{
-            1) {
+bad:
-            BIO_printf(bio_err, "Error reading PEM file\n");
+		BIO_printf(bio_err,"%s [options] <infile\n",prog);
-            ERR_print_errors(bio_err);
+		BIO_printf(bio_err,"where options are\n");
-            goto end;
+		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
-        }
+		BIO_printf(bio_err," -in arg       input file\n");
-    } else {
+		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
 		BIO_printf(bio_err," -noout arg    don't produce any output\n");
 		BIO_printf(bio_err," -offset arg   offset into file\n");
 		BIO_printf(bio_err," -length arg   length of section in file\n");
 		BIO_printf(bio_err," -i            indent entries\n");
 		BIO_printf(bio_err," -dump         dump unknown data in hex form\n");
 		BIO_printf(bio_err," -dlimit arg   dump the first arg bytes of unknown data in hex form\n");
 		BIO_printf(bio_err," -oid file     file of extra oid definitions\n");
 		BIO_printf(bio_err," -strparse offset\n");
 		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
 		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
 		BIO_printf(bio_err," -genstr str   string to generate ASN1 structure from\n");
 		BIO_printf(bio_err," -genconf file file to generate ASN1 structure from\n");
 		goto end;
 		}
-        if ((buf = BUF_MEM_new()) == NULL)
+	ERR_load_crypto_strings();
            goto end;
        if (!BUF_MEM_grow(buf, BUFSIZ * 8))
            goto end;           /* Pre-allocate :-) */
-        if (genstr || genconf) {
+	in=BIO_new(BIO_s_file());
-            num = do_generate(genstr, genconf, buf);
+	out=BIO_new(BIO_s_file());
-            if (num < 0) {
+	if ((in == NULL) || (out == NULL))
-                ERR_print_errors(bio_err);
+		{
-                goto end;
+		ERR_print_errors(bio_err);
-            }
+		goto end;
-        }
+		}
 	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
 #ifdef OPENSSL_SYS_VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	out = BIO_push(tmpbio, out);
 	}
 #endif
-        else {
+	if (oidfile != NULL)
 		{
 		if (BIO_read_filename(in,oidfile) <= 0)
 			{
 			BIO_printf(bio_err,"problems opening %s\n",oidfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		OBJ_create_objects(in);
 		}
-            if (informat == FORMAT_PEM) {
+	if (infile == NULL)
-                BIO *tmp;
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 	else
 		{
 		if (BIO_read_filename(in,infile) <= 0)
 			{
 			perror(infile);
 			goto end;
 			}
 		}
-                if ((b64 = BIO_new(BIO_f_base64())) == NULL)
+	if (derfile) {
-                    goto end;
+		if(!(derout = BIO_new_file(derfile, "wb"))) {
-                BIO_push(b64, in);
+			BIO_printf(bio_err,"problems opening %s\n",derfile);
-                tmp = in;
+			ERR_print_errors(bio_err);
-                in = b64;
+			goto end;
-                b64 = tmp;
+		}
-            }
+	}
-            num = 0;
+	if ((buf=BUF_MEM_new()) == NULL) goto end;
-            for (;;) {
+	if (!BUF_MEM_grow(buf,BUFSIZ*8)) goto end; /* Pre-allocate :-) */
                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;
-    }
+	if (genstr || genconf)
 		{
 		num = do_generate(bio_err, genstr, genconf, buf);
 		if (num < 0)
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    /* If any structs to parse go through in sequence */
+	else
 		{
-    if (sk_OPENSSL_STRING_num(osk)) {
+		if (informat == FORMAT_PEM)
-        tmpbuf = (unsigned char *)str;
+			{
-        tmplen = num;
+			BIO *tmp;
        for (i = 0; i < sk_OPENSSL_STRING_num(osk); i++) {
            ASN1_TYPE *atmp;
            int typ;
            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));
                continue;
            }
            tmpbuf += j;
            tmplen -= j;
            atmp = at;
            ctmpbuf = tmpbuf;
            at = d2i_ASN1_TYPE(NULL, &ctmpbuf, tmplen);
            ASN1_TYPE_free(atmp);
            if (!at) {
                BIO_printf(bio_err, "Error parsing structure\n");
                ERR_print_errors(bio_err);
                goto end;
            }
            typ = ASN1_TYPE_get(at);
            if ((typ == V_ASN1_OBJECT)
                || (typ == V_ASN1_BOOLEAN)
                || (typ == V_ASN1_NULL)) {
                BIO_printf(bio_err, "Can't parse %s type\n", ASN1_tag2str(typ));
                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;
        }
        str = (char *)tmpbuf;
        num = tmplen;
    }
-    if (offset >= num) {
+			if ((b64=BIO_new(BIO_f_base64())) == NULL)
-        BIO_printf(bio_err, "Error: offset too large\n");
+				goto end;
-        goto end;
+			BIO_push(b64,in);
-    }
+			tmp=in;
 			in=b64;
 			b64=tmp;
 			}
-    num -= offset;
+		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;
-    if ((length == 0) || ((long)length > num))
+	/* If any structs to parse go through in sequence */
        length = (unsigned int)num;
    if (derout) {
        if (BIO_write(derout, str + offset, length) != (int)length) {
            BIO_printf(bio_err, "Error writing output\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    if (!noout &&
        !ASN1_parse_dump(bio_out, (unsigned char *)&(str[offset]), length,
                         indent, dump)) {
        ERR_print_errors(bio_err);
        goto end;
    }
    ret = 0;
 end:
    BIO_free(derout);
    BIO_free(in);
    BIO_free(b64);
    if (ret != 0)
        ERR_print_errors(bio_err);
    BUF_MEM_free(buf);
    OPENSSL_free(name);
    OPENSSL_free(header);
    if (strictpem)
        OPENSSL_free(str);
    ASN1_TYPE_free(at);
    sk_OPENSSL_STRING_free(osk);
    OBJ_cleanup();
    return (ret);
 }
-static int do_generate(char *genstr, char *genconf, BUF_MEM *buf)
+	if (sk_num(osk))
-{
+		{
-    CONF *cnf = NULL;
+		tmpbuf=(unsigned char *)str;
-    int len;
+		tmplen=num;
-    unsigned char *p;
+		for (i=0; i<sk_num(osk); i++)
-    ASN1_TYPE *atyp = NULL;
+			{
 			ASN1_TYPE *atmp;
 			int typ;
 			j=atoi(sk_value(osk,i));
 			if (j == 0)
 				{
 				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,&ctmpbuf,tmplen);
 			ASN1_TYPE_free(atmp);
 			if(!at)
 				{
 				BIO_printf(bio_err,"Error parsing structure\n");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			typ = ASN1_TYPE_get(at);
 			if ((typ == V_ASN1_OBJECT)
 				|| (typ == V_ASN1_NULL))
 				{
 				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;
 			}
 		str=(char *)tmpbuf;
 		num=tmplen;
 		}
-    if (genconf) {
+	if (offset >= num)
-        if ((cnf = app_load_config(genconf)) == NULL)
+		{
-            goto err;
+		BIO_printf(bio_err, "Error: offset too large\n");
-        if (!genstr)
+		goto end;
-            genstr = NCONF_get_string(cnf, "default", "asn1");
+		}
        if (!genstr) {
            BIO_printf(bio_err, "Can't find 'asn1' in '%s'\n", genconf);
            goto err;
        }
    }
-    atyp = ASN1_generate_nconf(genstr, cnf);
+	num -= offset;
    NCONF_free(cnf);
    cnf = NULL;
-    if (!atyp)
+	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
-        return -1;
+	if(derout) {
 		if(BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 	if (!noout &&
 	    !ASN1_parse_dump(out,(unsigned char *)&(str[offset]),length,
 		    indent,dump))
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	ret=0;
 end:
 	BIO_free(derout);
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (b64 != NULL) BIO_free(b64);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	if (buf != NULL) BUF_MEM_free(buf);
 	if (at != NULL) ASN1_TYPE_free(at);
 	if (osk != NULL) sk_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-    len = i2d_ASN1_TYPE(atyp, NULL);
+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 (len <= 0)
+	if (genconf)
-        goto err;
+		{
 		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;
 			}
 		}
-    if (!BUF_MEM_grow(buf, len))
+	atyp = ASN1_generate_nconf(genstr, cnf);
-        goto err;
+	NCONF_free(cnf);
-    p = (unsigned char *)buf->data;
+	if (!atyp)
 		return -1;
-    i2d_ASN1_TYPE(atyp, &p);
+	len = i2d_ASN1_TYPE(atyp, NULL);
-    ASN1_TYPE_free(atyp);
+	if (len <= 0)
-    return len;
+		goto err;
- err:
+	if (!BUF_MEM_grow(buf,len))
-    NCONF_free(cnf);
+		goto err;
-    ASN1_TYPE_free(atyp);
+
-    return -1;
+	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
@@ -1,3 +1,4 @@
 /* apps/ciphers.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -58,195 +59,150 @@
 #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>
-typedef enum OPTION_choice {
+#undef PROG
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#define PROG	ciphers_main
    OPT_STDNAME,
    OPT_SSL3,
    OPT_TLS1,
    OPT_TLS1_1,
    OPT_TLS1_2,
    OPT_PSK,
    OPT_V, OPT_UPPER_V, OPT_S
 } OPTION_CHOICE;
-OPTIONS ciphers_options[] = {
+static const char *ciphers_usage[]={
-    {"help", OPT_HELP, '-', "Display this summary"},
+"usage: ciphers args\n",
-    {"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
+" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
-    {"V", OPT_UPPER_V, '-', "Even more verbose"},
+" -ssl2       - SSL2 mode\n",
-    {"s", OPT_S, '-', "Only supported ciphers"},
+" -ssl3       - SSL3 mode\n",
-    {"tls1", OPT_TLS1, '-', "TLS1 mode"},
+" -tls1       - TLS1 mode\n",
-    {"tls1_1", OPT_TLS1_1, '-', "TLS1.1 mode"},
+NULL
    {"tls1_2", OPT_TLS1_2, '-', "TLS1.2 mode"},
 #ifndef OPENSSL_NO_SSL_TRACE
    {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
 #endif
 #ifndef OPENSSL_NO_SSL3
    {"ssl3", OPT_SSL3, '-', "SSL3 mode"},
 #endif
 #ifndef OPENSSL_NO_PSK
    {"psk", OPT_PSK, '-', "include ciphersuites requiring PSK"},
 #endif
    {NULL}
 };
-static unsigned int dummy_psk(SSL *ssl, const char *hint, char *identity,
+int MAIN(int, char **);
                              unsigned int max_identity_len,
                              unsigned char *psk,
                              unsigned int max_psk_len)
 {
    return 0;
 }
-int ciphers_main(int argc, char **argv)
+int MAIN(int argc, char **argv)
-{
+	{
-    SSL_CTX *ctx = NULL;
+	int ret=1,i;
-    SSL *ssl = NULL;
+	int verbose=0;
-    STACK_OF(SSL_CIPHER) *sk = NULL;
+	const char **pp;
-    const SSL_METHOD *meth = TLS_server_method();
+	const char *p;
-    int ret = 1, i, verbose = 0, Verbose = 0, use_supported = 0;
+	int badops=0;
-#ifndef OPENSSL_NO_SSL_TRACE
+	SSL_CTX *ctx=NULL;
-    int stdname = 0;
+	SSL *ssl=NULL;
-#endif
+	char *ciphers=NULL;
-#ifndef OPENSSL_NO_PSK
+	SSL_METHOD *meth=NULL;
-    int psk = 0;
+	STACK_OF(SSL_CIPHER) *sk;
-#endif
+	char buf[512];
-    const char *p;
+	BIO *STDout=NULL;
    char *ciphers = NULL, *prog;
    char buf[512];
    OPTION_CHOICE o;
-    prog = opt_init(argc, argv, ciphers_options);
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-    while ((o = opt_next()) != OPT_EOF) {
+	meth=SSLv23_server_method();
-        switch (o) {
+#elif !defined(OPENSSL_NO_SSL3)
-        case OPT_EOF:
+	meth=SSLv3_server_method();
-        case OPT_ERR:
+#elif !defined(OPENSSL_NO_SSL2)
- opthelp:
+	meth=SSLv2_server_method();
-            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+#endif
-            goto end;
+
-        case OPT_HELP:
+	apps_startup();
-            opt_help(ciphers_options);
+
-            ret = 0;
+	if (bio_err == NULL)
-            goto end;
+		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-        case OPT_V:
+	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
-            verbose = 1;
+#ifdef OPENSSL_SYS_VMS
-            break;
+	{
-        case OPT_UPPER_V:
+	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-            verbose = Verbose = 1;
+	STDout = BIO_push(tmpbio, STDout);
-            break;
+	}
-        case OPT_S:
+#endif
-            use_supported = 1;
+
-            break;
+	argc--;
-        case OPT_STDNAME:
+	argv++;
-#ifndef OPENSSL_NO_SSL_TRACE
+	while (argc >= 1)
-            stdname = verbose = 1;
+		{
 		if (strcmp(*argv,"-v") == 0)
 			verbose=1;
 #ifndef OPENSSL_NO_SSL2
 		else if (strcmp(*argv,"-ssl2") == 0)
 			meth=SSLv2_client_method();
 #endif
            break;
        case OPT_SSL3:
 #ifndef OPENSSL_NO_SSL3
-            meth = SSLv3_client_method();
+		else if (strcmp(*argv,"-ssl3") == 0)
 			meth=SSLv3_client_method();
 #endif
-            break;
+#ifndef OPENSSL_NO_TLS1
-        case OPT_TLS1:
+		else if (strcmp(*argv,"-tls1") == 0)
-            meth = TLSv1_client_method();
+			meth=TLSv1_client_method();
            break;
        case OPT_TLS1_1:
            meth = TLSv1_1_client_method();
            break;
        case OPT_TLS1_2:
            meth = TLSv1_2_client_method();
            break;
        case OPT_PSK:
 #ifndef OPENSSL_NO_PSK
            psk = 1;
 #endif
-            break;
+		else if ((strncmp(*argv,"-h",2) == 0) ||
-        }
+			 (strcmp(*argv,"-?") == 0))
-    }
+			{
-    argv = opt_rest();
+			badops=1;
-    argc = opt_num_rest();
+			break;
 			}
 		else
 			{
 			ciphers= *argv;
 			}
 		argc--;
 		argv++;
 		}
-    if (argc == 1)
+	if (badops)
-        ciphers = *argv;
+		{
-    else if (argc != 0)
+		for (pp=ciphers_usage; (*pp != NULL); pp++)
-        goto opthelp;
+			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
-    ctx = SSL_CTX_new(meth);
+	OpenSSL_add_ssl_algorithms();
    if (ctx == NULL)
        goto err;
 #ifndef OPENSSL_NO_PSK
    if (psk)
        SSL_CTX_set_psk_client_callback(ctx, dummy_psk);
 #endif
    if (ciphers != NULL) {
        if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
            BIO_printf(bio_err, "Error in cipher list\n");
            goto err;
        }
    }
    ssl = SSL_new(ctx);
    if (ssl == NULL)
        goto err;
-    if (use_supported)
+	ctx=SSL_CTX_new(meth);
-        sk = SSL_get1_supported_ciphers(ssl);
+	if (ctx == NULL) goto err;
-    else
+	if (ciphers != NULL) {
-        sk = SSL_get_ciphers(ssl);
+		if(!SSL_CTX_set_cipher_list(ctx,ciphers)) {
 			BIO_printf(bio_err, "Error in cipher list\n");
 			goto err;
 		}
 	}
 	ssl=SSL_new(ctx);
 	if (ssl == NULL) goto err;
    if (!verbose) {
        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
            SSL_CIPHER *c = sk_SSL_CIPHER_value(sk, i);
            p = SSL_CIPHER_get_name(c);
            if (p == NULL)
                break;
            if (i != 0)
                BIO_printf(bio_out, ":");
            BIO_printf(bio_out, "%s", p);
        }
        BIO_printf(bio_out, "\n");
    } else {
-        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+	if (!verbose)
-            SSL_CIPHER *c;
+		{
 		for (i=0; ; i++)
 			{
 			p=SSL_get_cipher_list(ssl,i);
 			if (p == NULL) break;
 			if (i != 0) BIO_printf(STDout,":");
 			BIO_printf(STDout,"%s",p);
 			}
 		BIO_printf(STDout,"\n");
 		}
 	else
 		{
 		sk=SSL_get_ciphers(ssl);
-            c = sk_SSL_CIPHER_value(sk, i);
+		for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
 			{
 			BIO_puts(STDout,SSL_CIPHER_description(
 				sk_SSL_CIPHER_value(sk,i),
 				buf,sizeof buf));
 			}
 		}
-            if (Verbose) {
+	ret=0;
-                unsigned long id = SSL_CIPHER_get_id(c);
+	if (0)
-                int id0 = (int)(id >> 24);
+		{
-                int id1 = (int)((id >> 16) & 0xffL);
+err:
-                int id2 = (int)((id >> 8) & 0xffL);
+		SSL_load_error_strings();
-                int id3 = (int)(id & 0xffL);
+		ERR_print_errors(bio_err);
 		}
 end:
 	if (ctx != NULL) SSL_CTX_free(ctx);
 	if (ssl != NULL) SSL_free(ssl);
 	if (STDout != NULL) BIO_free_all(STDout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
                if ((id & 0xff000000L) == 0x03000000L)
                    BIO_printf(bio_out, "          0x%02X,0x%02X - ", id2, id3); /* SSL3
                                                                                  * cipher */
                else
                    BIO_printf(bio_out, "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(bio_out, "%s - ", nm);
            }
 #endif
            BIO_puts(bio_out, SSL_CIPHER_description(c, buf, sizeof buf));
        }
    }
    ret = 0;
    goto end;
 err:
    ERR_print_errors(bio_err);
 end:
    if (use_supported)
        sk_SSL_CIPHER_free(sk);
    SSL_CTX_free(ctx);
    SSL_free(ssl);
    return (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
@@ -1,3 +1,4 @@
 /* apps/crl.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -65,332 +66,364 @@
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
-typedef enum OPTION_choice {
+#undef PROG
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#define PROG	crl_main
    OPT_INFORM, OPT_IN, OPT_OUTFORM, OPT_OUT, OPT_KEYFORM, OPT_KEY,
    OPT_ISSUER, OPT_LASTUPDATE, OPT_NEXTUPDATE, OPT_FINGERPRINT,
    OPT_CRLNUMBER, OPT_BADSIG, OPT_GENDELTA, OPT_CAPATH, OPT_CAFILE,
    OPT_NOCAPATH, OPT_NOCAFILE, OPT_VERIFY, OPT_TEXT, OPT_HASH, OPT_HASH_OLD,
    OPT_NOOUT, OPT_NAMEOPT, OPT_MD
 } OPTION_CHOICE;
-OPTIONS crl_options[] = {
+#undef POSTFIX
-    {"help", OPT_HELP, '-', "Display this summary"},
+#define	POSTFIX	".rvk"
-    {"inform", OPT_INFORM, 'F', "Input format; default PEM"},
+
-    {"in", OPT_IN, '<', "Input file - default stdin"},
+static const char *crl_usage[]={
-    {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
+"usage: crl args\n",
-    {"out", OPT_OUT, '>', "output file - default stdout"},
+"\n",
-    {"keyform", OPT_KEYFORM, 'F'},
+" -inform arg     - input format - default PEM (DER or PEM)\n",
-    {"key", OPT_KEY, '<'},
+" -outform arg    - output format - default PEM\n",
-    {"issuer", OPT_ISSUER, '-', "Print issuer DN"},
+" -text           - print out a text format version\n",
-    {"lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field"},
+" -in arg         - input file - default stdin\n",
-    {"nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field"},
+" -out arg        - output file - default stdout\n",
-    {"noout", OPT_NOOUT, '-', "No CRL output"},
+" -hash           - print hash value\n",
-    {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},
+" -fingerprint    - print the crl fingerprint\n",
-    {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},
+" -issuer         - print issuer DN\n",
-    {"badsig", OPT_BADSIG, '-'},
+" -lastupdate     - lastUpdate field\n",
-    {"gendelta", OPT_GENDELTA, '<'},
+" -nextupdate     - nextUpdate field\n",
-    {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},
+" -noout          - no CRL output\n",
-    {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
+" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
-    {"no-CAfile", OPT_NOCAFILE, '-',
+" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
-     "Do not load the default certificates file"},
+" -nameopt arg    - various certificate name options\n",
-    {"no-CApath", OPT_NOCAPATH, '-',
+NULL
     "Do not load certificates from the default certificates directory"},
    {"verify", OPT_VERIFY, '-'},
    {"text", OPT_TEXT, '-', "Print out a text format version"},
    {"hash", OPT_HASH, '-', "Print hash value"},
    {"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"},
    {"", OPT_MD, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_MD5
    {"hash_old", OPT_HASH_OLD, '-', "Print old-style (MD5) hash value"},
 #endif
    {NULL}
 };
-int crl_main(int argc, char **argv)
+static X509_CRL *load_crl(char *file, int format);
-{
+static BIO *bio_out=NULL;
-    X509_CRL *x = NULL;
+
-    BIO *out = NULL;
+int MAIN(int, char **);
-    X509_STORE *store = NULL;
+
-    X509_STORE_CTX ctx;
+int MAIN(int argc, char **argv)
-    X509_LOOKUP *lookup = NULL;
+	{
-    X509_OBJECT xobj;
+	unsigned long nmflag = 0;
-    EVP_PKEY *pkey;
+	X509_CRL *x=NULL;
-    const EVP_MD *digest = EVP_sha1();
+	char *CAfile = NULL, *CApath = NULL;
-    unsigned long nmflag = 0;
+	int ret=1,i,num,badops=0;
-    char nmflag_set = 0;
+	BIO *out=NULL;
-    char *infile = NULL, *outfile = NULL, *crldiff = NULL, *keyfile = NULL;
+	int informat,outformat;
-    char *CAfile = NULL, *CApath = NULL, *prog;
+	char *infile=NULL,*outfile=NULL;
-    OPTION_CHOICE o;
+	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
-    int hash = 0, issuer = 0, lastupdate = 0, nextupdate = 0, noout = 0;
+	int fingerprint = 0;
-    int informat = FORMAT_PEM, outformat = FORMAT_PEM, keyformat = FORMAT_PEM;
+	const char **pp;
-    int ret = 1, num = 0, badsig = 0, fingerprint = 0, crlnumber = 0;
+	X509_STORE *store = NULL;
-    int text = 0, do_ver = 0, noCAfile = 0, noCApath = 0;
+	X509_STORE_CTX ctx;
-    int i;
+	X509_LOOKUP *lookup = NULL;
-#ifndef OPENSSL_NO_MD5
+	X509_OBJECT xobj;
-    int hash_old = 0;
+	EVP_PKEY *pkey;
 	int do_ver = 0;
 	const EVP_MD *md_alg,*digest=EVP_sha1();
 	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;
 	if (bio_out == NULL)
 		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 			{
 			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			bio_out = BIO_push(tmpbio, bio_out);
 			}
 #endif
 			}
-    prog = opt_init(argc, argv, crl_options);
+	informat=FORMAT_PEM;
-    while ((o = opt_next()) != OPT_EOF) {
+	outformat=FORMAT_PEM;
-        switch (o) {
+
-        case OPT_EOF:
+	argc--;
-        case OPT_ERR:
+	argv++;
- opthelp:
+	num=0;
-            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+	while (argc >= 1)
-            goto end;
+		{
-        case OPT_HELP:
+#ifdef undef
-            opt_help(crl_options);
+		if	(strcmp(*argv,"-p") == 0)
-            ret = 0;
+			{
-            goto end;
+			if (--argc < 1) goto bad;
-        case OPT_INFORM:
+			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
+			}
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUTFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
                goto opthelp;
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_KEYFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &keyformat))
                goto opthelp;
            break;
        case OPT_KEY:
            keyfile = opt_arg();
            break;
        case OPT_GENDELTA:
            crldiff = opt_arg();
            break;
        case OPT_CAPATH:
            CApath = opt_arg();
            do_ver = 1;
            break;
        case OPT_CAFILE:
            CAfile = opt_arg();
            do_ver = 1;
            break;
        case OPT_NOCAPATH:
            noCApath =  1;
            break;
        case OPT_NOCAFILE:
            noCAfile =  1;
            break;
        case OPT_HASH_OLD:
 #ifndef OPENSSL_NO_MD5
            hash_old = ++num;
 #endif
-            break;
+		if 	(strcmp(*argv,"-inform") == 0)
-        case OPT_VERIFY:
+			{
-            do_ver = 1;
+			if (--argc < 1) goto bad;
-            break;
+			informat=str2fmt(*(++argv));
-        case OPT_TEXT:
+			}
-            text = 1;
+		else if (strcmp(*argv,"-outform") == 0)
-            break;
+			{
-        case OPT_HASH:
+			if (--argc < 1) goto bad;
-            hash = ++num;
+			outformat=str2fmt(*(++argv));
-            break;
+			}
-        case OPT_ISSUER:
+		else if (strcmp(*argv,"-in") == 0)
-            issuer = ++num;
+			{
-            break;
+			if (--argc < 1) goto bad;
-        case OPT_LASTUPDATE:
+			infile= *(++argv);
-            lastupdate = ++num;
+			}
-            break;
+		else if (strcmp(*argv,"-out") == 0)
-        case OPT_NEXTUPDATE:
+			{
-            nextupdate = ++num;
+			if (--argc < 1) goto bad;
-            break;
+			outfile= *(++argv);
-        case OPT_NOOUT:
+			}
-            noout = ++num;
+		else if (strcmp(*argv,"-CApath") == 0)
-            break;
+			{
-        case OPT_FINGERPRINT:
+			if (--argc < 1) goto bad;
-            fingerprint = ++num;
+			CApath = *(++argv);
-            break;
+			do_ver = 1;
-        case OPT_CRLNUMBER:
+			}
-            crlnumber = ++num;
+		else if (strcmp(*argv,"-CAfile") == 0)
-            break;
+			{
-        case OPT_BADSIG:
+			if (--argc < 1) goto bad;
-            badsig = 1;
+			CAfile = *(++argv);
-            break;
+			do_ver = 1;
-        case OPT_NAMEOPT:
+			}
-            nmflag_set = 1;
+		else if (strcmp(*argv,"-verify") == 0)
-            if (!set_name_ex(&nmflag, opt_arg()))
+			do_ver = 1;
-                goto opthelp;
+		else if (strcmp(*argv,"-text") == 0)
-            break;
+			text = 1;
-        case OPT_MD:
+		else if (strcmp(*argv,"-hash") == 0)
-            if (!opt_md(opt_unknown(), &digest))
+			hash= ++num;
-                goto opthelp;
+		else if (strcmp(*argv,"-nameopt") == 0)
-        }
+			{
-    }
+			if (--argc < 1) goto bad;
-    argc = opt_num_rest();
+			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
-    argv = opt_rest();
+			}
 		else if (strcmp(*argv,"-issuer") == 0)
 			issuer= ++num;
 		else if (strcmp(*argv,"-lastupdate") == 0)
 			lastupdate= ++num;
 		else if (strcmp(*argv,"-nextupdate") == 0)
 			nextupdate= ++num;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout= ++num;
 		else if (strcmp(*argv,"-fingerprint") == 0)
 			fingerprint= ++num;
 		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
 			{
 			/* ok */
 			digest=md_alg;
 			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
-    if (!nmflag_set)
+	if (badops)
-        nmflag = XN_FLAG_ONELINE;
+		{
 bad:
 		for (pp=crl_usage; (*pp != NULL); pp++)
 			BIO_printf(bio_err,"%s",*pp);
 		goto end;
 		}
-    x = load_crl(infile, informat);
+	ERR_load_crypto_strings();
-    if (x == NULL)
+	x=load_crl(infile,informat);
-        goto end;
+	if (x == NULL) { goto end; }
-    if (do_ver) {
+	if(do_ver) {
-        if ((store = setup_verify(CAfile, CApath, noCAfile, noCApath)) == NULL)
+		store = X509_STORE_new();
-            goto end;
+		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
-        lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
+		if (lookup == NULL) goto end;
-        if (lookup == NULL)
+		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
-            goto end;
+			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
        if (!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
            BIO_printf(bio_err, "Error initialising X509 store\n");
            goto end;
        }
-        i = X509_STORE_get_by_subject(&ctx, X509_LU_X509,
+		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
-                                      X509_CRL_get_issuer(x), &xobj);
+		if (lookup == NULL) goto end;
-        if (i <= 0) {
+		if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
-            BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
+			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-            goto end;
+		ERR_clear_error();
        }
        pkey = X509_get_pubkey(xobj.data.x509);
        X509_OBJECT_free_contents(&xobj);
        if (!pkey) {
            BIO_printf(bio_err, "Error getting CRL issuer public key\n");
            goto end;
        }
        i = X509_CRL_verify(x, pkey);
        EVP_PKEY_free(pkey);
        if (i < 0)
            goto end;
        if (i == 0)
            BIO_printf(bio_err, "verify failure\n");
        else
            BIO_printf(bio_err, "verify OK\n");
    }
-    if (crldiff) {
+		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-        X509_CRL *newcrl, *delta;
+			BIO_printf(bio_err,
-        if (!keyfile) {
+				"Error initialising X509 store\n");
-            BIO_puts(bio_err, "Missing CRL signing key\n");
+			goto end;
-            goto end;
+		}
        }
        newcrl = load_crl(crldiff, informat);
        if (!newcrl)
            goto end;
        pkey = load_key(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) {
+		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
-        for (i = 1; i <= num; i++) {
+					X509_CRL_get_issuer(x), &xobj);
-            if (issuer == i) {
+		if(i <= 0) {
-                print_name(bio_out, "issuer=", X509_CRL_get_issuer(x),
+			BIO_printf(bio_err,
-                           nmflag);
+				"Error getting CRL issuer certificate\n");
-            }
+			goto end;
-            if (crlnumber == i) {
+		}
-                ASN1_INTEGER *crlnum;
+		pkey = X509_get_pubkey(xobj.data.x509);
-                crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number, NULL, NULL);
+		X509_OBJECT_free_contents(&xobj);
-                BIO_printf(bio_out, "crlNumber=");
+		if(!pkey) {
-                if (crlnum) {
+			BIO_printf(bio_err,
-                    i2a_ASN1_INTEGER(bio_out, crlnum);
+				"Error getting CRL issuer public key\n");
-                    ASN1_INTEGER_free(crlnum);
+			goto end;
-                } else
+		}
-                    BIO_puts(bio_out, "<NONE>");
+		i = X509_CRL_verify(x, pkey);
-                BIO_printf(bio_out, "\n");
+		EVP_PKEY_free(pkey);
-            }
+		if(i < 0) goto end;
-            if (hash == i) {
+		if(i == 0) BIO_printf(bio_err, "verify failure\n");
-                BIO_printf(bio_out, "%08lx\n",
+		else BIO_printf(bio_err, "verify OK\n");
-                           X509_NAME_hash(X509_CRL_get_issuer(x)));
+	}
-            }
+
-#ifndef OPENSSL_NO_MD5
+	if (num)
-            if (hash_old == i) {
+		{
-                BIO_printf(bio_out, "%08lx\n",
+		for (i=1; i<=num; i++)
-                           X509_NAME_hash_old(X509_CRL_get_issuer(x)));
+			{
-            }
+			if (issuer == i)
 				{
 				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
 				}
 			if (hash == i)
 				{
 				BIO_printf(bio_out,"%08lx\n",
 					X509_NAME_hash(X509_CRL_get_issuer(x)));
 				}
 			if (lastupdate == i)
 				{
 				BIO_printf(bio_out,"lastUpdate=");
 				ASN1_TIME_print(bio_out,
 						X509_CRL_get_lastUpdate(x));
 				BIO_printf(bio_out,"\n");
 				}
 			if (nextupdate == i)
 				{
 				BIO_printf(bio_out,"nextUpdate=");
 				if (X509_CRL_get_nextUpdate(x)) 
 					ASN1_TIME_print(bio_out,
 						X509_CRL_get_nextUpdate(x));
 				else
 					BIO_printf(bio_out,"NONE");
 				BIO_printf(bio_out,"\n");
 				}
 			if (fingerprint == i)
 				{
 				int j;
 				unsigned int n;
 				unsigned char md[EVP_MAX_MD_SIZE];
 				if (!X509_CRL_digest(x,digest,md,&n))
 					{
 					BIO_printf(bio_err,"out of memory\n");
 					goto end;
 					}
 				BIO_printf(bio_out,"%s Fingerprint=",
 						OBJ_nid2sn(EVP_MD_type(digest)));
 				for (j=0; j<(int)n; j++)
 					{
 					BIO_printf(bio_out,"%02X%c",md[j],
 						(j+1 == (int)n)
 						?'\n':':');
 					}
 				}
 			}
 		}
 	out=BIO_new(BIO_s_file());
 	if (out == NULL)
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
-            if (lastupdate == i) {
+		}
-                BIO_printf(bio_out, "lastUpdate=");
+	else
-                ASN1_TIME_print(bio_out, X509_CRL_get_lastUpdate(x));
+		{
-                BIO_printf(bio_out, "\n");
+		if (BIO_write_filename(out,outfile) <= 0)
-            }
+			{
-            if (nextupdate == i) {
+			perror(outfile);
-                BIO_printf(bio_out, "nextUpdate=");
+			goto end;
-                if (X509_CRL_get_nextUpdate(x))
+			}
-                    ASN1_TIME_print(bio_out, X509_CRL_get_nextUpdate(x));
+		}
                else
                    BIO_printf(bio_out, "NONE");
                BIO_printf(bio_out, "\n");
            }
            if (fingerprint == i) {
                int j;
                unsigned int n;
                unsigned char md[EVP_MAX_MD_SIZE];
-                if (!X509_CRL_digest(x, digest, md, &n)) {
+	if (text) X509_CRL_print(out, x);
                    BIO_printf(bio_err, "out of memory\n");
                    goto end;
                }
                BIO_printf(bio_out, "%s Fingerprint=",
                           OBJ_nid2sn(EVP_MD_type(digest)));
                for (j = 0; j < (int)n; j++) {
                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
                               ? '\n' : ':');
                }
            }
        }
    }
    out = bio_open_default(outfile, 'w', outformat);
    if (out == NULL)
        goto end;
-    if (text)
+	if (noout) 
-        X509_CRL_print(out, x);
+		{
 		ret = 0;
 		goto end;
 		}
-    if (noout) {
+	if 	(outformat == FORMAT_ASN1)
-        ret = 0;
+		i=(int)i2d_X509_CRL_bio(out,x);
-        goto end;
+	else if (outformat == FORMAT_PEM)
-    }
+		i=PEM_write_bio_X509_CRL(out,x);
 	else	
 		{
 		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
 	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
 	ret=0;
 end:
 	BIO_free_all(out);
 	BIO_free_all(bio_out);
 	bio_out=NULL;
 	X509_CRL_free(x);
 	if(store) {
 		X509_STORE_CTX_cleanup(&ctx);
 		X509_STORE_free(store);
 	}
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-    if (badsig) {
+static X509_CRL *load_crl(char *infile, int format)
-        ASN1_BIT_STRING *sig;
+	{
-        unsigned char *psig;
+	X509_CRL *x=NULL;
-        X509_CRL_get0_signature(&sig, NULL, x);
+	BIO *in=NULL;
        psig = ASN1_STRING_data(sig);
        psig[ASN1_STRING_length(sig) - 1] ^= 0x1;
    }
-    if (outformat == FORMAT_ASN1)
+	in=BIO_new(BIO_s_file());
-        i = (int)i2d_X509_CRL_bio(out, x);
+	if (in == NULL)
-    else
+		{
-        i = PEM_write_bio_X509_CRL(out, x);
+		ERR_print_errors(bio_err);
-    if (!i) {
+		goto end;
-        BIO_printf(bio_err, "unable to write CRL\n");
+		}
-        goto end;
+
-    }
+	if (infile == NULL)
-    ret = 0;
+		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);
 	}
 end:
    if (ret != 0)
        ERR_print_errors(bio_err);
    BIO_free_all(out);
    X509_CRL_free(x);
    if (store) {
        X509_STORE_CTX_cleanup(&ctx);
        X509_STORE_free(store);
    }
    return (ret);
 }
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -1,3 +1,4 @@
 /* apps/crl2p7.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,15 +56,14 @@
 * [including the GNU Public Licence.]
 */
-/*
+/* This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu>
- * This was written by Gordon Chaffee <chaffee@plateau.cs.berkeley.edu> and
+ * and donated 'to the cause' along with lots and lots of other fixes to
- * donated 'to the cause' along with lots and lots of other fixes to the
+ * the library. */
 * library.
 */
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -73,200 +73,273 @@
 #include <openssl/objects.h>
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 #undef PROG
 #define PROG	crl2pkcs7_main
-typedef enum OPTION_choice {
+/* -inform arg	- input format - default PEM (DER or PEM)
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+ * -outform arg - output format - default PEM
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOCRL, OPT_CERTFILE
+ * -in arg	- input file - default stdin
-} OPTION_CHOICE;
+ * -out arg	- output file - default stdout
 */
-OPTIONS crl2pkcs7_options[] = {
+int MAIN(int, char **);
    {"help", OPT_HELP, '-', "Display this summary"},
    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
    {"in", OPT_IN, '<', "Input file"},
    {"out", OPT_OUT, '>', "Output file"},
    {"nocrl", OPT_NOCRL, '-', "No crl to load, just certs from '-certfile'"},
    {"certfile", OPT_CERTFILE, '<',
     "File of chain of certs to a trusted CA; can be repeated"},
    {NULL}
 };
-int crl2pkcs7_main(int argc, char **argv)
+int MAIN(int argc, char **argv)
-{
+	{
-    BIO *in = NULL, *out = NULL;
+	int i,badops=0;
-    PKCS7 *p7 = NULL;
+	BIO *in=NULL,*out=NULL;
-    PKCS7_SIGNED *p7s = NULL;
+	int informat,outformat;
-    STACK_OF(OPENSSL_STRING) *certflst = NULL;
+	char *infile,*outfile,*prog,*certfile;
-    STACK_OF(X509) *cert_stack = NULL;
+	PKCS7 *p7 = NULL;
-    STACK_OF(X509_CRL) *crl_stack = NULL;
+	PKCS7_SIGNED *p7s = NULL;
-    X509_CRL *crl = NULL;
+	X509_CRL *crl=NULL;
-    char *infile = NULL, *outfile = NULL, *prog, *certfile;
+	STACK *certflst=NULL;
-    int i = 0, informat = FORMAT_PEM, outformat = FORMAT_PEM, ret = 1, nocrl =
+	STACK_OF(X509_CRL) *crl_stack=NULL;
-        0;
+	STACK_OF(X509) *cert_stack=NULL;
-    OPTION_CHOICE o;
+	int ret=1,nocrl=0;
-    prog = opt_init(argc, argv, crl2pkcs7_options);
+	apps_startup();
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(crl2pkcs7_options);
            ret = 0;
            goto end;
        case OPT_INFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
                goto opthelp;
            break;
        case OPT_OUTFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_NOCRL:
            nocrl = 1;
            break;
        case OPT_CERTFILE:
            if ((certflst == NULL)
                && (certflst = sk_OPENSSL_STRING_new_null()) == NULL)
                goto end;
            if (!sk_OPENSSL_STRING_push(certflst, *(++argv))) {
                sk_OPENSSL_STRING_free(certflst);
                goto end;
            }
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
-    if (!nocrl) {
+	if (bio_err == NULL)
-        in = bio_open_default(infile, 'r', informat);
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-        if (in == NULL)
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
            goto end;
-        if (informat == FORMAT_ASN1)
+	infile=NULL;
-            crl = d2i_X509_CRL_bio(in, NULL);
+	outfile=NULL;
-        else if (informat == FORMAT_PEM)
+	informat=FORMAT_PEM;
-            crl = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+	outformat=FORMAT_PEM;
        if (crl == NULL) {
            BIO_printf(bio_err, "unable to load CRL\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
-    if ((p7 = PKCS7_new()) == NULL)
+	prog=argv[0];
-        goto end;
+	argc--;
-    if ((p7s = PKCS7_SIGNED_new()) == NULL)
+	argv++;
-        goto end;
+	while (argc >= 1)
-    p7->type = OBJ_nid2obj(NID_pkcs7_signed);
+		{
-    p7->d.sign = p7s;
+		if 	(strcmp(*argv,"-inform") == 0)
-    p7s->contents->type = OBJ_nid2obj(NID_pkcs7_data);
+			{
 			if (--argc < 1) goto bad;
 			informat=str2fmt(*(++argv));
 			}
 		else if (strcmp(*argv,"-outform") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outformat=str2fmt(*(++argv));
 			}
 		else if (strcmp(*argv,"-in") == 0)
 			{
 			if (--argc < 1) goto bad;
 			infile= *(++argv);
 			}
 		else if (strcmp(*argv,"-nocrl") == 0)
 			{
 			nocrl=1;
 			}
 		else if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-certfile") == 0)
 			{
 			if (--argc < 1) goto bad;
 			if(!certflst) certflst = sk_new_null();
 			sk_push(certflst,*(++argv));
 			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
-    if (!ASN1_INTEGER_set(p7s->version, 1))
+	if (badops)
-        goto end;
+		{
-    if ((crl_stack = sk_X509_CRL_new_null()) == NULL)
+bad:
-        goto end;
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-    p7s->crl = crl_stack;
+		BIO_printf(bio_err,"where options are\n");
-    if (crl != NULL) {
+		BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
-        sk_X509_CRL_push(crl_stack, crl);
+		BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
-        crl = NULL;             /* now part of p7 for OPENSSL_freeing */
+		BIO_printf(bio_err," -in arg        input file\n");
-    }
+		BIO_printf(bio_err," -out arg       output file\n");
 		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
 		BIO_printf(bio_err,"                (can be used more than once)\n");
 		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
 		ret = 1;
 		goto end;
 		}
-    if ((cert_stack = sk_X509_new_null()) == NULL)
+	ERR_load_crypto_strings();
        goto end;
    p7s->cert = cert_stack;
-    if (certflst)
+	in=BIO_new(BIO_s_file());
-        for (i = 0; i < sk_OPENSSL_STRING_num(certflst); i++) {
+	out=BIO_new(BIO_s_file());
-            certfile = sk_OPENSSL_STRING_value(certflst, i);
+	if ((in == NULL) || (out == NULL))
-            if (add_certs_from_file(cert_stack, certfile) < 0) {
+		{
-                BIO_printf(bio_err, "error loading certificates\n");
+		ERR_print_errors(bio_err);
-                ERR_print_errors(bio_err);
+		goto end;
-                goto end;
+		}
            }
        }
-    sk_OPENSSL_STRING_free(certflst);
+	if (!nocrl)
 		{
 		if (infile == NULL)
 			BIO_set_fp(in,stdin,BIO_NOCLOSE);
 		else
 			{
 			if (BIO_read_filename(in,infile) <= 0)
 				{
 				perror(infile);
 				goto end;
 				}
 			}
-    out = bio_open_default(outfile, 'w', outformat);
+		if 	(informat == FORMAT_ASN1)
-    if (out == NULL)
+			crl=d2i_X509_CRL_bio(in,NULL);
-        goto end;
+		else if (informat == FORMAT_PEM)
 			crl=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 (crl == NULL)
 			{
 			BIO_printf(bio_err,"unable to load CRL\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
-    if (outformat == FORMAT_ASN1)
+	if ((p7=PKCS7_new()) == NULL) goto end;
-        i = i2d_PKCS7_bio(out, p7);
+	if ((p7s=PKCS7_SIGNED_new()) == NULL) goto end;
-    else if (outformat == FORMAT_PEM)
+	p7->type=OBJ_nid2obj(NID_pkcs7_signed);
-        i = PEM_write_bio_PKCS7(out, p7);
+	p7->d.sign=p7s;
-    if (!i) {
+	p7s->contents->type=OBJ_nid2obj(NID_pkcs7_data);
        BIO_printf(bio_err, "unable to write pkcs7 object\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    ret = 0;
 end:
    BIO_free(in);
    BIO_free_all(out);
    PKCS7_free(p7);
    X509_CRL_free(crl);
-    return (ret);
+	if (!ASN1_INTEGER_set(p7s->version,1)) goto end;
-}
+	if ((crl_stack=sk_X509_CRL_new_null()) == NULL) goto end;
 	p7s->crl=crl_stack;
 	if (crl != NULL)
 		{
 		sk_X509_CRL_push(crl_stack,crl);
 		crl=NULL; /* now part of p7 for OPENSSL_freeing */
 		}
-/*-
+	if ((cert_stack=sk_X509_new_null()) == NULL) goto end;
 	p7s->cert=cert_stack;
 	if(certflst) for(i = 0; i < sk_num(certflst); i++) {
 		certfile = sk_value(certflst, i);
 		if (add_certs_from_file(cert_stack,certfile) < 0)
 			{
 			BIO_printf(bio_err, "error loading certificates\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 	}
 	sk_free(certflst);
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
 		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 	if 	(outformat == FORMAT_ASN1)
 		i=i2d_PKCS7_bio(out,p7);
 	else if (outformat == FORMAT_PEM)
 		i=PEM_write_bio_PKCS7(out,p7);
 	else	{
 		BIO_printf(bio_err,"bad output format specified for outfile\n");
 		goto end;
 		}
 	if (!i)
 		{
 		BIO_printf(bio_err,"unable to write pkcs7 object\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	ret=0;
 end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (p7 != NULL) PKCS7_free(p7);
 	if (crl != NULL) X509_CRL_free(crl);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 /*
 *----------------------------------------------------------------------
 * int add_certs_from_file
 *
- *      Read a list of certificates to be checked from a file.
+ *	Read a list of certificates to be checked from a file.
 *
 * Results:
- *      number of certs added if successful, -1 if not.
+ *	number of certs added if successful, -1 if not.
 *----------------------------------------------------------------------
 */
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
-{
+	{
-    BIO *in = NULL;
+	struct stat st;
-    int count = 0;
+	BIO *in=NULL;
-    int ret = -1;
+	int count=0;
-    STACK_OF(X509_INFO) *sk = NULL;
+	int ret= -1;
-    X509_INFO *xi;
+	STACK_OF(X509_INFO) *sk=NULL;
 	X509_INFO *xi;
-    in = BIO_new_file(certfile, "r");
+	if ((stat(certfile,&st) != 0))
-    if (in == NULL) {
+		{
-        BIO_printf(bio_err, "error opening the file, %s\n", certfile);
+		BIO_printf(bio_err,"unable to load the file, %s\n",certfile);
-        goto end;
+		goto end;
-    }
+		}
-    /* This loads from a file, a stack of x509/crl/pkey sets */
+	in=BIO_new(BIO_s_file());
-    sk = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+	if ((in == NULL) || (BIO_read_filename(in,certfile) <= 0))
-    if (sk == NULL) {
+		{
-        BIO_printf(bio_err, "error reading the file, %s\n", certfile);
+		BIO_printf(bio_err,"error opening the file, %s\n",certfile);
-        goto end;
+		goto end;
-    }
+		}
-    /* scan over it and pull out the CRL's */
+	/* This loads from a file, a stack of x509/crl/pkey sets */
-    while (sk_X509_INFO_num(sk)) {
+	sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL);
-        xi = sk_X509_INFO_shift(sk);
+	if (sk == NULL) {
-        if (xi->x509 != NULL) {
+		BIO_printf(bio_err,"error reading the file, %s\n",certfile);
-            sk_X509_push(stack, xi->x509);
+		goto end;
-            xi->x509 = NULL;
+	}
-            count++;
+
-        }
+	/* scan over it and pull out the CRL's */
-        X509_INFO_free(xi);
+	while (sk_X509_INFO_num(sk))
-    }
+		{
 		xi=sk_X509_INFO_shift(sk);
 		if (xi->x509 != NULL)
 			{
 			sk_X509_push(stack,xi->x509);
 			xi->x509=NULL;
 			count++;
 			}
 		X509_INFO_free(xi);
 		}
 	ret=count;
 end:
 	/* never need to OPENSSL_free x */
 	if (in != NULL) BIO_free(in);
 	if (sk != NULL) sk_X509_INFO_free(sk);
 	return(ret);
 	}
    ret = count;
 end:
    /* never need to OPENSSL_free x */
    BIO_free(in);
    sk_X509_INFO_free(sk);
    return (ret);
 }
--- a/apps/demoSRP/srp_verifier.txt
+++ b/apps/demoSRP/srp_verifier.txt
@@ -1,6 +0,0 @@
 # This is a file that will be filled by the openssl srp routine.
 # You can initialize the file with additional groups, these are
 # records starting with a I followed by the g and N values and the id.
 # The exact values ... you have to dig this out from the source of srp.c
 # or srp_vfy.c
 # The last value of an I is used as the default group for new users.  
--- a/apps/demoSRP/srp_verifier.txt.attr
+++ b/apps/demoSRP/srp_verifier.txt.attr
@@ -1 +0,0 @@
 unique_subject = yes
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -1,3 +1,4 @@
 /* apps/dgst.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -68,464 +69,480 @@
 #include <openssl/hmac.h>
 #undef BUFSIZE
-#define BUFSIZE 1024*8
+#define BUFSIZE	1024*8
 #undef PROG
 #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,BIO *bmd,const char *hmac_key, int non_fips_allow);
          const char *file, BIO *bmd);
-typedef enum OPTION_choice {
+int MAIN(int, char **);
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_C, OPT_R, OPT_RAND, OPT_OUT, OPT_SIGN, OPT_PASSIN, OPT_VERIFY,
    OPT_PRVERIFY, OPT_SIGNATURE, OPT_KEYFORM, OPT_ENGINE, OPT_ENGINE_IMPL,
    OPT_HEX, OPT_BINARY, OPT_DEBUG, OPT_FIPS_FINGERPRINT,
    OPT_NON_FIPS_ALLOW, OPT_HMAC, OPT_MAC, OPT_SIGOPT, OPT_MACOPT,
    OPT_DIGEST
 } OPTION_CHOICE;
-OPTIONS dgst_options[] = {
+int MAIN(int argc, char **argv)
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [file...]\n"},
+	{
-    {OPT_HELP_STR, 1, '-',
+	ENGINE *e = NULL;
-        "  file... files to digest (default is stdin)\n"},
+	unsigned char *buf=NULL;
-    {"help", OPT_HELP, '-', "Display this summary"},
+	int i,err=0;
-    {"c", OPT_C, '-', "Print the digest with separating colons"},
+	const EVP_MD *md=NULL,*m;
-    {"r", OPT_R, '-', "Print the digest in coreutils format"},
+	BIO *in=NULL,*inp;
-    {"rand", OPT_RAND, 's'},
+	BIO *bmd=NULL;
-    {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
+	BIO *out = NULL;
-    {"passin", OPT_PASSIN, 's'},
+	const char *name;
-    {"sign", OPT_SIGN, '<', "Sign digest using private key in file"},
+#define PROG_NAME_SIZE  39
-    {"verify", OPT_VERIFY, '<',
+	char pname[PROG_NAME_SIZE+1];
-     "Verify a signature using public key in file"},
+	int separator=0;
-    {"prverify", OPT_PRVERIFY, '<',
+	int debug=0;
-     "Verify a signature using private key in file"},
+	int keyform=FORMAT_PEM;
-    {"signature", OPT_SIGNATURE, '<', "File with signature to verify"},
+	const char *outfile = NULL, *keyfile = NULL;
-    {"keyform", OPT_KEYFORM, 'f', "Key file format (PEM or ENGINE)"},
+	const char *sigfile = NULL, *randfile = NULL;
-    {"hex", OPT_HEX, '-', "Print as hex dump"},
+	int out_bin = -1, want_pub = 0, do_verify = 0;
-    {"binary", OPT_BINARY, '-', "Print in binary form"},
+	EVP_PKEY *sigkey = NULL;
-    {"d", OPT_DEBUG, '-', "Print debug info"},
+	unsigned char *sigbuf = NULL;
-    {"debug", OPT_DEBUG, '-'},
+	int siglen = 0;
-    {"fips-fingerprint", OPT_FIPS_FINGERPRINT, '-'},
+	unsigned int sig_flags = 0;
-    {"non-fips-allow", OPT_NON_FIPS_ALLOW, '-'},
+	char *passargin = NULL, *passin = NULL;
    {"hmac", OPT_HMAC, 's', "Create hashed MAC with key"},
    {"mac", OPT_MAC, 's', "Create MAC (not neccessarily HMAC)"},
    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
    {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key"},
    {"", OPT_DIGEST, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
+	char *engine=NULL;
    {"engine_impl", OPT_ENGINE_IMPL, '-'},
 #endif
-    {NULL}
+	char *hmac_key=NULL;
-};
+	int non_fips_allow = 0;
-int dgst_main(int argc, char **argv)
+	apps_startup();
-{
+ERR_load_crypto_strings();
-    BIO *in = NULL, *inp, *bmd = NULL, *out = NULL;
+	if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
-    ENGINE *e = NULL, *impl = NULL;
+		{
-    EVP_PKEY *sigkey = NULL;
+		BIO_printf(bio_err,"out of memory\n");
-    STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
+		goto end;
-    char *hmac_key = NULL;
+		}
-    char *mac_name = NULL;
+	if (bio_err == NULL)
-    char *passinarg = NULL, *passin = NULL;
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-    const EVP_MD *md = NULL, *m;
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
    const char *outfile = NULL, *keyfile = NULL, *prog = NULL;
    const char *sigfile = NULL, *randfile = NULL;
    OPTION_CHOICE o;
    int separator = 0, debug = 0, keyform = FORMAT_PEM, siglen = 0;
    int i, ret = 1, out_bin = -1, want_pub = 0, do_verify =
        0, non_fips_allow = 0;
    unsigned char *buf = NULL, *sigbuf = NULL;
    int engine_impl = 0;
-    prog = opt_progname(argv[0]);
+	if (!load_config(bio_err, NULL))
-    buf = app_malloc(BUFSIZE, "I/O buffer");
+		goto end;
    md = EVP_get_digestbyname(prog);
-    prog = opt_init(argc, argv, dgst_options);
+	/* first check the program name */
-    while ((o = opt_next()) != OPT_EOF) {
+	program_name(argv[0],pname,sizeof pname);
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(dgst_options);
            ret = 0;
            goto end;
        case OPT_C:
            separator = 1;
            break;
        case OPT_R:
            separator = 2;
            break;
        case OPT_RAND:
            randfile = opt_arg();
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_SIGN:
            keyfile = opt_arg();
            break;
        case OPT_PASSIN:
            passinarg = opt_arg();
            break;
        case OPT_VERIFY:
            keyfile = opt_arg();
            want_pub = do_verify = 1;
            break;
        case OPT_PRVERIFY:
            keyfile = opt_arg();
            do_verify = 1;
            break;
        case OPT_SIGNATURE:
            sigfile = opt_arg();
            break;
        case OPT_KEYFORM:
            if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyform))
                goto opthelp;
            break;
        case OPT_ENGINE:
            e = setup_engine(opt_arg(), 0);
            break;
        case OPT_ENGINE_IMPL:
            engine_impl = 1;
            break;
        case OPT_HEX:
            out_bin = 0;
            break;
        case OPT_BINARY:
            out_bin = 1;
            break;
        case OPT_DEBUG:
            debug = 1;
            break;
        case OPT_FIPS_FINGERPRINT:
            hmac_key = "etaonrishdlcupfm";
            break;
        case OPT_NON_FIPS_ALLOW:
            non_fips_allow = 1;
            break;
        case OPT_HMAC:
            hmac_key = opt_arg();
            break;
        case OPT_MAC:
            mac_name = opt_arg();
            break;
        case OPT_SIGOPT:
            if (!sigopts)
                sigopts = sk_OPENSSL_STRING_new_null();
            if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, opt_arg()))
                goto opthelp;
            break;
        case OPT_MACOPT:
            if (!macopts)
                macopts = sk_OPENSSL_STRING_new_null();
            if (!macopts || !sk_OPENSSL_STRING_push(macopts, opt_arg()))
                goto opthelp;
            break;
        case OPT_DIGEST:
            if (!opt_md(opt_unknown(), &m))
                goto opthelp;
            md = m;
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
-    if (do_verify && !sigfile) {
+	md=EVP_get_digestbyname(pname);
        BIO_printf(bio_err,
                   "No signature to verify: use the -signature option\n");
        goto end;
    }
    if (engine_impl)
        impl = e;
-    in = BIO_new(BIO_s_file());
+	argc--;
-    bmd = BIO_new(BIO_f_md());
+	argv++;
-    if ((in == NULL) || (bmd == NULL)) {
+	while (argc > 0)
-        ERR_print_errors(bio_err);
+		{
-        goto end;
+		if ((*argv)[0] != '-') break;
-    }
+		if (strcmp(*argv,"-c") == 0)
 			separator=1;
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) break;
 			randfile=*(++argv);
 			}
 		else if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) break;
 			outfile=*(++argv);
 			}
 		else if (strcmp(*argv,"-sign") == 0)
 			{
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			}
 		else if (!strcmp(*argv,"-passin"))
 			{
 			if (--argc < 1)
 				break;
 			passargin=*++argv;
 			}
 		else if (strcmp(*argv,"-verify") == 0)
 			{
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			want_pub = 1;
 			do_verify = 1;
 			}
 		else if (strcmp(*argv,"-prverify") == 0)
 			{
 			if (--argc < 1) break;
 			keyfile=*(++argv);
 			do_verify = 1;
 			}
 		else if (strcmp(*argv,"-x931") == 0)
 			sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
 		else if (strcmp(*argv,"-pss_saltlen") == 0)
 			{
 			int saltlen;
 			if (--argc < 1) break;
 			saltlen=atoi(*(++argv));
 			if (saltlen == -1)
 				sig_flags = EVP_MD_CTX_FLAG_PSS_MREC;
 			else if (saltlen == -2)
 				sig_flags = EVP_MD_CTX_FLAG_PSS_MDLEN;
 			else if (saltlen < -2 || saltlen >= 0xFFFE)
 				{
 				BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
 				goto end;
 				}
 			else
 				sig_flags = saltlen;
 			sig_flags <<= 16;
 			sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
 			}
 		else if (strcmp(*argv,"-signature") == 0)
 			{
 			if (--argc < 1) break;
 			sigfile=*(++argv);
 			}
 		else if (strcmp(*argv,"-keyform") == 0)
 			{
 			if (--argc < 1) break;
 			keyform=str2fmt(*(++argv));
 			}
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) break;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-hex") == 0)
 			out_bin = 0;
 		else if (strcmp(*argv,"-binary") == 0)
 			out_bin = 1;
 		else if (strcmp(*argv,"-d") == 0)
 			debug=1;
 		else if (strcmp(*argv,"-non-fips-allow") == 0)
 			non_fips_allow=1;
 		else if (!strcmp(*argv,"-hmac"))
 			{
 			if (--argc < 1)
 				break;
 			hmac_key=*++argv;
 			}
 		else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
 			md=m;
 		else
 			break;
 		argc--;
 		argv++;
 		}
-    if (debug) {
+	if (md == NULL)
-        BIO_set_callback(in, BIO_debug_callback);
+		md=EVP_md5();
        /* needed for windows 3.1 */
        BIO_set_callback_arg(in, (char *)bio_err);
    }
-    if (!app_passwd(passinarg, NULL, &passin, NULL)) {
+	if(do_verify && !sigfile) {
-        BIO_printf(bio_err, "Error getting password\n");
+		BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
-        goto end;
+		err = 1; 
-    }
+		goto end;
 	}
-    if (out_bin == -1) {
+	if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
-        if (keyfile)
+		{
-            out_bin = 1;
+		BIO_printf(bio_err,"unknown option '%s'\n",*argv);
-        else
+		BIO_printf(bio_err,"options are\n");
-            out_bin = 0;
+		BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
-    }
+		BIO_printf(bio_err,"-d              to output debug info\n");
 		BIO_printf(bio_err,"-hex            output as hex dump\n");
 		BIO_printf(bio_err,"-binary         output in binary form\n");
 		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
 		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
 		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
 		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
 		BIO_printf(bio_err,"-signature file signature to verify\n");
 		BIO_printf(bio_err,"-binary         output in binary form\n");
 #ifndef OPENSSL_NO_ENGINE
 		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 #endif
-    if (randfile)
+		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm (default)\n",
-        app_RAND_load_file(randfile, 0);
+			LN_md5,LN_md5);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_md4,LN_md4);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_md2,LN_md2);
 #ifndef OPENSSL_NO_SHA
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha1,LN_sha1);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha,LN_sha);
 #ifndef OPENSSL_NO_SHA256
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha224,LN_sha224);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha256,LN_sha256);
 #endif
 #ifndef OPENSSL_NO_SHA512
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha384,LN_sha384);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_sha512,LN_sha512);
 #endif
 #endif
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_mdc2,LN_mdc2);
 		BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
 			LN_ripemd160,LN_ripemd160);
 		err=1;
 		goto end;
 		}
-    out = bio_open_default(outfile, 'w', out_bin ? FORMAT_BINARY : FORMAT_TEXT);
+#ifndef OPENSSL_NO_ENGINE
-    if (out == NULL)
+        e = setup_engine(bio_err, engine, 0);
-        goto end;
+#endif
-    if ((! !mac_name + ! !keyfile + ! !hmac_key) > 1) {
+	in=BIO_new(BIO_s_file());
-        BIO_printf(bio_err, "MAC and Signing key cannot both be specified\n");
+	bmd=BIO_new(BIO_f_md());
-        goto end;
+	if (debug)
-    }
+		{
 		BIO_set_callback(in,BIO_debug_callback);
 		/* needed for windows 3.1 */
 		BIO_set_callback_arg(in,(char *)bio_err);
 		}
-    if (keyfile) {
+	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
-        if (want_pub)
+		{
-            sigkey = load_pubkey(keyfile, keyform, 0, NULL, e, "key file");
+		BIO_printf(bio_err, "Error getting password\n");
-        else
+		goto end;
-            sigkey = load_key(keyfile, keyform, 0, passin, e, "key file");
+		}
        if (!sigkey) {
            /*
             * load_[pub]key() has already printed an appropriate message
             */
            goto end;
        }
    }
-    if (mac_name) {
+	if ((in == NULL) || (bmd == NULL))
-        EVP_PKEY_CTX *mac_ctx = NULL;
+		{
-        int r = 0;
+		ERR_print_errors(bio_err);
-        if (!init_gen_str(&mac_ctx, mac_name, impl, 0))
+		goto end;
-            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:
        EVP_PKEY_CTX_free(mac_ctx);
        if (r == 0)
            goto end;
    }
-    if (non_fips_allow) {
+	if(out_bin == -1) {
-        EVP_MD_CTX *md_ctx;
+		if(keyfile) out_bin = 1;
-        BIO_get_md_ctx(bmd, &md_ctx);
+		else out_bin = 0;
-        EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+	}
    }
-    if (hmac_key) {
+	if(randfile)
-        sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, impl,
+		app_RAND_load_file(randfile, bio_err, 0);
                                      (unsigned char *)hmac_key, -1);
        if (!sigkey)
            goto end;
    }
-    if (sigkey) {
+	if(outfile) {
-        EVP_MD_CTX *mctx = NULL;
+		if(out_bin)
-        EVP_PKEY_CTX *pctx = NULL;
+			out = BIO_new_file(outfile, "wb");
-        int r;
+		else    out = BIO_new_file(outfile, "w");
-        if (!BIO_get_md_ctx(bmd, &mctx)) {
+	} else {
-            BIO_printf(bio_err, "Error getting context\n");
+		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-            ERR_print_errors(bio_err);
+#ifdef OPENSSL_SYS_VMS
-            goto end;
+		{
-        }
+		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-        if (do_verify)
+		out = BIO_push(tmpbio, out);
-            r = EVP_DigestVerifyInit(mctx, &pctx, md, impl, sigkey);
+		}
-        else
+#endif
-            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\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
-    if (sigfile && sigkey) {
+	if(!out) {
-        BIO *sigbio = BIO_new_file(sigfile, "rb");
+		BIO_printf(bio_err, "Error opening output file %s\n", 
-        if (!sigbio) {
+					outfile ? outfile : "(stdout)");
-            BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
+		ERR_print_errors(bio_err);
-            ERR_print_errors(bio_err);
+		goto end;
-            goto end;
+	}
        }
        siglen = EVP_PKEY_size(sigkey);
        sigbuf = app_malloc(siglen, "signature buffer");
        siglen = BIO_read(sigbio, sigbuf, siglen);
        BIO_free(sigbio);
        if (siglen <= 0) {
            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    inp = BIO_push(bmd, in);
-    if (md == NULL) {
+	if(keyfile)
-        EVP_MD_CTX *tctx;
+		{
-        BIO_get_md_ctx(bmd, &tctx);
+		if (want_pub)
-        md = EVP_MD_CTX_md(tctx);
+			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
-    }
+				e, "key file");
 		else
 			sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
 				e, "key file");
 		if (!sigkey)
 			{
 			/* load_[pub]key() has already printed an appropriate
 			   message */
 			goto end;
 			}
 		}
-    if (argc == 0) {
+	if(sigfile && sigkey) {
-        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+		BIO *sigbio;
-        ret = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+		sigbio = BIO_new_file(sigfile, "rb");
-                    siglen, NULL, NULL, "stdin", bmd);
+		siglen = EVP_PKEY_size(sigkey);
-    } else {
+		sigbuf = OPENSSL_malloc(siglen);
-        const char *md_name = NULL, *sig_name = NULL;
+		if(!sigbio) {
-        if (!out_bin) {
+			BIO_printf(bio_err, "Error opening signature file %s\n",
-            if (sigkey) {
+								sigfile);
-                const EVP_PKEY_ASN1_METHOD *ameth;
+			ERR_print_errors(bio_err);
-                ameth = EVP_PKEY_get0_asn1(sigkey);
+			goto end;
-                if (ameth)
+		}
-                    EVP_PKEY_asn1_get0_info(NULL, NULL,
+		siglen = BIO_read(sigbio, sigbuf, siglen);
-                                            NULL, NULL, &sig_name, ameth);
+		BIO_free(sigbio);
-            }
+		if(siglen <= 0) {
-            if (md)
+			BIO_printf(bio_err, "Error reading signature file %s\n",
-                md_name = EVP_MD_name(md);
+								sigfile);
-        }
+			ERR_print_errors(bio_err);
-        ret = 0;
+			goto end;
-        for (i = 0; i < argc; i++) {
+		}
-            int r;
+	}
-            if (BIO_read_filename(in, argv[i]) <= 0) {
+
-                perror(argv[i]);
+	if (non_fips_allow)
-                ret++;
+		{
-                continue;
+		EVP_MD_CTX *md_ctx;
-            } else
+		BIO_get_md_ctx(bmd,&md_ctx);
-                r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+		EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-                          siglen, sig_name, md_name, argv[i], bmd);
+		}
-            if (r)
+
-                ret = r;
+	if (sig_flags)
-            (void)BIO_reset(bmd);
+		{
-        }
+		EVP_MD_CTX *md_ctx;
-    }
+		BIO_get_md_ctx(bmd,&md_ctx);
- end:
+		EVP_MD_CTX_set_flags(md_ctx, sig_flags);
-    OPENSSL_clear_free(buf, BUFSIZE);
+		}
-    BIO_free(in);
+
-    OPENSSL_free(passin);
+	/* we use md as a filter, reading from 'in' */
-    BIO_free_all(out);
+	if (!BIO_set_md(bmd,md))
-    EVP_PKEY_free(sigkey);
+		{
-    sk_OPENSSL_STRING_free(sigopts);
+		BIO_printf(bio_err, "Error setting digest %s\n", pname);
-    sk_OPENSSL_STRING_free(macopts);
+		ERR_print_errors(bio_err);
-    OPENSSL_free(sigbuf);
+		goto end;
-    BIO_free(bmd);
+		}
-    return (ret);
+		
-}
+	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,"","(stdin)",bmd,hmac_key,non_fips_allow);
 		}
 	else
 		{
 		name=OBJ_nid2sn(md->type);
 		for (i=0; i<argc; i++)
 			{
 			char *tmp,*tofree=NULL;
 			int r;
 			if (BIO_read_filename(in,argv[i]) <= 0)
 				{
 				perror(argv[i]);
 				err++;
 				continue;
 				}
 			if(!out_bin)
 				{
 				size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
 				tmp=tofree=OPENSSL_malloc(len);
 				BIO_snprintf(tmp,len,"%s%s(%s)= ",
 							 hmac_key ? "HMAC-" : "",name,argv[i]);
 				}
 			else
 				tmp="";
 			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
 				siglen,tmp,argv[i],bmd,hmac_key,non_fips_allow);
 			if(r)
 			    err=r;
 			if(tofree)
 				OPENSSL_free(tofree);
 			(void)BIO_reset(bmd);
 			}
 		}
 end:
 	if (buf != NULL)
 		{
 		OPENSSL_cleanse(buf,BUFSIZE);
 		OPENSSL_free(buf);
 		}
 	if (in != NULL) BIO_free(in);
 	if (passin)
 		OPENSSL_free(passin);
 	BIO_free_all(out);
 	EVP_PKEY_free(sigkey);
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
 	apps_shutdown();
 	OPENSSL_EXIT(err);
 	}
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-          EVP_PKEY *key, unsigned char *sigin, int siglen,
+	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-          const char *sig_name, const char *md_name,
+	  const char *file,BIO *bmd,const char *hmac_key,int non_fips_allow)
-          const char *file, BIO *bmd)
+	{
-{
+	unsigned int len;
-    size_t len;
+	int i;
-    int i;
+	EVP_MD_CTX *md_ctx;
 	HMAC_CTX hmac_ctx;
-    for (;;) {
+	if (hmac_key)
-        i = BIO_read(bp, (char *)buf, BUFSIZE);
+		{
-        if (i < 0) {
+		EVP_MD *md;
-            BIO_printf(bio_err, "Read Error in %s\n", file);
+
-            ERR_print_errors(bio_err);
+		BIO_get_md(bmd,&md);
-            return 1;
+		HMAC_CTX_init(&hmac_ctx);
-        }
+		HMAC_Init_ex(&hmac_ctx,hmac_key,strlen(hmac_key),md, NULL);
-        if (i == 0)
+		BIO_get_md_ctx(bmd,&md_ctx);
-            break;
+		BIO_set_md_ctx(bmd,&hmac_ctx.md_ctx);
-    }
+		}
-    if (sigin) {
+	for (;;)
-        EVP_MD_CTX *ctx;
+		{
-        BIO_get_md_ctx(bp, &ctx);
+		i=BIO_read(bp,(char *)buf,BUFSIZE);
-        i = EVP_DigestVerifyFinal(ctx, sigin, (unsigned int)siglen);
+		if(i < 0)
-        if (i > 0)
+			{
-            BIO_printf(out, "Verified OK\n");
+			BIO_printf(bio_err, "Read Error in %s\n",file);
-        else if (i == 0) {
+			ERR_print_errors(bio_err);
-            BIO_printf(out, "Verification Failure\n");
+			return 1;
-            return 1;
+			}
-        } else {
+		if (i == 0) break;
-            BIO_printf(bio_err, "Error Verifying Data\n");
+		}
-            ERR_print_errors(bio_err);
+	if(sigin)
-            return 1;
+		{
-        }
+		EVP_MD_CTX *ctx;
-        return 0;
+		BIO_get_md_ctx(bp, &ctx);
-    }
+		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
-    if (key) {
+		if(i > 0)
-        EVP_MD_CTX *ctx;
+			BIO_printf(out, "Verified OK\n");
-        BIO_get_md_ctx(bp, &ctx);
+		else if(i == 0)
-        len = BUFSIZE;
+			{
-        if (!EVP_DigestSignFinal(ctx, buf, &len)) {
+			BIO_printf(out, "Verification Failure\n");
-            BIO_printf(bio_err, "Error Signing Data\n");
+			return 1;
-            ERR_print_errors(bio_err);
+			}
-            return 1;
+		else
-        }
+			{
-    } else {
+			BIO_printf(bio_err, "Error Verifying Data\n");
-        len = BIO_gets(bp, (char *)buf, BUFSIZE);
+			ERR_print_errors(bio_err);
-        if ((int)len < 0) {
+			return 1;
-            ERR_print_errors(bio_err);
+			}
-            return 1;
+		return 0;
-        }
+		}
-    }
+	if(key)
 		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
 		if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) 
 			{
 			BIO_printf(bio_err, "Error Signing Data\n");
 			ERR_print_errors(bio_err);
 			return 1;
 			}
 		}
 	else if(hmac_key)
 		{
 		HMAC_Final(&hmac_ctx,buf,&len);
 		HMAC_CTX_cleanup(&hmac_ctx);
 		}
 	else
 		len=BIO_gets(bp,(char *)buf,BUFSIZE);
 	if(binout) BIO_write(out, buf, len);
 	else 
 		{
 		BIO_write(out,title,strlen(title));
 		for (i=0; i<(int)len; i++)
 			{
 			if (sep && (i != 0))
 				BIO_printf(out, ":");
 			BIO_printf(out, "%02x",buf[i]);
 			}
 		BIO_printf(out, "\n");
 		}
 	if (hmac_key)
 		{
 		BIO_set_md_ctx(bmd,md_ctx);
 		}
 	return 0;
 	}
    if (binout)
        BIO_write(out, buf, len);
    else if (sep == 2) {
        for (i = 0; i < (int)len; i++)
            BIO_printf(out, "%02x", buf[i]);
        BIO_printf(out, " *%s\n", file);
    } else {
        if (sig_name) {
            BIO_puts(out, sig_name);
            if (md_name)
                BIO_printf(out, "-%s", md_name);
            BIO_printf(out, "(%s)= ", file);
        } else if (md_name)
            BIO_printf(out, "%s(%s)= ", md_name, file);
        else
            BIO_printf(out, "(%s)= ", file);
        for (i = 0; i < (int)len; i++) {
            if (sep && (i != 0))
                BIO_printf(out, ":");
            BIO_printf(out, "%02x", buf[i]);
        }
        BIO_printf(out, "\n");
    }
    return 0;
 }
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -0,0 +1,352 @@
 /* apps/dh.c */
 /* obsoleted by dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the 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 acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR 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.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <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/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #undef PROG
 #define PROG	dh_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
 * -check	- check the parameters are ok
 * -noout
 * -text
 * -C
 */
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	DH *dh=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,check=0,noout=0,C=0,ret=1;
 	char *infile,*outfile,*prog;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine;
 #endif
 	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;
 #ifndef OPENSSL_NO_ENGINE
 	engine=NULL;
 #endif
 	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);
 			}
 #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)
 			text=1;
 		else if (strcmp(*argv,"-C") == 0)
 			C=1;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		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 - one of DER PEM\n");
 		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file\n");
 		BIO_printf(bio_err," -check        check the DH parameters\n");
 		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -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);
 #endif
 	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;
 			}
 		}
 	if	(informat == FORMAT_ASN1)
 		dh=d2i_DHparams_bio(in,NULL);
 	else if (informat == FORMAT_PEM)
 		dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
 	else
 		{
 		BIO_printf(bio_err,"bad input format specified\n");
 		goto end;
 		}
 	if (dh == NULL)
 		{
 		BIO_printf(bio_err,"unable to load DH parameters\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if (text)
 		{
 		DHparams_print(out,dh);
 #ifdef undef
 		printf("p=");
 		BN_print(stdout,dh->p);
 		printf("\ng=");
 		BN_print(stdout,dh->g);
 		printf("\n");
 		if (dh->length != 0)
 			printf("recommended private length=%ld\n",dh->length);
 #endif
 		}
 	if (check)
 		{
 		if (!DH_check(dh,&i))
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		if (i & DH_CHECK_P_NOT_PRIME)
 			printf("p value is not prime\n");
 		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
 			printf("p value is not a safe prime\n");
 		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
 			printf("unable to check the generator value\n");
 		if (i & DH_NOT_SUITABLE_GENERATOR)
 			printf("the g value is not a generator\n");
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
 	if (C)
 		{
 		unsigned char *data;
 		int len,l,bits;
 		len=BN_num_bytes(dh->p);
 		bits=BN_num_bits(dh->p);
 		data=(unsigned char *)OPENSSL_malloc(len);
 		if (data == NULL)
 			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
 		l=BN_bn2bin(dh->p,data);
 		printf("static unsigned char dh%d_p[]={",bits);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 		l=BN_bn2bin(dh->g,data);
 		printf("static unsigned char dh%d_g[]={",bits);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
 		printf("DH *get_dh%d()\n\t{\n",bits);
 		printf("\tDH *dh;\n\n");
 		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
 		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
 			bits,bits);
 		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
 			bits,bits);
 		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 		printf("\t\treturn(NULL);\n");
 		printf("\treturn(dh);\n\t}\n");
 		OPENSSL_free(data);
 		}
 	if (!noout)
 		{
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
 			i=PEM_write_bio_DHparams(out,dh);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		if (!i)
 			{
 			BIO_printf(bio_err,"unable to write DH parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 	ret=0;
 end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #endif
--- a/apps/dh512.pem
+++ b/apps/dh512.pem
@@ -0,0 +1,9 @@
 -----BEGIN DH PARAMETERS-----
 MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak
 XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC
 -----END DH PARAMETERS-----
 These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols"
 (http://www.skip-vpn.org/spec/numbers.html).
 See there for how they were generated.
 Note that g is not a generator, but this is not a problem since p is a safe prime.
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -1,3 +1,4 @@
 /* apps/dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -108,346 +109,449 @@
 *
 */
-#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
+#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DH */
 #ifndef OPENSSL_NO_DH
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <time.h>
+#include <time.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dh.h>
+#include <openssl/dh.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
-#  include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# endif
+#endif
-# define DEFBITS 2048
+#undef PROG
 #define PROG	dhparam_main
-static int dh_cb(int p, int n, BN_GENCB *cb);
+#define DEFBITS	512
-typedef enum OPTION_choice {
+/* -inform arg	- input format - default PEM (DER or PEM)
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+ * -outform arg - output format - default PEM
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
+ * -in arg	- input file - default stdin
-    OPT_ENGINE, OPT_CHECK, OPT_TEXT, OPT_NOOUT,
+ * -out arg	- output file - default stdout
-    OPT_RAND, OPT_DSAPARAM, OPT_C, OPT_2, OPT_5
+ * -dsaparam  - read or generate DSA parameters, convert to DH
-} OPTION_CHOICE;
+ * -check	- check the parameters are ok
 * -noout
 * -text
 * -C
 */
-OPTIONS dhparam_options[] = {
+static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
    {OPT_HELP_STR, 1, '-', "Usage: %s [flags] [numbits]\n"},
    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
    {"help", OPT_HELP, '-', "Display this summary"},
    {"in", OPT_IN, '<', "Input file"},
    {"inform", OPT_INFORM, 'F', "Input format, DER or PEM"},
    {"outform", OPT_OUTFORM, 'F', "Output format, DER or PEM"},
    {"out", OPT_OUT, '>', "Output file"},
    {"check", OPT_CHECK, '-', "Check the DH parameters"},
    {"text", OPT_TEXT, '-', "Print a text form of the DH parameters"},
    {"noout", OPT_NOOUT, '-'},
    {"rand", OPT_RAND, 's',
     "Load the file(s) into the random number generator"},
    {"C", OPT_C, '-', "Print C code"},
    {"2", OPT_2, '-', "Generate parameters using 2 as the generator value"},
    {"5", OPT_5, '-', "Generate parameters using 5 as the generator value"},
 # ifndef OPENSSL_NO_DSA
    {"dsaparam", OPT_DSAPARAM, '-',
     "Read or generate DSA parameters, convert to DH"},
 # endif
 # ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
 # endif
    {NULL}
 };
-int dhparam_main(int argc, char **argv)
+int MAIN(int, char **);
 {
    BIO *in = NULL, *out = NULL;
    DH *dh = NULL;
    char *infile = NULL, *outfile = NULL, *prog, *inrand = NULL;
    int dsaparam = 0, i, text = 0, C = 0, ret = 1, num = 0, g = 0;
    int informat = FORMAT_PEM, outformat = FORMAT_PEM, check = 0, noout = 0;
    OPTION_CHOICE o;
-    prog = opt_init(argc, argv, dhparam_options);
+int MAIN(int argc, char **argv)
-    while ((o = opt_next()) != OPT_EOF) {
+	{
-        switch (o) {
+#ifndef OPENSSL_NO_ENGINE
-        case OPT_EOF:
+	ENGINE *e = NULL;
-        case OPT_ERR:
+#endif
- opthelp:
+	DH *dh=NULL;
-            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+	int i,badops=0,text=0;
-            goto end;
+#ifndef OPENSSL_NO_DSA
-        case OPT_HELP:
+	int dsaparam=0;
-            opt_help(dhparam_options);
+#endif
-            ret = 0;
+	BIO *in=NULL,*out=NULL;
-            goto end;
+	int informat,outformat,check=0,noout=0,C=0,ret=1;
-        case OPT_INFORM:
+	char *infile,*outfile,*prog;
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
+	char *inrand=NULL;
-                goto opthelp;
+#ifndef OPENSSL_NO_ENGINE
-            break;
+	char *engine=NULL;
-        case OPT_OUTFORM:
+#endif
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
+	int num = 0, g = 0;
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_ENGINE:
            (void)setup_engine(opt_arg(), 0);
            break;
        case OPT_CHECK:
            check = 1;
            break;
        case OPT_TEXT:
            text = 1;
            break;
        case OPT_DSAPARAM:
            dsaparam = 1;
            break;
        case OPT_C:
            C = 1;
            break;
        case OPT_2:
            g = 2;
            break;
        case OPT_5:
            g = 5;
            break;
        case OPT_NOOUT:
            noout = 1;
            break;
        case OPT_RAND:
            inrand = opt_arg();
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
-    if (argv[0] && (!opt_int(argv[0], &num) || num <= 0))
+	apps_startup();
        goto end;
-    if (g && !num)
+	if (bio_err == NULL)
-        num = DEFBITS;
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-# ifndef OPENSSL_NO_DSA
+	if (!load_config(bio_err, NULL))
-    if (dsaparam && g) {
+		goto end;
        BIO_printf(bio_err,
                   "generator may not be chosen for DSA parameters\n");
        goto end;
    }
 # endif
    /* DH parameters */
    if (num && !g)
        g = 2;
-    if (num) {
+	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
 	outformat=FORMAT_PEM;
-        BN_GENCB *cb;
+	prog=argv[0];
-        cb = BN_GENCB_new();
+	argc--;
-        if (cb == NULL) {
+	argv++;
-            ERR_print_errors(bio_err);
+	while (argc >= 1)
-            goto end;
+		{
-        }
+		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);
 			}
 #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)
 			text=1;
 #ifndef OPENSSL_NO_DSA
 		else if (strcmp(*argv,"-dsaparam") == 0)
 			dsaparam=1;
 #endif
 		else if (strcmp(*argv,"-C") == 0)
 			C=1;
 		else if (strcmp(*argv,"-noout") == 0)
 			noout=1;
 		else if (strcmp(*argv,"-2") == 0)
 			g=2;
 		else if (strcmp(*argv,"-5") == 0)
 			g=5;
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			}
 		else if (((sscanf(*argv,"%d",&num) == 0) || (num <= 0)))
 			goto bad;
 		argv++;
 		argc--;
 		}
-        BN_GENCB_set(cb, dh_cb, bio_err);
+	if (badops)
-        if (!app_RAND_load_file(NULL, 1) && inrand == NULL) {
+		{
-            BIO_printf(bio_err,
+bad:
-                       "warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"%s [options] [numbits]\n",prog);
-        }
+		BIO_printf(bio_err,"where options are\n");
-        if (inrand != NULL)
+		BIO_printf(bio_err," -inform arg   input format - one of DER PEM\n");
-            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
-                       app_RAND_load_files(inrand));
+		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file\n");
 #ifndef OPENSSL_NO_DSA
 		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
 #endif
 		BIO_printf(bio_err," -check        check the DH parameters\n");
 		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -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 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");
 		BIO_printf(bio_err," -noout        no output\n");
 		goto end;
 		}
-# ifndef OPENSSL_NO_DSA
+	ERR_load_crypto_strings();
        if (dsaparam) {
            DSA *dsa = DSA_new();
-            BIO_printf(bio_err,
+#ifndef OPENSSL_NO_ENGINE
-                       "Generating DSA parameters, %d bit long prime\n", num);
+        e = setup_engine(bio_err, engine, 0);
-            if (dsa == NULL
+#endif
                || !DSA_generate_parameters_ex(dsa, num, NULL, 0, NULL, NULL,
                                               cb)) {
                DSA_free(dsa);
                BN_GENCB_free(cb);
                ERR_print_errors(bio_err);
                goto end;
            }
-            dh = DSA_dup_DH(dsa);
+	if (g && !num)
-            DSA_free(dsa);
+		num = DEFBITS;
            if (dh == NULL) {
                BN_GENCB_free(cb);
                ERR_print_errors(bio_err);
                goto end;
            }
        } else
 # endif
        {
            dh = DH_new();
            BIO_printf(bio_err,
                       "Generating DH parameters, %d bit long safe prime, generator %d\n",
                       num, g);
            BIO_printf(bio_err, "This is going to take a long time\n");
            if (dh == NULL || !DH_generate_parameters_ex(dh, num, g, cb)) {
                BN_GENCB_free(cb);
                ERR_print_errors(bio_err);
                goto end;
            }
        }
-        BN_GENCB_free(cb);
+#ifndef OPENSSL_NO_DSA
-        app_RAND_write_file(NULL);
+	if (dsaparam)
-    } else {
+		{
 		if (g)
 			{
 			BIO_printf(bio_err, "generator may not be chosen for DSA parameters\n");
 			goto end;
 			}
 		}
 	else
 #endif
 		{
 		/* DH parameters */
 		if (num && !g)
 			g = 2;
 		}
-        in = bio_open_default(infile, 'r', informat);
+	if(num) {
        if (in == NULL)
            goto end;
-# ifndef OPENSSL_NO_DSA
+		BN_GENCB cb;
-        if (dsaparam) {
+		BN_GENCB_set(&cb, dh_cb, bio_err);
-            DSA *dsa;
+		if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 			{
 			BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 			}
 		if (inrand != NULL)
 			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
-            if (informat == FORMAT_ASN1)
+#ifndef OPENSSL_NO_DSA
-                dsa = d2i_DSAparams_bio(in, NULL);
+		if (dsaparam)
-            else                /* informat == FORMAT_PEM */
+			{
-                dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
+			DSA *dsa = DSA_new();
-            if (dsa == NULL) {
+			BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
-                BIO_printf(bio_err, "unable to load DSA parameters\n");
+			if(!dsa || !DSA_generate_parameters_ex(dsa, num,
-                ERR_print_errors(bio_err);
+						NULL, 0, NULL, NULL, &cb))
-                goto end;
+				{
-            }
+				if(dsa) DSA_free(dsa);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
-            dh = DSA_dup_DH(dsa);
+			dh = DSA_dup_DH(dsa);
-            DSA_free(dsa);
+			DSA_free(dsa);
-            if (dh == NULL) {
+			if (dh == NULL)
-                ERR_print_errors(bio_err);
+				{
-                goto end;
+				ERR_print_errors(bio_err);
-            }
+				goto end;
-        } else
+				}
-# endif
+			}
-        {
+		else
-            if (informat == FORMAT_ASN1)
+#endif
-                dh = d2i_DHparams_bio(in, NULL);
+			{
-            else                /* informat == FORMAT_PEM */
+			dh = DH_new();
-                dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
+			BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
 			BIO_printf(bio_err,"This is going to take a long time\n");
 			if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
 				{
 				if(dh) DH_free(dh);
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			}
-            if (dh == NULL) {
+		app_RAND_write_file(NULL, bio_err);
-                BIO_printf(bio_err, "unable to load DH parameters\n");
+	} else {
                ERR_print_errors(bio_err);
                goto end;
            }
        }
-        /* dh != 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;
 				}
 			}
-    out = bio_open_default(outfile, 'w', outformat);
+		if	(informat != FORMAT_ASN1 && informat != FORMAT_PEM)
-    if (out == NULL)
+			{
-        goto end;
+			BIO_printf(bio_err,"bad input format specified\n");
 			goto end;
 			}
-    if (text) {
+#ifndef OPENSSL_NO_DSA
-        DHparams_print(out, dh);
+		if (dsaparam)
-    }
+			{
 			DSA *dsa;
-    if (check) {
+			if (informat == FORMAT_ASN1)
-        if (!DH_check(dh, &i)) {
+				dsa=d2i_DSAparams_bio(in,NULL);
-            ERR_print_errors(bio_err);
+			else /* informat == FORMAT_PEM */
-            goto end;
+				dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
        }
        if (i & DH_CHECK_P_NOT_PRIME)
            printf("p value is not prime\n");
        if (i & DH_CHECK_P_NOT_SAFE_PRIME)
            printf("p value is not a safe prime\n");
        if (i & DH_UNABLE_TO_CHECK_GENERATOR)
            printf("unable to check the generator value\n");
        if (i & DH_NOT_SUITABLE_GENERATOR)
            printf("the g value is not a generator\n");
        if (i == 0)
            printf("DH parameters appear to be ok.\n");
    }
    if (C) {
        unsigned char *data;
        int len, bits;
-        len = BN_num_bytes(dh->p);
+			if (dsa == NULL)
-        bits = BN_num_bits(dh->p);
+				{
-        data = app_malloc(len, "print a BN");
+				BIO_printf(bio_err,"unable to load DSA parameters\n");
-        BIO_printf(out, "#ifndef HEADER_DH_H\n"
+				ERR_print_errors(bio_err);
-                        "# include <openssl/dh.h>\n"
+				goto end;
-                        "#endif\n"
+				}
                        "\n");
        BIO_printf(out, "DH *get_dh%d()\n{\n", bits);
        print_bignum_var(out, dh->p, "dhp", bits, data);
        print_bignum_var(out, dh->g, "dhg", bits, data);
        BIO_printf(out, "    DH *dh = DN_new();\n"
                        "\n"
                        "    if (dh == NULL)\n"
                        "        return NULL;\n");
        BIO_printf(out, "    dh->p = BN_bin2bn(dhp_%d, sizeof (dhp_%d), NULL);\n",
               bits, bits);
        BIO_printf(out, "    dh->g = BN_bin2bn(dhg_%d, sizeof (dhg_%d), NULL);\n",
               bits, bits);
        BIO_printf(out, "    if (!dh->p || !dh->g) {\n"
                        "        DH_free(dh);\n"
                        "        return NULL;\n"
                        "    }\n");
        if (dh->length)
            BIO_printf(out,
                        "    dh->length = %ld;\n", dh->length);
        BIO_printf(out, "    return dh;\n}\n");
        OPENSSL_free(data);
    }
-    if (!noout) {
+			dh = DSA_dup_DH(dsa);
-        if (outformat == FORMAT_ASN1)
+			DSA_free(dsa);
-            i = i2d_DHparams_bio(out, dh);
+			if (dh == NULL)
-        else if (dh->q)
+				{
-            i = PEM_write_bio_DHxparams(out, dh);
+				ERR_print_errors(bio_err);
-        else
+				goto end;
-            i = PEM_write_bio_DHparams(out, dh);
+				}
-        if (!i) {
+			}
-            BIO_printf(bio_err, "unable to write DH parameters\n");
+		else
-            ERR_print_errors(bio_err);
+#endif
-            goto end;
+			{
-        }
+			if (informat == FORMAT_ASN1)
-    }
+				dh=d2i_DHparams_bio(in,NULL);
-    ret = 0;
+			else /* informat == FORMAT_PEM */
- end:
+				dh=PEM_read_bio_DHparams(in,NULL,NULL,NULL);
    BIO_free(in);
    BIO_free_all(out);
    DH_free(dh);
    return (ret);
 }
-static int dh_cb(int p, int n, BN_GENCB *cb)
+			if (dh == NULL)
-{
+				{
-    char c = '*';
+				BIO_printf(bio_err,"unable to load DH parameters\n");
 				ERR_print_errors(bio_err);
 				goto end;
 				}
 			}
-    if (p == 0)
+		/* dh != NULL */
-        c = '.';
+	}
    if (p == 1)
        c = '+';
    if (p == 2)
        c = '*';
    if (p == 3)
        c = '\n';
    BIO_write(BN_GENCB_get_arg(cb), &c, 1);
    (void)BIO_flush(BN_GENCB_get_arg(cb));
    return 1;
 }
-#else                           /* !OPENSSL_NO_DH */
+	out=BIO_new(BIO_s_file());
 	if (out == NULL)
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
 		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
-# if PEDANTIC
+
-static void *dummy = &dummy;
+	if (text)
-# endif
+		{
 		DHparams_print(out,dh);
 		}
 	if (check)
 		{
 		if (!DH_check(dh,&i))
 			{
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		if (i & DH_CHECK_P_NOT_PRIME)
 			printf("p value is not prime\n");
 		if (i & DH_CHECK_P_NOT_SAFE_PRIME)
 			printf("p value is not a safe prime\n");
 		if (i & DH_UNABLE_TO_CHECK_GENERATOR)
 			printf("unable to check the generator value\n");
 		if (i & DH_NOT_SUITABLE_GENERATOR)
 			printf("the g value is not a generator\n");
 		if (i == 0)
 			printf("DH parameters appear to be ok.\n");
 		}
 	if (C)
 		{
 		unsigned char *data;
 		int len,l,bits;
 		len=BN_num_bytes(dh->p);
 		bits=BN_num_bits(dh->p);
 		data=(unsigned char *)OPENSSL_malloc(len);
 		if (data == NULL)
 			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
 		printf("#ifndef HEADER_DH_H\n"
 		       "#include <openssl/dh.h>\n"
 		       "#endif\n");
 		printf("DH *get_dh%d()\n\t{\n",bits);
 		l=BN_bn2bin(dh->p,data);
 		printf("\tstatic unsigned char dh%d_p[]={",bits);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t\t};\n");
 		l=BN_bn2bin(dh->g,data);
 		printf("\tstatic unsigned char dh%d_g[]={",bits);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t\t};\n");
 		printf("\tDH *dh;\n\n");
 		printf("\tif ((dh=DH_new()) == NULL) return(NULL);\n");
 		printf("\tdh->p=BN_bin2bn(dh%d_p,sizeof(dh%d_p),NULL);\n",
 			bits,bits);
 		printf("\tdh->g=BN_bin2bn(dh%d_g,sizeof(dh%d_g),NULL);\n",
 			bits,bits);
 		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 		printf("\t\t{ DH_free(dh); return(NULL); }\n");
 		if (dh->length)
 			printf("\tdh->length = %ld;\n", dh->length);
 		printf("\treturn(dh);\n\t}\n");
 		OPENSSL_free(data);
 		}
 	if (!noout)
 		{
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DHparams_bio(out,dh);
 		else if (outformat == FORMAT_PEM)
 			i=PEM_write_bio_DHparams(out,dh);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		if (!i)
 			{
 			BIO_printf(bio_err,"unable to write DH parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 	ret=0;
 end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 	{
 	char c='*';
 	if (p == 0) c='.';
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
 	BIO_write(cb->arg,&c,1);
 	(void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
 	return 1;
 	}
 #endif
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -1,3 +1,4 @@
 /* apps/dsa.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,250 +56,290 @@
 * [including the GNU Public Licence.]
 */
-#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <string.h>
+#include <string.h>
-# include <time.h>
+#include <time.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-typedef enum OPTION_choice {
+#undef PROG
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#define PROG	dsa_main
    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
    OPT_ENGINE, OPT_PVK_STRONG, OPT_PVK_WEAK,
    OPT_PVK_NONE, OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_PUBIN,
    OPT_PUBOUT, OPT_CIPHER, OPT_PASSIN, OPT_PASSOUT
 } OPTION_CHOICE;
-OPTIONS dsa_options[] = {
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
-    {"help", OPT_HELP, '-', "Display this summary"},
+ * -outform arg - output format - default PEM
-    {"inform", OPT_INFORM, 'F', "Input format, DER PEM PVK"},
+ * -in arg	- input file - default stdin
-    {"outform", OPT_OUTFORM, 'F', "Output format, DER PEM PVK"},
+ * -out arg	- output file - default stdout
-    {"in", OPT_IN, '<', "Input file"},
+ * -des		- encrypt output if PEM format with DES in cbc mode
-    {"out", OPT_OUT, '>', "Output file"},
+ * -des3	- encrypt output if PEM format
-    {"noout", OPT_NOOUT, '-', "Don't print key out"},
+ * -idea	- encrypt output if PEM format
-    {"text", OPT_TEXT, '-', "Print the key in text"},
+ * -aes128	- encrypt output if PEM format
-    {"modulus", OPT_MODULUS, '-', "Print the DSA public value"},
+ * -aes192	- encrypt output if PEM format
-    {"pubin", OPT_PUBIN, '-'},
+ * -aes256	- encrypt output if PEM format
-    {"pubout", OPT_PUBOUT, '-'},
+ * -camellia128 - encrypt output if PEM format
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+ * -camellia192 - encrypt output if PEM format
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+ * -camellia256 - encrypt output if PEM format
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
+ * -seed        - encrypt output if PEM format
-# ifndef OPENSSL_NO_RC4
+ * -text	- print a text version
-    {"pvk-strong", OPT_PVK_STRONG, '-'},
+ * -modulus	- print the DSA public key
-    {"pvk-weak", OPT_PVK_WEAK, '-'},
+ */
    {"pvk-none", OPT_PVK_NONE, '-'},
 # endif
 # ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
 # endif
    {NULL}
 };
-int dsa_main(int argc, char **argv)
+int MAIN(int, char **);
 {
    BIO *out = NULL;
    DSA *dsa = NULL;
    ENGINE *e = NULL;
    const EVP_CIPHER *enc = NULL;
    char *infile = NULL, *outfile = NULL, *prog;
    char *passin = NULL, *passout = NULL, *passinarg = NULL, *passoutarg = NULL;
    OPTION_CHOICE o;
    int informat = FORMAT_PEM, outformat = FORMAT_PEM, text = 0, noout = 0;
    int i, modulus = 0, pubin = 0, pubout = 0, pvk_encr = 2, ret = 1;
    int private = 0;
-    prog = opt_init(argc, argv, dsa_options);
+int MAIN(int argc, char **argv)
-    while ((o = opt_next()) != OPT_EOF) {
+	{
-        switch (o) {
+#ifndef OPENSSL_NO_ENGINE
-        case OPT_EOF:
+	ENGINE *e = NULL;
        case OPT_ERR:
 opthelp:
            ret = 0;
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(dsa_options);
            ret = 0;
            goto end;
        case OPT_INFORM:
            if (!opt_format
                (opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &informat))
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUTFORM:
            if (!opt_format
                (opt_arg(), OPT_FMT_PEMDER | OPT_FMT_PVK, &outformat))
                goto opthelp;
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_ENGINE:
            e = setup_engine(opt_arg(), 0);
            break;
        case OPT_PASSIN:
            passinarg = opt_arg();
            break;
        case OPT_PASSOUT:
            passoutarg = opt_arg();
            break;
 #ifndef OPENSSL_NO_RC4
        case OPT_PVK_STRONG:
            pvk_encr = 2;
            break;
        case OPT_PVK_WEAK:
            pvk_encr = 1;
            break;
        case OPT_PVK_NONE:
            pvk_encr = 0;
            break;
 #else
        case OPT_PVK_STRONG:
        case OPT_PVK_WEAK:
        case OPT_PVK_NONE:
            break;
 #endif
-        case OPT_NOOUT:
+	int ret=1;
-            noout = 1;
+	DSA *dsa=NULL;
-            break;
+	int i,badops=0;
-        case OPT_TEXT:
+	const EVP_CIPHER *enc=NULL;
-            text = 1;
+	BIO *in=NULL,*out=NULL;
-            break;
+	int informat,outformat,text=0,noout=0;
-        case OPT_MODULUS:
+	int pubin = 0, pubout = 0;
-            modulus = 1;
+	char *infile,*outfile,*prog;
-            break;
+#ifndef OPENSSL_NO_ENGINE
-        case OPT_PUBIN:
+	char *engine;
-            pubin = 1;
+#endif
-            break;
+	char *passargin = NULL, *passargout = NULL;
-        case OPT_PUBOUT:
+	char *passin = NULL, *passout = NULL;
-            pubout = 1;
+	int modulus=0;
-            break;
+
-        case OPT_CIPHER:
+	apps_startup();
-            if (!opt_cipher(opt_unknown(), &enc))
+
-                goto end;
+	if (bio_err == NULL)
-            break;
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-        }
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-    }
+
-    argc = opt_num_rest();
+	if (!load_config(bio_err, NULL))
-    argv = opt_rest();
+		goto end;
-    private = pubin || pubout ? 0 : 1;
+
-    if (text)
+#ifndef OPENSSL_NO_ENGINE
-        private = 1;
+	engine=NULL;
-
+#endif
-    if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
+	infile=NULL;
-        BIO_printf(bio_err, "Error getting passwords\n");
+	outfile=NULL;
-        goto end;
+	informat=FORMAT_PEM;
-    }
+	outformat=FORMAT_PEM;
-
+
-    BIO_printf(bio_err, "read DSA key\n");
+	prog=argv[0];
-    {
+	argc--;
-        EVP_PKEY *pkey;
+	argv++;
-
+	while (argc >= 1)
-        if (pubin)
+		{
-            pkey = load_pubkey(infile, informat, 1, passin, e, "Public Key");
+		if 	(strcmp(*argv,"-inform") == 0)
-        else
+			{
-            pkey = load_key(infile, informat, 1, passin, e, "Private Key");
+			if (--argc < 1) goto bad;
-
+			informat=str2fmt(*(++argv));
-        if (pkey) {
+			}
-            dsa = EVP_PKEY_get1_DSA(pkey);
+		else if (strcmp(*argv,"-outform") == 0)
-            EVP_PKEY_free(pkey);
+			{
-        }
+			if (--argc < 1) goto bad;
-    }
+			outformat=str2fmt(*(++argv));
-    if (dsa == NULL) {
+			}
-        BIO_printf(bio_err, "unable to load Key\n");
+		else if (strcmp(*argv,"-in") == 0)
-        ERR_print_errors(bio_err);
+			{
-        goto end;
+			if (--argc < 1) goto bad;
-    }
+			infile= *(++argv);
-
+			}
-    out = bio_open_owner(outfile, outformat, private);
+		else if (strcmp(*argv,"-out") == 0)
-    if (out == NULL)
+			{
-        goto end;
+			if (--argc < 1) goto bad;
-
+			outfile= *(++argv);
-    if (text) {
+			}
-        assert(private);
+		else if (strcmp(*argv,"-passin") == 0)
-        if (!DSA_print(out, dsa, 0)) {
+			{
-            perror(outfile);
+			if (--argc < 1) goto bad;
-            ERR_print_errors(bio_err);
+			passargin= *(++argv);
-            goto end;
+			}
-        }
+		else if (strcmp(*argv,"-passout") == 0)
-    }
+			{
-
+			if (--argc < 1) goto bad;
-    if (modulus) {
+			passargout= *(++argv);
-        BIO_printf(out, "Public Key=");
+			}
-        BN_print(out, dsa->pub_key);
+#ifndef OPENSSL_NO_ENGINE
-        BIO_printf(out, "\n");
+		else if (strcmp(*argv,"-engine") == 0)
-    }
+			{
-
+			if (--argc < 1) goto bad;
-    if (noout) {
+			engine= *(++argv);
-        ret = 0;
+			}
-        goto end;
+#endif
-    }
+		else if (strcmp(*argv,"-noout") == 0)
-    BIO_printf(bio_err, "writing DSA key\n");
+			noout=1;
-    if (outformat == FORMAT_ASN1) {
+		else if (strcmp(*argv,"-text") == 0)
-        if (pubin || pubout)
+			text=1;
-            i = i2d_DSA_PUBKEY_bio(out, dsa);
+		else if (strcmp(*argv,"-modulus") == 0)
-        else {
+			modulus=1;
-            assert(private);
+		else if (strcmp(*argv,"-pubin") == 0)
-            i = i2d_DSAPrivateKey_bio(out, dsa);
+			pubin=1;
-        }
+		else if (strcmp(*argv,"-pubout") == 0)
-    } else if (outformat == FORMAT_PEM) {
+			pubout=1;
-        if (pubin || pubout)
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
-            i = PEM_write_bio_DSA_PUBKEY(out, dsa);
+			{
-        else {
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
-            assert(private);
+			badops=1;
-            i = PEM_write_bio_DSAPrivateKey(out, dsa, enc,
+			break;
-                                            NULL, 0, NULL, passout);
+			}
-        }
+		argc--;
-# if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
+		argv++;
-    } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
+		}
-        EVP_PKEY *pk;
+
-        pk = EVP_PKEY_new();
+	if (badops)
-        EVP_PKEY_set1_DSA(pk, dsa);
+		{
-        if (outformat == FORMAT_PVK) {
+bad:
-            assert(private);
+		BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
-            i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+		BIO_printf(bio_err,"where options are\n");
-        }
+		BIO_printf(bio_err," -inform arg     input format - DER or PEM\n");
-        else if (pubin || pubout)
+		BIO_printf(bio_err," -outform arg    output format - DER or PEM\n");
-            i = i2b_PublicKey_bio(out, pk);
+		BIO_printf(bio_err," -in arg         input file\n");
-        else {
+		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
-            assert(private);
+		BIO_printf(bio_err," -out arg        output file\n");
-            i = i2b_PrivateKey_bio(out, pk);
+		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-        }
+#ifndef OPENSSL_NO_ENGINE
-        EVP_PKEY_free(pk);
+		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
-# endif
+#endif
-    } else {
+		BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
-        BIO_printf(bio_err, "bad output format specified for outfile\n");
+		BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-        goto end;
+#ifndef OPENSSL_NO_IDEA
-    }
+		BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
-    if (i <= 0) {
+#endif
-        BIO_printf(bio_err, "unable to write private key\n");
+#ifndef OPENSSL_NO_AES
-        ERR_print_errors(bio_err);
+		BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
-        goto end;
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
-    }
+#endif
-    ret = 0;
+#ifndef OPENSSL_NO_CAMELLIA
- end:
+		BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
-    BIO_free_all(out);
+		BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
-    DSA_free(dsa);
+#endif
-    OPENSSL_free(passin);
+#ifndef OPENSSL_NO_SEED
-    OPENSSL_free(passout);
+		BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");
-    return (ret);
+#endif
-}
+		BIO_printf(bio_err," -text           print the key in text\n");
-#else                           /* !OPENSSL_NO_DSA */
+		BIO_printf(bio_err," -noout          don't print key out\n");
-
+		BIO_printf(bio_err," -modulus        print the DSA public value\n");
-# if PEDANTIC
+		goto end;
-static void *dummy = &dummy;
+		}
-# endif
+
-
+	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");
 		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 DSA key\n");
 	if	(informat == FORMAT_ASN1) {
 		if(pubin) dsa=d2i_DSA_PUBKEY_bio(in,NULL);
 		else dsa=d2i_DSAPrivateKey_bio(in,NULL);
 	} else if (informat == FORMAT_PEM) {
 		if(pubin) dsa=PEM_read_bio_DSA_PUBKEY(in,NULL, NULL, NULL);
 		else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,passin);
 	} else
 		{
 		BIO_printf(bio_err,"bad input format specified for key\n");
 		goto end;
 		}
 	if (dsa == 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;
 			}
 		}
 	if (text) 
 		if (!DSA_print(out,dsa,0))
 			{
 			perror(outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 	if (modulus)
 		{
 		fprintf(stdout,"Public Key=");
 		BN_print(out,dsa->pub_key);
 		fprintf(stdout,"\n");
 		}
 	if (noout) goto end;
 	BIO_printf(bio_err,"writing DSA key\n");
 	if 	(outformat == FORMAT_ASN1) {
 		if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
 		else i=i2d_DSAPrivateKey_bio(out,dsa);
 	} else if (outformat == FORMAT_PEM) {
 		if(pubin || pubout)
 			i=PEM_write_bio_DSA_PUBKEY(out,dsa);
 		else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
 							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 != NULL) BIO_free(in);
 	if(out != NULL) BIO_free_all(out);
 	if(dsa != NULL) DSA_free(dsa);
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #endif
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -1,3 +1,4 @@
 /* apps/dsaparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,310 +56,423 @@
 * [including the GNU Public Licence.]
 */
-#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 /* Until the key-gen callbacks are modified to use newer prototypes, we allow
 * deprecated functions for openssl-internal code */
 #ifdef OPENSSL_NO_DEPRECATED
 #undef OPENSSL_NO_DEPRECATED
 #endif
 #ifndef OPENSSL_NO_DSA
-# include <stdio.h>
+#include <assert.h>
-# include <stdlib.h>
+#include <stdio.h>
-# include <time.h>
+#include <stdlib.h>
-# include <string.h>
+#include <time.h>
-# include "apps.h"
+#include <string.h>
-# include <openssl/bio.h>
+#include "apps.h"
-# include <openssl/err.h>
+#include <openssl/bio.h>
-# include <openssl/bn.h>
+#include <openssl/err.h>
-# include <openssl/dsa.h>
+#include <openssl/bn.h>
-# include <openssl/x509.h>
+#include <openssl/dsa.h>
-# include <openssl/pem.h>
+#include <openssl/x509.h>
 #include <openssl/pem.h>
-# ifdef GENCB_TEST
+#undef PROG
 #define PROG	dsaparam_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
 * -text
 * -C
 * -noout
 * -genkey
 *  #ifdef GENCB_TEST
 * -timebomb n  - interrupt keygen after <n> seconds
 *  #endif
 */
 #ifdef GENCB_TEST
 static int stop_keygen_flag = 0;
 static void timebomb_sigalarm(int foo)
-{
+	{
-    stop_keygen_flag = 1;
+	stop_keygen_flag = 1;
-}
+	}
 # endif
 static int dsa_cb(int p, int n, BN_GENCB *cb);
 typedef enum OPTION_choice {
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT, OPT_C,
    OPT_NOOUT, OPT_GENKEY, OPT_RAND, OPT_NON_FIPS_ALLOW, OPT_ENGINE,
    OPT_TIMEBOMB
 } OPTION_CHOICE;
 OPTIONS dsaparam_options[] = {
    {"help", OPT_HELP, '-', "Display this summary"},
    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
    {"in", OPT_IN, '<', "Input file"},
    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
    {"out", OPT_OUT, '>', "Output file"},
    {"text", OPT_TEXT, '-', "Print as text"},
    {"C", OPT_C, '-', "Output C code"},
    {"noout", OPT_NOOUT, '-', "No output"},
    {"genkey", OPT_GENKEY, '-', "Generate a DSA key"},
    {"rand", OPT_RAND, 's', "Files to use for random number input"},
    {"non-fips-allow", OPT_NON_FIPS_ALLOW, '-'},
 # ifdef GENCB_TEST
    {"timebomb", OPT_TIMEBOMB, 'p', "Interrupt keygen after 'pnum' seconds"},
 # endif
 # ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
 # endif
    {NULL}
 };
 int dsaparam_main(int argc, char **argv)
 {
    DSA *dsa = NULL;
    BIO *in = NULL, *out = NULL;
    BN_GENCB *cb = NULL;
    int numbits = -1, num = 0, genkey = 0, need_rand = 0, non_fips_allow = 0;
    int informat = FORMAT_PEM, outformat = FORMAT_PEM, noout = 0, C = 0;
    int ret = 1, i, text = 0, private = 0;
 # ifdef GENCB_TEST
    int timebomb = 0;
 # endif
    char *infile = NULL, *outfile = NULL, *prog, *inrand = NULL;
    OPTION_CHOICE o;
    prog = opt_init(argc, argv, dsaparam_options);
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(dsaparam_options);
            ret = 0;
            goto end;
        case OPT_INFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
                goto opthelp;
            break;
        case OPT_IN:
            infile = opt_arg();
            break;
        case OPT_OUTFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
                goto opthelp;
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_ENGINE:
            (void)setup_engine(opt_arg(), 0);
            break;
        case OPT_TIMEBOMB:
 # ifdef GENCB_TEST
            timebomb = atoi(opt_arg());
            break;
 # endif
        case OPT_TEXT:
            text = 1;
            break;
        case OPT_C:
            C = 1;
            break;
        case OPT_GENKEY:
            genkey = need_rand = 1;
            break;
        case OPT_RAND:
            inrand = opt_arg();
            need_rand = 1;
            break;
        case OPT_NOOUT:
            noout = 1;
            break;
        case OPT_NON_FIPS_ALLOW:
            non_fips_allow = 1;
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
    if (argc == 1) {
        if (!opt_int(argv[0], &num))
            goto end;
        /* generate a key */
        numbits = num;
        need_rand = 1;
    }
    private = genkey ? 1 : 0;
    in = bio_open_default(infile, 'r', informat);
    if (in == NULL)
        goto end;
    out = bio_open_owner(outfile, outformat, private);
    if (out == NULL)
        goto end;
    if (need_rand) {
        app_RAND_load_file(NULL, (inrand != NULL));
        if (inrand != NULL)
            BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                       app_RAND_load_files(inrand));
    }
    if (numbits > 0) {
        cb = BN_GENCB_new();
        if (cb == NULL) {
            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 == NULL) {
            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
        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);
    else
        dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL);
    if (dsa == NULL) {
        BIO_printf(bio_err, "unable to load DSA parameters\n");
        ERR_print_errors(bio_err);
        goto end;
    }
    if (text) {
        DSAparams_print(out, dsa);
    }
    if (C) {
        int len = BN_num_bytes(dsa->p);
        int bits_p = BN_num_bits(dsa->p);
        unsigned char *data = app_malloc(len + 20, "BN space");
        BIO_printf(bio_out, "DSA *get_dsa%d()\n{\n", bits_p);
        print_bignum_var(bio_out, dsa->p, "dsap", len, data);
        print_bignum_var(bio_out, dsa->q, "dsaq", len, data);
        print_bignum_var(bio_out, dsa->g, "dsag", len, data);
        BIO_printf(bio_out, "    DSA *dsa = DSA_new();\n"
                            "\n");
        BIO_printf(bio_out, "    if (dsa == NULL)\n"
                            "        return NULL;\n");
        BIO_printf(bio_out, "    dsa->p = BN_bin2bn(dsap_%d, sizeof (dsap_%d), NULL);\n",
               bits_p, bits_p);
        BIO_printf(bio_out, "    dsa->q = BN_bin2bn(dsaq_%d, sizeof (dsaq_%d), NULL);\n",
               bits_p, bits_p);
        BIO_printf(bio_out, "    dsa->g = BN_bin2bn(dsag_%d, sizeof (dsag_%d), NULL);\n",
               bits_p, bits_p);
        BIO_printf(bio_out, "    if (!dsa->p || !dsa->q || !dsa->g) {\n"
                            "        DSA_free(dsa);\n"
                            "        return NULL;\n"
                            "    }\n"
                            "    return(dsa);\n}\n");
    }
    if (!noout) {
        if (outformat == FORMAT_ASN1)
            i = i2d_DSAparams_bio(out, dsa);
        else
            i = PEM_write_bio_DSAparams(out, dsa);
        if (!i) {
            BIO_printf(bio_err, "unable to write DSA parameters\n");
            ERR_print_errors(bio_err);
            goto end;
        }
    }
    if (genkey) {
        DSA *dsakey;
        assert(need_rand);
        if ((dsakey = DSAparams_dup(dsa)) == NULL)
            goto end;
        if (non_fips_allow)
            dsakey->flags |= DSA_FLAG_NON_FIPS_ALLOW;
        if (!DSA_generate_key(dsakey)) {
            ERR_print_errors(bio_err);
            DSA_free(dsakey);
            goto end;
        }
        assert(private);
        if (outformat == FORMAT_ASN1)
            i = i2d_DSAPrivateKey_bio(out, dsakey);
        else
            i = PEM_write_bio_DSAPrivateKey(out, dsakey, NULL, NULL, 0, NULL,
                                            NULL);
        DSA_free(dsakey);
    }
    if (need_rand)
        app_RAND_write_file(NULL);
    ret = 0;
 end:
    BN_GENCB_free(cb);
    BIO_free(in);
    BIO_free_all(out);
    DSA_free(dsa);
    return (ret);
 }
 static int dsa_cb(int p, int n, BN_GENCB *cb)
 {
    char c = '*';
    if (p == 0)
        c = '.';
    if (p == 1)
        c = '+';
    if (p == 2)
        c = '*';
    if (p == 3)
        c = '\n';
    BIO_write(BN_GENCB_get_arg(cb), &c, 1);
    (void)BIO_flush(BN_GENCB_get_arg(cb));
 # ifdef GENCB_TEST
    if (stop_keygen_flag)
        return 0;
 # endif
    return 1;
 }
 #else                           /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 #endif
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	DSA *dsa=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,noout=0,C=0,ret=1;
 	char *infile,*outfile,*prog,*inrand=NULL;
 	int numbits= -1,num,genkey=0;
 	int need_rand=0;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
 #ifdef GENCB_TEST
 	int timebomb=0;
 #endif
 	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;
 	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);
 			}
 #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)
 			C=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,"-noout") == 0)
 			noout=1;
 		else if (sscanf(*argv,"%d",&num) == 1)
 			{
 			/* generate a key */
 			numbits=num;
 			need_rand=1;
 			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
 			badops=1;
 			break;
 			}
 		argc--;
 		argv++;
 		}
 	if (badops)
 		{
 bad:
 		BIO_printf(bio_err,"%s [options] [bits] <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," -out arg      output file\n");
 		BIO_printf(bio_err," -text         print as text\n");
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -noout        no output\n");
 		BIO_printf(bio_err," -genkey       generate a DSA key\n");
 		BIO_printf(bio_err," -rand         files to use for random number input\n");
 #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;
 		}
 	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
        e = setup_engine(bio_err, engine, 0);
 #endif
 	if (need_rand)
 		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 		if (inrand != NULL)
 			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 		}
 	if (numbits > 0)
 		{
 		BN_GENCB cb;
 		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;
 			}
 		BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
 	        BIO_printf(bio_err,"This could take some time\n");
 #ifdef GENCB_TEST
 		if(timebomb > 0)
 	{
 		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
 			BIO_printf(bio_err,"Error, DSA key generation failed\n");
 			goto end;
 			}
 		}
 	else if	(informat == FORMAT_ASN1)
 		dsa=d2i_DSAparams_bio(in,NULL);
 	else if (informat == FORMAT_PEM)
 		dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);
 	else
 		{
 		BIO_printf(bio_err,"bad input format specified\n");
 		goto end;
 		}
 	if (dsa == NULL)
 		{
 		BIO_printf(bio_err,"unable to load DSA parameters\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if (text)
 		{
 		DSAparams_print(out,dsa);
 		}
 	if (C)
 		{
 		unsigned char *data;
 		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)
 			{
 			perror("OPENSSL_malloc");
 			goto end;
 			}
 		l=BN_bn2bin(dsa->p,data);
 		printf("static unsigned char dsa%d_p[]={",bits_p);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 		l=BN_bn2bin(dsa->q,data);
 		printf("static unsigned char dsa%d_q[]={",bits_p);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n");
 		l=BN_bn2bin(dsa->g,data);
 		printf("static unsigned char dsa%d_g[]={",bits_p);
 		for (i=0; i<l; i++)
 			{
 			if ((i%12) == 0) printf("\n\t");
 			printf("0x%02X,",data[i]);
 			}
 		printf("\n\t};\n\n");
 		printf("DSA *get_dsa%d()\n\t{\n",bits_p);
 		printf("\tDSA *dsa;\n\n");
 		printf("\tif ((dsa=DSA_new()) == NULL) return(NULL);\n");
 		printf("\tdsa->p=BN_bin2bn(dsa%d_p,sizeof(dsa%d_p),NULL);\n",
 			bits_p,bits_p);
 		printf("\tdsa->q=BN_bin2bn(dsa%d_q,sizeof(dsa%d_q),NULL);\n",
 			bits_p,bits_p);
 		printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
 			bits_p,bits_p);
 		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
 		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
 		printf("\treturn(dsa);\n\t}\n");
 		}
 	if (!noout)
 		{
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DSAparams_bio(out,dsa);
 		else if (outformat == FORMAT_PEM)
 			i=PEM_write_bio_DSAparams(out,dsa);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		if (!i)
 			{
 			BIO_printf(bio_err,"unable to write DSA parameters\n");
 			ERR_print_errors(bio_err);
 			goto end;
 			}
 		}
 	if (genkey)
 		{
 		DSA *dsakey;
 		assert(need_rand);
 		if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
 		if (!DSA_generate_key(dsakey)) goto end;
 		if 	(outformat == FORMAT_ASN1)
 			i=i2d_DSAPrivateKey_bio(out,dsakey);
 		else if (outformat == FORMAT_PEM)
 			i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
 		else	{
 			BIO_printf(bio_err,"bad output format specified for outfile\n");
 			goto end;
 			}
 		DSA_free(dsakey);
 		}
 	if (need_rand)
 		app_RAND_write_file(NULL, bio_err);
 	ret=0;
 end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 	{
 	char c='*';
 	if (p == 0) c='.';
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
 	BIO_write(cb->arg,&c,1);
 	(void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
 #ifdef GENCB_TEST
 	if(stop_keygen_flag)
 		return 0;
 #endif
 	return 1;
 	}
 #endif
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -1,3 +1,4 @@
 /* apps/ec.c */
 /*
 * Written by Nils Larsch for the OpenSSL project.
 */
@@ -57,238 +58,346 @@
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_EC
-# include <stdio.h>
+#include <stdio.h>
-# include <stdlib.h>
+#include <stdlib.h>
-# include <string.h>
+#include <string.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-static OPT_PAIR conv_forms[] = {
+#undef PROG
-    {"compressed", POINT_CONVERSION_COMPRESSED},
+#define PROG	ec_main
    {"uncompressed", POINT_CONVERSION_UNCOMPRESSED},
    {"hybrid", POINT_CONVERSION_HYBRID},
    {NULL}
 };
-static OPT_PAIR param_enc[] = {
+/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
-    {"named_curve", OPENSSL_EC_NAMED_CURVE},
+ * -outform arg   - output format - default PEM
-    {"explicit", 0},
+ * -in arg        - input file - default stdin
-    {NULL}
+ * -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
 */
-typedef enum OPTION_choice {
+int MAIN(int, char **);
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
    OPT_NOOUT, OPT_TEXT, OPT_PARAM_OUT, OPT_PUBIN, OPT_PUBOUT,
    OPT_PASSIN, OPT_PASSOUT, OPT_PARAM_ENC, OPT_CONV_FORM, OPT_CIPHER
 } OPTION_CHOICE;
-OPTIONS ec_options[] = {
+int MAIN(int argc, char **argv)
    {"help", OPT_HELP, '-', "Display this summary"},
    {"in", OPT_IN, '<', "Input file"},
    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
    {"out", OPT_OUT, '>', "Output file"},
    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
    {"noout", OPT_NOOUT, '-', "Don't print key out"},
    {"text", OPT_TEXT, '-', "Print the key"},
    {"param_out", OPT_PARAM_OUT, '-', "Print the elliptic curve parameters"},
    {"pubin", OPT_PUBIN, '-'},
    {"pubout", OPT_PUBOUT, '-'},
    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
    {"param_enc", OPT_PARAM_ENC, 's',
     "Specifies the way the ec parameters are encoded"},
    {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
    {"", OPT_CIPHER, '-', "Any supported cipher"},
 # ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 # endif
    {NULL}
 };
 int ec_main(int argc, char **argv)
 {
-    BIO *in = NULL, *out = NULL;
+#ifndef OPENSSL_NO_ENGINE
-    EC_KEY *eckey = NULL;
+	ENGINE 	*e = NULL;
-    const EC_GROUP *group;
+#endif
-    const EVP_CIPHER *enc = NULL;
+	int 	ret = 1;
-    point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
+	EC_KEY 	*eckey = NULL;
-    char *infile = NULL, *outfile = NULL, *prog;
+	const EC_GROUP *group;
-    char *passin = NULL, *passout = NULL, *passinarg = NULL, *passoutarg = NULL;
+	int 	i, badops = 0;
-    OPTION_CHOICE o;
+	const EVP_CIPHER *enc = NULL;
-    int asn1_flag = OPENSSL_EC_NAMED_CURVE, new_form = 0, new_asn1_flag = 0;
+	BIO 	*in = NULL, *out = NULL;
-    int informat = FORMAT_PEM, outformat = FORMAT_PEM, text = 0, noout = 0;
+	int 	informat, outformat, text=0, noout=0;
-    int pubin = 0, pubout = 0, param_out = 0, i, ret = 1, private = 0;
+	int  	pubin = 0, pubout = 0, param_out = 0;
-
+	char 	*infile, *outfile, *prog, *engine;
-    prog = opt_init(argc, argv, ec_options);
+	char 	*passargin = NULL, *passargout = NULL;
-    while ((o = opt_next()) != OPT_EOF) {
+	char 	*passin = NULL, *passout = NULL;
-        switch (o) {
+	point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
-        case OPT_EOF:
+	int	new_form = 0;
-        case OPT_ERR:
+	int	asn1_flag = OPENSSL_EC_NAMED_CURVE;
- opthelp:
+	int 	new_asn1_flag = 0;
-            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+
-            goto end;
+	apps_startup();
-        case OPT_HELP:
+
-            opt_help(ec_options);
+	if (bio_err == NULL)
-            ret = 0;
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-            goto end;
+			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
-        case OPT_INFORM:
+
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
+	if (!load_config(bio_err, NULL))
-                goto opthelp;
+		goto end;
-            break;
+
-        case OPT_IN:
+	engine = NULL;
-            infile = opt_arg();
+	infile = NULL;
-            break;
+	outfile = NULL;
-        case OPT_OUTFORM:
+	informat = FORMAT_PEM;
-            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
+	outformat = FORMAT_PEM;
-                goto opthelp;
+
-            break;
+	prog = argv[0];
-        case OPT_OUT:
+	argc--;
-            outfile = opt_arg();
+	argv++;
-            break;
+	while (argc >= 1)
-        case OPT_NOOUT:
+		{
-            noout = 1;
+		if (strcmp(*argv,"-inform") == 0)
-            break;
+			{
-        case OPT_TEXT:
+			if (--argc < 1) goto bad;
-            text = 1;
+			informat=str2fmt(*(++argv));
-            break;
+			}
-        case OPT_PARAM_OUT:
+		else if (strcmp(*argv,"-outform") == 0)
-            param_out = 1;
+			{
-            break;
+			if (--argc < 1) goto bad;
-        case OPT_PUBIN:
+			outformat=str2fmt(*(++argv));
-            pubin = 1;
+			}
-            break;
+		else if (strcmp(*argv,"-in") == 0)
-        case OPT_PUBOUT:
+			{
-            pubout = 1;
+			if (--argc < 1) goto bad;
-            break;
+			infile= *(++argv);
-        case OPT_PASSIN:
+			}
-            passinarg = opt_arg();
+		else if (strcmp(*argv,"-out") == 0)
-            break;
+			{
-        case OPT_PASSOUT:
+			if (--argc < 1) goto bad;
-            passoutarg = opt_arg();
+			outfile= *(++argv);
-            break;
+			}
-        case OPT_ENGINE:
+		else if (strcmp(*argv,"-passin") == 0)
-            (void)setup_engine(opt_arg(), 0);
+			{
-            break;
+			if (--argc < 1) goto bad;
-        case OPT_CIPHER:
+			passargin= *(++argv);
-            if (!opt_cipher(opt_unknown(), &enc))
+			}
-                goto opthelp;
+		else if (strcmp(*argv,"-passout") == 0)
-            break;
+			{
-        case OPT_CONV_FORM:
+			if (--argc < 1) goto bad;
-            if (!opt_pair(opt_arg(), conv_forms, &i))
+			passargout= *(++argv);
-                goto opthelp;
+			}
-            new_form = 1;
+		else if (strcmp(*argv, "-engine") == 0)
-            form = i;
+			{
-            break;
+			if (--argc < 1) goto bad;
-        case OPT_PARAM_ENC:
+			engine= *(++argv);
-            if (!opt_pair(opt_arg(), param_enc, &i))
+			}
-                goto opthelp;
+		else if (strcmp(*argv, "-noout") == 0)
-            new_asn1_flag = 1;
+			noout = 1;
-            asn1_flag = i;
+		else if (strcmp(*argv, "-text") == 0)
-            break;
+			text = 1;
-        }
+		else if (strcmp(*argv, "-conv_form") == 0)
-    }
+			{
-    argc = opt_num_rest();
+			if (--argc < 1)
-    argv = opt_rest();
+				goto bad;
-    private = param_out || pubin || pubout ? 0 : 1;
+			++argv;
-    if (text)
+			new_form = 1;
-        private = 1;
+			if (strcmp(*argv, "compressed") == 0)
-
+				form = POINT_CONVERSION_COMPRESSED;
-    if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
+			else if (strcmp(*argv, "uncompressed") == 0)
-        BIO_printf(bio_err, "Error getting passwords\n");
+				form = POINT_CONVERSION_UNCOMPRESSED;
-        goto end;
+			else if (strcmp(*argv, "hybrid") == 0)
-    }
+				form = POINT_CONVERSION_HYBRID;
-
+			else
-    in = bio_open_default(infile, 'r', informat);
+				goto bad;
-    if (in == NULL)
+			}
-        goto end;
+		else if (strcmp(*argv, "-param_enc") == 0)
-
+			{
-    BIO_printf(bio_err, "read EC key\n");
+			if (--argc < 1)
-    if (informat == FORMAT_ASN1) {
+				goto bad;
-        if (pubin)
+			++argv;
-            eckey = d2i_EC_PUBKEY_bio(in, NULL);
+			new_asn1_flag = 1;
-        else
+			if (strcmp(*argv, "named_curve") == 0)
-            eckey = d2i_ECPrivateKey_bio(in, NULL);
+				asn1_flag = OPENSSL_EC_NAMED_CURVE;
-    } else {
+			else if (strcmp(*argv, "explicit") == 0)
-        if (pubin)
+				asn1_flag = 0;
-            eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
+			else
-        else
+				goto bad;
-            eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL, passin);
+			}
-    }
+		else if (strcmp(*argv, "-param_out") == 0)
-    if (eckey == NULL) {
+			param_out = 1;
-        BIO_printf(bio_err, "unable to load Key\n");
+		else if (strcmp(*argv, "-pubin") == 0)
-        ERR_print_errors(bio_err);
+			pubin=1;
-        goto end;
+		else if (strcmp(*argv, "-pubout") == 0)
-    }
+			pubout=1;
-
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
-    out = bio_open_owner(outfile, outformat, private);
+			{
-    if (out == NULL)
+			BIO_printf(bio_err, "unknown option %s\n", *argv);
-        goto end;
+			badops=1;
-
+			break;
-    group = EC_KEY_get0_group(eckey);
+			}
-
+		argc--;
-    if (new_form)
+		argv++;
-        EC_KEY_set_conv_form(eckey, form);
+		}
-
+
-    if (new_asn1_flag)
+	if (badops)
-        EC_KEY_set_asn1_flag(eckey, asn1_flag);
+		{
-
+bad:
-    if (text) {
+		BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
-        assert(private);
+		BIO_printf(bio_err, "where options are\n");
-        if (!EC_KEY_print(out, eckey, 0)) {
+		BIO_printf(bio_err, " -inform arg     input format - "
-            perror(outfile);
+				"DER or PEM\n");
-            ERR_print_errors(bio_err);
+		BIO_printf(bio_err, " -outform arg    output format - "
-            goto end;
+				"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");
-    if (noout) {
+		BIO_printf(bio_err, " -out arg        output file\n");
-        ret = 0;
+		BIO_printf(bio_err, " -passout arg    output file pass "
-        goto end;
+				"phrase source\n");
-    }
+		BIO_printf(bio_err, " -engine e       use engine e, "
-
+				"possibly a hardware device.\n");
-    BIO_printf(bio_err, "writing EC key\n");
+		BIO_printf(bio_err, " -des            encrypt PEM output, "
-    if (outformat == FORMAT_ASN1) {
+				"instead of 'des' every other \n"
-        if (param_out)
+				"                 cipher "
-            i = i2d_ECPKParameters_bio(out, group);
+				"supported by OpenSSL can be used\n");
-        else if (pubin || pubout)
+		BIO_printf(bio_err, " -text           print the key\n");
-            i = i2d_EC_PUBKEY_bio(out, eckey);
+		BIO_printf(bio_err, " -noout          don't print key out\n");
-        else {
+		BIO_printf(bio_err, " -param_out      print the elliptic "
-            assert(private);
+				"curve parameters\n");
-            i = i2d_ECPrivateKey_bio(out, eckey);
+		BIO_printf(bio_err, " -conv_form arg  specifies the "
-        }
+				"point conversion form \n");
-    } else {
+		BIO_printf(bio_err, "                 possible values:"
-        if (param_out)
+				" compressed\n");
-            i = PEM_write_bio_ECPKParameters(out, group);
+		BIO_printf(bio_err, "                                 "
-        else if (pubin || pubout)
+				" uncompressed (default)\n");
-            i = PEM_write_bio_EC_PUBKEY(out, eckey);
+		BIO_printf(bio_err, "                                  "
-        else {
+				" hybrid\n");
-            assert(private);
+		BIO_printf(bio_err, " -param_enc arg  specifies the way"
-            i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
+				" the ec parameters are encoded\n");
-                                           NULL, 0, NULL, passout);
+		BIO_printf(bio_err, "                 in the asn1 der "
-        }
+				"encoding\n");
-    }
+		BIO_printf(bio_err, "                 possilbe values:"
-
+				" named_curve (default)\n");
-    if (!i) {
+		BIO_printf(bio_err,"                                  "
-        BIO_printf(bio_err, "unable to write private key\n");
+				"explicit\n");
-        ERR_print_errors(bio_err);
+		goto end;
-    } else
+		}
-        ret = 0;
+
- end:
+	ERR_load_crypto_strings();
-    BIO_free(in);
+
-    BIO_free_all(out);
+#ifndef OPENSSL_NO_ENGINE
-    EC_KEY_free(eckey);
+        e = setup_engine(bio_err, engine, 0);
-    OPENSSL_free(passin);
+#endif
-    OPENSSL_free(passout);
+
-    return (ret);
+	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
-}
+		{
-#else                           /* !OPENSSL_NO_EC */
+		BIO_printf(bio_err, "Error getting passwords\n");
-
+		goto end;
-# if PEDANTIC
+		}
-static void *dummy = &dummy;
+
-# endif
+	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);
 }
 #endif
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
--- a/apps/enc.c
+++ b/apps/enc.c
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -1,6 +1,6 @@
-/*
+/* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
- * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
- * 2000.
+ * project 2000.
 */
 /* ====================================================================
 * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
@@ -56,417 +56,487 @@
 *
 */
 #ifndef OPENSSL_NO_ENGINE
 #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/engine.h>
+#include <openssl/ssl.h>
 # include <openssl/ssl.h>
-typedef enum OPTION_choice {
+#undef PROG
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#define PROG	engine_main
    OPT_C, OPT_T, OPT_TT, OPT_PRE, OPT_POST,
    OPT_V = 100, OPT_VV, OPT_VVV, OPT_VVVV
 } OPTION_CHOICE;
-OPTIONS engine_options[] = {
+static const char *engine_usage[]={
-    {"help", OPT_HELP, '-', "Display this summary"},
+"usage: engine opts [engine ...]\n",
-    {"vvvv", OPT_VVVV, '-', "Also show internal input flags"},
+" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
-    {"vvv", OPT_VVV, '-', "Also add the input flags for each command"},
+"               -vv will additionally display each command's description\n",
-    {"vv", OPT_VV, '-', "Also display each command's description"},
+"               -vvv will also add the input flags for each command\n",
-    {"v", OPT_V, '-', "For each engine, list its 'control commands'"},
+"               -vvvv will also show internal input flags\n",
-    {"c", OPT_C, '-', "List the capabilities of each engine"},
+" -c          - for each engine, also list the capabilities\n",
-    {"t", OPT_T, '-', "Check that each engine is available"},
+" -t[t]       - for each engine, check that they are really available\n",
-    {"tt", OPT_TT, '-', "Display error trace for unavailable engines"},
+"               -tt will display error trace for unavailable engines\n",
-    {"pre", OPT_PRE, 's', "Run command against the ENGINE before loading it"},
+" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
-    {"post", OPT_POST, 's', "Run command against the ENGINE after loading it"},
+"               to load it (if -t is used)\n",
-    {OPT_MORE_STR, OPT_EOF, 1,
+" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
-     "Commands are like \"SO_PATH:/lib/libdriver.so\""},
+"               (only used if -t is also provided)\n",
-    {NULL}
+" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
 " line, or all supported ENGINEs if none are specified.\n",
 " Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
 " argument \"/lib/libdriver.so\".\n",
 NULL
 };
-static void identity(char *ptr)
+static void identity(void *ptr)
-{
+	{
-    return;
+	return;
-}
+	}
 static int append_buf(char **buf, const char *s, int *size, int step)
-{
+	{
-    if (*buf == NULL) {
+	int l = strlen(s);
        *size = step;
        *buf = app_malloc(*size, "engine buffer");
        **buf = '\0';
    }
-    if (strlen(*buf) + strlen(s) >= (unsigned int)*size) {
+	if (*buf == NULL)
-        *size += step;
+		{
-        *buf = OPENSSL_realloc(*buf, *size);
+		*size = step;
-    }
+		*buf = OPENSSL_malloc(*size);
 		if (*buf == NULL)
 			return 0;
 		**buf = '\0';
 		}
-    if (*buf == NULL)
+	if (**buf != '\0')
-        return 0;
+		l += 2;		/* ", " */
-    if (**buf != '\0')
+	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
-        BUF_strlcat(*buf, ", ", *size);
+		{
-    BUF_strlcat(*buf, s, *size);
+		*size += step;
 		*buf = OPENSSL_realloc(*buf, *size);
 		}
-    return 1;
+	if (*buf == NULL)
-}
+		return 0;
-static int util_flags(BIO *out, unsigned int flags, const char *indent)
+	if (**buf != '\0')
-{
+		BUF_strlcat(*buf, ", ", *size);
-    int started = 0, err = 0;
+	BUF_strlcat(*buf, s, *size);
    /* Indent before displaying input flags */
    BIO_printf(out, "%s%s(input flags): ", indent, indent);
    if (flags == 0) {
        BIO_printf(out, "<no flags>\n");
        return 1;
    }
    /*
     * If the object is internal, mark it in a way that shows instead of
     * having it part of all the other flags, even if it really is.
     */
    if (flags & ENGINE_CMD_FLAG_INTERNAL) {
        BIO_printf(out, "[Internal] ");
    }
-    if (flags & ENGINE_CMD_FLAG_NUMERIC) {
+	return 1;
-        BIO_printf(out, "NUMERIC");
+	}
        started = 1;
    }
    /*
     * Now we check that no combinations of the mutually exclusive NUMERIC,
     * STRING, and NO_INPUT flags have been used. Future flags that can be
     * OR'd together with these would need to added after these to preserve
     * the testing logic.
     */
    if (flags & ENGINE_CMD_FLAG_STRING) {
        if (started) {
            BIO_printf(out, "|");
            err = 1;
        }
        BIO_printf(out, "STRING");
        started = 1;
    }
    if (flags & ENGINE_CMD_FLAG_NO_INPUT) {
        if (started) {
            BIO_printf(out, "|");
            err = 1;
        }
        BIO_printf(out, "NO_INPUT");
        started = 1;
    }
    /* Check for unknown flags */
    flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
        ~ENGINE_CMD_FLAG_STRING &
        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
    if (flags) {
        if (started)
            BIO_printf(out, "|");
        BIO_printf(out, "<0x%04X>", flags);
    }
    if (err)
        BIO_printf(out, "  <illegal flags!>");
    BIO_printf(out, "\n");
    return 1;
 }
-static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
+static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
-{
+	{
-    static const int line_wrap = 78;
+	int started = 0, err = 0;
-    int num;
+	/* Indent before displaying input flags */
-    int ret = 0;
+	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-    char *name = NULL;
+	if(flags == 0)
-    char *desc = NULL;
+		{
-    int flags;
+		BIO_printf(bio_out, "<no flags>\n");
-    int xpos = 0;
+		return 1;
-    STACK_OF(OPENSSL_STRING) *cmds = NULL;
+		}
-    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
+        /* If the object is internal, mark it in a way that shows instead of
-        ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
+         * having it part of all the other flags, even if it really is. */
-                            0, NULL, NULL)) <= 0)) {
+	if(flags & ENGINE_CMD_FLAG_INTERNAL)
-        return 1;
+		{
-    }
+		BIO_printf(bio_out, "[Internal] ");
 		}
-    cmds = sk_OPENSSL_STRING_new_null();
+	if(flags & ENGINE_CMD_FLAG_NUMERIC)
-    if (!cmds)
+		{
-        goto err;
+		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "NUMERIC");
 		started = 1;
 		}
 	/* Now we check that no combinations of the mutually exclusive NUMERIC,
 	 * STRING, and NO_INPUT flags have been used. Future flags that can be
 	 * OR'd together with these would need to added after these to preserve
 	 * the testing logic. */
 	if(flags & ENGINE_CMD_FLAG_STRING)
 		{
 		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "STRING");
 		started = 1;
 		}
 	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
 		{
 		if(started)
 			{
 			BIO_printf(bio_out, "|");
 			err = 1;
 			}
 		BIO_printf(bio_out, "NO_INPUT");
 		started = 1;
 		}
 	/* Check for unknown flags */
 	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
 			~ENGINE_CMD_FLAG_STRING &
 			~ENGINE_CMD_FLAG_NO_INPUT &
 			~ENGINE_CMD_FLAG_INTERNAL;
 	if(flags)
 		{
 		if(started) BIO_printf(bio_out, "|");
 		BIO_printf(bio_out, "<0x%04X>", flags);
 		}
 	if(err)
 		BIO_printf(bio_out, "  <illegal flags!>");
 	BIO_printf(bio_out, "\n");
 	return 1;
 	}
-    do {
+static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
-        int len;
+	{
-        /* Get the command input flags */
+	static const int line_wrap = 78;
-        if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
+	int num;
-                                 NULL, NULL)) < 0)
+	int ret = 0;
-            goto err;
+	char *name = NULL;
-        if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
+	char *desc = NULL;
-            /* Get the command name */
+	int flags;
-            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
+	int xpos = 0;
-                                   NULL, NULL)) <= 0)
+	STACK *cmds = NULL;
-                goto err;
+	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
-            name = app_malloc(len + 1, "name buffer");
+			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-            if (ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
+					0, NULL, NULL)) <= 0))
-                            NULL) <= 0)
+		{
-                goto err;
+#if 0
-            /* Get the command description */
+		BIO_printf(bio_out, "%s<no control commands>\n", indent);
-            if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
+#endif
-                                   NULL, NULL)) < 0)
+		return 1;
-                goto err;
+		}
-            if (len > 0) {
+
-                desc = app_malloc(len + 1, "description buffer");
+	cmds = sk_new_null();
-                if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
+
 	if(!cmds)
 		goto err;
 	do {
 		int len;
 		/* Get the command input flags */
 		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
 					NULL, NULL)) < 0)
 			goto err;
                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
                        {
                        /* Get the command name */
                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
                                NULL, NULL)) <= 0)
                                goto err;
                        if((name = OPENSSL_malloc(len + 1)) == NULL)
                                goto err;
                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
                                NULL) <= 0)
-                    goto err;
+                                goto err;
-            }
+                        /* Get the command description */
-            /* Now decide on the output */
+                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
-            if (xpos == 0)
+                                NULL, NULL)) < 0)
-                /* Do an indent */
+                                goto err;
-                xpos = BIO_puts(out, indent);
+                        if(len > 0)
-            else
+                                {
-                /* Otherwise prepend a ", " */
+                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
-                xpos += BIO_printf(out, ", ");
+                                        goto err;
-            if (verbose == 1) {
+                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
-                /*
+                                        NULL) <= 0)
-                 * We're just listing names, comma-delimited
+                                        goto err;
-                 */
+                                }
-                if ((xpos > (int)strlen(indent)) &&
+                        /* Now decide on the output */
-                    (xpos + (int)strlen(name) > line_wrap)) {
+                        if(xpos == 0)
-                    BIO_printf(out, "\n");
+                                /* Do an indent */
-                    xpos = BIO_puts(out, indent);
+                                xpos = BIO_printf(bio_out, indent);
-                }
+                        else
-                xpos += BIO_printf(out, "%s", name);
+                                /* Otherwise prepend a ", " */
-            } else {
+                                xpos += BIO_printf(bio_out, ", ");
-                /* We're listing names plus descriptions */
+                        if(verbose == 1)
-                BIO_printf(out, "%s: %s\n", name,
+                                {
-                           (desc == NULL) ? "<no description>" : desc);
+                                /* We're just listing names, comma-delimited */
-                /* ... and sometimes input flags */
+                                if((xpos > (int)strlen(indent)) &&
-                if ((verbose >= 3) && !util_flags(out, flags, indent))
+					(xpos + (int)strlen(name) > line_wrap))
-                    goto err;
+                                        {
-                xpos = 0;
+                                        BIO_printf(bio_out, "\n");
-            }
+                                        xpos = BIO_printf(bio_out, indent);
-        }
+                                        }
-        OPENSSL_free(name);
+                                xpos += BIO_printf(bio_out, "%s", name);
-        name = NULL;
+                                }
-        OPENSSL_free(desc);
+                        else
-        desc = NULL;
+                                {
-        /* Move to the next command */
+                                /* We're listing names plus descriptions */
-        num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL);
+                                BIO_printf(bio_out, "%s: %s\n", name,
-    } while (num > 0);
+                                        (desc == NULL) ? "<no description>" : desc);
-    if (xpos > 0)
+                                /* ... and sometimes input flags */
-        BIO_printf(out, "\n");
+                                if((verbose >= 3) && !util_flags(bio_out, flags,
-    ret = 1;
+                                        indent))
- err:
+                                        goto err;
-    sk_OPENSSL_STRING_pop_free(cmds, identity);
+                                xpos = 0;
-    OPENSSL_free(name);
+                                }
-    OPENSSL_free(desc);
+                        }
-    return ret;
+		OPENSSL_free(name); name = NULL;
-}
+		if(desc) { OPENSSL_free(desc); desc = NULL; }
 		/* Move to the next command */
 		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
 					num, NULL, NULL);
 		} while(num > 0);
 	if(xpos > 0)
 		BIO_printf(bio_out, "\n");
 	ret = 1;
 err:
 	if(cmds) sk_pop_free(cmds, identity);
 	if(name) OPENSSL_free(name);
 	if(desc) OPENSSL_free(desc);
 	return ret;
 	}
-static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
+static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
-                         BIO *out, const char *indent)
+	{
-{
+	int loop, res, num = sk_num(cmds);
-    int loop, res, num = sk_OPENSSL_STRING_num(cmds);
+	if(num < 0)
 		{
 		BIO_printf(bio_out, "[Error]: internal stack error\n");
 		return;
 		}
 	for(loop = 0; loop < num; loop++)
 		{
 		char buf[256];
 		const char *cmd, *arg;
 		cmd = sk_value(cmds, loop);
 		res = 1; /* assume success */
 		/* Check if this command has no ":arg" */
 		if((arg = strstr(cmd, ":")) == NULL)
 			{
 			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
 				res = 0;
 			}
 		else
 			{
 			if((int)(arg - cmd) > 254)
 				{
 				BIO_printf(bio_out,"[Error]: command name too long\n");
 				return;
 				}
 			memcpy(buf, cmd, (int)(arg - cmd));
 			buf[arg-cmd] = '\0';
 			arg++; /* Move past the ":" */
 			/* Call the command with the argument */
 			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
 				res = 0;
 			}
 		if(res)
 			BIO_printf(bio_out, "[Success]: %s\n", cmd);
 		else
 			{
 			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
 			ERR_print_errors(bio_out);
 			}
 		}
 	}
-    if (num < 0) {
+int MAIN(int, char **);
        BIO_printf(out, "[Error]: internal stack error\n");
        return;
    }
    for (loop = 0; loop < num; loop++) {
        char buf[256];
        const char *cmd, *arg;
        cmd = sk_OPENSSL_STRING_value(cmds, loop);
        res = 1;                /* assume success */
        /* Check if this command has no ":arg" */
        if ((arg = strstr(cmd, ":")) == NULL) {
            if (!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
                res = 0;
        } else {
            if ((int)(arg - cmd) > 254) {
                BIO_printf(out, "[Error]: command name too long\n");
                return;
            }
            memcpy(buf, cmd, (int)(arg - cmd));
            buf[arg - cmd] = '\0';
            arg++;              /* Move past the ":" */
            /* Call the command with the argument */
            if (!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
                res = 0;
        }
        if (res)
            BIO_printf(out, "[Success]: %s\n", cmd);
        else {
            BIO_printf(out, "[Failure]: %s\n", cmd);
            ERR_print_errors(out);
        }
    }
 }
-int engine_main(int argc, char **argv)
+int MAIN(int argc, char **argv)
-{
+	{
-    int ret = 1, i;
+	int ret=1,i;
-    int verbose = 0, list_cap = 0, test_avail = 0, test_avail_noise = 0;
+	const char **pp;
-    ENGINE *e;
+	int verbose=0, list_cap=0, test_avail=0, test_avail_noise = 0;
-    STACK_OF(OPENSSL_STRING) *engines = sk_OPENSSL_STRING_new_null();
+	ENGINE *e;
-    STACK_OF(OPENSSL_STRING) *pre_cmds = sk_OPENSSL_STRING_new_null();
+	STACK *engines = sk_new_null();
-    STACK_OF(OPENSSL_STRING) *post_cmds = sk_OPENSSL_STRING_new_null();
+	STACK *pre_cmds = sk_new_null();
-    BIO *out;
+	STACK *post_cmds = sk_new_null();
-    const char *indent = "     ";
+	int badops=1;
-    OPTION_CHOICE o;
+	BIO *bio_out=NULL;
-    char *prog;
+	const char *indent = "     ";
-    out = dup_bio_out(FORMAT_TEXT);
+	apps_startup();
-    prog = opt_init(argc, argv, engine_options);
+	SSL_load_error_strings();
    if (!engines || !pre_cmds || !post_cmds)
        goto end;
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(engine_options);
            ret = 0;
            goto end;
        case OPT_VVVV:
        case OPT_VVV:
        case OPT_VV:
        case OPT_V:
            /* Convert to an integer from one to four. */
            i = (int)(o - OPT_V) + 1;
            if (verbose < i)
                verbose = i;
            break;
        case OPT_C:
            list_cap = 1;
            break;
        case OPT_TT:
            test_avail_noise++;
        case OPT_T:
            test_avail++;
            break;
        case OPT_PRE:
            sk_OPENSSL_STRING_push(pre_cmds, opt_arg());
            break;
        case OPT_POST:
            sk_OPENSSL_STRING_push(post_cmds, opt_arg());
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
    for ( ; *argv; argv++)
        sk_OPENSSL_STRING_push(engines, *argv);
-    if (sk_OPENSSL_STRING_num(engines) == 0) {
+	if (bio_err == NULL)
-        for (e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e)) {
+		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
            sk_OPENSSL_STRING_push(engines, (char *)ENGINE_get_id(e));
        }
    }
-    for (i = 0; i < sk_OPENSSL_STRING_num(engines); i++) {
+	if (!load_config(bio_err, NULL))
-        const char *id = sk_OPENSSL_STRING_value(engines, i);
+		goto end;
-        if ((e = ENGINE_by_id(id)) != NULL) {
+	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-            const char *name = ENGINE_get_name(e);
+#ifdef OPENSSL_SYS_VMS
-            /*
+	{
-             * Do "id" first, then "name". Easier to auto-parse.
+	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-             */
+	bio_out = BIO_push(tmpbio, bio_out);
-            BIO_printf(out, "(%s) %s\n", id, name);
+	}
-            util_do_cmds(e, pre_cmds, out, indent);
+#endif
            if (strcmp(ENGINE_get_id(e), id) != 0) {
                BIO_printf(out, "Loaded: (%s) %s\n",
                           ENGINE_get_id(e), ENGINE_get_name(e));
            }
            if (list_cap) {
                int cap_size = 256;
                char *cap_buf = NULL;
                int k, n;
                const int *nids;
                ENGINE_CIPHERS_PTR fn_c;
                ENGINE_DIGESTS_PTR fn_d;
                ENGINE_PKEY_METHS_PTR fn_pk;
-                if (ENGINE_get_RSA(e) != NULL
+	argc--;
-                    && !append_buf(&cap_buf, "RSA", &cap_size, 256))
+	argv++;
-                    goto end;
+	while (argc >= 1)
-                if (ENGINE_get_DSA(e) != NULL
+		{
-                    && !append_buf(&cap_buf, "DSA", &cap_size, 256))
+		if (strncmp(*argv,"-v",2) == 0)
-                    goto end;
+			{
-                if (ENGINE_get_DH(e) != NULL
+			if(strspn(*argv + 1, "v") < strlen(*argv + 1))
-                    && !append_buf(&cap_buf, "DH", &cap_size, 256))
+				goto skip_arg_loop;
-                    goto end;
+			if((verbose=strlen(*argv + 1)) > 4)
-                if (ENGINE_get_RAND(e) != NULL
+				goto skip_arg_loop;
-                    && !append_buf(&cap_buf, "RAND", &cap_size, 256))
+			}
-                    goto end;
+		else if (strcmp(*argv,"-c") == 0)
 			list_cap=1;
 		else if (strncmp(*argv,"-t",2) == 0)
 			{
 			test_avail=1;
 			if(strspn(*argv + 1, "t") < strlen(*argv + 1))
 				goto skip_arg_loop;
 			if((test_avail_noise = strlen(*argv + 1) - 1) > 1)
 				goto skip_arg_loop;
 			}
 		else if (strcmp(*argv,"-pre") == 0)
 			{
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
 			sk_push(pre_cmds,*argv);
 			}
 		else if (strcmp(*argv,"-post") == 0)
 			{
 			argc--; argv++;
 			if (argc == 0)
 				goto skip_arg_loop;
 			sk_push(post_cmds,*argv);
 			}
 		else if ((strncmp(*argv,"-h",2) == 0) ||
 				(strcmp(*argv,"-?") == 0))
 			goto skip_arg_loop;
 		else
 			sk_push(engines,*argv);
 		argc--;
 		argv++;
 		}
 	/* Looks like everything went OK */
 	badops = 0;
 skip_arg_loop:
-                fn_c = ENGINE_get_ciphers(e);
+	if (badops)
-                if (!fn_c)
+		{
-                    goto skip_ciphers;
+		for (pp=engine_usage; (*pp != NULL); pp++)
-                n = fn_c(e, NULL, &nids, 0);
+			BIO_printf(bio_err,"%s",*pp);
-                for (k = 0; k < n; ++k)
+		goto end;
-                    if (!append_buf(&cap_buf,
+		}
                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
                        goto end;
- skip_ciphers:
+	if (sk_num(engines) == 0)
-                fn_d = ENGINE_get_digests(e);
+		{
-                if (!fn_d)
+		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
-                    goto skip_digests;
+			{
-                n = fn_d(e, NULL, &nids, 0);
+			sk_push(engines,(char *)ENGINE_get_id(e));
-                for (k = 0; k < n; ++k)
+			}
-                    if (!append_buf(&cap_buf,
+		}
                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
                        goto end;
- skip_digests:
+	for (i=0; i<sk_num(engines); i++)
-                fn_pk = ENGINE_get_pkey_meths(e);
+		{
-                if (!fn_pk)
+		const char *id = sk_value(engines,i);
-                    goto skip_pmeths;
+		if ((e = ENGINE_by_id(id)) != NULL)
-                n = fn_pk(e, NULL, &nids, 0);
+			{
-                for (k = 0; k < n; ++k)
+			const char *name = ENGINE_get_name(e);
-                    if (!append_buf(&cap_buf,
+			/* Do "id" first, then "name". Easier to auto-parse. */
-                                    OBJ_nid2sn(nids[k]), &cap_size, 256))
+			BIO_printf(bio_out, "(%s) %s\n", id, name);
-                        goto end;
+			util_do_cmds(e, pre_cmds, bio_out, indent);
- skip_pmeths:
+			if (strcmp(ENGINE_get_id(e), id) != 0)
-                if (cap_buf && (*cap_buf != '\0'))
+				{
-                    BIO_printf(out, " [%s]\n", cap_buf);
+				BIO_printf(bio_out, "Loaded: (%s) %s\n",
 					ENGINE_get_id(e), ENGINE_get_name(e));
 				}
 			if (list_cap)
 				{
 				int cap_size = 256;
 				char *cap_buf = NULL;
 				int k,n;
 				const int *nids;
 				ENGINE_CIPHERS_PTR fn_c;
 				ENGINE_DIGESTS_PTR fn_d;
-                OPENSSL_free(cap_buf);
+				if (ENGINE_get_RSA(e) != NULL
-            }
+					&& !append_buf(&cap_buf, "RSA",
-            if (test_avail) {
+						&cap_size, 256))
-                BIO_printf(out, "%s", indent);
+					goto end;
-                if (ENGINE_init(e)) {
+				if (ENGINE_get_DSA(e) != NULL
-                    BIO_printf(out, "[ available ]\n");
+					&& !append_buf(&cap_buf, "DSA",
-                    util_do_cmds(e, post_cmds, out, indent);
+						&cap_size, 256))
-                    ENGINE_finish(e);
+					goto end;
-                } else {
+				if (ENGINE_get_DH(e) != NULL
-                    BIO_printf(out, "[ unavailable ]\n");
+					&& !append_buf(&cap_buf, "DH",
-                    if (test_avail_noise)
+						&cap_size, 256))
-                        ERR_print_errors_fp(stdout);
+					goto end;
-                    ERR_clear_error();
+				if (ENGINE_get_RAND(e) != NULL
-                }
+					&& !append_buf(&cap_buf, "RAND",
-            }
+						&cap_size, 256))
-            if ((verbose > 0) && !util_verbose(e, verbose, out, indent))
+					goto end;
                goto end;
            ENGINE_free(e);
        } else
            ERR_print_errors(bio_err);
    }
-    ret = 0;
+				fn_c = ENGINE_get_ciphers(e);
- end:
+				if(!fn_c) goto skip_ciphers;
 				n = fn_c(e, NULL, &nids, 0);
 				for(k=0 ; k < n ; ++k)
 					if(!append_buf(&cap_buf,
 						       OBJ_nid2sn(nids[k]),
 						       &cap_size, 256))
 						goto end;
-    ERR_print_errors(bio_err);
+skip_ciphers:
-    sk_OPENSSL_STRING_pop_free(engines, identity);
+				fn_d = ENGINE_get_digests(e);
-    sk_OPENSSL_STRING_pop_free(pre_cmds, identity);
+				if(!fn_d) goto skip_digests;
-    sk_OPENSSL_STRING_pop_free(post_cmds, identity);
+				n = fn_d(e, NULL, &nids, 0);
-    BIO_free_all(out);
+				for(k=0 ; k < n ; ++k)
-    return (ret);
+					if(!append_buf(&cap_buf,
-}
+						       OBJ_nid2sn(nids[k]),
 						       &cap_size, 256))
 						goto end;
 skip_digests:
 				if (cap_buf && (*cap_buf != '\0'))
 					BIO_printf(bio_out, " [%s]\n", cap_buf);
 				OPENSSL_free(cap_buf);
 				}
 			if(test_avail)
 				{
 				BIO_printf(bio_out, "%s", indent);
 				if (ENGINE_init(e))
 					{
 					BIO_printf(bio_out, "[ available ]\n");
 					util_do_cmds(e, post_cmds, bio_out, indent);
 					ENGINE_finish(e);
 					}
 				else
 					{
 					BIO_printf(bio_out, "[ unavailable ]\n");
 					if(test_avail_noise)
 						ERR_print_errors_fp(stdout);
 					ERR_clear_error();
 					}
 				}
 			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
 				goto end;
 			ENGINE_free(e);
 			}
 		else
 			ERR_print_errors(bio_err);
 		}
 	ret=0;
 end:
 	ERR_print_errors(bio_err);
 	sk_pop_free(engines, identity);
 	sk_pop_free(pre_cmds, identity);
 	sk_pop_free(post_cmds, identity);
 	if (bio_out != NULL) BIO_free_all(bio_out);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #else
 # if PEDANTIC
-static void *dummy = &dummy;
+static void *dummy=&dummy;
 # endif
 #endif
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -1,3 +1,4 @@
 /* apps/errstr.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -64,60 +65,62 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
-typedef enum OPTION_choice {
+#undef PROG
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#define PROG	errstr_main
    OPT_STATS
 } OPTION_CHOICE;
-OPTIONS errstr_options[] = {
+int MAIN(int, char **);
    {OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n"},
    {OPT_HELP_STR, 1, '-', "  errnum  Error number\n"},
    {"help", OPT_HELP, '-', "Display this summary"},
    {"stats", OPT_STATS, '-',
     "Print internal hashtable statistics (long!)"},
    {NULL}
 };
-int errstr_main(int argc, char **argv)
+int MAIN(int argc, char **argv)
-{
+	{
-    OPTION_CHOICE o;
+	int i,ret=0;
-    char buf[256], *prog;
+	char buf[256];
-    int ret = 1;
+	unsigned long l;
    unsigned long l;
-    prog = opt_init(argc, argv, errstr_options);
+	apps_startup();
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            opt_help(errstr_options);
            ret = 0;
            goto end;
        case OPT_STATS:
            lh_ERR_STRING_DATA_node_stats_bio(ERR_get_string_table(),
                                              bio_out);
            lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(), bio_out);
            lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
                                                    bio_out);
            ret = 0;
            goto end;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
-    ret = 0;
+	if (bio_err == NULL)
-    for (argv = opt_rest(); *argv; argv++) {
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-        if (!opt_ulong(*argv, &l))
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-            ret++;
+
-        else {
+	SSL_load_error_strings();
-            ERR_error_string_n(l, buf, sizeof buf);
+
-            BIO_printf(bio_out, "%s\n", buf);
+	if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
-        }
+		{
-    }
+		BIO *out=NULL;
- end:
+
-    return (ret);
+		out=BIO_new(BIO_s_file());
-}
+		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
 			{
 #ifdef OPENSSL_SYS_VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
 			}
 #endif
 			lh_node_stats_bio((LHASH *)ERR_get_string_table(),out);
 			lh_stats_bio((LHASH *)ERR_get_string_table(),out);
 			lh_node_usage_stats_bio((LHASH *)
 				ERR_get_string_table(),out);
 			}
 		if (out != NULL) BIO_free_all(out);
 		argc--;
 		argv++;
 		}
 	for (i=1; i<argc; i++)
 		{
 		if (sscanf(argv[i],"%lx",&l))
 			{
 			ERR_error_string_n(l, buf, sizeof buf);
 			printf("%s\n",buf);
 			}
 		else
 			{
 			printf("%s: bad error code\n",argv[i]);
 			printf("usage: errstr [-stats] <errno> ...\n");
 			ret++;
 			}
 		}
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -0,0 +1,238 @@
 /* apps/gendh.c */
 /* obsoleted by dhparam.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the 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 acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR 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.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
 #include <openssl/opensslconf.h>
 /* Until the key-gen callbacks are modified to use newer prototypes, we allow
 * deprecated functions for openssl-internal code */
 #ifdef OPENSSL_NO_DEPRECATED
 #undef OPENSSL_NO_DEPRECATED
 #endif
 #ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #define DEFBITS	512
 #undef PROG
 #define PROG gendh_main
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
 int MAIN(int, char **);
 int MAIN(int argc, char **argv)
 	{
 	BN_GENCB cb;
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	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();
 	BN_GENCB_set(&cb, dh_cb, bio_err);
 	if (bio_err == NULL)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 	if (!load_config(bio_err, NULL))
 		goto end;
 	argv++;
 	argc--;
 	for (;;)
 		{
 		if (argc <= 0) break;
 		if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-2") == 0)
 			g=2;
 	/*	else if (strcmp(*argv,"-3") == 0)
 			g=3; */
 		else if (strcmp(*argv,"-5") == 0)
 			g=5;
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			}
 		else
 			break;
 		argv++;
 		argc--;
 		}
 	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
 		{
 bad:
 		BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
 		BIO_printf(bio_err," -out file - output the key to 'file\n");
 		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
 	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
 		BIO_printf(bio_err," -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);
 #endif
 	out=BIO_new(BIO_s_file());
 	if (out == NULL)
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
 		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 		{
 		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 	BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
 	BIO_printf(bio_err,"This is going to take a long time\n");
 	if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
 		goto end;
 	app_RAND_write_file(NULL, bio_err);
 	if (!PEM_write_bio_DHparams(out,dh))
 		goto end;
 	ret=0;
 end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
 	{
 	char c='*';
 	if (p == 0) c='.';
 	if (p == 1) c='+';
 	if (p == 2) c='*';
 	if (p == 3) c='\n';
 	BIO_write(cb->arg,&c,1);
 	(void)BIO_flush(cb->arg);
 #ifdef LINT
 	p=n;
 #endif
 	return 1;
 	}
 #endif
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -1,3 +1,4 @@
 /* apps/gendsa.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -55,140 +56,227 @@
 * [including the GNU Public Licence.]
 */
-#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
+#include <openssl/opensslconf.h>	/* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
-# include <stdio.h>
+#include <stdio.h>
-# include <string.h>
+#include <string.h>
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-typedef enum OPTION_choice {
+#define DEFBITS	512
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+#undef PROG
-    OPT_OUT, OPT_PASSOUT, OPT_ENGINE, OPT_RAND, OPT_CIPHER
+#define PROG gendsa_main
 } OPTION_CHOICE;
-OPTIONS gendsa_options[] = {
+int MAIN(int, char **);
    {OPT_HELP_STR, 1, '-', "Usage: %s [args] dsaparam-file\n"},
    {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
    {"help", OPT_HELP, '-', "Display this summary"},
    {"out", OPT_OUT, '>', "Output the key to the specified file"},
    {"passout", OPT_PASSOUT, 's'},
    {"rand", OPT_RAND, 's',
     "Load the file(s) into the random number generator"},
    {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
 # ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 # endif
    {NULL}
 };
 int gendsa_main(int argc, char **argv)
 {
    BIO *out = NULL, *in = NULL;
    DSA *dsa = NULL;
    const EVP_CIPHER *enc = NULL;
    char *inrand = NULL, *dsaparams = NULL;
    char *outfile = NULL, *passoutarg = NULL, *passout = NULL, *prog;
    OPTION_CHOICE o;
    int ret = 1, private = 0;
    prog = opt_init(argc, argv, gendsa_options);
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            ret = 0;
            opt_help(gendsa_options);
            goto end;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_PASSOUT:
            passoutarg = opt_arg();
            break;
        case OPT_ENGINE:
            (void)setup_engine(opt_arg(), 0);
            break;
        case OPT_RAND:
            inrand = opt_arg();
            break;
        case OPT_CIPHER:
            if (!opt_cipher(opt_unknown(), &enc))
                goto end;
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
    private = 1;
    if (argc != 1)
        goto opthelp;
    dsaparams = *argv;
    if (!app_passwd(NULL, passoutarg, NULL, &passout)) {
        BIO_printf(bio_err, "Error getting password\n");
        goto end;
    }
    in = bio_open_default(dsaparams, 'r', FORMAT_PEM);
    if (in == NULL)
        goto end2;
    if ((dsa = PEM_read_bio_DSAparams(in, NULL, NULL, NULL)) == NULL) {
        BIO_printf(bio_err, "unable to load DSA parameter file\n");
        goto end;
    }
    BIO_free(in);
    in = NULL;
    out = bio_open_owner(outfile, FORMAT_PEM, private);
    if (out == NULL)
        goto end2;
    if (!app_RAND_load_file(NULL, 1) && inrand == NULL) {
        BIO_printf(bio_err,
                   "warning, not much extra random data, consider using the -rand option\n");
    }
    if (inrand != NULL)
        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                   app_RAND_load_files(inrand));
    BIO_printf(bio_err, "Generating DSA key, %d bits\n", BN_num_bits(dsa->p));
    if (!DSA_generate_key(dsa))
        goto end;
    app_RAND_write_file(NULL);
    assert(private);
    if (!PEM_write_bio_DSAPrivateKey(out, dsa, enc, NULL, 0, NULL, passout))
        goto end;
    ret = 0;
 end:
    if (ret != 0)
        ERR_print_errors(bio_err);
 end2:
    BIO_free(in);
    BIO_free_all(out);
    DSA_free(dsa);
    OPENSSL_free(passout);
    return (ret);
 }
 #else                           /* !OPENSSL_NO_DSA */
 # if PEDANTIC
 static void *dummy = &dummy;
 # endif
 int MAIN(int argc, char **argv)
 	{
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE *e = NULL;
 #endif
 	DSA *dsa=NULL;
 	int ret=1;
 	char *outfile=NULL;
 	char *inrand=NULL,*dsaparams=NULL;
 	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();
 	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;
 	argv++;
 	argc--;
 	for (;;)
 		{
 		if (argc <= 0) break;
 		if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-passout") == 0)
 			{
 			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;
 			inrand= *(++argv);
 			}
 		else if (strcmp(*argv,"-") == 0)
 			goto bad;
 #ifndef OPENSSL_NO_DES
 		else if (strcmp(*argv,"-des") == 0)
 			enc=EVP_des_cbc();
 		else if (strcmp(*argv,"-des3") == 0)
 			enc=EVP_des_ede3_cbc();
 #endif
 #ifndef OPENSSL_NO_IDEA
 		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();
 		else if (strcmp(*argv,"-aes192") == 0)
 			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)
 			{
 			dsaparams = *argv;
 			}
 		else
 			goto bad;
 		argv++;
 		argc--;
 		}
 	if (dsaparams == NULL)
 		{
 bad:
 		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
 		BIO_printf(bio_err," -out file - output the key to 'file'\n");
 #ifndef OPENSSL_NO_DES
 		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
 		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #endif
 #ifndef OPENSSL_NO_IDEA
 		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #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");
 		BIO_printf(bio_err," dsaparam-file\n");
 		BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
 		goto end;
 		}
 #ifndef OPENSSL_NO_ENGINE
        e = setup_engine(bio_err, engine, 0);
 #endif
 	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
 	}
 	in=BIO_new(BIO_s_file());
 	if (!(BIO_read_filename(in,dsaparams)))
 		{
 		perror(dsaparams);
 		goto end;
 		}
 	if ((dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL)) == NULL)
 		{
 		BIO_printf(bio_err,"unable to load DSA parameter file\n");
 		goto end;
 		}
 	BIO_free(in);
 	in = NULL;
 	out=BIO_new(BIO_s_file());
 	if (out == NULL) goto end;
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
 		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto end;
 			}
 		}
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 		{
 		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 	BIO_printf(bio_err,"Generating DSA key, %d bits\n",
 							BN_num_bits(dsa->p));
 	if (!DSA_generate_key(dsa)) goto end;
 	app_RAND_write_file(NULL, bio_err);
 	if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))
 		goto end;
 	ret=0;
 end:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
 #endif
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,361 +0,0 @@
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
 * 2006
 */
 /* ====================================================================
 * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    licensing@OpenSSL.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
 #include <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(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e);
 static int genpkey_cb(EVP_PKEY_CTX *ctx);
 typedef enum OPTION_choice {
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_ENGINE, OPT_OUTFORM, OPT_OUT, OPT_PASS, OPT_PARAMFILE,
    OPT_ALGORITHM, OPT_PKEYOPT, OPT_GENPARAM, OPT_TEXT, OPT_CIPHER
 } OPTION_CHOICE;
 OPTIONS genpkey_options[] = {
    {"help", OPT_HELP, '-', "Display this summary"},
    {"out", OPT_OUT, '>', "Output file"},
    {"outform", OPT_OUTFORM, 'F', "output format (DER or PEM)"},
    {"pass", OPT_PASS, 's', "Output file pass phrase source"},
    {"paramfile", OPT_PARAMFILE, '<', "Parameters file"},
    {"algorithm", OPT_ALGORITHM, 's', "The public key algorithm"},
    {"pkeyopt", OPT_PKEYOPT, 's',
     "Set the public key algorithm option as opt:value"},
    {"genparam", OPT_GENPARAM, '-', "Generate parameters, not key"},
    {"text", OPT_TEXT, '-', "Print the in text"},
    {"", OPT_CIPHER, '-', "Cipher to use to encrypt the key"},
 #ifndef OPENSSL_NO_ENGINE
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 #endif
    /* This is deliberately last. */
    {OPT_HELP_STR, 1, 1,
     "Order of options may be important!  See the documentation.\n"},
    {NULL}
 };
 int genpkey_main(int argc, char **argv)
 {
    BIO *in = NULL, *out = NULL;
    ENGINE *e = NULL;
    EVP_PKEY *pkey = NULL;
    EVP_PKEY_CTX *ctx = NULL;
    char *outfile = NULL, *passarg = NULL, *pass = NULL, *prog;
    const EVP_CIPHER *cipher = NULL;
    OPTION_CHOICE o;
    int outformat = FORMAT_PEM, text = 0, ret = 1, rv, do_param = 0;
    int private = 0;
    prog = opt_init(argc, argv, genpkey_options);
    while ((o = opt_next()) != OPT_EOF) {
        switch (o) {
        case OPT_EOF:
        case OPT_ERR:
 opthelp:
            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
            goto end;
        case OPT_HELP:
            ret = 0;
            opt_help(genpkey_options);
            goto end;
        case OPT_OUTFORM:
            if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
                goto opthelp;
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_PASS:
            passarg = opt_arg();
            break;
        case OPT_ENGINE:
            e = setup_engine(opt_arg(), 0);
            break;
        case OPT_PARAMFILE:
            if (do_param == 1)
                goto opthelp;
            if (!init_keygen_file(&ctx, opt_arg(), e))
                goto end;
            break;
        case OPT_ALGORITHM:
            if (!init_gen_str(&ctx, opt_arg(), e, do_param))
                goto end;
            break;
        case OPT_PKEYOPT:
            if (ctx == NULL) {
                BIO_printf(bio_err, "%s: No keytype specified.\n", prog);
                goto opthelp;
            }
            if (pkey_ctrl_string(ctx, opt_arg()) <= 0) {
                BIO_printf(bio_err,
                           "%s: Error setting %s parameter:\n",
                           prog, opt_arg());
                ERR_print_errors(bio_err);
                goto end;
            }
            break;
        case OPT_GENPARAM:
            if (ctx != NULL)
                goto opthelp;
            do_param = 1;
            break;
        case OPT_TEXT:
            text = 1;
            break;
        case OPT_CIPHER:
            if (!opt_cipher(opt_unknown(), &cipher)
                || do_param == 1)
                goto opthelp;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
    private = do_param ? 0 : 1;
    if (ctx == NULL)
        goto opthelp;
    if (!app_passwd(passarg, NULL, &pass, NULL)) {
        BIO_puts(bio_err, "Error getting password\n");
        goto end;
    }
    out = bio_open_owner(outfile, outformat, private);
    if (out == NULL)
        goto end;
    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) {
        assert(private);
        rv = PEM_write_bio_PrivateKey(out, pkey, cipher, NULL, 0, NULL, pass);
    } else if (outformat == FORMAT_ASN1) {
        assert(private);
        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:
    EVP_PKEY_free(pkey);
    EVP_PKEY_CTX_free(ctx);
    BIO_free_all(out);
    BIO_free(in);
    OPENSSL_free(pass);
    return ret;
 }
 static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e)
 {
    BIO *pbio;
    EVP_PKEY *pkey = NULL;
    EVP_PKEY_CTX *ctx = NULL;
    if (*pctx) {
        BIO_puts(bio_err, "Parameters already set!\n");
        return 0;
    }
    pbio = BIO_new_file(file, "r");
    if (!pbio) {
        BIO_printf(bio_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 == NULL)
        goto err;
    if (EVP_PKEY_keygen_init(ctx) <= 0)
        goto err;
    EVP_PKEY_free(pkey);
    *pctx = ctx;
    return 1;
 err:
    BIO_puts(bio_err, "Error initializing context\n");
    ERR_print_errors(bio_err);
    EVP_PKEY_CTX_free(ctx);
    EVP_PKEY_free(pkey);
    return 0;
 }
 int init_gen_str(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(bio_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(bio_err, "Error initializing %s context\n", algname);
    ERR_print_errors(bio_err);
    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
@@ -1,3 +1,4 @@
 /* apps/genrsa.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -56,193 +57,285 @@
 */
 #include <openssl/opensslconf.h>
 /* Until the key-gen callbacks are modified to use newer prototypes, we allow
 * deprecated functions for openssl-internal code */
 #ifdef OPENSSL_NO_DEPRECATED
 #undef OPENSSL_NO_DEPRECATED
 #endif
 #ifndef OPENSSL_NO_RSA
-# include <stdio.h>
+#include <stdio.h>
-# include <string.h>
+#include <string.h>
-# include <sys/types.h>
+#include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/stat.h>
-# include "apps.h"
+#include "apps.h"
-# include <openssl/bio.h>
+#include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/err.h>
-# include <openssl/bn.h>
+#include <openssl/bn.h>
-# include <openssl/rsa.h>
+#include <openssl/rsa.h>
-# include <openssl/evp.h>
+#include <openssl/evp.h>
-# include <openssl/x509.h>
+#include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/pem.h>
-# include <openssl/rand.h>
+#include <openssl/rand.h>
-# define DEFBITS 2048
+#define DEFBITS	512
 #undef PROG
 #define PROG genrsa_main
-static int genrsa_cb(int p, int n, BN_GENCB *cb);
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb);
-typedef enum OPTION_choice {
+int MAIN(int, char **);
    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
    OPT_3, OPT_F4, OPT_NON_FIPS_ALLOW, OPT_ENGINE,
    OPT_OUT, OPT_RAND, OPT_PASSOUT, OPT_CIPHER
 } OPTION_CHOICE;
-OPTIONS genrsa_options[] = {
+int MAIN(int argc, char **argv)
-    {"help", OPT_HELP, '-', "Display this summary"},
+	{
-    {"3", OPT_3, '-', "Use 3 for the E value"},
+	BN_GENCB cb;
-    {"F4", OPT_F4, '-', "Use F4 (0x10001) for the E value"},
+#ifndef OPENSSL_NO_ENGINE
-    {"f4", OPT_F4, '-', "Use F4 (0x10001) for the E value"},
+	ENGINE *e = NULL;
-    {"non-fips-allow", OPT_NON_FIPS_ALLOW, '-'},
+#endif
-    {"out", OPT_OUT, 's', "Output the key to specified file"},
+	int ret=1;
-    {"rand", OPT_RAND, 's',
+	int i,num=DEFBITS;
-     "Load the file(s) into the random number generator"},
+	long l;
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+	int use_x931 = 0;
-    {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
+	const EVP_CIPHER *enc=NULL;
-# ifndef OPENSSL_NO_ENGINE
+	unsigned long f4=RSA_F4;
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+	char *outfile=NULL;
-# endif
+	char *passargout = NULL, *passout = NULL;
-    {NULL}
+#ifndef OPENSSL_NO_ENGINE
-};
+	char *engine=NULL;
 #endif
 	char *inrand=NULL;
 	BIO *out=NULL;
 	BIGNUM *bn = BN_new();
 	RSA *rsa = RSA_new();
-int genrsa_main(int argc, char **argv)
+	if(!bn || !rsa) goto err;
 {
    BN_GENCB *cb = BN_GENCB_new();
    PW_CB_DATA cb_data;
    ENGINE *e = NULL;
    BIGNUM *bn = BN_new();
    BIO *out = NULL;
    RSA *rsa = NULL;
    const EVP_CIPHER *enc = NULL;
    int ret = 1, non_fips_allow = 0, num = DEFBITS, private = 0;
    unsigned long f4 = RSA_F4;
    char *outfile = NULL, *passoutarg = NULL, *passout = NULL;
    char *inrand = NULL, *prog, *hexe, *dece;
    OPTION_CHOICE o;
-    if (bn == NULL || cb == NULL)
+	apps_startup();
-        goto end;
+	BN_GENCB_set(&cb, genrsa_cb, bio_err);
-    BN_GENCB_set(cb, genrsa_cb, bio_err);
+	if (bio_err == NULL)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-    prog = opt_init(argc, argv, genrsa_options);
+	if (!load_config(bio_err, NULL))
-    while ((o = opt_next()) != OPT_EOF) {
+		goto err;
-        switch (o) {
+	if ((out=BIO_new(BIO_s_file())) == NULL)
-        case OPT_EOF:
+		{
-        case OPT_ERR:
+		BIO_printf(bio_err,"unable to create BIO for output\n");
-            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+		goto err;
-            goto end;
+		}
        case OPT_HELP:
            ret = 0;
            opt_help(genrsa_options);
            goto end;
        case OPT_3:
            f4 = 3;
            break;
        case OPT_F4:
            f4 = RSA_F4;
            break;
        case OPT_NON_FIPS_ALLOW:
            non_fips_allow = 1;
            break;
        case OPT_OUT:
            outfile = opt_arg();
            break;
        case OPT_ENGINE:
            e = setup_engine(opt_arg(), 0);
            break;
        case OPT_RAND:
            inrand = opt_arg();
            break;
        case OPT_PASSOUT:
            passoutarg = opt_arg();
            break;
        case OPT_CIPHER:
            if (!opt_cipher(opt_unknown(), &enc))
                goto end;
            break;
        }
    }
    argc = opt_num_rest();
    argv = opt_rest();
    private = 1;
-    if (argv[0] && (!opt_int(argv[0], &num) || num <= 0))
+	argv++;
-        goto end;
+	argc--;
 	for (;;)
 		{
 		if (argc <= 0) break;
 		if (strcmp(*argv,"-out") == 0)
 			{
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
 		else if (strcmp(*argv,"-3") == 0)
 			f4=3;
 		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
 			f4=RSA_F4;
 		else if (strcmp(*argv,"-x931") == 0)
 			use_x931 = 1;
 #ifndef OPENSSL_NO_ENGINE
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
 			engine= *(++argv);
 			}
 #endif
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			}
 #ifndef OPENSSL_NO_DES
 		else if (strcmp(*argv,"-des") == 0)
 			enc=EVP_des_cbc();
 		else if (strcmp(*argv,"-des3") == 0)
 			enc=EVP_des_ede3_cbc();
 #endif
 #ifndef OPENSSL_NO_IDEA
 		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();
 		else if (strcmp(*argv,"-aes192") == 0)
 			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
 			break;
 		argv++;
 		argc--;
 		}
 	if ((argc >= 1) && ((sscanf(*argv,"%d",&num) == 0) || (num < 0)))
 		{
 bad:
 		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
 		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
 		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #ifndef OPENSSL_NO_IDEA
 		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");
 #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");
 		goto err;
 		}
-    if (!app_passwd(NULL, passoutarg, NULL, &passout)) {
+	ERR_load_crypto_strings();
        BIO_printf(bio_err, "Error getting password\n");
        goto end;
    }
-    out = bio_open_owner(outfile, FORMAT_PEM, private);
+	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
-    if (out == NULL)
+		BIO_printf(bio_err, "Error getting password\n");
-        goto end;
+		goto err;
 	}
-    if (!app_RAND_load_file(NULL, 1) && inrand == NULL
+#ifndef OPENSSL_NO_ENGINE
-        && !RAND_status()) {
+        e = setup_engine(bio_err, engine, 0);
-        BIO_printf(bio_err,
+#endif
                   "warning, not much extra random data, consider using the -rand option\n");
    }
    if (inrand != NULL)
        BIO_printf(bio_err, "%ld semi-random bytes loaded\n",
                   app_RAND_load_files(inrand));
-    BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
+	if (outfile == NULL)
-               num);
+		{
-    rsa = e ? RSA_new_method(e) : RSA_new();
+		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-    if (rsa == NULL)
+#ifdef OPENSSL_SYS_VMS
-        goto end;
+		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
 		}
 #endif
 		}
 	else
 		{
 		if (BIO_write_filename(out,outfile) <= 0)
 			{
 			perror(outfile);
 			goto err;
 			}
 		}
-    if (non_fips_allow)
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-        rsa->flags |= RSA_FLAG_NON_FIPS_ALLOW;
+		&& !RAND_status())
 		{
 		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
-    if (!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, cb))
+	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
-        goto end;
+		num);
-    app_RAND_write_file(NULL);
+	if (use_x931)
 		{
 		BIGNUM *pubexp;
 		pubexp = BN_new();
 		if (!BN_set_word(pubexp, f4))
 			goto err;
 		if (!RSA_X931_generate_key_ex(rsa, num, pubexp, &cb))
 			goto err;
 		BN_free(pubexp);
 		}
 	else if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
 		goto err;
-    hexe = BN_bn2hex(rsa->e);
+	app_RAND_write_file(NULL, bio_err);
    dece = BN_bn2dec(rsa->e);
    if (hexe && dece) {
        BIO_printf(bio_err, "e is %s (0x%s)\n", dece, hexe);
    }
    OPENSSL_free(hexe);
    OPENSSL_free(dece);
    cb_data.password = passout;
    cb_data.prompt_info = outfile;
    assert(private);
    if (!PEM_write_bio_RSAPrivateKey(out, rsa, enc, NULL, 0,
                                     (pem_password_cb *)password_callback,
                                     &cb_data))
        goto end;
-    ret = 0;
+	/* We need to do the following for when the base number size is <
- end:
+	 * long, esp windows 3.1 :-(. */
-    BN_free(bn);
+	l=0L;
-    BN_GENCB_free(cb);
+	for (i=0; i<rsa->e->top; i++)
-    RSA_free(rsa);
+		{
-    BIO_free_all(out);
+#ifndef SIXTY_FOUR_BIT
-    OPENSSL_free(passout);
+		l<<=BN_BITS4;
-    if (ret != 0)
+		l<<=BN_BITS4;
-        ERR_print_errors(bio_err);
+#endif
-    return (ret);
+		l+=rsa->e->d[i];
-}
+		}
 	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
 	{
 	PW_CB_DATA cb_data;
 	cb_data.password = passout;
 	cb_data.prompt_info = outfile;
 	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
 		(pem_password_cb *)password_callback,&cb_data))
 		goto err;
 	}
-static int genrsa_cb(int p, int n, BN_GENCB *cb)
+	ret=0;
-{
+err:
-    char c = '*';
+	if (bn) BN_free(bn);
 	if (rsa) RSA_free(rsa);
 	if (out) BIO_free_all(out);
 	if(passout) OPENSSL_free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	apps_shutdown();
 	OPENSSL_EXIT(ret);
 	}
-    if (p == 0)
+static int MS_CALLBACK genrsa_cb(int p, int n, BN_GENCB *cb)
-        c = '.';
+	{
-    if (p == 1)
+	char c='*';
-        c = '+';
+
-    if (p == 2)
+	if (p == 0) c='.';
-        c = '*';
+	if (p == 1) c='+';
-    if (p == 3)
+	if (p == 2) c='*';
-        c = '\n';
+	if (p == 3) c='\n';
-    BIO_write(BN_GENCB_get_arg(cb), &c, 1);
+	BIO_write(cb->arg,&c,1);
-    (void)BIO_flush(BN_GENCB_get_arg(cb));
+	(void)BIO_flush(cb->arg);
-    return 1;
+#ifdef LINT
-}
+	p=n;
-#else                           /* !OPENSSL_NO_RSA */
+#endif
 	return 1;
 	}
 #else /* !OPENSSL_NO_RSA */
 # if PEDANTIC
-static void *dummy = &dummy;
+static void *dummy=&dummy;
 # endif
 #endif
--- 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/Show More
+++ b/Show More
		`@@ -1,2 +0,0 @@`
			`Please https://www.openssl.org/community/thanks.html for the current`
			`acknowledgements.`